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

package/dist/lib/node-esm/index.mjs

@@ -7,7 +7,7 @@ import {
   getTypename,
   protocol,
   toUint8Array
-} from "./chunk-DR5YNW5K.mjs";
+} from "./chunk-JTBFRYNM.mjs";
 
 // src/index.ts
 export * from "@dxos/protocols/buf/dxos/edge/messenger_pb";
@@ -124,7 +124,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";
@@ -178,19 +178,6 @@ import { log, logInfo } from "@dxos/log";
 import { EdgeWebsocketProtocol } from "@dxos/protocols";
 import { buf } from "@dxos/protocols/buf";
 import { MessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_decorate(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") r = Reflect.decorate(decorators, target, key, desc);
@@ -201,6 +188,28 @@ var __dxlog_file3 = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/edge-ws-c
 var SIGNAL_KEEPALIVE_INTERVAL = 4e3;
 var SIGNAL_KEEPALIVE_TIMEOUT = 12e3;
 var EdgeWsConnection = class extends Resource {
+  _identity;
+  _connectionInfo;
+  _callbacks;
+  _inactivityTimeoutCtx;
+  _ws;
+  _wsMuxer;
+  _lastReceivedMessageTimestamp = Date.now();
+  _openTimestamp;
+  // Latency tracking.
+  _pingTimestamp;
+  _rtt = 0;
+  // Rate tracking with sliding window.
+  _uploadRate = 0;
+  _downloadRate = 0;
+  _rateWindow = 1e4;
+  _rateUpdateInterval = 1e3;
+  _bytesSamples = [];
+  _messagesSent = 0;
+  _messagesReceived = 0;
+  constructor(_identity, _connectionInfo, _callbacks) {
+    super(), this._identity = _identity, this._connectionInfo = _connectionInfo, this._callbacks = _callbacks;
+  }
   get info() {
     return {
       open: this.isOpen,
@@ -208,10 +217,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",
@@ -220,7 +247,7 @@ var EdgeWsConnection = class extends Resource {
     });
     invariant3(this._wsMuxer, void 0, {
       F: __dxlog_file3,
-      L: 54,
+      L: 94,
       S: this,
       A: [
         "this._wsMuxer",
@@ -232,10 +259,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) {
@@ -245,17 +273,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)
       }));
@@ -277,18 +308,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)
         });
@@ -296,12 +329,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)
         });
@@ -316,7 +349,7 @@ var EdgeWsConnection = class extends Resource {
           info: event.message
         }, {
           F: __dxlog_file3,
-          L: 101,
+          L: 148,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -326,7 +359,7 @@ var EdgeWsConnection = class extends Resource {
           error: event.error
         }, {
           F: __dxlog_file3,
-          L: 104,
+          L: 151,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -338,7 +371,7 @@ var EdgeWsConnection = class extends Resource {
           event: event.type
         }, {
           F: __dxlog_file3,
-          L: 112,
+          L: 159,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -346,13 +379,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", {
@@ -360,7 +399,7 @@ var EdgeWsConnection = class extends Resource {
           payload: protocol.getPayloadType(message)
         }, {
           F: __dxlog_file3,
-          L: 130,
+          L: 185,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -380,11 +419,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)
       });
@@ -393,7 +432,7 @@ var EdgeWsConnection = class extends Resource {
   _scheduleHeartbeats() {
     invariant3(this._ws, void 0, {
       F: __dxlog_file3,
-      L: 153,
+      L: 208,
       S: this,
       A: [
         "this._ws",
@@ -401,8 +440,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();
   }
@@ -413,7 +454,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) {
@@ -422,7 +463,7 @@ var EdgeWsConnection = class extends Resource {
             lastReceivedMessageTimestamp: this._lastReceivedMessageTimestamp
           }, {
             F: __dxlog_file3,
-            L: 178,
+            L: 235,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -433,8 +474,46 @@ var EdgeWsConnection = class extends Resource {
       }
     }, SIGNAL_KEEPALIVE_TIMEOUT);
   }
-  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();
+  _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;
   }
 };
 _ts_decorate([
@@ -462,19 +541,6 @@ var getEdgeUrlWithProtocol = (baseUrl, protocol2) => {
 };
 
 // src/edge-client.ts
-function _define_property2(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_decorate2(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") r = Reflect.decorate(decorators, target, key, desc);
@@ -483,7 +549,26 @@ 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 {
+  _identity;
+  _config;
+  statusChanged = new Event();
+  _persistentLifecycle = new PersistentLifecycle({
+    start: async () => this._connect(),
+    stop: async (state) => this._disconnect(state)
+  });
+  _messageListeners = /* @__PURE__ */ new Set();
+  _reconnectListeners = /* @__PURE__ */ new Set();
+  _baseWsUrl;
+  _baseHttpUrl;
+  _currentConnection = void 0;
+  _ready = new Trigger();
+  constructor(_identity, _config) {
+    super(), this._identity = _identity, this._config = _config;
+    this._baseWsUrl = getEdgeUrlWithProtocol(_config.socketEndpoint, "ws");
+    this._baseHttpUrl = getEdgeUrlWithProtocol(_config.socketEndpoint, "http");
+  }
   get info() {
     return {
       open: this.isOpen,
@@ -493,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;
@@ -508,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)
       });
@@ -525,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)
       });
@@ -555,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)
             });
@@ -573,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)
     });
@@ -582,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.
@@ -596,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)
     });
@@ -613,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)
       });
@@ -626,7 +725,7 @@ var EdgeClient = class extends Resource2 {
       protocolHeader
     }, {
       F: __dxlog_file4,
-      L: 188,
+      L: 219,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -641,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)
           });
@@ -654,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)
           });
@@ -670,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)
           });
@@ -707,7 +806,7 @@ var EdgeClient = class extends Resource2 {
           err
         }, {
           F: __dxlog_file4,
-          L: 249,
+          L: 280,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -724,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)
         });
@@ -745,21 +844,14 @@ var EdgeClient = class extends Resource2 {
         statusText: response.statusText
       }, {
         F: __dxlog_file4,
-        L: 271,
+        L: 302,
         S: this,
         C: (f, a) => f(...a)
       });
       return void 0;
     }
   }
-  constructor(_identity, _config) {
-    super(), _define_property2(this, "_identity", void 0), _define_property2(this, "_config", void 0), _define_property2(this, "statusChanged", void 0), _define_property2(this, "_persistentLifecycle", void 0), _define_property2(this, "_messageListeners", void 0), _define_property2(this, "_reconnectListeners", void 0), _define_property2(this, "_baseWsUrl", void 0), _define_property2(this, "_baseHttpUrl", void 0), _define_property2(this, "_currentConnection", void 0), _define_property2(this, "_ready", void 0), _define_property2(this, "_isActive", void 0), this._identity = _identity, this._config = _config, this.statusChanged = new Event(), this._persistentLifecycle = new PersistentLifecycle({
-      start: async () => this._connect(),
-      stop: async (state) => this._disconnect(state)
-    }), this._messageListeners = /* @__PURE__ */ new Set(), this._reconnectListeners = /* @__PURE__ */ new Set(), this._currentConnection = void 0, this._ready = new Trigger(), this._isActive = (connection) => connection === this._currentConnection;
-    this._baseWsUrl = getEdgeUrlWithProtocol(_config.socketEndpoint, "ws");
-    this._baseHttpUrl = getEdgeUrlWithProtocol(_config.socketEndpoint, "http");
-  }
+  _isActive = (connection) => connection === this._currentConnection;
 };
 _ts_decorate2([
   logInfo2
@@ -770,44 +862,37 @@ 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 { invariant as invariant4 } from "@dxos/invariant";
 import { log as log4 } from "@dxos/log";
 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) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file5 = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/http-client.ts";
-var _Context_Tag;
-var HttpConfig = class extends (_Context_Tag = Context2.Tag("HttpConfig")()) {
+var HttpConfig = class _HttpConfig extends Context2.Tag("HttpConfig")() {
+  static default = Layer.succeed(_HttpConfig, {
+    timeout: Duration.millis(1e3),
+    retryTimes: 3,
+    retryBaseDelay: Duration.millis(1e3)
+  });
 };
-_define_property3(HttpConfig, "default", Layer.succeed(HttpConfig, {
-  timeout: Duration.millis(1e3),
-  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
   }));
@@ -816,39 +901,45 @@ var withRetryConfig = (effect) => Effect.gen(function* () {
   const config = yield* HttpConfig;
   return yield* withRetry(effect, config);
 });
-var withLogging = (effect) => effect.pipe(Effect.tap((res) => log3.info("response", {
-  status: res.status
-}, {
-  F: __dxlog_file5,
-  L: 58,
-  S: void 0,
-  C: (f, a) => f(...a)
-})));
+var withLogging = (effect) => effect.pipe(Effect.tap((res) => {
+  log3.info("response", {
+    status: res.status
+  }, {
+    F: __dxlog_file5,
+    L: 66,
+    S: void 0,
+    C: (f, a) => f(...a)
+  });
+}));
 var encodeAuthHeader = (challenge) => {
   const encodedChallenge = Buffer.from(challenge).toString("base64");
   return `VerifiablePresentation pb;base64,${encodedChallenge}`;
 };
 
 // src/edge-http-client.ts
-function _define_property4(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file6 = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/edge-http-client.ts";
 var DEFAULT_RETRY_TIMEOUT = 1500;
 var DEFAULT_RETRY_JITTER = 500;
 var DEFAULT_MAX_RETRIES_COUNT = 3;
 var WARNING_BODY_SIZE = 10 * 1024 * 1024;
 var EdgeHttpClient = class {
+  _baseUrl;
+  _edgeIdentity;
+  /**
+  * Auth header is cached until receiving the next 401 from EDGE, at which point it gets refreshed.
+  */
+  _authHeader;
+  constructor(baseUrl) {
+    this._baseUrl = getEdgeUrlWithProtocol(baseUrl, "http");
+    log4("created", {
+      url: this._baseUrl
+    }, {
+      F: __dxlog_file6,
+      L: 107,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
   get baseUrl() {
     return this._baseUrl;
   }
@@ -981,6 +1072,7 @@ var EdgeHttpClient = class {
     formData.append("version", body.version);
     formData.append("ownerPublicKey", body.ownerPublicKey);
     formData.append("entryPoint", body.entryPoint);
+    body.runtime && formData.append("runtime", body.runtime);
     for (const [filename, content] of Object.entries(body.assets)) {
       formData.append("assets", new Blob([
         content
@@ -1066,75 +1158,109 @@ 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);
+  async _fetch(url, _args) {
+    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, {
+    const requestContext = args.context ?? Context3.default(void 0, {
       F: __dxlog_file6,
-      L: 389
+      L: 400
     });
     log4("fetch", {
       url,
       request: args.body
     }, {
       F: __dxlog_file6,
-      L: 390,
+      L: 401,
       S: this,
       C: (f, a) => f(...a)
     });
     let handledAuth = false;
+    const tryCount = 1;
     while (true) {
       let processingError = void 0;
-      let retryAfterHeaderValue = Number.NaN;
       try {
+        if (!this._authHeader && args.auth) {
+          const response2 = await fetch(new URL(`/auth`, this.baseUrl));
+          if (response2.status === 401) {
+            this._authHeader = await this._handleUnauthorized(response2);
+          }
+        }
         const request = createRequest(args, this._authHeader);
+        log4("call edge", {
+          url,
+          tryCount,
+          authHeader: !!this._authHeader
+        }, {
+          F: __dxlog_file6,
+          L: 416,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         const response = await fetch(url, request);
-        retryAfterHeaderValue = Number(response.headers.get("Retry-After"));
         if (response.ok) {
-          const body = await response.json();
+          const body2 = await response.clone().json();
           if (args.rawResponse) {
-            return body;
-          }
-          if (!("success" in body)) {
-            return body;
-          }
-          if (body.success) {
-            return body.data;
+            return body2;
           }
-          log4.warn("unsuccessful edge response", {
-            url,
-            body
-          }, {
+          invariant4(body2, "Expected body to be present", {
             F: __dxlog_file6,
-            L: 415,
+            L: 424,
             S: this,
-            C: (f, a) => f(...a)
+            A: [
+              "body",
+              "'Expected body to be present'"
+            ]
           });
-          if (body.errorData?.type === "auth_challenge" && typeof body.errorData?.challenge === "string") {
-            processingError = new EdgeAuthChallengeError(body.errorData.challenge, body.errorData);
-          } else if (body.errorData) {
-            processingError = EdgeCallFailedError.fromUnsuccessfulResponse(response, body);
+          if (!("success" in body2)) {
+            return body2;
+          }
+          if (body2.success) {
+            return body2.data;
           }
         } else if (response.status === 401 && !handledAuth) {
           this._authHeader = await this._handleUnauthorized(response);
           handledAuth = true;
           continue;
+        }
+        const body = response.headers.get("Content-Type") === "application/json" ? await response.clone().json() : void 0;
+        invariant4(!body?.success, "Expected body to not be a failure response or undefined.", {
+          F: __dxlog_file6,
+          L: 440,
+          S: this,
+          A: [
+            "!body?.success",
+            "'Expected body to not be a failure response or undefined.'"
+          ]
+        });
+        if (body?.errorData?.type === "auth_challenge" && typeof body?.errorData?.challenge === "string") {
+          processingError = new EdgeAuthChallengeError(body.errorData.challenge, body.errorData);
+        } else if (body?.success === false) {
+          processingError = EdgeCallFailedError.fromUnsuccessfulResponse(response, body);
         } else {
+          invariant4(!response.ok, "Expected response to not be ok.", {
+            F: __dxlog_file6,
+            L: 447,
+            S: this,
+            A: [
+              "!response.ok",
+              "'Expected response to not be ok.'"
+            ]
+          });
           processingError = await EdgeCallFailedError.fromHttpFailure(response);
         }
       } catch (error) {
         processingError = EdgeCallFailedError.fromProcessingFailureCause(error);
       }
-      if (processingError?.isRetryable && await shouldRetry(requestContext, retryAfterHeaderValue)) {
-        log4("retrying edge request", {
+      if (processingError?.isRetryable && await shouldRetry(requestContext, processingError.retryAfterMs)) {
+        log4.verbose("retrying edge request", {
           url,
           processingError
         }, {
           F: __dxlog_file6,
-          L: 433,
+          L: 455,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1147,7 +1273,7 @@ var EdgeHttpClient = class {
     if (!this._edgeIdentity) {
       log4.warn("unauthorized response received before identity was set", void 0, {
         F: __dxlog_file6,
-        L: 442,
+        L: 464,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1156,20 +1282,6 @@ var EdgeHttpClient = class {
     const challenge = await handleAuthChallenge(response, this._edgeIdentity);
     return encodeAuthHeader(challenge);
   }
-  constructor(baseUrl) {
-    _define_property4(this, "_baseUrl", void 0);
-    _define_property4(this, "_edgeIdentity", void 0);
-    _define_property4(this, "_authHeader", void 0);
-    this._baseUrl = getEdgeUrlWithProtocol(baseUrl, "http");
-    log4("created", {
-      url: this._baseUrl
-    }, {
-      F: __dxlog_file6,
-      L: 97,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-  }
 };
 var createRequest = ({ method, body, json = true }, authHeader) => {
   let requestBody;
@@ -1185,7 +1297,7 @@ var createRequest = ({ method, body, json = true }, authHeader) => {
       bodySize: requestBody.length
     }, {
       F: __dxlog_file6,
-      L: 466,
+      L: 488,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -1199,14 +1311,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;
@@ -1214,8 +1326,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;
   };