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

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

@@ -32,7 +32,7 @@ __export(testing_exports, {
   sanitizeInvitation: () => sanitizeInvitation
 });
 module.exports = __toCommonJS(testing_exports);
-var import_chunk_SJ3DQ4HS = require("../chunk-SJ3DQ4HS.cjs");
+var import_chunk_HAYNZLSJ = require("../chunk-HAYNZLSJ.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_SJ3DQ4HS.ServiceContext) {
+  if (host instanceof import_chunk_HAYNZLSJ.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_SJ3DQ4HS.ServiceContext) {
+  if (guest instanceof import_chunk_HAYNZLSJ.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_SJ3DQ4HS.ClientServicesHost({
+  return new import_chunk_HAYNZLSJ.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_SJ3DQ4HS.ServiceContext(storage, level, networkManager, signalManager, void 0, void 0, {
+  return new import_chunk_HAYNZLSJ.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_SJ3DQ4HS.DataSpaceManager({
+    return this._props.dataSpaceManager ??= new import_chunk_HAYNZLSJ.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_SJ3DQ4HS.InvitationsManager(new import_chunk_SJ3DQ4HS.InvitationsHandler(this.networkManager), (invitation) => {
+    return this._props.invitationsManager ??= new import_chunk_HAYNZLSJ.InvitationsManager(new import_chunk_HAYNZLSJ.InvitationsHandler(this.networkManager), (invitation) => {
       if (invitation.kind === import_services2.Invitation.Kind.SPACE) {
-        return new import_chunk_SJ3DQ4HS.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
+        return new import_chunk_HAYNZLSJ.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
       } else {
         throw new Error("not implemented");
       }

package/dist/lib/node-esm/{chunk-ZQFIFOIV.mjs → chunk-NK72VK3B.mjs}

@@ -1,7 +1,7 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 
 // 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.97aedb1";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -2099,7 +2099,7 @@ var DataSpaceManager = class extends Resource4 {
       dataFeedKey,
       state: SpaceState.SPACE_ACTIVE
     };
-    log6.info("creating space...", {
+    log6("creating space...", {
       spaceId,
       spaceKey
     }, {
@@ -2670,7 +2670,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";
@@ -2678,7 +2678,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 log8 } 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";
 
@@ -2930,7 +2930,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();
@@ -4026,6 +4026,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.");
     }
@@ -4035,7 +4039,7 @@ var IdentityServiceImpl = class extends Resource6 {
   async signPresentation({ presentation, nonce }) {
     invariant10(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file14,
-      L: 116,
+      L: 118,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -4054,7 +4058,7 @@ var IdentityServiceImpl = class extends Resource6 {
     const identity = this._identityManager.identity;
     invariant10(identity, "Identity not initialized.", {
       F: __dxlog_file14,
-      L: 130,
+      L: 132,
       S: this,
       A: [
         "identity",
@@ -4092,7 +4096,7 @@ var IdentityServiceImpl = class extends Resource6 {
             duplicate: space.id
           }, {
             F: __dxlog_file14,
-            L: 164,
+            L: 166,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4106,7 +4110,7 @@ var IdentityServiceImpl = class extends Resource6 {
     }, (err) => {
       log11.catch(err, void 0, {
         F: __dxlog_file14,
-        L: 175,
+        L: 177,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7705,10 +7709,41 @@ var EdgeIdentityRecoveryManager = class {
       dataFeedKey: await this._keyring.createKey()
     });
   }
+  /**
+  * Recovery identity using an opaque token sent to the user's email.
+  */
+  async recoverIdentityWithToken({ token }) {
+    invariant22(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: PublicKey14.fromHex(response.genesisFeedKey),
+      haloSpaceKey: PublicKey14.fromHex(response.haloSpaceKey),
+      identityKey: PublicKey14.fromHex(response.identityKey),
+      deviceKey,
+      controlFeedKey,
+      dataFeedKey: await this._keyring.createKey()
+    });
+  }
   async recoverIdentity({ recoveryCode }) {
     invariant22(this._edgeClient, "Not connected to EDGE.", {
       F: __dxlog_file27,
-      L: 136,
+      L: 163,
       S: this,
       A: [
         "this._edgeClient",
@@ -7739,7 +7774,7 @@ var EdgeIdentityRecoveryManager = class {
     }
     log23.info("recovering identity", response, {
       F: __dxlog_file27,
-      L: 162,
+      L: 189,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8478,7 +8513,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 invariant25 } from "@dxos/invariant";
 import { Device as Device2, DeviceKind as DeviceKind2 } from "@dxos/protocols/proto/dxos/client/services";
@@ -8549,7 +8584,7 @@ var DevicesServiceImpl = class {
           presenceSubscribed = true;
         }
       };
-      const subscriptions = new EventSubscriptions3();
+      const subscriptions = new SubscriptionList3();
       if (this._identityManager.identity) {
         subscribeIdentity();
         subscribePresence();
@@ -8568,7 +8603,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";
@@ -8628,7 +8663,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;
@@ -9344,4 +9379,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-ZQFIFOIV.mjs.map
+//# sourceMappingURL=chunk-NK72VK3B.mjs.map