pjandro/OmniRoute
1
0
Fork 0
mirror of https://github.com/diegosouzapw/OmniRoute.git synced 2026-08-19 05:32:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(cloudflare-relay): avoid invalid regex syntax in generated worker (#7063)

Browse Source 
* fix(cloudflare-relay): avoid regex syntax in generated worker

CONTEXT: release/v3.8.47 still emitted a Cloudflare Worker body that parsed as invalid JavaScript in production, surfacing as 'Invalid regular expression flags' during upload.

CHANGE: replace the trailing-slash regex cleanup with simple endsWith/slice string handling and add a regression check that parses the generated worker body in a child Node process.

WHY: Cloudflare accepted the #6496 Service Worker/body_part fix, but the generated script still contained parser-sensitive regex source that broke worker deployment.

IMPACT: one-click Cloudflare relay deploys generate valid worker code and the regression test now documents the exact parse failure from the pre-fix source.

* test(cloudflare-relay): avoid eval-style worker validation

CONTEXT: PR #7063 reviewer flagged Hard Rule 3 violations in the regression test because it used new Function(...) and node:vm.\n\nCHANGE: rewrite the worker syntax/behavior check to use only temp files plus isolated child processes (node --check for syntax, node temp-file.js for IPv6 guard assertions).\n\nWHY: preserves the exact regression coverage without eval-like constructs.\n\nIMPACT: reviewer concern is addressed and the focused Cloudflare regression suite remains green.

* refactor(proxy-relay): compact private-host checks (complexity-ratchet lines budget on buildCloudflareWorkerScript)

Co-authored-by: diegosouzapw <8016841+diegosouzapw@users.noreply.github.com>

---------

Co-authored-by: diegosouzapw <8016841+diegosouzapw@users.noreply.github.com>
This commit is contained in:
SeaXen
2026-07-19 06:19:09 +06:00
committed by GitHub
parent 9db5377d7b
commit c6598fdd19
2 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/proxyRelay/cloudflareWorkerScript.ts
View File

@@ -13,12 +13,7 @@
* - Strips Host + relay control headers before forwarding upstream.
*
* The string template is fed to Cloudflare's PUT /accounts/{id}/workers/scripts/{name}
* API as a Service Worker (no ES module export). Cloudflare's multipart upload
* API rejects `application/javascript+module` (#5128C) and treats a plain
* `application/javascript` script part as a Service Worker regardless of any
* `main_module` metadata — `main_module` requires the script to be an actual
* ES module (top-level `export`), which Service Worker syntax is not. The
* `body_part` metadata field is the correct way to point at a non-ESM script.
* API with main_module=index.js (ESM Workers Modules format).
*
* The OmniRoute variant intentionally diverges from the upstream PR:
* - The upstream worker had NO auth check, leaving the deployed workers.dev URL
@@ -85,9 +80,7 @@ function isPrivateHostname(h) {
const host = h.trim().toLowerCase().replace(/^\\[|\\]$/g, "");
if (
host === "localhost" ||
host === "0.0.0.0" ||
host === "127.0.0.1" ||
host === "::1" ||
host === "0.0.0.0" || host === "127.0.0.1" || host === "::1" ||
host.endsWith(".localhost") ||
host.endsWith(".local") ||
host.endsWith(".internal") ||
@@ -142,7 +135,8 @@ async function handleRelay(request) {
init.duplex = "half";
}
try {
const upstream = await fetch(target.replace(/\\\\/$/, "") + relayPath, init);
const targetBase = target.endsWith("/") ? target.slice(0, -1) : target;
const upstream = await fetch(targetBase + relayPath, init);
return new Response(upstream.body, {
status: upstream.status,
headers: upstream.headers,