@dxos/client-services 0.1.50 → 0.1.51-main.04d9478

package/dist/lib/browser/{chunk-BAHSFG33.mjs → chunk-QUJROKKU.mjs}

@@ -969,8 +969,8 @@ var DeviceInvitationProtocol = class {
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts
 import assert6 from "@dxos/node-std/assert";
-import { PushStream, scheduleTask as scheduleTask2, sleep, TimeoutError, Trigger as Trigger3 } from "@dxos/async";
-import { AuthenticatingInvitationObservable, AUTHENTICATION_CODE_LENGTH, CancellableInvitationObservable, INVITATION_TIMEOUT, ON_CLOSE_DELAY } from "@dxos/client-protocol";
+import { PushStream, scheduleTask as scheduleTask2, TimeoutError, Trigger as Trigger3 } from "@dxos/async";
+import { AuthenticatingInvitationObservable, AUTHENTICATION_CODE_LENGTH, CancellableInvitationObservable, INVITATION_TIMEOUT } from "@dxos/client-protocol";
 import { Context as Context4 } from "@dxos/context";
 import { generatePasscode } from "@dxos/credentials";
 import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError2 } from "@dxos/errors";
@@ -1326,7 +1326,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         file: "invitations-handler.ts",
-        line: 100,
+        line: 99,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1367,7 +1367,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 file: "invitations-handler.ts",
-                line: 139,
+                line: 138,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1375,7 +1375,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 140,
+                line: 139,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1391,7 +1391,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 143,
+                line: 142,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1403,7 +1403,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 file: "invitations-handler.ts",
-                line: 145,
+                line: 144,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1413,7 +1413,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   file: "invitations-handler.ts",
-                  line: 148,
+                  line: 147,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1424,7 +1424,7 @@ var InvitationsHandler = class {
               } else {
                 log5.error("failed", err, {
                   file: "invitations-handler.ts",
-                  line: 151,
+                  line: 150,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1435,13 +1435,13 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 file: "invitations-handler.ts",
-                line: 154,
+                line: 153,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
             } finally {
               if (type !== Invitation3.Type.MULTIUSE) {
-                await sleep(ON_CLOSE_DELAY);
+                await swarmConnection.close();
                 await ctx.dispose();
               }
             }
@@ -1477,9 +1477,10 @@ var InvitationsHandler = class {
       });
       return extension;
     };
+    let swarmConnection;
     scheduleTask2(ctx, async () => {
       const topic = invitation.swarmKey;
-      const swarmConnection = await this._networkManager.joinSwarm({
+      swarmConnection = await this._networkManager.joinSwarm({
         topic,
         peerId: topic,
         protocolProvider: createTeleportProtocolFactory(async (teleport) => {
@@ -1510,6 +1511,7 @@ var InvitationsHandler = class {
     const { timeout = INVITATION_TIMEOUT } = invitation;
     assert6(protocol);
     const authenticated = new Trigger3();
+    let admitted = false;
     let currentState;
     const stream = new PushStream();
     const setState = (newData) => {
@@ -1527,7 +1529,7 @@ var InvitationsHandler = class {
             ...protocol.toJSON()
           }, {
             file: "invitations-handler.ts",
-            line: 225,
+            line: 230,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1537,7 +1539,7 @@ var InvitationsHandler = class {
         } else {
           log5.warn("auth failed", err, {
             file: "invitations-handler.ts",
-            line: 228,
+            line: 233,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1551,7 +1553,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         file: "invitations-handler.ts",
-        line: 236,
+        line: 241,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1566,11 +1568,11 @@ var InvitationsHandler = class {
               currentState
             }, {
               file: "invitations-handler.ts",
-              line: 246,
+              line: 251,
               scope: this,
               callSite: (f, a) => f(...a)
             });
-            if (currentState !== Invitation3.State.SUCCESS) {
+            if (!admitted) {
               stream.error(new Error("Remote peer disconnected."));
             }
           });
@@ -1581,7 +1583,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 file: "invitations-handler.ts",
-                line: 255,
+                line: 260,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1593,7 +1595,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 263,
+                line: 268,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1604,7 +1606,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 267,
+                line: 272,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1614,7 +1616,7 @@ var InvitationsHandler = class {
                 response: introductionResponse
               }, {
                 file: "invitations-handler.ts",
-                line: 271,
+                line: 276,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1626,7 +1628,7 @@ var InvitationsHandler = class {
                 for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
                   log5("guest waiting for authentication code...", {}, {
                     file: "invitations-handler.ts",
-                    line: 280,
+                    line: 285,
                     scope: this,
                     callSite: (f, a) => f(...a)
                   });
@@ -1638,7 +1640,7 @@ var InvitationsHandler = class {
                   });
                   log5("sending authentication request", {}, {
                     file: "invitations-handler.ts",
-                    line: 284,
+                    line: 289,
                     scope: this,
                     callSite: (f, a) => f(...a)
                   });
@@ -1659,7 +1661,7 @@ var InvitationsHandler = class {
                         attempt
                       }, {
                         file: "invitations-handler.ts",
-                        line: 295,
+                        line: 300,
                         scope: this,
                         callSite: (f, a) => f(...a)
                       });
@@ -1676,18 +1678,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);
               log5("admitted by host", {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 314,
+                line: 322,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1699,7 +1702,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 file: "invitations-handler.ts",
-                line: 316,
+                line: 324,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1709,7 +1712,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   file: "invitations-handler.ts",
-                  line: 319,
+                  line: 327,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1719,7 +1722,7 @@ var InvitationsHandler = class {
               } else {
                 log5("auth failed", err, {
                   file: "invitations-handler.ts",
-                  line: 322,
+                  line: 330,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1730,7 +1733,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 file: "invitations-handler.ts",
-                line: 325,
+                line: 333,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1748,7 +1751,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               file: "invitations-handler.ts",
-              line: 336,
+              line: 344,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1758,7 +1761,7 @@ var InvitationsHandler = class {
           } else {
             log5("auth failed", err, {
               file: "invitations-handler.ts",
-              line: 339,
+              line: 347,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -2195,11 +2198,12 @@ import { PublicKey as PublicKey7 } from "@dxos/keys";
 import { log as log10 } from "@dxos/log";
 import { SpaceState } from "@dxos/protocols/proto/dxos/client/services";
 import { AdmittedFeed as AdmittedFeed3 } from "@dxos/protocols/proto/dxos/halo/credentials";
+import { Timeframe } from "@dxos/timeframe";
 import { ComplexSet as ComplexSet2 } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
 import assert9 from "@dxos/node-std/assert";
-import { DeferredTask, Event as Event4, scheduleTask as scheduleTask3, sleep as sleep2, TimeoutError as TimeoutError2, Trigger as Trigger5 } from "@dxos/async";
+import { DeferredTask, Event as Event4, scheduleTask as scheduleTask3, sleep, TimeoutError as TimeoutError2, Trigger as Trigger5 } from "@dxos/async";
 import { Context as Context5, rejectOnDispose } from "@dxos/context";
 import { PublicKey as PublicKey6 } from "@dxos/keys";
 import { log as log9 } from "@dxos/log";
@@ -2309,7 +2313,7 @@ var NotarizationPlugin = class {
           scope: this,
           callSite: (f, a) => f(...a)
         });
-        await sleep2(successDelay);
+        await sleep(successDelay);
       } catch (err) {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
           log9.warn("error notarizing (recoverable)", err, {
@@ -2537,7 +2541,7 @@ var DataSpace = class DataSpace2 {
         if (err instanceof CancelledError) {
           log10("Data pipeline initialization cancelled", err, {
             file: "data-space.ts",
-            line: 172,
+            line: 173,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -2545,7 +2549,7 @@ var DataSpace = class DataSpace2 {
         }
         log10.error("Error initializing data pipeline", err, {
           file: "data-space.ts",
-          line: 176,
+          line: 177,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2652,7 +2656,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,
@@ -2663,6 +2667,12 @@ var DataSpace = class DataSpace2 {
         })
       }
     });
+    await this.inner.controlPipeline.state.waitUntilTimeframe(new 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) {
@@ -2694,7 +2704,7 @@ import { ComplexMap as ComplexMap3, deferFunction as deferFunction2 } from "@dxo
 import { createCredential } from "@dxos/credentials";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
 import { AdmittedFeed as AdmittedFeed4, SpaceMember } from "@dxos/protocols/proto/dxos/halo/credentials";
-import { Timeframe } from "@dxos/timeframe";
+import { Timeframe as Timeframe2 } from "@dxos/timeframe";
 var spaceGenesis = async (keyring, signingContext, space) => {
   var _a, _b, _c, _d;
   const credentials = [
@@ -2745,7 +2755,7 @@ var spaceGenesis = async (keyring, signingContext, space) => {
         "@type": "dxos.halo.credentials.Epoch",
         number: 0,
         previousId: void 0,
-        timeframe: new Timeframe(),
+        timeframe: new Timeframe2(),
         snapshotCid: void 0
       }
     })
@@ -3079,7 +3089,7 @@ var SpacesServiceImpl = class {
           spaces
         }, {
           file: "spaces-service.ts",
-          line: 59,
+          line: 60,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -3166,12 +3176,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 ? 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,
@@ -3193,6 +3204,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 ? SpaceMember2.PresenceState.ONLINE : SpaceMember2.PresenceState.OFFLINE
         };
       }),
+      creator: (_f = space.inner.spaceState.creator) == null ? void 0 : _f.key,
       cache: space.cache,
       metrics: space.metrics
     };
@@ -3554,7 +3566,8 @@ var DevicesServiceImpl = class {
 // packages/sdk/client-services/src/packlets/logging/logging-service.ts
 import { Event as Event7 } from "@dxos/async";
 import { Stream as Stream11 } from "@dxos/codec-protobuf";
-import { log as log14, shouldLog, getContextFromEntry } from "@dxos/log";
+import { getContextFromEntry, log as log14 } from "@dxos/log";
+import { QueryLogsRequest } from "@dxos/protocols/proto/dxos/client/services";
 import { jsonify } from "@dxos/util";
 var LoggingServiceImpl = class {
   constructor() {
@@ -3571,31 +3584,60 @@ var LoggingServiceImpl = class {
     log14.runtimeConfig.processors.splice(index, 1);
   }
   queryLogs(request) {
-    var _a;
-    const filters = ((_a = request.filters) == null ? void 0 : _a.length) ? request.filters : void 0;
     return new Stream11(({ ctx, next }) => {
       const handler = (entry2) => {
-        var _a2, _b, _c;
-        if (((_a2 = entry2.meta) == null ? void 0 : _a2.file.includes("logging-service")) || entry2.context && Object.values(entry2.context).some((value) => typeof value === "string" && value.includes("LoggingService"))) {
+        var _a, _b, _c, _d, _e;
+        if (LOG_PROCESSING > 0) {
           return;
         }
-        if (shouldLog(entry2, filters)) {
-          const record = {
-            ...entry2,
-            context: jsonify(getContextFromEntry(entry2))
-          };
-          (_b = record.meta) == null ? true : delete _b.bugcheck;
-          (_c = record.meta) == null ? true : delete _c.scope;
+        if (((_a = entry2.meta) == null ? void 0 : _a.file.includes("logging-service")) || entry2.context && Object.values(entry2.context).some((value) => typeof value === "string" && value.includes("LoggingService"))) {
+          return;
+        }
+        if (!shouldLog(entry2, request)) {
+          return;
+        }
+        const record = {
+          ...entry2,
+          context: jsonify(getContextFromEntry(entry2)),
+          timestamp: new Date(),
+          meta: {
+            // TODO(dmaretskyi): Fix proto.
+            file: (_c = (_b = entry2.meta) == null ? void 0 : _b.file) != null ? _c : "",
+            line: (_e = (_d = entry2.meta) == null ? void 0 : _d.line) != null ? _e : 0
+          }
+        };
+        try {
+          LOG_PROCESSING++;
           next(record);
+        } finally {
+          LOG_PROCESSING--;
         }
       };
-      ctx.onDispose(() => {
-        this._logs.off(handler);
-      });
-      this._logs.on(handler);
+      this._logs.on(ctx, handler);
+    });
+  }
+};
+var matchFilter = (filter, level, path, options) => {
+  switch (options) {
+    case QueryLogsRequest.MatchingOptions.INCLUSIVE:
+      return level >= filter.level && (!filter.pattern || path.includes(filter.pattern));
+    case QueryLogsRequest.MatchingOptions.EXPLICIT:
+      return level === filter.level && (!filter.pattern || path.includes(filter.pattern));
+  }
+};
+var shouldLog = (entry2, request) => {
+  var _a;
+  const options = (_a = request.options) != null ? _a : QueryLogsRequest.MatchingOptions.INCLUSIVE;
+  if (request.filters === void 0) {
+    return options === QueryLogsRequest.MatchingOptions.INCLUSIVE;
+  } else {
+    return request.filters.some((filter) => {
+      var _a2, _b;
+      return matchFilter(filter, entry2.level, (_b = (_a2 = entry2.meta) == null ? void 0 : _a2.file) != null ? _b : "", options);
     });
   }
 };
+var LOG_PROCESSING = 0;
 
 // packages/sdk/client-services/src/packlets/network/network-service.ts
 import { Stream as Stream12 } from "@dxos/codec-protobuf";
@@ -3952,4 +3994,4 @@ export {
   ClientServicesHost,
   LocalClientServices
 };
-//# sourceMappingURL=chunk-BAHSFG33.mjs.map
+//# sourceMappingURL=chunk-QUJROKKU.mjs.map