@dxos/client-services 0.6.3-main.9e4e207 → 0.6.3-next.2f65b78

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

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

package/dist/lib/node/{chunk-MMUSO27N.cjs → chunk-PQML4EXM.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_MMUSO27N_exports = {};
-__export(chunk_MMUSO27N_exports, {
+var chunk_PQML4EXM_exports = {};
+__export(chunk_PQML4EXM_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   ClientServicesProviderResource: () => ClientServicesProviderResource,
@@ -70,7 +70,7 @@ __export(chunk_MMUSO27N_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_MMUSO27N_exports);
+module.exports = __toCommonJS(chunk_PQML4EXM_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -647,7 +647,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.6.3-main.9e4e207";
+var DXOS_VERSION = "0.6.3-next.2f65b78";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -4643,15 +4643,17 @@ var DataSpace = class {
               };
             });
           }
-          const root = await this._echoHost.openSpaceRoot(this.id, handle.url);
+          const root = await this._echoHost.openSpaceRoot(handle.url);
           this._databaseRoot = root;
           if (root.getVersion() !== import_echo_protocol.SpaceDocVersion.CURRENT) {
-            this._state = import_services12.SpaceState.REQUIRES_MIGRATION;
-            this.stateUpdate.emit();
-          } else if (this._state !== import_services12.SpaceState.READY) {
-            await this._enterReadyState();
+            if (this._state !== import_services12.SpaceState.REQUIRES_MIGRATION) {
+              this._state = import_services12.SpaceState.REQUIRES_MIGRATION;
+              this.stateUpdate.emit();
+            }
           } else {
-            this.stateUpdate.emit();
+            if (this._state !== import_services12.SpaceState.READY) {
+              await this._enterReadyState();
+            }
           }
         } catch (_) {
           _usingCtx.e = _;
@@ -4668,7 +4670,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file17,
-          L: 431,
+          L: 433,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4721,18 +4723,14 @@ var DataSpace = class {
         credential
       }
     });
-    const timeframe = new import_timeframe3.Timeframe([
+    await this.inner.controlPipeline.state.waitUntilTimeframe(new import_timeframe3.Timeframe([
       [
         receipt.feedKey,
         receipt.seq
       ]
-    ]);
-    await this.inner.controlPipeline.state.waitUntilTimeframe(timeframe);
+    ]));
     await this._echoHost.updateIndexes();
-    return {
-      credential,
-      timeframe
-    };
+    return credential;
   }
   async activate() {
     if (![
@@ -4758,7 +4756,7 @@ var DataSpace = class {
       state: import_services12.SpaceState[this._state]
     }, {
       F: __dxlog_file17,
-      L: 513,
+      L: 514,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5257,37 +5255,19 @@ var DataSpaceManager = class {
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
         credentialAuthenticator: (0, import_util9.deferFunction)(() => dataSpace.authVerifier.verifier)
       },
-      onAuthorizedConnection: (session) => queueMicrotask(async () => {
-        try {
-          if (!session.isOpen) {
-            return;
-          }
-          session.addExtension("dxos.mesh.teleport.admission-discovery", new import_echo_pipeline4.CredentialServerExtension(space));
-          session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
-            remotePeerId: session.remotePeerId
-          }));
-          session.addExtension("dxos.mesh.teleport.notarization", dataSpace.notarizationPlugin.createExtension());
-          await this._echoHost.authorizeDevice(space.key, session.remotePeerId);
-          if (!session.isOpen) {
-            return;
-          }
-          session.addExtension("dxos.mesh.teleport.automerge", this._echoHost.createReplicationExtension());
-        } catch (err) {
-          import_log15.log.warn("error on authorized connection", {
-            err
-          }, {
-            F: __dxlog_file18,
-            L: 403,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          await session.close(err);
-        }
-      }),
+      onAuthorizedConnection: (session) => {
+        session.addExtension("dxos.mesh.teleport.admission-discovery", new import_echo_pipeline4.CredentialServerExtension(space));
+        session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
+          remotePeerId: session.remotePeerId
+        }));
+        session.addExtension("dxos.mesh.teleport.notarization", dataSpace.notarizationPlugin.createExtension());
+        this._echoHost.authorizeDevice(space.key, session.remotePeerId);
+        session.addExtension("dxos.mesh.teleport.automerge", this._echoHost.createReplicationExtension());
+      },
       onAuthFailure: () => {
         import_log15.log.warn("auth failure", void 0, {
           F: __dxlog_file18,
-          L: 408,
+          L: 396,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5320,7 +5300,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file18,
-            L: 435,
+            L: 423,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5331,7 +5311,7 @@ var DataSpaceManager = class {
             open: this._isOpen
           }, {
             F: __dxlog_file18,
-            L: 438,
+            L: 426,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5350,7 +5330,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file18,
-            L: 446,
+            L: 434,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5391,7 +5371,7 @@ var DataSpaceManager = class {
       closedSessions
     }, {
       F: __dxlog_file18,
-      L: 482,
+      L: 470,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5406,7 +5386,7 @@ var DataSpaceManager = class {
           peerId: peerState.peerId
         }, {
           F: __dxlog_file18,
-          L: 496,
+          L: 484,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5534,9 +5514,9 @@ var SpacesServiceImpl = class {
       const scheduler = new import_async17.UpdateScheduler(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
-        (0, import_log16.log)("update", () => ({
-          ids: spaces.map((space) => space.id)
-        }), {
+        (0, import_log16.log)("update", {
+          spaces
+        }, {
           F: __dxlog_file19,
           L: 115,
           S: this,
@@ -5671,13 +5651,12 @@ var SpacesServiceImpl = class {
   async createEpoch({ spaceKey, migration, automergeRootUrl }) {
     const dataSpaceManager = await this._getDataSpaceManager();
     const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols12.SpaceNotFoundError(spaceKey));
-    const result = await space.createEpoch({
+    const credential = await space.createEpoch({
       migration,
       newAutomergeRoot: automergeRootUrl
     });
     return {
-      epochCredential: result?.credential,
-      controlTimeframe: result?.timeframe
+      epochCredential: credential ?? void 0
     };
   }
   async admitContact(request) {
@@ -7156,4 +7135,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-MMUSO27N.cjs.map
+//# sourceMappingURL=chunk-PQML4EXM.cjs.map