@dxos/client-services 0.5.9-main.df0042a → 0.5.9-main.e183eeb

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

@@ -30,7 +30,7 @@ __export(testing_exports, {
   sanitizeInvitation: () => sanitizeInvitation
 });
 module.exports = __toCommonJS(testing_exports);
-var import_chunk_2K5VPBW6 = require("../../chunk-2K5VPBW6.cjs");
+var import_chunk_F2EIFQZH = require("../../chunk-F2EIFQZH.cjs");
 var import_credentials = require("@dxos/credentials");
 var import_keys = require("@dxos/keys");
 var import_async = require("@dxos/async");
@@ -227,7 +227,7 @@ var createInvitation = async (host, options) => {
     authMethod: import_services.Invitation.AuthMethod.NONE,
     ...options ?? {}
   };
-  if (host instanceof import_chunk_2K5VPBW6.ServiceContext) {
+  if (host instanceof import_chunk_F2EIFQZH.ServiceContext) {
     return host.invitationsManager.createInvitation({
       kind: import_services.Invitation.Kind.SPACE,
       ...options
@@ -237,7 +237,7 @@ var createInvitation = async (host, options) => {
 };
 var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
   invitation = sanitizeInvitation(invitation);
-  if (guest instanceof import_chunk_2K5VPBW6.ServiceContext) {
+  if (guest instanceof import_chunk_F2EIFQZH.ServiceContext) {
     return guest.invitationsManager.acceptInvitation({
       invitation,
       deviceProfile: guestDeviceProfile
@@ -246,7 +246,7 @@ var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
   return guest.join(invitation, guestDeviceProfile);
 };
 var createServiceHost = (config, signalManagerContext) => {
-  return new import_chunk_2K5VPBW6.ClientServicesHost({
+  return new import_chunk_F2EIFQZH.ClientServicesHost({
     config,
     signalManager: new import_messaging.MemorySignalManager(signalManagerContext),
     transportFactory: import_network_manager.MemoryTransportFactory
@@ -262,7 +262,7 @@ var createServiceContext = async ({ signalContext = new import_messaging.MemoryS
   });
   const level = (0, import_testing.createTestLevel)();
   await level.open();
-  return new import_chunk_2K5VPBW6.ServiceContext(storage, level, networkManager, signalManager, {
+  return new import_chunk_F2EIFQZH.ServiceContext(storage, level, networkManager, signalManager, {
     invitationConnectionDefaultParams: {
       controlHeartbeatInterval: 200
     },
@@ -363,12 +363,12 @@ var TestPeer = class {
     });
   }
   get dataSpaceManager() {
-    return this._props.dataSpaceManager ??= new import_chunk_2K5VPBW6.DataSpaceManager(this.spaceManager, this.metadataStore, this.keyring, this.identity, this.feedStore, this.echoHost, this.invitationsManager, this._opts.dataSpaceParams);
+    return this._props.dataSpaceManager ??= new import_chunk_F2EIFQZH.DataSpaceManager(this.spaceManager, this.metadataStore, this.keyring, this.identity, this.feedStore, this.echoHost, this.invitationsManager, this._opts.dataSpaceParams);
   }
   get invitationsManager() {
-    return this._props.invitationsManager ??= new import_chunk_2K5VPBW6.InvitationsManager(new import_chunk_2K5VPBW6.InvitationsHandler(this.networkManager), (invitation) => {
+    return this._props.invitationsManager ??= new import_chunk_F2EIFQZH.InvitationsManager(new import_chunk_F2EIFQZH.InvitationsHandler(this.networkManager), (invitation) => {
       if (invitation.kind === import_services2.Invitation.Kind.SPACE) {
-        return new import_chunk_2K5VPBW6.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
+        return new import_chunk_F2EIFQZH.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
       } else {
         throw new Error("not implemented");
       }

package/dist/types/src/packlets/identity/identity-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identity-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/identity/identity-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIzC,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,QAAQ,IAAI,aAAa,EAC9B,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAE7B,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAEtG,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACtF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAElD,qBAAa,mBAAoB,SAAQ,QAAS,YAAW,eAAe;IAExE,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,yBAAyB;IAC1C,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAJjB,gBAAgB,EAAE,eAAe,EACjC,QAAQ,EAAE,OAAO,EACjB,yBAAyB,EAAE,MAAM,gBAAgB,EACjD,eAAe,EAAE,CAAC,MAAM,EAAE,qBAAqB,KAAK,OAAO,CAAC,QAAQ,CAAC,EACrE,gBAAgB,CAAC,aAAY,eAAe,GAAG,SAAS,KAAK,QAAQ,IAAI,CAAC,aAAA;cAKpE,KAAK;IAOxB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,aAAa,CAAC;YAO9D,mBAAmB;IAO3B,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,aAAa,CAAC;IAI9E,aAAa,IAAI,MAAM,CAAC,qBAAqB,CAAC;IAS9C,OAAO,CAAC,YAAY;IAYd,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC;IAO/D,gBAAgB,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,uBAAuB,GAAG,OAAO,CAAC,YAAY,CAAC;YAYjF,+BAA+B;CAuB9C"}
+{"version":3,"file":"identity-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/identity/identity-service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIzC,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,QAAQ,IAAI,aAAa,EAC9B,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAE7B,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAGtG,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACtF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAIlD,qBAAa,mBAAoB,SAAQ,QAAS,YAAW,eAAe;IAExE,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,yBAAyB;IAC1C,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAJjB,gBAAgB,EAAE,eAAe,EACjC,QAAQ,EAAE,OAAO,EACjB,yBAAyB,EAAE,MAAM,gBAAgB,EACjD,eAAe,EAAE,CAAC,MAAM,EAAE,qBAAqB,KAAK,OAAO,CAAC,QAAQ,CAAC,EACrE,gBAAgB,CAAC,aAAY,eAAe,GAAG,SAAS,KAAK,QAAQ,IAAI,CAAC,aAAA;cAKpE,KAAK;IAOxB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,aAAa,CAAC;YAO9D,mBAAmB;IAO3B,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,aAAa,CAAC;IAI9E,aAAa,IAAI,MAAM,CAAC,qBAAqB,CAAC;IAS9C,OAAO,CAAC,YAAY;IAYd,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC;IAO/D,gBAAgB,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,uBAAuB,GAAG,OAAO,CAAC,YAAY,CAAC;YAYjF,+BAA+B;CAuC9C"}

package/dist/types/src/version.d.ts

@@ -1,2 +1,2 @@
-export declare const DXOS_VERSION = "0.5.9-main.df0042a";
+export declare const DXOS_VERSION = "0.5.9-main.e183eeb";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.5.9-main.df0042a",
+  "version": "0.5.9-main.e183eeb",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -23,45 +23,45 @@
   ],
   "dependencies": {
     "platform": "^1.3.6",
-    "@dxos/async": "0.5.9-main.df0042a",
-    "@dxos/automerge": "0.5.9-main.df0042a",
-    "@dxos/client-protocol": "0.5.9-main.df0042a",
-    "@dxos/codec-protobuf": "0.5.9-main.df0042a",
-    "@dxos/config": "0.5.9-main.df0042a",
-    "@dxos/context": "0.5.9-main.df0042a",
-    "@dxos/crypto": "0.5.9-main.df0042a",
-    "@dxos/credentials": "0.5.9-main.df0042a",
-    "@dxos/debug": "0.5.9-main.df0042a",
-    "@dxos/echo-db": "0.5.9-main.df0042a",
-    "@dxos/echo-protocol": "0.5.9-main.df0042a",
-    "@dxos/echo-pipeline": "0.5.9-main.df0042a",
-    "@dxos/echo-schema": "0.5.9-main.df0042a",
-    "@dxos/feed-store": "0.5.9-main.df0042a",
-    "@dxos/indexing": "0.5.9-main.df0042a",
-    "@dxos/keyring": "0.5.9-main.df0042a",
-    "@dxos/invariant": "0.5.9-main.df0042a",
-    "@dxos/keys": "0.5.9-main.df0042a",
-    "@dxos/kv-store": "0.5.9-main.df0042a",
-    "@dxos/lock-file": "0.5.9-main.df0042a",
-    "@dxos/messaging": "0.5.9-main.df0042a",
-    "@dxos/log": "0.5.9-main.df0042a",
-    "@dxos/network-manager": "0.5.9-main.df0042a",
-    "@dxos/node-std": "0.5.9-main.df0042a",
-    "@dxos/protocols": "0.5.9-main.df0042a",
-    "@dxos/random-access-storage": "0.5.9-main.df0042a",
-    "@dxos/rpc": "0.5.9-main.df0042a",
-    "@dxos/teleport-extension-object-sync": "0.5.9-main.df0042a",
-    "@dxos/teleport-extension-gossip": "0.5.9-main.df0042a",
-    "@dxos/teleport": "0.5.9-main.df0042a",
-    "@dxos/timeframe": "0.5.9-main.df0042a",
-    "@dxos/tracing": "0.5.9-main.df0042a",
-    "@dxos/websocket-rpc": "0.5.9-main.df0042a",
-    "@dxos/util": "0.5.9-main.df0042a"
+    "@dxos/async": "0.5.9-main.e183eeb",
+    "@dxos/automerge": "0.5.9-main.e183eeb",
+    "@dxos/client-protocol": "0.5.9-main.e183eeb",
+    "@dxos/codec-protobuf": "0.5.9-main.e183eeb",
+    "@dxos/config": "0.5.9-main.e183eeb",
+    "@dxos/context": "0.5.9-main.e183eeb",
+    "@dxos/credentials": "0.5.9-main.e183eeb",
+    "@dxos/crypto": "0.5.9-main.e183eeb",
+    "@dxos/debug": "0.5.9-main.e183eeb",
+    "@dxos/echo-db": "0.5.9-main.e183eeb",
+    "@dxos/echo-protocol": "0.5.9-main.e183eeb",
+    "@dxos/echo-schema": "0.5.9-main.e183eeb",
+    "@dxos/echo-pipeline": "0.5.9-main.e183eeb",
+    "@dxos/feed-store": "0.5.9-main.e183eeb",
+    "@dxos/invariant": "0.5.9-main.e183eeb",
+    "@dxos/indexing": "0.5.9-main.e183eeb",
+    "@dxos/keys": "0.5.9-main.e183eeb",
+    "@dxos/keyring": "0.5.9-main.e183eeb",
+    "@dxos/lock-file": "0.5.9-main.e183eeb",
+    "@dxos/kv-store": "0.5.9-main.e183eeb",
+    "@dxos/log": "0.5.9-main.e183eeb",
+    "@dxos/messaging": "0.5.9-main.e183eeb",
+    "@dxos/network-manager": "0.5.9-main.e183eeb",
+    "@dxos/protocols": "0.5.9-main.e183eeb",
+    "@dxos/node-std": "0.5.9-main.e183eeb",
+    "@dxos/rpc": "0.5.9-main.e183eeb",
+    "@dxos/teleport": "0.5.9-main.e183eeb",
+    "@dxos/random-access-storage": "0.5.9-main.e183eeb",
+    "@dxos/teleport-extension-object-sync": "0.5.9-main.e183eeb",
+    "@dxos/timeframe": "0.5.9-main.e183eeb",
+    "@dxos/teleport-extension-gossip": "0.5.9-main.e183eeb",
+    "@dxos/tracing": "0.5.9-main.e183eeb",
+    "@dxos/util": "0.5.9-main.e183eeb",
+    "@dxos/websocket-rpc": "0.5.9-main.e183eeb"
   },
   "devDependencies": {
     "@types/platform": "^1.3.4",
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.5.9-main.df0042a"
+    "@dxos/signal": "0.5.9-main.e183eeb"
   },
   "publishConfig": {
     "access": "public"

package/src/packlets/identity/identity-service.ts

@@ -2,12 +2,14 @@
 // Copyright 2023 DXOS.org
 //
 
+import { Trigger, sleep } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
 import { Resource } from '@dxos/context';
 import { signPresentation } from '@dxos/credentials';
 import { todo } from '@dxos/debug';
 import { invariant } from '@dxos/invariant';
 import { type Keyring } from '@dxos/keyring';
+import { log } from '@dxos/log';
 import {
   type CreateIdentityRequest,
   type Identity as IdentityProto,
@@ -18,11 +20,14 @@ import {
   SpaceState,
 } from '@dxos/protocols/proto/dxos/client/services';
 import { type Presentation, type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
+import { safeAwaitAll } from '@dxos/util';
 
 import { type Identity } from './identity';
 import { type CreateIdentityOptions, type IdentityManager } from './identity-manager';
 import { type DataSpaceManager } from '../spaces';
 
+const DEFAULT_SPACE_SEARCH_TIMEOUT = 10_000;
+
 export class IdentityServiceImpl extends Resource implements IdentityService {
   constructor(
     private readonly _identityManager: IdentityManager,
@@ -100,25 +105,41 @@ export class IdentityServiceImpl extends Resource implements IdentityService {
   }
 
   private async _fixIdentityWithoutDefaultSpace(identity: Identity) {
-    let hasDefaultSpace = false;
+    let recodedDefaultSpace = false;
+    let foundDefaultSpace = false;
     const dataSpaceManager = this._dataSpaceManagerProvider();
-    for (const space of dataSpaceManager.spaces.values()) {
+
+    const recordedDefaultSpaceTrigger = new Trigger();
+
+    const allProcessed = safeAwaitAll(dataSpaceManager.spaces.values(), async (space) => {
       if (space.state === SpaceState.CLOSED) {
         await space.open();
 
         // Wait until the space is either READY or REQUIRES_MIGRATION.
+        // NOTE: Space could potentially never initialize if the space data is corrupted.
         const requiresMigration = space.stateUpdate.waitForCondition(
           () => space.state === SpaceState.REQUIRES_MIGRATION,
         );
         await Promise.race([space.initializeDataPipeline(), requiresMigration]);
       }
       if (await dataSpaceManager.isDefaultSpace(space)) {
+        if (foundDefaultSpace) {
+          log.warn('Multiple default spaces found. Using the first one.', { duplicate: space.id });
+          return;
+        }
+
+        foundDefaultSpace = true;
         await identity.updateDefaultSpace(space.id);
-        hasDefaultSpace = true;
-        break;
+        recodedDefaultSpace = true;
+        recordedDefaultSpaceTrigger.wake();
       }
-    }
-    if (!hasDefaultSpace) {
+    });
+
+    // Wait for all spaces to be processed or until the default space is recorded.
+    // If the timeout is reached, create a new default space.
+    await Promise.race([allProcessed, recordedDefaultSpaceTrigger.wait(), sleep(DEFAULT_SPACE_SEARCH_TIMEOUT)]);
+
+    if (!recodedDefaultSpace) {
       await this._createDefaultSpace(dataSpaceManager);
     }
   }

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.5.9-main.df0042a";
+export const DXOS_VERSION = "0.5.9-main.e183eeb";