wrangler 0.0.0-e1c2f5b9 → 0.0.0-e1d2fd668

package/wrangler-dist/ProxyWorker.js

@@ -0,0 +1,241 @@
+// src/api/startDevWorker/utils.ts
+import assert from "node:assert";
+function createDeferred(previousDeferred) {
+  let resolve, reject;
+  const newPromise = new Promise((_resolve, _reject) => {
+    resolve = _resolve;
+    reject = _reject;
+  });
+  assert(resolve);
+  assert(reject);
+  previousDeferred?.resolve(newPromise);
+  return {
+    promise: newPromise,
+    resolve,
+    reject
+  };
+}
+function urlFromParts(parts, base = "http://localhost") {
+  const url = new URL(base);
+  Object.assign(url, parts);
+  return url;
+}
+
+// templates/startDevWorker/ProxyWorker.ts
+var LIVE_RELOAD_PROTOCOL = "WRANGLER_PROXYWORKER_LIVE_RELOAD_PROTOCOL";
+var ProxyWorker_default = {
+  fetch(req, env) {
+    const singleton = env.DURABLE_OBJECT.idFromName("");
+    const inspectorProxy = env.DURABLE_OBJECT.get(singleton);
+    return inspectorProxy.fetch(req);
+  }
+};
+var ProxyWorker = class {
+  constructor(state, env) {
+    this.state = state;
+    this.env = env;
+  }
+  proxyData;
+  requestQueue = /* @__PURE__ */ new Map();
+  requestRetryQueue = /* @__PURE__ */ new Map();
+  fetch(request) {
+    if (isRequestForLiveReloadWebsocket(request)) {
+      return this.handleLiveReloadWebSocket(request);
+    }
+    if (isRequestFromProxyController(request, this.env)) {
+      return this.processProxyControllerRequest(request);
+    }
+    const deferred = createDeferred();
+    this.requestQueue.set(request, deferred);
+    this.processQueue();
+    return deferred.promise;
+  }
+  handleLiveReloadWebSocket(request) {
+    const { 0: response, 1: liveReload } = new WebSocketPair();
+    const websocketProtocol = request.headers.get("Sec-WebSocket-Protocol") ?? "";
+    this.state.acceptWebSocket(liveReload, ["live-reload"]);
+    return new Response(null, {
+      status: 101,
+      webSocket: response,
+      headers: { "Sec-WebSocket-Protocol": websocketProtocol }
+    });
+  }
+  processProxyControllerRequest(request) {
+    const event = request.cf?.hostMetadata;
+    switch (event?.type) {
+      case "pause":
+        this.proxyData = void 0;
+        break;
+      case "play":
+        this.proxyData = event.proxyData;
+        this.processQueue();
+        this.state.getWebSockets("live-reload").forEach((ws) => ws.send("reload"));
+        break;
+    }
+    return new Response(null, { status: 204 });
+  }
+  /**
+   * Process requests that are being retried first, then process newer requests.
+   * Requests that are being retried are, by definition, older than requests which haven't been processed yet.
+   * We don't need to be more accurate than this re ordering, since the requests are being fired off synchronously.
+   */
+  *getOrderedQueue() {
+    yield* this.requestRetryQueue;
+    yield* this.requestQueue;
+  }
+  processQueue() {
+    const { proxyData } = this;
+    if (proxyData === void 0)
+      return;
+    for (const [request, deferredResponse] of this.getOrderedQueue()) {
+      this.requestRetryQueue.delete(request);
+      this.requestQueue.delete(request);
+      const outerUrl = new URL(request.url);
+      const headers = new Headers(request.headers);
+      const userWorkerUrl = new URL(request.url);
+      Object.assign(userWorkerUrl, proxyData.userWorkerUrl);
+      const innerUrl = urlFromParts(
+        proxyData.userWorkerInnerUrlOverrides ?? {},
+        request.url
+      );
+      headers.set("MF-Original-URL", innerUrl.href);
+      headers.set("MF-Disable-Pretty-Error", "true");
+      const encoding = request.cf?.clientAcceptEncoding;
+      if (encoding !== void 0)
+        headers.set("Accept-Encoding", encoding);
+      rewriteUrlRelatedHeaders(headers, outerUrl, innerUrl);
+      for (const [key, value] of Object.entries(proxyData.headers ?? {})) {
+        if (value === void 0)
+          continue;
+        if (key.toLowerCase() === "cookie") {
+          const existing = request.headers.get("cookie") ?? "";
+          headers.set("cookie", `${existing};${value}`);
+        } else {
+          headers.set(key, value);
+        }
+      }
+      void fetch(userWorkerUrl, new Request(request, { headers })).then((res) => {
+        res = new Response(res.body, res);
+        rewriteUrlRelatedHeaders(res.headers, innerUrl, outerUrl);
+        if (isHtmlResponse(res)) {
+          res = insertLiveReloadScript(request, res, this.env, proxyData);
+        }
+        deferredResponse.resolve(res);
+      }).catch((error) => {
+        const newUserWorkerUrl = this.proxyData && urlFromParts(this.proxyData.userWorkerUrl);
+        if (userWorkerUrl.href === newUserWorkerUrl?.href) {
+          void sendMessageToProxyController(this.env, {
+            type: "error",
+            error: {
+              name: error.name,
+              message: error.message,
+              stack: error.stack,
+              cause: error.cause
+            }
+          });
+          deferredResponse.reject(error);
+        } else if (request.method === "GET" || request.method === "HEAD") {
+          this.requestRetryQueue.set(request, deferredResponse);
+        } else {
+          deferredResponse.resolve(
+            new Response(
+              "Your worker restarted mid-request. Please try sending the request again. Only GET or HEAD requests are retried automatically.",
+              {
+                status: 503,
+                headers: { "Retry-After": "0" }
+              }
+            )
+          );
+        }
+      });
+    }
+  }
+};
+function isRequestFromProxyController(req, env) {
+  return req.headers.get("Authorization") === env.PROXY_CONTROLLER_AUTH_SECRET;
+}
+function isHtmlResponse(res) {
+  return res.headers.get("content-type")?.startsWith("text/html") ?? false;
+}
+function isRequestForLiveReloadWebsocket(req) {
+  const websocketProtocol = req.headers.get("Sec-WebSocket-Protocol");
+  const isWebSocketUpgrade = req.headers.get("Upgrade") === "websocket";
+  return isWebSocketUpgrade && websocketProtocol === LIVE_RELOAD_PROTOCOL;
+}
+function sendMessageToProxyController(env, message) {
+  return env.PROXY_CONTROLLER.fetch("http://dummy", {
+    method: "POST",
+    body: JSON.stringify(message)
+  });
+}
+function insertLiveReloadScript(request, response, env, proxyData) {
+  const htmlRewriter = new HTMLRewriter();
+  let errorDetails = "";
+  htmlRewriter.on("#cf-error-details", {
+    text(element) {
+      errorDetails += element.text;
+    }
+  });
+  htmlRewriter.onDocument({
+    end(end) {
+      if (response.status === 400 && errorDetails.includes("Invalid Workers Preview configuration")) {
+        void sendMessageToProxyController(env, {
+          type: "previewTokenExpired",
+          proxyData
+        });
+      }
+      if (proxyData.liveReload) {
+        const websocketUrl = new URL(request.url);
+        websocketUrl.protocol = websocketUrl.protocol === "http:" ? "ws:" : "wss:";
+        end.append(liveReloadScript, { html: true });
+      }
+    }
+  });
+  return htmlRewriter.transform(response);
+}
+var liveReloadScript = `
+<script defer type="application/javascript">
+	(function() {
+		var ws;
+		function recover() {
+			ws = null;
+			setTimeout(initLiveReload, 100);
+		}
+		function initLiveReload() {
+			if (ws) return;
+			var origin = (location.protocol === "http:" ? "ws://" : "wss://") + location.host;
+			ws = new WebSocket(origin + "/cdn-cgi/live-reload", "${LIVE_RELOAD_PROTOCOL}");
+			ws.onclose = recover;
+			ws.onerror = recover;
+			ws.onmessage = location.reload.bind(location);
+		}
+		initLiveReload();
+	})();
+</script>
+`;
+function rewriteUrlRelatedHeaders(headers, from, to) {
+  const setCookie = headers.getAll("Set-Cookie");
+  headers.delete("Set-Cookie");
+  headers.forEach((value, key) => {
+    if (typeof value === "string" && value.includes(from.host)) {
+      headers.set(
+        key,
+        value.replaceAll(from.origin, to.origin).replaceAll(from.host, to.host)
+      );
+    }
+  });
+  for (const cookie of setCookie) {
+    headers.append(
+      "Set-Cookie",
+      cookie.replace(
+        new RegExp(`Domain=${from.hostname}($|;|,)`),
+        `Domain=${to.hostname}$1`
+      )
+    );
+  }
+}
+export {
+  ProxyWorker,
+  ProxyWorker_default as default
+};
+//# sourceMappingURL=ProxyWorker.js.map

package/wrangler-dist/ProxyWorker.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../src/api/startDevWorker/utils.ts", "../templates/startDevWorker/ProxyWorker.ts"],
+  "mappings": "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",
+  "names": []
+}