@edgeone/opennextjs-pages 0.0.9-beta.1 → 0.0.9

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

@@ -2356,17 +2356,10 @@ function transformForEdgeOneRuntime(code) {
     const patchedConstructor = `class ${className} extends ${parentClass}{constructor(${paramName}){super(${paramName}.input,${paramName}.init),this.sourcePage=${paramName}.page;var __k="__edgeone_nextInternal",__self=this;if(this[__k]){Object.defineProperty(this,"nextUrl",{get:function(){return __self[__k]?__self[__k].nextUrl:undefined},enumerable:true,configurable:true});Object.defineProperty(this,"cookies",{get:function(){return __self[__k]?__self[__k].cookies:undefined},enumerable:true,configurable:true})}}`;
     return patchedConstructor;
   });
-  const baseClassInternalAssignPattern = /this\[(\w+)\]\s*=\s*\{\s*cookies\s*:\s*new\s+([\w.]+)\.RequestCookies\s*\(\s*this\.headers\s*\)\s*,\s*nextUrl\s*:\s*(\w+)\s*,\s*url\s*:\s*\3\.toString\s*\(\s*\)\s*\}/g;
-  transformed = transformed.replace(baseClassInternalAssignPattern, (match, internalVar, cookiesModule, nextUrlVar) => {
+  const baseClassInternalAssignPattern = /this\[(\w+)\]\s*=\s*\{\s*cookies\s*:\s*new\s+\w+\.RequestCookies\s*\(\s*this\.headers\s*\)\s*,\s*nextUrl\s*:\s*(\w+)\s*,\s*url\s*:\s*\2\.toString\s*\(\s*\)\s*\}/g;
+  transformed = transformed.replace(baseClassInternalAssignPattern, (match, internalVar, _nextUrlVar) => {
     transformCount++;
-    const patchedAssignment = `Object.defineProperty(this,${internalVar},{value:{cookies:new ${cookiesModule}.RequestCookies(this.headers),nextUrl:${nextUrlVar},url:${nextUrlVar}.toString()},writable:true,enumerable:true,configurable:true});var __self=this;Object.defineProperty(this,"nextUrl",{get:function(){return __self[${internalVar}]?__self[${internalVar}].nextUrl:undefined},enumerable:true,configurable:true});Object.defineProperty(this,"cookies",{get:function(){return __self[${internalVar}]?__self[${internalVar}].cookies:undefined},enumerable:true,configurable:true})`;
-    return patchedAssignment;
-  });
-  const baseClassInternalAssignPatternMultiline = /this\[(\w+)\]\s*=\s*\{\s*cookies\s*:\s*new\s+[\w.]+\.RequestCookies\s*\(\s*this\.headers\s*\)\s*,\s*geo\s*:\s*[^,]+,\s*ip\s*:\s*[^,]+,\s*nextUrl\s*,\s*url\s*:\s*[^}]+\}/g;
-  transformed = transformed.replace(baseClassInternalAssignPatternMultiline, (match, internalVar) => {
-    transformCount++;
-    const objContent = match.replace(/^this\[\w+\]\s*=\s*/, "");
-    const patchedAssignment = `Object.defineProperty(this,${internalVar},{value:${objContent},writable:true,enumerable:true,configurable:true});var __self=this;Object.defineProperty(this,"nextUrl",{get:function(){return __self[${internalVar}]?__self[${internalVar}].nextUrl:undefined},enumerable:true,configurable:true});Object.defineProperty(this,"cookies",{get:function(){return __self[${internalVar}]?__self[${internalVar}].cookies:undefined},enumerable:true,configurable:true});Object.defineProperty(this,"geo",{get:function(){return __self[${internalVar}]?__self[${internalVar}].geo:undefined},enumerable:true,configurable:true});Object.defineProperty(this,"ip",{get:function(){return __self[${internalVar}]?__self[${internalVar}].ip:undefined},enumerable:true,configurable:true})`;
+    const patchedAssignment = match + `;var __self=this;Object.defineProperty(this,"nextUrl",{get:function(){return __self[${internalVar}]?__self[${internalVar}].nextUrl:undefined},enumerable:true,configurable:true});Object.defineProperty(this,"cookies",{get:function(){return __self[${internalVar}]?__self[${internalVar}].cookies:undefined},enumerable:true,configurable:true})`;
     return patchedAssignment;
   });
   const responseInternalAssignPattern = /this\[(\w+)\]\s*=\s*\{\s*cookies\s*:\s*(\w+)\s*,\s*url\s*:\s*([^}]+)\}/g;

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

@@ -32,8 +32,9 @@ var compileMiddleware = async (ctx) => {
     }
   }
   if (!middlewareFilePath) {
-    console.log("[Middleware Compiler] No middleware.js found, skipping middleware compilation.");
-    return null;
+    console.error("[Middleware Compiler] Could not find middleware.js in any of the expected locations:");
+    possiblePaths.forEach((p) => console.error("  -", p));
+    throw new Error("middleware.js not found");
   }
   const result = await compile(middlewareFilePath, {
     env: { DEBUG: "true" }

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

@@ -292,36 +292,48 @@ async function executeMiddleware({request}) {
   // \u83B7\u53D6 middleware \u51FD\u6570
   const middlewareFn = await getMiddleware();
   
-  // \u5C06\u539F\u59CB Headers \u8F6C\u6362\u4E3A\u666E\u901A\u5BF9\u8C61\u683C\u5F0F
-  // Next.js adapter \u5185\u90E8\u7684 fromNodeOutgoingHttpHeaders \u671F\u671B\u5BF9\u8C61\u683C\u5F0F
-  const headersObject = {};
-  request.headers.forEach((value, key) => {
-    headersObject[key] = value;
-  });
+  // \u6784\u9020 Next.js middleware \u671F\u671B\u7684\u8BF7\u6C42\u683C\u5F0F
+  // \u6CE8\u610F\uFF1Aheaders \u5FC5\u987B\u662F Headers \u5B9E\u4F8B\uFF0C\u56E0\u4E3A\u7F16\u8BD1\u540E\u7684\u4EE3\u7801\u4F1A\u8C03\u7528 headers.forEach()
+  const headersInstance = new Headers(request.headers);
   
-  // \u6784\u9020 Next.js middleware adapter \u671F\u671B\u7684\u53C2\u6570\u683C\u5F0F
-  // \u53C2\u8003 Next.js \u6E90\u7801\u4E2D\u7684 adapter \u51FD\u6570
-  const middlewareParams = {
+  const middlewareRequest = {
     request: {
       url: request.url,
       method: request.method,
-      headers: headersObject,
+      headers: headersInstance,  // \u5FC5\u987B\u662F Headers \u5B9E\u4F8B\uFF0C\u652F\u6301 forEach
       body: request.body,
       nextConfig: {
         basePath: '',
         i18n: null,
         trailingSlash: false
       },
-      geo: {},
-      ip: request.headers.get('x-forwarded-for') || request.headers.get('x-real-ip') || '',
-      signal: request.signal || null
+      signal: request.signal || null,
+      waitUntil: (promise) => {}
     },
     page: '/',
-    // \u6DFB\u52A0 waitUntil \u65B9\u6CD5
-    waitUntil: (promise) => {}
+    waitUntil: (promise) => {},
+    bypassNextUrl: false,
+    // \u6DFB\u52A0 rewrite \u65B9\u6CD5 - \u7F16\u8BD1\u540E\u7684 middleware \u9700\u8981\u8C03\u7528\u6B64\u65B9\u6CD5
+    rewrite: (url) => {
+      const headers = new Headers();
+      headers.set("x-middleware-rewrite", typeof url === 'string' ? url : url.toString());
+      return new Response(null, { headers });
+    },
+    // \u6DFB\u52A0 redirect \u65B9\u6CD5
+    redirect: (url, status = 307) => {
+      return new Response(null, {
+        status,
+        headers: { Location: typeof url === 'string' ? url : url.toString() }
+      });
+    },
+    // \u6DFB\u52A0 next \u65B9\u6CD5
+    next: () => {
+      return new Response(null, { headers: { 'x-middleware-next': '1' } });
+    },
+    IncrementalCache: null
   };
 
-  const result = await middlewareFn(middlewareParams);
+  const result = await middlewareFn(middlewareRequest);
 
   // Webpack \u6A21\u5F0F\u8FD4\u56DE\u7684\u662F { response: Response, waitUntil: {} } \u683C\u5F0F
   // \u9700\u8981\u63D0\u53D6\u5B9E\u9645\u7684 Response \u5BF9\u8C61

package/dist/build/functions/server.js

@@ -100,8 +100,6 @@ var getHandlerFile = async (ctx) => {
   };
   if (ctx.relativeAppDir.length !== 0) {
     const template2 = await readFile(join(templatesDir, "handler-monorepo.tmpl.js"), "utf-8");
-    console.log("ctx.lambdaWorkingDirectory", ctx.lambdaWorkingDirectory);
-    console.log("ctx.nextServerHandler", ctx.nextServerHandler);
     templateVariables["{{cwd}}"] = posixJoin(ctx.lambdaWorkingDirectory);
     templateVariables["{{nextServerHandler}}"] = posixJoin(ctx.nextServerHandler);
     return applyTemplateVariables(template2, templateVariables);

package/dist/build/routes.js

@@ -9,105 +9,6 @@ import "../esm-chunks/chunk-6BT4RYQJ.js";
 // src/build/routes.ts
 import * as fs from "fs";
 import * as path from "path";
-function isRE2Compatible(regexSource) {
-  const unsupported = [
-    /\(\?[=!<]/,
-    // 断言（前瞻、后顾）
-    /\(\?>/,
-    // 原子组
-    /\\(\d+)/,
-    // 反向引用 \1 \2
-    /\(\?\(/
-    // 条件表达式
-  ];
-  return !unsupported.some((r) => r.test(regexSource));
-}
-async function getMiddlewareConfig(ctx) {
-  try {
-    const manifest = await ctx.getMiddlewareManifest();
-    if (manifest && manifest.middleware && manifest.middleware["/"]) {
-      const middlewareInfo = manifest.middleware["/"];
-      const matchers = middlewareInfo.matchers || [];
-      const normalizedMatchers = matchers.map((m) => ({
-        source: m.originalSource || "/:path*",
-        regex: m.regexp
-      }));
-      const hasIncompatibleRegex = normalizedMatchers.some(
-        (item) => item.regex && !isRE2Compatible(item.regex)
-      );
-      if (hasIncompatibleRegex) {
-        return {
-          runtime: "edge",
-          matcher: [{ source: "/:path*" }]
-        };
-      }
-      return {
-        runtime: "edge",
-        matcher: normalizedMatchers.map((item) => ({ source: item.source }))
-      };
-    }
-    const possibleFunctionsConfigPaths = [
-      path.join(process.cwd(), ".next/server/functions-config-manifest.json"),
-      path.join(ctx.distDir, "server/functions-config-manifest.json")
-    ];
-    let functionsConfigPath = "";
-    for (const p of possibleFunctionsConfigPaths) {
-      if (fs.existsSync(p)) {
-        functionsConfigPath = p;
-        break;
-      }
-    }
-    if (functionsConfigPath) {
-      const functionsConfig = JSON.parse(fs.readFileSync(functionsConfigPath, "utf-8"));
-      const middlewareConfig = functionsConfig?.functions?.["/_middleware"];
-      if (middlewareConfig && middlewareConfig.matchers) {
-        const matchers = middlewareConfig.matchers;
-        const normalizedMatchers = matchers.map((m) => ({
-          source: m.originalSource || "/:path*",
-          regex: m.regexp
-        }));
-        const hasIncompatibleRegex = normalizedMatchers.some(
-          (item) => item.regex && !isRE2Compatible(item.regex)
-        );
-        if (hasIncompatibleRegex) {
-          return {
-            runtime: middlewareConfig.runtime || "edge",
-            matcher: [{ source: "/:path*" }]
-          };
-        }
-        return {
-          runtime: middlewareConfig.runtime || "edge",
-          matcher: normalizedMatchers.map((item) => ({ source: item.source }))
-        };
-      }
-    }
-    return null;
-  } catch (error) {
-    console.log("[Middleware] Failed to read middleware config:", error);
-    return null;
-  }
-}
-function updateEdgeFunctionsMetaJson(middlewareConfig) {
-  const metaJsonPath = path.join(process.cwd(), ".edgeone/edge-functions/meta.json");
-  let meta = { routes: [] };
-  if (fs.existsSync(metaJsonPath)) {
-    try {
-      const content = fs.readFileSync(metaJsonPath, "utf-8");
-      meta = JSON.parse(content);
-    } catch (error) {
-      console.log("[Middleware] Failed to parse existing meta.json, creating new one");
-    }
-  }
-  if (middlewareConfig) {
-    meta.middleware = middlewareConfig;
-    console.log("[Middleware] Updated meta.json with middleware config:", JSON.stringify(middlewareConfig.matcher));
-  }
-  const edgeFunctionsDir = path.dirname(metaJsonPath);
-  if (!fs.existsSync(edgeFunctionsDir)) {
-    fs.mkdirSync(edgeFunctionsDir, { recursive: true });
-  }
-  fs.writeFileSync(metaJsonPath, JSON.stringify(meta, null, 2), "utf-8");
-}
 var convertNextRoutePattern = (path2) => {
   if (!path2.includes("[")) {
     return path2;
@@ -196,7 +97,7 @@ var createRouteMeta = async (ctx) => {
     path: path2,
     ...config
   }));
-  const serverHandlerDir = ctx.serverHandlerRootDir;
+  const serverHandlerDir = ctx.serverHandlerDir;
   if (!fs.existsSync(serverHandlerDir)) {
     fs.mkdirSync(serverHandlerDir, { recursive: true });
   }
@@ -209,8 +110,6 @@ var createRouteMeta = async (ctx) => {
     JSON.stringify(metaData, null, 2),
     "utf-8"
   );
-  const middlewareConfig = await getMiddlewareConfig(ctx);
-  updateEdgeFunctionsMetaJson(middlewareConfig);
 };
 export {
   convertNextRoutePattern,

package/dist/index.js

@@ -36,14 +36,13 @@ var onBuild = async (options) => {
     // copyStaticAssets(ctx),
     copyStaticContent(ctx),
     copyPrerenderedContent(ctx),
-    createServerHandler(ctx)
+    createServerHandler(ctx),
+    createRouteMeta(ctx)
   ]);
-  await createRouteMeta(ctx);
 };
 var onPostBuild = async (options) => {
-  console.log("onPostBuild");
   const ctx = new PluginContext(options);
-  await compileMiddleware(ctx);
+  compileMiddleware(ctx);
 };
 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.0.9-beta.1";
+var version = "0.0.9";
 
 // 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.0.9-beta.1",
+  "version": "0.0.9",
   "description": "",
   "main": "./dist/index.js",
   "type": "module",