@dxos/client-services 0.3.11-main.c95bc86 → 0.3.11-main.cb5abf5

package/dist/lib/browser/{chunk-4ZZIUZXZ.mjs → chunk-ESWBGQCJ.mjs}

@@ -2533,29 +2533,32 @@ import { invariant as invariant9 } from "@dxos/invariant";
 import { log as log8 } from "@dxos/log";
 import { STORAGE_VERSION } from "@dxos/protocols";
 import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
+import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
+import { Platform } from "@dxos/protocols/proto/dxos/client/services";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
       const { userAgent } = window.navigator;
       return {
-        type: "browser",
+        type: Platform.PLATFORM_TYPE.BROWSER,
         userAgent,
         uptime: Math.floor((Date.now() - window.performance.timeOrigin) / 1e3)
       };
     } else {
       return {
-        type: "shared-worker",
+        type: Platform.PLATFORM_TYPE.SHARED_WORKER,
         uptime: Math.floor((Date.now() - performance.timeOrigin) / 1e3)
       };
     }
   } else {
     const { platform: platform2, version, arch } = process;
     return {
-      type: "node",
-      platform: `${platform2} ${version} ${arch}`,
-      runtime: process.version,
+      type: Platform.PLATFORM_TYPE.NODE,
+      platform: platform2,
+      arch,
+      runtime: version,
       uptime: Math.floor(process.uptime()),
       memory: process.memoryUsage()
     };
@@ -2563,7 +2566,7 @@ var getPlatform = () => {
 };
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.3.11-main.c95bc86";
+var DXOS_VERSION = "0.3.11-main.cb5abf5";
 
 // 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";
@@ -2577,12 +2580,13 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
       storage: {
         version: STORAGE_VERSION
       }
-    }
+    },
+    trace: TRACE_PROCESSOR.getDiagnostics()
   };
   {
     invariant9(clientServices.LoggingService, "SystemService is not available.", {
       F: __dxlog_file10,
-      L: 93,
+      L: 111,
       S: void 0,
       A: [
         "clientServices.LoggingService",
@@ -2648,7 +2652,7 @@ var getProperties = (space) => {
   } catch (err) {
     log8.warn(err.message, void 0, {
       F: __dxlog_file10,
-      L: 178,
+      L: 196,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -2704,9 +2708,9 @@ var getSpaceStats = async (space) => {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
-import { Event as Event5, scheduleTask as scheduleTask4, sleep as sleep2, synchronized, trackLeaks } from "@dxos/async";
+import { Event as Event5, asyncTimeout, 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 } from "@dxos/context";
+import { cancelWithContext as cancelWithContext2, Context as Context7, ContextDisposedError } from "@dxos/context";
 import { timed } from "@dxos/debug";
 import { createMappedFeedWriter } from "@dxos/echo-pipeline";
 import { failedInvariant } from "@dxos/invariant";
@@ -3055,7 +3059,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 138,
+      L: 141,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3088,6 +3092,12 @@ var DataSpace = class {
   get automergeSpaceState() {
     return this._automergeSpaceState;
   }
+  get _automergeInfo() {
+    return {
+      rootUrl: this._automergeSpaceState.rootUrl,
+      lastEpoch: this._automergeSpaceState.lastEpoch
+    };
+  }
   async open() {
     await this._open();
   }
@@ -3102,7 +3112,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 190,
+      L: 203,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3120,7 +3130,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 204,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3149,10 +3159,10 @@ var DataSpace = class {
         this.metrics.pipelineInitBegin = /* @__PURE__ */ new Date();
         await this.initializeDataPipeline();
       } catch (err) {
-        if (err instanceof CancelledError) {
+        if (err instanceof CancelledError || err instanceof ContextDisposedError) {
           log10("data pipeline initialization cancelled", err, {
             F: __dxlog_file12,
-            L: 237,
+            L: 250,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3160,7 +3170,7 @@ var DataSpace = class {
         }
         log10.error("Error initializing data pipeline", err, {
           F: __dxlog_file12,
-          L: 241,
+          L: 254,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3169,7 +3179,7 @@ var DataSpace = class {
           state: SpaceState[this._state]
         }, {
           F: __dxlog_file12,
-          L: 243,
+          L: 256,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3189,7 +3199,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 259,
+      L: 272,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3200,7 +3210,7 @@ var DataSpace = class {
     await cancelWithContext2(this._ctx, this._inner.dataPipeline.ensureEpochInitialized());
     log10("waiting for data pipeline to reach target timeframe", void 0, {
       F: __dxlog_file12,
-      L: 273,
+      L: 286,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3211,7 +3221,7 @@ var DataSpace = class {
     this.metrics.dataPipelineReady = /* @__PURE__ */ new Date();
     log10("data pipeline ready", void 0, {
       F: __dxlog_file12,
-      L: 282,
+      L: 295,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3221,7 +3231,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 286,
+      L: 299,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3237,7 +3247,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     log10("writable feeds created", void 0, {
       F: __dxlog_file12,
-      L: 302,
+      L: 315,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3295,19 +3305,19 @@ var DataSpace = class {
     }
   }
   _onNewAutomergeRoot(rootUrl) {
-    log10.info("loading automerge root doc for space", {
+    log10("loading automerge root doc for space", {
       space: this.key,
       rootUrl
     }, {
       F: __dxlog_file12,
-      L: 368,
+      L: 381,
       S: this,
       C: (f, a) => f(...a)
     });
     const handle = this._automergeHost.repo.find(rootUrl);
     queueMicrotask(async () => {
       try {
-        await handle.whenReady();
+        await asyncTimeout(handle.whenReady(), 5e3);
         const doc = handle.docSync() ?? failedInvariant();
         if (!doc.experimental_spaceKey) {
           handle.change((doc2) => {
@@ -3321,7 +3331,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file12,
-          L: 381,
+          L: 394,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3411,13 +3421,29 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 470,
+      L: 483,
       S: this,
       C: (f, a) => f(...a)
     });
     this.stateUpdate.emit();
   }
 };
+_ts_decorate4([
+  trace6.info()
+], DataSpace.prototype, "_inner", void 0);
+_ts_decorate4([
+  trace6.info()
+], DataSpace.prototype, "key", null);
+_ts_decorate4([
+  trace6.info({
+    enum: SpaceState
+  })
+], DataSpace.prototype, "state", null);
+_ts_decorate4([
+  trace6.info({
+    depth: null
+  })
+], DataSpace.prototype, "_automergeInfo", null);
 _ts_decorate4([
   synchronized
 ], DataSpace.prototype, "open", null);
@@ -3444,7 +3470,8 @@ _ts_decorate4([
   synchronized
 ], DataSpace.prototype, "deactivate", null);
 DataSpace = _ts_decorate4([
-  trackLeaks("open", "close")
+  trackLeaks("open", "close"),
+  trace6.resource()
 ], DataSpace);
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
@@ -4389,7 +4416,7 @@ var ServiceRegistry = class {
 };
 
 // packages/sdk/client-services/src/packlets/locks/browser.ts
-import { asyncTimeout, Trigger as Trigger6 } from "@dxos/async";
+import { asyncTimeout as asyncTimeout2, 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) {
@@ -4430,7 +4457,7 @@ var Lock = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      await asyncTimeout(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
+      await asyncTimeout2(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
       log14("acquired lock", void 0, {
         F: __dxlog_file16,
         L: 44,
@@ -4577,7 +4604,7 @@ import { createSimplePeerTransportFactory, NetworkManager } from "@dxos/network-
 import { trace as trace9 } from "@dxos/protocols";
 import { SystemStatus } from "@dxos/protocols/proto/dxos/client/services";
 import { TextModel } from "@dxos/text-model";
-import { TRACE_PROCESSOR, trace as Trace3 } from "@dxos/tracing";
+import { TRACE_PROCESSOR as TRACE_PROCESSOR2, trace as Trace3 } from "@dxos/tracing";
 import { WebsocketRpcClient } from "@dxos/websocket-rpc";
 
 // packages/sdk/client-services/src/packlets/devices/devices-service.ts
@@ -4753,6 +4780,7 @@ var NetworkServiceImpl = class {
       const update = () => {
         next({
           swarm: this.networkManager.connectionState,
+          connectionInfo: this.networkManager.connectionLog?.swarms,
           signaling: this.signalManager.getStatus().map(({ host, state }) => ({
             server: host,
             state
@@ -4802,6 +4830,9 @@ var SystemServiceImpl = class {
       })))
     };
   }
+  async getPlatform() {
+    return getPlatform();
+  }
   async updateStatus({ status }) {
     await this._onUpdateStatus(status);
   }
@@ -4865,7 +4896,7 @@ var ClientServicesHost = class {
     lockKey,
     callbacks
   } = {}) {
-    this._tracingService = TRACE_PROCESSOR.createTraceSender();
+    this._tracingService = TRACE_PROCESSOR2.createTraceSender();
     this._statusUpdate = new Event8();
     this._opening = false;
     this._open = false;
@@ -5263,4 +5294,4 @@ export {
   createDefaultModelFactory,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-4ZZIUZXZ.mjs.map
+//# sourceMappingURL=chunk-ESWBGQCJ.mjs.map