@dxos/edge-client 0.9.1-main.c7dcc2e112 → 0.10.0

package/dist/lib/neutral/index.mjs

@@ -16,14 +16,14 @@ import "./chunk-J5LGTIGS.mjs";
 export * from "@dxos/protocols/buf/dxos/edge/messenger_pb";
 
 // src/auth.ts
-import { createCredential, signPresentation } from "@dxos/credentials";
+import { createCredential, createDidFromIdentityKey, signPresentation } from "@dxos/credentials";
 import { invariant } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
-import { PublicKey } from "@dxos/keys";
+import { IdentityDid, PublicKey } from "@dxos/keys";
 var __dxlog_file = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/auth.ts";
 var createDeviceEdgeIdentity = async (signer, key) => {
   return {
-    identityKey: key.toHex(),
+    identityDid: await createDidFromIdentityKey(key),
     peerKey: key.toHex(),
     presentCredentials: async ({ challenge }) => {
       return signPresentation({
@@ -61,7 +61,7 @@ var createChainEdgeIdentity = async (signer, identityKey, peerKey, chain, creden
     })
   ];
   return {
-    identityKey: identityKey.toHex(),
+    identityDid: await createDidFromIdentityKey(identityKey),
     peerKey: peerKey.toHex(),
     presentCredentials: async ({ challenge }) => {
       invariant(chain, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 56, S: void 0, A: ["chain", ""] });
@@ -107,10 +107,10 @@ var createTestHaloEdgeIdentity = async (signer, identityKey, deviceKey) => {
   ]);
 };
 var createStubEdgeIdentity = () => {
-  const identityKey = PublicKey.random();
   const deviceKey = PublicKey.random();
   return {
-    identityKey: identityKey.toHex(),
+    // Random placeholder DID — the stub never authenticates or connects; a real identity replaces it.
+    identityDid: IdentityDid.random(),
     peerKey: deviceKey.toHex(),
     presentCredentials: async () => {
       throw new Error("Stub identity does not support authentication.");
@@ -185,7 +185,7 @@ var EdgeWsConnection = class extends Resource {
   get info() {
     return {
       open: this.isOpen,
-      identity: this._identity.identityKey,
+      identity: this._identity.identityDid,
       device: this._identity.peerKey
     };
   }
@@ -460,7 +460,7 @@ var EdgeClient = class extends Resource2 {
     return {
       open: this.isOpen,
       status: this.status,
-      identity: this._identity.identityKey,
+      identity: this._identity.identityDid,
       device: this._identity.peerKey
     };
   }
@@ -475,14 +475,14 @@ var EdgeClient = class extends Resource2 {
       messagesReceived: this._currentConnection?.messagesReceived ?? 0
     };
   }
-  get identityKey() {
-    return this._identity.identityKey;
+  get identityDid() {
+    return this._identity.identityDid;
   }
   get peerKey() {
     return this._identity.peerKey;
   }
   setIdentity(identity) {
-    if (identity.identityKey !== this._identity.identityKey || identity.peerKey !== this._identity.peerKey) {
+    if (identity.identityDid !== this._identity.identityDid || identity.peerKey !== this._identity.peerKey) {
       log2("Edge identity changed", {
         identity,
         oldIdentity: this._identity
@@ -506,7 +506,7 @@ var EdgeClient = class extends Resource2 {
     if (!this._currentConnection) {
       throw new EdgeConnectionClosedError();
     }
-    if (message.source && (message.source.peerKey !== this._identity.peerKey || message.source.identityKey !== this.identityKey)) {
+    if (message.source && (message.source.peerKey !== this._identity.peerKey || message.source.identityDid !== this.identityDid)) {
       throw new EdgeIdentityChangedError();
     }
     const traceCtx = ctx.getAttribute(TRACE_SPAN_ATTRIBUTE);
@@ -531,7 +531,7 @@ var EdgeClient = class extends Resource2 {
           try {
             listener();
           } catch (error) {
-            log2.catch(error, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 123, S: this });
+            log2.catch(error, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 124, S: this });
           }
         }
       });
@@ -544,11 +544,11 @@ var EdgeClient = class extends Resource2 {
   async _open() {
     log2("opening...", {
       info: this.info
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 133, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 134, S: this });
     this._persistentLifecycle.open().catch((err) => {
       log2.warn("Error while opening connection", {
         err
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 137, S: this });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 138, S: this });
     });
     scheduleTaskInterval2(this._ctx, async () => {
       if (!this._currentConnection) {
@@ -563,7 +563,7 @@ var EdgeClient = class extends Resource2 {
   async _close() {
     log2("closing...", {
       peerKey: this._identity.peerKey
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 152, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 153, S: this });
     this._closeCurrentConnection();
     await this._persistentLifecycle.close();
   }
@@ -572,10 +572,10 @@ var EdgeClient = class extends Resource2 {
       return void 0;
     }
     const identity = this._identity;
-    const path = `/ws/${identity.identityKey}/${identity.peerKey}`;
+    const path = `/ws/${identity.identityDid}/${identity.peerKey}`;
     const protocolHeader = this._config.disableAuth ? void 0 : await this._createAuthHeader(path);
     if (this._identity !== identity) {
-      log2("identity changed during auth header request", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 166, S: this });
+      log2("identity changed during auth header request", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 167, S: this });
       return void 0;
     }
     const restartRequired = new Trigger();
@@ -583,7 +583,7 @@ var EdgeClient = class extends Resource2 {
     log2("Opening websocket", {
       url: url.toString(),
       protocolHeader
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 171, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 172, S: this });
     const connection = new EdgeWsConnection(identity, {
       url,
       protocolHeader,
@@ -596,7 +596,7 @@ var EdgeClient = class extends Resource2 {
           this._ready.wake();
           this._notifyReconnected();
         } else {
-          log2.verbose("connected callback ignored, because connection is not active", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 187, S: this });
+          log2.verbose("connected callback ignored, because connection is not active", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 188, S: this });
         }
       },
       onRestartRequired: () => {
@@ -604,7 +604,7 @@ var EdgeClient = class extends Resource2 {
           this._closeCurrentConnection();
           void this._persistentLifecycle.scheduleRestart();
         } else {
-          log2.verbose("restart requested by inactive connection", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 195, S: this });
+          log2.verbose("restart requested by inactive connection", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 196, S: this });
         }
         restartRequired.wake();
       },
@@ -615,7 +615,7 @@ var EdgeClient = class extends Resource2 {
           log2.verbose("ignored a message on inactive connection", {
             from: message.source,
             type: message.payload?.typeUrl
-          }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 203, S: this });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 204, S: this });
         }
       }
     });
@@ -650,7 +650,7 @@ var EdgeClient = class extends Resource2 {
       } catch (err) {
         log2.error("ws reconnect listener failed", {
           err
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 244, S: this });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 245, S: this });
       }
     }
   }
@@ -662,7 +662,7 @@ var EdgeClient = class extends Resource2 {
         log2.error("ws incoming message processing failed", {
           err,
           payload: protocol.getPayloadType(message)
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 255, S: this });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 256, S: this });
       }
     }
   }
@@ -678,7 +678,7 @@ var EdgeClient = class extends Resource2 {
       log2.warn("no auth challenge from edge", {
         status: response.status,
         statusText: response.statusText
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 271, S: this });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 272, S: this });
       return void 0;
     }
   }
@@ -760,7 +760,7 @@ var BaseHttpClient = class {
     return this._baseUrl;
   }
   setIdentity(identity) {
-    if (this._edgeIdentity?.identityKey !== identity.identityKey || this._edgeIdentity?.peerKey !== identity.peerKey) {
+    if (this._edgeIdentity?.identityDid !== identity.identityDid || this._edgeIdentity?.peerKey !== identity.peerKey) {
       this._edgeIdentity = identity;
       this._authHeader = void 0;
     }
@@ -1086,7 +1086,7 @@ var EdgeHttpClient = class extends BaseHttpClient {
     });
   }
   getAgentStatus(ctx, request, args) {
-    return this._call(ctx, new URL(`/users/${request.ownerIdentityKey.toHex()}/agent/status`, this.baseUrl), {
+    return this._call(ctx, new URL(`/users/${request.ownerIdentityDid}/agent/status`, this.baseUrl), {
       ...args,
       method: "GET"
     });
@@ -1195,7 +1195,8 @@ var EdgeHttpClient = class extends BaseHttpClient {
     const formData = new FormData();
     formData.append("name", body.name ?? "");
     formData.append("version", body.version);
-    formData.append("ownerPublicKey", body.ownerPublicKey);
+    const ownerUri = this._edgeIdentity?.identityDid ?? body.ownerUri;
+    formData.append("ownerUri", ownerUri);
     formData.append("entryPoint", body.entryPoint);
     body.runtime && formData.append("runtime", body.runtime);
     for (const [filename, content] of Object.entries(body.assets)) {