feat: add support for next15 geolocation

Author: vicb

.changeset/friendly-kangaroos-give.md

@@ -0,0 +1,5 @@
+---
+"@opennextjs/aws": patch
+---
+
+feat: add support for Next15 geolocation

packages/open-next/src/core/routing/middleware.ts

@@ -46,13 +46,13 @@ export async function handleMiddleware(
   internalEvent: InternalEvent,
   middlewareLoader: MiddlewareLoader = defaultMiddlewareLoader,
 ): Promise<MiddlewareOutputEvent | InternalResult> {
-  const { query } = internalEvent;
+  // We bypass the middleware if the request is internal
+  if (internalEvent.headers["x-isr"]) return internalEvent;
+
   const normalizedPath = localizePath(internalEvent);
   // We only need the normalizedPath to check if the middleware should run
   const hasMatch = middleMatch.some((r) => r.test(normalizedPath));
   if (!hasMatch) return internalEvent;
-  // We bypass the middleware if the request is internal
-  if (internalEvent.headers["x-isr"]) return internalEvent;
 
   // Retrieve the protocol:
   // - In lambda, the url only contains the rawPath and the query - default to https
@@ -64,20 +64,33 @@ export async function handleMiddleware(
     : "http://localhost:3000";
 
   const initialUrl = new URL(normalizedPath, host);
-  initialUrl.search = convertToQueryString(query);
+  initialUrl.search = convertToQueryString(internalEvent.query);
   const url = initialUrl.toString();
 
   const middleware = await middlewareLoader();
 
+  const geo = {
+    city: internalEvent.headers["x-open-next-city"],
+    country: internalEvent.headers["x-open-next-country"],
+    region: internalEvent.headers["x-open-next-region"],
+    latitude: internalEvent.headers["x-open-next-latitude"],
+    longitude: internalEvent.headers["x-open-next-longitude"],
+  };
+
   const result: Response = await middleware.default({
-    geo: {
-      city: internalEvent.headers["x-open-next-city"],
-      country: internalEvent.headers["x-open-next-country"],
-      region: internalEvent.headers["x-open-next-region"],
-      latitude: internalEvent.headers["x-open-next-latitude"],
-      longitude: internalEvent.headers["x-open-next-longitude"],
+    // `geo` is pre Next 15
+    geo,
+    headers: {
+      ...internalEvent.headers,
+      // Next 15 geo headers
+      // See https://github.com/vercel/vercel/blob/7714b1c/packages/functions/src/headers.ts
+      "x-vercel-ip-city": geo.city,
+      "x-vercel-ip-country": geo.country,
+      "x-vercel-ip-country-region": geo.region,
+      "x-vercel-ip-latitude": geo.latitude,
+      "x-vercel-ip-longitude": geo.longitude,
     },
-    headers: internalEvent.headers,
+
     method: internalEvent.method || "GET",
     nextConfig: {
       basePath: NextConfig.basePath,