@dxos/messaging 0.1.56-main.f3d4052 → 0.1.56-next.71eb10c

package/src/signal-client/signal-client.ts

@@ -2,11 +2,10 @@
 // Copyright 2020 DXOS.org
 //
 
-import invariant from 'tiny-invariant';
-
 import { DeferredTask, Event, Trigger, asyncTimeout, scheduleTask, scheduleTaskInterval, sleep } from '@dxos/async';
 import { Any, Stream } from '@dxos/codec-protobuf';
 import { Context, cancelWithContext } from '@dxos/context';
+import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { trace } from '@dxos/protocols';
@@ -264,10 +263,10 @@ export class SignalClient implements SignalMethods {
 
     // Create new context for each connection.
     this._connectionCtx = this._ctx!.derive();
-    this._connectionCtx.onDispose(() => {
+    this._connectionCtx.onDispose(async () => {
       log('connection context disposed');
-      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();
     });

package/src/signal-client/signal-rpc-client.ts

@@ -3,10 +3,10 @@
 //
 
 import WebSocket from 'isomorphic-ws';
-import invariant from 'tiny-invariant';
 
 import { Trigger } from '@dxos/async';
 import { Any, Stream } from '@dxos/codec-protobuf';
+import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { schema, trace } from '@dxos/protocols';

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

@@ -2,13 +2,13 @@
 // Copyright 2020 DXOS.org
 //
 
-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 { invariant } from '@dxos/invariant';
 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 +56,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 +157,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 +201,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 {};
+};

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

@@ -2,11 +2,10 @@
 // Copyright 2020 DXOS.org
 //
 
-import invariant from 'tiny-invariant';
-
 import { Event, synchronized } from '@dxos/async';
 import { Any } from '@dxos/codec-protobuf';
 import { Context } from '@dxos/context';
+import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { trace } from '@dxos/protocols';