@dxos/edge-client 0.8.2-main.5885341 → 0.8.2-main.85fa0e5

package/dist/lib/node/index.cjs

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -18,37 +16,31 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var node_exports = {};
 __export(node_exports, {
-  CLOUDFLARE_MESSAGE_MAX_BYTES: () => import_chunk_ZOL3YSDR.CLOUDFLARE_MESSAGE_MAX_BYTES,
-  CLOUDFLARE_RPC_MAX_BYTES: () => import_chunk_ZOL3YSDR.CLOUDFLARE_RPC_MAX_BYTES,
+  CLOUDFLARE_MESSAGE_MAX_BYTES: () => import_chunk_FQM4JFRT.CLOUDFLARE_MESSAGE_MAX_BYTES,
+  CLOUDFLARE_RPC_MAX_BYTES: () => import_chunk_FQM4JFRT.CLOUDFLARE_RPC_MAX_BYTES,
+  EDGE_WEBSOCKET_PROTOCOL_V0: () => import_chunk_FQM4JFRT.EDGE_WEBSOCKET_PROTOCOL_V0,
+  EDGE_WEBSOCKET_PROTOCOL_V1: () => import_chunk_FQM4JFRT.EDGE_WEBSOCKET_PROTOCOL_V1,
   EdgeClient: () => EdgeClient,
   EdgeConnectionClosedError: () => EdgeConnectionClosedError,
   EdgeHttpClient: () => EdgeHttpClient,
   EdgeIdentityChangedError: () => EdgeIdentityChangedError,
-  Protocol: () => import_chunk_ZOL3YSDR.Protocol,
-  WebSocketMuxer: () => import_chunk_ZOL3YSDR.WebSocketMuxer,
+  Protocol: () => import_chunk_FQM4JFRT.Protocol,
+  WebSocketMuxer: () => import_chunk_FQM4JFRT.WebSocketMuxer,
   createChainEdgeIdentity: () => createChainEdgeIdentity,
   createDeviceEdgeIdentity: () => createDeviceEdgeIdentity,
   createEphemeralEdgeIdentity: () => createEphemeralEdgeIdentity,
   createStubEdgeIdentity: () => createStubEdgeIdentity,
   createTestHaloEdgeIdentity: () => createTestHaloEdgeIdentity,
-  getTypename: () => import_chunk_ZOL3YSDR.getTypename,
+  getTypename: () => import_chunk_FQM4JFRT.getTypename,
   handleAuthChallenge: () => handleAuthChallenge,
-  protocol: () => import_chunk_ZOL3YSDR.protocol,
-  toUint8Array: () => import_chunk_ZOL3YSDR.toUint8Array
+  protocol: () => import_chunk_FQM4JFRT.protocol,
+  toUint8Array: () => import_chunk_FQM4JFRT.toUint8Array
 });
 module.exports = __toCommonJS(node_exports);
-var import_chunk_ZOL3YSDR = require("./chunk-ZOL3YSDR.cjs");
+var import_chunk_FQM4JFRT = require("./chunk-FQM4JFRT.cjs");
 __reExport(node_exports, require("@dxos/protocols/buf/dxos/edge/messenger_pb"), module.exports);
 var import_async = require("@dxos/async");
 var import_context = require("@dxos/context");
@@ -56,22 +48,14 @@ var import_log = require("@dxos/log");
 var import_services = require("@dxos/protocols/proto/dxos/client/services");
 var import_invariant = require("@dxos/invariant");
 var import_proto = require("@dxos/protocols/proto");
-var import_isomorphic_ws = __toESM(require("isomorphic-ws"));
+var import_credentials = require("@dxos/credentials");
+var import_invariant2 = require("@dxos/invariant");
+var import_keyring = require("@dxos/keyring");
+var import_keys = require("@dxos/keys");
 var import_async2 = require("@dxos/async");
 var import_context2 = require("@dxos/context");
-var import_invariant2 = require("@dxos/invariant");
 var import_log2 = require("@dxos/log");
 var import_protocols = require("@dxos/protocols");
-var import_buf = require("@dxos/protocols/buf");
-var import_messenger_pb = require("@dxos/protocols/buf/dxos/edge/messenger_pb");
-var import_credentials = require("@dxos/credentials");
-var import_invariant3 = require("@dxos/invariant");
-var import_keyring = require("@dxos/keyring");
-var import_keys = require("@dxos/keys");
-var import_async3 = require("@dxos/async");
-var import_context3 = require("@dxos/context");
-var import_log3 = require("@dxos/log");
-var import_protocols2 = require("@dxos/protocols");
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-identity.ts";
 var handleAuthChallenge = async (failedResponse, identity) => {
   (0, import_invariant.invariant)(failedResponse.status === 401, void 0, {
@@ -108,251 +92,6 @@ var handleAuthChallenge = async (failedResponse, identity) => {
   });
   return import_proto.schema.getCodecForType("dxos.halo.credentials.Presentation").encode(presentation);
 };
-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_file2 = "/home/runner/work/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 import_context2.Resource {
-  constructor(_identity, _connectionInfo, _callbacks) {
-    super();
-    this._identity = _identity;
-    this._connectionInfo = _connectionInfo;
-    this._callbacks = _callbacks;
-  }
-  get info() {
-    return {
-      open: this.isOpen,
-      identity: this._identity.identityKey,
-      device: this._identity.peerKey
-    };
-  }
-  send(message) {
-    (0, import_invariant2.invariant)(this._ws, void 0, {
-      F: __dxlog_file2,
-      L: 52,
-      S: this,
-      A: [
-        "this._ws",
-        ""
-      ]
-    });
-    (0, import_invariant2.invariant)(this._wsMuxer, void 0, {
-      F: __dxlog_file2,
-      L: 53,
-      S: this,
-      A: [
-        "this._wsMuxer",
-        ""
-      ]
-    });
-    (0, import_log2.log)("sending...", {
-      peerKey: this._identity.peerKey,
-      payload: import_chunk_ZOL3YSDR.protocol.getPayloadType(message)
-    }, {
-      F: __dxlog_file2,
-      L: 54,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    if (this._ws?.protocol.includes(import_protocols.EdgeWebsocketProtocol.V0)) {
-      const binary = import_buf.buf.toBinary(import_messenger_pb.MessageSchema, message);
-      if (binary.length > import_chunk_ZOL3YSDR.CLOUDFLARE_MESSAGE_MAX_BYTES) {
-        import_log2.log.error("Message dropped because it was too large (>1MB).", {
-          byteLength: binary.byteLength,
-          serviceId: message.serviceId,
-          payload: import_chunk_ZOL3YSDR.protocol.getPayloadType(message)
-        }, {
-          F: __dxlog_file2,
-          L: 58,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        return;
-      }
-      this._ws.send(binary);
-    } else {
-      this._wsMuxer.send(message).catch((e) => import_log2.log.catch(e, void 0, {
-        F: __dxlog_file2,
-        L: 67,
-        S: this,
-        C: (f, a) => f(...a)
-      }));
-    }
-  }
-  async _open() {
-    const baseProtocols = [
-      ...Object.values(import_protocols.EdgeWebsocketProtocol)
-    ];
-    this._ws = new import_isomorphic_ws.default(this._connectionInfo.url.toString(), this._connectionInfo.protocolHeader ? [
-      ...baseProtocols,
-      this._connectionInfo.protocolHeader
-    ] : [
-      ...baseProtocols
-    ]);
-    const muxer = new import_chunk_ZOL3YSDR.WebSocketMuxer(this._ws);
-    this._wsMuxer = muxer;
-    this._ws.onopen = () => {
-      if (this.isOpen) {
-        (0, import_log2.log)("connected", void 0, {
-          F: __dxlog_file2,
-          L: 84,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        this._callbacks.onConnected();
-        this._scheduleHeartbeats();
-      } else {
-        import_log2.log.verbose("connected after becoming inactive", {
-          currentIdentity: this._identity
-        }, {
-          F: __dxlog_file2,
-          L: 88,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-    };
-    this._ws.onclose = (event) => {
-      if (this.isOpen) {
-        import_log2.log.warn("disconnected while being open", {
-          code: event.code,
-          reason: event.reason
-        }, {
-          F: __dxlog_file2,
-          L: 93,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        this._callbacks.onRestartRequired();
-        muxer.destroy();
-      }
-    };
-    this._ws.onerror = (event) => {
-      if (this.isOpen) {
-        import_log2.log.warn("edge connection socket error", {
-          error: event.error,
-          info: event.message
-        }, {
-          F: __dxlog_file2,
-          L: 100,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        this._callbacks.onRestartRequired();
-      } else {
-        import_log2.log.verbose("error ignored on closed connection", {
-          error: event.error
-        }, {
-          F: __dxlog_file2,
-          L: 103,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-    };
-    this._ws.onmessage = async (event) => {
-      if (!this.isOpen) {
-        import_log2.log.verbose("message ignored on closed connection", {
-          event: event.type
-        }, {
-          F: __dxlog_file2,
-          L: 111,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        return;
-      }
-      if (event.data === "__pong__") {
-        this._rescheduleHeartbeatTimeout();
-        return;
-      }
-      const bytes = await (0, import_chunk_ZOL3YSDR.toUint8Array)(event.data);
-      if (!this.isOpen) {
-        return;
-      }
-      const message = this._ws?.protocol?.includes(import_protocols.EdgeWebsocketProtocol.V0) ? import_buf.buf.fromBinary(import_messenger_pb.MessageSchema, bytes) : muxer.receiveData(bytes);
-      if (message) {
-        (0, import_log2.log)("received", {
-          from: message.source,
-          payload: import_chunk_ZOL3YSDR.protocol.getPayloadType(message)
-        }, {
-          F: __dxlog_file2,
-          L: 128,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        this._callbacks.onMessage(message);
-      }
-    };
-  }
-  async _close() {
-    void this._inactivityTimeoutCtx?.dispose().catch(() => {
-    });
-    try {
-      this._ws?.close();
-      this._ws = void 0;
-      this._wsMuxer?.destroy();
-      this._wsMuxer = void 0;
-    } catch (err) {
-      if (err instanceof Error && err.message.includes("WebSocket is closed before the connection is established.")) {
-        return;
-      }
-      import_log2.log.warn("Error closing websocket", {
-        err
-      }, {
-        F: __dxlog_file2,
-        L: 146,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-  }
-  _scheduleHeartbeats() {
-    (0, import_invariant2.invariant)(this._ws, void 0, {
-      F: __dxlog_file2,
-      L: 151,
-      S: this,
-      A: [
-        "this._ws",
-        ""
-      ]
-    });
-    (0, import_async2.scheduleTaskInterval)(this._ctx, async () => {
-      this._ws?.send("__ping__");
-    }, SIGNAL_KEEPALIVE_INTERVAL);
-    this._ws.send("__ping__");
-    this._rescheduleHeartbeatTimeout();
-  }
-  _rescheduleHeartbeatTimeout() {
-    if (!this.isOpen) {
-      return;
-    }
-    void this._inactivityTimeoutCtx?.dispose();
-    this._inactivityTimeoutCtx = new import_context2.Context(void 0, {
-      F: __dxlog_file2,
-      L: 170
-    });
-    (0, import_async2.scheduleTask)(this._inactivityTimeoutCtx, () => {
-      if (this.isOpen) {
-        import_log2.log.warn("restart due to inactivity timeout", void 0, {
-          F: __dxlog_file2,
-          L: 175,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        this._callbacks.onRestartRequired();
-      }
-    }, SIGNAL_KEEPALIVE_TIMEOUT);
-  }
-};
-_ts_decorate([
-  import_log2.logInfo
-], EdgeWsConnection.prototype, "info", null);
 var EdgeConnectionClosedError = class extends Error {
   constructor() {
     super("Edge connection closed.");
@@ -369,13 +108,13 @@ var getEdgeUrlWithProtocol = (baseUrl, protocol2) => {
   url.protocol = protocol2 + (isSecure ? "s" : "");
   return url.toString();
 };
-function _ts_decorate2(decorators, target, key, desc) {
+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 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-client.ts";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-client.ts";
 var DEFAULT_TIMEOUT = 1e4;
 var EdgeClient = class extends import_context.Resource {
   constructor(_identity, _config) {
@@ -418,7 +157,7 @@ var EdgeClient = class extends import_context.Resource {
         identity,
         oldIdentity: this._identity
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file2,
         L: 99,
         S: this,
         C: (f, a) => f(...a)
@@ -441,7 +180,7 @@ var EdgeClient = class extends import_context.Resource {
             listener();
           } catch (error) {
             import_log.log.catch(error, void 0, {
-              F: __dxlog_file3,
+              F: __dxlog_file2,
               L: 121,
               S: this,
               C: (f, a) => f(...a)
@@ -459,7 +198,7 @@ var EdgeClient = class extends import_context.Resource {
     (0, import_log.log)("opening...", {
       info: this.info
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 133,
       S: this,
       C: (f, a) => f(...a)
@@ -468,7 +207,7 @@ var EdgeClient = class extends import_context.Resource {
       import_log.log.warn("Error while opening connection", {
         err
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file2,
         L: 135,
         S: this,
         C: (f, a) => f(...a)
@@ -482,7 +221,7 @@ var EdgeClient = class extends import_context.Resource {
     (0, import_log.log)("closing...", {
       peerKey: this._identity.peerKey
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 143,
       S: this,
       C: (f, a) => f(...a)
@@ -499,7 +238,7 @@ var EdgeClient = class extends import_context.Resource {
     const protocolHeader = this._config.disableAuth ? void 0 : await this._createAuthHeader(path);
     if (this._identity !== identity) {
       (0, import_log.log)("identity changed during auth header request", void 0, {
-        F: __dxlog_file3,
+        F: __dxlog_file2,
         L: 157,
         S: this,
         C: (f, a) => f(...a)
@@ -512,12 +251,12 @@ var EdgeClient = class extends import_context.Resource {
       url: url.toString(),
       protocolHeader
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 163,
       S: this,
       C: (f, a) => f(...a)
     });
-    const connection = new EdgeWsConnection(identity, {
+    const connection = new import_chunk_FQM4JFRT.EdgeWsConnection(identity, {
       url,
       protocolHeader
     }, {
@@ -527,7 +266,7 @@ var EdgeClient = class extends import_context.Resource {
           this._notifyReconnected();
         } else {
           import_log.log.verbose("connected callback ignored, because connection is not active", void 0, {
-            F: __dxlog_file3,
+            F: __dxlog_file2,
             L: 173,
             S: this,
             C: (f, a) => f(...a)
@@ -540,7 +279,7 @@ var EdgeClient = class extends import_context.Resource {
           void this._persistentLifecycle.scheduleRestart();
         } else {
           import_log.log.verbose("restart requested by inactive connection", void 0, {
-            F: __dxlog_file3,
+            F: __dxlog_file2,
             L: 181,
             S: this,
             C: (f, a) => f(...a)
@@ -556,7 +295,7 @@ var EdgeClient = class extends import_context.Resource {
             from: message.source,
             type: message.payload?.typeUrl
           }, {
-            F: __dxlog_file3,
+            F: __dxlog_file2,
             L: 189,
             S: this,
             C: (f, a) => f(...a)
@@ -593,7 +332,7 @@ var EdgeClient = class extends import_context.Resource {
         import_log.log.error("ws reconnect listener failed", {
           err
         }, {
-          F: __dxlog_file3,
+          F: __dxlog_file2,
           L: 225,
           S: this,
           C: (f, a) => f(...a)
@@ -608,9 +347,9 @@ var EdgeClient = class extends import_context.Resource {
       } catch (err) {
         import_log.log.error("ws incoming message processing failed", {
           err,
-          payload: import_chunk_ZOL3YSDR.protocol.getPayloadType(message)
+          payload: import_chunk_FQM4JFRT.protocol.getPayloadType(message)
         }, {
-          F: __dxlog_file3,
+          F: __dxlog_file2,
           L: 235,
           S: this,
           C: (f, a) => f(...a)
@@ -625,7 +364,7 @@ var EdgeClient = class extends import_context.Resource {
   async send(message) {
     if (this._ready.state !== import_async.TriggerState.RESOLVED) {
       (0, import_log.log)("waiting for websocket to become ready", void 0, {
-        F: __dxlog_file3,
+        F: __dxlog_file2,
         L: 246,
         S: this,
         C: (f, a) => f(...a)
@@ -655,7 +394,7 @@ var EdgeClient = class extends import_context.Resource {
         status: response.status,
         statusText: response.statusText
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file2,
         L: 271,
         S: this,
         C: (f, a) => f(...a)
@@ -664,14 +403,14 @@ var EdgeClient = class extends import_context.Resource {
     }
   }
 };
-_ts_decorate2([
+_ts_decorate([
   import_log.logInfo
 ], EdgeClient.prototype, "info", null);
 var encodePresentationWsAuthHeader = (encodedPresentation) => {
   const encodedToken = Buffer.from(encodedPresentation).toString("base64").replace(/=*$/, "").replaceAll("/", "|");
   return `base64url.bearer.authorization.dxos.org.${encodedToken}`;
 };
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/auth.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/auth.ts";
 var createDeviceEdgeIdentity = async (signer, key) => {
   return {
     identityKey: key.toHex(),
@@ -715,8 +454,8 @@ var createChainEdgeIdentity = async (signer, identityKey, peerKey, chain, creden
     identityKey: identityKey.toHex(),
     peerKey: peerKey.toHex(),
     presentCredentials: async ({ challenge }) => {
-      (0, import_invariant3.invariant)(chain, void 0, {
-        F: __dxlog_file4,
+      (0, import_invariant2.invariant)(chain, void 0, {
+        F: __dxlog_file3,
         L: 75,
         S: void 0,
         A: [
@@ -776,17 +515,17 @@ var createStubEdgeIdentity = () => {
     }
   };
 };
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-http-client.ts";
+var __dxlog_file4 = "/home/runner/work/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 EdgeHttpClient = class {
   constructor(baseUrl) {
     this._baseUrl = getEdgeUrlWithProtocol(baseUrl, "http");
-    (0, import_log3.log)("created", {
+    (0, import_log2.log)("created", {
       url: this._baseUrl
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 53,
       S: this,
       C: (f, a) => f(...a)
@@ -918,8 +657,8 @@ var EdgeHttpClient = class {
     });
   }
   async _call(path, args) {
-    const requestContext = args.context ?? new import_context3.Context(void 0, {
-      F: __dxlog_file5,
+    const requestContext = args.context ?? new import_context2.Context(void 0, {
+      F: __dxlog_file4,
       L: 192
     });
     const shouldRetry = createRetryHandler(args);
@@ -931,12 +670,12 @@ var EdgeHttpClient = class {
       }
       url += `?${queryParams.toString()}`;
     }
-    (0, import_log3.log)("call", {
+    (0, import_log2.log)("call", {
       method: args.method,
       path,
       request: args.body
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 204,
       S: this,
       C: (f, a) => f(...a)
@@ -955,36 +694,36 @@ var EdgeHttpClient = class {
           if (body.success) {
             return body.data;
           }
-          (0, import_log3.log)("unsuccessful edge response", {
+          (0, import_log2.log)("unsuccessful edge response", {
             path,
             body
           }, {
-            F: __dxlog_file5,
+            F: __dxlog_file4,
             L: 223,
             S: this,
             C: (f, a) => f(...a)
           });
           if (body.errorData?.type === "auth_challenge" && typeof body.errorData?.challenge === "string") {
-            processingError = new import_protocols2.EdgeAuthChallengeError(body.errorData.challenge, body.errorData);
+            processingError = new import_protocols.EdgeAuthChallengeError(body.errorData.challenge, body.errorData);
           } else {
-            processingError = import_protocols2.EdgeCallFailedError.fromUnsuccessfulResponse(response, body);
+            processingError = import_protocols.EdgeCallFailedError.fromUnsuccessfulResponse(response, body);
           }
         } else if (response.status === 401 && !handledAuth) {
           authHeader = await this._handleUnauthorized(response);
           handledAuth = true;
           continue;
         } else {
-          processingError = import_protocols2.EdgeCallFailedError.fromHttpFailure(response);
+          processingError = import_protocols.EdgeCallFailedError.fromHttpFailure(response);
         }
       } catch (error) {
-        processingError = import_protocols2.EdgeCallFailedError.fromProcessingFailureCause(error);
+        processingError = import_protocols.EdgeCallFailedError.fromProcessingFailureCause(error);
       }
       if (processingError.isRetryable && await shouldRetry(requestContext, retryAfterHeaderValue)) {
-        (0, import_log3.log)("retrying edge request", {
+        (0, import_log2.log)("retrying edge request", {
           path,
           processingError
         }, {
-          F: __dxlog_file5,
+          F: __dxlog_file4,
           L: 242,
           S: this,
           C: (f, a) => f(...a)
@@ -996,18 +735,18 @@ var EdgeHttpClient = class {
   }
   async _handleUnauthorized(response) {
     if (!this._edgeIdentity) {
-      import_log3.log.warn("edge unauthorized response received before identity was set", void 0, {
-        F: __dxlog_file5,
+      import_log2.log.warn("edge unauthorized response received before identity was set", void 0, {
+        F: __dxlog_file4,
         L: 251,
         S: this,
         C: (f, a) => f(...a)
       });
-      throw import_protocols2.EdgeCallFailedError.fromHttpFailure(response);
+      throw import_protocols.EdgeCallFailedError.fromHttpFailure(response);
     }
     const challenge = await handleAuthChallenge(response, this._edgeIdentity);
     this._authHeader = encodeAuthHeader(challenge);
-    (0, import_log3.log)("auth header updated", void 0, {
-      F: __dxlog_file5,
+    (0, import_log2.log)("auth header updated", void 0, {
+      F: __dxlog_file4,
       L: 256,
       S: this,
       C: (f, a) => f(...a)
@@ -1028,10 +767,10 @@ var createRetryHandler = (args) => {
       return false;
     }
     if (retryAfter) {
-      await (0, import_async3.sleep)(retryAfter);
+      await (0, import_async2.sleep)(retryAfter);
     } else {
       const timeout = baseTimeout + Math.random() * jitter;
-      await (0, import_async3.sleep)(timeout);
+      await (0, import_async2.sleep)(timeout);
     }
     return true;
   };
@@ -1053,6 +792,8 @@ var encodeAuthHeader = (challenge) => {
 0 && (module.exports = {
   CLOUDFLARE_MESSAGE_MAX_BYTES,
   CLOUDFLARE_RPC_MAX_BYTES,
+  EDGE_WEBSOCKET_PROTOCOL_V0,
+  EDGE_WEBSOCKET_PROTOCOL_V1,
   EdgeClient,
   EdgeConnectionClosedError,
   EdgeHttpClient,