@netlify/redirects 4.0.4 → 4.1.0

package/dist/main.js

@@ -5,7 +5,7 @@ import process from "process";
 import path from "path";
 import { toMultiValueHeaders } from "@netlify/dev-utils";
 import { parseCookie } from "cookie";
-import redirector from "netlify-redirector";
+import { createMatcher } from "@netlify/redirect-matcher";
 
 // src/lib/parser.ts
 import { parseAllRedirects } from "@netlify/redirect-parser";
@@ -78,17 +78,15 @@ var createRewriter = async function({
   }
   const getMatcher = async () => {
     if (matcher) return matcher;
-    if (redirects.length !== 0) {
-      return matcher = await redirector.parseJSON(JSON.stringify(redirects), {
-        jwtSecret,
-        jwtRoleClaim
-      });
+    if (redirects.length === 0) {
+      return { match: () => null };
     }
-    return {
-      match() {
-        return null;
-      }
-    };
+    matcher = await createMatcher(redirects, { jwtSecret, jwtRoleClaim });
+    if (matcher.parseErrors.length !== 0) {
+      console.log(`Redirects matcher errors:
+${matcher.parseErrors.map(({ message }) => message).join("\n\n")}`);
+    }
+    return matcher;
   };
   return async function rewriter(req) {
     const matcherFunc = await getMatcher();
@@ -99,23 +97,14 @@ var createRewriter = async function({
       "x-country": cookieValues.nf_country || geoCountry || "us",
       ...toMultiValueHeaders(req.headers)
     };
-    const matchReq = {
+    return matcherFunc.match({
       scheme: reqUrl.protocol.replace(/:.*$/, ""),
       host: reqUrl.hostname,
       path: decodeURIComponent(reqUrl.pathname),
       query: reqUrl.search.slice(1),
       headers,
-      cookieValues,
-      getHeader: (name) => {
-        const val = headers[name.toLowerCase()];
-        if (Array.isArray(val)) {
-          return val[0];
-        }
-        return val || "";
-      },
-      getCookie: (key) => cookieValues[key] || ""
-    };
-    return matcherFunc.match(matchReq);
+      cookies: cookieValues
+    });
   };
 };
 
@@ -172,7 +161,7 @@ var RedirectsHandler = class {
     if (!rule) {
       return;
     }
-    if (rule.force404) {
+    if (rule.type === "forcedNotFound") {
       return {
         external: false,
         force: true,
@@ -180,24 +169,22 @@ var RedirectsHandler = class {
         hiddenProxy: false,
         redirect: false,
         statusCode: 404,
-        target: new URL(""),
+        target: new URL(request.url),
         targetRelative: ""
       };
     }
     const requestURL = new URL(request.url);
-    const headers = {
-      ...rule.force404 ? {} : rule.proxyHeaders
-    };
+    const headers = { ...rule.proxyHeaders };
     const hiddenProxy = Object.entries(headers).some(
       ([key, val]) => key.toLowerCase() === "x-nf-hidden-proxy" && val === "true"
     );
     const target = new URL(rule.to, request.url);
     const match = {
-      external: "to" in rule && /^https?:\/\//.exec(rule.to) != null,
+      external: /^https?:\/\//.exec(rule.to) != null,
       force: rule.force,
       headers,
       hiddenProxy,
-      redirect: "status" in rule && rule.status != null && rule.status >= 300 && rule.status <= 400,
+      redirect: rule.status >= 300 && rule.status <= 400,
       statusCode: rule.status,
       target,
       targetRelative: `${rule.to}${requestURL.search}${requestURL.hash}`
@@ -207,8 +194,9 @@ var RedirectsHandler = class {
         target.searchParams.append(key, val);
       });
     }
-    if (rule.signingSecret) {
-      const signingSecretVar = process.env[rule.signingSecret];
+    const signingSecretName = rule.signer?.jwtSecret;
+    if (signingSecretName) {
+      const signingSecretVar = process.env[signingSecretName];
       if (signingSecretVar) {
         match.headers["x-nf-sign"] = signRedirect({
           deployContext: "dev",
@@ -217,7 +205,7 @@ var RedirectsHandler = class {
           siteURL: this.siteURL
         });
       } else {
-        match.error = new Error(`Could not sign redirect because environment variable ${rule.signingSecret} is not set`);
+        match.error = new Error(`Could not sign redirect because environment variable ${signingSecretName} is not set`);
       }
     }
     return match;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/redirects",
-  "version": "4.0.4",
+  "version": "4.1.0",
   "description": "TypeScript implementation of Netlify's rewrites and redirects engine",
   "type": "module",
   "engines": {
@@ -43,9 +43,9 @@
   },
   "dependencies": {
     "@netlify/dev-utils": "6.0.3",
+    "@netlify/redirect-matcher": "^0.4.2",
     "@netlify/redirect-parser": "^16.1.1",
     "cookie": "^2.0.0",
-    "jsonwebtoken": "9.0.3",
-    "netlify-redirector": "^0.5.0"
+    "jsonwebtoken": "9.0.3"
   }
 }