@cloudflare/vite-plugin 2.0.0-beta.v.0 → 2.0.0-beta.v.1

package/dist/index.mjs

@@ -88427,7 +88427,7 @@ __name(createWorkerUploadForm, "createWorkerUploadForm");
 //#endregion
 //#region ../remote-bindings/dist/index.mjs
 var import_undici = require_undici();
-var version$1 = "0.0.48";
+var version$1 = "0.0.49";
 var NoDefaultValueProvided = class extends UserError {
 	constructor() {
 		super("This command cannot be run in a non-interactive context", { telemetryMessage: "remote bindings prompt default missing" });
@@ -88482,7 +88482,7 @@ let logger;
 function initLogger(value) {
 	logger = value;
 }
-var ProxyWorker_default = "// src/startDevWorker/utils.ts\nimport assert from \"node:assert\";\nvar PREVIEW_TOKEN_REFRESH_INTERVAL = 50 * 60 * 1e3;\nfunction createDeferred(previousDeferred) {\n  let resolve, reject;\n  const newPromise = new Promise((_resolve, _reject) => {\n    resolve = _resolve;\n    reject = _reject;\n  });\n  assert(resolve);\n  assert(reject);\n  previousDeferred?.resolve(newPromise);\n  return {\n    promise: newPromise,\n    resolve,\n    reject\n  };\n}\nfunction urlFromParts(parts, base = \"http://localhost\") {\n  const url = new URL(base);\n  Object.assign(url, parts);\n  return url;\n}\nfunction rewriteUrlInHeaderValue(value, from, to) {\n  return value.replace(\n    /(https?:\\/\\/[^/?#\\s,;\"']+)([^\\s,;\"']*)/gi,\n    (match, origin, rest) => {\n      let url;\n      try {\n        url = new URL(origin);\n      } catch {\n        return match;\n      }\n      if (url.host !== from.host) {\n        return match;\n      }\n      return to.origin + rest;\n    }\n  );\n}\n\n// templates/startDevWorker/ProxyWorker.ts\nvar ProxyWorker_default = {\n  fetch(req, env) {\n    const singleton = env.DURABLE_OBJECT.idFromName(\"\");\n    const inspectorProxy = env.DURABLE_OBJECT.get(singleton);\n    return inspectorProxy.fetch(req);\n  }\n};\nvar ProxyWorker = class {\n  constructor(_state, env) {\n    this.env = env;\n  }\n  env;\n  proxyData;\n  requestQueue = /* @__PURE__ */ new Map();\n  requestRetryQueue = /* @__PURE__ */ new Map();\n  fetch(request) {\n    if (isRequestFromProxyController(request, this.env)) {\n      return this.processProxyControllerRequest(request);\n    }\n    const deferred = createDeferred();\n    this.requestQueue.set(request, deferred);\n    this.processQueue();\n    return deferred.promise;\n  }\n  processProxyControllerRequest(request) {\n    const event = request.cf?.hostMetadata;\n    switch (event?.type) {\n      case \"pause\":\n        this.proxyData = void 0;\n        break;\n      case \"play\":\n        this.proxyData = event.proxyData;\n        this.processQueue();\n        break;\n    }\n    return new Response(null, { status: 204 });\n  }\n  /**\n   * Process requests that are being retried first, then process newer requests.\n   * Requests that are being retried are, by definition, older than requests which haven't been processed yet.\n   * We don't need to be more accurate than this re ordering, since the requests are being fired off synchronously.\n   */\n  *getOrderedQueue() {\n    yield* this.requestRetryQueue;\n    yield* this.requestQueue;\n  }\n  processQueue() {\n    const { proxyData } = this;\n    if (proxyData === void 0) {\n      return;\n    }\n    for (const [request, deferredResponse] of this.getOrderedQueue()) {\n      this.requestRetryQueue.delete(request);\n      this.requestQueue.delete(request);\n      const outerUrl = new URL(request.url);\n      const headers = new Headers(request.headers);\n      const userWorkerUrl = new URL(request.url);\n      Object.assign(userWorkerUrl, proxyData.userWorkerUrl);\n      const innerUrl = urlFromParts(\n        proxyData.userWorkerInnerUrlOverrides ?? {},\n        request.url\n      );\n      const encoding = request.cf?.clientAcceptEncoding;\n      if (encoding !== void 0) {\n        headers.set(\"Accept-Encoding\", encoding);\n      }\n      rewriteUrlRelatedHeaders(headers, outerUrl, innerUrl);\n      headers.set(\"MF-Original-URL\", innerUrl.href);\n      for (const [key, value] of Object.entries(proxyData.headers ?? {})) {\n        if (value === void 0) {\n          continue;\n        }\n        if (key.toLowerCase() === \"cookie\") {\n          const existing = request.headers.get(\"cookie\") ?? \"\";\n          headers.set(\"cookie\", `${existing};${value}`);\n        } else {\n          headers.set(key, value);\n        }\n      }\n      void fetch(userWorkerUrl, new Request(request, { headers })).then(async (res) => {\n        res = new Response(res.body, res);\n        rewriteUrlRelatedHeaders(res.headers, innerUrl, outerUrl);\n        await checkForPreviewTokenError(res, this.env, proxyData);\n        deferredResponse.resolve(res);\n      }).catch((error) => {\n        const newUserWorkerUrl = this.proxyData && urlFromParts(this.proxyData.userWorkerUrl);\n        if (userWorkerUrl.href === newUserWorkerUrl?.href) {\n          void sendMessageToProxyController(this.env, {\n            type: \"error\",\n            error: {\n              name: error.name,\n              message: error.message,\n              stack: error.stack,\n              cause: error.cause\n            }\n          });\n          deferredResponse.reject(error);\n        } else if (request.method === \"GET\" || request.method === \"HEAD\") {\n          this.requestRetryQueue.set(request, deferredResponse);\n        } else {\n          deferredResponse.resolve(\n            new Response(\n              \"Your worker restarted mid-request. Please try sending the request again. Only GET or HEAD requests are retried automatically.\",\n              {\n                status: 503,\n                headers: { \"Retry-After\": \"0\" }\n              }\n            )\n          );\n        }\n      });\n    }\n  }\n};\nfunction isRequestFromProxyController(req, env) {\n  return req.headers.get(\"Authorization\") === env.PROXY_CONTROLLER_AUTH_SECRET;\n}\nfunction sendMessageToProxyController(env, message) {\n  return env.PROXY_CONTROLLER.fetch(\"http://dummy\", {\n    method: \"POST\",\n    body: JSON.stringify(message)\n  });\n}\nasync function checkForPreviewTokenError(response, env, proxyData) {\n  if (response.status !== 400) {\n    return;\n  }\n  const clone = response.clone();\n  const text = await clone.text();\n  if (text.includes(\"Invalid Workers Preview configuration\") || text.includes(\"error code: 1031\")) {\n    void sendMessageToProxyController(env, {\n      type: \"previewTokenExpired\",\n      proxyData\n    });\n  }\n}\nfunction rewriteUrlRelatedHeaders(headers, from, to) {\n  const setCookie = headers.getAll(\"Set-Cookie\");\n  headers.delete(\"Set-Cookie\");\n  headers.forEach((value, key) => {\n    if (typeof value === \"string\" && value.includes(from.host)) {\n      headers.set(key, rewriteUrlInHeaderValue(value, from, to));\n    }\n  });\n  for (const cookie of setCookie) {\n    headers.append(\n      \"Set-Cookie\",\n      cookie.replace(\n        new RegExp(`Domain=${from.hostname}($|;|,)`),\n        `Domain=${to.hostname}$1`\n      )\n    );\n  }\n}\nexport {\n  ProxyWorker,\n  ProxyWorker_default as default\n};\n";
+var ProxyWorker_default = "// src/startDevWorker/utils.ts\nimport assert from \"node:assert\";\nvar PREVIEW_TOKEN_REFRESH_INTERVAL = 50 * 60 * 1e3;\nvar PREVIEW_TOKEN_REFRESH_RETRY_INTERVAL = 60 * 1e3;\nfunction createDeferred(previousDeferred) {\n  let resolve, reject;\n  const newPromise = new Promise((_resolve, _reject) => {\n    resolve = _resolve;\n    reject = _reject;\n  });\n  assert(resolve);\n  assert(reject);\n  previousDeferred?.resolve(newPromise);\n  return {\n    promise: newPromise,\n    resolve,\n    reject\n  };\n}\nfunction urlFromParts(parts, base = \"http://localhost\") {\n  const url = new URL(base);\n  Object.assign(url, parts);\n  return url;\n}\nfunction rewriteUrlInHeaderValue(value, from, to) {\n  return value.replace(\n    /(https?:\\/\\/[^/?#\\s,;\"']+)([^\\s,;\"']*)/gi,\n    (match, origin, rest) => {\n      let url;\n      try {\n        url = new URL(origin);\n      } catch {\n        return match;\n      }\n      if (url.host !== from.host) {\n        return match;\n      }\n      return to.origin + rest;\n    }\n  );\n}\n\n// templates/startDevWorker/ProxyWorker.ts\nvar ProxyWorker_default = {\n  fetch(req, env) {\n    const singleton = env.DURABLE_OBJECT.idFromName(\"\");\n    const inspectorProxy = env.DURABLE_OBJECT.get(singleton);\n    return inspectorProxy.fetch(req);\n  }\n};\nvar ProxyWorker = class {\n  constructor(_state, env) {\n    this.env = env;\n  }\n  env;\n  proxyData;\n  requestQueue = /* @__PURE__ */ new Map();\n  requestRetryQueue = /* @__PURE__ */ new Map();\n  fetch(request) {\n    if (isRequestFromProxyController(request, this.env)) {\n      return this.processProxyControllerRequest(request);\n    }\n    const deferred = createDeferred();\n    this.requestQueue.set(request, deferred);\n    this.processQueue();\n    return deferred.promise;\n  }\n  processProxyControllerRequest(request) {\n    const event = request.cf?.hostMetadata;\n    switch (event?.type) {\n      case \"pause\":\n        this.proxyData = void 0;\n        break;\n      case \"play\":\n        this.proxyData = event.proxyData;\n        this.processQueue();\n        break;\n    }\n    return new Response(null, { status: 204 });\n  }\n  /**\n   * Process requests that are being retried first, then process newer requests.\n   * Requests that are being retried are, by definition, older than requests which haven't been processed yet.\n   * We don't need to be more accurate than this re ordering, since the requests are being fired off synchronously.\n   */\n  *getOrderedQueue() {\n    yield* this.requestRetryQueue;\n    yield* this.requestQueue;\n  }\n  processQueue() {\n    const { proxyData } = this;\n    if (proxyData === void 0) {\n      return;\n    }\n    for (const [request, deferredResponse] of this.getOrderedQueue()) {\n      this.requestRetryQueue.delete(request);\n      this.requestQueue.delete(request);\n      const outerUrl = new URL(request.url);\n      const headers = new Headers(request.headers);\n      const userWorkerUrl = new URL(request.url);\n      Object.assign(userWorkerUrl, proxyData.userWorkerUrl);\n      const innerUrl = urlFromParts(\n        proxyData.userWorkerInnerUrlOverrides ?? {},\n        request.url\n      );\n      const encoding = request.cf?.clientAcceptEncoding;\n      if (encoding !== void 0) {\n        headers.set(\"Accept-Encoding\", encoding);\n      }\n      rewriteUrlRelatedHeaders(headers, outerUrl, innerUrl);\n      headers.set(\"MF-Original-URL\", innerUrl.href);\n      for (const [key, value] of Object.entries(proxyData.headers ?? {})) {\n        if (value === void 0) {\n          continue;\n        }\n        if (key.toLowerCase() === \"cookie\") {\n          const existing = request.headers.get(\"cookie\") ?? \"\";\n          headers.set(\"cookie\", `${existing};${value}`);\n        } else {\n          headers.set(key, value);\n        }\n      }\n      void fetch(userWorkerUrl, new Request(request, { headers })).then(async (res) => {\n        res = new Response(res.body, res);\n        rewriteUrlRelatedHeaders(res.headers, innerUrl, outerUrl);\n        await checkForPreviewTokenError(res, this.env, proxyData);\n        deferredResponse.resolve(res);\n      }).catch((error) => {\n        const newUserWorkerUrl = this.proxyData && urlFromParts(this.proxyData.userWorkerUrl);\n        if (userWorkerUrl.href === newUserWorkerUrl?.href) {\n          void sendMessageToProxyController(this.env, {\n            type: \"error\",\n            error: {\n              name: error.name,\n              message: error.message,\n              stack: error.stack,\n              cause: error.cause\n            }\n          });\n          deferredResponse.reject(error);\n        } else if (request.method === \"GET\" || request.method === \"HEAD\") {\n          this.requestRetryQueue.set(request, deferredResponse);\n        } else {\n          deferredResponse.resolve(\n            new Response(\n              \"Your worker restarted mid-request. Please try sending the request again. Only GET or HEAD requests are retried automatically.\",\n              {\n                status: 503,\n                headers: { \"Retry-After\": \"0\" }\n              }\n            )\n          );\n        }\n      });\n    }\n  }\n};\nfunction isRequestFromProxyController(req, env) {\n  return req.headers.get(\"Authorization\") === env.PROXY_CONTROLLER_AUTH_SECRET;\n}\nfunction sendMessageToProxyController(env, message) {\n  return env.PROXY_CONTROLLER.fetch(\"http://dummy\", {\n    method: \"POST\",\n    body: JSON.stringify(message)\n  });\n}\nasync function checkForPreviewTokenError(response, env, proxyData) {\n  if (response.status !== 400) {\n    return;\n  }\n  const clone = response.clone();\n  const text = await clone.text();\n  if (text.includes(\"Invalid Workers Preview configuration\") || text.includes(\"error code: 1031\")) {\n    void sendMessageToProxyController(env, {\n      type: \"previewTokenExpired\",\n      proxyData\n    });\n  }\n}\nfunction rewriteUrlRelatedHeaders(headers, from, to) {\n  const setCookie = headers.getAll(\"Set-Cookie\");\n  headers.delete(\"Set-Cookie\");\n  headers.forEach((value, key) => {\n    if (typeof value === \"string\" && value.includes(from.host)) {\n      headers.set(key, rewriteUrlInHeaderValue(value, from, to));\n    }\n  });\n  for (const cookie of setCookie) {\n    headers.append(\n      \"Set-Cookie\",\n      cookie.replace(\n        new RegExp(`Domain=${from.hostname}($|;|,)`),\n        `Domain=${to.hostname}$1`\n      )\n    );\n  }\n}\nexport {\n  ProxyWorker,\n  ProxyWorker_default as default\n};\n";
 function castLogLevel(level) {
 	let key = level.toUpperCase();
 	if (key === "LOG") key = "INFO";
@@ -88515,6 +88515,15 @@ function castErrorCause(cause) {
 * Preview tokens expire after 1 hour (hardcoded in the Workers control plane), so we retry after 50 mins.
 */
 const PREVIEW_TOKEN_REFRESH_INTERVAL = 3e3 * 1e3;
+/**
+* How soon to try again after a proactive preview token refresh fails (e.g.
+* the machine is offline). A failed refresh must not give up the retry cycle
+* for good — otherwise a network outage longer than the API's own few quick
+* retries (see `retryOnAPIFailure`) permanently strands the session even
+* after connectivity returns, since nothing else re-triggers a refresh
+* attempt for a long-lived session like `getPlatformProxy()`'s.
+*/
+const PREVIEW_TOKEN_REFRESH_RETRY_INTERVAL = 60 * 1e3;
 function createDeferred(previousDeferred) {
 	let resolve$3, reject;
 	const newPromise = new Promise((_resolve$1, _reject) => {
@@ -88930,6 +88939,7 @@ var RemoteRuntimeController = class {
 	#latestBundle;
 	#latestProxyData;
 	#refreshTimer;
+	#sessionCreatedAt;
 	#tearingDown = false;
 	constructor(onError$1, onReloadComplete) {
 		this.onError = onError$1;
@@ -88937,7 +88947,9 @@ var RemoteRuntimeController = class {
 	}
 	async #previewSession(props) {
 		try {
-			return await retryOnAPIFailure(() => createPreviewSession(props.complianceConfig, props, this.#abortController.signal, props.name, props.cliDisplayName), logger, void 0, void 0, this.#abortController.signal);
+			const session = await retryOnAPIFailure(() => createPreviewSession(props.complianceConfig, props, this.#abortController.signal, props.name, props.cliDisplayName), logger, void 0, void 0, this.#abortController.signal);
+			if (session) this.#sessionCreatedAt = Date.now();
+			return session;
 		} catch (err) {
 			if (err instanceof Error && err.name == "AbortError") return;
 			handlePreviewSessionCreationError(err, props.accountId);
@@ -89042,9 +89054,13 @@ var RemoteRuntimeController = class {
 	}
 	#scheduleRefresh(interval) {
 		clearTimeout(this.#refreshTimer);
+		const delay = interval === PREVIEW_TOKEN_REFRESH_INTERVAL && this.#sessionCreatedAt !== void 0 ? Math.max(0, PREVIEW_TOKEN_REFRESH_INTERVAL - (Date.now() - this.#sessionCreatedAt)) : interval;
 		this.#refreshTimer = setTimeout(() => {
+			this.#refreshTimer = void 0;
 			if (this.#latestProxyData) this.onPreviewTokenExpired();
-		}, interval);
+			else if (!this.#tearingDown) this.#scheduleRefresh(PREVIEW_TOKEN_REFRESH_RETRY_INTERVAL);
+		}, delay);
+		this.#refreshTimer.unref?.();
 	}
 	async #onBundleComplete({ config: config$3, bundle }, id) {
 		if (id !== this.#currentBundleId) return;
@@ -89072,10 +89088,14 @@ var RemoteRuntimeController = class {
 			logger.warn("Cannot refresh preview token: missing config or bundle data");
 			return;
 		}
+		const bundleId = this.#currentBundleId;
+		const abortSignal = this.#abortController.signal;
+		const shouldRetry = () => bundleId === this.#currentBundleId && !abortSignal.aborted && !this.#tearingDown;
 		try {
 			const auth = await unwrapHook(this.#latestConfig.auth);
 			this.#session = await this.#getPreviewSession(this.#latestConfig, auth);
-			if (await this.#updatePreviewToken(this.#latestConfig, this.#latestBundle, auth, this.#currentBundleId)) logger.log(source_default.green("✔ Preview token refreshed successfully"));
+			if (await this.#updatePreviewToken(this.#latestConfig, this.#latestBundle, auth, bundleId)) logger.log(source_default.green("✔ Preview token refreshed successfully"));
+			else if (shouldRetry()) this.#scheduleRefresh(PREVIEW_TOKEN_REFRESH_RETRY_INTERVAL);
 		} catch (error$3) {
 			if (error$3 instanceof Error && error$3.name == "AbortError") return;
 			this.emitErrorEvent({
@@ -89085,12 +89105,13 @@ var RemoteRuntimeController = class {
 				source: "RemoteRuntimeController",
 				data: void 0
 			});
+			if (shouldRetry()) this.#scheduleRefresh(PREVIEW_TOKEN_REFRESH_RETRY_INTERVAL);
 		}
 	}
 	onUpdateStart() {
 		this.#abortController.abort();
 		this.#abortController = new AbortController();
-		clearTimeout(this.#refreshTimer);
+		if (!this.#refreshTimer && this.#latestProxyData && !this.#tearingDown) this.#scheduleRefresh(PREVIEW_TOKEN_REFRESH_RETRY_INTERVAL);
 	}
 	onBundleComplete(ev) {
 		const id = ++this.#currentBundleId;
@@ -89695,7 +89716,7 @@ function createRemoteBindingsLogger(logger$2) {
 }
 function getWorkerZone(config$3) {
 	const domain$1 = config$3.domains?.[0];
-	if (domain$1 !== void 0) return getZoneFromRoute(domain$1);
+	if (domain$1 !== void 0) return getZoneFromRoute(typeof domain$1 === "string" ? domain$1 : domain$1.hostname);
 	const fetchTrigger = config$3.triggers?.find((trigger) => trigger.type === "fetch");
 	if (fetchTrigger?.type !== "fetch") return;
 	return getZoneFromRoute(fetchTrigger.zone?.includes(".") ? {

package/dist/{package-DXI-SUrO.mjs → package-DNE1Ou5k.mjs}

@@ -1,7 +1,7 @@
 //#region package.json
 var package_default = {
 	name: "@cloudflare/vite-plugin",
-	version: "2.0.0-beta.v.0",
+	version: "2.0.0-beta.v.1",
 	description: "Cloudflare plugin for Vite",
 	keywords: [
 		"cloudflare",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "2.0.0-beta.v.0",
+  "version": "2.0.0-beta.v.1",
   "description": "Cloudflare plugin for Vite",
   "keywords": [
     "cloudflare",
@@ -42,11 +42,11 @@
   "dependencies": {
     "unenv": "2.0.0-rc.24",
     "ws": "8.21.0",
-    "@cloudflare/build-output-utils": "0.9.2",
-    "@cloudflare/config": "0.26.0",
-    "@cloudflare/runtime-types": "0.1.11",
+    "@cloudflare/config": "0.27.0",
+    "@cloudflare/runtime-types": "0.1.12",
+    "@cloudflare/build-output-utils": "0.9.3",
     "@cloudflare/unenv-preset": "2.16.2",
-    "miniflare": "5.20261012.0-beta"
+    "miniflare": "5.20261012.1-beta"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^5.20261006.1",
@@ -70,13 +70,13 @@
     "vite": "8.1.5",
     "vite-legacy": "npm:vite@7.1.12",
     "vitest": "4.1.0",
-    "@cloudflare/cli-shared-helpers": "0.2.6",
-    "@cloudflare/containers-shared": "0.22.0",
     "@cloudflare/mock-npm-registry": "0.0.0",
-    "@cloudflare/remote-bindings": "0.0.48",
+    "@cloudflare/containers-shared": "0.22.1",
     "@cloudflare/workers-auth": "0.14.0",
     "@cloudflare/workers-shared": "0.20.1",
+    "@cloudflare/remote-bindings": "0.0.49",
     "@cloudflare/workers-tsconfig": "0.0.0",
+    "@cloudflare/cli-shared-helpers": "0.2.6",
     "@cloudflare/workers-utils": "0.47.2"
   },
   "peerDependencies": {