@dxos/client-services 0.4.3-main.3a01342 → 0.4.3-main.4eed300

package/dist/lib/browser/{chunk-ZJGCDL3M.mjs → chunk-W7PKKXQW.mjs}

@@ -2566,7 +2566,7 @@ var getPlatform = () => {
 };
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.4.3-main.3a01342";
+var DXOS_VERSION = "0.4.3-main.4eed300";
 
 // packages/sdk/client-services/src/packlets/services/diagnostics.ts
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
@@ -2708,10 +2708,10 @@ var getSpaceStats = async (space) => {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
-import { Event as Event5, asyncTimeout, scheduleTask as scheduleTask4, sleep as sleep2, synchronized, trackLeaks } from "@dxos/async";
+import { Event as Event5, scheduleTask as scheduleTask4, sleep as sleep2, synchronized, trackLeaks } from "@dxos/async";
 import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
 import { cancelWithContext as cancelWithContext2, Context as Context7, ContextDisposedError } from "@dxos/context";
-import { timed } from "@dxos/debug";
+import { timed, warnAfterTimeout } from "@dxos/debug";
 import { createMappedFeedWriter } from "@dxos/echo-pipeline";
 import { failedInvariant } from "@dxos/invariant";
 import { PublicKey as PublicKey8 } from "@dxos/keys";
@@ -3317,7 +3317,12 @@ var DataSpace = class {
     const handle = this._automergeHost.repo.find(rootUrl);
     queueMicrotask(async () => {
       try {
-        await asyncTimeout(handle.whenReady(), 5e3);
+        await warnAfterTimeout(5e3, "Automerge root doc load timeout (DataSpace)", async () => {
+          await cancelWithContext2(this._ctx, handle.whenReady());
+        });
+        if (this._ctx.disposed) {
+          return;
+        }
         const doc = handle.docSync() ?? failedInvariant();
         if (!doc.experimental_spaceKey) {
           handle.change((doc2) => {
@@ -3325,13 +3330,16 @@ var DataSpace = class {
           });
         }
       } catch (err) {
+        if (err instanceof ContextDisposedError) {
+          return;
+        }
         log10.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)
         });
@@ -3421,7 +3429,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 483,
+      L: 492,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4416,7 +4424,7 @@ var ServiceRegistry = class {
 };
 
 // packages/sdk/client-services/src/packlets/locks/browser.ts
-import { asyncTimeout as asyncTimeout2, Trigger as Trigger6 } from "@dxos/async";
+import { asyncTimeout, Trigger as Trigger6 } from "@dxos/async";
 import { RESOURCE_LOCK_TIMEOUT } from "@dxos/client-protocol";
 import { log as log14, logInfo } from "@dxos/log";
 function _ts_decorate7(decorators, target, key, desc) {
@@ -4457,7 +4465,7 @@ var Lock = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      await asyncTimeout2(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
+      await asyncTimeout(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
       log14("acquired lock", void 0, {
         F: __dxlog_file16,
         L: 44,
@@ -4815,7 +4823,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.
@@ -4922,7 +4930,7 @@ var ClientServicesHost = class {
       });
     }
     this._systemService = new SystemServiceImpl({
-      config: this._config,
+      config: () => this._config,
       statusUpdate: this._statusUpdate,
       getCurrentStatus: () => this.isOpen ? SystemStatus.ACTIVE : SystemStatus.INACTIVE,
       getDiagnostics: () => {
@@ -5294,4 +5302,4 @@ export {
   createDefaultModelFactory,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-ZJGCDL3M.mjs.map
+//# sourceMappingURL=chunk-W7PKKXQW.mjs.map