sen-ether-client 0.1.7 → 0.2.1

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) {
@@ -384,42 +396,57 @@ export class Sen extends EventEmitter {
 
   async #connectSingle(config) {
     const target = config.target ?? await this.#discoverTarget(config);
-    if (!target) {
+    const activeNode = Boolean(config.session && (config.tcpHub || config.multicastDiscovery !== false));
+    if (!target && !activeNode) {
       throw new Error('no SEN ether process matches the requested filters');
     }
 
-    const sessionName = target.session?.name ?? target.info?.sessionName ?? config.session;
+    const sessionName = target?.session?.name ?? target?.info?.sessionName ?? config.session;
     if (!sessionName) {
       throw new Error('cannot connect without a SEN session name');
     }
-    if (!this.targets.includes(target)) {
+    if (target && !this.targets.includes(target)) {
       this.targets.push(target);
     }
-    if (!this.targetsBySession.has(sessionName)) {
+    if (target && !this.targetsBySession.has(sessionName)) {
       this.targetsBySession.set(sessionName, target);
     }
 
     const client = new EtherClient({
       sessionName,
       appName: config.appName,
+      tcpHub: config.tcpHub,
+      multicastDiscovery: config.multicastDiscovery,
+      listen: config.listen,
+      listenHost: config.listenHost,
+      listenPort: config.listenPort,
+      advertisedHost: config.advertisedHost,
+      beamPeriodMs: config.beamPeriodMs,
       socketKeepAlive: config.socketKeepAlive,
       socketKeepAliveInitialDelayMs: config.socketKeepAliveInitialDelayMs,
       socketIdleTimeoutMs: config.socketIdleTimeoutMs,
       interfaceAddress: config.interfaceAddress,
+      group: config.group,
+      bindAddress: config.bindAddress,
       discoveryPort: config.port,
       busMulticast: config.busMulticast,
       busMulticastPort: config.busMulticastPort,
       busMulticastRange: config.busMulticastRange
     });
     this.client = client;
-    this.target = target;
+    this.target = target ?? { session: { name: sessionName }, process: client.processInfo, info: client.processInfo, local: true };
     this.#wireClient(client);
 
     try {
-      await client.connect(target);
-      await waitForEvent(client, 'ready', config.timeout ?? 3000);
-      this.#startPresenceWatchdog(target, config);
-      this.emit('connect', { target, sessionName });
+      if (config.tcpHub || config.listen !== false) {
+        await client.start(config);
+      }
+      if (target) {
+        await client.connect(target);
+        await waitForEvent(client, 'ready', config.timeout ?? 3000);
+        this.#startPresenceWatchdog(target, config);
+      }
+      this.emit('connect', { target: this.target, sessionName });
       return this;
     } catch (error) {
       await client.close().catch(closeError => this.emit('warning', closeError));
@@ -534,6 +561,60 @@ export class Sen extends EventEmitter {
     return await this.subscribe(name, options);
   }
 
+  /**
+   * Publish local JavaScript objects on a SEN bus.
+   *
+   * @param {string} busName Session-qualified or ether-local bus name.
+   * @param {object|object[]} objects
+   * @param {object} [options]
+   */
+  async publishObjects(busName, objects, options = {}) {
+    if (!this.client) {
+      const sessionName = this.#sessionNameForBus(busName, options);
+      const session = await this.session(sessionName);
+      return await session.publishObjects(busName, objects, options);
+    }
+
+    if (!this.client || !this.target) {
+      throw new Error('Sen is not connected');
+    }
+
+    const sessionName = this.target.session?.name ?? this.client.processInfo.sessionName;
+    this.#assertBusBelongsToSession(busName, sessionName);
+    const bus = etherBusName(sessionName, busName);
+
+    if (!this.buses.has(bus)) {
+      const joined = await this.client.joinBus(bus, options);
+      this.buses.set(bus, new SenBus(this, bus, joined.busId));
+    }
+
+    return this.client.publishObjects(bus, objects, options);
+  }
+
+  /**
+   * Remove previously published local JavaScript objects from a SEN bus.
+   *
+   * @param {string} busName Session-qualified or ether-local bus name.
+   * @param {Array<string|number>|string|number} objects Object ids or names.
+   * @param {object} [options]
+   */
+  async removePublishedObjects(busName, objects, options = {}) {
+    if (!this.client) {
+      const sessionName = this.#sessionNameForBus(busName, options);
+      const session = await this.session(sessionName);
+      return await session.removePublishedObjects(busName, objects, options);
+    }
+
+    if (!this.client || !this.target) {
+      throw new Error('Sen is not connected');
+    }
+
+    const sessionName = this.target.session?.name ?? this.client.processInfo.sessionName;
+    this.#assertBusBelongsToSession(busName, sessionName);
+    const bus = etherBusName(sessionName, busName);
+    return this.client.removePublishedObjects(bus, objects);
+  }
+
   async session(name) {
     const sessionName = String(name || '').trim();
     if (!sessionName) {
@@ -970,17 +1051,36 @@ export class Sen extends EventEmitter {
         client = new EtherClient({
           sessionName,
           appName: config.appName,
+          tcpHub: config.tcpHub,
+          multicastDiscovery: config.multicastDiscovery,
+          listen: config.listen,
+          listenHost: config.listenHost,
+          listenPort: config.listenPort,
+          advertisedHost: config.advertisedHost,
+          beamPeriodMs: config.beamPeriodMs,
           socketKeepAlive: config.socketKeepAlive,
           socketKeepAliveInitialDelayMs: config.socketKeepAliveInitialDelayMs,
-          socketIdleTimeoutMs: config.socketIdleTimeoutMs
+          socketIdleTimeoutMs: config.socketIdleTimeoutMs,
+          interfaceAddress: config.interfaceAddress,
+          group: config.group,
+          bindAddress: config.bindAddress,
+          discoveryPort: config.port,
+          busMulticast: config.busMulticast,
+          busMulticastPort: config.busMulticastPort,
+          busMulticastRange: config.busMulticastRange
         });
         this.client = client;
         this.target = target;
         this.#wireClient(client);
 
-        await client.connect(target);
-        await waitForEvent(client, 'ready', config.timeout ?? 3000);
-        this.#startPresenceWatchdog(target, config);
+        if (config.tcpHub || config.listen !== false) {
+          await client.start(config);
+        }
+        if (target) {
+          await client.connect(target);
+          await waitForEvent(client, 'ready', config.timeout ?? 3000);
+          this.#startPresenceWatchdog(target, config);
+        }
 
         for (const bus of this.buses.values()) {
           await bus.rejoin(config.timeout ?? 3000);
@@ -1224,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 });
         }
@@ -1279,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);
         }
@@ -1331,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);
     }
@@ -1403,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 });
@@ -1415,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;
     }
@@ -1423,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;
       }
@@ -1495,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;
         }
@@ -1568,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 {
@@ -1577,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');
@@ -1779,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);
   }
@@ -1914,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/lib/values.js

@@ -1,5 +1,6 @@
 import { SenBinaryReader, SenBinaryWriter } from './codec.js';
 import { decodePropertyUpdateBuffer } from './bus.js';
+import { propertyHash } from './hash32.js';
 
 function numberOrBigInt(value) {
   return value <= BigInt(Number.MAX_SAFE_INTEGER) ? Number(value) : value;
@@ -323,6 +324,19 @@ export function encodeValue(value, typeName, typeRegistry) {
   return writer.toBuffer();
 }
 
+export function encodePropertyUpdateBuffer(updates = [], typeRegistry) {
+  const writer = new SenBinaryWriter();
+  for (const update of updates) {
+    writer.writeUInt32(update.id ?? propertyHash(update.name));
+    const value = update.valueBuffer
+      ? Buffer.from(update.valueBuffer)
+      : encodeValue(update.value, update.type, typeRegistry);
+    writer.writeUInt32(value.length);
+    writer.chunks.push(value);
+  }
+  return writer.toBuffer();
+}
+
 export function encodeArguments(values, argSpecs = [], typeRegistry) {
   if ((values?.length ?? 0) !== argSpecs.length) {
     throw new TypeError(`SEN method expects ${argSpecs.length} argument(s), got ${values?.length ?? 0}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sen-ether-client",
-  "version": "0.1.7",
+  "version": "0.2.1",
   "description": "Pure JavaScript SEN client for existing kernels over ether",
   "senCompatibility": {
     "kernelProtocolVersion": 9,
@@ -25,7 +25,7 @@
   "exports": "./index.js",
   "scripts": {
     "generate:protocol": "node ./scripts/generate-protocol.mjs",
-    "test": "node --test ./test/protocol.test.js ./test/codec.test.js ./test/discovery.test.js ./test/sen.test.js",
+    "test": "node --test --test-concurrency=1 --test-reporter spec ./test/protocol.test.js ./test/codec.test.js ./test/discovery.test.js ./test/client.test.js ./test/sen.test.js",
     "test:integration": "node --test ./test/integration-*.test.js"
   }
 }