@dxos/messaging 0.1.56-main.c787da3 → 0.1.56-main.e47dfd1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/messaging",
-  "version": "0.1.56-main.c787da3",
+  "version": "0.1.56-main.e47dfd1",
   "description": "Messaging",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -20,22 +20,22 @@
     "isomorphic-ws": "^4.0.1",
     "tiny-invariant": "^1.3.1",
     "ws": "^7.4.4",
-    "@dxos/async": "0.1.56-main.c787da3",
-    "@dxos/codec-protobuf": "0.1.56-main.c787da3",
-    "@dxos/context": "0.1.56-main.c787da3",
-    "@dxos/keys": "0.1.56-main.c787da3",
-    "@dxos/log": "0.1.56-main.c787da3",
-    "@dxos/node-std": "0.1.56-main.c787da3",
-    "@dxos/protocols": "0.1.56-main.c787da3",
-    "@dxos/rpc": "0.1.56-main.c787da3",
-    "@dxos/util": "0.1.56-main.c787da3"
+    "@dxos/async": "0.1.56-main.e47dfd1",
+    "@dxos/codec-protobuf": "0.1.56-main.e47dfd1",
+    "@dxos/context": "0.1.56-main.e47dfd1",
+    "@dxos/keys": "0.1.56-main.e47dfd1",
+    "@dxos/log": "0.1.56-main.e47dfd1",
+    "@dxos/node-std": "0.1.56-main.e47dfd1",
+    "@dxos/protocols": "0.1.56-main.e47dfd1",
+    "@dxos/rpc": "0.1.56-main.e47dfd1",
+    "@dxos/util": "0.1.56-main.e47dfd1"
   },
   "devDependencies": {
     "@types/node": "^18.11.9",
     "earljs": "~0.1.10",
     "typescript": "^5.0.4",
     "wait-for-expect": "^3.0.2",
-    "@dxos/signal": "0.1.56-main.c787da3"
+    "@dxos/signal": "0.1.56-main.e47dfd1"
   },
   "publishConfig": {
     "access": "public"

package/src/signal-manager/memory-signal-manager.ts

@@ -4,11 +4,12 @@
 
 import invariant from 'tiny-invariant';
 
-import { Event } from '@dxos/async';
+import { Event, Trigger } from '@dxos/async';
 import { Any } from '@dxos/codec-protobuf';
 import { Context } from '@dxos/context';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
+import { schema } from '@dxos/protocols';
 import { SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
 import { ComplexMap, ComplexSet } from '@dxos/util';
 
@@ -56,6 +57,9 @@ export class MemorySignalManager implements SignalManager {
 
   private _ctx!: Context;
 
+  // TODO(dmaretskyi): Replace with callback.
+  private readonly _freezeTrigger = new Trigger().wake();
+
   // prettier-ignore
   constructor(
     private readonly _context: MemorySignalManagerContext
@@ -154,16 +158,39 @@ export class MemorySignalManager implements SignalManager {
   }
 
   async sendMessage({ author, recipient, payload }: { author: PublicKey; recipient: PublicKey; payload: Any }) {
+    log('send message', { author, recipient, ...dec(payload) });
+
     invariant(recipient);
     invariant(!this._ctx.disposed, 'Closed');
-    if (!this._context.connections.has(recipient)) {
+
+    await this._freezeTrigger.wait();
+
+    const remote = this._context.connections.get(recipient);
+    if (!remote) {
       log.warn('recipient is not subscribed for messages', { author, recipient });
       return;
     }
 
-    if (!this._context.connections.get(recipient)?._ctx.disposed) {
-      this._context.connections.get(recipient)!.onMessage.emit({ author, recipient, payload });
+    if (remote._ctx.disposed) {
+      log.warn('recipient is disposed', { author, recipient });
+      return;
     }
+
+    remote._freezeTrigger
+      .wait()
+      .then(() => {
+        if (remote._ctx.disposed) {
+          log.warn('recipient is disposed', { author, recipient });
+          return;
+        }
+
+        log('receive message', { author, recipient, ...dec(payload) });
+
+        remote.onMessage.emit({ author, recipient, payload });
+      })
+      .catch((err) => {
+        log.error('error while waiting for freeze', { err });
+      });
   }
 
   async subscribeMessages(peerId: PublicKey) {
@@ -175,4 +202,25 @@ export class MemorySignalManager implements SignalManager {
     log('unsubscribing', { peerId });
     this._context.connections.delete(peerId);
   }
+
+  freeze() {
+    this._freezeTrigger.reset();
+  }
+
+  unfreeze() {
+    this._freezeTrigger.wake();
+  }
 }
+const dec = (payload: Any) => {
+  if (!payload.type_url.endsWith('ReliablePayload')) {
+    return {};
+  }
+
+  const relPayload = schema.getCodecForType('dxos.mesh.messaging.ReliablePayload').decode(payload.value);
+
+  if (typeof relPayload?.payload?.data === 'object') {
+    return { payload: Object.keys(relPayload?.payload?.data)[0], sessionId: relPayload?.payload?.sessionId };
+  }
+
+  return {};
+};