searvia-next 0.1.0 → 0.2.0

package/README.md

@@ -29,7 +29,7 @@ SEARVIA_WEBHOOK_URL=https://www.example.com/api/searvia  # optional, instant ref
 export { middleware } from 'searvia-next/middleware';
 ```
 
-Already have a middleware? Wrap your response: `return withSearviaPath(request, response)`.
+Already have a middleware? Wrap your response: `return withSearviaPath(request, response)`, and to apply approved redirects first add `const redirect = await searviaRedirect(request); if (redirect) return redirect;`.
 
 **2. Root layout** (`app/layout.tsx`):
 

package/dist/feed.d.ts

@@ -1,4 +1,4 @@
-export declare const VERSION = "0.1.0";
+export declare const VERSION = "0.2.0";
 export type Fix = {
     t: string;
     v: Record<string, any>;

package/dist/feed.js

@@ -1,5 +1,5 @@
 // Searvia fix feed: signed (HMAC-SHA256) list of approved fixes keyed by path. Works in the Node.js and Edge runtimes.
-export const VERSION = '0.1.0';
+export const VERSION = '0.2.0';
 export function config() {
     const [channel, secret] = (process.env.SEARVIA_SITE_KEY ?? '').split('.', 2);
     if (!channel || !secret || !/^[a-z0-9]{24}$/.test(channel)) {

package/dist/middleware.d.ts

@@ -1,9 +1,14 @@
 import { NextResponse, type NextRequest } from 'next/server';
 /** Request header that carries the current address to Server Components (App Router layouts do not know the path). */
 export declare const PATH_HEADER = "x-searvia-path";
+/**
+ * A redirect approved in Searvia (a broken or merged page) for this request, or null. Call it from your own middleware:
+ * `const redirect = await searviaRedirect(request); if (redirect) return redirect;`
+ */
+export declare function searviaRedirect(request: NextRequest): Promise<NextResponse | null>;
 /**
  * Middleware that passes the path to `searviaMetadata()` and `<SearviaHead />`. Use it as your middleware, or call it from
  * your own: `return withSearviaPath(request, NextResponse.next(...))`.
  */
 export declare function withSearviaPath(request: NextRequest, response?: NextResponse): NextResponse;
-export declare function middleware(request: NextRequest): NextResponse;
+export declare function middleware(request: NextRequest): Promise<NextResponse>;

package/dist/middleware.js

@@ -1,6 +1,42 @@
 import { NextResponse } from 'next/server';
+import { config, same, sign, VERSION } from './feed.js';
 /** Request header that carries the current address to Server Components (App Router layouts do not know the path). */
 export const PATH_HEADER = 'x-searvia-path';
+const TTL = 300_000;
+let cached = null;
+/** The fix list for redirects, kept in memory for five minutes (middleware fetches are not cached by Next.js). */
+async function feed() {
+    const settings = config();
+    if (!settings)
+        return null;
+    if (cached && Date.now() - cached.at < TTL)
+        return cached.feed;
+    try {
+        const response = await fetch(`${settings.base}/fixes/${settings.channel}/feed`, { headers: { 'User-Agent': `SearviaNext/${VERSION} (middleware)` } });
+        const body = response.ok ? await response.text() : '';
+        const valid = body !== '' && same(await sign(body, settings.secret), response.headers.get('x-searvia-signature') ?? '');
+        cached = { feed: valid ? JSON.parse(body) : (cached?.feed ?? null), at: Date.now() };
+    }
+    catch {
+        cached = { feed: cached?.feed ?? null, at: Date.now() };
+    }
+    return cached.feed;
+}
+/**
+ * A redirect approved in Searvia (a broken or merged page) for this request, or null. Call it from your own middleware:
+ * `const redirect = await searviaRedirect(request); if (redirect) return redirect;`
+ */
+export async function searviaRedirect(request) {
+    if (request.method !== 'GET')
+        return null;
+    const { pathname, search } = request.nextUrl;
+    const list = (await feed())?.fixes;
+    const fix = (list?.[pathname + search] ?? list?.[pathname] ?? []).find((item) => item.t === 'redirect');
+    if (!fix || typeof fix.v.href !== 'string')
+        return null;
+    const target = new URL(fix.v.href, request.url);
+    return target.href === request.nextUrl.href ? null : NextResponse.redirect(target, [301, 302, 308].includes(fix.v.status) ? fix.v.status : 301);
+}
 /**
  * Middleware that passes the path to `searviaMetadata()` and `<SearviaHead />`. Use it as your middleware, or call it from
  * your own: `return withSearviaPath(request, NextResponse.next(...))`.
@@ -12,6 +48,6 @@ export function withSearviaPath(request, response) {
     response?.headers.forEach((value, key) => next.headers.set(key, value));
     return next;
 }
-export function middleware(request) {
-    return withSearviaPath(request);
+export async function middleware(request) {
+    return (await searviaRedirect(request)) ?? withSearviaPath(request);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "searvia-next",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Apply the SEO fixes you approve in Searvia (titles, descriptions, canonical, robots, hreflang, structured data, alt text, internal links) to a Next.js App Router site.",
   "type": "module",
   "main": "./dist/index.js",