@dxos/client-services 0.6.3-main.d007b87 → 0.6.3-main.daaea86

package/dist/lib/browser/{chunk-Y7UULU6J.mjs → chunk-UESTPAVS.mjs}

@@ -359,7 +359,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.6.3-main.d007b87";
+var DXOS_VERSION = "0.6.3-main.daaea86";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -2402,7 +2402,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, {
@@ -2472,7 +2472,7 @@ var InvitationsHandler = class {
                 C: (f, a) => f(...a)
               });
               guardedState.set(extension, Invitation4.State.SUCCESS);
-              metrics.increment("invitation.success");
+              metrics.increment("dxos.invitation.success");
               log10.trace("dxos.sdk.invitations-handler.host.onOpen", trace5.end({
                 id: traceId
               }), {
@@ -2488,7 +2488,7 @@ var InvitationsHandler = class {
             } catch (err) {
               if (err instanceof TimeoutError) {
                 if (guardedState.set(extension, Invitation4.State.TIMEOUT)) {
-                  metrics.increment("invitation.timeout");
+                  metrics.increment("dxos.invitation.timeout");
                   log10("timeout", {
                     ...protocol.toJSON()
                   }, {
@@ -2500,7 +2500,7 @@ var InvitationsHandler = class {
                 }
               } else {
                 if (guardedState.error(extension, err)) {
-                  metrics.increment("invitation.failed");
+                  metrics.increment("dxos.invitation.failed");
                   log10.error("failed", err, {
                     F: __dxlog_file13,
                     L: 139,
@@ -2536,7 +2536,7 @@ var InvitationsHandler = class {
           }
           if (err instanceof TimeoutError) {
             if (guardedState.set(extension, Invitation4.State.TIMEOUT)) {
-              metrics.increment("invitation.timeout");
+              metrics.increment("dxos.invitation.timeout");
               log10("timeout", {
                 err
               }, {
@@ -2548,7 +2548,7 @@ var InvitationsHandler = class {
             }
           } else {
             if (guardedState.error(extension, err)) {
-              metrics.increment("invitation.failed");
+              metrics.increment("dxos.invitation.failed");
               log10.error("failed", err, {
                 F: __dxlog_file13,
                 L: 161,
@@ -2573,7 +2573,7 @@ var InvitationsHandler = class {
         scheduleTask3(ctx, async () => {
           await swarmConnection.close();
           guardedState.set(null, Invitation4.State.EXPIRED);
-          metrics.increment("invitation.expired");
+          metrics.increment("dxos.invitation.expired");
           await ctx.dispose();
         }, invitation.created.getTime() + invitation.lifetime * 1e3 - Date.now());
       }
@@ -4628,17 +4628,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() !== SpaceDocVersion2.CURRENT) {
-            if (this._state !== SpaceState2.REQUIRES_MIGRATION) {
-              this._state = SpaceState2.REQUIRES_MIGRATION;
-              this.stateUpdate.emit();
-            }
+            this._state = SpaceState2.REQUIRES_MIGRATION;
+            this.stateUpdate.emit();
+          } else if (this._state !== SpaceState2.READY) {
+            await this._enterReadyState();
           } else {
-            if (this._state !== SpaceState2.READY) {
-              await this._enterReadyState();
-            }
+            this.stateUpdate.emit();
           }
         } catch (_) {
           _usingCtx.e = _;
@@ -4655,7 +4653,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file18,
-          L: 433,
+          L: 431,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4708,14 +4706,18 @@ var DataSpace = class {
         credential
       }
     });
-    await this.inner.controlPipeline.state.waitUntilTimeframe(new Timeframe3([
+    const timeframe = new Timeframe3([
       [
         receipt.feedKey,
         receipt.seq
       ]
-    ]));
+    ]);
+    await this.inner.controlPipeline.state.waitUntilTimeframe(timeframe);
     await this._echoHost.updateIndexes();
-    return credential;
+    return {
+      credential,
+      timeframe
+    };
   }
   async activate() {
     if (![
@@ -4741,7 +4743,7 @@ var DataSpace = class {
       state: SpaceState2[this._state]
     }, {
       F: __dxlog_file18,
-      L: 514,
+      L: 513,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5269,19 +5271,37 @@ var DataSpaceManager = class {
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
         credentialAuthenticator: deferFunction2(() => dataSpace.authVerifier.verifier)
       },
-      onAuthorizedConnection: (session) => {
-        session.addExtension("dxos.mesh.teleport.admission-discovery", new 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 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) {
+          log16.warn("error on authorized connection", {
+            err
+          }, {
+            F: __dxlog_file19,
+            L: 403,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          await session.close(err);
+        }
+      }),
       onAuthFailure: () => {
         log16.warn("auth failure", void 0, {
           F: __dxlog_file19,
-          L: 396,
+          L: 408,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5314,7 +5334,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file19,
-            L: 423,
+            L: 435,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5325,7 +5345,7 @@ var DataSpaceManager = class {
             open: this._isOpen
           }, {
             F: __dxlog_file19,
-            L: 426,
+            L: 438,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5344,7 +5364,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file19,
-            L: 434,
+            L: 446,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5385,7 +5405,7 @@ var DataSpaceManager = class {
       closedSessions
     }, {
       F: __dxlog_file19,
-      L: 470,
+      L: 482,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5400,7 +5420,7 @@ var DataSpaceManager = class {
           peerId: peerState.peerId
         }, {
           F: __dxlog_file19,
-          L: 484,
+          L: 496,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5540,9 +5560,9 @@ var SpacesServiceImpl = class {
       const scheduler = new UpdateScheduler(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
-        log17("update", {
-          spaces
-        }, {
+        log17("update", () => ({
+          ids: spaces.map((space) => space.id)
+        }), {
           F: __dxlog_file20,
           L: 115,
           S: this,
@@ -5677,12 +5697,13 @@ var SpacesServiceImpl = class {
   async createEpoch({ spaceKey, migration, automergeRootUrl }) {
     const dataSpaceManager = await this._getDataSpaceManager();
     const space = dataSpaceManager.spaces.get(spaceKey) ?? raise2(new SpaceNotFoundError2(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) {
@@ -5789,7 +5810,7 @@ var SpacesServiceImpl = class {
     const dataSpaceManager = await this._getDataSpaceManager();
     const identity = this._identityManager.identity?.identityKey.truncate();
     if (identity) {
-      trace8.metrics.gauge("echo.space.count", dataSpaceManager.spaces.size, {
+      trace8.metrics.gauge("dxos.echo.space.count", dataSpaceManager.spaces.size, {
         tags: {
           identity
         }
@@ -7332,4 +7353,4 @@ export {
   ClientServicesProviderResource,
   DiagnosticsCollector
 };
-//# sourceMappingURL=chunk-Y7UULU6J.mjs.map
+//# sourceMappingURL=chunk-UESTPAVS.mjs.map