@dxos/client-services 0.8.1-staging.391c573 → 0.8.1-staging.97aedb1

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

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

package/dist/lib/node/{chunk-SJ3DQ4HS.cjs → chunk-HAYNZLSJ.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_SJ3DQ4HS_exports = {};
-__export(chunk_SJ3DQ4HS_exports, {
+var chunk_HAYNZLSJ_exports = {};
+__export(chunk_HAYNZLSJ_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -72,7 +72,7 @@ __export(chunk_SJ3DQ4HS_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_SJ3DQ4HS_exports);
+module.exports = __toCommonJS(chunk_HAYNZLSJ_exports);
 var import_async = require("@dxos/async");
 var import_stream = require("@dxos/codec-protobuf/stream");
 var import_feed_store = require("@dxos/feed-store");
@@ -389,7 +389,7 @@ var import_util17 = require("@dxos/util");
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devtools/feeds.ts";
 var subscribeToFeeds = ({ feedStore, spaceManager }, { feedKeys }) => {
   return new import_stream.Stream(({ next }) => {
-    const subscriptions = new import_async.EventSubscriptions();
+    const subscriptions = new import_async.SubscriptionList();
     const feedMap = new import_util.ComplexMap(import_keys.PublicKey.hash);
     const update = () => {
       const { feeds } = feedStore;
@@ -451,7 +451,7 @@ var subscribeToFeedBlocks = ({ feedStore }, { feedKey, maxBlocks = 10 }) => {
     if (!feedKey) {
       return;
     }
-    const subscriptions = new import_async.EventSubscriptions();
+    const subscriptions = new import_async.SubscriptionList();
     const timeout = setTimeout(async () => {
       const feed = feedStore.getFeed(feedKey);
       if (!feed) {
@@ -744,7 +744,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.8.1-staging.391c573";
+var DXOS_VERSION = "0.8.1-staging.97aedb1";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -2320,7 +2320,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       dataFeedKey,
       state: import_services6.SpaceState.SPACE_ACTIVE
     };
-    import_log8.log.info("creating space...", {
+    (0, import_log8.log)("creating space...", {
       spaceId,
       spaceKey
     }, {
@@ -3126,7 +3126,7 @@ var SpacesServiceImpl = class {
       });
       (0, import_async12.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const subscriptions = new import_async12.EventSubscriptions();
+        const subscriptions = new import_async12.SubscriptionList();
         ctx.onDispose(() => subscriptions.clear());
         const subscribeSpaces = () => {
           subscriptions.clear();
@@ -4194,6 +4194,10 @@ var IdentityServiceImpl = class extends import_context10.Resource {
       });
     } else if (request.external) {
       await this._recoveryManager.recoverIdentityWithExternalSignature(request.external);
+    } else if (request.token) {
+      await this._recoveryManager.recoverIdentityWithToken({
+        token: request.token
+      });
     } else {
       throw new Error("Invalid request.");
     }
@@ -4203,7 +4207,7 @@ var IdentityServiceImpl = class extends import_context10.Resource {
   async signPresentation({ presentation, nonce }) {
     (0, import_invariant12.invariant)(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file14,
-      L: 116,
+      L: 118,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -4222,7 +4226,7 @@ var IdentityServiceImpl = class extends import_context10.Resource {
     const identity = this._identityManager.identity;
     (0, import_invariant12.invariant)(identity, "Identity not initialized.", {
       F: __dxlog_file14,
-      L: 130,
+      L: 132,
       S: this,
       A: [
         "identity",
@@ -4260,7 +4264,7 @@ var IdentityServiceImpl = class extends import_context10.Resource {
             duplicate: space.id
           }, {
             F: __dxlog_file14,
-            L: 164,
+            L: 166,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4274,7 +4278,7 @@ var IdentityServiceImpl = class extends import_context10.Resource {
     }, (err) => {
       import_log12.log.catch(err, void 0, {
         F: __dxlog_file14,
-        L: 175,
+        L: 177,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7712,10 +7716,41 @@ var EdgeIdentityRecoveryManager = class {
       dataFeedKey: await this._keyring.createKey()
     });
   }
+  /**
+  * Recovery identity using an opaque token sent to the user's email.
+  */
+  async recoverIdentityWithToken({ token }) {
+    (0, import_invariant24.invariant)(this._edgeClient, "Not connected to EDGE.", {
+      F: __dxlog_file27,
+      L: 139,
+      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(),
+      token
+    };
+    const response = await this._edgeClient.recoverIdentity(request);
+    await this._acceptRecoveredIdentity({
+      authorizedDeviceCredential: decodeCredential(response.deviceAuthCredential),
+      haloGenesisFeedKey: import_keys18.PublicKey.fromHex(response.genesisFeedKey),
+      haloSpaceKey: import_keys18.PublicKey.fromHex(response.haloSpaceKey),
+      identityKey: import_keys18.PublicKey.fromHex(response.identityKey),
+      deviceKey,
+      controlFeedKey,
+      dataFeedKey: await this._keyring.createKey()
+    });
+  }
   async recoverIdentity({ recoveryCode }) {
     (0, import_invariant24.invariant)(this._edgeClient, "Not connected to EDGE.", {
       F: __dxlog_file27,
-      L: 136,
+      L: 163,
       S: this,
       A: [
         "this._edgeClient",
@@ -7746,7 +7781,7 @@ var EdgeIdentityRecoveryManager = class {
     }
     import_log24.log.info("recovering identity", response, {
       F: __dxlog_file27,
-      L: 162,
+      L: 189,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8507,7 +8542,7 @@ var DevicesServiceImpl = class {
           presenceSubscribed = true;
         }
       };
-      const subscriptions = new import_async24.EventSubscriptions();
+      const subscriptions = new import_async24.SubscriptionList();
       if (this._identityManager.identity) {
         subscribeIdentity();
         subscribePresence();
@@ -8580,7 +8615,7 @@ var ContactsServiceImpl = class {
         maxFrequency: 2
       });
       (0, import_async25.scheduleTask)(ctx, async () => {
-        const subscriptions = new import_async25.EventSubscriptions();
+        const subscriptions = new import_async25.SubscriptionList();
         ctx.onDispose(() => subscriptions.clear());
         const subscribeToSpaceAndUpdate = () => {
           const oldSetSize = subscribedSpaceKeySet.size;
@@ -9278,4 +9313,4 @@ ClientServicesHost = _ts_decorate11([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-SJ3DQ4HS.cjs.map
+//# sourceMappingURL=chunk-HAYNZLSJ.cjs.map