@dxos/messaging 0.9.1-main.c7dcc2e112 → 0.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/messaging",
-  "version": "0.9.1-main.c7dcc2e112",
+  "version": "0.10.0",
   "description": "Messaging",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -33,23 +33,24 @@
   "dependencies": {
     "isomorphic-ws": "^5.0.0",
     "ws": "^8.17.1",
-    "@dxos/async": "0.9.1-main.c7dcc2e112",
-    "@dxos/context": "0.9.1-main.c7dcc2e112",
-    "@dxos/edge-client": "0.9.1-main.c7dcc2e112",
-    "@dxos/invariant": "0.9.1-main.c7dcc2e112",
-    "@dxos/log": "0.9.1-main.c7dcc2e112",
-    "@dxos/rpc": "0.9.1-main.c7dcc2e112",
-    "@dxos/node-std": "0.9.1-main.c7dcc2e112",
-    "@dxos/keys": "0.9.1-main.c7dcc2e112",
-    "@dxos/tracing": "0.9.1-main.c7dcc2e112",
-    "@dxos/util": "0.9.1-main.c7dcc2e112",
-    "@dxos/protocols": "0.9.1-main.c7dcc2e112",
-    "@dxos/codec-protobuf": "0.9.1-main.c7dcc2e112"
+    "@dxos/async": "0.10.0",
+    "@dxos/codec-protobuf": "0.10.0",
+    "@dxos/context": "0.10.0",
+    "@dxos/credentials": "0.10.0",
+    "@dxos/invariant": "0.10.0",
+    "@dxos/keys": "0.10.0",
+    "@dxos/log": "0.10.0",
+    "@dxos/edge-client": "0.10.0",
+    "@dxos/node-std": "0.10.0",
+    "@dxos/rpc": "0.10.0",
+    "@dxos/protocols": "0.10.0",
+    "@dxos/tracing": "0.10.0",
+    "@dxos/util": "0.10.0"
   },
   "devDependencies": {
-    "@dxos/keyring": "0.9.1-main.c7dcc2e112",
-    "@dxos/signal": "0.9.1-main.c7dcc2e112",
-    "@dxos/test-utils": "0.9.1-main.c7dcc2e112"
+    "@dxos/signal": "0.10.0",
+    "@dxos/keyring": "0.10.0",
+    "@dxos/test-utils": "0.10.0"
   },
   "publishConfig": {
     "access": "public"

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

@@ -18,8 +18,8 @@ import { SignalClient } from './signal-client';
 
 const PAYLOAD: TaggedType<TYPES, 'google.protobuf.Any'> = {
   '@type': 'google.protobuf.Any',
-  type_url: 'google.protobuf.Any',
-  value: Buffer.from('1'),
+  'type_url': 'google.protobuf.Any',
+  'value': Buffer.from('1'),
 };
 
 describe('SignalClient', () => {

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

@@ -2,6 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
+// DX-1059: this client is already DID-only — it never writes the deprecated `identity_key`
+// (proto field 2). The dual-read fallback that still gates removing that field lives on the
+// edge side (which relays peers from not-yet-migrated senders); nothing here needs it.
+
 import { Event, scheduleMicroTask } from '@dxos/async';
 import { type Context, Resource, cancelWithContext } from '@dxos/context';
 import { type EdgeConnection, EdgeIdentityChangedError, protocol } from '@dxos/edge-client';
@@ -66,11 +70,13 @@ export class EdgeSignalManager extends Resource implements SignalManager {
         peer,
         expected: {
           peerKey: this._edgeConnection.peerKey,
-          identityKey: this._edgeConnection.identityKey,
+          identityDid: this._edgeConnection.identityDid,
         },
       });
 
-      peer.identityKey = this._edgeConnection.identityKey;
+      // DX-1059: advertise only the identity DID; the client no longer sends the hex `identityKey`
+      // (edge derives the connection's identity from auth, not from this message body).
+      peer.identityDid = this._edgeConnection.identityDid;
       peer.peerKey = this._edgeConnection.peerKey;
     }
 
@@ -118,7 +124,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
         serviceId: EdgeService.SWARM,
         source: createMessageSource(topic, {
           peerKey: this._edgeConnection.peerKey,
-          identityKey: this._edgeConnection.identityKey,
+          identityDid: this._edgeConnection.identityDid,
         }),
         payload: { action: SwarmRequestAction.INFO, swarmKeys: [topic.toHex()] },
       }),
@@ -132,7 +138,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
       // NOTE: Could only join swarm with the same peer info as the edge connection.
       log.warn('ignoring author on send request', {
         author: message.author,
-        expected: { peerKey: this._edgeConnection.peerKey, identityKey: this._edgeConnection.identityKey },
+        expected: { peerKey: this._edgeConnection.peerKey, identityDid: this._edgeConnection.identityDid },
       });
     }
 
@@ -223,8 +229,8 @@ export class EdgeSignalManager extends Resource implements SignalManager {
   }
 
   private _matchSelfPeerInfo(peer: PeerInfo): boolean {
-    return (
-      peer && (peer.peerKey === this._edgeConnection.peerKey || peer.identityKey === this._edgeConnection.identityKey)
+    return Boolean(
+      peer && (peer.peerKey === this._edgeConnection.peerKey || peer.identityDid === this._edgeConnection.identityDid),
     );
   }
 
@@ -235,7 +241,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
         topic,
         peer: {
           peerKey: this._edgeConnection.peerKey,
-          identityKey: this._edgeConnection.identityKey,
+          identityDid: this._edgeConnection.identityDid,
           state: lastState,
         },
       });

package/src/testing/test-messages.ts

@@ -7,18 +7,18 @@ import { type TYPES } from '@dxos/protocols/proto';
 
 export const PAYLOAD_1: TaggedType<TYPES, 'google.protobuf.Any'> = {
   '@type': 'google.protobuf.Any',
-  type_url: 'dxos.Example1',
-  value: Buffer.from('1'),
+  'type_url': 'dxos.Example1',
+  'value': Buffer.from('1'),
 };
 
 export const PAYLOAD_2: TaggedType<TYPES, 'google.protobuf.Any'> = {
   '@type': 'google.protobuf.Any',
-  type_url: 'dxos.Example2',
-  value: Buffer.from('2'),
+  'type_url': 'dxos.Example2',
+  'value': Buffer.from('2'),
 };
 
 export const PAYLOAD_3: TaggedType<TYPES, 'google.protobuf.Any'> = {
   '@type': 'google.protobuf.Any',
-  type_url: 'dxos.Example3',
-  value: Buffer.from('3'),
+  'type_url': 'dxos.Example3',
+  'value': Buffer.from('3'),
 };

package/src/testing/test-peer.ts

@@ -4,8 +4,10 @@
 
 import { Event } from '@dxos/async';
 import { Resource } from '@dxos/context';
+import { createDidFromIdentityKey } from '@dxos/credentials';
 import { PeerSchema } from '@dxos/edge-client';
-import { PublicKey } from '@dxos/keys';
+import { invariant } from '@dxos/invariant';
+import { type IdentityDid, PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { buf } from '@dxos/protocols/buf';
 
@@ -16,17 +18,25 @@ import { type TestBuilder } from './test-builder';
 import { expectPeerAvailable, expectPeerLeft, expectReceivedMessage } from './utils';
 
 export class TestPeer extends Resource {
-  public peerId = PublicKey.random();
+  /**
+   * Undefined until `_open()`: a `createSignalManager` factory (e.g. edge's) may install its own
+   * signer-backed key, otherwise a random one is generated. Read via {@link peerInfo} after opening.
+   */
+  public peerId?: PublicKey;
   public signalManager!: SignalManager;
   public messenger!: Messenger;
   public defaultReceived = new Event<Message>();
 
+  /** DID derived from {@link peerId} in `_open()`, mirroring `createDeviceEdgeIdentity`. */
+  private _identityDid?: IdentityDid;
+
   constructor(private readonly testBuilder: TestBuilder) {
     super();
   }
 
   get peerInfo(): PeerInfo {
-    return buf.create(PeerSchema, { peerKey: this.peerId.toHex(), identityKey: this.peerId.toHex() });
+    invariant(this.peerId && this._identityDid, 'TestPeer not open');
+    return buf.create(PeerSchema, { peerKey: this.peerId.toHex(), identityDid: this._identityDid });
   }
 
   async waitTillReceive(message: Message): Promise<Message> {
@@ -42,7 +52,11 @@ export class TestPeer extends Resource {
   }
 
   protected override async _open(): Promise<void> {
+    // `createSignalManager` (e.g. edge's factory) may populate `peerId` with its own signer-backed
+    // key; otherwise fall back to a random one. Derive the DID only after `peerId` is settled.
     this.signalManager = await this.testBuilder.createSignalManager(this);
+    this.peerId ??= PublicKey.random();
+    this._identityDid = await createDidFromIdentityKey(this.peerId);
     this.messenger = new Messenger({ signalManager: this.signalManager, retryDelay: 300 });
 
     await this.signalManager.open();