next-ssr-middleware 0.8.9 → 0.9.0-rc.0

package/ReadMe.md

@@ -9,10 +9,11 @@
 
 ## Versions
 
-| SemVer  |    status    |    MobX     | [MobX i18n][6] |
-| :-----: | :----------: | :---------: | :------------: |
-| `>=0.7` | ✅developing |  `>=6.11`   |    `>=0.5`     |
-| `<0.7`  | ❌deprecated | `>=4 <6.11` |     `<0.5`     |
+|    SemVer    |    status    |  Next.js  |    MobX     | [MobX i18n][6] |
+| :----------: | :----------: | :-------: | :---------: | :------------: |
+|   `>=0.9`    | ✅developing |  `>=15`   |  `>=6.11`   |    `>=0.5`     |
+| `>=0.7 <0.9` | ❌deprecated | `>=9 <15` |  `>=6.11`   |    `>=0.5`     |
+|    `<0.7`    | ❌deprecated | `>=9 <15` | `>=4 <6.11` |     `<0.5`     |
 
 ## Middlewares
 
@@ -26,7 +27,9 @@
 
 ## Usage
 
-### `pages/user/[id].tsx`
+### Page router
+
+#### `pages/user/[id].tsx`
 
 ```tsx
 import {
@@ -74,6 +77,47 @@ export default function UserDetailPage({
 }
 ```
 
+### App router
+
+#### `middleware.ts`
+
+```ts
+import { NextRequest, NextResponse } from 'next/server';
+import { middlewareMatcher, parseHeaders } from 'next-ssr-middleware';
+
+export const config = { matcher: middlewareMatcher };
+
+export const middleware = ({ headers }: NextRequest) =>
+    NextResponse.next({ headers: parseHeaders(headers) });
+```
+
+#### `app/page.tsx`
+
+```tsx
+import { compose, withMiddleware, ServerProps } from 'next-ssr-middleware';
+
+const getServerSideProps = compose(async () => {
+    const props = await (
+        await fetch('https://api.github.com/orgs/idea2app')
+    ).json();
+
+    return { props };
+});
+
+const HomePage = withMiddleware(getServerSideProps, Home);
+
+export default HomePage;
+
+async function Home({ params, searchParams, ...props }: ServerProps) {
+    return (
+        <>
+            <h1>Home</h1>
+            <pre>{JSON.stringify(props, null, 4)}</pre>
+        </>
+    );
+}
+```
+
 ## Cases
 
 1. https://github.com/idea2app/Next-Bootstrap-ts

package/dist/compose.js

@@ -9,7 +9,7 @@ function compose() {
         middlewares[_i] = arguments[_i];
     }
     return (function (context) {
-        var first = middlewares[0], rest = middlewares.slice(1);
+        var _a = tslib_1.__read(middlewares), first = _a[0], rest = _a.slice(1);
         var next = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             var _a;
             return tslib_1.__generator(this, function (_b) {

package/dist/compose.js.map

@@ -1 +1 @@
-{"version":3,"file":"compose.js","sourceRoot":"","sources":["../source/compose.ts"],"names":[],"mappings":";;AAaA,0BAcC;;AAdD,SAAgB,OAAO;IAAvB,iBAcC;IAVC,qBAAkC;SAAlC,UAAkC,EAAlC,qBAAkC,EAAlC,IAAkC;QAAlC,gCAAkC;;IAChC,OAAO,CAAC,UAAA,OAAO;QACJ,IAAA,KAAK,GAAa,WAAW,GAAxB,EAAK,IAAI,GAAI,WAAW,SAAf,CAAgB;QAErC,IAAM,IAAI,GAAG;;;;4BACR,qBAAM,CAAA,MAAA,IAAI,CAAC,KAAK,EAAE,0CAAG,OAAO,EAAE,IAAI,CAAC,CAAA,EAAA;4BAApC,sBAAA,CAAC,SAAmC,CAAC;4BACpC,EAAE,KAAK,EAAE,EAAE,EAAkC,EAAA;;;aAAA,CAAC;QAEnD,OAAO,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC,CAAM,CAAC;AACZ,CAAC"}
+{"version":3,"file":"compose.js","sourceRoot":"","sources":["../source/compose.ts"],"names":[],"mappings":";;AAaA,0BAcC;;AAdD,SAAgB,OAAO;IAAvB,iBAcC;IAVC,qBAAkC;SAAlC,UAAkC,EAAlC,qBAAkC,EAAlC,IAAkC;QAAlC,gCAAkC;;IAChC,OAAO,CAAC,UAAA,OAAO;QACL,IAAA,KAAA,eAAmB,WAAW,CAAA,EAA7B,KAAK,QAAA,EAAK,IAAI,cAAe,CAAC;QAErC,IAAM,IAAI,GAAG;;;;4BACR,qBAAM,CAAA,MAAA,IAAI,CAAC,KAAK,EAAE,0CAAG,OAAO,EAAE,IAAI,CAAC,CAAA,EAAA;4BAApC,sBAAA,CAAC,SAAmC,CAAC;4BACpC,EAAE,KAAK,EAAE,EAAE,EAAkC,EAAA;;;aAAA,CAAC;QAEnD,OAAO,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC,CAAM,CAAC;AACZ,CAAC"}

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export * from './compose';
 export * from './middleware';
+export * from './shim';

package/dist/index.js

@@ -3,4 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./compose"), exports);
 tslib_1.__exportStar(require("./middleware"), exports);
+tslib_1.__exportStar(require("./shim"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";;;AAAA,oDAA0B;AAC1B,uDAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";;;AAAA,oDAA0B;AAC1B,uDAA6B;AAC7B,iDAAuB"}

package/dist/middleware/local.js

@@ -80,10 +80,20 @@ function cache(oneInterval, allInterval) {
     if (oneInterval === void 0) { oneInterval = 30 * web_utility_1.Second; }
     if (allInterval === void 0) { allInterval = web_utility_1.Day; }
     function cleanCache() {
-        for (var _i = 0, _a = Object.entries(serverRenderCache); _i < _a.length; _i++) {
-            var _b = _a[_i], URI = _b[0], expiredAt = _b[1].expiredAt;
-            if (Date.now() - expiredAt > allInterval)
-                delete serverRenderCache[URI];
+        var e_1, _a;
+        try {
+            for (var _b = tslib_1.__values(Object.entries(serverRenderCache)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var _d = tslib_1.__read(_c.value, 2), URI = _d[0], expiredAt = _d[1].expiredAt;
+                if (Date.now() - expiredAt > allInterval)
+                    delete serverRenderCache[URI];
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_1) throw e_1.error; }
         }
     }
     return (function (context, next) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
@@ -120,7 +130,7 @@ function translator(i18n) {
             switch (_e.label) {
                 case 0:
                     _c = cookies.language, language = _c === void 0 ? '' : _c, languages = (0, mobx_i18n_1.parseLanguageHeader)(headers['accept-language'] || '');
-                    return [4 /*yield*/, i18n.loadLanguages(tslib_1.__spreadArray([language], languages, true).filter(Boolean))];
+                    return [4 /*yield*/, i18n.loadLanguages(tslib_1.__spreadArray([language], tslib_1.__read(languages), false).filter(Boolean))];
                 case 1:
                     _e.sent();
                     return [2 /*return*/, next()];

package/dist/middleware/local.js.map

@@ -1 +1 @@
-{"version":3,"file":"local.js","sourceRoot":"","sources":["../../source/middleware/local.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"local.js","sourceRoot":"","sources":["../../source/middleware/local.ts"],"names":[],"mappings":"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"}

package/dist/middleware/remote.d.ts

@@ -1,7 +1,7 @@
 import { DataObject, Middleware } from '../compose';
 export type OAuth2Ticket = {
     code: string;
-    state?: string;
+    state: string;
     [key: string]: string;
 };
 export interface OAuth2Option {

package/dist/middleware/remote.js

@@ -10,23 +10,23 @@ function oauth2Signer(_a) {
     var _this = this;
     var signInURL = _a.signInURL, accessToken = _a.accessToken, userProfile = _a.userProfile, _b = _a.tokenKey, tokenKey = _b === void 0 ? 'token' : _b;
     return function (_a, next_1) { return tslib_1.__awaiter(_this, [_a, next_1], void 0, function (_b, next) {
-        var token, pageURL, token_1, user, data, props, _c;
+        var token, pageURL, token_1, searchParams, user, data, props, _c;
         var _d = _b.req, url = _d.url, headers = _d.headers, cookies = _d.cookies, query = _b.query, res = _b.res;
         return tslib_1.__generator(this, function (_e) {
             switch (_e.label) {
                 case 0:
                     token = cookies[tokenKey];
-                    pageURL = new URL(url || '/', headers['origin'] || Host) + '';
+                    pageURL = new URL(url || '/', headers['origin'] || Host);
                     if (!query.code) return [3 /*break*/, 2];
                     return [4 /*yield*/, accessToken(query)];
                 case 1:
-                    token_1 = _e.sent();
+                    token_1 = _e.sent(), searchParams = pageURL.searchParams;
                     res.setHeader('Set-Cookie', "token=".concat(token_1, "; Path=/"));
+                    searchParams.delete('code');
+                    if (searchParams.get('state') === '')
+                        searchParams.delete('state');
                     return [2 /*return*/, {
-                            redirect: {
-                                destination: pageURL.split('?')[0],
-                                permanent: false
-                            },
+                            redirect: { destination: pageURL + '', permanent: false },
                             props: {}
                         }];
                 case 2:

package/dist/middleware/remote.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../source/middleware/remote.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../source/middleware/remote.ts"],"names":[],"mappings":"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"}

package/dist/shim.d.ts

@@ -0,0 +1,15 @@
+import { NextRequest } from 'next/server';
+import { GetServerSideProps } from 'next/types';
+import { ParsedUrlQuery } from 'querystring';
+import type { ReactNode } from 'react';
+/**
+ * Matcher ignoring `/_next/`, `/api/` & icons
+ */
+export declare const middlewareMatcher: string[];
+export declare function patchHeaders(request: NextRequest): Headers;
+export type ServerProps<I extends Record<string, string> = {}, O extends object = {}> = O & {
+    params: Promise<I>;
+    searchParams: Promise<ParsedUrlQuery>;
+};
+export type ServerComponent<I extends Record<string, string> = {}, O extends object = {}> = (props: ServerProps<I, O>) => Promise<ReactNode>;
+export declare const withMiddleware: <I extends Record<string, string> = {}, O extends object = {}>(getServerSideProps: GetServerSideProps<O, I>, ServerSideComponent: ServerComponent<I, O>) => ServerComponent<I>;

package/dist/shim.js

@@ -0,0 +1,92 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withMiddleware = exports.middlewareMatcher = void 0;
+exports.patchHeaders = patchHeaders;
+var tslib_1 = require("tslib");
+var headers_1 = require("next/headers");
+var navigation_1 = require("next/navigation");
+/**
+ * Matcher ignoring `/_next/`, `/api/` & icons
+ */
+exports.middlewareMatcher = [
+    '/((?!api|_next/static|_next/image|favicon.ico|apple-icon|icon).*)'
+];
+function patchHeaders(request) {
+    var _a;
+    var resolvedUrl = request.nextUrl + '', _b = request.nextUrl, locale = _b.locale, _c = _b.defaultLocale, defaultLocale = _c === void 0 ? '' : _c, domainLocale = _b.domainLocale, headers = new Headers(request.headers);
+    var locales = ((_a = domainLocale === null || domainLocale === void 0 ? void 0 : domainLocale.locales) === null || _a === void 0 ? void 0 : _a.join(',')) || locale;
+    headers.set('x-resolved-url', resolvedUrl);
+    headers.set('x-locale', locale);
+    headers.set('x-locales', locales);
+    headers.set('x-default-locale', defaultLocale);
+    return headers;
+}
+var withMiddleware = function (getServerSideProps, ServerSideComponent) {
+    return function (_a) { return tslib_1.__awaiter(void 0, [_a], void 0, function (_b) {
+        var resolvedParams, resolvedSearchParams, header, cookie, isEnabled, resolvedUrl, locale, locales, defaultLocale, req, context, result, isPermanent, destination, props;
+        var _c;
+        var params = _b.params, searchParams = _b.searchParams;
+        return tslib_1.__generator(this, function (_d) {
+            switch (_d.label) {
+                case 0: return [4 /*yield*/, params];
+                case 1:
+                    resolvedParams = _d.sent();
+                    return [4 /*yield*/, searchParams];
+                case 2:
+                    resolvedSearchParams = _d.sent();
+                    return [4 /*yield*/, (0, headers_1.headers)()];
+                case 3:
+                    header = _d.sent();
+                    return [4 /*yield*/, (0, headers_1.cookies)()];
+                case 4:
+                    cookie = _d.sent();
+                    return [4 /*yield*/, (0, headers_1.draftMode)()];
+                case 5:
+                    isEnabled = (_d.sent()).isEnabled;
+                    resolvedUrl = header.get('x-resolved-url') || '', locale = header.get('x-locale') || '', locales = ((_c = header.get('x-locales')) === null || _c === void 0 ? void 0 : _c.split(',')) || [], defaultLocale = header.get('x-default-locale') || '';
+                    req = {
+                        headers: Object.fromEntries(tslib_1.__spreadArray([], tslib_1.__read(header), false)),
+                        cookies: Object.fromEntries(cookie.getAll().map(function (_a) {
+                            var name = _a.name, value = _a.value;
+                            return [name, value];
+                        }))
+                    };
+                    context = {
+                        req: req,
+                        res: {},
+                        params: resolvedParams,
+                        query: resolvedSearchParams,
+                        preview: false,
+                        previewData: {},
+                        draftMode: isEnabled,
+                        resolvedUrl: resolvedUrl,
+                        locale: locale,
+                        locales: locales,
+                        defaultLocale: defaultLocale
+                    };
+                    return [4 /*yield*/, getServerSideProps(context)];
+                case 6:
+                    result = _d.sent();
+                    if ('redirect' in result) {
+                        isPermanent = 'statusCode' in result.redirect
+                            ? result.redirect.statusCode === 308
+                            : 'permanent' in result.redirect &&
+                                result.redirect.permanent;
+                        destination = result.redirect.destination;
+                        if (isPermanent)
+                            (0, navigation_1.permanentRedirect)(destination);
+                        else
+                            (0, navigation_1.redirect)(destination);
+                    }
+                    if (!('props' in result)) return [3 /*break*/, 8];
+                    return [4 /*yield*/, result.props];
+                case 7:
+                    props = _d.sent();
+                    return [2 /*return*/, ServerSideComponent(tslib_1.__assign({ params: params, searchParams: searchParams }, props))];
+                case 8: return [2 /*return*/];
+            }
+        });
+    }); };
+};
+exports.withMiddleware = withMiddleware;
+//# sourceMappingURL=shim.js.map

package/dist/shim.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shim.js","sourceRoot":"","sources":["../source/shim.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "next-ssr-middleware",
-    "version": "0.8.9",
+    "version": "0.9.0-rc.0",
     "license": "LGPL-3.0-or-later",
     "author": "shiy2008@gmail.com",
     "description": "Koa-like middlewares for Next.js Server Side Rendering",
@@ -24,24 +24,26 @@
     "dependencies": {
         "jsonwebtoken": "^9.0.2",
         "tslib": "^2.8.1",
-        "web-utility": "^4.4.1"
+        "web-utility": "^4.4.3"
     },
     "peerDependencies": {
+        "@types/react": ">=18",
         "mobx-i18n": ">=0.5 <1",
         "next": ">=9.3"
     },
     "devDependencies": {
-        "@types/jsonwebtoken": "^9.0.7",
-        "@types/node": "^20.17.6",
-        "husky": "^9.1.6",
-        "koajax": "^3.0.3",
-        "lint-staged": "^15.2.10",
+        "@types/jsonwebtoken": "^9.0.9",
+        "@types/node": "^22.14.0",
+        "@types/react": "^19.1.0",
+        "husky": "^9.1.7",
+        "koajax": "^3.1.2",
+        "lint-staged": "^15.5.0",
         "mobx-i18n": "^0.6.0",
-        "next": "^15.0.2",
+        "next": "^15.2.4",
         "open-cli": "^8.0.0",
-        "prettier": "^3.3.3",
-        "typedoc": "^0.26.11",
-        "typescript": "~5.6.3"
+        "prettier": "^3.5.3",
+        "typedoc": "^0.28.1",
+        "typescript": "~5.8.2"
     },
     "prettier": {
         "singleQuote": true,

package/source/index.ts

@@ -1,2 +1,3 @@
 export * from './compose';
 export * from './middleware';
+export * from './shim';

package/source/middleware/remote.ts

@@ -4,7 +4,7 @@ import { DataObject, Middleware } from '../compose';
 
 export type OAuth2Ticket = {
     code: string;
-    state?: string;
+    state: string;
     [key: string]: string;
 };
 
@@ -31,18 +31,19 @@ export function oauth2Signer<I extends DataObject, O extends DataObject = {}>({
 }: OAuth2Option): Middleware<I, O> {
     return async ({ req: { url, headers, cookies }, query, res }, next) => {
         const token = cookies[tokenKey];
-        const pageURL = new URL(url || '/', headers['origin'] || Host) + '';
+        const pageURL = new URL(url || '/', headers['origin'] || Host);
 
         if (query.code) {
-            const token = await accessToken(query as OAuth2Ticket);
+            const token = await accessToken(query as OAuth2Ticket),
+                { searchParams } = pageURL;
 
             res.setHeader('Set-Cookie', `token=${token}; Path=/`);
 
+            searchParams.delete('code');
+            if (searchParams.get('state') === '') searchParams.delete('state');
+
             return {
-                redirect: {
-                    destination: pageURL.split('?')[0],
-                    permanent: false
-                },
+                redirect: { destination: pageURL + '', permanent: false },
                 props: {} as O
             };
         }

package/source/shim.ts

@@ -0,0 +1,102 @@
+import { IncomingMessage, ServerResponse } from 'http';
+import { NextApiRequestCookies } from 'next/dist/server/api-utils';
+import { cookies, draftMode, headers } from 'next/headers';
+import { permanentRedirect, redirect } from 'next/navigation';
+import { NextRequest } from 'next/server';
+import {
+    GetServerSideProps,
+    GetServerSidePropsContext,
+    PreviewData
+} from 'next/types';
+import { ParsedUrlQuery } from 'querystring';
+import type { ReactNode } from 'react';
+
+/**
+ * Matcher ignoring `/_next/`, `/api/` & icons
+ */
+export const middlewareMatcher = [
+    '/((?!api|_next/static|_next/image|favicon.ico|apple-icon|icon).*)'
+];
+
+export function patchHeaders(request: NextRequest) {
+    const resolvedUrl = request.nextUrl + '',
+        { locale, defaultLocale = '', domainLocale } = request.nextUrl,
+        headers = new Headers(request.headers);
+    const locales = domainLocale?.locales?.join(',') || locale;
+
+    headers.set('x-resolved-url', resolvedUrl);
+    headers.set('x-locale', locale);
+    headers.set('x-locales', locales);
+    headers.set('x-default-locale', defaultLocale);
+
+    return headers;
+}
+
+export type ServerProps<
+    I extends Record<string, string> = {},
+    O extends object = {}
+> = O & {
+    params: Promise<I>;
+    searchParams: Promise<ParsedUrlQuery>;
+};
+
+export type ServerComponent<
+    I extends Record<string, string> = {},
+    O extends object = {}
+> = (props: ServerProps<I, O>) => Promise<ReactNode>;
+
+export const withMiddleware =
+    <I extends Record<string, string> = {}, O extends object = {}>(
+        getServerSideProps: GetServerSideProps<O, I>,
+        ServerSideComponent: ServerComponent<I, O>
+    ): ServerComponent<I> =>
+    async ({ params, searchParams }) => {
+        const resolvedParams = await params,
+            resolvedSearchParams = await searchParams,
+            header = await headers(),
+            cookie = await cookies(),
+            { isEnabled } = await draftMode();
+
+        const resolvedUrl = header.get('x-resolved-url') || '',
+            locale = header.get('x-locale') || '',
+            locales = header.get('x-locales')?.split(',') || [],
+            defaultLocale = header.get('x-default-locale') || '';
+        const req = {
+            headers: Object.fromEntries([...header]),
+            cookies: Object.fromEntries(
+                cookie.getAll().map(({ name, value }) => [name, value])
+            )
+        } as IncomingMessage & { cookies: NextApiRequestCookies };
+
+        const context: GetServerSidePropsContext<I> = {
+            req,
+            res: {} as ServerResponse,
+            params: resolvedParams as I,
+            query: resolvedSearchParams,
+            preview: false,
+            previewData: {} as PreviewData,
+            draftMode: isEnabled,
+            resolvedUrl,
+            locale,
+            locales,
+            defaultLocale
+        };
+        const result = await getServerSideProps(context);
+
+        if ('redirect' in result) {
+            const isPermanent =
+                'statusCode' in result.redirect
+                    ? result.redirect.statusCode === 308
+                    : 'permanent' in result.redirect &&
+                      result.redirect.permanent;
+            const { destination } = result.redirect;
+
+            if (isPermanent) permanentRedirect(destination);
+            else redirect(destination);
+        }
+        if ('props' in result) {
+            const props = await result.props;
+
+            return ServerSideComponent({ params, searchParams, ...props });
+        }
+    };

package/tsconfig.json

@@ -1,6 +1,8 @@
 {
     "compilerOptions": {
+        "downlevelIteration": true,
         "importHelpers": true,
+        "lib": ["ESNext", "DOM", "DOM.Iterable"],
         "skipLibCheck": true,
         "declaration": true,
         "sourceMap": true,
@@ -10,7 +12,6 @@
     "typedocOptions": {
         "name": "Next SSR middleware",
         "excludeExternals": true,
-        "excludePrivate": true,
-        "readme": "ReadMe.md"
+        "excludePrivate": true
     }
 }