@klnap/next-proxy-chain 1.0.1 → 1.0.2

package/dist/index.cjs

@@ -32,8 +32,10 @@ __export(index_exports, {
   createProxyContext: () => createProxyContext,
   decodeOverriddenRequestHeaders: () => decodeOverriddenRequestHeaders,
   defineProxy: () => defineProxy,
+  finalizeResponse: () => finalizeResponse,
   formatPipelineLine: () => formatPipelineLine,
   headersDiffer: () => headersDiffer,
+  headersInitToHeaders: () => headersInitToHeaders,
   host: () => host,
   isNextResult: () => isNextResult,
   isRequestHeaderAllowed: () => isRequestHeaderAllowed,
@@ -46,6 +48,7 @@ __export(index_exports, {
   path: () => path,
   pathMatches: () => pathMatches,
   proxyChain: () => proxyChain,
+  resolveRuleResult: () => resolveRuleResult,
   responseHeaderItems: () => responseHeaderItems,
   ruleLabel: () => ruleLabel,
   ruleMatches: () => ruleMatches,
@@ -57,22 +60,39 @@ __export(index_exports, {
   withRuleTimeout: () => withRuleTimeout
 });
 module.exports = __toCommonJS(index_exports);
-var import_server = require("next/server");
 
-// src/core.ts
+// src/core/constants.ts
 var NEXT = /* @__PURE__ */ Symbol.for("proxy-chain.next");
-function next(options = {}) {
-  return { [NEXT]: true, ...options };
-}
-function isNextResult(value) {
-  return typeof value === "object" && value !== null && NEXT in value;
-}
+var DEFAULT_BLOCKED_REQUEST_HEADERS = Object.freeze([
+  "host",
+  "connection",
+  "keep-alive",
+  "proxy-authenticate",
+  "proxy-authorization",
+  "te",
+  "trailer",
+  "transfer-encoding",
+  "upgrade",
+  "content-length",
+  "cookie",
+  "authorization",
+  "x-forwarded-host",
+  "x-forwarded-for",
+  "x-forwarded-proto",
+  "x-real-ip",
+  "x-middleware-next",
+  "x-middleware-override-headers"
+]);
+
+// src/core/context.ts
 function createProxyContext() {
   return /* @__PURE__ */ new Map();
 }
-var USELESS_FN_NAMES = /* @__PURE__ */ new Set(["", "proxy", "anonymous", "run", "next"]);
-function usefulName(value) {
-  if (!value || USELESS_FN_NAMES.has(value)) return void 0;
+
+// src/core/matching.ts
+var RESERVED_FN_NAMES = /* @__PURE__ */ new Set(["", "proxy", "anonymous", "run", "next"]);
+function extractMeaningfulName(value) {
+  if (!value || RESERVED_FN_NAMES.has(value)) return void 0;
   return value;
 }
 function toStatelessRegExp(re) {
@@ -93,6 +113,39 @@ function host(matcher) {
 function isScopeObject(value) {
   return "host" in value || "path" in value;
 }
+function segmentToRegex(segment) {
+  if (segment === "**") return "(?:.*)";
+  if (segment === "*") return "[^/]+";
+  if (segment.startsWith(":")) return "[^/]+";
+  return escapeRegex(segment);
+}
+function path(pattern, options = {}) {
+  const { locales = [] } = options;
+  const localePrefix = locales.length > 0 ? `(?:(?:${locales.map(escapeRegex).join("|")})\\/)?` : "";
+  if (pattern instanceof RegExp) {
+    const body2 = pattern.source.replace(/^\^/, "").replace(/\$$/, "");
+    const needsStart = !pattern.source.startsWith("^");
+    const needsEnd = !pattern.source.endsWith("$");
+    return toStatelessRegExp(
+      new RegExp(
+        `${needsStart ? "^" : ""}${localePrefix ? `/${localePrefix}` : ""}${body2}${needsEnd ? "$" : ""}`,
+        pattern.flags
+      )
+    );
+  }
+  const normalized = (pattern.startsWith("/") ? pattern : `/${pattern}`).replace(/\/$/, "") || "/";
+  const segments = normalized.slice(1).split("/");
+  const trailingStar = segments.length > 0 && segments[segments.length - 1] === "*";
+  const suffix = trailingStar ? "(?:\\/.*)?$" : "$";
+  const body = trailingStar ? segments.slice(0, -1).map(segmentToRegex).concat("[^/]+").join("\\/") : segments.map(segmentToRegex).join("\\/");
+  return new RegExp(`^/${localePrefix}${body}${suffix}`);
+}
+function toPathRegex(matcher, options) {
+  const list = Array.isArray(matcher) ? matcher : [matcher];
+  const regexes = list.map((m) => path(m, options));
+  if (regexes.length === 1) return toStatelessRegExp(regexes[0]);
+  return toStatelessRegExp(new RegExp(`(?:${regexes.map((r) => `(?:${r.source})`).join("|")})`));
+}
 function compileScopes(input, pathOptions) {
   if (input == null) return void 0;
   const list = Array.isArray(input) ? input : [input];
@@ -137,12 +190,12 @@ function scopeMatches(pathname, hostname, scope) {
 }
 function toRule(entry) {
   if (typeof entry === "function") {
-    const name2 = usefulName(entry.name);
+    const name2 = extractMeaningfulName(entry.name);
     return name2 ? { run: entry, name: name2 } : { run: entry };
   }
   const rule = entry;
-  const runName = typeof rule.run === "function" ? usefulName(rule.run.name) : void 0;
-  const name = usefulName(rule.name) ?? runName;
+  const runName = typeof rule.run === "function" ? extractMeaningfulName(rule.run.name) : void 0;
+  const name = extractMeaningfulName(rule.name) ?? runName;
   const harden = (scopes) => scopes?.map((s) => ({
     host: s.host ? toStatelessRegExp(s.host) : void 0,
     path: s.path ? toStatelessRegExp(s.path) : void 0
@@ -155,8 +208,8 @@ function toRule(entry) {
   };
 }
 function ruleLabel(rule, index) {
-  const runName = typeof rule.run === "function" ? usefulName(rule.run.name) : void 0;
-  return usefulName(rule.name) ?? runName ?? `rule#${index}`;
+  const runName = typeof rule.run === "function" ? extractMeaningfulName(rule.run.name) : void 0;
+  return extractMeaningfulName(rule.name) ?? runName ?? `rule#${index}`;
 }
 function withPaths(entry, filter) {
   const base = toRule(entry);
@@ -188,6 +241,58 @@ function normalizeHost(raw) {
   const withoutPort = first.replace(/:\d+$/, "");
   return withoutPort || null;
 }
+function scopeKey(scope) {
+  return `${scope.host?.source ?? "*"}::${scope.host?.flags ?? ""}|${scope.path?.source ?? "*"}::${scope.path?.flags ?? ""}`;
+}
+function assertIncludeExcludeNoOverlap(include, exclude, label) {
+  if (!include?.length || !exclude?.length) return;
+  const excluded = new Set(exclude.map(scopeKey));
+  for (const scope of include) {
+    if (excluded.has(scopeKey(scope))) {
+      throw new Error(
+        `[proxy-chain] ${label}: include and exclude share an identical scope. Remove one.`
+      );
+    }
+  }
+}
+
+// src/core/headers.ts
+function normalizeHeaderName(name) {
+  return name.toLowerCase();
+}
+function headersInitToHeaders(init) {
+  return new Headers(init);
+}
+function headersDiffer(base, overrides) {
+  for (const [key, value] of overrides.entries()) {
+    if (base.get(key) !== value) return true;
+  }
+  return false;
+}
+function isRequestHeaderAllowed(name, policy = {}) {
+  const key = normalizeHeaderName(name);
+  const allowed = new Set((policy.allowed ?? []).map(normalizeHeaderName));
+  if (allowed.has(key)) return true;
+  if (key.startsWith("x-middleware-")) return false;
+  const blocked = /* @__PURE__ */ new Set([
+    ...DEFAULT_BLOCKED_REQUEST_HEADERS.map(normalizeHeaderName),
+    ...(policy.blocked ?? []).map(normalizeHeaderName)
+  ]);
+  return !blocked.has(key);
+}
+function mergeRequestHeaderOverrides(target, overrides, policy = {}) {
+  const dropped = [];
+  let applied = 0;
+  overrides.forEach((value, key) => {
+    if (!isRequestHeaderAllowed(key, policy)) {
+      dropped.push(key);
+      return;
+    }
+    target.set(key, value);
+    applied++;
+  });
+  return { applied, dropped };
+}
 function parseCookieName(setCookie) {
   const eq = setCookie.indexOf("=");
   return (eq === -1 ? setCookie : setCookie.slice(0, eq)).trim();
@@ -245,7 +350,7 @@ function mergeWrites(writes, strategy, onConflict) {
       const previousRule = setBy.get(key);
       if (typeof strategy === "function") {
         const result = strategy(key, existing, value);
-        if (result === null) resolved.delete(key);
+        if (result === null || result === void 0) resolved.delete(key);
         else resolved.set(key, result);
         setBy.set(key, write.ruleName);
         continue;
@@ -270,109 +375,16 @@ function applyMergedToResponse(res, headers, cookies) {
     res.headers.append("set-cookie", cookie);
   }
 }
-var DEFAULT_BLOCKED_REQUEST_HEADERS = [
-  "host",
-  "connection",
-  "keep-alive",
-  "proxy-authenticate",
-  "proxy-authorization",
-  "te",
-  "trailer",
-  "transfer-encoding",
-  "upgrade",
-  "content-length",
-  "cookie",
-  "authorization",
-  "x-forwarded-host",
-  "x-forwarded-for",
-  "x-forwarded-proto",
-  "x-real-ip",
-  "x-middleware-next",
-  "x-middleware-override-headers"
-];
-function normalizeHeaderName(name) {
-  return name.toLowerCase();
-}
-function isRequestHeaderAllowed(name, policy = {}) {
-  const key = normalizeHeaderName(name);
-  const allowed = new Set((policy.allowed ?? []).map(normalizeHeaderName));
-  if (allowed.has(key)) return true;
-  if (key.startsWith("x-middleware-")) return false;
-  const blocked = /* @__PURE__ */ new Set([
-    ...DEFAULT_BLOCKED_REQUEST_HEADERS.map(normalizeHeaderName),
-    ...(policy.blocked ?? []).map(normalizeHeaderName)
-  ]);
-  return !blocked.has(key);
-}
-function mergeRequestHeaderOverrides(target, overrides, policy = {}) {
-  const dropped = [];
-  let applied = 0;
-  overrides.forEach((value, key) => {
-    if (!isRequestHeaderAllowed(key, policy)) {
-      dropped.push(key);
-      return;
-    }
-    target.set(key, value);
-    applied++;
-  });
-  return { applied, dropped };
-}
-function headersInitToHeaders(init) {
-  return new Headers(init);
-}
-function headersDiffer(base, overrides) {
-  for (const [key, value] of overrides.entries()) {
-    if (base.get(key) !== value) return true;
-  }
-  return false;
-}
-function segmentToRegex(segment) {
-  if (segment === "**") return "(?:.*)";
-  if (segment === "*") return "[^/]+";
-  if (segment.startsWith(":")) return "[^/]+";
-  return escapeRegex(segment);
-}
-function path(pattern, options = {}) {
-  const { locales = [] } = options;
-  const localePrefix = locales.length > 0 ? `(?:(?:${locales.map(escapeRegex).join("|")})\\/)?` : "";
-  if (pattern instanceof RegExp) {
-    const body2 = pattern.source.replace(/^\^/, "").replace(/\$$/, "");
-    const needsStart = !pattern.source.startsWith("^");
-    const needsEnd = !pattern.source.endsWith("$");
-    return toStatelessRegExp(
-      new RegExp(
-        `${needsStart ? "^" : ""}${localePrefix ? `/${localePrefix}` : ""}${body2}${needsEnd ? "$" : ""}`,
-        pattern.flags
-      )
-    );
-  }
-  const normalized = (pattern.startsWith("/") ? pattern : `/${pattern}`).replace(/\/$/, "") || "/";
-  const segments = normalized.slice(1).split("/");
-  const trailingStar = segments.length > 0 && segments[segments.length - 1] === "*";
-  const suffix = trailingStar ? "(?:\\/.*)?$" : "$";
-  const body = trailingStar ? segments.slice(0, -1).map(segmentToRegex).concat("[^/]+").join("\\/") : segments.map(segmentToRegex).join("\\/");
-  return new RegExp(`^/${localePrefix}${body}${suffix}`);
-}
-function toPathRegex(matcher, options) {
-  const list = Array.isArray(matcher) ? matcher : [matcher];
-  const regexes = list.map((m) => path(m, options));
-  if (regexes.length === 1) return toStatelessRegExp(regexes[0]);
-  return toStatelessRegExp(new RegExp(`(?:${regexes.map((r) => `(?:${r.source})`).join("|")})`));
-}
-function scopeKey(scope) {
-  return `${scope.host?.source ?? "*"}::${scope.host?.flags ?? ""}|${scope.path?.source ?? "*"}::${scope.path?.flags ?? ""}`;
+
+// src/core/actions.ts
+function next(options = {}) {
+  return { [NEXT]: true, ...options };
 }
-function assertIncludeExcludeNoOverlap(include, exclude, label) {
-  if (!include?.length || !exclude?.length) return;
-  const excluded = new Set(exclude.map(scopeKey));
-  for (const scope of include) {
-    if (excluded.has(scopeKey(scope))) {
-      throw new Error(
-        `[proxy-chain] ${label}: include and exclude share an identical scope. Remove one.`
-      );
-    }
-  }
+function isNextResult(value) {
+  return typeof value === "object" && value !== null && NEXT in value;
 }
+
+// src/core/logger.ts
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -414,6 +426,8 @@ function formatPipelineLine(input) {
       return `[proxy-chain] \xD7 ${req} | ${name} (${formatDuration(outcome.duration)}) -> stop ${outcome.status}`;
   }
 }
+
+// src/core/timeout.ts
 var RuleTimeoutError = class extends Error {
   ruleName;
   timeoutMs;
@@ -437,45 +451,8 @@ async function withRuleTimeout(promise, timeoutMs, ruleName) {
   }
 }
 
-// src/index.ts
-function isPathFilter(value) {
-  if (value === null || typeof value !== "object") return false;
-  if ("nextUrl" in value) return false;
-  return "include" in value || "exclude" in value || "name" in value || "pathOptions" in value;
-}
-function defineProxy(nameOrRun, maybeRun) {
-  const defaultName = typeof nameOrRun === "string" ? nameOrRun : void 0;
-  const run = typeof nameOrRun === "function" ? nameOrRun : maybeRun;
-  const proxy = ((reqOrFilter, eventOrCtx, maybeEvent) => {
-    if (isPathFilter(reqOrFilter)) {
-      return withPaths(run, {
-        ...reqOrFilter,
-        name: reqOrFilter.name ?? defaultName
-      });
-    }
-    return run(reqOrFilter, eventOrCtx, maybeEvent);
-  });
-  Object.defineProperty(proxy, "name", {
-    value: defaultName ?? "",
-    configurable: true
-  });
-  return proxy;
-}
-function resolveConfig(overrides = {}) {
-  const { logger, debug, ...rest } = overrides;
-  return {
-    createContext: () => createProxyContext(),
-    cookieMergeStrategy: "last-write-wins",
-    headerMergeStrategy: "last-write-wins",
-    debug: false,
-    ruleTimeoutMs: 0,
-    requestHeaderPolicy: {},
-    strictOverrideCheck: false,
-    ...rest,
-    ...debug !== void 0 ? { debug } : {},
-    logger: logger ?? createConsoleLogger(debug ? "debug" : "info")
-  };
-}
+// src/core/pipeline.ts
+var import_server = require("next/server");
 function safeInternalError() {
   return new import_server.NextResponse("Internal Server Error", {
     status: 500,
@@ -564,6 +541,57 @@ function resolveRuleResult(res, requestHeaderPolicy, logger, debug) {
   }
   return { kind: "stop", response: res };
 }
+function finalizeResponse(res, headerWrites, cookieWrites, headerStrategy, cookieStrategy, logger, debug) {
+  const headers = mergeWrites(headerWrites, headerStrategy, (key, winner, loser) => {
+    if (debug) logger.debug({ header: key, winner, loser }, "header conflict resolved");
+  });
+  const cookies = mergeWrites(cookieWrites, cookieStrategy, (key, winner, loser) => {
+    if (debug) logger.debug({ cookie: key, winner, loser }, "cookie conflict resolved");
+  });
+  applyMergedToResponse(res, headers, cookies);
+  return res;
+}
+
+// src/core/engine.ts
+var import_server2 = require("next/server");
+function isPathFilter(value) {
+  if (value === null || typeof value !== "object") return false;
+  if ("nextUrl" in value) return false;
+  return "include" in value || "exclude" in value || "name" in value || "pathOptions" in value;
+}
+function defineProxy(nameOrRun, maybeRun) {
+  const defaultName = typeof nameOrRun === "string" ? nameOrRun : void 0;
+  const run = typeof nameOrRun === "function" ? nameOrRun : maybeRun;
+  const proxy = ((reqOrFilter, eventOrCtx, maybeEvent) => {
+    if (isPathFilter(reqOrFilter)) {
+      return withPaths(run, {
+        ...reqOrFilter,
+        name: reqOrFilter.name ?? defaultName
+      });
+    }
+    return run(reqOrFilter, eventOrCtx, maybeEvent);
+  });
+  Object.defineProperty(proxy, "name", {
+    value: defaultName ?? "",
+    configurable: true
+  });
+  return proxy;
+}
+function resolveConfig(overrides = {}) {
+  const { logger, debug, ...rest } = overrides;
+  return {
+    createContext: () => createProxyContext(),
+    cookieMergeStrategy: "last-write-wins",
+    headerMergeStrategy: "last-write-wins",
+    debug: false,
+    ruleTimeoutMs: 0,
+    requestHeaderPolicy: {},
+    strictOverrideCheck: false,
+    ...rest,
+    ...debug !== void 0 ? { debug } : {},
+    logger: logger ?? createConsoleLogger(debug ? "debug" : "info")
+  };
+}
 function proxyChain(optionsOrEntries, maybeEntries) {
   const options = Array.isArray(optionsOrEntries) ? {} : optionsOrEntries;
   const entries = Array.isArray(optionsOrEntries) ? optionsOrEntries : maybeEntries;
@@ -609,14 +637,15 @@ function proxyChain(optionsOrEntries, maybeEntries) {
         merged.set(k, v);
       });
       pendingRequestOverrides = null;
-      currentReq = new import_server.NextRequest(currentReq, { headers: merged });
+      currentReq = new import_server2.NextRequest(currentReq, { headers: merged });
       return currentReq;
     };
     const appliedRequestOverrides = new Headers();
     const queueRequestOverrides = (overrides) => {
       if (!pendingRequestOverrides) pendingRequestOverrides = new Headers();
-      mergeRequestHeaderOverrides(pendingRequestOverrides, overrides, requestHeaderPolicy);
+      const target = pendingRequestOverrides;
       overrides.forEach((v, k) => {
+        target.set(k, v);
         appliedRequestOverrides.set(k, v);
       });
     };
@@ -670,7 +699,7 @@ function proxyChain(optionsOrEntries, maybeEntries) {
                     })
                   );
                 }
-                return finalize(
+                return finalizeResponse(
                   recovered,
                   headerWrites,
                   cookieWrites,
@@ -767,7 +796,7 @@ function proxyChain(optionsOrEntries, maybeEntries) {
             }
           }
         }
-        return finalize(
+        return finalizeResponse(
           outcome.response,
           headerWrites,
           cookieWrites,
@@ -806,11 +835,11 @@ function proxyChain(optionsOrEntries, maybeEntries) {
       let final;
       if (finalRewriteUrl) {
         const rewriteTarget = new URL(finalRewriteUrl, finalReq.url);
-        final = import_server.NextResponse.rewrite(rewriteTarget, { request: { headers: finalReq.headers } });
+        final = import_server2.NextResponse.rewrite(rewriteTarget, { request: { headers: finalReq.headers } });
       } else {
-        final = import_server.NextResponse.next({ request: { headers: finalReq.headers } });
+        final = import_server2.NextResponse.next({ request: { headers: finalReq.headers } });
       }
-      return finalize(
+      return finalizeResponse(
         final,
         headerWrites,
         cookieWrites,
@@ -832,16 +861,6 @@ function proxyChain(optionsOrEntries, maybeEntries) {
     }
   };
 }
-function finalize(res, headerWrites, cookieWrites, headerStrategy, cookieStrategy, logger, debug) {
-  const headers = mergeWrites(headerWrites, headerStrategy, (key, winner, loser) => {
-    if (debug) logger.debug({ header: key, winner, loser }, "header conflict resolved");
-  });
-  const cookies = mergeWrites(cookieWrites, cookieStrategy, (key, winner, loser) => {
-    if (debug) logger.debug({ cookie: key, winner, loser }, "cookie conflict resolved");
-  });
-  applyMergedToResponse(res, headers, cookies);
-  return res;
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DEFAULT_BLOCKED_REQUEST_HEADERS,
@@ -856,8 +875,10 @@ function finalize(res, headerWrites, cookieWrites, headerStrategy, cookieStrateg
   createProxyContext,
   decodeOverriddenRequestHeaders,
   defineProxy,
+  finalizeResponse,
   formatPipelineLine,
   headersDiffer,
+  headersInitToHeaders,
   host,
   isNextResult,
   isRequestHeaderAllowed,
@@ -870,6 +891,7 @@ function finalize(res, headerWrites, cookieWrites, headerStrategy, cookieStrateg
   path,
   pathMatches,
   proxyChain,
+  resolveRuleResult,
   responseHeaderItems,
   ruleLabel,
   ruleMatches,