esiur/esiur-dotnet
2
0
Fork 0
mirror of https://github.com/esiur/esiur-dotnet.git synced 2026-07-30 17:30:40 +00:00
Code Issues Projects Releases Wiki Activity

Version 3.0

Browse Source
This commit is contained in:
ahmed
2026-07-18 19:05:32 +03:00
parent cfb7f83899
commit a4b5702090
6 changed files with 617 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/Esiur/Protocol/EpConnection.cs
+15 -14
View File
@@ -3549,29 +3549,22 @@ public partial class EpConnection : NetworkConnection, IStore
foreach (var r in toBeRestored)
{
var link = DC.ToBytes(r.ResourceLink);
Global.Log("EpConnection", LogType.Debug, "Restoreing " + r.ResourceLink);
try
{
var id = (uint)await SendRequest(EpPacketRequest.GetResourceIdByLink, link);
// remove from suspended.
// remove from suspended — Reattach(link, ...) below re-resolves
// and re-registers it under whatever id the server currently
// has (not necessarily the one we last knew — see Reattach's
// doc comment: the remote node's instance id is not permanent,
// only the link is), in a single round trip.
_suspendedResources.Remove(r.ResourceInstanceId);
// id changed ?
if (id != r.ResourceInstanceId)
r.ResourceInstanceId = id;
_neededResources[id] = r;
// Reattach using the last-known age so only properties modified while
// disconnected are transferred and merged, instead of re-fetching all.
await Reattach(id, r.Instance.Age, r);
await Reattach(r.ResourceLink, r.Instance.Age, r);
Global.Log("EpConnection", LogType.Debug, "Restored " + id);
Global.Log("EpConnection", LogType.Debug, "Restored " + r.ResourceInstanceId);
}
catch (AsyncException ex)
@@ -3720,6 +3713,14 @@ public partial class EpConnection : NetworkConnection, IStore
_suspendedResources[r.ResourceInstanceId] = x;
}
}
// Every entry just moved to _suspendedResources — clear the old map too,
// otherwise Reattach()'s "already attached" fast path
// (`_attachedResources[id]?.TryGetTarget(...)`) finds the still-live
// weak reference to the now-suspended resource and returns it
// immediately, short-circuiting before _Reattach() ever runs — so a
// reconnect never actually resets Status back to Attached/Published
// or resubscribes events.
_attachedResources.Clear();
if (Server != null)
{
Libraries/Esiur/Protocol/EpConnectionProtocol.cs
+168 -101
View File
@@ -1053,71 +1053,85 @@ partial class EpConnection
void EpRequestReattachResource(uint callback, PlainTdu tdu)
{
// resourceId, index, value
// resourceLinkOrId (string link, or uint id — a link is resolved by
// query since a remote node's instance id is not permanent: the
// resource may have been cleared from memory and recreated under a
// different id while the peer was disconnected), age
var (valueOffset, valueSize, args) =
DataDeserializer.LimitedCountListParser(tdu.Data, tdu.PayloadOffset,
tdu.PayloadLength, Instance.Warehouse, 2);
var resourceId = Convert.ToUInt32(args[0]);
var age = Convert.ToUInt64(args[1]);
if (!TryBeginPeerAttachment(resourceId, out var exceptionCode, out var exceptionMessage))
void Resolved(IResource res)
{
SendError(ErrorType.Management, callback, (ushort)exceptionCode, exceptionMessage);
return;
}
if (res == null)
{
Global.Log("EpConnection", LogType.Debug, "Not found (reattach) " + args[0]);
SendError(ErrorType.Management, callback, (ushort)ExceptionCode.ResourceNotFound);
return;
}
var resourceId = res.Instance.Id;
if (!TryBeginPeerAttachment(resourceId, out var exceptionCode, out var exceptionMessage))
{
SendError(ErrorType.Management, callback, (ushort)exceptionCode, exceptionMessage);
return;
}
Instance.Warehouse.GetById(resourceId).Then((res) =>
{
try
{
if (res != null)
{
if (!TryApplyManagers(
null,
res,
ActionType.Attach,
callback,
ErrorType.Management,
ExceptionCode.AttachDenied,
out _))
return;
if (!TryApplyManagers(
null,
res,
ActionType.Attach,
callback,
ErrorType.Management,
ExceptionCode.AttachDenied,
out _))
return;
var r = res as IResource;
var r = res;
// unsubscribe
Unsubscribe(r);
// unsubscribe
Unsubscribe(r);
// reply ok — the resolved id comes first so the caller can
// detect and apply an id change (link-based reattach, or the
// remote node recreated the resource with a new id).
SendReply(EpPacketReply.Completed, callback,
r.Instance.Id,
r.Instance.Definition.Id,
r.Instance.Age,
r.Instance.Link,
r.Instance.Hops,
r.Instance.SerializeAfter(age));
// reply ok
SendReply(EpPacketReply.Completed, callback,
r.Instance.Definition.Id,
r.Instance.Age,
r.Instance.Link,
r.Instance.Hops,
r.Instance.SerializeAfter(age));
// subscribe
Subscribe(r);
}
else
{
// reply failed
Global.Log("EpConnection", LogType.Debug, "Not found " + resourceId);
SendError(ErrorType.Management, callback, (ushort)ExceptionCode.ResourceNotFound);
}
// subscribe
Subscribe(r);
}
finally
{
EndPeerAttachment(resourceId);
}
}).Error(ex =>
{
EndPeerAttachment(resourceId);
}
void Failed(Exception ex) =>
SendError(ErrorType.Management, callback, (ushort)ExceptionCode.GeneralFailure, ex.Message);
});
if (args[0] is string link)
{
if (Server?.EntryPoint != null)
Server.EntryPoint.Query(link, this).Then(Resolved).Error(Failed);
else
Instance.Warehouse.Query(link).Then(Resolved).Error(Failed);
}
else
{
var resourceId = Convert.ToUInt32(args[0]);
Instance.Warehouse.GetById(resourceId).Then(Resolved).Error(Failed);
}
}
void EpRequestDetachResource(uint callback, PlainTdu tdu)
@@ -1496,7 +1510,11 @@ partial class EpConnection
out _))
return;
SendReply(EpPacketReply.Completed, callback, r);
// Only the id — this opcode resolves a link to an identity,
// it does not attach. (A resource reference in a reply would
// auto-attach on decode, which is not what a bare id lookup
// should do — see Get(string) for the real attach step.)
SendReply(EpPacketReply.Completed, callback, r.Instance.Id);
}
};
@@ -2742,36 +2760,24 @@ partial class EpConnection
/// <returns>Resource</returns>
public AsyncReply<IResource> Get(string path)
{
var rt = new AsyncReply<IResource>();
var req = SendRequest(EpPacketRequest.GetResourceIdByLink, path);
req.Then(result =>
// Two steps, deliberately: resolve the link to its (not permanent —
// the remote node may recreate the resource under a different id)
// current instance id, then attach by that id. GetResourceIdByLink
// returns a bare id, not a resource — it must not have the side
// effect of attaching anything on its own.
SendRequest(EpPacketRequest.GetResourceIdByLink, path).Then(result =>
{
var id = Convert.ToUInt32(result);
FetchResource(id, null).Then(resource =>
{
// The resource is being handed to the application: remember it and publish its graph
// once all reachable dependencies have attached.
if (result is EpResource resource)
TrackDeliveredRoot(resource);
rt.Trigger(result);
// The resource is being handed to the application: remember it and publish its
// graph once all reachable dependencies have attached.
TrackDeliveredRoot(resource);
rt.Trigger(resource);
}).Error(ex => rt.TriggerError(ex));
//Query(path).Then(ar =>
//{
// //if (filter != null)
// // ar = ar?.Where(filter).ToArray();
// // MISSING: should dispatch the unused resources.
// if (ar?.Length > 0)
// rt.Trigger(ar[0]);
// else
// rt.Trigger(null);
//}).Error(ex => rt.TriggerError(ex));
}).Error(ex => rt.TriggerError(ex));
return rt;
}
@@ -3265,62 +3271,123 @@ partial class EpConnection
/// merged into the existing instance instead of re-fetching everything. Falls back to a full
/// <see cref="FetchResource"/> if there is no prior state to merge into.
/// </summary>
public AsyncReply<EpResource> Reattach(uint id, ulong age, EpResource resource)
/// <param name="resourceLinkOrId">
/// A <see cref="string"/> link or a <see cref="uint"/> id. Prefer the link: the remote node's
/// instance id is not permanent (the resource may have been cleared from memory and recreated
/// under a different id while disconnected), but the link is — passing it resolves the current
/// id and reattaches in a single round trip instead of a separate GetResourceIdByLink first.
/// </param>
public AsyncReply<EpResource> Reattach(object resourceLinkOrId, ulong age, EpResource resource)
{
EpResource attachedResource = null;
_attachedResources[id]?.TryGetTarget(out attachedResource);
if (attachedResource != null)
return new AsyncReply<EpResource>(attachedResource);
// The already-attached / already-in-flight fast paths only apply when we
// already know a specific id — a link's current id isn't known until the
// server resolves it. (Concurrent duplicate reattach-by-link calls for the
// same resource aren't deduplicated the way FetchResource dedupes concurrent
// attach-by-id calls; the sole caller today — the reconnect loop — only ever
// calls this once per resource per reconnect, so this is a deliberate
// simplification, not an oversight.)
if (resourceLinkOrId is uint knownId)
{
EpResource attachedResource = null;
_attachedResources[knownId]?.TryGetTarget(out attachedResource);
if (attachedResource != null)
return new AsyncReply<EpResource>(attachedResource);
var existing = _resourceRequests[id];
if (existing != null)
return existing.Reply;
var existing = _resourceRequests[knownId];
if (existing != null)
return existing.Reply;
}
var reply = new AsyncReply<EpResource>();
var sequence = new uint[] { id };
if (!TryReserveResourceAttachment(id, reply, sequence, out var alternative))
return alternative;
ResourceAttachRequestCount++;
SendRequest(EpPacketRequest.ReattachResource, id, age).Then(result =>
SendRequest(EpPacketRequest.ReattachResource, resourceLinkOrId, age).Then(result =>
{
if (result == null)
{
_resourceRequests.Remove(id);
reply.TriggerError(new AsyncException(ErrorType.Management,
(ushort)ExceptionCode.ResourceNotFound, "Null response"));
return;
}
// typeId, age, link, hops, delta(index -> PropertyValue)
// resolvedId, typeId, age, link, hops, delta(index -> PropertyValue)
var args = (object[])result;
var deltaData = (byte[])args[4];
var resolvedId = Convert.ToUInt32(args[0]);
var deltaData = (byte[])args[5];
var sequence = new uint[] { resolvedId };
var oldId = resource.ResourceInstanceId;
DataDeserializer.PropertyValueMapParserAsync(deltaData, 0, (uint)deltaData.Length, this, sequence)
.Then(delta =>
{
if (resolvedId != oldId)
{
// Re-key our own tracking to the id the server actually
// resolved the link to — see the id-is-not-permanent note above.
resource.ResourceInstanceId = resolvedId;
// Only evict oldId's entries if they still point to THIS
// resource. If the remote node reused oldId for a different
// resource (freed, then reassigned) and something else
// concurrently attached it while this reattach was in
// flight, a blind Remove(oldId) would wrongly evict that
// unrelated resource's own valid tracking.
var oldAttachedRef = _attachedResources[oldId];
if (oldAttachedRef != null
&& oldAttachedRef.TryGetTarget(out var oldAttached)
&& ReferenceEquals(oldAttached, resource))
_attachedResources.Remove(oldId);
if (ReferenceEquals(_neededResources[oldId], resource))
_neededResources.Remove(oldId);
// Safe unconditionally: this dictionary just marks "still
// suspended, needs restoring", which is false either way now
// that we're mid-reattach — no risk of evicting something
// unrelated's meaningful state. (Already removed by the
// reconnect loop's own pre-cleanup in the common case.)
_suspendedResources.Remove(oldId);
// Reattach() never reserves a _resourceRequests entry before
// sending the request (see the fast-path comment above), so
// there is nothing of ours to remove here — left out
// entirely rather than risk canceling an unrelated in-flight
// request that happens to share the reused oldId.
}
if (!resource._Reattach(delta))
{
// No prior state to merge into — perform a full attach instead.
_resourceRequests.Remove(id);
FetchResource(id, null).Then(r => reply.Trigger(r)).Error(ex => reply.TriggerError(ex));
_resourceRequests.Remove(resolvedId);
FetchResource(resolvedId, null).Then(r => reply.Trigger(r)).Error(ex => reply.TriggerError(ex));
return;
}
_resourceRequests.Remove(id);
_neededResources.Remove(id);
_attachedResources[id] = new WeakReference<EpResource>(resource);
ClearResourceFetchNode(id);
_resourceRequests.Remove(resolvedId);
_neededResources.Remove(resolvedId);
_attachedResources[resolvedId] = new WeakReference<EpResource>(resource);
ClearResourceFetchNode(resolvedId);
// TryPublishDeliveredRoots() alone isn't enough here: it only
// re-checks resources tracked in _deliveredRoots, which a
// resource that attached cleanly on its *first* attempt
// (the common case) never enters — see TrackDeliveredRoot's
// early return. Without this, a reattached resource stays
// stuck at ResourceStatus.Attached forever after a
// reconnect, since nothing else ever calls Publish() on it.
PublishGraph(resource);
TryPublishDeliveredRoots();
reply.Trigger(resource);
})
.Error(ex => { _resourceRequests.Remove(id); ClearResourceFetchNode(id); reply.TriggerError(ex); });
}).Error(ex =>
{
_resourceRequests.Remove(id);
ClearResourceFetchNode(id);
reply.TriggerError(ex);
});
.Error(ex =>
{
_resourceRequests.Remove(resolvedId);
ClearResourceFetchNode(resolvedId);
reply.TriggerError(ex);
});
}).Error(ex => reply.TriggerError(ex));
// No _resourceRequests/fetch-node cleanup needed here: unlike
// FetchResource's id-based path, this method never reserves an
// entry before the request is sent (see the fast-path comment
// above), so there is nothing to unwind if the request itself fails.
return reply;
}
Libraries/Esiur/Protocol/EpResource.cs
+188
View File
@@ -80,6 +80,18 @@ public class EpResource : DynamicObject, IResource, INotifyPropertyChanged, IDyn
EpResourceEvent[] _events;
// `On`/`Off` listener bags, keyed by property/event index — separate from
// the single-slot `_events[]` dynamic-member mechanism (`resource.Foo +=
// handler`) above, which only ever holds one delegate per event.
readonly Dictionary<byte, List<Action<object>>> _propertyListeners = new();
readonly Dictionary<byte, List<Action<object>>> _eventListeners = new();
// Events we believe the server currently has us subscribed to — checked
// before sending a Subscribe/Unsubscribe request, since the server errors
// (AlreadyListened/AlreadyUnsubscribed) on a redundant one.
readonly HashSet<byte> _subscribedEvents = new();
// Event indices with a subscription-reconciliation loop currently running.
readonly HashSet<byte> _reconciling = new();
/// <summary>
@@ -260,6 +272,12 @@ public class EpResource : DynamicObject, IResource, INotifyPropertyChanged, IDyn
}
_status = Resource.ResourceStatus.Attached;
// A reattach can follow an unexpected disconnect + automatic
// reconnect: the server-side subscription state keyed to the old,
// now-dead connection is gone, but our local listeners (On()/+=)
// are untouched, so without this we'd wrongly believe we're still
// subscribed and never resend the wire Subscribe request.
ReconcileAllSubscriptions();
return true;
}
@@ -269,6 +287,7 @@ public class EpResource : DynamicObject, IResource, INotifyPropertyChanged, IDyn
var et = Instance.Definition.GetEventDefByIndex(index);
_events[index]?.Invoke(this, args);
Instance.EmitResourceEvent(et, args);
DispatchListeners(_eventListeners, index, args);
}
public AsyncReply _Invoke(byte index, object args)
@@ -371,6 +390,164 @@ public class EpResource : DynamicObject, IResource, INotifyPropertyChanged, IDyn
return Unsubscribe(et);
}
/// <summary>
/// Listen for a property change (<c>On(":propName", cb)</c>) or an
/// exported event (<c>On("eventName", cb)</c>). For events where the
/// TypeDef marks <see cref="EventDef.Subscribable"/> (i.e. not
/// <c>[AutoDelivery]</c>), the first listener triggers a Subscribe
/// request and the last <see cref="Off"/> triggers Unsubscribe —
/// ref-counted by listener count, so redundant wire requests aren't sent
/// for a second/third listener on the same already-subscribed event.
/// </summary>
public EpResource On(string name, Action<object> callback)
{
if (name.StartsWith(":"))
{
var propertyName = name.Substring(1);
var pt = Instance.Definition.GetPropertyDefByName(propertyName)
?? throw new Exception($"Unknown property \"{propertyName}\".");
AddListener(_propertyListeners, pt.Index, callback);
return this;
}
var et = Instance.Definition.GetEventDefByName(name)
?? throw new Exception($"Unknown event \"{name}\".");
AddListener(_eventListeners, et.Index, callback);
if (et.Subscribable) ReconcileSubscription(et);
return this;
}
/// <summary>Remove a listener registered with <see cref="On"/>.</summary>
public EpResource Off(string name, Action<object> callback)
{
if (name.StartsWith(":"))
{
var pt = Instance.Definition.GetPropertyDefByName(name.Substring(1));
if (pt != null) RemoveListener(_propertyListeners, pt.Index, callback);
return this;
}
var et = Instance.Definition.GetEventDefByName(name);
if (et == null) return this;
RemoveListener(_eventListeners, et.Index, callback);
if (et.Subscribable) ReconcileSubscription(et);
return this;
}
static void AddListener(Dictionary<byte, List<Action<object>>> map, byte index, Action<object> callback)
{
lock (map)
{
if (!map.TryGetValue(index, out var list))
{
list = new List<Action<object>>();
map[index] = list;
}
list.Add(callback);
}
}
static void RemoveListener(Dictionary<byte, List<Action<object>>> map, byte index, Action<object> callback)
{
lock (map)
if (map.TryGetValue(index, out var list))
list.Remove(callback);
}
static int ListenerCount(Dictionary<byte, List<Action<object>>> map, byte index)
{
lock (map)
return map.TryGetValue(index, out var list) ? list.Count : 0;
}
static void DispatchListeners(Dictionary<byte, List<Action<object>>> map, byte index, object value)
{
Action<object>[] callbacks;
lock (map)
{
if (!map.TryGetValue(index, out var list) || list.Count == 0) return;
callbacks = list.ToArray();
}
foreach (var callback in callbacks)
callback(value);
}
/// <summary>
/// Called from <see cref="_Reattach"/>: reset our belief about server-side
/// subscription state (a fresh connection starts with none) and re-run
/// reconciliation for every subscribable event that still has active
/// listeners, so subscriptions survive an unexpected disconnect +
/// automatic reconnect transparently.
/// </summary>
void ReconcileAllSubscriptions()
{
lock (_subscribedEvents) _subscribedEvents.Clear();
lock (_reconciling) _reconciling.Clear();
foreach (var et in Instance.Definition.Events)
{
if (!et.Subscribable) continue;
var hasListeners = ListenerCount(_eventListeners, et.Index) > 0 || _events[et.Index] != null;
if (hasListeners) ReconcileSubscription(et);
}
}
/// <summary>
/// Settle the wire subscription state for <paramref name="et"/> toward
/// whatever the current listener count implies, rechecking the *current*
/// desired state on each step — so a burst of On()/Off() calls while a
/// request is in flight is coalesced into whatever the state actually is
/// once the in-flight request settles, rather than replaying every
/// transition.
/// </summary>
void ReconcileSubscription(EventDef et)
{
lock (_reconciling)
{
if (!_reconciling.Add(et.Index)) return;
}
StepSubscription(et);
}
void StepSubscription(EventDef et)
{
bool desired;
bool actual;
lock (_subscribedEvents)
{
// Either subscription mechanism wanting delivery is enough:
// `On()`/`Off()`'s ref-counted list, or a native `+=`/`-=`
// multicast delegate assigned via TrySetMember.
desired = ListenerCount(_eventListeners, et.Index) > 0 || _events[et.Index] != null;
actual = _subscribedEvents.Contains(et.Index);
}
if (desired == actual)
{
lock (_reconciling) _reconciling.Remove(et.Index);
return;
}
var request = desired ? Subscribe(et) : Unsubscribe(et);
request.Then((_) =>
{
lock (_subscribedEvents)
{
if (desired) _subscribedEvents.Add(et.Index);
else _subscribedEvents.Remove(et.Index);
}
// Re-check: the desired state may have changed while this request
// was in flight (another On()/Off() call came in meanwhile).
StepSubscription(et);
}).Error((_) =>
{
// Leave `_subscribedEvents` as-is; the next On()/Off() call that
// changes the listener count re-triggers reconciliation, so a
// transient failure here just needs another transition to retry.
lock (_reconciling) _reconciling.Remove(et.Index);
});
}
public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result)
{
@@ -492,6 +669,7 @@ public class EpResource : DynamicObject, IResource, INotifyPropertyChanged, IDyn
var pt = Instance.Definition.GetPropertyDefByIndex(index);
_properties[index] = value;
Instance.EmitModification(pt, value);
DispatchListeners(_propertyListeners, index, value);
}
/// <summary>
@@ -538,7 +716,17 @@ public class EpResource : DynamicObject, IResource, INotifyPropertyChanged, IDyn
if (et == null)
return false;
// `r.Milestone += handler` desugars to a get (TryGetMember) + a
// DLR-computed `Delegate.Combine` + this set — so this slot is
// already a proper multicast delegate across multiple `+=`
// subscribers. What's new is noticing the null <-> non-null
// transition to (un)subscribe on the wire, matching `On`/`Off`.
var wasEmpty = _events[et.Index] == null;
_events[et.Index] = (EpResourceEvent)value;
var isEmpty = _events[et.Index] == null;
if (wasEmpty != isEmpty && et.Subscribable)
ReconcileSubscription(et);
return true;
}