@samebase/convex-hosting 0.3.2 → 0.4.0

package/dist/workers-shared/utils/configuration/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/workers-shared/utils/configuration/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC;AACnC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC;AAEjC,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AAC9E,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CAAC;AACpC,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC;AACpC,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CAAC;AACpC,MAAM,CAAC,MAAM,0BAA0B,GAAG,GAAG,CAAC;AAC9C,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,CAAC;AAC9C,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC;AAEnC,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,CAAC;AACjC,MAAM,CAAC,MAAM,iBAAiB,GAAG,eAAe,CAAC;AAEjD,gDAAgD;AAChD,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CAAC;AACpC,yDAAyD;AACzD,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAG,CAAC"}

package/dist/workers-shared/utils/configuration/constructConfiguration.d.ts

@@ -0,0 +1,12 @@
+import type { AssetConfig } from "../types.js";
+import type { Logger, ParsedHeaders, ParsedRedirects } from "./types.js";
+export declare function constructRedirects({ redirects, redirectsFile, logger, }: {
+    redirects?: ParsedRedirects;
+    redirectsFile?: string;
+    logger: Logger;
+}): Pick<AssetConfig, "redirects">;
+export declare function constructHeaders({ headers, headersFile, logger, }: {
+    headers?: ParsedHeaders;
+    headersFile?: string;
+    logger: Logger;
+}): Pick<AssetConfig, "headers">;

package/dist/workers-shared/utils/configuration/constructConfiguration.js

@@ -0,0 +1,103 @@
+import { relative } from "node:path";
+import { HEADERS_VERSION, PLACEHOLDER_REGEX, REDIRECTS_VERSION, SPLAT_REGEX, } from "./constants.js";
+export function constructRedirects({ redirects, redirectsFile, logger, }) {
+    if (!redirects) {
+        return {};
+    }
+    const num_valid = redirects.rules.length;
+    const num_invalid = redirects.invalid.length;
+    // exhaustive check, since we could not have parsed `redirects` out of
+    // a non-existing redirects file
+    const redirectsRelativePath = redirectsFile
+        ? relative(process.cwd(), redirectsFile)
+        : "";
+    logger.log(`✨ Parsed ${num_valid} valid redirect rule${num_valid === 1 ? "" : "s"}.`);
+    if (num_invalid > 0) {
+        let invalidRedirectRulesList = ``;
+        for (const { line, lineNumber, message } of redirects.invalid) {
+            invalidRedirectRulesList += `▶︎ ${message}\n`;
+            if (line) {
+                invalidRedirectRulesList += `    at ${redirectsRelativePath}${lineNumber ? `:${lineNumber}` : ""} | ${line}\n\n`;
+            }
+        }
+        logger.warn(`Found ${num_invalid} invalid redirect rule${num_invalid === 1 ? "" : "s"}:\n` +
+            `${invalidRedirectRulesList}`);
+    }
+    /* Better to return no Redirects object at all than one with empty rules */
+    if (num_valid === 0) {
+        return {};
+    }
+    const staticRedirects = {};
+    const dynamicRedirects = {};
+    let canCreateStaticRule = true;
+    for (const rule of redirects.rules) {
+        if (!rule.from.match(SPLAT_REGEX) && !rule.from.match(PLACEHOLDER_REGEX)) {
+            if (canCreateStaticRule) {
+                staticRedirects[rule.from] = {
+                    status: rule.status,
+                    to: rule.to,
+                    lineNumber: rule.lineNumber,
+                };
+                continue;
+            }
+            else {
+                logger.info(`The redirect rule ${rule.from} → ${rule.status} ${rule.to} could be made more performant by bringing it above any lines with splats or placeholders.`);
+            }
+        }
+        dynamicRedirects[rule.from] = { status: rule.status, to: rule.to };
+        canCreateStaticRule = false;
+    }
+    return {
+        redirects: {
+            version: REDIRECTS_VERSION,
+            staticRules: staticRedirects,
+            rules: dynamicRedirects,
+        },
+    };
+}
+export function constructHeaders({ headers, headersFile, logger, }) {
+    if (!headers) {
+        return {};
+    }
+    const num_valid = headers.rules.length;
+    const num_invalid = headers.invalid.length;
+    // exhaustive check, since we could not have parsed `headers` out of
+    // a non-existing headers file
+    const headersRelativePath = headersFile
+        ? relative(process.cwd(), headersFile)
+        : "";
+    logger.log(`✨ Parsed ${num_valid} valid header rule${num_valid === 1 ? "" : "s"}.`);
+    if (num_invalid > 0) {
+        let invalidHeaderRulesList = ``;
+        for (const { line, lineNumber, message } of headers.invalid) {
+            invalidHeaderRulesList += `▶︎ ${message}\n`;
+            if (line) {
+                invalidHeaderRulesList += `    at ${headersRelativePath}${lineNumber ? `:${lineNumber}` : ""} | ${line}\n\n`;
+            }
+        }
+        logger.warn(`Found ${num_invalid} invalid header rule${num_invalid === 1 ? "" : "s"}:\n` +
+            `${invalidHeaderRulesList}`);
+    }
+    /* Better to return no Headers object at all than one with empty rules */
+    if (num_valid === 0) {
+        return {};
+    }
+    const rules = {};
+    for (const rule of headers.rules) {
+        const configuredRule = {};
+        if (Object.keys(rule.headers).length) {
+            configuredRule.set = rule.headers;
+        }
+        if (rule.unsetHeaders.length) {
+            configuredRule.unset = rule.unsetHeaders;
+        }
+        rules[rule.path] = configuredRule;
+    }
+    return {
+        headers: {
+            version: HEADERS_VERSION,
+            rules,
+        },
+    };
+}
+//# sourceMappingURL=constructConfiguration.js.map

package/dist/workers-shared/utils/configuration/constructConfiguration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constructConfiguration.js","sourceRoot":"","sources":["../../../../src/workers-shared/utils/configuration/constructConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EACN,eAAe,EACf,iBAAiB,EACjB,iBAAiB,EACjB,WAAW,GACX,MAAM,gBAAgB,CAAC;AASxB,MAAM,UAAU,kBAAkB,CAAC,EAClC,SAAS,EACT,aAAa,EACb,MAAM,GAKN;IACA,IAAI,CAAC,SAAS,EAAE,CAAC;QAChB,OAAO,EAAE,CAAC;IACX,CAAC;IAED,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC;IACzC,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC;IAE7C,sEAAsE;IACtE,gCAAgC;IAChC,MAAM,qBAAqB,GAAG,aAAa;QAC1C,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC;QACxC,CAAC,CAAC,EAAE,CAAC;IAEN,MAAM,CAAC,GAAG,CACT,YAAY,SAAS,uBAAuB,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CACzE,CAAC;IAEF,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;QACrB,IAAI,wBAAwB,GAAG,EAAE,CAAC;QAElC,KAAK,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YAC/D,wBAAwB,IAAI,MAAM,OAAO,IAAI,CAAC;YAE9C,IAAI,IAAI,EAAE,CAAC;gBACV,wBAAwB,IAAI,UAAU,qBAAqB,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,MAAM,CAAC;YAClH,CAAC;QACF,CAAC;QAED,MAAM,CAAC,IAAI,CACV,SAAS,WAAW,yBAAyB,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK;YAC7E,GAAG,wBAAwB,EAAE,CAC9B,CAAC;IACH,CAAC;IAED,2EAA2E;IAC3E,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,EAAE,CAAC;IACX,CAAC;IAED,MAAM,eAAe,GAA4B,EAAE,CAAC;IACpD,MAAM,gBAAgB,GAAsB,EAAE,CAAC;IAC/C,IAAI,mBAAmB,GAAG,IAAI,CAAC;IAC/B,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAC1E,IAAI,mBAAmB,EAAE,CAAC;gBACzB,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;oBAC5B,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,EAAE,EAAE,IAAI,CAAC,EAAE;oBACX,UAAU,EAAE,IAAI,CAAC,UAAU;iBAC3B,CAAC;gBACF,SAAS;YACV,CAAC;iBAAM,CAAC;gBACP,MAAM,CAAC,IAAI,CACV,qBAAqB,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,EAAE,4FAA4F,CACtJ,CAAC;YACH,CAAC;QACF,CAAC;QAED,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;QACnE,mBAAmB,GAAG,KAAK,CAAC;IAC7B,CAAC;IAED,OAAO;QACN,SAAS,EAAE;YACV,OAAO,EAAE,iBAAiB;YAC1B,WAAW,EAAE,eAAe;YAC5B,KAAK,EAAE,gBAAgB;SACvB;KACD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,EAChC,OAAO,EACP,WAAW,EACX,MAAM,GAKN;IACA,IAAI,CAAC,OAAO,EAAE,CAAC;QACd,OAAO,EAAE,CAAC;IACX,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IACvC,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;IAE3C,oEAAoE;IACpE,8BAA8B;IAC9B,MAAM,mBAAmB,GAAG,WAAW;QACtC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,WAAW,CAAC;QACtC,CAAC,CAAC,EAAE,CAAC;IAEN,MAAM,CAAC,GAAG,CACT,YAAY,SAAS,qBAAqB,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CACvE,CAAC;IAEF,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;QACrB,IAAI,sBAAsB,GAAG,EAAE,CAAC;QAEhC,KAAK,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YAC7D,sBAAsB,IAAI,MAAM,OAAO,IAAI,CAAC;YAE5C,IAAI,IAAI,EAAE,CAAC;gBACV,sBAAsB,IAAI,UAAU,mBAAmB,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,MAAM,CAAC;YAC9G,CAAC;QACF,CAAC;QAED,MAAM,CAAC,IAAI,CACV,SAAS,WAAW,uBAAuB,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK;YAC3E,GAAG,sBAAsB,EAAE,CAC5B,CAAC;IACH,CAAC;IAED,yEAAyE;IACzE,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,EAAE,CAAC;IACX,CAAC;IAED,MAAM,KAAK,GAAoB,EAAE,CAAC;IAClC,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QAClC,MAAM,cAAc,GAA4B,EAAE,CAAC;QAEnD,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;YACtC,cAAc,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC;QACnC,CAAC;QACD,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;YAC9B,cAAc,CAAC,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC;QAC1C,CAAC;QAED,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC;IACnC,CAAC;IAED,OAAO;QACN,OAAO,EAAE;YACR,OAAO,EAAE,eAAe;YACxB,KAAK;SACL;KACD,CAAC;AACH,CAAC"}

package/dist/workers-shared/utils/configuration/parseHeaders.d.ts

@@ -0,0 +1,5 @@
+import type { ParsedHeaders } from "./types.js";
+export declare function parseHeaders(input: string, { maxRules, maxLineLength, }?: {
+    maxRules?: number;
+    maxLineLength?: number;
+}): ParsedHeaders;

package/dist/workers-shared/utils/configuration/parseHeaders.js

@@ -0,0 +1,181 @@
+import { HEADER_SEPARATOR, MAX_HEADER_RULES, MAX_LINE_LENGTH, SPLAT_REGEX, UNSET_OPERATOR, } from "./constants.js";
+import { validateUrl } from "./validateURL.js";
+// Not strictly necessary to check for all protocols-like beginnings, since _technically_ that could be a legit header (e.g. name=http, value=://I'm a value).
+// But we're checking here since some people might be caught out and it'll help 99.9% of people who get it wrong.
+// We do the proper validation in `validateUrl` anyway :)
+const LINE_IS_PROBABLY_A_PATH = new RegExp(/^([^\s]+:\/\/|^\/)/);
+export function parseHeaders(input, { maxRules = MAX_HEADER_RULES, maxLineLength = MAX_LINE_LENGTH, } = {}) {
+    const lines = input.split("\n");
+    const rules = [];
+    const invalid = [];
+    let rule = undefined;
+    // When a path line is rejected (invalid URL, multiple wildcards, etc.),
+    // we silently skip subsequent header lines until the next path line
+    // rather than emitting confusing "Path should come before header" errors.
+    let skipUntilNextPath = false;
+    for (let i = 0; i < lines.length; i++) {
+        const line = (lines[i] || "").trim();
+        if (line.length === 0 || line.startsWith("#")) {
+            continue;
+        }
+        if (line.length > maxLineLength) {
+            invalid.push({
+                message: `Ignoring line ${i + 1} as it exceeds the maximum allowed length of ${maxLineLength}.`,
+            });
+            continue;
+        }
+        if (LINE_IS_PROBABLY_A_PATH.test(line)) {
+            skipUntilNextPath = false;
+            if (rules.length >= maxRules) {
+                invalid.push({
+                    message: `Maximum number of rules supported is ${maxRules}. Skipping remaining ${lines.length - i} lines of file.`,
+                });
+                break;
+            }
+            if (rule) {
+                if (isValidRule(rule)) {
+                    rules.push({
+                        path: rule.path,
+                        headers: rule.headers,
+                        unsetHeaders: rule.unsetHeaders,
+                    });
+                }
+                else {
+                    invalid.push({
+                        line: rule.line,
+                        lineNumber: i + 1,
+                        message: "No headers specified",
+                    });
+                }
+            }
+            const [path, pathError] = validateUrl(line, false, true);
+            if (pathError) {
+                invalid.push({
+                    line,
+                    lineNumber: i + 1,
+                    message: pathError,
+                });
+                rule = undefined;
+                skipUntilNextPath = true;
+                continue;
+            }
+            const wildcardError = validateNoMultipleWildcards(path);
+            if (wildcardError) {
+                invalid.push({
+                    line,
+                    lineNumber: i + 1,
+                    message: wildcardError,
+                });
+                rule = undefined;
+                skipUntilNextPath = true;
+                continue;
+            }
+            rule = {
+                path: path,
+                line,
+                headers: {},
+                unsetHeaders: [],
+            };
+            continue;
+        }
+        if (skipUntilNextPath) {
+            continue;
+        }
+        if (!line.includes(HEADER_SEPARATOR)) {
+            if (!rule) {
+                invalid.push({
+                    line,
+                    lineNumber: i + 1,
+                    message: "Expected a path beginning with at least one forward-slash",
+                });
+            }
+            else {
+                if (line.trim().startsWith(UNSET_OPERATOR)) {
+                    rule.unsetHeaders.push(line.trim().replace(UNSET_OPERATOR, ""));
+                }
+                else {
+                    invalid.push({
+                        line,
+                        lineNumber: i + 1,
+                        message: "Expected a colon-separated header pair (e.g. name: value)",
+                    });
+                }
+            }
+            continue;
+        }
+        const [rawName, ...rawValue] = line.split(HEADER_SEPARATOR);
+        const name = (rawName || "").trim().toLowerCase();
+        if (name.includes(" ")) {
+            invalid.push({
+                line,
+                lineNumber: i + 1,
+                message: "Header name cannot include spaces",
+            });
+            continue;
+        }
+        const value = rawValue.join(HEADER_SEPARATOR).trim();
+        if (name === "") {
+            invalid.push({
+                line,
+                lineNumber: i + 1,
+                message: "No header name specified",
+            });
+            continue;
+        }
+        if (value === "") {
+            invalid.push({
+                line,
+                lineNumber: i + 1,
+                message: "No header value specified",
+            });
+            continue;
+        }
+        if (!rule) {
+            invalid.push({
+                line,
+                lineNumber: i + 1,
+                message: `Path should come before header (${name}: ${value})`,
+            });
+            continue;
+        }
+        const existingValues = rule.headers[name];
+        rule.headers[name] = existingValues ? `${existingValues}, ${value}` : value;
+    }
+    if (rule) {
+        if (isValidRule(rule)) {
+            rules.push({
+                path: rule.path,
+                headers: rule.headers,
+                unsetHeaders: rule.unsetHeaders,
+            });
+        }
+        else {
+            invalid.push({ line: rule.line, message: "No headers specified" });
+        }
+    }
+    return {
+        rules,
+        invalid,
+    };
+}
+function isValidRule(rule) {
+    return Object.keys(rule.headers).length > 0 || rule.unsetHeaders.length > 0;
+}
+/**
+ * At runtime, `*` wildcards are converted to `:splat` placeholders. This means
+ * a path with multiple wildcards, or a wildcard combined with an explicit
+ * `:splat` placeholder, would result in duplicate `:splat` parameters which is
+ * unsupported.
+ */
+function validateNoMultipleWildcards(path) {
+    const wildcardCount = (path.match(SPLAT_REGEX) ?? []).length;
+    const hasSplatPlaceholder = /:splat(?!\w)/.test(path);
+    if (wildcardCount > 1) {
+        return `Only one wildcard is allowed per rule. Use a named placeholder (e.g. :project) instead. Skipping ${path}.`;
+    }
+    if (wildcardCount > 0 && hasSplatPlaceholder) {
+        return `Cannot combine a wildcard * with a :splat placeholder because wildcards are converted to :splat at runtime. Skipping ${path}.`;
+    }
+    return undefined;
+}
+//# sourceMappingURL=parseHeaders.js.map

package/dist/workers-shared/utils/configuration/parseHeaders.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseHeaders.js","sourceRoot":"","sources":["../../../../src/workers-shared/utils/configuration/parseHeaders.ts"],"names":[],"mappings":"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"}

package/dist/workers-shared/utils/configuration/parseRedirects.d.ts

@@ -0,0 +1,8 @@
+import type { AssetConfig } from "../types.js";
+import type { ParsedRedirects } from "./types.js";
+export declare function parseRedirects(input: string, { htmlHandling, maxStaticRules, maxDynamicRules, maxLineLength, }?: {
+    htmlHandling?: AssetConfig["html_handling"];
+    maxStaticRules?: number;
+    maxDynamicRules?: number;
+    maxLineLength?: number;
+}): ParsedRedirects;

package/dist/workers-shared/utils/configuration/parseRedirects.js

@@ -0,0 +1,129 @@
+import { MAX_DYNAMIC_REDIRECT_RULES, MAX_LINE_LENGTH, MAX_STATIC_REDIRECT_RULES, PERMITTED_STATUS_CODES, PLACEHOLDER_REGEX, SPLAT_REGEX, } from "./constants.js";
+import { urlHasHost, validateUrl } from "./validateURL.js";
+export function parseRedirects(input, { htmlHandling = undefined, maxStaticRules = MAX_STATIC_REDIRECT_RULES, maxDynamicRules = MAX_DYNAMIC_REDIRECT_RULES, maxLineLength = MAX_LINE_LENGTH, } = {}) {
+    const lines = input.split("\n");
+    const rules = [];
+    const seen_paths = new Set();
+    const invalid = [];
+    let staticRules = 0;
+    let dynamicRules = 0;
+    let canCreateStaticRule = true;
+    for (let i = 0; i < lines.length; i++) {
+        const line = (lines[i] || "").trim();
+        if (line.length === 0 || line.startsWith("#")) {
+            continue;
+        }
+        if (line.length > maxLineLength) {
+            invalid.push({
+                message: `Ignoring line ${i + 1} as it exceeds the maximum allowed length of ${maxLineLength}.`,
+            });
+            continue;
+        }
+        // Handle inline comments: strip off from the first `#` token that starts a comment, but not URL fragments.
+        // This allows `/a /b#fragment` but strips `/a /b # comment`
+        const tokens = line.replace(/\s+#.*$/, "").split(/\s+/);
+        if (tokens.length < 2 || tokens.length > 3) {
+            invalid.push({
+                line,
+                lineNumber: i + 1,
+                message: `Expected exactly 2 or 3 whitespace-separated tokens. Got ${tokens.length}.`,
+            });
+            continue;
+        }
+        const [str_from, str_to, str_status = "302"] = tokens;
+        const fromResult = validateUrl(str_from, true, true, false, false);
+        if (fromResult[0] === undefined) {
+            invalid.push({
+                line,
+                lineNumber: i + 1,
+                message: fromResult[1],
+            });
+            continue;
+        }
+        const from = fromResult[0];
+        if (canCreateStaticRule &&
+            !from.match(SPLAT_REGEX) &&
+            !from.match(PLACEHOLDER_REGEX)) {
+            staticRules += 1;
+            if (staticRules > maxStaticRules) {
+                invalid.push({
+                    message: `Maximum number of static rules supported is ${maxStaticRules}. Skipping line.`,
+                });
+                continue;
+            }
+        }
+        else {
+            dynamicRules += 1;
+            canCreateStaticRule = false;
+            if (dynamicRules > maxDynamicRules) {
+                invalid.push({
+                    message: `Maximum number of dynamic rules supported is ${maxDynamicRules}. Skipping remaining ${lines.length - i} lines of file.`,
+                });
+                break;
+            }
+        }
+        const toResult = validateUrl(str_to, false, false, true, true);
+        if (toResult[0] === undefined) {
+            invalid.push({
+                line,
+                lineNumber: i + 1,
+                message: toResult[1],
+            });
+            continue;
+        }
+        const to = toResult[0];
+        const status = Number(str_status);
+        if (isNaN(status) || !PERMITTED_STATUS_CODES.has(status)) {
+            invalid.push({
+                line,
+                lineNumber: i + 1,
+                message: `Valid status codes are 200, 301, 302 (default), 303, 307, or 308. Got ${str_status}.`,
+            });
+            continue;
+        }
+        // Here we reject two patterns:
+        // 1. `/* /index.html` Is always rejected.
+        // 2. `/ /index` Is rejected when HTML handling is enabled.
+        // Allowing the redirect in other cases will cause TOO_MANY_REDIRECTS errors as the asset Worker will
+        // redirect it back to `/` by removing the `/index.html`.
+        // We only want to run this on relative URLs.
+        const hasRelativePath = !urlHasHost(to);
+        const hasWildcardToIndex = from.endsWith("/*") && /\/index(.html)?$/.test(to);
+        const hasRootToIndex = from.endsWith("/") && /\/index(.html)?$/.test(to);
+        const hasHTMLHandling = htmlHandling !== "none"; // HTML handling is enabled by default.
+        if (hasRelativePath &&
+            (hasWildcardToIndex || (hasRootToIndex && hasHTMLHandling))) {
+            invalid.push({
+                line,
+                lineNumber: i + 1,
+                message: "Infinite loop detected in this rule and has been ignored. This will cause a redirect to strip `.html` or `/index` and end up triggering this rule again. Please fix or remove this rule to silence this warning.",
+            });
+            continue;
+        }
+        if (seen_paths.has(from)) {
+            invalid.push({
+                line,
+                lineNumber: i + 1,
+                message: `Ignoring duplicate rule for path ${from}.`,
+            });
+            continue;
+        }
+        seen_paths.add(from);
+        if (status === 200) {
+            if (urlHasHost(to)) {
+                invalid.push({
+                    line,
+                    lineNumber: i + 1,
+                    message: `Proxy (200) redirects can only point to relative paths. Got ${to}`,
+                });
+                continue;
+            }
+        }
+        rules.push({ from, to, status, lineNumber: i + 1 });
+    }
+    return {
+        rules,
+        invalid,
+    };
+}
+//# sourceMappingURL=parseRedirects.js.map

package/dist/workers-shared/utils/configuration/parseRedirects.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseRedirects.js","sourceRoot":"","sources":["../../../../src/workers-shared/utils/configuration/parseRedirects.ts"],"names":[],"mappings":"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"}

package/dist/workers-shared/utils/configuration/parseStaticRouting.d.ts

@@ -0,0 +1,2 @@
+import type { StaticRouting } from "../types.js";
+export declare function parseStaticRouting(input: string[]): StaticRouting;

package/dist/workers-shared/utils/configuration/parseStaticRouting.js

@@ -0,0 +1,94 @@
+import { MAX_ROUTES_RULE_LENGTH, MAX_ROUTES_RULES } from "./constants.js";
+const MAX_REPORTED_DUPLICATED_RULES = 5;
+// copy of what EWC does. Wrangler uploads the rules in one array (so the API is consistent with Wrangler config),
+// but router Worker expects the rules to be split into two arrays, which we do here.
+// This logic is translated from assets/staticrouting.go.
+export function parseStaticRouting(input) {
+    if (input.length === 0) {
+        throw new Error("No `run_worker_first` rules were provided; must provide at least 1 rule.");
+    }
+    if (input.length > MAX_ROUTES_RULES) {
+        const seenRules = new Set();
+        const duplicatedRules = new Set();
+        for (const rule of input) {
+            if (seenRules.has(rule)) {
+                duplicatedRules.add(rule);
+            }
+            seenRules.add(rule);
+        }
+        if (duplicatedRules.size > 0) {
+            const duplicateEntryCount = input.length - seenRules.size;
+            const reportedDuplicatedRules = [...seenRules]
+                .filter((rule) => duplicatedRules.has(rule))
+                .slice(0, MAX_REPORTED_DUPLICATED_RULES);
+            const unreportedDuplicatedRuleCount = duplicatedRules.size - reportedDuplicatedRules.length;
+            const unreportedDuplicatedRulesMessage = unreportedDuplicatedRuleCount > 0
+                ? `\n...and ${unreportedDuplicatedRuleCount} more duplicated ${unreportedDuplicatedRuleCount === 1 ? "rule" : "rules"}.`
+                : "";
+            throw new Error(`Too many \`run_worker_first\` rules were provided; ${input.length} rules provided (${seenRules.size} distinct, ${duplicateEntryCount} duplicate ${duplicateEntryCount === 1 ? "entry" : "entries"}) exceeds max of ${MAX_ROUTES_RULES}. Note: duplicate entries count towards the route limit. Ensure that no duplicate rules are present in your \`run_worker_first\` configuration.\n\nThe duplicated rules found are:\n${reportedDuplicatedRules.map((rule) => `- ${JSON.stringify(rule)}`).join("\n")}${unreportedDuplicatedRulesMessage}`);
+        }
+        throw new Error(`Too many \`run_worker_first\` rules were provided; ${input.length} rules provided exceeds max of ${MAX_ROUTES_RULES}.`);
+    }
+    const rawAssetWorkerRules = [];
+    const assetWorkerRules = [];
+    const userWorkerRules = [];
+    const invalidRules = [];
+    for (const rule of input) {
+        if (rule.startsWith("!/")) {
+            assetWorkerRules.push(rule.slice(1)); // Remove leading !
+            rawAssetWorkerRules.push(rule);
+        }
+        else if (rule.startsWith("/")) {
+            userWorkerRules.push(rule);
+        }
+        else if (rule.startsWith("!")) {
+            invalidRules.push(`'${rule}': negative rules must start with '!/'`);
+        }
+        else {
+            invalidRules.push(`'${rule}': rules must start with '/' or '!/'`);
+        }
+    }
+    if (assetWorkerRules.length > 0 && userWorkerRules.length === 0) {
+        throw new Error("Only negative `run_worker_first` rules were provided; must provide at least 1 non-negative rule");
+    }
+    const invalidAssetWorkerRules = validateStaticRoutingRules(rawAssetWorkerRules);
+    const invalidUserWorkerRules = validateStaticRoutingRules(userWorkerRules);
+    const errorMessage = formatInvalidRoutes([
+        ...invalidRules,
+        ...invalidUserWorkerRules,
+        ...invalidAssetWorkerRules,
+    ]);
+    if (errorMessage) {
+        throw new Error(errorMessage);
+    }
+    return { asset_worker: assetWorkerRules, user_worker: userWorkerRules };
+}
+function validateStaticRoutingRules(rules) {
+    const invalid = [];
+    const seen = new Set();
+    for (const rule of rules) {
+        if (rule.length > MAX_ROUTES_RULE_LENGTH) {
+            invalid.push(`'${rule}': all rules must be less than ${MAX_ROUTES_RULE_LENGTH} characters in length`);
+        }
+        if (seen.has(rule)) {
+            invalid.push(`'${rule}': rule is a duplicate; rules must be unique`);
+        }
+        if (rule.endsWith("*")) {
+            // Check for redundant rules due to a glob
+            for (const otherRule of rules) {
+                if (otherRule !== rule && otherRule.startsWith(rule.slice(0, -1))) {
+                    invalid.push(`'${otherRule}': rule '${rule}' makes it redundant`);
+                }
+            }
+        }
+        seen.add(rule);
+    }
+    return invalid;
+}
+const formatInvalidRoutes = (invalidRules) => {
+    if (invalidRules.length === 0) {
+        return undefined;
+    }
+    return `Invalid routes in \`run_worker_first\`:\n` + invalidRules.join("\n");
+};
+//# sourceMappingURL=parseStaticRouting.js.map

package/dist/workers-shared/utils/configuration/parseStaticRouting.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseStaticRouting.js","sourceRoot":"","sources":["../../../../src/workers-shared/utils/configuration/parseStaticRouting.ts"],"names":[],"mappings":"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"}

package/dist/workers-shared/utils/configuration/types.d.ts

@@ -0,0 +1,38 @@
+export type RedirectLine = [from: string, to: string, status?: number];
+export type RedirectRule = {
+    from: string;
+    to: string;
+    status: number;
+    lineNumber: number;
+};
+export type Headers = Record<string, string>;
+export type HeadersRule = {
+    path: string;
+    headers: Headers;
+    unsetHeaders: string[];
+};
+export type InvalidRedirectRule = {
+    line?: string;
+    lineNumber?: number;
+    message: string;
+};
+export type InvalidHeadersRule = {
+    line?: string;
+    lineNumber?: number;
+    message: string;
+};
+export type ParsedRedirects = {
+    invalid: InvalidRedirectRule[];
+    rules: RedirectRule[];
+};
+export type ParsedHeaders = {
+    invalid: InvalidHeadersRule[];
+    rules: HeadersRule[];
+};
+export interface Logger {
+    debug: (message: string) => void;
+    log: (message: string) => void;
+    info: (message: string) => void;
+    warn: (message: string) => void;
+    error: (error: Error) => void;
+}

package/dist/workers-shared/utils/configuration/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/workers-shared/utils/configuration/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/workers-shared/utils/configuration/types.ts"],"names":[],"mappings":""}

package/dist/workers-shared/utils/configuration/validateURL.d.ts

@@ -0,0 +1,3 @@
+export declare const extractPathname: (path: string | undefined, includeSearch: boolean, includeHash: boolean) => string;
+export declare const validateUrl: (token: string, onlyRelative?: boolean, disallowPorts?: boolean, includeSearch?: boolean, includeHash?: boolean) => [undefined, string] | [string, undefined];
+export declare function urlHasHost(token: string): boolean;