@dxos/client-services 0.8.1-staging.391c573 → 0.8.1-staging.9eaf14f

package/dist/lib/browser/{chunk-27WUD3Q6.mjs → chunk-2I64KBVC.mjs}

@@ -1,7 +1,7 @@
 import "@dxos/node-std/globals";
 
 // packages/sdk/client-services/src/packlets/devtools/feeds.ts
-import { EventSubscriptions } from "@dxos/async";
+import { SubscriptionList } from "@dxos/async";
 import { Stream } from "@dxos/codec-protobuf/stream";
 import { FeedIterator } from "@dxos/feed-store";
 import { PublicKey } from "@dxos/keys";
@@ -10,7 +10,7 @@ import { ComplexMap } from "@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 Stream(({ next }) => {
-    const subscriptions = new EventSubscriptions();
+    const subscriptions = new SubscriptionList();
     const feedMap = new ComplexMap(PublicKey.hash);
     const update = () => {
       const { feeds } = feedStore;
@@ -72,7 +72,7 @@ var subscribeToFeedBlocks = ({ feedStore }, { feedKey, maxBlocks = 10 }) => {
     if (!feedKey) {
       return;
     }
-    const subscriptions = new EventSubscriptions();
+    const subscriptions = new SubscriptionList();
     const timeout = setTimeout(async () => {
       const feed = feedStore.getFeed(feedKey);
       if (!feed) {
@@ -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.8.1-staging.391c573";
+var DXOS_VERSION = "0.8.1-staging.9eaf14f";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -2177,7 +2177,7 @@ var DataSpaceManager = class extends Resource4 {
       dataFeedKey,
       state: SpaceState.SPACE_ACTIVE
     };
-    log7.info("creating space...", {
+    log7("creating space...", {
       spaceId,
       spaceKey
     }, {
@@ -2748,7 +2748,7 @@ DataSpaceManager = _ts_decorate3([
 ], DataSpaceManager);
 
 // packages/sdk/client-services/src/packlets/spaces/spaces-service.ts
-import { EventSubscriptions as EventSubscriptions2, UpdateScheduler, scheduleTask as scheduleTask3 } from "@dxos/async";
+import { SubscriptionList as SubscriptionList2, UpdateScheduler, scheduleTask as scheduleTask3 } from "@dxos/async";
 import { Stream as Stream7 } from "@dxos/codec-protobuf/stream";
 import { createAdmissionCredentials as createAdmissionCredentials2, createDidFromIdentityKey as createDidFromIdentityKey2, getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
 import { raise } from "@dxos/debug";
@@ -2756,7 +2756,7 @@ import { writeMessages as writeMessages2 } from "@dxos/feed-store";
 import { assertArgument as assertArgument4, assertState as assertState3, invariant as invariant7 } from "@dxos/invariant";
 import { SpaceId as SpaceId2 } from "@dxos/keys";
 import { log as log9 } from "@dxos/log";
-import { ApiError, SpaceNotFoundError, encodeError, IdentityNotInitializedError, AuthorizationError } from "@dxos/protocols";
+import { encodeError, ApiError, AuthorizationError, IdentityNotInitializedError, SpaceNotFoundError } from "@dxos/protocols";
 import { SpaceMember as SpaceMember4, SpaceState as SpaceState2 } from "@dxos/protocols/proto/dxos/client/services";
 import { trace as trace2 } from "@dxos/tracing";
 
@@ -3008,7 +3008,7 @@ var SpacesServiceImpl = class {
       });
       scheduleTask3(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const subscriptions = new EventSubscriptions2();
+        const subscriptions = new SubscriptionList2();
         ctx.onDispose(() => subscriptions.clear());
         const subscribeSpaces = () => {
           subscriptions.clear();
@@ -4104,6 +4104,10 @@ var IdentityServiceImpl = class extends Resource6 {
       });
     } 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.");
     }
@@ -4113,7 +4117,7 @@ var IdentityServiceImpl = class extends Resource6 {
   async signPresentation({ presentation, nonce }) {
     invariant10(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file15,
-      L: 116,
+      L: 118,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -4132,7 +4136,7 @@ var IdentityServiceImpl = class extends Resource6 {
     const identity = this._identityManager.identity;
     invariant10(identity, "Identity not initialized.", {
       F: __dxlog_file15,
-      L: 130,
+      L: 132,
       S: this,
       A: [
         "identity",
@@ -4170,7 +4174,7 @@ var IdentityServiceImpl = class extends Resource6 {
             duplicate: space.id
           }, {
             F: __dxlog_file15,
-            L: 164,
+            L: 166,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4184,7 +4188,7 @@ var IdentityServiceImpl = class extends Resource6 {
     }, (err) => {
       log12.catch(err, void 0, {
         F: __dxlog_file15,
-        L: 175,
+        L: 177,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7848,10 +7852,41 @@ var EdgeIdentityRecoveryManager = class {
       dataFeedKey: await this._keyring.createKey()
     });
   }
+  /**
+  * Recovery identity using an opaque token sent to the user's email.
+  */
+  async recoverIdentityWithToken({ token }) {
+    invariant21(this._edgeClient, "Not connected to EDGE.", {
+      F: __dxlog_file28,
+      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: PublicKey14.fromHex(response.genesisFeedKey),
+      haloSpaceKey: PublicKey14.fromHex(response.haloSpaceKey),
+      identityKey: PublicKey14.fromHex(response.identityKey),
+      deviceKey,
+      controlFeedKey,
+      dataFeedKey: await this._keyring.createKey()
+    });
+  }
   async recoverIdentity({ recoveryCode }) {
     invariant21(this._edgeClient, "Not connected to EDGE.", {
       F: __dxlog_file28,
-      L: 136,
+      L: 163,
       S: this,
       A: [
         "this._edgeClient",
@@ -7882,7 +7917,7 @@ var EdgeIdentityRecoveryManager = class {
     }
     log24.info("recovering identity", response, {
       F: __dxlog_file28,
-      L: 162,
+      L: 189,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8621,7 +8656,7 @@ import { TRACE_PROCESSOR as TRACE_PROCESSOR3, trace as Trace4 } from "@dxos/trac
 import { WebsocketRpcClient } from "@dxos/websocket-rpc";
 
 // packages/sdk/client-services/src/packlets/devices/devices-service.ts
-import { EventSubscriptions as EventSubscriptions3 } from "@dxos/async";
+import { SubscriptionList as SubscriptionList3 } from "@dxos/async";
 import { Stream as Stream12 } from "@dxos/codec-protobuf/stream";
 import { invariant as invariant24 } from "@dxos/invariant";
 import { Device as Device2, DeviceKind as DeviceKind2 } from "@dxos/protocols/proto/dxos/client/services";
@@ -8692,7 +8727,7 @@ var DevicesServiceImpl = class {
           presenceSubscribed = true;
         }
       };
-      const subscriptions = new EventSubscriptions3();
+      const subscriptions = new SubscriptionList3();
       if (this._identityManager.identity) {
         subscribeIdentity();
         subscribePresence();
@@ -8711,7 +8746,7 @@ var DevicesServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/identity/contacts-service.ts
-import { EventSubscriptions as EventSubscriptions4, scheduleTask as scheduleTask9, UpdateScheduler as UpdateScheduler2 } from "@dxos/async";
+import { scheduleTask as scheduleTask9, UpdateScheduler as UpdateScheduler2, SubscriptionList as SubscriptionList4 } from "@dxos/async";
 import { Stream as Stream13 } from "@dxos/codec-protobuf/stream";
 import { PublicKey as PublicKey17 } from "@dxos/keys";
 import { ComplexMap as ComplexMap5, ComplexSet as ComplexSet6 } from "@dxos/util";
@@ -8771,7 +8806,7 @@ var ContactsServiceImpl = class {
         maxFrequency: 2
       });
       scheduleTask9(ctx, async () => {
-        const subscriptions = new EventSubscriptions4();
+        const subscriptions = new SubscriptionList4();
         ctx.onDispose(() => subscriptions.clear());
         const subscribeToSpaceAndUpdate = () => {
           const oldSetSize = subscribedSpaceKeySet.size;
@@ -9487,4 +9522,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-27WUD3Q6.mjs.map
+//# sourceMappingURL=chunk-2I64KBVC.mjs.map