@dxos/client-services 0.1.50 → 0.1.51-main.0e88376

package/dist/lib/node/index.cjs

@@ -1394,7 +1394,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         file: "invitations-handler.ts",
-        line: 100,
+        line: 99,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1435,7 +1435,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 file: "invitations-handler.ts",
-                line: 139,
+                line: 138,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1443,7 +1443,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 140,
+                line: 139,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1459,7 +1459,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 143,
+                line: 142,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1471,7 +1471,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 file: "invitations-handler.ts",
-                line: 145,
+                line: 144,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1481,7 +1481,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   file: "invitations-handler.ts",
-                  line: 148,
+                  line: 147,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1492,7 +1492,7 @@ var InvitationsHandler = class {
               } else {
                 import_log5.log.error("failed", err, {
                   file: "invitations-handler.ts",
-                  line: 151,
+                  line: 150,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1503,13 +1503,13 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 file: "invitations-handler.ts",
-                line: 154,
+                line: 153,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
             } finally {
               if (type !== import_services3.Invitation.Type.MULTIUSE) {
-                await (0, import_async8.sleep)(import_client_protocol2.ON_CLOSE_DELAY);
+                await swarmConnection.close();
                 await ctx.dispose();
               }
             }
@@ -1545,9 +1545,10 @@ var InvitationsHandler = class {
       });
       return extension;
     };
+    let swarmConnection;
     (0, import_async8.scheduleTask)(ctx, async () => {
       const topic = invitation.swarmKey;
-      const swarmConnection = await this._networkManager.joinSwarm({
+      swarmConnection = await this._networkManager.joinSwarm({
         topic,
         peerId: topic,
         protocolProvider: (0, import_network_manager.createTeleportProtocolFactory)(async (teleport) => {
@@ -1578,6 +1579,7 @@ var InvitationsHandler = class {
     const { timeout = import_client_protocol2.INVITATION_TIMEOUT } = invitation;
     (0, import_node_assert6.default)(protocol);
     const authenticated = new import_async8.Trigger();
+    let admitted = false;
     let currentState;
     const stream = new import_async8.PushStream();
     const setState = (newData) => {
@@ -1595,7 +1597,7 @@ var InvitationsHandler = class {
             ...protocol.toJSON()
           }, {
             file: "invitations-handler.ts",
-            line: 225,
+            line: 230,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1605,7 +1607,7 @@ var InvitationsHandler = class {
         } else {
           import_log5.log.warn("auth failed", err, {
             file: "invitations-handler.ts",
-            line: 228,
+            line: 233,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1619,7 +1621,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         file: "invitations-handler.ts",
-        line: 236,
+        line: 241,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1634,11 +1636,11 @@ var InvitationsHandler = class {
               currentState
             }, {
               file: "invitations-handler.ts",
-              line: 246,
+              line: 251,
               scope: this,
               callSite: (f, a) => f(...a)
             });
-            if (currentState !== import_services3.Invitation.State.SUCCESS) {
+            if (!admitted) {
               stream.error(new Error("Remote peer disconnected."));
             }
           });
@@ -1649,7 +1651,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 file: "invitations-handler.ts",
-                line: 255,
+                line: 260,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1661,7 +1663,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 263,
+                line: 268,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1672,7 +1674,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 267,
+                line: 272,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1682,7 +1684,7 @@ var InvitationsHandler = class {
                 response: introductionResponse
               }, {
                 file: "invitations-handler.ts",
-                line: 271,
+                line: 276,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1694,7 +1696,7 @@ var InvitationsHandler = class {
                 for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
                   (0, import_log5.log)("guest waiting for authentication code...", {}, {
                     file: "invitations-handler.ts",
-                    line: 280,
+                    line: 285,
                     scope: this,
                     callSite: (f, a) => f(...a)
                   });
@@ -1706,7 +1708,7 @@ var InvitationsHandler = class {
                   });
                   (0, import_log5.log)("sending authentication request", {}, {
                     file: "invitations-handler.ts",
-                    line: 284,
+                    line: 289,
                     scope: this,
                     callSite: (f, a) => f(...a)
                   });
@@ -1727,7 +1729,7 @@ var InvitationsHandler = class {
                         attempt
                       }, {
                         file: "invitations-handler.ts",
-                        line: 295,
+                        line: 300,
                         scope: this,
                         callSite: (f, a) => f(...a)
                       });
@@ -1744,18 +1746,19 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 306,
+                line: 311,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
               const admissionRequest = await protocol.createAdmissionRequest();
               const admissionResponse = await extension.rpc.InvitationHostService.admit(admissionRequest);
+              admitted = true;
               const result = await protocol.accept(admissionResponse, admissionRequest);
               (0, import_log5.log)("admitted by host", {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 314,
+                line: 322,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1767,7 +1770,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 file: "invitations-handler.ts",
-                line: 316,
+                line: 324,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1777,7 +1780,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   file: "invitations-handler.ts",
-                  line: 319,
+                  line: 327,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1787,7 +1790,7 @@ var InvitationsHandler = class {
               } else {
                 (0, import_log5.log)("auth failed", err, {
                   file: "invitations-handler.ts",
-                  line: 322,
+                  line: 330,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1798,7 +1801,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 file: "invitations-handler.ts",
-                line: 325,
+                line: 333,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1816,7 +1819,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               file: "invitations-handler.ts",
-              line: 336,
+              line: 344,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1826,7 +1829,7 @@ var InvitationsHandler = class {
           } else {
             (0, import_log5.log)("auth failed", err, {
               file: "invitations-handler.ts",
-              line: 339,
+              line: 347,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -2345,6 +2348,7 @@ var import_keys8 = require("@dxos/keys");
 var import_log11 = require("@dxos/log");
 var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials9 = require("@dxos/protocols/proto/dxos/halo/credentials");
+var import_timeframe = require("@dxos/timeframe");
 var import_util5 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
@@ -2687,7 +2691,7 @@ var DataSpace = class DataSpace2 {
         if (err instanceof import_errors3.CancelledError) {
           (0, import_log11.log)("Data pipeline initialization cancelled", err, {
             file: "data-space.ts",
-            line: 172,
+            line: 173,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -2695,7 +2699,7 @@ var DataSpace = class DataSpace2 {
         }
         import_log11.log.error("Error initializing data pipeline", err, {
           file: "data-space.ts",
-          line: 176,
+          line: 177,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2802,7 +2806,7 @@ var DataSpace = class DataSpace2 {
   async createEpoch() {
     var _a, _b;
     const epoch = await this.dataPipeline.createEpoch();
-    await this.inner.controlPipeline.writer.write({
+    const receipt = await this.inner.controlPipeline.writer.write({
       credential: {
         credential: await this._signingContext.credentialSigner.createCredential({
           subject: this.key,
@@ -2813,6 +2817,12 @@ var DataSpace = class DataSpace2 {
         })
       }
     });
+    await this.inner.controlPipeline.state.waitUntilTimeframe(new import_timeframe.Timeframe([
+      [
+        receipt.feedKey,
+        receipt.seq
+      ]
+    ]));
     for (const feed of (_b = (_a = this.inner.dataPipeline.pipelineState) == null ? void 0 : _a.feeds) != null ? _b : []) {
       const indexBeforeEpoch = epoch.timeframe.get(feed.key);
       if (indexBeforeEpoch) {
@@ -2832,7 +2842,7 @@ DataSpace = __decorate2([
 var import_credentials10 = require("@dxos/credentials");
 var import_debug4 = require("@dxos/debug");
 var import_credentials11 = require("@dxos/protocols/proto/dxos/halo/credentials");
-var import_timeframe = require("@dxos/timeframe");
+var import_timeframe2 = require("@dxos/timeframe");
 var spaceGenesis = async (keyring, signingContext, space) => {
   var _a, _b, _c, _d;
   const credentials = [
@@ -2883,7 +2893,7 @@ var spaceGenesis = async (keyring, signingContext, space) => {
         "@type": "dxos.halo.credentials.Epoch",
         number: 0,
         previousId: void 0,
-        timeframe: new import_timeframe.Timeframe(),
+        timeframe: new import_timeframe2.Timeframe(),
         snapshotCid: void 0
       }
     })
@@ -3217,7 +3227,7 @@ var SpacesServiceImpl = class {
           spaces
         }, {
           file: "spaces-service.ts",
-          line: 59,
+          line: 60,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -3304,12 +3314,13 @@ var SpacesServiceImpl = class {
     await space.createEpoch();
   }
   _transformSpace(space) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     return {
       spaceKey: space.key,
       state: space.state,
       error: space.error ? (0, import_protocols7.encodeError)(space.error) : void 0,
       pipeline: {
+        currentEpoch: space.dataPipeline.currentEpoch,
         controlFeeds: space.inner.controlPipeline.state.feeds.map((feed) => feed.key),
         currentControlTimeframe: space.inner.controlPipeline.state.timeframe,
         targetControlTimeframe: space.inner.controlPipeline.state.targetTimeframe,
@@ -3331,6 +3342,7 @@ var SpacesServiceImpl = class {
           presence: ((_c2 = this._identityManager.identity) == null ? void 0 : _c2.identityKey.equals(member.key)) || space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? import_services9.SpaceMember.PresenceState.ONLINE : import_services9.SpaceMember.PresenceState.OFFLINE
         };
       }),
+      creator: (_f = space.inner.spaceState.creator) == null ? void 0 : _f.key,
       cache: space.cache,
       metrics: space.metrics
     };