@dxos/client-services 0.1.51-next.57ad9f3 → 0.1.51

package/dist/lib/node/index.cjs

@@ -92,11 +92,15 @@ var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
         }
       });
       next({
-        feeds: Array.from(feedMap.values()).map((feed) => ({
-          feedKey: feed.key,
-          length: feed.properties.length,
-          bytes: feed.core.byteLength
-        }))
+        feeds: Array.from(feedMap.values()).map((feed) => {
+          var _a, _b;
+          return {
+            feedKey: feed.key,
+            length: feed.properties.length,
+            bytes: feed.core.byteLength,
+            downloaded: (_b = (_a = feed.core.bitfield) == null ? void 0 : _a.data.toBuffer()) != null ? _b : new Uint8Array()
+          };
+        })
       });
     };
     subscriptions.add(feedStore.feedOpened.on(update));
@@ -328,6 +332,11 @@ var DevtoolsServiceImpl = class {
       usageQuota: (_e = navigatorInfo == null ? void 0 : navigatorInfo.quota) != null ? _e : 0
     };
   }
+  async getBlobs() {
+    return {
+      blobs: await this.params.context.blobStore.list()
+    };
+  }
   async getSnapshots() {
     return {
       snapshots: await this.params.context.snapshotStore.listSnapshots()
@@ -868,7 +877,8 @@ var IdentityManager = class {
     });
     (0, import_node_assert2.default)(identityRecord.haloSpace.dataFeedKey);
     const dataFeed = await this._feedStore.openFeed(identityRecord.haloSpace.dataFeedKey, {
-      writable: true
+      writable: true,
+      sparse: true
     });
     const space = await this._constructSpace({
       spaceRecord: identityRecord.haloSpace,
@@ -891,7 +901,7 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey
     }, {
       file: "identity-manager.ts",
-      line: 223,
+      line: 226,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -912,7 +922,7 @@ var IdentityManager = class {
       onAuthFailure: () => {
         import_log3.log.warn("auth failure", {}, {
           file: "identity-manager.ts",
-          line: 242,
+          line: 245,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2140,7 +2150,7 @@ var import_log15 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_network_manager2 = require("@dxos/network-manager");
 var import_protocols9 = require("@dxos/protocols");
-var import_services11 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services12 = require("@dxos/protocols/proto/dxos/client/services");
 
 // packages/sdk/client-services/src/packlets/devices/devices-service.ts
 var import_async10 = require("@dxos/async");
@@ -2251,6 +2261,7 @@ var isLocked = (lockPath) => import_lockfile.default.checkSync(lockPath);
 var import_async12 = require("@dxos/async");
 var import_codec_protobuf10 = require("@dxos/codec-protobuf");
 var import_log9 = require("@dxos/log");
+var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util3 = require("@dxos/util");
 var LoggingServiceImpl = class {
   constructor() {
@@ -2267,31 +2278,60 @@ var LoggingServiceImpl = class {
     import_log9.log.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 import_codec_protobuf10.Stream(({ 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 ((0, import_log9.shouldLog)(entry2, filters)) {
-          const record = {
-            ...entry2,
-            context: (0, import_util3.jsonify)((0, import_log9.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: (0, import_util3.jsonify)((0, import_log9.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 import_services7.QueryLogsRequest.MatchingOptions.INCLUSIVE:
+      return level >= filter.level && (!filter.pattern || path.includes(filter.pattern));
+    case import_services7.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 : import_services7.QueryLogsRequest.MatchingOptions.INCLUSIVE;
+  if (request.filters === void 0) {
+    return options === import_services7.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
 var import_codec_protobuf11 = require("@dxos/codec-protobuf");
@@ -2333,7 +2373,7 @@ var import_credentials12 = require("@dxos/credentials");
 var import_keys9 = require("@dxos/keys");
 var import_log12 = require("@dxos/log");
 var import_protocols6 = require("@dxos/protocols");
-var import_services8 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services9 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_gossip = require("@dxos/teleport-extension-gossip");
 var import_util6 = require("@dxos/util");
 
@@ -2346,7 +2386,7 @@ var import_echo_pipeline = require("@dxos/echo-pipeline");
 var import_errors3 = require("@dxos/errors");
 var import_keys8 = require("@dxos/keys");
 var import_log11 = require("@dxos/log");
-var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services8 = 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");
@@ -2607,7 +2647,7 @@ var __decorate2 = function(decorators, target, key, desc) {
 var DataSpace = class DataSpace2 {
   constructor(params) {
     this._ctx = new import_context6.Context();
-    this._state = import_services7.SpaceState.CLOSED;
+    this._state = import_services8.SpaceState.CLOSED;
     /**
     * Error for _state === SpaceState.ERROR.
     */
@@ -2661,11 +2701,11 @@ var DataSpace = class DataSpace2 {
     await this.notarizationPlugin.open();
     await this._notarizationPluginConsumer.open();
     await this._inner.open();
-    this._state = import_services7.SpaceState.INACTIVE;
+    this._state = import_services8.SpaceState.INACTIVE;
     this.metrics.open = new Date();
   }
   async close() {
-    this._state = import_services7.SpaceState.CLOSED;
+    this._state = import_services8.SpaceState.CLOSED;
     await this._ctx.dispose();
     await this.authVerifier.close();
     await this._inner.close();
@@ -2703,7 +2743,7 @@ var DataSpace = class DataSpace2 {
           scope: this,
           callSite: (f, a) => f(...a)
         });
-        this._state = import_services7.SpaceState.ERROR;
+        this._state = import_services8.SpaceState.ERROR;
         this.error = err;
         this.stateUpdate.emit();
       } finally {
@@ -2713,10 +2753,10 @@ var DataSpace = class DataSpace2 {
   }
   async initializeDataPipeline() {
     var _a, _b, _c, _d;
-    if (this._state !== import_services7.SpaceState.INACTIVE) {
+    if (this._state !== import_services8.SpaceState.INACTIVE) {
       throw new import_errors3.SystemError("Invalid operation");
     }
-    this._state = import_services7.SpaceState.INITIALIZING;
+    this._state = import_services8.SpaceState.INITIALIZING;
     await this._inner.controlPipeline.state.waitUntilReachedTargetTimeframe({
       ctx: this._ctx,
       breakOnStall: false
@@ -2756,7 +2796,7 @@ var DataSpace = class DataSpace2 {
       callSite: (f, a) => f(...a)
     });
     await ((_b = (_a = this._callbacks).beforeReady) == null ? void 0 : _b.call(_a));
-    this._state = import_services7.SpaceState.READY;
+    this._state = import_services8.SpaceState.READY;
     this.stateUpdate.emit();
     await ((_d = (_c = this._callbacks).afterReady) == null ? void 0 : _d.call(_c));
   }
@@ -2780,7 +2820,8 @@ var DataSpace = class DataSpace2 {
     }
     if (!this.inner.dataFeedKey) {
       const dataFeed = await this._feedStore.openFeed(await this._keyring.createKey(), {
-        writable: true
+        writable: true,
+        sparse: true
       });
       this.inner.setDataFeed(dataFeed);
       credentials.push(await this._signingContext.credentialSigner.createCredential({
@@ -3073,7 +3114,7 @@ var DataSpaceManager = class DataSpaceManager2 {
   async waitUntilSpaceReady(spaceKey) {
     await (0, import_context7.cancelWithContext)(this._ctx, this.updated.waitForCondition(() => {
       const space = this._spaces.get(spaceKey);
-      return !!space && space.state === import_services8.SpaceState.READY;
+      return !!space && space.state === import_services9.SpaceState.READY;
     }));
   }
   async _constructSpace(metadata) {
@@ -3098,7 +3139,8 @@ var DataSpaceManager = class DataSpaceManager2 {
       writable: true
     });
     const dataFeed = metadata.dataFeedKey && await this._feedStore.openFeed(metadata.dataFeedKey, {
-      writable: true
+      writable: true,
+      sparse: true
     });
     const space = await this._spaceManager.constructSpace({
       metadata,
@@ -3111,7 +3153,6 @@ var DataSpaceManager = class DataSpaceManager2 {
         session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
           remotePeerId: session.remotePeerId
         }));
-        session.addExtension("dxos.mesh.teleport.objectsync", space.snapshotManager.objectSync.createExtension());
         session.addExtension("dxos.mesh.teleport.notarization", dataSpace.notarizationPlugin.createExtension());
       },
       onAuthFailure: () => {
@@ -3197,7 +3238,7 @@ var import_debug5 = require("@dxos/debug");
 var import_echo_pipeline2 = require("@dxos/echo-pipeline");
 var import_log13 = require("@dxos/log");
 var import_protocols7 = require("@dxos/protocols");
-var import_services9 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util7 = require("@dxos/util");
 var TIMEFRAME_UPDATE_DEBOUNCE_TIME = 500;
 var SpacesServiceImpl = class {
@@ -3244,6 +3285,7 @@ var SpacesServiceImpl = class {
           for (const space of dataSpaceManager.spaces.values()) {
             subscriptions.add(space.stateUpdate.on(ctx, onUpdate));
             subscriptions.add(space.presence.updated.on(ctx, onUpdate));
+            subscriptions.add(space.dataPipeline.onNewEpoch.on(ctx, onUpdate));
             space.inner.controlPipeline.state.timeframeUpdate.debounce(TIMEFRAME_UPDATE_DEBOUNCE_TIME).on(ctx, onUpdate);
             if (space.dataPipeline.pipelineState) {
               subscriptions.add(space.dataPipeline.pipelineState.timeframeUpdate.debounce(TIMEFRAME_UPDATE_DEBOUNCE_TIME).on(ctx, onUpdate));
@@ -3314,21 +3356,23 @@ var SpacesServiceImpl = class {
     await space.createEpoch();
   }
   _transformSpace(space) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     return {
       spaceKey: space.key,
       state: space.state,
       error: space.error ? (0, import_protocols7.encodeError)(space.error) : void 0,
       pipeline: {
         currentEpoch: space.dataPipeline.currentEpoch,
+        appliedEpoch: space.dataPipeline.appliedEpoch,
         controlFeeds: space.inner.controlPipeline.state.feeds.map((feed) => feed.key),
         currentControlTimeframe: space.inner.controlPipeline.state.timeframe,
         targetControlTimeframe: space.inner.controlPipeline.state.targetTimeframe,
         totalControlTimeframe: space.inner.controlPipeline.state.endTimeframe,
         dataFeeds: (_b = (_a = space.dataPipeline.pipelineState) == null ? void 0 : _a.feeds.map((feed) => feed.key)) != null ? _b : [],
-        currentDataTimeframe: (_c = space.dataPipeline.pipelineState) == null ? void 0 : _c.timeframe,
-        targetDataTimeframe: (_d = space.dataPipeline.pipelineState) == null ? void 0 : _d.targetTimeframe,
-        totalDataTimeframe: (_e = space.dataPipeline.pipelineState) == null ? void 0 : _e.endTimeframe
+        startDataTimeframe: (_c = space.dataPipeline.pipelineState) == null ? void 0 : _c.startTimeframe,
+        currentDataTimeframe: (_d = space.dataPipeline.pipelineState) == null ? void 0 : _d.timeframe,
+        targetDataTimeframe: (_e = space.dataPipeline.pipelineState) == null ? void 0 : _e.targetTimeframe,
+        totalDataTimeframe: (_f = space.dataPipeline.pipelineState) == null ? void 0 : _f.endTimeframe
       },
       members: Array.from(space.inner.spaceState.members.values()).map((member) => {
         var _a2, _b2, _c2;
@@ -3339,10 +3383,10 @@ var SpacesServiceImpl = class {
               displayName: (_b2 = (_a2 = member.assertion.profile) == null ? void 0 : _a2.displayName) != null ? _b2 : (0, import_util7.humanize)(member.key)
             }
           },
-          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
+          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_services10.SpaceMember.PresenceState.ONLINE : import_services10.SpaceMember.PresenceState.OFFLINE
         };
       }),
-      creator: (_f = space.inner.spaceState.creator) == null ? void 0 : _f.key,
+      creator: (_g = space.inner.spaceState.creator) == null ? void 0 : _g.key,
       cache: space.cache,
       metrics: space.metrics
     };
@@ -3448,7 +3492,8 @@ var import_keyring = require("@dxos/keyring");
 var import_keys10 = require("@dxos/keys");
 var import_log14 = require("@dxos/log");
 var import_protocols8 = require("@dxos/protocols");
-var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services11 = require("@dxos/protocols/proto/dxos/client/services");
+var import_teleport_extension_object_sync = require("@dxos/teleport-extension-object-sync");
 var ServiceContext = class {
   // prettier-ignore
   constructor(storage, networkManager, signalManager, modelFactory) {
@@ -3462,6 +3507,7 @@ var ServiceContext = class {
     this._instanceId = import_keys10.PublicKey.random().toHex();
     this.metadataStore = new import_echo_pipeline3.MetadataStore(storage.createDirectory("metadata"));
     this.snapshotStore = new import_echo_pipeline3.SnapshotStore(storage.createDirectory("snapshots"));
+    this.blobStore = new import_teleport_extension_object_sync.BlobStore(storage.createDirectory("blobs"));
     this.keyring = new import_keyring.Keyring(storage.createDirectory("keyring"));
     this.feedStore = new import_feed_store4.FeedStore({
       factory: new import_feed_store4.FeedFactory({
@@ -3475,13 +3521,14 @@ var ServiceContext = class {
     this.spaceManager = new import_echo_pipeline3.SpaceManager({
       feedStore: this.feedStore,
       networkManager: this.networkManager,
+      blobStore: this.blobStore,
       metadataStore: this.metadataStore,
       modelFactory: this.modelFactory,
       snapshotStore: this.snapshotStore
     });
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager);
     this.invitations = new InvitationsHandler(this.networkManager);
-    this._handlerFactories.set(import_services10.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => {
+    this._handlerFactories.set(import_services11.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => {
       var _a;
       return (_a = this.identityManager.identity) != null ? _a : (0, import_debug6.failUndefined)();
     }, this._acceptIdentity.bind(this)));
@@ -3491,14 +3538,14 @@ var ServiceContext = class {
       id: this._instanceId
     }), {
       file: "service-context.ts",
-      line: 119,
+      line: 126,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     await this._checkStorageVersion();
     (0, import_log14.log)("opening...", {}, {
       file: "service-context.ts",
-      line: 123,
+      line: 130,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3511,7 +3558,7 @@ var ServiceContext = class {
     }
     (0, import_log14.log)("opened", {}, {
       file: "service-context.ts",
-      line: 131,
+      line: 138,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3519,7 +3566,7 @@ var ServiceContext = class {
       id: this._instanceId
     }), {
       file: "service-context.ts",
-      line: 132,
+      line: 139,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3528,7 +3575,7 @@ var ServiceContext = class {
     var _a, _b;
     (0, import_log14.log)("closing...", {}, {
       file: "service-context.ts",
-      line: 136,
+      line: 143,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3542,7 +3589,7 @@ var ServiceContext = class {
     this.dataServiceSubscriptions.clear();
     (0, import_log14.log)("closed", {}, {
       file: "service-context.ts",
-      line: 145,
+      line: 152,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3573,7 +3620,7 @@ var ServiceContext = class {
     var _a;
     (0, import_log14.log)("initializing spaces...", {}, {
       file: "service-context.ts",
-      line: 178,
+      line: 185,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3593,7 +3640,7 @@ var ServiceContext = class {
     };
     this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.feedStore);
     await this.dataSpaceManager.open();
-    this._handlerFactories.set(import_services10.Invitation.Kind.SPACE, (invitation) => {
+    this._handlerFactories.set(import_services11.Invitation.Kind.SPACE, (invitation) => {
       (0, import_node_assert11.default)(this.dataSpaceManager, "dataSpaceManager not initialized yet");
       return new SpaceInvitationProtocol(this.dataSpaceManager, signingContext, this.keyring, invitation.spaceKey);
     });
@@ -3612,7 +3659,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             file: "service-context.ts",
-            line: 217,
+            line: 224,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -3623,7 +3670,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             file: "service-context.ts",
-            line: 221,
+            line: 228,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -3634,7 +3681,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             file: "service-context.ts",
-            line: 226,
+            line: 233,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -3645,7 +3692,7 @@ var ServiceContext = class {
         } catch (err) {
           import_log14.log.catch(err, {}, {
             file: "service-context.ts",
-            line: 232,
+            line: 239,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -3719,12 +3766,12 @@ var ClientServicesHost = class {
     this._systemService = new SystemServiceImpl({
       config: this._config,
       statusUpdate: this._statusUpdate,
-      getCurrentStatus: () => this.isOpen ? import_services11.SystemStatus.ACTIVE : import_services11.SystemStatus.INACTIVE,
+      getCurrentStatus: () => this.isOpen ? import_services12.SystemStatus.ACTIVE : import_services12.SystemStatus.INACTIVE,
       onUpdateStatus: async (status) => {
         var _a, _b;
-        if (!this.isOpen && status === import_services11.SystemStatus.ACTIVE) {
+        if (!this.isOpen && status === import_services12.SystemStatus.ACTIVE) {
           await ((_a = this._resourceLock) == null ? void 0 : _a.acquire());
-        } else if (this.isOpen && status === import_services11.SystemStatus.INACTIVE) {
+        } else if (this.isOpen && status === import_services12.SystemStatus.INACTIVE) {
           await ((_b = this._resourceLock) == null ? void 0 : _b.release());
         }
       },