@dxos/client-services 0.7.5-labs.e27f9b9 → 0.7.5-labs.f400bbc

package/dist/lib/browser/testing/index.mjs

@@ -6,7 +6,7 @@ import {
   InvitationsManager,
   ServiceContext,
   SpaceInvitationProtocol
-} from "../chunk-OHBCYJRF.mjs";
+} from "../chunk-VWZJYGCJ.mjs";
 
 // packages/sdk/client-services/src/packlets/testing/credential-utils.ts
 import { createCredential } from "@dxos/credentials";

package/dist/lib/node/{chunk-X3IYGB6Q.cjs → chunk-TVKZUCQN.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_X3IYGB6Q_exports = {};
-__export(chunk_X3IYGB6Q_exports, {
+var chunk_TVKZUCQN_exports = {};
+__export(chunk_TVKZUCQN_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -72,7 +72,7 @@ __export(chunk_X3IYGB6Q_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_X3IYGB6Q_exports);
+module.exports = __toCommonJS(chunk_TVKZUCQN_exports);
 var import_async = require("@dxos/async");
 var import_stream = require("@dxos/codec-protobuf/stream");
 var import_feed_store = require("@dxos/feed-store");
@@ -735,7 +735,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.7.5-labs.e27f9b9";
+var DXOS_VERSION = "0.7.5-labs.f400bbc";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -928,7 +928,7 @@ var findSystemServiceProvider = () => {
 };
 var findConfigs = () => {
   const configs = import_tracing2.TRACE_PROCESSOR.findResourcesByAnnotation(import_config.ConfigResource);
-  return configs.map((r) => r.instance.deref()).filter(import_util2.nonNullable);
+  return configs.map((r) => r.instance.deref()).filter(import_util2.isNonNullable);
 };
 var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/authenticator.ts";
 var Credential = import_proto.schema.getCodecForType("dxos.halo.credentials.Credential");
@@ -2666,7 +2666,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     });
     dataSpace.postOpen.append(async () => {
       const setting = dataSpace.getEdgeReplicationSetting();
-      if (setting === import_metadata.EdgeReplicationSetting.ENABLED) {
+      if (!setting || setting === import_metadata.EdgeReplicationSetting.ENABLED) {
         await this._echoEdgeReplicator?.connectToSpace(dataSpace.id);
       } else if (this._echoEdgeReplicator) {
         (0, import_log8.log)("not connecting EchoEdgeReplicator because of EdgeReplicationSetting", {
@@ -2681,7 +2681,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     });
     dataSpace.preClose.append(async () => {
       const setting = dataSpace.getEdgeReplicationSetting();
-      if (setting === import_metadata.EdgeReplicationSetting.ENABLED) {
+      if (!setting || setting === import_metadata.EdgeReplicationSetting.ENABLED) {
         await this._echoEdgeReplicator?.disconnectFromSpace(dataSpace.id);
       }
     });
@@ -3910,15 +3910,26 @@ var IdentityServiceImpl = class extends import_context9.Resource {
   async createRecoveryCredential(request) {
     return this._recoveryManager.createRecoveryCredential(request);
   }
+  async requestRecoveryChallenge() {
+    return this._recoveryManager.requestRecoveryChallenge();
+  }
   async recoverIdentity(request) {
-    await this._recoveryManager.recoverIdentity(request);
+    if (request.recoveryCode) {
+      await this._recoveryManager.recoverIdentity({
+        recoveryCode: request.recoveryCode
+      });
+    } else if (request.external) {
+      await this._recoveryManager.recoverIdentityWithExternalSignature(request.external);
+    } else {
+      throw new Error("Invalid request.");
+    }
     return this._getIdentity();
   }
   // TODO(burdon): Rename createPresentation?
   async signPresentation({ presentation, nonce }) {
     (0, import_invariant10.invariant)(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file13,
-      L: 105,
+      L: 116,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -3937,7 +3948,7 @@ var IdentityServiceImpl = class extends import_context9.Resource {
     const identity = this._identityManager.identity;
     (0, import_invariant10.invariant)(identity, "Identity not initialized.", {
       F: __dxlog_file13,
-      L: 119,
+      L: 130,
       S: this,
       A: [
         "identity",
@@ -3975,7 +3986,7 @@ var IdentityServiceImpl = class extends import_context9.Resource {
             duplicate: space.id
           }, {
             F: __dxlog_file13,
-            L: 153,
+            L: 164,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3989,7 +4000,7 @@ var IdentityServiceImpl = class extends import_context9.Resource {
     }, (err) => {
       import_log11.log.catch(err, void 0, {
         F: __dxlog_file13,
-        L: 164,
+        L: 175,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7051,6 +7062,18 @@ var EdgeAgentManager = class extends import_context15.Resource {
       haloSpaceKey: this._identity.haloSpaceKey.toHex()
     });
     const deviceKey = import_keys15.PublicKey.fromHex(response.deviceKey);
+    if (await this._identity.authorizedDeviceKeys.has(deviceKey)) {
+      import_log21.log.info("agent was already added to HALO, ignoring response", {
+        response
+      }, {
+        F: __dxlog_file25,
+        L: 67,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      this._updateStatus(import_protocols14.EdgeAgentStatus.ACTIVE, deviceKey);
+      return;
+    }
     await this._identity.admitDevice({
       deviceKey,
       controlFeedKey: import_keys15.PublicKey.fromHex(response.feedKey),
@@ -7059,7 +7082,7 @@ var EdgeAgentManager = class extends import_context15.Resource {
     });
     (0, import_log21.log)("agent created", response, {
       F: __dxlog_file25,
-      L: 73,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7071,7 +7094,7 @@ var EdgeAgentManager = class extends import_context15.Resource {
       isEnabled
     }, {
       F: __dxlog_file25,
-      L: 81,
+      L: 87,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7104,7 +7127,7 @@ var EdgeAgentManager = class extends import_context15.Resource {
   async _fetchAgentStatus() {
     (0, import_invariant20.invariant)(this._edgeHttpClient, void 0, {
       F: __dxlog_file25,
-      L: 115,
+      L: 121,
       S: this,
       A: [
         "this._edgeHttpClient",
@@ -7114,7 +7137,7 @@ var EdgeAgentManager = class extends import_context15.Resource {
     try {
       (0, import_log21.log)("fetching agent status", void 0, {
         F: __dxlog_file25,
-        L: 117,
+        L: 123,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7133,7 +7156,7 @@ var EdgeAgentManager = class extends import_context15.Resource {
             err
           }, {
             F: __dxlog_file25,
-            L: 127,
+            L: 133,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7146,7 +7169,7 @@ var EdgeAgentManager = class extends import_context15.Resource {
         retryAfterMs
       }, {
         F: __dxlog_file25,
-        L: 132,
+        L: 138,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7182,7 +7205,7 @@ var EdgeAgentManager = class extends import_context15.Resource {
         spaceId: space.id
       }, {
         F: __dxlog_file25,
-        L: 159,
+        L: 165,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7202,7 +7225,7 @@ var EdgeAgentManager = class extends import_context15.Resource {
       status
     }, {
       F: __dxlog_file25,
-      L: 175,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7275,7 +7298,7 @@ var EdgeIdentityRecoveryManager = class {
     this._identityProvider = _identityProvider;
     this._acceptRecoveredIdentity = _acceptRecoveredIdentity;
   }
-  async createRecoveryCredential({ recoveryKey, algorithm }) {
+  async createRecoveryCredential({ recoveryKey, lookupKey, algorithm }) {
     const identity = this._identityProvider();
     (0, import_invariant22.invariant)(identity, void 0, {
       F: __dxlog_file26,
@@ -7287,15 +7310,16 @@ var EdgeIdentityRecoveryManager = class {
       ]
     });
     let recoveryCode;
-    if (!recoveryKey) {
+    if (!recoveryKey || !lookupKey) {
       recoveryCode = (0, import_credentials23.generateSeedPhrase)();
       const keypair = (0, import_credentials23.keyPairFromSeedPhrase)(recoveryCode);
       recoveryKey = import_keys17.PublicKey.from(keypair.publicKey);
-      algorithm = -8;
+      lookupKey = import_keys17.PublicKey.random();
+      algorithm = "ED25519";
     }
     (0, import_invariant22.invariant)(algorithm, "Algorithm is required.", {
       F: __dxlog_file26,
-      L: 47,
+      L: 48,
       S: this,
       A: [
         "algorithm",
@@ -7309,7 +7333,8 @@ var EdgeIdentityRecoveryManager = class {
         "@type": "dxos.halo.credentials.IdentityRecovery",
         recoveryKey,
         identityKey,
-        algorithm
+        algorithm,
+        lookupKey
       }
     });
     const receipt = await identity.controlPipeline.writer.write({
@@ -7327,10 +7352,71 @@ var EdgeIdentityRecoveryManager = class {
       recoveryCode
     };
   }
+  async requestRecoveryChallenge() {
+    (0, import_invariant22.invariant)(this._edgeClient, "Not connected to EDGE.", {
+      F: __dxlog_file26,
+      L: 68,
+      S: this,
+      A: [
+        "this._edgeClient",
+        "'Not connected to EDGE.'"
+      ]
+    });
+    const deviceKey = await this._keyring.createKey();
+    const controlFeedKey = await this._keyring.createKey();
+    const request = {
+      deviceKey: deviceKey.toHex(),
+      controlFeedKey: controlFeedKey.toHex()
+    };
+    try {
+      await this._edgeClient.recoverIdentity(request);
+      throw new Error("No challenge received.");
+    } catch (error) {
+      if (!(error instanceof import_protocols17.EdgeAuthChallengeError)) {
+        throw error;
+      }
+      return {
+        deviceKey,
+        controlFeedKey,
+        challenge: error.challenge
+      };
+    }
+  }
+  async recoverIdentityWithExternalSignature({ lookupKey, deviceKey, controlFeedKey, signature, clientDataJson, authenticatorData }) {
+    (0, import_invariant22.invariant)(this._edgeClient, "Not connected to EDGE.", {
+      F: __dxlog_file26,
+      L: 100,
+      S: this,
+      A: [
+        "this._edgeClient",
+        "'Not connected to EDGE.'"
+      ]
+    });
+    const request = {
+      lookupKey: lookupKey.toHex(),
+      deviceKey: deviceKey.toHex(),
+      controlFeedKey: controlFeedKey.toHex(),
+      signature: clientDataJson && authenticatorData ? {
+        signature: Buffer.from(signature).toString("base64"),
+        clientDataJson: Buffer.from(clientDataJson).toString("base64"),
+        authenticatorData: Buffer.from(authenticatorData).toString("base64")
+      } : Buffer.from(signature).toString("base64")
+    };
+    const response = await this._edgeClient.recoverIdentity(request);
+    await this._acceptRecoveredIdentity({
+      authorizedDeviceCredential: decodeCredential(response.deviceAuthCredential),
+      haloGenesisFeedKey: import_keys17.PublicKey.fromHex(response.genesisFeedKey),
+      haloSpaceKey: import_keys17.PublicKey.fromHex(response.haloSpaceKey),
+      identityKey: import_keys17.PublicKey.fromHex(response.identityKey),
+      deviceKey,
+      controlFeedKey,
+      dataFeedKey: await this._keyring.createKey()
+    });
+  }
   async recoverIdentity({ recoveryCode }) {
     (0, import_invariant22.invariant)(this._edgeClient, "Not connected to EDGE.", {
       F: __dxlog_file26,
-      L: 66,
+      L: 130,
       S: this,
       A: [
         "this._edgeClient",
@@ -7342,7 +7428,7 @@ var EdgeIdentityRecoveryManager = class {
     const deviceKey = await this._keyring.createKey();
     const controlFeedKey = await this._keyring.createKey();
     const request = {
-      recoveryKey: recoveryKey.toHex(),
+      lookupKey: recoveryKey.toHex(),
       deviceKey: deviceKey.toHex(),
       controlFeedKey: controlFeedKey.toHex()
     };
@@ -7361,7 +7447,7 @@ var EdgeIdentityRecoveryManager = class {
     }
     import_log23.log.info("recovering identity", response, {
       F: __dxlog_file26,
-      L: 92,
+      L: 156,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8890,4 +8976,4 @@ ClientServicesHost = _ts_decorate11([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-X3IYGB6Q.cjs.map
+//# sourceMappingURL=chunk-TVKZUCQN.cjs.map