sen-ether-client 0.2.0 → 0.2.1

package/lib/client.js

@@ -470,6 +470,7 @@ export class EtherClient extends EventEmitter {
     this.ready = false;
     this.buses = new Map();
     this.remoteParticipantsByBusId = new Map();
+    this.nextInterestId = randomUInt32();
   }
 
   /**
@@ -997,7 +998,7 @@ export class EtherClient extends EventEmitter {
    */
   startInterest(bus, query, options = {}) {
     const busState = this.#getBus(bus);
-    const id = options.id ?? crc32(query);
+    const id = options.id ?? this.#nextInterestId(busState);
     this.#sendBusControlToRemoteParticipants(busState, {
       type: 'InterestStarted',
       value: { query, id }
@@ -1007,6 +1008,18 @@ export class EtherClient extends EventEmitter {
     return { busName: busState.busName, busId: busState.busId, id, query };
   }
 
+  #nextInterestId(busState) {
+    for (let attempts = 0; attempts < 0xffff_ffff; attempts += 1) {
+      this.nextInterestId = (this.nextInterestId + 1) >>> 0;
+      const id = this.nextInterestId || 1;
+      if (!busState.interests.has(id)) {
+        this.nextInterestId = id;
+        return id;
+      }
+    }
+    throw new Error('could not allocate a SEN interest id');
+  }
+
   #restartInterestForRemote(busState) {
     for (const participant of this.#remoteParticipantsForBus(busState.busId)) {
       for (const interest of busState.interests.values()) {

package/lib/sen.js

@@ -161,8 +161,20 @@ function normalizeTimestampNs(value) {
   return typeof value === 'bigint' ? value : BigInt(value);
 }
 
-function stateRequestKey(interestId, objectId) {
-  return `${interestId >>> 0}:${objectId >>> 0}`;
+function stateRequestKey(interestId, ownerId, objectId) {
+  return `${interestId >>> 0}:${remoteObjectKey(ownerId, objectId)}`;
+}
+
+function remoteObjectKey(ownerId, objectId) {
+  const owner = ownerId === undefined || ownerId === null ? 'unknown' : String(ownerId >>> 0);
+  return `${owner}:${objectId >>> 0}`;
+}
+
+function eventOwnerId(event) {
+  if (event?.ownerId !== undefined) {
+    return event.ownerId;
+  }
+  return event?.multicast ? undefined : event?.to;
 }
 
 async function waitForSessionBuses(session, timeoutMs) {
@@ -1312,43 +1324,36 @@ export class SenBus extends EventEmitter {
   }
 
   handleObjectsPublished(event) {
+    const ownerId = eventOwnerId(event);
     const newTypeHashes = new Set();
     for (const discovery of event.discoveries ?? []) {
       const interest = this.interests.get(discovery.interestId);
-      if (interest && event.ownerId !== undefined) {
-        if (interest.ownerId !== undefined && interest.ownerId !== event.ownerId) {
-          this.#resetInterestForOwner(interest, event.ownerId);
-        } else {
-          interest.ownerId = event.ownerId;
-        }
+      if (!interest) {
+        continue;
+      }
+      if (ownerId !== undefined) {
+        interest.ownerId ??= ownerId;
+        interest.ownerIds.add(ownerId >>> 0);
       }
 
       for (const info of discovery.objects ?? []) {
-        let object = this.objectsById.get(info.id);
-        if (object && event.ownerId !== undefined && object.ownerId !== event.ownerId) {
-          this.#removeObjectFromAllInterests(object, {
-            reason: 'ownerChanged',
-            ownerId: event.ownerId,
-            previousOwnerId: object.ownerId
-          });
-          object = undefined;
-        }
+        let object = this.#objectByOwnerAndId(ownerId, info.id);
         const isNewObject = !object;
         if (!object) {
           object = new SenRemoteObject(this, {
             ...info,
-            ownerId: event.ownerId,
+            ownerId,
             interestId: discovery.interestId
           });
-          this.objectsById.set(object.id, object);
+          this.objectsById.set(object.key, object);
         } else {
           object.attachInterest(discovery.interestId);
           object.updateDiscoveryInfo({
             ...info,
-            ownerId: event.ownerId
+            ownerId
           });
         }
-        interest?.objectsById.set(object.id, object);
+        interest?.objectsById.set(object.key, object);
         if (info.state?.length) {
           object.applyState(info.state, 'published', info.time, { interestId: discovery.interestId });
         }
@@ -1367,10 +1372,14 @@ export class SenBus extends EventEmitter {
   }
 
   handleObjectsRemoved(event) {
+    const ownerId = eventOwnerId(event);
     for (const removal of event.removals ?? []) {
+      const interest = this.interests.get(removal.interestId);
+      if (!interest) {
+        continue;
+      }
       for (const id of removal.ids ?? []) {
-        const object = this.objectsById.get(id);
-        const interest = this.interests.get(removal.interestId);
+        const object = this.#objectByOwnerAndId(ownerId, id);
         if (object) {
           this.#removeObjectFromInterest(object, removal.interestId, interest);
         }
@@ -1419,14 +1428,16 @@ export class SenBus extends EventEmitter {
 
   #removeObjectFromInterest(object, interestId, interest, detail = {}) {
     const normalizedInterestId = interestId >>> 0;
-    this.stateRequestedObjectIds.delete(stateRequestKey(normalizedInterestId, object.id));
-    interest?.objectsById.delete(object.id);
+    this.stateRequestedObjectIds.delete(stateRequestKey(normalizedInterestId, object.ownerId, object.id));
+    interest?.objectsById.delete(object.key);
     object.detachInterest(normalizedInterestId);
     object.emit('remove', { interestId: normalizedInterestId, ...detail });
     interest?.emit('remove', object);
     if (object.interestIds.size === 0) {
-      this.objectsById.delete(object.id);
-      this.requestedTypeHashes.delete(object.typeHash);
+      this.objectsById.delete(object.key);
+      if (![...this.objectsById.values()].some(item => item.typeHash === object.typeHash)) {
+        this.requestedTypeHashes.delete(object.typeHash);
+      }
       this.emit('remove', object);
       this.sen.emit('remove', object);
     }
@@ -1491,10 +1502,15 @@ export class SenBus extends EventEmitter {
   }
 
   handleObjectsStateResponse(event) {
+    const ownerId = eventOwnerId(event);
     for (const response of event.responses ?? []) {
+      const interest = this.interests.get(response.interestId);
+      if (!interest) {
+        continue;
+      }
       for (const state of response.objectStates ?? []) {
-        const object = this.objectsById.get(state.id);
-        if (!object || (event.ownerId !== undefined && object.ownerId !== event.ownerId)) {
+        const object = this.#objectByOwnerAndId(ownerId, state.id);
+        if (!object || !interest.objectsById.has(object.key)) {
           continue;
         }
         object.applyState(state.state, 'state', state.timestamp, { interestId: response.interestId });
@@ -1503,7 +1519,7 @@ export class SenBus extends EventEmitter {
   }
 
   handleRuntimeObjectUpdate(event) {
-    const object = this.objectsById.get(event.update.objectId);
+    const object = this.#objectByOwnerAndId(eventOwnerId(event), event.update.objectId);
     if (!object) {
       return;
     }
@@ -1511,8 +1527,9 @@ export class SenBus extends EventEmitter {
   }
 
   handleRuntimeEvents(event) {
+    const ownerId = eventOwnerId(event);
     for (const item of event.events ?? []) {
-      const object = this.objectsById.get(item.producerId);
+      const object = this.#objectByOwnerAndId(ownerId, item.producerId);
       if (!object) {
         continue;
       }
@@ -1583,7 +1600,7 @@ export class SenBus extends EventEmitter {
         if (!object.spec) {
           continue;
         }
-        const key = stateRequestKey(interest.id, object.id);
+        const key = stateRequestKey(interest.id, object.ownerId, object.id);
         if (!force && this.stateRequestedObjectIds.has(key)) {
           continue;
         }
@@ -1656,6 +1673,14 @@ export class SenBus extends EventEmitter {
       }
     }
   }
+
+  #objectByOwnerAndId(ownerId, objectId) {
+    if (ownerId !== undefined && ownerId !== null) {
+      return this.objectsById.get(remoteObjectKey(ownerId, objectId));
+    }
+    const id = objectId >>> 0;
+    return [...this.objectsById.values()].find(object => object.id === id);
+  }
 }
 
 export class SenInterest extends EventEmitter {
@@ -1665,6 +1690,7 @@ export class SenInterest extends EventEmitter {
     this.id = id;
     this.query = query;
     this.ownerId = undefined;
+    this.ownerIds = new Set();
     this.options = { ...options };
     this.propertyNames = normalizePropertyNames(options.properties ?? options.propertyNames);
     this.changeMode = options.changeMode ?? (options.batch ? 'batch' : 'individual');
@@ -1867,6 +1893,10 @@ export class SenRemoteObject extends EventEmitter {
     return this.propertyTimestamps.get(name);
   }
 
+  get key() {
+    return remoteObjectKey(this.ownerId, this.id);
+  }
+
   isReadyForInterest(interestId) {
     return this.readyInterestIds.has(interestId >>> 0);
   }
@@ -2002,7 +2032,7 @@ export class SenRemoteObject extends EventEmitter {
 
     const interests = [];
     for (const interest of this.bus.interests.values()) {
-      if (interest.objectsById.has(this.id)) {
+      if (interest.objectsById.has(this.key) || interest.objectsById.has(this.id)) {
         interests.push(interest);
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sen-ether-client",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Pure JavaScript SEN client for existing kernels over ether",
   "senCompatibility": {
     "kernelProtocolVersion": 9,