@dxos/client-services 0.6.2 → 0.6.3-main.226a8ae

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

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

package/dist/lib/node/{chunk-7XBIZ7NK.cjs → chunk-LHYZLG23.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_7XBIZ7NK_exports = {};
-__export(chunk_7XBIZ7NK_exports, {
+var chunk_LHYZLG23_exports = {};
+__export(chunk_LHYZLG23_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   ClientServicesProviderResource: () => ClientServicesProviderResource,
@@ -70,7 +70,7 @@ __export(chunk_7XBIZ7NK_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_7XBIZ7NK_exports);
+module.exports = __toCommonJS(chunk_LHYZLG23_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.2";
+var DXOS_VERSION = "0.6.3-main.226a8ae";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -2488,7 +2488,7 @@ var InvitationsHandler = class {
     this._defaultTeleportParams = _defaultTeleportParams;
   }
   handleInvitationFlow(ctx, stream, protocol, invitation) {
-    metrics.increment("invitation.created");
+    metrics.increment("dxos.invitation.created");
     const guardedState = this._createGuardedState(ctx, invitation, stream);
     const createExtension = () => {
       const extension = new InvitationHostExtension(guardedState.mutex, {
@@ -2558,7 +2558,7 @@ var InvitationsHandler = class {
                 C: (f, a) => f(...a)
               });
               guardedState.set(extension, import_services6.Invitation.State.SUCCESS);
-              metrics.increment("invitation.success");
+              metrics.increment("dxos.invitation.success");
               import_log6.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols5.trace.end({
                 id: traceId
               }), {
@@ -2574,7 +2574,7 @@ var InvitationsHandler = class {
             } catch (err) {
               if (err instanceof import_async9.TimeoutError) {
                 if (guardedState.set(extension, import_services6.Invitation.State.TIMEOUT)) {
-                  metrics.increment("invitation.timeout");
+                  metrics.increment("dxos.invitation.timeout");
                   (0, import_log6.log)("timeout", {
                     ...protocol.toJSON()
                   }, {
@@ -2586,7 +2586,7 @@ var InvitationsHandler = class {
                 }
               } else {
                 if (guardedState.error(extension, err)) {
-                  metrics.increment("invitation.failed");
+                  metrics.increment("dxos.invitation.failed");
                   import_log6.log.error("failed", err, {
                     F: __dxlog_file12,
                     L: 139,
@@ -2622,7 +2622,7 @@ var InvitationsHandler = class {
           }
           if (err instanceof import_async9.TimeoutError) {
             if (guardedState.set(extension, import_services6.Invitation.State.TIMEOUT)) {
-              metrics.increment("invitation.timeout");
+              metrics.increment("dxos.invitation.timeout");
               (0, import_log6.log)("timeout", {
                 err
               }, {
@@ -2634,7 +2634,7 @@ var InvitationsHandler = class {
             }
           } else {
             if (guardedState.error(extension, err)) {
-              metrics.increment("invitation.failed");
+              metrics.increment("dxos.invitation.failed");
               import_log6.log.error("failed", err, {
                 F: __dxlog_file12,
                 L: 161,
@@ -2659,7 +2659,7 @@ var InvitationsHandler = class {
         (0, import_async9.scheduleTask)(ctx, async () => {
           await swarmConnection.close();
           guardedState.set(null, import_services6.Invitation.State.EXPIRED);
-          metrics.increment("invitation.expired");
+          metrics.increment("dxos.invitation.expired");
           await ctx.dispose();
         }, invitation.created.getTime() + invitation.lifetime * 1e3 - Date.now());
       }
@@ -4643,17 +4643,15 @@ var DataSpace = class {
               };
             });
           }
-          const root = await this._echoHost.openSpaceRoot(handle.url);
+          const root = await this._echoHost.openSpaceRoot(this.id, handle.url);
           this._databaseRoot = root;
           if (root.getVersion() !== import_echo_protocol.SpaceDocVersion.CURRENT) {
-            if (this._state !== import_services12.SpaceState.REQUIRES_MIGRATION) {
-              this._state = import_services12.SpaceState.REQUIRES_MIGRATION;
-              this.stateUpdate.emit();
-            }
+            this._state = import_services12.SpaceState.REQUIRES_MIGRATION;
+            this.stateUpdate.emit();
+          } else if (this._state !== import_services12.SpaceState.READY) {
+            await this._enterReadyState();
           } else {
-            if (this._state !== import_services12.SpaceState.READY) {
-              await this._enterReadyState();
-            }
+            this.stateUpdate.emit();
           }
         } catch (_) {
           _usingCtx.e = _;
@@ -4670,7 +4668,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file17,
-          L: 433,
+          L: 431,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4723,14 +4721,18 @@ var DataSpace = class {
         credential
       }
     });
-    await this.inner.controlPipeline.state.waitUntilTimeframe(new import_timeframe3.Timeframe([
+    const timeframe = new import_timeframe3.Timeframe([
       [
         receipt.feedKey,
         receipt.seq
       ]
-    ]));
+    ]);
+    await this.inner.controlPipeline.state.waitUntilTimeframe(timeframe);
     await this._echoHost.updateIndexes();
-    return credential;
+    return {
+      credential,
+      timeframe
+    };
   }
   async activate() {
     if (![
@@ -4756,7 +4758,7 @@ var DataSpace = class {
       state: import_services12.SpaceState[this._state]
     }, {
       F: __dxlog_file17,
-      L: 514,
+      L: 513,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5255,19 +5257,37 @@ var DataSpaceManager = class {
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
         credentialAuthenticator: (0, import_util9.deferFunction)(() => dataSpace.authVerifier.verifier)
       },
-      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());
-      },
+      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);
+        }
+      }),
       onAuthFailure: () => {
         import_log15.log.warn("auth failure", void 0, {
           F: __dxlog_file18,
-          L: 396,
+          L: 408,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5300,7 +5320,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file18,
-            L: 423,
+            L: 435,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5311,7 +5331,7 @@ var DataSpaceManager = class {
             open: this._isOpen
           }, {
             F: __dxlog_file18,
-            L: 426,
+            L: 438,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5330,7 +5350,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file18,
-            L: 434,
+            L: 446,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5371,7 +5391,7 @@ var DataSpaceManager = class {
       closedSessions
     }, {
       F: __dxlog_file18,
-      L: 470,
+      L: 482,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5386,7 +5406,7 @@ var DataSpaceManager = class {
           peerId: peerState.peerId
         }, {
           F: __dxlog_file18,
-          L: 484,
+          L: 496,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5514,9 +5534,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", {
-          spaces
-        }, {
+        (0, import_log16.log)("update", () => ({
+          ids: spaces.map((space) => space.id)
+        }), {
           F: __dxlog_file19,
           L: 115,
           S: this,
@@ -5651,12 +5671,13 @@ 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 credential = await space.createEpoch({
+    const result = await space.createEpoch({
       migration,
       newAutomergeRoot: automergeRootUrl
     });
     return {
-      epochCredential: credential ?? void 0
+      epochCredential: result?.credential,
+      controlTimeframe: result?.timeframe
     };
   }
   async admitContact(request) {
@@ -5763,7 +5784,7 @@ var SpacesServiceImpl = class {
     const dataSpaceManager = await this._getDataSpaceManager();
     const identity = this._identityManager.identity?.identityKey.truncate();
     if (identity) {
-      import_tracing8.trace.metrics.gauge("echo.space.count", dataSpaceManager.spaces.size, {
+      import_tracing8.trace.metrics.gauge("dxos.echo.space.count", dataSpaceManager.spaces.size, {
         tags: {
           identity
         }
@@ -7135,4 +7156,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-7XBIZ7NK.cjs.map
+//# sourceMappingURL=chunk-LHYZLG23.cjs.map