@dxos/edge-client 0.8.4-main.dedc0f3 → 0.8.4-main.ead640a

package/dist/lib/browser/index.mjs

@@ -123,7 +123,7 @@ var createStubEdgeIdentity = () => {
 };
 
 // src/edge-client.ts
-import { Event, PersistentLifecycle, Trigger, TriggerState, scheduleMicroTask } from "@dxos/async";
+import { Event, PersistentLifecycle, Trigger, TriggerState, scheduleMicroTask, scheduleTaskInterval as scheduleTaskInterval2 } from "@dxos/async";
 import { Resource as Resource2 } from "@dxos/context";
 import { log as log2, logInfo as logInfo2 } from "@dxos/log";
 import { EdgeStatus } from "@dxos/protocols/proto/dxos/client/services";
@@ -207,10 +207,28 @@ var EdgeWsConnection = class extends Resource {
       device: this._identity.peerKey
     };
   }
+  get rtt() {
+    return this._rtt;
+  }
+  get uptime() {
+    return this._openTimestamp ? (Date.now() - this._openTimestamp) / 1e3 : 0;
+  }
+  get uploadRate() {
+    return this._uploadRate;
+  }
+  get downloadRate() {
+    return this._downloadRate;
+  }
+  get messagesSent() {
+    return this._messagesSent;
+  }
+  get messagesReceived() {
+    return this._messagesReceived;
+  }
   send(message) {
     invariant3(this._ws, void 0, {
       F: __dxlog_file3,
-      L: 53,
+      L: 93,
       S: this,
       A: [
         "this._ws",
@@ -219,7 +237,7 @@ var EdgeWsConnection = class extends Resource {
     });
     invariant3(this._wsMuxer, void 0, {
       F: __dxlog_file3,
-      L: 54,
+      L: 94,
       S: this,
       A: [
         "this._wsMuxer",
@@ -231,10 +249,11 @@ var EdgeWsConnection = class extends Resource {
       payload: protocol.getPayloadType(message)
     }, {
       F: __dxlog_file3,
-      L: 55,
+      L: 95,
       S: this,
       C: (f, a) => f(...a)
     });
+    this._messagesSent++;
     if (this._ws?.protocol.includes(EdgeWebsocketProtocol.V0)) {
       const binary = buf.toBinary(MessageSchema, message);
       if (binary.length > CLOUDFLARE_MESSAGE_MAX_BYTES) {
@@ -244,17 +263,20 @@ var EdgeWsConnection = class extends Resource {
           payload: protocol.getPayloadType(message)
         }, {
           F: __dxlog_file3,
-          L: 59,
+          L: 100,
           S: this,
           C: (f, a) => f(...a)
         });
         return;
       }
+      this._recordBytes(binary.byteLength, 0);
       this._ws.send(binary);
     } else {
+      const binary = buf.toBinary(MessageSchema, message);
+      this._recordBytes(binary.byteLength, 0);
       this._wsMuxer.send(message).catch((e) => log.catch(e, void 0, {
         F: __dxlog_file3,
-        L: 68,
+        L: 113,
         S: this,
         C: (f, a) => f(...a)
       }));
@@ -276,18 +298,20 @@ var EdgeWsConnection = class extends Resource {
       if (this.isOpen) {
         log("connected", void 0, {
           F: __dxlog_file3,
-          L: 85,
+          L: 130,
           S: this,
           C: (f, a) => f(...a)
         });
+        this._openTimestamp = Date.now();
         this._callbacks.onConnected();
         this._scheduleHeartbeats();
+        this._scheduleRateCalculation();
       } else {
         log.verbose("connected after becoming inactive", {
           currentIdentity: this._identity
         }, {
           F: __dxlog_file3,
-          L: 89,
+          L: 136,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -295,12 +319,12 @@ var EdgeWsConnection = class extends Resource {
     };
     this._ws.onclose = (event) => {
       if (this.isOpen) {
-        log.warn("disconnected while being open", {
+        log.warn("server disconnected", {
           code: event.code,
           reason: event.reason
         }, {
           F: __dxlog_file3,
-          L: 94,
+          L: 141,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -315,7 +339,7 @@ var EdgeWsConnection = class extends Resource {
           info: event.message
         }, {
           F: __dxlog_file3,
-          L: 101,
+          L: 148,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -325,7 +349,7 @@ var EdgeWsConnection = class extends Resource {
           error: event.error
         }, {
           F: __dxlog_file3,
-          L: 104,
+          L: 151,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -337,7 +361,7 @@ var EdgeWsConnection = class extends Resource {
           event: event.type
         }, {
           F: __dxlog_file3,
-          L: 112,
+          L: 159,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -345,13 +369,19 @@ var EdgeWsConnection = class extends Resource {
       }
       this._lastReceivedMessageTimestamp = Date.now();
       if (event.data === "__pong__") {
+        if (this._pingTimestamp) {
+          this._rtt = Date.now() - this._pingTimestamp;
+          this._pingTimestamp = void 0;
+        }
         this._rescheduleHeartbeatTimeout();
         return;
       }
       const bytes = await toUint8Array(event.data);
+      this._recordBytes(0, bytes.byteLength);
       if (!this.isOpen) {
         return;
       }
+      this._messagesReceived++;
       const message = this._ws?.protocol?.includes(EdgeWebsocketProtocol.V0) ? buf.fromBinary(MessageSchema, bytes) : muxer.receiveData(bytes);
       if (message) {
         log("received", {
@@ -359,7 +389,7 @@ var EdgeWsConnection = class extends Resource {
           payload: protocol.getPayloadType(message)
         }, {
           F: __dxlog_file3,
-          L: 130,
+          L: 185,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -379,11 +409,11 @@ var EdgeWsConnection = class extends Resource {
       if (err instanceof Error && err.message.includes("WebSocket is closed before the connection is established.")) {
         return;
       }
-      log.warn("Error closing websocket", {
+      log.warn("error closing websocket", {
         err
       }, {
         F: __dxlog_file3,
-        L: 148,
+        L: 203,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -392,7 +422,7 @@ var EdgeWsConnection = class extends Resource {
   _scheduleHeartbeats() {
     invariant3(this._ws, void 0, {
       F: __dxlog_file3,
-      L: 153,
+      L: 208,
       S: this,
       A: [
         "this._ws",
@@ -400,8 +430,10 @@ var EdgeWsConnection = class extends Resource {
       ]
     });
     scheduleTaskInterval(this._ctx, async () => {
+      this._pingTimestamp = Date.now();
       this._ws?.send("__ping__");
     }, SIGNAL_KEEPALIVE_INTERVAL);
+    this._pingTimestamp = Date.now();
     this._ws.send("__ping__");
     this._rescheduleHeartbeatTimeout();
   }
@@ -412,7 +444,7 @@ var EdgeWsConnection = class extends Resource {
     void this._inactivityTimeoutCtx?.dispose();
     this._inactivityTimeoutCtx = new Context(void 0, {
       F: __dxlog_file3,
-      L: 172
+      L: 229
     });
     scheduleTask(this._inactivityTimeoutCtx, () => {
       if (this.isOpen) {
@@ -421,7 +453,7 @@ var EdgeWsConnection = class extends Resource {
             lastReceivedMessageTimestamp: this._lastReceivedMessageTimestamp
           }, {
             F: __dxlog_file3,
-            L: 178,
+            L: 235,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -432,8 +464,61 @@ var EdgeWsConnection = class extends Resource {
       }
     }, SIGNAL_KEEPALIVE_TIMEOUT);
   }
+  _recordBytes(sent, received) {
+    const now = Date.now();
+    const currentSecond = Math.floor(now / 1e3) * 1e3;
+    const existingSample = this._bytesSamples.find((s) => Math.floor(s.timestamp / 1e3) * 1e3 === currentSecond);
+    if (existingSample) {
+      existingSample.sent += sent;
+      existingSample.received += received;
+    } else {
+      this._bytesSamples.push({
+        timestamp: now,
+        sent,
+        received
+      });
+    }
+  }
+  _scheduleRateCalculation() {
+    scheduleTaskInterval(this._ctx, async () => {
+      this._calculateRates();
+    }, this._rateUpdateInterval);
+    this._calculateRates();
+  }
+  _calculateRates() {
+    const now = Date.now();
+    const cutoff = now - this._rateWindow;
+    this._bytesSamples = this._bytesSamples.filter((s) => s.timestamp > cutoff);
+    if (this._bytesSamples.length === 0) {
+      this._uploadRate = 0;
+      this._downloadRate = 0;
+      return;
+    }
+    let totalSent = 0;
+    let totalReceived = 0;
+    const oldestTimestamp = Math.min(...this._bytesSamples.map((s) => s.timestamp));
+    const timeSpan = (now - oldestTimestamp) / 1e3;
+    for (const sample of this._bytesSamples) {
+      totalSent += sample.sent;
+      totalReceived += sample.received;
+    }
+    this._uploadRate = timeSpan > 0 ? Math.round(totalSent / timeSpan) : 0;
+    this._downloadRate = timeSpan > 0 ? Math.round(totalReceived / timeSpan) : 0;
+  }
   constructor(_identity, _connectionInfo, _callbacks) {
-    super(), _define_property(this, "_identity", void 0), _define_property(this, "_connectionInfo", void 0), _define_property(this, "_callbacks", void 0), _define_property(this, "_inactivityTimeoutCtx", void 0), _define_property(this, "_ws", void 0), _define_property(this, "_wsMuxer", void 0), _define_property(this, "_lastReceivedMessageTimestamp", void 0), this._identity = _identity, this._connectionInfo = _connectionInfo, this._callbacks = _callbacks, this._lastReceivedMessageTimestamp = Date.now();
+    super(), _define_property(this, "_identity", void 0), _define_property(this, "_connectionInfo", void 0), _define_property(this, "_callbacks", void 0), _define_property(this, "_inactivityTimeoutCtx", void 0), _define_property(this, "_ws", void 0), _define_property(this, "_wsMuxer", void 0), _define_property(this, "_lastReceivedMessageTimestamp", void 0), _define_property(this, "_openTimestamp", void 0), // Latency tracking.
+    _define_property(this, "_pingTimestamp", void 0), _define_property(this, "_rtt", void 0), // Rate tracking with sliding window.
+    _define_property(this, "_uploadRate", void 0), _define_property(this, "_downloadRate", void 0), _define_property(
+      this,
+      "_rateWindow",
+      void 0
+      // 10 second sliding window.
+    ), _define_property(
+      this,
+      "_rateUpdateInterval",
+      void 0
+      // Update rates every second.
+    ), _define_property(this, "_bytesSamples", void 0), _define_property(this, "_messagesSent", void 0), _define_property(this, "_messagesReceived", void 0), this._identity = _identity, this._connectionInfo = _connectionInfo, this._callbacks = _callbacks, this._lastReceivedMessageTimestamp = Date.now(), this._rtt = 0, this._uploadRate = 0, this._downloadRate = 0, this._rateWindow = 1e4, this._rateUpdateInterval = 1e3, this._bytesSamples = [], this._messagesSent = 0, this._messagesReceived = 0;
   }
 };
 _ts_decorate([
@@ -482,6 +567,7 @@ function _ts_decorate2(decorators, target, key, desc) {
 }
 var __dxlog_file4 = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/edge-client.ts";
 var DEFAULT_TIMEOUT = 1e4;
+var STATUS_REFRESH_INTERVAL = 1e3;
 var EdgeClient = class extends Resource2 {
   get info() {
     return {
@@ -492,7 +578,15 @@ var EdgeClient = class extends Resource2 {
     };
   }
   get status() {
-    return Boolean(this._currentConnection) && this._ready.state === TriggerState.RESOLVED ? EdgeStatus.CONNECTED : EdgeStatus.NOT_CONNECTED;
+    return {
+      state: Boolean(this._currentConnection) && this._ready.state === TriggerState.RESOLVED ? EdgeStatus.ConnectionState.CONNECTED : EdgeStatus.ConnectionState.NOT_CONNECTED,
+      uptime: this._currentConnection?.uptime ?? 0,
+      rtt: this._currentConnection?.rtt ?? 0,
+      rateBytesUp: this._currentConnection?.uploadRate ?? 0,
+      rateBytesDown: this._currentConnection?.downloadRate ?? 0,
+      messagesSent: this._currentConnection?.messagesSent ?? 0,
+      messagesReceived: this._currentConnection?.messagesReceived ?? 0
+    };
   }
   get identityKey() {
     return this._identity.identityKey;
@@ -507,7 +601,7 @@ var EdgeClient = class extends Resource2 {
         oldIdentity: this._identity
       }, {
         F: __dxlog_file4,
-        L: 99,
+        L: 118,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -524,7 +618,7 @@ var EdgeClient = class extends Resource2 {
     if (this._ready.state !== TriggerState.RESOLVED) {
       log2("waiting for websocket", void 0, {
         F: __dxlog_file4,
-        L: 112,
+        L: 131,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -554,7 +648,7 @@ var EdgeClient = class extends Resource2 {
           } catch (error) {
             log2.catch(error, void 0, {
               F: __dxlog_file4,
-              L: 145,
+              L: 164,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -572,7 +666,7 @@ var EdgeClient = class extends Resource2 {
       info: this.info
     }, {
       F: __dxlog_file4,
-      L: 158,
+      L: 177,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -581,11 +675,17 @@ var EdgeClient = class extends Resource2 {
         err
       }, {
         F: __dxlog_file4,
-        L: 160,
+        L: 179,
         S: this,
         C: (f, a) => f(...a)
       });
     });
+    scheduleTaskInterval2(this._ctx, async () => {
+      if (!this._currentConnection) {
+        return;
+      }
+      this.statusChanged.emit(this.status);
+    }, STATUS_REFRESH_INTERVAL);
   }
   /**
   * Close connection and free resources.
@@ -595,7 +695,7 @@ var EdgeClient = class extends Resource2 {
       peerKey: this._identity.peerKey
     }, {
       F: __dxlog_file4,
-      L: 168,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -612,7 +712,7 @@ var EdgeClient = class extends Resource2 {
     if (this._identity !== identity) {
       log2("identity changed during auth header request", void 0, {
         F: __dxlog_file4,
-        L: 182,
+        L: 213,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -625,7 +725,7 @@ var EdgeClient = class extends Resource2 {
       protocolHeader
     }, {
       F: __dxlog_file4,
-      L: 188,
+      L: 219,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -640,7 +740,7 @@ var EdgeClient = class extends Resource2 {
         } else {
           log2.verbose("connected callback ignored, because connection is not active", void 0, {
             F: __dxlog_file4,
-            L: 198,
+            L: 229,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -653,7 +753,7 @@ var EdgeClient = class extends Resource2 {
         } else {
           log2.verbose("restart requested by inactive connection", void 0, {
             F: __dxlog_file4,
-            L: 206,
+            L: 237,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -669,7 +769,7 @@ var EdgeClient = class extends Resource2 {
             type: message.payload?.typeUrl
           }, {
             F: __dxlog_file4,
-            L: 214,
+            L: 245,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -706,7 +806,7 @@ var EdgeClient = class extends Resource2 {
           err
         }, {
           F: __dxlog_file4,
-          L: 249,
+          L: 280,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -723,7 +823,7 @@ var EdgeClient = class extends Resource2 {
           payload: protocol.getPayloadType(message)
         }, {
           F: __dxlog_file4,
-          L: 259,
+          L: 290,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -744,7 +844,7 @@ var EdgeClient = class extends Resource2 {
         statusText: response.statusText
       }, {
         F: __dxlog_file4,
-        L: 271,
+        L: 302,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -769,8 +869,10 @@ var encodePresentationWsAuthHeader = (encodedPresentation) => {
 };
 
 // src/edge-http-client.ts
-import { FetchHttpClient, HttpClient } from "@effect/platform";
-import { Effect as Effect2, pipe } from "effect";
+import * as FetchHttpClient from "@effect/platform/FetchHttpClient";
+import * as HttpClient from "@effect/platform/HttpClient";
+import * as Effect2 from "effect/Effect";
+import * as Function from "effect/Function";
 import { sleep } from "@dxos/async";
 import { Context as Context3 } from "@dxos/context";
 import { log as log4 } from "@dxos/log";
@@ -778,7 +880,11 @@ import { EdgeAuthChallengeError, EdgeCallFailedError } from "@dxos/protocols";
 import { createUrl } from "@dxos/util";
 
 // src/http-client.ts
-import { Context as Context2, Duration, Effect, Layer, Schedule } from "effect";
+import * as Context2 from "effect/Context";
+import * as Duration from "effect/Duration";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Schedule from "effect/Schedule";
 import { log as log3 } from "@dxos/log";
 function _define_property3(obj, key, value) {
   if (key in obj) {
@@ -802,11 +908,11 @@ _define_property3(HttpConfig, "default", Layer.succeed(HttpConfig, {
   retryTimes: 3,
   retryBaseDelay: Duration.millis(1e3)
 }));
-var withRetry = (effect, { timeout = Duration.millis(1e3), retryBaseDelay = Duration.millis(1e3), retryTimes = 3 } = {}) => {
+var withRetry = (effect, { timeout: timeout2 = Duration.millis(1e3), retryBaseDelay = Duration.millis(1e3), retryTimes = 3 } = {}) => {
   return effect.pipe(Effect.flatMap((res) => (
     // Treat 500 errors as retryable?
     res.status === 500 ? Effect.fail(new Error(res.status.toString())) : res.json
-  )), Effect.timeout(timeout), Effect.retry({
+  )), Effect.timeout(timeout2), Effect.retry({
     schedule: Schedule.exponential(retryBaseDelay).pipe(Schedule.jittered),
     times: retryTimes
   }));
@@ -819,7 +925,7 @@ var withLogging = (effect) => effect.pipe(Effect.tap((res) => log3.info("respons
   status: res.status
 }, {
   F: __dxlog_file5,
-  L: 58,
+  L: 64,
   S: void 0,
   C: (f, a) => f(...a)
 })));
@@ -1066,21 +1172,21 @@ var EdgeHttpClient = class {
   // Internal
   //
   async _fetch(url, args) {
-    return pipe(HttpClient.get(url), withLogging, withRetryConfig, Effect2.provide(FetchHttpClient.layer), Effect2.provide(HttpConfig.default), Effect2.withSpan("EdgeHttpClient"), Effect2.runPromise);
+    return Function.pipe(HttpClient.get(url), withLogging, withRetryConfig, Effect2.provide(FetchHttpClient.layer), Effect2.provide(HttpConfig.default), Effect2.withSpan("EdgeHttpClient"), Effect2.runPromise);
   }
   // TODO(burdon): Refactor with effect (see edge-http-client.test.ts).
   async _call(url, args) {
     const shouldRetry = createRetryHandler(args);
     const requestContext = args.context ?? new Context3(void 0, {
       F: __dxlog_file6,
-      L: 389
+      L: 391
     });
     log4("fetch", {
       url,
       request: args.body
     }, {
       F: __dxlog_file6,
-      L: 390,
+      L: 392,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1108,7 +1214,7 @@ var EdgeHttpClient = class {
             body
           }, {
             F: __dxlog_file6,
-            L: 415,
+            L: 417,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1133,7 +1239,7 @@ var EdgeHttpClient = class {
           processingError
         }, {
           F: __dxlog_file6,
-          L: 433,
+          L: 435,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1146,7 +1252,7 @@ var EdgeHttpClient = class {
     if (!this._edgeIdentity) {
       log4.warn("unauthorized response received before identity was set", void 0, {
         F: __dxlog_file6,
-        L: 442,
+        L: 444,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1164,7 +1270,7 @@ var EdgeHttpClient = class {
       url: this._baseUrl
     }, {
       F: __dxlog_file6,
-      L: 97,
+      L: 99,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1184,7 +1290,7 @@ var createRequest = ({ method, body, json = true }, authHeader) => {
       bodySize: requestBody.length
     }, {
       F: __dxlog_file6,
-      L: 466,
+      L: 468,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -1198,14 +1304,14 @@ var createRequest = ({ method, body, json = true }, authHeader) => {
     headers
   };
 };
-var createRetryHandler = ({ retry }) => {
-  if (!retry || retry.count < 1) {
+var createRetryHandler = ({ retry: retry2 }) => {
+  if (!retry2 || retry2.count < 1) {
     return async () => false;
   }
   let retries = 0;
-  const maxRetries = retry.count ?? DEFAULT_MAX_RETRIES_COUNT;
-  const baseTimeout = retry.timeout ?? DEFAULT_RETRY_TIMEOUT;
-  const jitter = retry.jitter ?? DEFAULT_RETRY_JITTER;
+  const maxRetries = retry2.count ?? DEFAULT_MAX_RETRIES_COUNT;
+  const baseTimeout = retry2.timeout ?? DEFAULT_RETRY_TIMEOUT;
+  const jitter = retry2.jitter ?? DEFAULT_RETRY_JITTER;
   return async (ctx, retryAfter) => {
     if (++retries > maxRetries || ctx.disposed) {
       return false;
@@ -1213,8 +1319,8 @@ var createRetryHandler = ({ retry }) => {
     if (retryAfter) {
       await sleep(retryAfter);
     } else {
-      const timeout = baseTimeout + Math.random() * jitter;
-      await sleep(timeout);
+      const timeout2 = baseTimeout + Math.random() * jitter;
+      await sleep(timeout2);
     }
     return true;
   };