@dxos/client-services 0.1.48-next.83f55fd → 0.1.49-next.55d8a92

package/dist/lib/node/packlets/testing/index.cjs

@@ -151,7 +151,7 @@ var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
         feeds: Array.from(feedMap.values()).map((feed) => ({
           feedKey: feed.key,
           length: feed.properties.length,
-          diskUsage: feed.core.byteLength
+          bytes: feed.core.byteLength
         }))
       });
     };
@@ -2138,6 +2138,7 @@ var SpaceInvitationProtocol = class {
 var import_async11 = require("@dxos/async");
 var import_codec_protobuf9 = require("@dxos/codec-protobuf");
 var import_log8 = require("@dxos/log");
+var import_util3 = require("@dxos/util");
 var LoggingServiceImpl = class {
   constructor() {
     this._logs = new import_async11.Event();
@@ -2157,12 +2158,18 @@ var LoggingServiceImpl = class {
     const filters = ((_a = request.filters) == null ? void 0 : _a.length) ? request.filters : void 0;
     return new import_codec_protobuf9.Stream(({ ctx, next }) => {
       const handler = (entry2) => {
-        var _a2;
+        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"))) {
           return;
         }
         if ((0, import_log8.shouldLog)(entry2, filters)) {
-          next(jsonify(entry2));
+          const record = {
+            ...entry2,
+            context: (0, import_util3.jsonify)((0, import_log8.getContextFromEntry)(entry2))
+          };
+          (_b = record.meta) == null ? true : delete _b.bugcheck;
+          (_c = record.meta) == null ? true : delete _c.scope;
+          next(record);
         }
       };
       ctx.onDispose(() => {
@@ -2172,30 +2179,6 @@ var LoggingServiceImpl = class {
     });
   }
 };
-var jsonify = (value, handles = /* @__PURE__ */ new WeakSet()) => {
-  if (typeof value === "function") {
-    return null;
-  } else if (typeof value === "object" && value !== null) {
-    if (handles.has(value)) {
-      return null;
-    }
-    handles.add(value);
-    if (Array.isArray(value)) {
-      return value.map((x) => jsonify(x, handles));
-    } else {
-      if (typeof value.toJSON === "function") {
-        return value.toJSON();
-      }
-      const res = {};
-      for (const key of Object.keys(value)) {
-        res[key] = jsonify(value[key], handles);
-      }
-      return res;
-    }
-  } else {
-    return value;
-  }
-};
 
 // packages/sdk/client-services/src/packlets/network/network-service.ts
 var import_codec_protobuf10 = require("@dxos/codec-protobuf");
@@ -2239,7 +2222,7 @@ var import_log11 = require("@dxos/log");
 var import_protocols6 = require("@dxos/protocols");
 var import_services8 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_gossip = require("@dxos/teleport-extension-gossip");
-var import_util5 = require("@dxos/util");
+var import_util6 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
 var import_async13 = require("@dxos/async");
@@ -2252,7 +2235,7 @@ var import_keys9 = require("@dxos/keys");
 var import_log10 = require("@dxos/log");
 var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials10 = require("@dxos/protocols/proto/dxos/halo/credentials");
-var import_util4 = require("@dxos/util");
+var import_util5 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
 var import_node_assert9 = __toESM(require("node:assert"));
@@ -2262,7 +2245,7 @@ var import_keys8 = require("@dxos/keys");
 var import_log9 = require("@dxos/log");
 var import_protocols5 = require("@dxos/protocols");
 var import_teleport2 = require("@dxos/teleport");
-var import_util3 = require("@dxos/util");
+var import_util4 = require("@dxos/util");
 var DEFAULT_RETRY_TIMEOUT = 1e3;
 var DEFAULT_SUCCESS_DELAY = 1e3;
 var DEFAULT_NOTARIZE_TIMEOUT = 1e4;
@@ -2271,8 +2254,8 @@ var NotarizationPlugin = class {
     this._ctx = new import_context5.Context();
     this._extensionOpened = new import_async12.Event();
     this._extensions = /* @__PURE__ */ new Set();
-    this._processedCredentials = new import_util3.ComplexSet(import_keys8.PublicKey.hash);
-    this._processCredentialsTriggers = new import_util3.ComplexMap(import_keys8.PublicKey.hash);
+    this._processedCredentials = new import_util4.ComplexSet(import_keys8.PublicKey.hash);
+    this._processCredentialsTriggers = new import_util4.ComplexMap(import_keys8.PublicKey.hash);
   }
   async open() {
   }
@@ -2414,7 +2397,7 @@ var NotarizationPlugin = class {
     if (this._processedCredentials.has(id)) {
       return;
     }
-    await (0, import_util3.entry)(this._processCredentialsTriggers, id).orInsert(new import_async12.Trigger()).value.wait();
+    await (0, import_util4.entry)(this._processCredentialsTriggers, id).orInsert(new import_async12.Trigger()).value.wait();
   }
   /**
   * Requests from other peers to notarize credentials.
@@ -2525,7 +2508,7 @@ var DataSpace = class DataSpace2 {
     this._signingContext = params.signingContext;
     this._callbacks = (_a = params.callbacks) != null ? _a : {};
     this.authVerifier = new TrustedKeySetAuthVerifier({
-      trustedKeysProvider: () => new import_util4.ComplexSet(import_keys9.PublicKey.hash, Array.from(this._inner.spaceState.members.keys())),
+      trustedKeysProvider: () => new import_util5.ComplexSet(import_keys9.PublicKey.hash, Array.from(this._inner.spaceState.members.keys())),
       update: this._inner.stateUpdate,
       authTimeout: import_client_protocol3.AUTH_TIMEOUT
     });
@@ -2823,7 +2806,7 @@ var DataSpaceManager = class DataSpaceManager2 {
     this._feedStore = _feedStore;
     this._ctx = new import_context7.Context();
     this.updated = new import_async14.Event();
-    this._spaces = new import_util5.ComplexMap(import_keys10.PublicKey.hash);
+    this._spaces = new import_util6.ComplexMap(import_keys10.PublicKey.hash);
     this._isOpen = false;
     this._instanceId = import_keys10.PublicKey.random().toHex();
   }
@@ -2999,7 +2982,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       swarmIdentity: {
         peerKey: this._signingContext.deviceKey,
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
-        credentialAuthenticator: (0, import_util5.deferFunction)(() => dataSpace.authVerifier.verifier)
+        credentialAuthenticator: (0, import_util6.deferFunction)(() => dataSpace.authVerifier.verifier)
       },
       onNetworkConnection: (session) => {
         session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
@@ -3092,7 +3075,7 @@ var import_echo_pipeline2 = require("@dxos/echo-pipeline");
 var import_log12 = require("@dxos/log");
 var import_protocols7 = require("@dxos/protocols");
 var import_services9 = require("@dxos/protocols/proto/dxos/client/services");
-var import_util6 = require("@dxos/util");
+var import_util7 = require("@dxos/util");
 var TIMEFRAME_UPDATE_DEBOUNCE_TIME = 500;
 var SpacesServiceImpl = class {
   constructor(_identityManager, _spaceManager, _dataServiceSubscriptions, _getDataSpaceManager) {
@@ -3229,7 +3212,7 @@ var SpacesServiceImpl = class {
           identity: {
             identityKey: member.key,
             profile: {
-              displayName: (_b2 = (_a2 = member.assertion.profile) == null ? void 0 : _a2.displayName) != null ? _b2 : (0, import_util6.humanize)(member.key)
+              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
@@ -3333,7 +3316,7 @@ var import_client_protocol5 = require("@dxos/client-protocol");
 var import_log13 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_network_manager2 = require("@dxos/network-manager");
-var import_util7 = require("@dxos/util");
+var import_util8 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/services/client-rpc-server.ts
 var import_codec_protobuf13 = require("@dxos/codec-protobuf");
@@ -3485,7 +3468,7 @@ var IFrameHostRuntime = class {
       callSite: (f, a) => f(...a)
     });
     try {
-      this._config = await (0, import_util7.getAsyncValue)(this._configProvider);
+      this._config = await (0, import_util8.getAsyncValue)(this._configProvider);
       this._transportFactory = (0, import_network_manager2.createWebRTCTransportFactory)({
         iceServers: this._config.get("runtime.services.ice")
       });
@@ -3573,7 +3556,7 @@ var import_errors5 = require("@dxos/errors");
 var import_log14 = require("@dxos/log");
 var import_network_manager3 = require("@dxos/network-manager");
 var import_rpc3 = require("@dxos/rpc");
-var import_util8 = require("@dxos/util");
+var import_util9 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/vault/vault-resource-lock.ts
 var import_async19 = require("@dxos/async");
@@ -3709,7 +3692,7 @@ var import_async20 = require("@dxos/async");
 var import_client_protocol8 = require("@dxos/client-protocol");
 var import_log16 = require("@dxos/log");
 var import_rpc4 = require("@dxos/rpc");
-var import_util9 = require("@dxos/util");
+var import_util10 = require("@dxos/util");
 var __decorate5 = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -3723,7 +3706,7 @@ var __decorate5 = function(decorators, target, key, desc) {
 var WorkerSession = class {
   constructor({ serviceHost, systemPort, appPort, shellPort, readySignal }) {
     this._startTrigger = new import_async20.Trigger();
-    this.onClose = new import_util9.Callback();
+    this.onClose = new import_util10.Callback();
     (0, import_node_assert12.default)(serviceHost);
     this._serviceHost = serviceHost;
     const middleware = {
@@ -4207,7 +4190,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       file: "service-host.ts",
-      line: 186,
+      line: 187,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4220,7 +4203,7 @@ var ClientServicesHost = class {
       lockKey: (_a = this._resourceLock) == null ? void 0 : _a.lockKey
     }, {
       file: "service-host.ts",
-      line: 194,
+      line: 195,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4255,7 +4238,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 249,
+      line: 250,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4263,7 +4246,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       file: "service-host.ts",
-      line: 250,
+      line: 251,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4278,7 +4261,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 259,
+      line: 260,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4293,7 +4276,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 265,
+      line: 266,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4305,13 +4288,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       file: "service-host.ts",
-      line: 270,
+      line: 271,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     (0, import_log19.log)("resetting...", {}, {
       file: "service-host.ts",
-      line: 272,
+      line: 273,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4319,7 +4302,7 @@ var ClientServicesHost = class {
     await this._storage.reset();
     (0, import_log19.log)("reset", {}, {
       file: "service-host.ts",
-      line: 275,
+      line: 276,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4327,7 +4310,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       file: "service-host.ts",
-      line: 276,
+      line: 277,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4530,6 +4513,7 @@ var acceptInvitation = (guest, invitation) => {
 
 // packages/sdk/client-services/src/packlets/testing/test-builder.ts
 var import_client_protocol10 = require("@dxos/client-protocol");
+var import_context8 = require("@dxos/context");
 var import_credentials15 = require("@dxos/credentials");
 var import_echo_pipeline5 = require("@dxos/echo-pipeline");
 var import_testing = require("@dxos/echo-pipeline/testing");
@@ -4577,20 +4561,29 @@ var syncItemsLocal = async (db1, db2) => {
 var TestBuilder = class {
   constructor() {
     this.signalContext = new import_messaging4.MemorySignalManagerContext();
+    this._ctx = new import_context8.Context();
   }
-  createPeer() {
-    return new TestPeer(this.signalContext);
+  createPeer(peerOptions) {
+    const peer = new TestPeer(this.signalContext, peerOptions);
+    this._ctx.onDispose(async () => peer.destroy());
+    return peer;
+  }
+  async destroy() {
+    await this._ctx.dispose();
   }
 };
 var TestPeer = class {
-  constructor(signalContext) {
+  constructor(signalContext, opts = {
+    storageType: import_random_access_storage2.StorageType.RAM
+  }) {
     this.signalContext = signalContext;
+    this.opts = opts;
     this._props = {};
   }
   get storage() {
     var _a, _b;
     return (_b = (_a = this._props).storage) != null ? _b : _a.storage = (0, import_random_access_storage2.createStorage)({
-      type: import_random_access_storage2.StorageType.RAM
+      type: this.opts.storageType
     });
   }
   get keyring() {
@@ -4634,6 +4627,9 @@ var TestPeer = class {
       snapshotStore: this.snapshotStore
     });
   }
+  async destroy() {
+    await this.storage.reset();
+  }
 };
 var createSigningContext = async (keyring) => {
   const identityKey = await keyring.createKey();