@dxos/messaging 0.4.10-main.99ef736 → 0.4.10-main.fa5a270

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

@@ -125,7 +125,6 @@ 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}`);
@@ -310,7 +309,6 @@ export class SignalClient implements SignalMethods {
 
             this._reconnectTask!.schedule();
           },
-          getMetadata: this._getMetadata,
         },
       });
     } catch (err: any) {

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

@@ -30,7 +30,6 @@ export type SignalCallbacks = {
   onDisconnected?: () => void;
 
   onError?: (error: Error) => void;
-  getMetadata?: () => any;
 };
 
 export type SignalRPCClientParams = {
@@ -165,7 +164,6 @@ 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;
@@ -192,7 +190,6 @@ export class SignalRPCClient {
       author: author.asUint8Array(),
       recipient: recipient.asUint8Array(),
       payload,
-      metadata: this._callbacks?.getMetadata?.(),
     });
   }
 }

package/src/signal-manager/index.ts

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

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

@@ -42,10 +42,7 @@ export class WebsocketSignalManager implements SignalManager {
 
   private readonly _instanceId = PublicKey.random().toHex();
 
-  constructor(
-    private readonly _hosts: Runtime.Services.Signal[],
-    private readonly _getMetadata?: () => any,
-  ) {
+  constructor(private readonly _hosts: Runtime.Services.Signal[]) {
     log('Created WebsocketSignalManager', { hosts: this._hosts });
     for (const host of this._hosts) {
       if (this._servers.has(host.server)) {
@@ -55,7 +52,6 @@ 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()));
 

package/dist/types/src/signal-manager/utils.d.ts

@@ -1,7 +0,0 @@
-import { type DevicesService, type IdentityService } from '@dxos/protocols/proto/dxos/client/services';
-export declare const setIdentityTags: ({ identityService, devicesService, setTag, }: {
-    identityService: IdentityService;
-    devicesService: DevicesService;
-    setTag: (k: string, v: string) => void;
-}) => void;
-//# sourceMappingURL=utils.d.ts.map

package/dist/types/src/signal-manager/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/signal-manager/utils.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAGvG,eAAO,MAAM,eAAe;qBAKT,eAAe;oBAChB,cAAc;gBAClB,MAAM,KAAK,MAAM,KAAK,IAAI;UAyBvC,CAAC"}

package/src/signal-manager/utils.ts

@@ -1,42 +0,0 @@
-//
-// 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());
-  });
-};