@dxos/client-services 0.4.3-main.2a46fc0 → 0.4.3-main.308c191

package/dist/lib/node/{chunk-DREUJBPG.cjs → chunk-VNH2KY33.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_DREUJBPG_exports = {};
-__export(chunk_DREUJBPG_exports, {
+var chunk_VNH2KY33_exports = {};
+__export(chunk_VNH2KY33_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -60,7 +60,7 @@ __export(chunk_DREUJBPG_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_DREUJBPG_exports);
+module.exports = __toCommonJS(chunk_VNH2KY33_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -2675,7 +2675,7 @@ var getPlatform = () => {
     };
   }
 };
-var DXOS_VERSION = "0.4.3-main.2a46fc0";
+var DXOS_VERSION = "0.4.3-main.308c191";
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
 var DEFAULT_TIMEOUT = 1e3;
 var createDiagnostics = async (clientServices, serviceContext, config) => {
@@ -3389,7 +3389,12 @@ var DataSpace = class {
     const handle = this._automergeHost.repo.find(rootUrl);
     queueMicrotask(async () => {
       try {
-        await (0, import_async10.asyncTimeout)(handle.whenReady(), 5e3);
+        await (0, import_debug4.warnAfterTimeout)(5e3, "Automerge root doc load timeout (DataSpace)", async () => {
+          await (0, import_context6.cancelWithContext)(this._ctx, handle.whenReady());
+        });
+        if (this._ctx.disposed) {
+          return;
+        }
         const doc = handle.docSync() ?? (0, import_invariant10.failedInvariant)();
         if (!doc.experimental_spaceKey) {
           handle.change((doc2) => {
@@ -3397,13 +3402,16 @@ var DataSpace = class {
           });
         }
       } catch (err) {
+        if (err instanceof import_context6.ContextDisposedError) {
+          return;
+        }
         import_log9.log.warn("error loading automerge root doc", {
           space: this.key,
           rootUrl,
           err
         }, {
           F: __dxlog_file12,
-          L: 394,
+          L: 403,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3493,7 +3501,7 @@ var DataSpace = class {
       state: import_services8.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 483,
+      L: 492,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4723,7 +4731,7 @@ var SystemServiceImpl = class {
     this._onReset = onReset;
   }
   async getConfig() {
-    return this._config?.values ?? {};
+    return (await this._config?.())?.values ?? {};
   }
   /**
   * NOTE: Since this is serialized as a JSON object, we allow the option to serialize keys.
@@ -4828,7 +4836,7 @@ var ClientServicesHost = class {
       });
     }
     this._systemService = new SystemServiceImpl({
-      config: this._config,
+      config: () => this._config,
       statusUpdate: this._statusUpdate,
       getCurrentStatus: () => this.isOpen ? import_services12.SystemStatus.ACTIVE : import_services12.SystemStatus.INACTIVE,
       getDiagnostics: () => {
@@ -5199,4 +5207,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-DREUJBPG.cjs.map
+//# sourceMappingURL=chunk-VNH2KY33.cjs.map