sen-ether-client 0.2.2 → 0.2.4

package/lib/client.js

@@ -1501,7 +1501,27 @@ export class EtherClient extends EventEmitter {
       const busMessage = decodeBusMessage(frame.message);
       this.emit('busFrame', { ...frame, busMessage, remote, multicast: true });
       if (busMessage.categoryName === 'controlMessage') {
-        this.emit('busControlMessage', { ...frame, control: busMessage.control, remote, multicast: true });
+        const control = busMessage.control;
+        this.emit('busControlMessage', { ...frame, control, remote, multicast: true });
+        switch (control.type) {
+          case 'ObjectsPublished':
+            this.emit('objectsPublished', { bus: busState, remote, multicast: true, ...control.value });
+            break;
+          case 'ObjectsRemoved':
+            this.emit('objectsRemoved', { bus: busState, remote, multicast: true, ...control.value });
+            break;
+          case 'ObjectsStateResponse':
+            this.emit('objectsStateResponse', { bus: busState, remote, multicast: true, ...control.value });
+            break;
+          case 'TypesInfoResponse':
+            this.emit('typesInfoResponse', { bus: busState, remote, multicast: true, ...control.value });
+            break;
+          case 'TypesInfoRejection':
+            this.emit('typesInfoRejection', { bus: busState, remote, multicast: true, ...control.value });
+            break;
+          default:
+            break;
+        }
         return;
       }
       this.emit(busMessage.categoryName, { ...frame, ...busMessage, remote, multicast: true });

package/lib/sen.js

@@ -657,7 +657,8 @@ export class Sen extends EventEmitter {
       await session.connect({
         ...baseConfig,
         session: sessionName,
-        target
+        target,
+        rediscoverTargetOnReconnect: true
       });
     } catch (error) {
       this.sessions.delete(sessionName);
@@ -921,6 +922,9 @@ export class Sen extends EventEmitter {
   }
 
   async #reconnectTarget(options) {
+    if (options.rediscoverTargetOnReconnect) {
+      return await this.#discoverTarget({ ...options, target: undefined });
+    }
     if (options.tcpHub || !options.target) {
       return await this.#discoverTarget(options);
     }
@@ -1229,6 +1233,7 @@ export class SenBus extends EventEmitter {
     this.id = id;
     this.objectsById = new Map();
     this.typeRegistry = new Map();
+    this.typeRegistryByHash = new Map();
     this.requestedTypeHashes = new Set();
     this.stateRequestedObjectIds = new Set();
     this.stateResyncTimers = new Set();
@@ -1236,6 +1241,7 @@ export class SenBus extends EventEmitter {
     this.interests = new Map();
     this.pendingCalls = new Map();
     this.nextTicketId = 1;
+    this.reconnectPrepared = false;
   }
 
   startInterest(query, options = {}) {
@@ -1278,24 +1284,31 @@ export class SenBus extends EventEmitter {
   }
 
   prepareReconnect() {
+    if (this.reconnectPrepared) {
+      return;
+    }
+    this.reconnectPrepared = true;
+    const detail = { reason: 'reconnect' };
     for (const call of this.pendingCalls.values()) {
       clearTimeout(call.timeout);
       call.reject(new Error('SEN connection closed before method response'));
     }
     this.pendingCalls.clear();
-    for (const object of this.objectsById.values()) {
+    for (const object of [...this.objectsById.values()]) {
       object.stale = true;
-      object.emit('stale');
+      object.emit('stale', detail);
+      this.#removeObjectFromAllInterests(object, detail);
     }
     this.objectsById.clear();
     this.typeRegistry.clear();
+    this.typeRegistryByHash.clear();
     this.requestedTypeHashes.clear();
     this.stateRequestedObjectIds.clear();
     this.#clearStateResyncTimers();
     for (const interest of this.interests.values()) {
       interest.closeLocal();
       interest.objectsById.clear();
-      interest.emit('stale');
+      interest.emit('stale', detail);
     }
   }
 
@@ -1306,6 +1319,7 @@ export class SenBus extends EventEmitter {
     });
     const joined = await this.sen.client.joinBus(this.name);
     this.id = joined.busId;
+    this.reconnectPrepared = false;
     const participantReadyTimeoutMs = Math.min(timeoutMs, this.sen.options.participantReadyTimeoutMs ?? 1000);
     await waitForEvent(this.sen.client, 'busParticipantReady', participantReadyTimeoutMs).catch(error => {
       this.sen.emit('warning', error);
@@ -1362,9 +1376,7 @@ export class SenBus extends EventEmitter {
         }
         this.#attachKnownType(object);
         interest?.objectsById.set(object.key, object);
-        if (info.state?.length) {
-          object.applyState(info.state, 'published', info.time, { interestId: discovery.interestId });
-        }
+        object.applyState(info.state?.length ? info.state : Buffer.alloc(0), 'state', info.time, { interestId: discovery.interestId });
         if (!this.requestedTypeHashes.has(info.typeHash)) {
           this.requestedTypeHashes.add(info.typeHash);
           newTypeHashes.add(info.typeHash);
@@ -1499,6 +1511,7 @@ export class SenBus extends EventEmitter {
     for (const type of event.types ?? []) {
       this.typeRegistry.set(type.spec.qualifiedName, type.spec);
       if (type.classHash !== undefined) {
+        this.typeRegistryByHash.set(type.classHash >>> 0, type.spec);
         for (const object of this.objectsById.values()) {
           if (object.typeHash === type.classHash) {
             object.spec = type.spec;
@@ -1699,6 +1712,12 @@ export class SenBus extends EventEmitter {
     if (object.spec) {
       return;
     }
+    const specByHash = this.typeRegistryByHash.get(object.typeHash >>> 0);
+    if (specByHash) {
+      object.spec = specByHash;
+      object.emit('type', specByHash);
+      return;
+    }
     for (const spec of this.typeRegistry.values()) {
       const hash = crc32(spec?.qualifiedName ?? spec?.name ?? '');
       if (hash === object.typeHash) {

package/package.json

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