@dxos/messaging 0.1.56-main.c19b7cd → 0.1.56-main.c277f68

package/dist/lib/node/index.cjs

@@ -210,7 +210,7 @@ var Messenger = class {
   async listen({ peerId, payloadType, onMessage }) {
     (0, import_invariant.invariant)(!this._closed, "Closed", {
       F: __dxlog_file,
-      L: 150,
+      L: 149,
       S: this,
       A: [
         "!this._closed",
@@ -274,7 +274,7 @@ var Messenger = class {
   async _handleReliablePayload({ author, recipient, payload }) {
     (0, import_invariant.invariant)(payload.type_url === "dxos.mesh.messaging.ReliablePayload", void 0, {
       F: __dxlog_file,
-      L: 211,
+      L: 210,
       S: this,
       A: [
         "payload.type_url === 'dxos.mesh.messaging.ReliablePayload'",
@@ -288,7 +288,7 @@ var Messenger = class {
       messageId: reliablePayload.messageId
     }, {
       F: __dxlog_file,
-      L: 214,
+      L: 213,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -308,17 +308,16 @@ var Messenger = class {
     });
   }
   async _handleAcknowledgement({ payload }) {
-    var _a;
     (0, import_invariant.invariant)(payload.type_url === "dxos.mesh.messaging.Acknowledgement", void 0, {
       F: __dxlog_file,
-      L: 236,
+      L: 235,
       S: this,
       A: [
         "payload.type_url === 'dxos.mesh.messaging.Acknowledgement'",
         ""
       ]
     });
-    (_a = this._onAckCallbacks.get(Acknowledgement.decode(payload.value).messageId)) == null ? void 0 : _a();
+    this._onAckCallbacks.get(Acknowledgement.decode(payload.value).messageId)?.();
   }
   async _sendAcknowledgement({ author, recipient, messageId }) {
     (0, import_log.log)("sending ACK", {
@@ -327,7 +326,7 @@ var Messenger = class {
       to: author
     }, {
       F: __dxlog_file,
-      L: 249,
+      L: 248,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -436,7 +435,6 @@ var SignalRPCClient = class {
       }
     });
     this._socket.onopen = async () => {
-      var _a, _b, _c, _d;
       try {
         await this._rpc.open();
         (0, import_log2.log)(`RPC open ${this._url}`, void 0, {
@@ -445,32 +443,30 @@ var SignalRPCClient = class {
           S: this,
           C: (f, a) => f(...a)
         });
-        (_b = (_a = this._callbacks).onConnected) == null ? void 0 : _b.call(_a);
+        this._callbacks.onConnected?.();
         this._connectTrigger.wake();
       } catch (err) {
-        (_d = (_c = this._callbacks).onError) == null ? void 0 : _d.call(_c, err);
+        this._callbacks.onError?.(err);
       }
     };
     this._socket.onclose = async () => {
-      var _a, _b;
       (0, import_log2.log)(`Disconnected ${this._url}`, void 0, {
         F: __dxlog_file2,
         L: 98,
         S: this,
         C: (f, a) => f(...a)
       });
-      (_b = (_a = this._callbacks).onDisconnected) == null ? void 0 : _b.call(_a);
+      this._callbacks.onDisconnected?.();
       await this.close();
     };
     this._socket.onerror = async (event) => {
-      var _a, _b, _c, _d, _e;
       if (this._closed) {
         return;
       }
-      (_c = (_b = this._callbacks).onError) == null ? void 0 : _c.call(_b, (_a = event.error) != null ? _a : new Error(event.message));
+      this._callbacks.onError?.(event.error ?? new Error(event.message));
       this._connectTrigger.reset();
       try {
-        await ((_d = this._rpc) == null ? void 0 : _d.close());
+        await this._rpc?.close();
       } catch (err) {
         import_log2.log.catch(err, void 0, {
           F: __dxlog_file2,
@@ -480,7 +476,7 @@ var SignalRPCClient = class {
         });
       }
       this._closed = true;
-      import_log2.log.warn((_e = event.message) != null ? _e : "Socket error", {
+      import_log2.log.warn(event.message ?? "Socket error", {
         url: this._url
       }, {
         F: __dxlog_file2,
@@ -499,11 +495,10 @@ var SignalRPCClient = class {
     });
   }
   async close() {
-    var _a, _b;
     this._closed = true;
     try {
-      await ((_a = this._rpc) == null ? void 0 : _a.close());
-      (_b = this._socket) == null ? void 0 : _b.close();
+      await this._rpc?.close();
+      this._socket?.close();
     } catch (err) {
       import_log2.log.warn("close error", err, {
         F: __dxlog_file2,
@@ -638,8 +633,8 @@ var SignalClient = class {
     this._onSwarmEvent = _onSwarmEvent;
     this._state = import_signal.SignalState.CLOSED;
     this._reconnectAfter = DEFAULT_RECONNECT_TIMEOUT;
-    this._connectionStarted = new Date();
-    this._lastStateChange = new Date();
+    this._connectionStarted = /* @__PURE__ */ new Date();
+    this._lastStateChange = /* @__PURE__ */ new Date();
     this._clientReady = new import_async3.Trigger();
     this.statusChanged = new import_async3.Event();
     this.commandTrace = new import_async3.Event();
@@ -677,8 +672,7 @@ var SignalClient = class {
     }
     this._ctx = new import_context2.Context({
       onError: (err) => {
-        var _a;
-        if (this._state === import_signal.SignalState.CLOSED || ((_a = this._ctx) == null ? void 0 : _a.disposed)) {
+        if (this._state === import_signal.SignalState.CLOSED || this._ctx?.disposed) {
           return;
         }
         if (this._state === import_signal.SignalState.CONNECTED) {
@@ -717,7 +711,6 @@ var SignalClient = class {
     });
   }
   async close() {
-    var _a, _b;
     (0, import_log3.log)("closing...", void 0, {
       F: __dxlog_file3,
       L: 180,
@@ -729,9 +722,9 @@ var SignalClient = class {
     ].includes(this._state)) {
       return;
     }
-    await ((_a = this._ctx) == null ? void 0 : _a.dispose());
+    await this._ctx?.dispose();
     this._clientReady.reset();
-    await ((_b = this._client) == null ? void 0 : _b.close());
+    await this._client?.close();
     this._client = void 0;
     this._setState(import_signal.SignalState.CLOSED);
     (0, import_log3.log)("closed", void 0, {
@@ -742,11 +735,10 @@ var SignalClient = class {
     });
   }
   getStatus() {
-    var _a;
     return {
       host: this._host,
       state: this._state,
-      error: (_a = this._lastError) == null ? void 0 : _a.message,
+      error: this._lastError?.message,
       reconnectIn: this._reconnectAfter,
       connectionStarted: this._connectionStarted,
       lastStateChange: this._lastStateChange
@@ -770,7 +762,6 @@ var SignalClient = class {
     this._reconcileTask.schedule();
   }
   async leave({ topic, peerId }) {
-    var _a;
     this._performance.leaveCounter++;
     (0, import_log3.log)("leaving", {
       topic,
@@ -781,10 +772,10 @@ var SignalClient = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    (_a = this._swarmStreams.get({
+    this._swarmStreams.get({
       topic,
       peerId
-    })) == null ? void 0 : _a.close();
+    })?.close();
     this._swarmStreams.delete({
       topic,
       peerId
@@ -823,7 +814,6 @@ var SignalClient = class {
     this._reconcileTask.schedule();
   }
   async unsubscribeMessages(peerId) {
-    var _a;
     (0, import_log3.log)("unsubscribing from messages", {
       peerId
     }, {
@@ -835,7 +825,7 @@ var SignalClient = class {
     this._subscribedMessages.delete({
       peerId
     });
-    (_a = this._messageStreams.get(peerId)) == null ? void 0 : _a.close();
+    this._messageStreams.get(peerId)?.close();
     this._messageStreams.delete(peerId);
   }
   _scheduleReconcileAfterError() {
@@ -845,7 +835,7 @@ var SignalClient = class {
   }
   _setState(newState) {
     this._state = newState;
-    this._lastStateChange = new Date();
+    this._lastStateChange = /* @__PURE__ */ new Date();
     (0, import_log3.log)("signal state changed", {
       status: this.getStatus()
     }, {
@@ -875,17 +865,17 @@ var SignalClient = class {
         "'Client already created'"
       ]
     });
-    this._connectionStarted = new Date();
+    this._connectionStarted = /* @__PURE__ */ new Date();
     this._connectionCtx = this._ctx.derive();
-    this._connectionCtx.onDispose(() => {
+    this._connectionCtx.onDispose(async () => {
       (0, import_log3.log)("connection context disposed", void 0, {
         F: __dxlog_file3,
         L: 267,
         S: this,
         C: (f, a) => f(...a)
       });
-      Array.from(this._swarmStreams.values()).forEach((stream) => stream.close());
-      Array.from(this._messageStreams.values()).forEach((stream) => stream.close());
+      await Promise.all(Array.from(this._swarmStreams.values()).map((stream) => stream.close()));
+      await Promise.all(Array.from(this._messageStreams.values()).map((stream) => stream.close()));
       this._swarmStreams.clear();
       this._messageStreams.clear();
     });
@@ -958,7 +948,6 @@ var SignalClient = class {
     this._reconnectAfter = Math.min(this._reconnectAfter, MAX_RECONNECT_TIMEOUT);
   }
   async _reconnect() {
-    var _a, _b;
     (0, import_log3.log)(`reconnecting in ${this._reconnectAfter}ms`, {
       state: this._state
     }, {
@@ -981,8 +970,8 @@ var SignalClient = class {
       return;
     }
     this._clientReady.reset();
-    await ((_a = this._connectionCtx) == null ? void 0 : _a.dispose());
-    (_b = this._client) == null ? void 0 : _b.close().catch(() => {
+    await this._connectionCtx?.dispose();
+    this._client?.close().catch(() => {
     });
     this._client = void 0;
     await (0, import_context2.cancelWithContext)(this._ctx, (0, import_async3.sleep)(this._reconnectAfter));
@@ -990,7 +979,6 @@ var SignalClient = class {
     this._createClient();
   }
   async _reconcileSwarmSubscriptions() {
-    var _a;
     await (0, import_async3.asyncTimeout)((0, import_context2.cancelWithContext)(this._connectionCtx, this._clientReady.wait()), 5e3);
     const client = this._client;
     (0, import_invariant3.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
@@ -1009,10 +997,10 @@ var SignalClient = class {
       })) {
         continue;
       }
-      (_a = this._swarmStreams.get({
+      this._swarmStreams.get({
         topic,
         peerId
-      })) == null ? void 0 : _a.close();
+      })?.close();
       this._swarmStreams.delete({
         topic,
         peerId
@@ -1050,7 +1038,6 @@ var SignalClient = class {
     }
   }
   async _reconcileMessageSubscriptions() {
-    var _a;
     await (0, import_async3.asyncTimeout)((0, import_context2.cancelWithContext)(this._connectionCtx, this._clientReady.wait()), 5e3);
     const client = this._client;
     (0, import_invariant3.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
@@ -1068,7 +1055,7 @@ var SignalClient = class {
       })) {
         continue;
       }
-      (_a = this._messageStreams.get(peerId)) == null ? void 0 : _a.close();
+      this._messageStreams.get(peerId)?.close();
       this._messageStreams.delete(peerId);
     }
     for (const { peerId } of this._subscribedMessages.values()) {
@@ -1170,7 +1157,7 @@ var MemorySignalManager = class {
       swarmEvent: {
         peerAvailable: {
           peer: peerId.asUint8Array(),
-          since: new Date()
+          since: /* @__PURE__ */ new Date()
         }
       }
     });
@@ -1181,7 +1168,7 @@ var MemorySignalManager = class {
           swarmEvent: {
             peerAvailable: {
               peer: peerId2.asUint8Array(),
-              since: new Date()
+              since: /* @__PURE__ */ new Date()
             }
           }
         });
@@ -1340,15 +1327,14 @@ var MemorySignalManager = class {
   }
 };
 var dec = (payload) => {
-  var _a, _b, _c;
   if (!payload.type_url.endsWith("ReliablePayload")) {
     return {};
   }
   const relPayload = import_protocols4.schema.getCodecForType("dxos.mesh.messaging.ReliablePayload").decode(payload.value);
-  if (typeof ((_a = relPayload == null ? void 0 : relPayload.payload) == null ? void 0 : _a.data) === "object") {
+  if (typeof relPayload?.payload?.data === "object") {
     return {
-      payload: Object.keys((_b = relPayload == null ? void 0 : relPayload.payload) == null ? void 0 : _b.data)[0],
-      sessionId: (_c = relPayload == null ? void 0 : relPayload.payload) == null ? void 0 : _c.sessionId
+      payload: Object.keys(relPayload?.payload?.data)[0],
+      sessionId: relPayload?.payload?.sessionId
     };
   }
   return {};