@dxos/messaging 0.4.9 → 0.4.10-main.068c3d8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/messaging",
-  "version": "0.4.9",
+  "version": "0.4.10-main.068c3d8",
   "description": "Messaging",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -19,23 +19,23 @@
   "dependencies": {
     "isomorphic-ws": "^4.0.1",
     "ws": "^8.14.2",
-    "@dxos/codec-protobuf": "0.4.9",
-    "@dxos/async": "0.4.9",
-    "@dxos/invariant": "0.4.9",
-    "@dxos/context": "0.4.9",
-    "@dxos/keys": "0.4.9",
-    "@dxos/node-std": "0.4.9",
-    "@dxos/rpc": "0.4.9",
-    "@dxos/log": "0.4.9",
-    "@dxos/protocols": "0.4.9",
-    "@dxos/util": "0.4.9"
+    "@dxos/async": "0.4.10-main.068c3d8",
+    "@dxos/context": "0.4.10-main.068c3d8",
+    "@dxos/invariant": "0.4.10-main.068c3d8",
+    "@dxos/codec-protobuf": "0.4.10-main.068c3d8",
+    "@dxos/keys": "0.4.10-main.068c3d8",
+    "@dxos/log": "0.4.10-main.068c3d8",
+    "@dxos/node-std": "0.4.10-main.068c3d8",
+    "@dxos/protocols": "0.4.10-main.068c3d8",
+    "@dxos/util": "0.4.10-main.068c3d8",
+    "@dxos/rpc": "0.4.10-main.068c3d8"
   },
   "devDependencies": {
     "@types/node": "^18.11.9",
     "earljs": "~0.1.10",
     "typescript": "^5.2.2",
     "wait-for-expect": "^3.0.2",
-    "@dxos/signal": "0.4.9"
+    "@dxos/signal": "0.4.10-main.068c3d8"
   },
   "publishConfig": {
     "access": "public"

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

@@ -125,6 +125,7 @@ export class SignalClient implements SignalMethods {
     private readonly _host: string,
     private readonly _onMessage: (params: { author: PublicKey; recipient: PublicKey; payload: Any }) => Promise<void>,
     private readonly _onSwarmEvent: (params: { topic: PublicKey; swarmEvent: SwarmEvent }) => Promise<void>,
+    private readonly _getMetadata?: () => any,
   ) {
     if (!this._host.startsWith('wss://') && !this._host.startsWith('ws://')) {
       throw new Error(`Signal server requires a websocket URL. Provided: ${this._host}`);
@@ -212,7 +213,6 @@ export class SignalClient implements SignalMethods {
   async leave({ topic, peerId }: { topic: PublicKey; peerId: PublicKey }): Promise<void> {
     this._performance.leaveCounter++;
     log('leaving', { topic, peerId });
-
     void this._swarmStreams.get({ topic, peerId })?.close();
     this._swarmStreams.delete({ topic, peerId });
     this._joinedTopics.delete({ topic, peerId });
@@ -309,6 +309,7 @@ export class SignalClient implements SignalMethods {
 
             this._reconnectTask!.schedule();
           },
+          getMetadata: this._getMetadata,
         },
       });
     } catch (err: any) {

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

@@ -30,6 +30,7 @@ export type SignalCallbacks = {
   onDisconnected?: () => void;
 
   onError?: (error: Error) => void;
+  getMetadata?: () => any;
 };
 
 export type SignalRPCClientParams = {
@@ -164,6 +165,7 @@ export class SignalRPCClient {
     const swarmStream = this._rpc.rpc.Signal.join({
       swarm: topic.asUint8Array(),
       peer: peerId.asUint8Array(),
+      metadata: this._callbacks?.getMetadata?.(),
     });
     await swarmStream.waitUntilReady();
     return swarmStream;
@@ -190,6 +192,7 @@ export class SignalRPCClient {
       author: author.asUint8Array(),
       recipient: recipient.asUint8Array(),
       payload,
+      metadata: this._callbacks?.getMetadata?.(),
     });
   }
 }

package/src/signal-manager/index.ts

@@ -5,3 +5,4 @@
 export * from './memory-signal-manager';
 export * from './signal-manager';
 export * from './websocket-signal-manager';
+export * from './utils';

package/src/signal-manager/utils.ts

@@ -0,0 +1,42 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { invariant } from '@dxos/invariant';
+import { log } from '@dxos/log';
+import { type DevicesService, type IdentityService } from '@dxos/protocols/proto/dxos/client/services';
+import { DeviceKind } from '@dxos/protocols/proto/dxos/client/services';
+
+export const setIdentityTags = ({
+  identityService,
+  devicesService,
+  setTag,
+}: {
+  identityService: IdentityService;
+  devicesService: DevicesService;
+  setTag: (k: string, v: string) => void;
+}) => {
+  identityService.queryIdentity().subscribe((idqr) => {
+    if (!idqr?.identity?.identityKey) {
+      log('empty response from identity service', { idqr });
+      return;
+    }
+
+    setTag('identityKey', idqr.identity.identityKey.truncate());
+  });
+
+  devicesService.queryDevices().subscribe((dqr) => {
+    if (!dqr || !dqr.devices || dqr.devices.length === 0) {
+      log('empty response from device service', { device: dqr });
+      return;
+    }
+    invariant(dqr, 'empty response from device service');
+
+    const thisDevice = dqr.devices.find((device) => device.kind === DeviceKind.CURRENT);
+    if (!thisDevice) {
+      log('no current device', { device: dqr });
+      return;
+    }
+    setTag('deviceKey', thisDevice.deviceKey.truncate());
+  });
+};

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

@@ -42,7 +42,10 @@ export class WebsocketSignalManager implements SignalManager {
 
   private readonly _instanceId = PublicKey.random().toHex();
 
-  constructor(private readonly _hosts: Runtime.Services.Signal[]) {
+  constructor(
+    private readonly _hosts: Runtime.Services.Signal[],
+    private readonly _getMetadata?: () => any,
+  ) {
     log('Created WebsocketSignalManager', { hosts: this._hosts });
     for (const host of this._hosts) {
       if (this._servers.has(host.server)) {
@@ -52,6 +55,7 @@ export class WebsocketSignalManager implements SignalManager {
         host.server,
         async (message) => this.onMessage.emit(message),
         async (data) => this.swarmEvent.emit(data),
+        this._getMetadata,
       );
       server.statusChanged.on(() => this.statusChanged.emit(this.getStatus()));