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

package/dist/lib/{browser → neutral}/index.mjs

@@ -6,7 +6,7 @@ import {
   getTypename,
   protocol,
   toUint8Array
-} from "./chunk-IKP53CBQ.mjs";
+} from "./chunk-ZIQ5T3A7.mjs";
 
 // src/index.ts
 export * from "@dxos/protocols/buf/dxos/edge/messenger_pb";
@@ -60,15 +60,7 @@ var createChainEdgeIdentity = async (signer, identityKey, peerKey, chain, creden
     identityKey: identityKey.toHex(),
     peerKey: peerKey.toHex(),
     presentCredentials: async ({ challenge }) => {
-      invariant(chain, void 0, {
-        F: __dxlog_file,
-        L: 75,
-        S: void 0,
-        A: [
-          "chain",
-          ""
-        ]
-      });
+      invariant(chain, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 56, S: void 0, A: ["chain", ""] });
       return signPresentation({
         presentation: {
           credentials: credentialsToSign
@@ -124,6 +116,7 @@ var createStubEdgeIdentity = () => {
 
 // src/edge-client.ts
 import { Event, PersistentLifecycle, Trigger, TriggerState, scheduleMicroTask, scheduleTaskInterval as scheduleTaskInterval2 } from "@dxos/async";
+import { TRACE_SPAN_ATTRIBUTE } from "@dxos/context";
 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";
@@ -133,35 +126,11 @@ import { invariant as invariant2 } from "@dxos/invariant";
 import { schema } from "@dxos/protocols/proto";
 var __dxlog_file2 = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/edge-identity.ts";
 var handleAuthChallenge = async (failedResponse, identity) => {
-  invariant2(failedResponse.status === 401, void 0, {
-    F: __dxlog_file2,
-    L: 21,
-    S: void 0,
-    A: [
-      "failedResponse.status === 401",
-      ""
-    ]
-  });
+  invariant2(failedResponse.status === 401, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 7, S: void 0, A: ["failedResponse.status === 401", ""] });
   const headerValue = failedResponse.headers.get("Www-Authenticate");
-  invariant2(headerValue?.startsWith("VerifiablePresentation challenge="), void 0, {
-    F: __dxlog_file2,
-    L: 24,
-    S: void 0,
-    A: [
-      "headerValue?.startsWith('VerifiablePresentation challenge=')",
-      ""
-    ]
-  });
+  invariant2(headerValue?.startsWith("VerifiablePresentation challenge="), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 9, S: void 0, A: ["headerValue?.startsWith('VerifiablePresentation challenge=')", ""] });
   const challenge = headerValue?.slice("VerifiablePresentation challenge=".length);
-  invariant2(challenge, void 0, {
-    F: __dxlog_file2,
-    L: 27,
-    S: void 0,
-    A: [
-      "challenge",
-      ""
-    ]
-  });
+  invariant2(challenge, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 11, S: void 0, A: ["challenge", ""] });
   const presentation = await identity.presentCredentials({
     challenge: Buffer.from(challenge, "base64")
   });
@@ -177,29 +146,38 @@ 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;
-}
+var __dxlog_file3 = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/edge-ws-connection.ts";
 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);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file3 = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/edge-ws-connection.ts";
 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,
@@ -226,33 +204,12 @@ var EdgeWsConnection = class extends Resource {
     return this._messagesReceived;
   }
   send(message) {
-    invariant3(this._ws, void 0, {
-      F: __dxlog_file3,
-      L: 93,
-      S: this,
-      A: [
-        "this._ws",
-        ""
-      ]
-    });
-    invariant3(this._wsMuxer, void 0, {
-      F: __dxlog_file3,
-      L: 94,
-      S: this,
-      A: [
-        "this._wsMuxer",
-        ""
-      ]
-    });
+    invariant3(this._ws, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 72, S: this, A: ["this._ws", ""] });
+    invariant3(this._wsMuxer, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 73, S: this, A: ["this._wsMuxer", ""] });
     log("sending...", {
       peerKey: this._identity.peerKey,
       payload: protocol.getPayloadType(message)
-    }, {
-      F: __dxlog_file3,
-      L: 95,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 74, S: this });
     this._messagesSent++;
     if (this._ws?.protocol.includes(EdgeWebsocketProtocol.V0)) {
       const binary = buf.toBinary(MessageSchema, message);
@@ -261,12 +218,7 @@ var EdgeWsConnection = class extends Resource {
           byteLength: binary.byteLength,
           serviceId: message.serviceId,
           payload: protocol.getPayloadType(message)
-        }, {
-          F: __dxlog_file3,
-          L: 100,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 82, S: this });
         return;
       }
       this._recordBytes(binary.byteLength, 0);
@@ -274,12 +226,7 @@ var EdgeWsConnection = class extends Resource {
     } 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: 113,
-        S: this,
-        C: (f, a) => f(...a)
-      }));
+      this._wsMuxer.send(message).catch((e) => log.catch(e, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 95, S: this }));
     }
   }
   async _open() {
@@ -291,17 +238,14 @@ var EdgeWsConnection = class extends Resource {
       this._connectionInfo.protocolHeader
     ] : [
       ...baseProtocols
-    ]);
+    ], this._connectionInfo.headers ? {
+      headers: this._connectionInfo.headers
+    } : void 0);
     const muxer = new WebSocketMuxer(this._ws);
     this._wsMuxer = muxer;
     this._ws.onopen = () => {
       if (this.isOpen) {
-        log("connected", void 0, {
-          F: __dxlog_file3,
-          L: 130,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        log("connected", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 114, S: this });
         this._openTimestamp = Date.now();
         this._callbacks.onConnected();
         this._scheduleHeartbeats();
@@ -309,12 +253,7 @@ var EdgeWsConnection = class extends Resource {
       } else {
         log.verbose("connected after becoming inactive", {
           currentIdentity: this._identity
-        }, {
-          F: __dxlog_file3,
-          L: 136,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 120, S: this });
       }
     };
     this._ws.onclose = (event) => {
@@ -322,12 +261,7 @@ var EdgeWsConnection = class extends Resource {
         log.warn("server disconnected", {
           code: event.code,
           reason: event.reason
-        }, {
-          F: __dxlog_file3,
-          L: 141,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 127, S: this });
         this._callbacks.onRestartRequired();
         muxer.destroy();
       }
@@ -337,34 +271,19 @@ var EdgeWsConnection = class extends Resource {
         log.warn("edge connection socket error", {
           error: event.error,
           info: event.message
-        }, {
-          F: __dxlog_file3,
-          L: 148,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 137, S: this });
         this._callbacks.onRestartRequired();
       } else {
         log.verbose("error ignored on closed connection", {
           error: event.error
-        }, {
-          F: __dxlog_file3,
-          L: 151,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 143, S: this });
       }
     };
     this._ws.onmessage = async (event) => {
       if (!this.isOpen) {
         log.verbose("message ignored on closed connection", {
           event: event.type
-        }, {
-          F: __dxlog_file3,
-          L: 159,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 152, S: this });
         return;
       }
       this._lastReceivedMessageTimestamp = Date.now();
@@ -387,12 +306,7 @@ var EdgeWsConnection = class extends Resource {
         log("received", {
           from: message.source,
           payload: protocol.getPayloadType(message)
-        }, {
-          F: __dxlog_file3,
-          L: 185,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 175, S: this });
         this._callbacks.onMessage(message);
       }
     };
@@ -411,24 +325,11 @@ var EdgeWsConnection = class extends Resource {
       }
       log.warn("error closing websocket", {
         err
-      }, {
-        F: __dxlog_file3,
-        L: 203,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 194, S: this });
     }
   }
   _scheduleHeartbeats() {
-    invariant3(this._ws, void 0, {
-      F: __dxlog_file3,
-      L: 208,
-      S: this,
-      A: [
-        "this._ws",
-        ""
-      ]
-    });
+    invariant3(this._ws, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 200, S: this, A: ["this._ws", ""] });
     scheduleTaskInterval(this._ctx, async () => {
       this._pingTimestamp = Date.now();
       this._ws?.send("__ping__");
@@ -442,21 +343,13 @@ var EdgeWsConnection = class extends Resource {
       return;
     }
     void this._inactivityTimeoutCtx?.dispose();
-    this._inactivityTimeoutCtx = new Context(void 0, {
-      F: __dxlog_file3,
-      L: 229
-    });
+    this._inactivityTimeoutCtx = new Context(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 216 });
     scheduleTask(this._inactivityTimeoutCtx, () => {
       if (this.isOpen) {
         if (Date.now() - this._lastReceivedMessageTimestamp > SIGNAL_KEEPALIVE_TIMEOUT) {
           log.warn("restart due to inactivity timeout", {
             lastReceivedMessageTimestamp: this._lastReceivedMessageTimestamp
-          }, {
-            F: __dxlog_file3,
-            L: 235,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 220, S: this });
           this._callbacks.onRestartRequired();
         } else {
           this._rescheduleHeartbeatTimeout();
@@ -505,21 +398,6 @@ var EdgeWsConnection = class extends Resource {
     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), _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([
   logInfo
@@ -546,29 +424,34 @@ 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;
-}
+var __dxlog_file4 = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/edge-client.ts";
 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);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-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,
@@ -599,12 +482,7 @@ var EdgeClient = class extends Resource2 {
       log2("Edge identity changed", {
         identity,
         oldIdentity: this._identity
-      }, {
-        F: __dxlog_file4,
-        L: 118,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 74, S: this });
       this._identity = identity;
       this._closeCurrentConnection(new EdgeIdentityChangedError());
       void this._persistentLifecycle.scheduleRestart();
@@ -614,14 +492,9 @@ var EdgeClient = class extends Resource2 {
   * Send message.
   * NOTE: The message is guaranteed to be delivered but the service must respond with a message to confirm processing.
   */
-  async send(message) {
+  async send(ctx, message) {
     if (this._ready.state !== TriggerState.RESOLVED) {
-      log2("waiting for websocket", void 0, {
-        F: __dxlog_file4,
-        L: 131,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      log2("waiting for websocket", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 88, S: this });
       await this._ready.wait({
         timeout: this._config.timeout ?? DEFAULT_TIMEOUT
       });
@@ -632,6 +505,14 @@ var EdgeClient = class extends Resource2 {
     if (message.source && (message.source.peerKey !== this._identity.peerKey || message.source.identityKey !== this.identityKey)) {
       throw new EdgeIdentityChangedError();
     }
+    const traceCtx = ctx.getAttribute(TRACE_SPAN_ATTRIBUTE);
+    if (traceCtx) {
+      message.traceContext = {
+        $typeName: "dxos.edge.messenger.TraceContext",
+        traceparent: traceCtx.traceparent,
+        tracestate: traceCtx.tracestate
+      };
+    }
     this._currentConnection.send(message);
   }
   onMessage(listener) {
@@ -646,12 +527,7 @@ var EdgeClient = class extends Resource2 {
           try {
             listener();
           } catch (error) {
-            log2.catch(error, void 0, {
-              F: __dxlog_file4,
-              L: 164,
-              S: this,
-              C: (f, a) => f(...a)
-            });
+            log2.catch(error, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 123, S: this });
           }
         }
       });
@@ -664,21 +540,11 @@ var EdgeClient = class extends Resource2 {
   async _open() {
     log2("opening...", {
       info: this.info
-    }, {
-      F: __dxlog_file4,
-      L: 177,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 133, S: this });
     this._persistentLifecycle.open().catch((err) => {
       log2.warn("Error while opening connection", {
         err
-      }, {
-        F: __dxlog_file4,
-        L: 179,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 137, S: this });
     });
     scheduleTaskInterval2(this._ctx, async () => {
       if (!this._currentConnection) {
@@ -693,12 +559,7 @@ var EdgeClient = class extends Resource2 {
   async _close() {
     log2("closing...", {
       peerKey: this._identity.peerKey
-    }, {
-      F: __dxlog_file4,
-      L: 199,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 152, S: this });
     this._closeCurrentConnection();
     await this._persistentLifecycle.close();
   }
@@ -710,12 +571,7 @@ var EdgeClient = class extends Resource2 {
     const path = `/ws/${identity.identityKey}/${identity.peerKey}`;
     const protocolHeader = this._config.disableAuth ? void 0 : await this._createAuthHeader(path);
     if (this._identity !== identity) {
-      log2("identity changed during auth header request", void 0, {
-        F: __dxlog_file4,
-        L: 213,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      log2("identity changed during auth header request", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 166, S: this });
       return void 0;
     }
     const restartRequired = new Trigger();
@@ -723,27 +579,20 @@ var EdgeClient = class extends Resource2 {
     log2("Opening websocket", {
       url: url.toString(),
       protocolHeader
-    }, {
-      F: __dxlog_file4,
-      L: 219,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 171, S: this });
     const connection = new EdgeWsConnection(identity, {
       url,
-      protocolHeader
+      protocolHeader,
+      headers: this._config.clientTag ? {
+        "X-DXOS-Client-Tag": this._config.clientTag
+      } : void 0
     }, {
       onConnected: () => {
         if (this._isActive(connection)) {
           this._ready.wake();
           this._notifyReconnected();
         } else {
-          log2.verbose("connected callback ignored, because connection is not active", void 0, {
-            F: __dxlog_file4,
-            L: 229,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          log2.verbose("connected callback ignored, because connection is not active", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 187, S: this });
         }
       },
       onRestartRequired: () => {
@@ -751,12 +600,7 @@ var EdgeClient = class extends Resource2 {
           this._closeCurrentConnection();
           void this._persistentLifecycle.scheduleRestart();
         } else {
-          log2.verbose("restart requested by inactive connection", void 0, {
-            F: __dxlog_file4,
-            L: 237,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          log2.verbose("restart requested by inactive connection", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 195, S: this });
         }
         restartRequired.wake();
       },
@@ -767,12 +611,7 @@ var EdgeClient = class extends Resource2 {
           log2.verbose("ignored a message on inactive connection", {
             from: message.source,
             type: message.payload?.typeUrl
-          }, {
-            F: __dxlog_file4,
-            L: 245,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 203, S: this });
         }
       }
     });
@@ -804,12 +643,7 @@ var EdgeClient = class extends Resource2 {
       } catch (err) {
         log2.error("ws reconnect listener failed", {
           err
-        }, {
-          F: __dxlog_file4,
-          L: 280,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 238, S: this });
       }
     }
   }
@@ -821,12 +655,7 @@ var EdgeClient = class extends Resource2 {
         log2.error("ws incoming message processing failed", {
           err,
           payload: protocol.getPayloadType(message)
-        }, {
-          F: __dxlog_file4,
-          L: 290,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 249, S: this });
       }
     }
   }
@@ -842,23 +671,11 @@ var EdgeClient = class extends Resource2 {
       log2.warn("no auth challenge from edge", {
         status: response.status,
         statusText: response.statusText
-      }, {
-        F: __dxlog_file4,
-        L: 302,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 265, S: this });
       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
@@ -874,9 +691,11 @@ 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 { TRACE_SPAN_ATTRIBUTE as TRACE_SPAN_ATTRIBUTE2 } from "@dxos/context";
+import { runAndForwardErrors } from "@dxos/effect";
+import { invariant as invariant4 } from "@dxos/invariant";
 import { log as log4 } from "@dxos/log";
-import { EdgeAuthChallengeError, EdgeCallFailedError } from "@dxos/protocols";
+import { EDGE_CLIENT_TAG_HEADER, EdgeAuthChallengeError, EdgeCallFailedError } from "@dxos/protocols";
 import { createUrl } from "@dxos/util";
 
 // src/http-client.ts
@@ -886,28 +705,14 @@ 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: timeout2 = Duration.millis(1e3), retryBaseDelay = Duration.millis(1e3), retryTimes = 3 } = {}) => {
   return effect.pipe(Effect.flatMap((res) => (
     // Treat 500 errors as retryable?
@@ -921,39 +726,38 @@ 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: 64,
-  S: void 0,
-  C: (f, a) => f(...a)
-})));
+var withLogging = (effect) => effect.pipe(Effect.tap((res) => {
+  log3.info("response", {
+    status: res.status
+  }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 31, S: void 0 });
+}));
 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 LEGACY_CORS_PROXY_URL = "https://cors-proxy.dxos.workers.dev";
 var EdgeHttpClient = class {
+  _baseUrl;
+  _clientTag;
+  _edgeIdentity;
+  /**
+  * Auth header is cached until receiving the next 401 from EDGE, at which point it gets refreshed.
+  */
+  _authHeader;
+  constructor(baseUrl, options) {
+    this._baseUrl = getEdgeUrlWithProtocol(baseUrl, "http");
+    this._clientTag = options?.clientTag;
+    log4("created", {
+      url: this._baseUrl
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 37, S: this });
+  }
   get baseUrl() {
     return this._baseUrl;
   }
@@ -966,24 +770,25 @@ var EdgeHttpClient = class {
   //
   // Status
   //
-  async getStatus(args) {
-    return this._call(new URL("/status", this.baseUrl), {
+  async getStatus(ctx, args) {
+    return this._call(ctx, new URL("/status", this.baseUrl), {
       ...args,
-      method: "GET"
+      method: "GET",
+      auth: true
     });
   }
   //
   // Agents
   //
-  createAgent(body, args) {
-    return this._call(new URL("/agents/create", this.baseUrl), {
+  createAgent(ctx, body, args) {
+    return this._call(ctx, new URL("/agents/create", this.baseUrl), {
       ...args,
       method: "POST",
       body
     });
   }
-  getAgentStatus(request, args) {
-    return this._call(new URL(`/users/${request.ownerIdentityKey.toHex()}/agent/status`, this.baseUrl), {
+  getAgentStatus(ctx, request, args) {
+    return this._call(ctx, new URL(`/users/${request.ownerIdentityKey.toHex()}/agent/status`, this.baseUrl), {
       ...args,
       method: "GET"
     });
@@ -991,14 +796,14 @@ var EdgeHttpClient = class {
   //
   // Credentials
   //
-  getCredentialsForNotarization(spaceId, args) {
-    return this._call(new URL(`/spaces/${spaceId}/notarization`, this.baseUrl), {
+  getCredentialsForNotarization(ctx, spaceId, args) {
+    return this._call(ctx, new URL(`/spaces/${spaceId}/notarization`, this.baseUrl), {
       ...args,
       method: "GET"
     });
   }
-  async notarizeCredentials(spaceId, body, args) {
-    await this._call(new URL(`/spaces/${spaceId}/notarization`, this.baseUrl), {
+  async notarizeCredentials(ctx, spaceId, body, args) {
+    await this._call(ctx, new URL(`/spaces/${spaceId}/notarization`, this.baseUrl), {
       ...args,
       body,
       method: "POST"
@@ -1007,8 +812,8 @@ var EdgeHttpClient = class {
   //
   // Identity
   //
-  async recoverIdentity(body, args) {
-    return this._call(new URL("/identity/recover", this.baseUrl), {
+  async recoverIdentity(ctx, body, args) {
+    return this._call(ctx, new URL("/identity/recover", this.baseUrl), {
       ...args,
       body,
       method: "POST"
@@ -1017,8 +822,8 @@ var EdgeHttpClient = class {
   //
   // Invitations
   //
-  async joinSpaceByInvitation(spaceId, body, args) {
-    return this._call(new URL(`/spaces/${spaceId}/join`, this.baseUrl), {
+  async joinSpaceByInvitation(ctx, spaceId, body, args) {
+    return this._call(ctx, new URL(`/spaces/${spaceId}/join`, this.baseUrl), {
       ...args,
       body,
       method: "POST"
@@ -1027,8 +832,8 @@ var EdgeHttpClient = class {
   //
   // OAuth and credentials
   //
-  async initiateOAuthFlow(body, args) {
-    return this._call(new URL("/oauth/initiate", this.baseUrl), {
+  async initiateOAuthFlow(ctx, body, args) {
+    return this._call(ctx, new URL("/oauth/initiate", this.baseUrl), {
       ...args,
       body,
       method: "POST"
@@ -1037,8 +842,8 @@ var EdgeHttpClient = class {
   //
   // Spaces
   //
-  async createSpace(body, args) {
-    return this._call(new URL("/spaces/create", this.baseUrl), {
+  async createSpace(ctx, body, args) {
+    return this._call(ctx, new URL("/spaces/create", this.baseUrl), {
       ...args,
       body,
       method: "POST"
@@ -1047,9 +852,10 @@ var EdgeHttpClient = class {
   //
   // Queues
   //
-  async queryQueue(subspaceTag, spaceId, query, args) {
-    const { queueId } = query;
-    return this._call(createUrl(new URL(`/spaces/${subspaceTag}/${spaceId}/queue/${queueId}/query`, this.baseUrl), {
+  async queryQueue(ctx, subspaceTag, spaceId, query, args) {
+    const queueId = query.queueIds?.[0];
+    invariant4(queueId, "queueId required", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 137, S: this, A: ["queueId", "'queueId required'"] });
+    return this._call(ctx, createUrl(new URL(`/spaces/${subspaceTag}/${spaceId}/queue/${queueId}/query`, this.baseUrl), {
       after: query.after,
       before: query.before,
       limit: query.limit,
@@ -1060,8 +866,8 @@ var EdgeHttpClient = class {
       method: "GET"
     });
   }
-  async insertIntoQueue(subspaceTag, spaceId, queueId, objects, args) {
-    return this._call(new URL(`/spaces/${subspaceTag}/${spaceId}/queue/${queueId}`, this.baseUrl), {
+  async insertIntoQueue(ctx, subspaceTag, spaceId, queueId, objects, args) {
+    return this._call(ctx, new URL(`/spaces/${subspaceTag}/${spaceId}/queue/${queueId}`, this.baseUrl), {
       ...args,
       body: {
         objects
@@ -1069,8 +875,8 @@ var EdgeHttpClient = class {
       method: "POST"
     });
   }
-  async deleteFromQueue(subspaceTag, spaceId, queueId, objectIds, args) {
-    return this._call(createUrl(new URL(`/spaces/${subspaceTag}/${spaceId}/queue/${queueId}`, this.baseUrl), {
+  async deleteFromQueue(ctx, subspaceTag, spaceId, queueId, objectIds, args) {
+    return this._call(ctx, createUrl(new URL(`/spaces/${subspaceTag}/${spaceId}/queue/${queueId}`, this.baseUrl), {
       ids: objectIds.join(",")
     }), {
       ...args,
@@ -1080,12 +886,13 @@ var EdgeHttpClient = class {
   //
   // Functions
   //
-  async uploadFunction(pathParts, body, args) {
+  async uploadFunction(ctx, pathParts, body, args) {
     const formData = new FormData();
     formData.append("name", body.name ?? "");
     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
@@ -1099,20 +906,20 @@ var EdgeHttpClient = class {
         pathParts.functionId
       ] : []
     ].join("/");
-    return this._call(new URL(path, this.baseUrl), {
+    return this._call(ctx, new URL(path, this.baseUrl), {
       ...args,
       body: formData,
       method: "PUT",
       json: false
     });
   }
-  async listFunctions(args) {
-    return this._call(new URL("/functions", this.baseUrl), {
+  async listFunctions(ctx, args) {
+    return this._call(ctx, new URL("/functions", this.baseUrl), {
       ...args,
       method: "GET"
     });
   }
-  async invokeFunction(params, input, args) {
+  async invokeFunction(ctx, params, input, args) {
     const url = new URL(`/functions/${params.functionId}`, this.baseUrl);
     if (params.version) {
       url.searchParams.set("version", params.version);
@@ -1126,18 +933,17 @@ var EdgeHttpClient = class {
     if (params.subrequestsLimit) {
       url.searchParams.set("subrequestsLimit", params.subrequestsLimit.toString());
     }
-    return this._call(url, {
+    return this._call(ctx, url, {
       ...args,
       body: input,
-      method: "POST",
-      rawResponse: true
+      method: "POST"
     });
   }
   //
   // Workflows
   //
-  async executeWorkflow(spaceId, graphId, input, args) {
-    return this._call(new URL(`/workflows/${spaceId}/${graphId}`, this.baseUrl), {
+  async executeWorkflow(ctx, spaceId, graphId, input, args) {
+    return this._call(ctx, new URL(`/workflows/${spaceId}/${graphId}`, this.baseUrl), {
       ...args,
       body: input,
       method: "POST"
@@ -1146,103 +952,161 @@ var EdgeHttpClient = class {
   //
   // Triggers
   //
-  async getCronTriggers(spaceId) {
-    return this._call(new URL(`/test/functions/${spaceId}/triggers/crons`, this.baseUrl), {
+  async getCronTriggers(ctx, spaceId) {
+    return this._call(ctx, new URL(`/functions/${spaceId}/triggers/crons`, this.baseUrl), {
+      method: "GET"
+    });
+  }
+  async forceRunCronTrigger(ctx, spaceId, triggerId) {
+    return this._call(ctx, new URL(`/functions/${spaceId}/triggers/crons/${triggerId}/run`, this.baseUrl), {
+      method: "POST"
+    });
+  }
+  //
+  // Query
+  //
+  /**
+  * Execute a QueryAST query against a space.
+  */
+  async execQuery(ctx, spaceId, body, args) {
+    return this._call(ctx, new URL(`/spaces/${spaceId}/exec-query`, this.baseUrl), {
+      ...args,
+      body,
+      method: "POST"
+    });
+  }
+  //
+  // Registry
+  //
+  /**
+  * Fetches the hydrated plugin directory from the Edge registry service.
+  * Unauthenticated; safe to call without an identity.
+  */
+  async getRegistryPlugins(ctx, args) {
+    return this._call(ctx, new URL("/registry/plugins", this.baseUrl), {
+      ...args,
+      method: "GET"
+    });
+  }
+  /**
+  * Fetches the available release versions for a given plugin repo. `repo` is the
+  * GitHub `owner/name` form; this method takes care of URL-encoding before issuing
+  * the request. Unauthenticated; same surface area as {@link getRegistryPlugins}.
+  *
+  * Versions are returned newest first, suitable for direct rendering in a picker.
+  */
+  async getRegistryPluginVersions(ctx, repo, args) {
+    return this._call(ctx, new URL(`/registry/plugins/${encodeURIComponent(repo)}/versions`, this.baseUrl), {
+      ...args,
       method: "GET"
     });
   }
   //
   // Import/Export space.
   //
-  async importBundle(spaceId, body, args) {
-    return this._call(new URL(`/spaces/${spaceId}/import`, this.baseUrl), {
+  async importBundle(ctx, spaceId, body, args) {
+    return this._call(ctx, new URL(`/spaces/${spaceId}/import`, this.baseUrl), {
       ...args,
       body,
       method: "PUT"
     });
   }
-  async exportBundle(spaceId, body, args) {
-    return this._call(new URL(`/spaces/${spaceId}/export`, this.baseUrl), {
+  async exportBundle(ctx, spaceId, body, args) {
+    return this._call(ctx, new URL(`/spaces/${spaceId}/export`, this.baseUrl), {
       ...args,
       body,
       method: "POST"
     });
   }
   //
+  // Integration proxy.
+  //
+  /**
+  * Fetch through the edge proxy, used by integration plugins (Discord, ...)
+  * to call third-party REST APIs that don't set permissive CORS headers.
+  *
+  * `init.headers.Authorization` (caller-supplied) is preserved by prefixing
+  * with `X-Cors-Proxy-Authorization`, since the proxy strips `Authorization`
+  * on forwarding to avoid leaking the DXOS presentation upstream — the
+  * prefix carries the upstream's bot token / token through.
+  *
+  * TEMPORARY: routed through the legacy standalone proxy at
+  * `cors-proxy.dxos.workers.dev` (open, unauthenticated, path
+  * `/<host>/<path>`) so that integration plugins can be tested before the
+  * authenticated `/proxy/*` route on the main edge worker ships
+  * (https://github.com/dxos/edge/pull/576). When that PR deploys, restore
+  * the commented-out block below — it rewrites the target under
+  * `${this.baseUrl}/proxy/...` and signs the request with the cached
+  * verifiable presentation. The header-remap and `x-cors-proxy-*` override
+  * conventions are unchanged between the two paths.
+  */
+  async proxyFetch(target, init = {}) {
+    return proxyFetchLegacy(target, init, this._clientTag);
+  }
+  //
   // Internal
   //
-  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);
+  async _fetch(url, _args) {
+    return Function.pipe(HttpClient.get(url), withLogging, withRetryConfig, Effect2.provide(FetchHttpClient.layer), Effect2.provide(HttpConfig.default), Effect2.withSpan("EdgeHttpClient"), runAndForwardErrors);
   }
   // TODO(burdon): Refactor with effect (see edge-http-client.test.ts).
-  async _call(url, args) {
+  async _call(ctx, url, args) {
     const shouldRetry = createRetryHandler(args);
-    const requestContext = args.context ?? new Context3(void 0, {
-      F: __dxlog_file6,
-      L: 391
-    });
     log4("fetch", {
       url,
       request: args.body
-    }, {
-      F: __dxlog_file6,
-      L: 392,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 362, S: this });
+    const traceHeaders = getTraceHeaders(ctx);
     let handledAuth = false;
+    const tryCount = 1;
     while (true) {
       let processingError = void 0;
-      let retryAfterHeaderValue = Number.NaN;
       try {
-        const request = createRequest(args, this._authHeader);
+        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, traceHeaders, this._clientTag);
+        log4("call edge", {
+          url,
+          tryCount,
+          authHeader: !!this._authHeader
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 379, S: this });
         const response = await fetch(url, request);
-        retryAfterHeaderValue = Number(response.headers.get("Retry-After"));
         if (response.ok) {
-          const body = await response.json();
-          if (args.rawResponse) {
-            return body;
-          }
-          if (!("success" in body)) {
-            return body;
-          }
-          if (body.success) {
-            return body.data;
+          const body2 = await response.clone().json();
+          invariant4(body2, "Expected body to be present", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 387, S: this, A: ["body", "'Expected body to be present'"] });
+          if (!("success" in body2)) {
+            return body2;
           }
-          log4.warn("unsuccessful edge response", {
-            url,
-            body
-          }, {
-            F: __dxlog_file6,
-            L: 417,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          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 (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.", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 400, S: this, A: ["!body?.success", "'Expected body to not be a failure response or undefined.'"] });
+        if (body?.data?.type === "auth_challenge" && typeof body?.data?.challenge === "string") {
+          processingError = new EdgeAuthChallengeError(body.data.challenge, body.data);
+        } else if (body?.success === false) {
+          processingError = EdgeCallFailedError.fromUnsuccessfulResponse(response, body);
         } else {
+          invariant4(!response.ok, "Expected response to not be ok.", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 406, 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(ctx, processingError.retryAfterMs)) {
+        log4.verbose("retrying edge request", {
           url,
           processingError
-        }, {
-          F: __dxlog_file6,
-          L: 435,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 413, S: this });
       } else {
         throw processingError;
       }
@@ -1250,33 +1114,14 @@ var EdgeHttpClient = class {
   }
   async _handleUnauthorized(response) {
     if (!this._edgeIdentity) {
-      log4.warn("unauthorized response received before identity was set", void 0, {
-        F: __dxlog_file6,
-        L: 444,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      log4.warn("unauthorized response received before identity was set", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 424, S: this });
       throw await EdgeCallFailedError.fromHttpFailure(response);
     }
     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: 99,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-  }
 };
-var createRequest = ({ method, body, json = true }, authHeader) => {
+var createRequest = ({ method, body, json = true }, authHeader, traceHeaders, clientTag) => {
   let requestBody;
   const headers = {};
   if (json) {
@@ -1288,22 +1133,36 @@ var createRequest = ({ method, body, json = true }, authHeader) => {
   if (typeof requestBody === "string" && requestBody.length > WARNING_BODY_SIZE) {
     log4.warn("Request with large body", {
       bodySize: requestBody.length
-    }, {
-      F: __dxlog_file6,
-      L: 468,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 441, S: void 0 });
   }
   if (authHeader) {
     headers["Authorization"] = authHeader;
   }
+  if (traceHeaders) {
+    Object.assign(headers, traceHeaders);
+  }
+  if (clientTag) {
+    headers[EDGE_CLIENT_TAG_HEADER] = clientTag;
+  }
   return {
     method,
     body: requestBody,
     headers
   };
 };
+var getTraceHeaders = (ctx) => {
+  const traceCtx = ctx.getAttribute(TRACE_SPAN_ATTRIBUTE2);
+  if (!traceCtx) {
+    return void 0;
+  }
+  const headers = {
+    traceparent: traceCtx.traceparent
+  };
+  if (traceCtx.tracestate) {
+    headers.tracestate = traceCtx.tracestate;
+  }
+  return headers;
+};
 var createRetryHandler = ({ retry: retry2 }) => {
   if (!retry2 || retry2.count < 1) {
     return async () => false;
@@ -1329,6 +1188,28 @@ var getFileMimeType = (filename) => [
   ".js",
   ".mjs"
 ].some((codeExtension) => filename.endsWith(codeExtension)) ? "application/javascript+module" : filename.endsWith(".wasm") ? "application/wasm" : "application/octet-stream";
+var remapAuthorizationForProxy = (headers) => {
+  const callerAuth = headers.get("Authorization");
+  if (callerAuth !== null) {
+    headers.delete("Authorization");
+    headers.set("X-Cors-Proxy-Authorization", callerAuth);
+  }
+  return headers;
+};
+var proxyFetchLegacy = (target, init = {}, clientTag) => {
+  const proxyUrl = new URL(`/${target.host}${target.pathname}${target.search}`, LEGACY_CORS_PROXY_URL);
+  if (target.protocol === "http:") {
+    proxyUrl.searchParams.set("scheme", "http");
+  }
+  const requestHeaders = remapAuthorizationForProxy(new Headers(init.headers ?? void 0));
+  if (clientTag) {
+    requestHeaders.set(EDGE_CLIENT_TAG_HEADER, clientTag);
+  }
+  return fetch(proxyUrl, {
+    ...init,
+    headers: requestHeaders
+  });
+};
 export {
   CLOUDFLARE_MESSAGE_MAX_BYTES,
   CLOUDFLARE_RPC_MAX_BYTES,
@@ -1348,6 +1229,7 @@ export {
   getTypename,
   handleAuthChallenge,
   protocol,
+  proxyFetchLegacy,
   toUint8Array,
   withLogging,
   withRetry,