@edgeone/opennextjs-pages 0.1.4 → 0.1.5-beta.1

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

@@ -2455,11 +2455,14 @@ async function compileTurbopack(inputPath, middlewareCode, options = {}) {
   }
   const externalChunks = [];
   const middlewareChunks = [];
+  const libraryChunks = [];
   for (const chunkPath of chunkPaths) {
     if (chunkPath.includes("[externals]")) {
       externalChunks.push(chunkPath);
     } else if (chunkPath.includes("[root-of-the-server]")) {
       middlewareChunks.push(chunkPath);
+    } else {
+      libraryChunks.push(chunkPath);
     }
   }
   const chunksCode = [];
@@ -2474,6 +2477,17 @@ async function compileTurbopack(inputPath, middlewareCode, options = {}) {
       warnings.push(`External chunk not found: ${fullPath}`);
     }
   }
+  for (const chunkPath of libraryChunks) {
+    const relativePath = chunkPath.replace(/^server\//, "");
+    const fullPath = join(middlewareDir, relativePath);
+    if (existsSync(fullPath)) {
+      let code = readFileSync(fullPath, "utf-8");
+      code = transformForEdgeOneRuntime(code);
+      chunksCode.push(code);
+    } else {
+      warnings.push(`Library chunk not found: ${fullPath}`);
+    }
+  }
   for (const chunkPath of middlewareChunks) {
     const relativePath = chunkPath.replace(/^server\//, "");
     const fullPath = join(middlewareDir, relativePath);
@@ -3650,6 +3664,22 @@ async function executeMiddleware({request}) {
         }
       } catch (e) {}
     }
+
+    // \u4ECE EdgeOne request.eo \u83B7\u53D6 geo \u548C ip \u4FE1\u606F
+    const eoData = request.eo || {};
+    const eoGeo = eoData.geo || {};
+    
+    // \u5C06 EdgeOne geo \u683C\u5F0F\u8F6C\u6362\u4E3A Next.js geo \u683C\u5F0F
+    // EdgeOne: { countryCodeAlpha2, regionCode, cityName, latitude, longitude, ... }
+    // Next.js: { country, region, city, latitude, longitude }
+    const nextGeo = {
+      country: eoGeo.countryCodeAlpha2 || undefined,
+      region: eoGeo.regionCode || undefined,
+      city: eoGeo.cityName || undefined,
+      latitude: eoGeo.latitude !== undefined ? String(eoGeo.latitude) : undefined,
+      longitude: eoGeo.longitude !== undefined ? String(eoGeo.longitude) : undefined,
+    };
+    const clientIp = eoData.clientIp || request.headers.get('x-forwarded-for') || '';
     
     // \u6784\u9020\u8BF7\u6C42\u5BF9\u8C61
     let nextRequest;
@@ -3659,7 +3689,9 @@ async function executeMiddleware({request}) {
         // NextRequest \u6784\u9020\u51FD\u6570\u7B7E\u540D: new NextRequest(input, init?)
         // input \u53EF\u4EE5\u662F URL \u5B57\u7B26\u4E32\u6216 Request \u5BF9\u8C61
         nextRequest = new NextRequestClass(request, {
-          nextConfig: {}
+          nextConfig: {},
+          geo: nextGeo,
+          ip: clientIp
         });
       } catch (e) {
         nextRequest = null;
@@ -3713,9 +3745,9 @@ async function executeMiddleware({request}) {
         delete: () => {}
       };
       
-      // \u6DFB\u52A0 geo \u548C ip
-      nextRequest.geo = {};
-      nextRequest.ip = request.headers.get('x-forwarded-for') || '';
+      // \u6DFB\u52A0 geo \u548C ip\uFF08\u4F7F\u7528\u4ECE EdgeOne \u8F6C\u6362\u540E\u7684\u6570\u636E\uFF09
+      nextRequest.geo = nextGeo;
+      nextRequest.ip = clientIp;
     }
     
     // \u8BBE\u7F6E\u5168\u5C40 NextResponse\uFF08\u5982\u679C\u53EF\u7528\uFF09
@@ -3738,6 +3770,11 @@ async function executeMiddleware({request}) {
       headersObj[key] = 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
+    headersObj['geo'] = JSON.stringify(nextGeo);
+    headersObj['clientIp'] = clientIp;
+    
     // \u521B\u5EFA\u4E00\u4E2A\u53EF\u5199\u7684 request \u5305\u88C5\u5BF9\u8C61
     const requestWrapper = {
       url: request.url,
@@ -3747,6 +3784,8 @@ async function executeMiddleware({request}) {
       bodyUsed: request.bodyUsed,
       signal: request.signal,
       nextConfig: {},  // NextURL \u6784\u9020\u51FD\u6570\u9700\u8981\u8FD9\u4E2A
+      geo: nextGeo,    // EdgeOne geo \u8F6C\u6362\u4E3A Next.js \u683C\u5F0F\uFF08\u517C\u5BB9 Next.js 14 \u53CA\u4EE5\u4E0B\uFF09
+      ip: clientIp,    // \u5BA2\u6237\u7AEF IP\uFF08\u517C\u5BB9 Next.js 14 \u53CA\u4EE5\u4E0B\uFF09
       // \u4FDD\u6301\u539F\u59CB Request \u7684\u65B9\u6CD5\u53EF\u7528
       clone: () => request.clone(),
       arrayBuffer: () => request.arrayBuffer(),

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

@@ -11,16 +11,20 @@ import { compile } from "./compiler.js";
 import { join } from "node:path";
 import { existsSync, writeFileSync, mkdirSync, readFileSync } from "node:fs";
 var compileMiddleware = async (ctx) => {
+  const nextDistDir = ctx.nextDistDir || ".next";
   const possiblePaths = [
-    // 1. Next.js 15+: distDir/server/middleware.js (直接在 .next 目录下)
+    // 1. Next.js 15+: distDir/server/middleware.js (直接在 distDir 目录下)
     join(ctx.distDir, "server/middleware.js"),
-    // 2. Next.js 15+: standaloneDir/.next/server/middleware.js
-    join(ctx.standaloneDir, ".next/server/middleware.js"),
-    // 3. 旧版: standaloneDir/.next/server/src/middleware.js
-    join(ctx.standaloneDir, ".next/server/src/middleware.js"),
+    // 2. Next.js 15+: standaloneDir/{nextDistDir}/server/middleware.js
+    join(ctx.standaloneDir, nextDistDir, "server/middleware.js"),
+    // 3. 旧版: standaloneDir/{nextDistDir}/server/src/middleware.js
+    join(ctx.standaloneDir, nextDistDir, "server/src/middleware.js"),
     // 4. 旧版: distDir/server/src/middleware.js
     join(ctx.distDir, "server/src/middleware.js"),
-    // 5. 相对于当前工作目录
+    // 5. 相对于当前工作目录（使用配置的 distDir）
+    join(process.cwd(), nextDistDir, "server/middleware.js"),
+    join(process.cwd(), nextDistDir, "server/src/middleware.js"),
+    // 6. 兼容默认 .next 目录（以防 nextDistDir 获取失败）
     join(process.cwd(), ".next/server/middleware.js"),
     join(process.cwd(), ".next/server/src/middleware.js")
   ];
@@ -41,7 +45,8 @@ var compileMiddleware = async (ctx) => {
   mkdirSync(outputDir, { recursive: true });
   const outputPath = join(outputDir, "compiled-middleware.js");
   writeFileSync(outputPath, result.code || "", "utf-8");
-  const edgeFunctionPath = join(process.cwd(), ".edgeone/edge-functions/index.js");
+  const edgeoneDir = join(process.cwd(), ".edgeone");
+  const edgeFunctionPath = join(edgeoneDir, "edge-functions/index.js");
   if (existsSync(edgeFunctionPath)) {
     let edgeFunctionCode = readFileSync(edgeFunctionPath, "utf-8");
     if (edgeFunctionCode.includes(`'__MIDDLEWARE_BUNDLE_CODE__'`)) {

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

@@ -73,6 +73,22 @@ var responsePolyfill = `
     return originalRedirect.call(OriginalResponse, urlString, status);
   };
   
+  // Response.json \u9759\u6001\u65B9\u6CD5 polyfill
+  // \u67D0\u4E9B Edge \u8FD0\u884C\u65F6\u4E0D\u652F\u6301\u8FD9\u4E2A\u8F83\u65B0\u7684 Web API
+  const patchedJson = function(data, init) {
+    const body = JSON.stringify(data);
+    const responseInit = cleanResponseInit(init) || {};
+    
+    // \u8BBE\u7F6E Content-Type header
+    const headers = new Headers(responseInit.headers || {});
+    if (!headers.has('Content-Type')) {
+      headers.set('Content-Type', 'application/json');
+    }
+    responseInit.headers = headers;
+    
+    return new OriginalResponse(body, responseInit);
+  };
+  
   // \u521B\u5EFA cookies \u5BF9\u8C61\u7684\u5DE5\u5382\u51FD\u6570
   function createResponseCookies(response) {
     const cookieStore = new Map();
@@ -137,6 +153,14 @@ var responsePolyfill = `
       if (prop === 'redirect') {
         return patchedRedirect;
       }
+      // \u62E6\u622A json \u9759\u6001\u65B9\u6CD5\uFF08polyfill for Edge runtime\uFF09
+      if (prop === 'json') {
+        // \u5982\u679C\u539F\u751F\u652F\u6301\u5C31\u7528\u539F\u751F\u7684\uFF0C\u5426\u5219\u7528 polyfill
+        if (typeof OriginalResponse.json === 'function') {
+          return OriginalResponse.json.bind(OriginalResponse);
+        }
+        return patchedJson;
+      }
       // \u5176\u4ED6\u9759\u6001\u65B9\u6CD5\u76F4\u63A5\u4ECE\u539F\u59CB Response \u83B7\u53D6
       return Reflect.get(target, prop, receiver);
     }

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

@@ -21,6 +21,24 @@ function getEdgeOneWrapperCode(options = {}) {
 // Middleware Runner (Raw Source Mode)
 // ============================================================
 
+/**
+ * \u5C06 EdgeOne geo \u683C\u5F0F\u8F6C\u6362\u4E3A Next.js geo \u683C\u5F0F
+ * EdgeOne: { countryCodeAlpha2, regionCode, cityName, latitude, longitude, ... }
+ * Next.js: { country, region, city, latitude, longitude }
+ */
+function convertEoGeoToNextGeo(eoGeo) {
+  if (!eoGeo || typeof eoGeo !== 'object') {
+    return {};
+  }
+  return {
+    country: eoGeo.countryCodeAlpha2 || undefined,
+    region: eoGeo.regionCode || undefined,
+    city: eoGeo.cityName || undefined,
+    latitude: eoGeo.latitude !== undefined ? String(eoGeo.latitude) : undefined,
+    longitude: eoGeo.longitude !== undefined ? String(eoGeo.longitude) : undefined,
+  };
+}
+
 /**
  * \u8FD0\u884C\u4E2D\u95F4\u4EF6\u7684\u4E3B\u51FD\u6570
  * @param {Request} request - \u539F\u59CB\u8BF7\u6C42\u5BF9\u8C61
@@ -77,66 +95,80 @@ async function executeMiddleware({request}) {
     }
   }
 
+  // \u4ECE EdgeOne request.eo \u83B7\u53D6 geo \u548C ip \u4FE1\u606F
+  const eoData = request.eo || {};
+  const nextGeo = convertEoGeoToNextGeo(eoData.geo);
+  const clientIp = eoData.clientIp || request.headers.get('x-forwarded-for') || request.headers.get('x-real-ip') || '';
+
+  // \u521B\u5EFA\u65B0\u7684 Headers\uFF0C\u6CE8\u5165 geo \u548C clientIp
+  // Next.js 15+ \u79FB\u9664\u4E86 request.geo \u548C request.ip\uFF0C\u7528\u6237\u9700\u8981\u4ECE headers \u4E2D\u8BFB\u53D6
+  const newHeaders = new Headers(request.headers);
+  newHeaders.set('geo', JSON.stringify(nextGeo));
+  newHeaders.set('clientIp', clientIp);
+
+  // \u521B\u5EFA\u5E26\u6709\u65B0 headers \u7684 request
+  const newRequest = new Request(request.url, {
+    method: request.method,
+    headers: newHeaders,
+    body: request.body,
+  });
+
   // \u4E3A request \u6DFB\u52A0 nextUrl \u5C5E\u6027
-  if (!request.nextUrl) {
-    Object.defineProperty(request, 'nextUrl', {
-      value: {
-        pathname: pathname,
-        search: url.search,
-        searchParams: url.searchParams,
-        hash: url.hash,
-        host: url.host,
-        hostname: url.hostname,
-        port: url.port,
-        protocol: url.protocol,
-        href: url.href,
-        origin: url.origin,
-        basePath: '',
-        locale: '',
-        defaultLocale: '',
-        toString: () => url.href,
-        clone: () => new URL(url.href)
-      },
-      writable: true,
-      enumerable: true
-    });
-  }
+  Object.defineProperty(newRequest, 'nextUrl', {
+    value: {
+      pathname: pathname,
+      search: url.search,
+      searchParams: url.searchParams,
+      hash: url.hash,
+      host: url.host,
+      hostname: url.hostname,
+      port: url.port,
+      protocol: url.protocol,
+      href: url.href,
+      origin: url.origin,
+      basePath: '',
+      locale: '',
+      defaultLocale: '',
+      toString: () => url.href,
+      clone: () => new URL(url.href)
+    },
+    writable: true,
+    enumerable: true
+  });
 
   // \u4E3A request \u6DFB\u52A0 cookies \u5C5E\u6027
-  if (!request.cookies) {
-    const cookieHeader = request.headers.get('cookie') || '';
-    const cookieMap = new Map();
-    
-    if (cookieHeader) {
-      cookieHeader.split(';').forEach(cookie => {
-        const [name, ...valueParts] = cookie.trim().split('=');
-        if (name) {
-          cookieMap.set(name.trim(), { 
-            name: name.trim(), 
-            value: valueParts.join('=') || '' 
-          });
-        }
-      });
-    }
-    
-    Object.defineProperty(request, 'cookies', {
-      value: {
-        get: (name) => cookieMap.get(name),
-        has: (name) => cookieMap.has(name),
-        getAll: () => Array.from(cookieMap.values()),
-        set: () => {},
-        delete: () => {},
-        clear: () => {},
-        [Symbol.iterator]: () => cookieMap.values(),
-        size: cookieMap.size
-      },
-      writable: true,
-      enumerable: true
+  const cookieHeader = newRequest.headers.get('cookie') || '';
+  const cookieMap = new Map();
+  
+  if (cookieHeader) {
+    cookieHeader.split(';').forEach(cookie => {
+      const [name, ...valueParts] = cookie.trim().split('=');
+      if (name) {
+        cookieMap.set(name.trim(), { 
+          name: name.trim(), 
+          value: valueParts.join('=') || '' 
+        });
+      }
     });
   }
+  
+  Object.defineProperty(newRequest, 'cookies', {
+    value: {
+      get: (name) => cookieMap.get(name),
+      has: (name) => cookieMap.has(name),
+      getAll: () => Array.from(cookieMap.values()),
+      set: () => {},
+      delete: () => {},
+      clear: () => {},
+      [Symbol.iterator]: () => cookieMap.values(),
+      size: cookieMap.size
+    },
+    writable: true,
+    enumerable: true
+  });
 
   // \u8C03\u7528 middleware \u51FD\u6570
-  const result = await middleware(request);
+  const result = await middleware(newRequest);
 
   return result;
 }
@@ -274,6 +306,24 @@ function matchesPath(pathname, matcher) {
   return false;
 }
 
+/**
+ * \u5C06 EdgeOne geo \u683C\u5F0F\u8F6C\u6362\u4E3A Next.js geo \u683C\u5F0F
+ * EdgeOne: { countryCodeAlpha2, regionCode, cityName, latitude, longitude, ... }
+ * Next.js: { country, region, city, latitude, longitude }
+ */
+function convertEoGeoToNextGeo(eoGeo) {
+  if (!eoGeo || typeof eoGeo !== 'object') {
+    return {};
+  }
+  return {
+    country: eoGeo.countryCodeAlpha2 || undefined,
+    region: eoGeo.regionCode || undefined,
+    city: eoGeo.cityName || undefined,
+    latitude: eoGeo.latitude !== undefined ? String(eoGeo.latitude) : undefined,
+    longitude: eoGeo.longitude !== undefined ? String(eoGeo.longitude) : undefined,
+  };
+}
+
 /**
  * \u8FD0\u884C\u4E2D\u95F4\u4EF6\u7684\u4E3B\u51FD\u6570
  * @param {Request} request - \u539F\u59CB\u8BF7\u6C42\u5BF9\u8C61
@@ -298,6 +348,17 @@ async function executeMiddleware({request}) {
   request.headers.forEach((value, key) => {
     headersObject[key] = value;
   });
+
+  // \u4ECE EdgeOne request.eo \u83B7\u53D6 geo \u548C ip \u4FE1\u606F
+  const eoData = request.eo || {};
+  const nextGeo = convertEoGeoToNextGeo(eoData.geo);
+  const clientIp = eoData.clientIp || request.headers.get('x-forwarded-for') || request.headers.get('x-real-ip') || '';
+  
+  // \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
+  // \u4F7F\u7528 'geo' (JSON \u5B57\u7B26\u4E32) \u548C 'clientIp' \u4F5C\u4E3A header \u540D\u79F0
+  headersObject['geo'] = JSON.stringify(nextGeo);
+  headersObject['clientIp'] = clientIp;
   
   // \u6784\u9020 Next.js middleware adapter \u671F\u671B\u7684\u53C2\u6570\u683C\u5F0F
   // \u53C2\u8003 Next.js \u6E90\u7801\u4E2D\u7684 adapter \u51FD\u6570
@@ -312,8 +373,8 @@ async function executeMiddleware({request}) {
         i18n: null,
         trailingSlash: false
       },
-      geo: {},
-      ip: request.headers.get('x-forwarded-for') || request.headers.get('x-real-ip') || '',
+      geo: nextGeo,
+      ip: clientIp,
       signal: request.signal || null
     },
     page: '/',

package/dist/build/plugin-context.js

@@ -22,7 +22,7 @@ import { fileURLToPath } from "node:url";
 var MODULE_DIR = fileURLToPath(new URL(".", import.meta.url));
 var PLUGIN_DIR = join(MODULE_DIR, "../..");
 var DEFAULT_PUBLISH_DIR = ".next";
-var SERVER_HANDLER_NAME = "server-handler";
+var SERVER_HANDLER_NAME = "cloud-functions/ssr-node";
 var EDGE_HANDLER_NAME = "edgeone-edge-handler";
 var PluginContext = class {
   edgeoneConfig;
@@ -40,7 +40,7 @@ var PluginContext = class {
   }
   /** Temporary directory for stashing the build output */
   get tempPublishDir() {
-    return this.resolveFromPackagePath(".edgeone/.next");
+    return this.resolveFromPackagePath(join(".edgeone", this.nextDistDir));
   }
   /** Absolute path of the publish directory */
   get publishDir() {
@@ -152,13 +152,15 @@ var PluginContext = class {
     return join(this.edgeFunctionsDir, EDGE_HANDLER_NAME);
   }
   constructor(options) {
+    const detectedPublishDir = this.detectPublishDir(options?.constants?.PACKAGE_PATH);
     options = {
       ...options,
       functions: {
         "*": {}
       },
       constants: {
-        PUBLISH_DIR: ".next"
+        ...options?.constants,
+        PUBLISH_DIR: detectedPublishDir
         // BUILD_VERSION: '32.1.4',
       }
     };
@@ -171,6 +173,32 @@ var PluginContext = class {
     this.serverlessWrapHandler = options.serverlessWrapHandler;
     this.getRuntimeShim = options.getRuntimeShim;
   }
+  /**
+   * 自动检测 Next.js 构建输出目录
+   * 搜索包含 BUILD_ID 文件的目录，支持自定义 distDir 配置
+   */
+  detectPublishDir(packagePath) {
+    const basePath = packagePath || process.cwd();
+    const possibleDirs = [
+      ".next",
+      // 默认
+      "build",
+      // 常见自定义
+      "dist",
+      // 常见自定义
+      "out",
+      // 常见自定义
+      ".build"
+      // 其他可能
+    ];
+    for (const dir of possibleDirs) {
+      const fullPath = resolve(basePath, dir);
+      if (existsSync(join(fullPath, "BUILD_ID"))) {
+        return dir;
+      }
+    }
+    return DEFAULT_PUBLISH_DIR;
+  }
   /** Resolves a path correctly with mono repository awareness for .edgeone directories mainly  */
   resolveFromPackagePath(...args) {
     return resolve(this.constants.PACKAGE_PATH || "", ...args);
@@ -201,18 +229,21 @@ var PluginContext = class {
   /**
    * Uses various heuristics to try to find the .next dir.
    * Works by looking for BUILD_ID, so requires the site to have been built
+   * 支持自定义 distDir 配置（如 distDir: 'build'）
    */
   findDotNext() {
-    for (const dir of [
-      // The publish directory
-      this.publishDir,
-      // In the root
-      resolve(DEFAULT_PUBLISH_DIR),
-      // The sibling of the publish directory
-      resolve(this.publishDir, "..", DEFAULT_PUBLISH_DIR),
-      // In the package dir
-      resolve(this.constants.PACKAGE_PATH || "", DEFAULT_PUBLISH_DIR)
-    ]) {
+    const possibleDirNames = [".next", "build", "dist", "out", ".build"];
+    const searchDirs = [
+      // The publish directory (已检测的目录)
+      this.publishDir
+    ];
+    for (const dirName of possibleDirNames) {
+      searchDirs.push(resolve(dirName));
+      searchDirs.push(resolve(this.publishDir, "..", dirName));
+      searchDirs.push(resolve(this.constants.PACKAGE_PATH || "", dirName));
+    }
+    const uniqueDirs = [...new Set(searchDirs)];
+    for (const dir of uniqueDirs) {
       if (existsSync(join(dir, "BUILD_ID"))) {
         return dir;
       }