@edgeone/opennextjs-pages 0.1.7 → 0.1.9-beta.1

package/dist/build/functions/middleware/compiler.js

@@ -3797,11 +3797,26 @@ async function executeMiddleware({request}) {
     // 2. request.headers \u662F\u666E\u901A\u5BF9\u8C61\uFF08\u4F1A\u6267\u884C Object.entries(t.request.headers)\uFF09
     // 3. request.nextConfig \u5B58\u5728\uFF08\u7528\u4E8E\u521B\u5EFA NextURL\uFF09
     
+    // \u8C03\u7528 middleware
+    // Turbopack \u7684 middleware \u5305\u88C5\u5668\u671F\u671B\u4E00\u4E2A\u7279\u6B8A\u7684\u53C2\u6570\u5BF9\u8C61
+    
+    // \u6784\u9020 Turbopack \u671F\u671B\u7684\u8BF7\u6C42\u53C2\u6570
+    // \u5173\u952E\uFF1ATurbopack \u7684 to \u51FD\u6570\u671F\u671B\uFF1A
+    // 1. request.url \u662F\u53EF\u5199\u7684\uFF08\u4F1A\u6267\u884C t.request.url = t.request.url.replace(...)\uFF09
+    // 2. request.headers \u662F\u666E\u901A\u5BF9\u8C61\uFF08\u4F1A\u6267\u884C Object.entries(t.request.headers)\uFF09
+    // 3. request.nextConfig \u5B58\u5728\uFF08\u7528\u4E8E\u521B\u5EFA NextURL\uFF09
+    
     // \u5C06 Headers \u8F6C\u6362\u4E3A\u666E\u901A\u5BF9\u8C61
+    // \u622A\u65AD\u8D85\u8FC7 4095 \u5B57\u8282\u7684 header \u503C\uFF08EdgeOne \u8FD0\u884C\u65F6\u9650\u5236\uFF09
+    // \u4F8B\u5982 CDN \u6CE8\u5165\u7684 XX-Script-Ssl-Info (5331 bytes) \u4F1A\u5BFC\u81F4
+    // Turbopack \u5185\u90E8 set x-middleware-request-* \u65F6\u8D85\u9650\u62A5\u9519
     const headersObj = {};
     request.headers.forEach((value, key) => {
-      headersObj[key] = value;
+      // \u622A\u65AD\u5230 4095 \u5B57\u8282\uFF0C\u907F\u514D\u4E22\u5931\u6574\u4E2A header
+      headersObj[key] = value.length > 4095 ? value.substring(0, 4095) : value;
     });
+
+
     
     // \u6CE8\u5165 geo \u548C clientIp \u5230 headers \u4E2D
     // Next.js 15+ \u79FB\u9664\u4E86 request.geo \u548C request.ip\uFF0C\u7528\u6237\u9700\u8981\u4ECE headers \u4E2D\u8BFB\u53D6

package/dist/build/functions/middleware/wrapper.js

@@ -276,10 +276,10 @@ function matchesPath(pathname, matcher) {
             // \u68C0\u67E5\u4FEE\u9970\u7B26
             if (ci < p.length && p[ci] === '*') {
               // :param* -> \u96F6\u4E2A\u6216\u591A\u4E2A\u8DEF\u5F84\u6BB5\uFF0C\u524D\u9762\u7684 / \u4E5F\u53D8\u4E3A\u53EF\u9009
-              if (regexPattern.endsWith('\\/')) {
+              if (regexPattern.endsWith('\\\\/')) {
                 regexPattern = regexPattern.slice(0, -2);
               }
-              regexPattern += '(?:\\/.*)?';
+              regexPattern += '(?:\\\\/.*)?';
               ci++;
             } else if (ci < p.length && p[ci] === '+') {
               // :param+ -> \u4E00\u4E2A\u6216\u591A\u4E2A\u8DEF\u5F84\u6BB5
@@ -290,7 +290,7 @@ function matchesPath(pathname, matcher) {
               regexPattern += '[^/]+';
             }
           } else if (p[ci] === '/') {
-            regexPattern += '\\/';
+            regexPattern += '\\\\/';
             ci++;
           } else if (p[ci] === '*') {
             if (ci + 1 < p.length && p[ci + 1] === '*') {
@@ -305,7 +305,7 @@ function matchesPath(pathname, matcher) {
             const ch = p[ci];
             const specialChars = '.+?^$|(){}[]\\\\';
             if (specialChars.indexOf(ch) !== -1) {
-              regexPattern += '\\' + ch;
+              regexPattern += '\\\\' + ch;
             } else {
               regexPattern += ch;
             }

package/dist/build/image-optimization.js

@@ -0,0 +1,147 @@
+
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
+        return createRequire(import.meta.url);
+      })();
+    
+import "../esm-chunks/chunk-6BT4RYQJ.js";
+
+// src/build/image-optimization.ts
+import { existsSync, readFileSync, writeFileSync, renameSync, unlinkSync, mkdirSync } from "node:fs";
+import { join } from "node:path";
+var IMAGE_LOADER_CONTENT = `'use client'
+
+export default function edgeoneImageLoader({ src, width, quality }) {
+  // \u5916\u90E8\u56FE\u7247\uFF08http/https \u5F00\u5934\uFF09\u4E0D\u8D70\u4E07\u8C61\u5904\u7406\uFF0C\u56DE\u9000\u5230\u9ED8\u8BA4\u884C\u4E3A
+  // if (src.startsWith('http://') || src.startsWith('https://') || src.startsWith('//')) {
+  //   return '/_next/image?url=' + encodeURIComponent(src) + '&w=' + (width || 0) + '&q=' + (quality || 75);
+  // }
+
+  // \u8DF3\u8FC7 SVG/GIF/ICO\uFF08\u4E0D\u9002\u5408\u5149\u6805\u4F18\u5316\uFF09
+  var ext = src.split('?')[0].split('#')[0].split('.').pop();
+  if (ext && ['svg', 'gif', 'ico'].indexOf(ext.toLowerCase()) !== -1) {
+    return src;
+  }
+
+  var q = quality || 75;
+  var params = [];
+  if (width) params.push('thumbnail/' + width + 'x');
+  params.push('quality/' + q);
+  params.push('format/webp');
+
+  var sep = src.indexOf('?') !== -1 ? '&' : '?';
+  return src + sep + 'imageMogr2/' + params.join('/');
+}
+`;
+function findNextConfig(cwd) {
+  const candidates = ["next.config.ts", "next.config.mts", "next.config.js", "next.config.mjs"];
+  for (const name of candidates) {
+    const fullPath = join(cwd, name);
+    if (existsSync(fullPath)) {
+      const ext = name.replace("next.config", "");
+      return { path: fullPath, ext };
+    }
+  }
+  return null;
+}
+function getBackupMarker(cwd) {
+  return join(cwd, ".edgeone", ".image-loader-injected");
+}
+function generateWrapperConfig(ext, importPath) {
+  const isTS = ext.includes("ts");
+  const isMJS = ext.includes("mjs") || ext.includes("mts");
+  if (isTS) {
+    return `import originalConfig from '${importPath}'
+import type { NextConfig } from 'next'
+
+const config: NextConfig = {
+  ...originalConfig as any,
+  images: {
+    ...(originalConfig as any)?.images,
+    loader: 'custom',
+    loaderFile: './.edgeone/cloud-functions/ssr-node/image-loader.mjs',
+  },
+};
+
+export default config;
+`;
+  }
+  if (isMJS) {
+    return `import originalConfig from '${importPath}';
+
+const config = {
+  ...originalConfig,
+  images: {
+    ...originalConfig?.images,
+    loader: 'custom',
+    loaderFile: './.edgeone/cloud-functions/ssr-node/image-loader.mjs',
+  },
+};
+
+export default config;
+`;
+  }
+  return `const originalConfig = require('${importPath}');
+const resolved = originalConfig.default || originalConfig;
+
+module.exports = {
+  ...resolved,
+  images: {
+    ...resolved?.images,
+    loader: 'custom',
+    loaderFile: './.edgeone/cloud-functions/ssr-node/image-loader.mjs',
+  },
+};
+`;
+}
+function injectImageLoader(cwd) {
+  const loaderDir = join(cwd, ".edgeone", "cloud-functions", "ssr-node");
+  if (!existsSync(loaderDir)) {
+    mkdirSync(loaderDir, { recursive: true });
+  }
+  const loaderPath = join(loaderDir, "image-loader.mjs");
+  writeFileSync(loaderPath, IMAGE_LOADER_CONTENT, "utf-8");
+  const config = findNextConfig(cwd);
+  if (!config) {
+    console.log("[opennext] next.config not found, skipping image loader injection");
+    return;
+  }
+  const originalContent = readFileSync(config.path, "utf-8");
+  if (originalContent.includes("loaderFile")) {
+    console.log("[opennext] images.loaderFile already configured, skipping injection");
+    return;
+  }
+  const configDir = config.path.substring(0, config.path.lastIndexOf("/"));
+  const backupPath = join(configDir, `next.config.original${config.ext}`);
+  renameSync(config.path, backupPath);
+  const isTS = config.ext.includes("ts");
+  const importPath = isTS ? "./next.config.original" : `./next.config.original${config.ext}`;
+  writeFileSync(config.path, generateWrapperConfig(config.ext, importPath), "utf-8");
+  writeFileSync(getBackupMarker(cwd), JSON.stringify({
+    configPath: config.path,
+    backupPath,
+    ext: config.ext
+  }), "utf-8");
+  console.log("[opennext] Image optimization loader injected");
+}
+function restoreNextConfig(cwd) {
+  const markerPath = getBackupMarker(cwd);
+  if (!existsSync(markerPath)) {
+    return;
+  }
+  try {
+    const info = JSON.parse(readFileSync(markerPath, "utf-8"));
+    if (existsSync(info.backupPath)) {
+      unlinkSync(info.configPath);
+      renameSync(info.backupPath, info.configPath);
+    }
+    unlinkSync(markerPath);
+    console.log("[opennext] Restored original next.config");
+  } catch (e) {
+    console.warn("[opennext] Failed to restore next.config:", e);
+  }
+}
+export {
+  injectImageLoader,
+  restoreNextConfig
+};

package/dist/build/routes.js

@@ -354,23 +354,12 @@ var createRouteMeta = async (ctx) => {
     fs.mkdirSync(serverHandlerDir, { recursive: true });
   }
   const nextVersion = ctx.nextVersion || null;
-  const imagesManifest = await ctx.getImagesManifest();
-  const updatedRedirects = [];
-  if (imagesManifest?.images?.path) {
-    const imagePath = imagesManifest.images.path;
-    const nextImageRedirect = {
-      source: `${imagePath}\\?url=*`,
-      destination: ":splat",
-      statusCode: 302
-    };
-    updatedRedirects.push(nextImageRedirect);
-  }
   const config = {
     version: 3,
     routes,
-    conf: {
-      redirects: updatedRedirects
-    },
+    // conf: {
+    //   redirects: updatedRedirects
+    // },
     ...nextVersion ? { framework: { version: nextVersion } } : {}
   };
   const configFilePath = path.join(serverHandlerDir, "config.json");

package/dist/index.js

@@ -19,8 +19,11 @@ import { compileMiddleware } from "./build/functions/middleware/middleware.js";
 import { createServerHandler } from "./build/functions/server.js";
 import { PluginContext } from "./build/plugin-context.js";
 import { createRouteMeta } from "./build/routes.js";
+import { injectImageLoader, restoreNextConfig } from "./build/image-optimization.js";
 var onPreBuild = async (options) => {
   process.env.NEXT_PRIVATE_STANDALONE = "true";
+  const cwd = options.cwd || process.cwd();
+  injectImageLoader(cwd);
 };
 var onBuild = async (options) => {
   const ctx = new PluginContext(options);
@@ -43,6 +46,8 @@ var onBuild = async (options) => {
 var onPostBuild = async (options) => {
   const ctx = new PluginContext(options);
   await compileMiddleware(ctx);
+  const cwd = options.cwd || process.cwd();
+  restoreNextConfig(cwd);
 };
 export {
   onBuild,

package/dist/run/handlers/tags-handler.cjs

@@ -28,7 +28,7 @@ module.exports = __toCommonJS(tags_handler_exports);
 
 // package.json
 var name = "@edgeone/opennextjs-pages";
-var version = "0.1.7";
+var version = "0.1.9-beta.1";
 
 // src/run/handlers/tags-handler.cts
 var import_request_context = require("./request-context.cjs");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgeone/opennextjs-pages",
-  "version": "0.1.7",
+  "version": "0.1.9-beta.1",
   "description": "",
   "main": "./dist/index.js",
   "type": "module",