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

package/dist/lib/node/testing/index.cjs

@@ -32,7 +32,7 @@ __export(testing_exports, {
   sanitizeInvitation: () => sanitizeInvitation
 });
 module.exports = __toCommonJS(testing_exports);
-var import_chunk_X3IYGB6Q = require("../chunk-X3IYGB6Q.cjs");
+var import_chunk_TVKZUCQN = require("../chunk-TVKZUCQN.cjs");
 var import_credentials = require("@dxos/credentials");
 var import_keys = require("@dxos/keys");
 var import_async = require("@dxos/async");
@@ -235,7 +235,7 @@ var createInvitation = async (host, options) => {
     authMethod: import_services.Invitation.AuthMethod.NONE,
     ...options ?? {}
   };
-  if (host instanceof import_chunk_X3IYGB6Q.ServiceContext) {
+  if (host instanceof import_chunk_TVKZUCQN.ServiceContext) {
     return host.invitationsManager.createInvitation({
       kind: import_services.Invitation.Kind.SPACE,
       ...options
@@ -245,7 +245,7 @@ var createInvitation = async (host, options) => {
 };
 var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
   invitation = sanitizeInvitation(invitation);
-  if (guest instanceof import_chunk_X3IYGB6Q.ServiceContext) {
+  if (guest instanceof import_chunk_TVKZUCQN.ServiceContext) {
     return guest.invitationsManager.acceptInvitation({
       invitation,
       deviceProfile: guestDeviceProfile
@@ -255,7 +255,7 @@ var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
 };
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/testing/test-builder.ts";
 var createServiceHost = (config, signalManagerContext) => {
-  return new import_chunk_X3IYGB6Q.ClientServicesHost({
+  return new import_chunk_TVKZUCQN.ClientServicesHost({
     config,
     signalManager: new import_messaging.MemorySignalManager(signalManagerContext),
     transportFactory: import_network_manager.MemoryTransportFactory
@@ -274,7 +274,7 @@ var createServiceContext = async ({ signalManagerFactory = async () => {
   });
   const level = (0, import_testing.createTestLevel)();
   await level.open();
-  return new import_chunk_X3IYGB6Q.ServiceContext(storage, level, networkManager, signalManager, void 0, void 0, {
+  return new import_chunk_TVKZUCQN.ServiceContext(storage, level, networkManager, signalManager, void 0, void 0, {
     invitationConnectionDefaultParams: {
       teleport: {
         controlHeartbeatInterval: 200
@@ -385,7 +385,7 @@ var TestPeer = class {
     return this._props.meshEchoReplicator ??= new import_echo_pipeline.MeshEchoReplicator();
   }
   get dataSpaceManager() {
-    return this._props.dataSpaceManager ??= new import_chunk_X3IYGB6Q.DataSpaceManager({
+    return this._props.dataSpaceManager ??= new import_chunk_TVKZUCQN.DataSpaceManager({
       spaceManager: this.spaceManager,
       metadataStore: this.metadataStore,
       keyring: this.keyring,
@@ -400,9 +400,9 @@ var TestPeer = class {
     });
   }
   get invitationsManager() {
-    return this._props.invitationsManager ??= new import_chunk_X3IYGB6Q.InvitationsManager(new import_chunk_X3IYGB6Q.InvitationsHandler(this.networkManager), (invitation) => {
+    return this._props.invitationsManager ??= new import_chunk_TVKZUCQN.InvitationsManager(new import_chunk_TVKZUCQN.InvitationsHandler(this.networkManager), (invitation) => {
       if (invitation.kind === import_services2.Invitation.Kind.SPACE) {
-        return new import_chunk_X3IYGB6Q.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
+        return new import_chunk_TVKZUCQN.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
       } else {
         throw new Error("not implemented");
       }

package/dist/lib/node-esm/{chunk-U5S4G236.mjs → chunk-OEO5PHCK.mjs}

@@ -397,7 +397,7 @@ import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.7.5-labs.e27f9b9";
+var DXOS_VERSION = "0.7.5-labs.f400bbc";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -571,7 +571,7 @@ import { ClientServicesProviderResource } from "@dxos/client-protocol";
 import { ConfigResource } from "@dxos/config";
 import { GetDiagnosticsRequest } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR as TRACE_PROCESSOR2 } from "@dxos/tracing";
-import { jsonKeyReplacer, nonNullable } from "@dxos/util";
+import { jsonKeyReplacer, isNonNullable } from "@dxos/util";
 var GET_DIAGNOSTICS_RPC_TIMEOUT = 1e4;
 var DiagnosticsCollector = class {
   static {
@@ -604,7 +604,7 @@ var findSystemServiceProvider = () => {
 };
 var findConfigs = () => {
   const configs = TRACE_PROCESSOR2.findResourcesByAnnotation(ConfigResource);
-  return configs.map((r) => r.instance.deref()).filter(nonNullable);
+  return configs.map((r) => r.instance.deref()).filter(isNonNullable);
 };
 
 // packages/sdk/client-services/src/packlets/identity/authenticator.ts
@@ -2452,7 +2452,7 @@ var DataSpaceManager = class extends Resource4 {
     });
     dataSpace.postOpen.append(async () => {
       const setting = dataSpace.getEdgeReplicationSetting();
-      if (setting === EdgeReplicationSetting.ENABLED) {
+      if (!setting || setting === EdgeReplicationSetting.ENABLED) {
         await this._echoEdgeReplicator?.connectToSpace(dataSpace.id);
       } else if (this._echoEdgeReplicator) {
         log6("not connecting EchoEdgeReplicator because of EdgeReplicationSetting", {
@@ -2467,7 +2467,7 @@ var DataSpaceManager = class extends Resource4 {
     });
     dataSpace.preClose.append(async () => {
       const setting = dataSpace.getEdgeReplicationSetting();
-      if (setting === EdgeReplicationSetting.ENABLED) {
+      if (!setting || setting === EdgeReplicationSetting.ENABLED) {
         await this._echoEdgeReplicator?.disconnectFromSpace(dataSpace.id);
       }
     });
@@ -3736,15 +3736,26 @@ var IdentityServiceImpl = class extends Resource5 {
   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 }) {
     invariant9(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file13,
-      L: 105,
+      L: 116,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -3763,7 +3774,7 @@ var IdentityServiceImpl = class extends Resource5 {
     const identity = this._identityManager.identity;
     invariant9(identity, "Identity not initialized.", {
       F: __dxlog_file13,
-      L: 119,
+      L: 130,
       S: this,
       A: [
         "identity",
@@ -3801,7 +3812,7 @@ var IdentityServiceImpl = class extends Resource5 {
             duplicate: space.id
           }, {
             F: __dxlog_file13,
-            L: 153,
+            L: 164,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3815,7 +3826,7 @@ var IdentityServiceImpl = class extends Resource5 {
     }, (err) => {
       log10.catch(err, void 0, {
         F: __dxlog_file13,
-        L: 164,
+        L: 175,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7005,6 +7016,18 @@ var EdgeAgentManager = class extends Resource6 {
       haloSpaceKey: this._identity.haloSpaceKey.toHex()
     });
     const deviceKey = PublicKey13.fromHex(response.deviceKey);
+    if (await this._identity.authorizedDeviceKeys.has(deviceKey)) {
+      log21.info("agent was already added to HALO, ignoring response", {
+        response
+      }, {
+        F: __dxlog_file25,
+        L: 67,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      this._updateStatus(EdgeAgentStatus.ACTIVE, deviceKey);
+      return;
+    }
     await this._identity.admitDevice({
       deviceKey,
       controlFeedKey: PublicKey13.fromHex(response.feedKey),
@@ -7013,7 +7036,7 @@ var EdgeAgentManager = class extends Resource6 {
     });
     log21("agent created", response, {
       F: __dxlog_file25,
-      L: 73,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7025,7 +7048,7 @@ var EdgeAgentManager = class extends Resource6 {
       isEnabled
     }, {
       F: __dxlog_file25,
-      L: 81,
+      L: 87,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7058,7 +7081,7 @@ var EdgeAgentManager = class extends Resource6 {
   async _fetchAgentStatus() {
     invariant19(this._edgeHttpClient, void 0, {
       F: __dxlog_file25,
-      L: 115,
+      L: 121,
       S: this,
       A: [
         "this._edgeHttpClient",
@@ -7068,7 +7091,7 @@ var EdgeAgentManager = class extends Resource6 {
     try {
       log21("fetching agent status", void 0, {
         F: __dxlog_file25,
-        L: 117,
+        L: 123,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7087,7 +7110,7 @@ var EdgeAgentManager = class extends Resource6 {
             err
           }, {
             F: __dxlog_file25,
-            L: 127,
+            L: 133,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7100,7 +7123,7 @@ var EdgeAgentManager = class extends Resource6 {
         retryAfterMs
       }, {
         F: __dxlog_file25,
-        L: 132,
+        L: 138,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7136,7 +7159,7 @@ var EdgeAgentManager = class extends Resource6 {
         spaceId: space.id
       }, {
         F: __dxlog_file25,
-        L: 159,
+        L: 165,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7156,7 +7179,7 @@ var EdgeAgentManager = class extends Resource6 {
       status
     }, {
       F: __dxlog_file25,
-      L: 175,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7262,7 +7285,7 @@ var EdgeIdentityRecoveryManager = class {
     this._identityProvider = _identityProvider;
     this._acceptRecoveredIdentity = _acceptRecoveredIdentity;
   }
-  async createRecoveryCredential({ recoveryKey, algorithm }) {
+  async createRecoveryCredential({ recoveryKey, lookupKey, algorithm }) {
     const identity = this._identityProvider();
     invariant20(identity, void 0, {
       F: __dxlog_file26,
@@ -7274,15 +7297,16 @@ var EdgeIdentityRecoveryManager = class {
       ]
     });
     let recoveryCode;
-    if (!recoveryKey) {
+    if (!recoveryKey || !lookupKey) {
       recoveryCode = generateSeedPhrase();
       const keypair = keyPairFromSeedPhrase(recoveryCode);
       recoveryKey = PublicKey14.from(keypair.publicKey);
-      algorithm = -8;
+      lookupKey = PublicKey14.random();
+      algorithm = "ED25519";
     }
     invariant20(algorithm, "Algorithm is required.", {
       F: __dxlog_file26,
-      L: 47,
+      L: 48,
       S: this,
       A: [
         "algorithm",
@@ -7296,7 +7320,8 @@ var EdgeIdentityRecoveryManager = class {
         "@type": "dxos.halo.credentials.IdentityRecovery",
         recoveryKey,
         identityKey,
-        algorithm
+        algorithm,
+        lookupKey
       }
     });
     const receipt = await identity.controlPipeline.writer.write({
@@ -7314,10 +7339,71 @@ var EdgeIdentityRecoveryManager = class {
       recoveryCode
     };
   }
+  async requestRecoveryChallenge() {
+    invariant20(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 EdgeAuthChallengeError2)) {
+        throw error;
+      }
+      return {
+        deviceKey,
+        controlFeedKey,
+        challenge: error.challenge
+      };
+    }
+  }
+  async recoverIdentityWithExternalSignature({ lookupKey, deviceKey, controlFeedKey, signature, clientDataJson, authenticatorData }) {
+    invariant20(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: PublicKey14.fromHex(response.genesisFeedKey),
+      haloSpaceKey: PublicKey14.fromHex(response.haloSpaceKey),
+      identityKey: PublicKey14.fromHex(response.identityKey),
+      deviceKey,
+      controlFeedKey,
+      dataFeedKey: await this._keyring.createKey()
+    });
+  }
   async recoverIdentity({ recoveryCode }) {
     invariant20(this._edgeClient, "Not connected to EDGE.", {
       F: __dxlog_file26,
-      L: 66,
+      L: 130,
       S: this,
       A: [
         "this._edgeClient",
@@ -7329,7 +7415,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()
     };
@@ -7348,7 +7434,7 @@ var EdgeIdentityRecoveryManager = class {
     }
     log22.info("recovering identity", response, {
       F: __dxlog_file26,
-      L: 92,
+      L: 156,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8950,4 +9036,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-U5S4G236.mjs.map
+//# sourceMappingURL=chunk-OEO5PHCK.mjs.map