@websolutespa/bom-next 3.0.1 → 3.0.2

package/dist/exports/instrumentation.d.ts

@@ -1,13 +1,2 @@
-import { n as RequestInfo, t as ErrorContext } from "../types2.js";
-
-//#region src/instrumentation/server.d.ts
-declare function registerIntrumentation(): Promise<void>;
-/**
- * Reports errors passed to the the Next.js `onRequestError` instrumentation hook.
- */
-declare function captureRequestError(error: unknown, request: RequestInfo, errorContext: ErrorContext): void;
-//# sourceMappingURL=server.d.ts.map
-
-//#endregion
-export { captureRequestError, registerIntrumentation };
-//# sourceMappingURL=instrumentation.d.ts.map
+import { captureRequestError, registerIntrumentation } from "../instrumentation/server.js";
+export { captureRequestError, registerIntrumentation };

package/dist/exports/instrumentation.js

@@ -1,25 +1,2 @@
-import * as Sentry from "@sentry/nextjs";
-//#region src/instrumentation/sentry/capture.requestError.ts
-/**
-* Reports errors passed to the the Next.js `onRequestError` instrumentation hook.
-*/
-const captureRequestError$1 = Sentry.captureRequestError;
-//#endregion
-//#region src/instrumentation/server.ts
-async function registerIntrumentation() {
-	if (process.env.NEXT_PUBLIC_SENTRY_DSN) {
-		if (process.env.NEXT_RUNTIME === "nodejs") await import("../config.server.js");
-		if (process.env.NEXT_RUNTIME === "edge") await import("../config.edge.js");
-	}
-}
-/**
-* Reports errors passed to the the Next.js `onRequestError` instrumentation hook.
-*/
-function captureRequestError(error, request, errorContext) {
-	if (process.env.NEXT_PUBLIC_SENTRY_DSN) return captureRequestError$1(error, request, errorContext);
-	else console.log("Instrumentation.captureRequestError", error, errorContext);
-}
-//#endregion
+import { captureRequestError, registerIntrumentation } from "../instrumentation/server.js";
 export { captureRequestError, registerIntrumentation };
-
-//# sourceMappingURL=instrumentation.js.map

package/dist/exports/proxy.d.ts

@@ -1,71 +1,5 @@
-import { IRoute } from "@websolutespa/bom-core";
-import { NextFetchEvent, NextRequest } from "next/server";
-import { NextMiddlewareResult } from "next/dist/server/web/types";
-
-//#region src/proxy/proxy.d.ts
-type MiddlewareOptions = {
-  request: NextRequest;
-  next: NextFetchEvent;
-  disabled?: boolean;
-};
-type Middleware = (props: MiddlewareOptions) => NextMiddlewareResult | Promise<NextMiddlewareResult>;
-/**
- * Returns the externally visible origin for an internal middleware request.
- *
- * Deployments commonly terminate TLS or change ports before forwarding to
- * Next.js. Honoring valid forwarded headers keeps resolver requests on the
- * public host and prevents an avoidable proxy redirect; direct-origin fallback
- * keeps local development and untrusted/invalid header values deterministic.
- */
-declare function getRequestOrigin(request: NextRequest): string;
-/**
- * Composes middleware into an ordered, short-circuiting proxy pipeline.
- *
- * A disabled proxy returns immediately, avoiding all downstream request work.
- * Otherwise each middleware can claim the response; stopping at its first
- * result prevents duplicate rewrites, redirects, and expensive policy checks.
- */
-declare function createProxy(...proxies: Middleware[]): Middleware;
-//# sourceMappingURL=proxy.d.ts.map
-//#endregion
-//#region src/proxy/route-proxy.d.ts
-type Proxy = (request: NextRequest, next: NextFetchEvent) => Promise<NextMiddlewareResult>;
-type RouteMiddlewareOptions = {
-  request: NextRequest;
-  next: NextFetchEvent;
-  route: IRoute;
-  disabled?: boolean;
-};
-type RouteMiddleware = (props: RouteMiddlewareOptions) => NextMiddlewareResult | Promise<NextMiddlewareResult>;
-type RouteInterceptorProxy = (route: IRoute, request: NextRequest, next: NextFetchEvent) => Promise<NextMiddlewareResult>;
-type ResolvedRoute = IRoute & {
-  splat?: string;
-};
-type RouteResolverResponse = {
-  parent?: IRoute;
-  route?: ResolvedRoute;
-};
-/**
- * Resolves a public request to a CMS route, then rewrites it to the internal
- * Next.js page while preserving the original browser URL.
- *
- * The resolver call is deliberately made to this request's public origin so it
- * works behind reverse proxies and deployment hosts. A rewrite keeps routing
- * server-side, avoiding an extra browser round trip that a redirect would add.
- */
-declare function createRouteProxy(...middlewares: RouteMiddleware[]): Middleware;
-//# sourceMappingURL=route-proxy.d.ts.map
-//#endregion
-//#region src/proxy/protected-route.d.ts
-declare const protectedRouteProxy: RouteMiddleware;
-//# sourceMappingURL=protected-route.d.ts.map
-//#endregion
-//#region src/proxy/route-auto-detection.d.ts
-declare function detectLocale(request: NextRequest, defaultLocale?: string): Promise<string>;
-declare function detectCountry(request: NextRequest, defaultMarket?: string): Promise<string | undefined>;
-declare const routeAutoDetection: Middleware;
-//# sourceMappingURL=route-auto-detection.d.ts.map
-
-//#endregion
-export { Middleware, MiddlewareOptions, Proxy, ResolvedRoute, RouteInterceptorProxy, RouteMiddleware, RouteMiddlewareOptions, RouteResolverResponse, createProxy, createRouteProxy, detectCountry, detectLocale, getRequestOrigin, protectedRouteProxy, routeAutoDetection };
-//# sourceMappingURL=proxy.d.ts.map
+import { Middleware, MiddlewareOptions, createProxy, getRequestOrigin } from "../proxy/proxy.js";
+import { Proxy, ResolvedRoute, RouteInterceptorProxy, RouteMiddleware, RouteMiddlewareOptions, RouteResolverResponse, createRouteProxy } from "../proxy/route-proxy.js";
+import { protectedRouteProxy } from "../proxy/protected-route.js";
+import { detectCountry, detectLocale, routeAutoDetection } from "../proxy/route-auto-detection.js";
+export { Middleware, MiddlewareOptions, Proxy, ResolvedRoute, RouteInterceptorProxy, RouteMiddleware, RouteMiddlewareOptions, RouteResolverResponse, createProxy, createRouteProxy, detectCountry, detectLocale, getRequestOrigin, protectedRouteProxy, routeAutoDetection };

package/dist/exports/proxy.js

@@ -1,254 +1,5 @@
-import { o as localApiGet } from "../http.js";
-import { n as getNextUrl, t as getHrefBeforeRedirect } from "../utils2.js";
-import { asEquatable, defaultLocale, defaultMarket } from "@websolutespa/bom-core";
-import { NextResponse } from "next/server";
-//#region src/proxy/proxy.ts
-/**
-* Returns the externally visible origin for an internal middleware request.
-*
-* Deployments commonly terminate TLS or change ports before forwarding to
-* Next.js. Honoring valid forwarded headers keeps resolver requests on the
-* public host and prevents an avoidable proxy redirect; direct-origin fallback
-* keeps local development and untrusted/invalid header values deterministic.
-*/
-function getRequestOrigin(request) {
-	const forwardedHost = request.headers.get("x-forwarded-host")?.split(",")[0]?.trim();
-	const forwardedProtocol = request.headers.get("x-forwarded-proto")?.split(",")[0]?.trim();
-	const forwardedPort = request.headers.get("x-forwarded-port")?.split(",")[0]?.trim();
-	if (!forwardedHost || !["http", "https"].includes(forwardedProtocol || "")) return request.nextUrl.origin;
-	const protocol = forwardedProtocol;
-	const defaultPort = protocol === "https" ? "443" : "80";
-	const includesPort = forwardedHost.startsWith("[") ? forwardedHost.includes("]:") : forwardedHost.includes(":");
-	return `${protocol}://${forwardedPort && forwardedPort !== defaultPort && !includesPort ? `${forwardedHost}:${forwardedPort}` : forwardedHost}`;
-}
-/**
-* Composes middleware into an ordered, short-circuiting proxy pipeline.
-*
-* A disabled proxy returns immediately, avoiding all downstream request work.
-* Otherwise each middleware can claim the response; stopping at its first
-* result prevents duplicate rewrites, redirects, and expensive policy checks.
-*/
-function createProxy(...proxies) {
-	return async function({ request, next, disabled }) {
-		if (disabled) return NextResponse.next();
-		let proxyResponse, i = 0;
-		while (i < proxies.length && !proxyResponse) {
-			const proxy = proxies[i];
-			if (typeof proxy === "function") {
-				proxyResponse = await proxy({
-					request,
-					next
-				});
-				if (proxyResponse) return proxyResponse;
-			}
-			i++;
-		}
-		return NextResponse.next();
-	};
-}
-//#endregion
-//#region src/proxy/protected-route.ts
-function getPublicRedirectUrl(request, href) {
-	if (!href.startsWith("/") || href.startsWith("//")) return;
-	const url = new URL(href, getRequestOrigin(request));
-	return url.pathname === request.nextUrl.pathname ? void 0 : url;
-}
-const protectedRouteProxy = async ({ request, route }) => {
-	if (route.isProtected) {
-		const isAuthenticated = request.cookies.get("payload-token");
-		console.log("protectedRouteProxy.isAuthenticated", isAuthenticated);
-		if (!isAuthenticated) {
-			if (route.publicRedirect) {
-				const redirectUrl = getPublicRedirectUrl(request, route.publicRedirect);
-				if (redirectUrl) return NextResponse.redirect(redirectUrl);
-			}
-			const { pathname } = request.nextUrl;
-			const reqHeaders = new Headers(request.headers);
-			reqHeaders.set("x-pathname", pathname);
-			const nextRoute = (await localApiGet(`/-route?schema=login&market=${encodeURIComponent(route.market)}&locale=${encodeURIComponent(route.locale)}`, {}, void 0, getRequestOrigin(request)))?.route;
-			if (nextRoute) {
-				const nextUrl = getNextUrl(request, nextRoute);
-				reqHeaders.set("x-market", nextRoute.market);
-				reqHeaders.set("x-locale", nextRoute.locale);
-				reqHeaders.set("x-schema", nextRoute.schema);
-				reqHeaders.set("x-id", String(nextRoute.page));
-				reqHeaders.set("x-forwarded-pathname", nextUrl.pathname);
-				console.log("protectedRouteProxy.Protected", pathname, ">", nextUrl.pathname);
-				return NextResponse.rewrite(nextUrl, { request: { headers: reqHeaders } });
-			}
-		}
-	}
-};
-//#endregion
-//#region src/proxy/route-auto-detection.ts
-async function detectLocale(request, defaultLocale) {
-	const acceptLanguage = request.headers.get("accept-language")?.split(",")[0];
-	return request.cookies.get("NEXT_LOCALE")?.value || acceptLanguage || defaultLocale || process.env.DEFAULT_LOCALE;
-}
-async function detectCountry(request, defaultMarket) {
-	let ip = request.headers.get("x-forwarded-for") || request.headers.get("x-real-ip");
-	if (ip) ip = ip.split(",")[0];
-	const isValidIp = ip?.match(/^(\d+?)\.(\d+?)\.(\d+?)\.(\d+?)$/);
-	let detectedCountry = "";
-	try {
-		const token = process.env.IPINFO_TOKEN;
-		if (token) {
-			const url = isValidIp ? `https://api.ipinfo.io/lite/${ip}/country_code?token=${token}` : `https://api.ipinfo.io/lite/me/country_code?token=${token}`;
-			const response = await fetch(url);
-			if (response.ok) detectedCountry = (await response.text()).toLowerCase();
-		} else {
-			const url = `https://geoip.websolute.it/Ip2Location/get_info.aspx?ipaddress=${isValidIp ? ip : ""}`;
-			const response = await fetch(url);
-			if (response.ok) detectedCountry = (((await response.text()).split("<CountryCode><![CDATA[")[1] || "").split("]]></CountryCode>")[0] || "").replace("-", "").toLowerCase();
-		}
-		return detectedCountry || defaultMarket || process.env.DEFAULT_MARKET;
-	} catch (error) {
-		console.log("routeInterceptor.detectCountry.error", error);
-	}
-	return defaultMarket || process.env.DEFAULT_MARKET;
-}
-const routeAutoDetection = async ({ request }) => {
-	let redirectUrl = void 0;
-	const url = request.nextUrl;
-	const origin = getRequestOrigin(request);
-	if (url.pathname === "/") {
-		const cookie = request.cookies.get("detectedRoute");
-		if (cookie?.value) redirectUrl = cookie.value;
-		const rootRoutes = await localApiGet("/-route?where[isRoot][equals]=true", {}, void 0, origin);
-		if (rootRoutes.find((x) => x.id === "/")) return;
-		const markets = await localApiGet("/market?pagination=false", {}, void 0, origin);
-		const market = markets.find((x) => x.isDefault) || markets.find((x) => x.id === defaultMarket) || markets[0];
-		const detectedCountry = await detectCountry(request, market.id);
-		const detectedMarket = detectedCountry ? markets.filter((x) => Array.isArray(x.countries)).find((x) => {
-			return (x.countries || []).map((x) => typeof x === "string" ? x : x.id).includes(detectedCountry);
-		}) || markets.find((x) => !Array.isArray(x.countries)) : void 0;
-		let detectedMarketRoutes = rootRoutes.filter((x) => x.market === detectedMarket?.id);
-		if (detectedMarketRoutes.length === 0) detectedMarketRoutes = rootRoutes.filter((x) => x.market === market.id);
-		const defaultMarketLocale = market.defaultLanguage ? typeof market.defaultLanguage === "string" ? market.defaultLanguage : market.defaultLanguage.id : defaultLocale;
-		const detectedLocale = await detectLocale(request, defaultMarketLocale);
-		const detectedLocaleRoutes = detectedMarketRoutes.filter((x) => x.locale === detectedLocale);
-		const detectedRoute = detectedLocaleRoutes.length > 0 ? detectedLocaleRoutes[0] : detectedMarketRoutes.find((x) => {
-			const market = markets.find((m) => m.id === x.market);
-			const marketLocale = market.defaultLanguage ? asEquatable(market.defaultLanguage) : defaultMarketLocale;
-			return x.locale === marketLocale;
-		});
-		if (detectedRoute && detectedRoute.id !== url.pathname) {
-			console.log("routeInterceptor.routeAutoDetection", detectedLocale, detectedCountry, detectedRoute.id);
-			redirectUrl = detectedRoute.id;
-		}
-	}
-	if (redirectUrl) {
-		const resolvedUrl = new URL(redirectUrl, origin).href;
-		const search = request.nextUrl.search;
-		const response = NextResponse.redirect(resolvedUrl + search, { status: 307 });
-		response.cookies.set({
-			expires: new Date(Date.now() + 864e5),
-			httpOnly: true,
-			name: "detectedRoute",
-			path: "/",
-			sameSite: "lax",
-			secure: true,
-			value: redirectUrl
-		});
-		return response;
-	}
-};
-//#endregion
-//#region src/proxy/route-proxy.ts
-/**
-* Resolves a public request to a CMS route, then rewrites it to the internal
-* Next.js page while preserving the original browser URL.
-*
-* The resolver call is deliberately made to this request's public origin so it
-* works behind reverse proxies and deployment hosts. A rewrite keeps routing
-* server-side, avoiding an extra browser round trip that a redirect would add.
-*/
-function createRouteProxy(...middlewares) {
-	return async function({ request, next }) {
-		const url = request.nextUrl;
-		const origin = getRequestOrigin(request);
-		const hrefBeforeRedirect = getHrefBeforeRedirect(request);
-		const { pathname } = url;
-		const headers = new Headers(request.headers);
-		headers.set("x-pathname", pathname);
-		try {
-			const draftMode = request.cookies.has("__prerender_bypass");
-			console.log("draftMode", draftMode);
-			if (draftMode) return;
-			const resolution = await localApiGet(`/-route?pathname=${url.pathname}&href=${url.href}&hrefBeforeRedirect=${hrefBeforeRedirect}`, {}, void 0, origin);
-			const route = resolution?.route;
-			if (route) {
-				let middlewareResponse, i = 0;
-				while (i < middlewares.length && !middlewareResponse) {
-					const middleware = middlewares[i];
-					if (typeof middleware === "function") {
-						middlewareResponse = await middleware({
-							request,
-							next,
-							route
-						});
-						if (middlewareResponse) return middlewareResponse;
-					}
-					i++;
-				}
-				const nextUrl = getNextUrl(request, route);
-				console.log("createRouteProxy.Found", pathname, ">", nextUrl.pathname);
-				headers.set("x-market", route.market);
-				headers.set("x-locale", route.locale);
-				headers.set("x-schema", route.schema);
-				headers.set("x-id", String(route.page));
-				headers.set("x-forwarded-pathname", nextUrl.pathname);
-				return NextResponse.rewrite(nextUrl, { request: { headers } });
-			} else {
-				const parentRoute = resolution?.parent;
-				const market = parentRoute?.market || defaultMarket;
-				const locale = parentRoute?.locale || defaultLocale;
-				const nextUrl = request.nextUrl.clone();
-				nextUrl.pathname = `/${market}/${locale}/404`;
-				headers.set("x-market", market);
-				headers.set("x-locale", locale);
-				headers.set("x-schema", "not_found");
-				headers.set("x-id", "404");
-				headers.set("x-forwarded-pathname", nextUrl.pathname);
-				console.log("createRouteProxy.NotFound", pathname);
-				return NextResponse.rewrite(nextUrl, { request: { headers } });
-			}
-		} catch (error) {
-			const routeError = error && typeof error === "object" ? error : {};
-			if (routeError.status && routeError.status >= 300 && routeError.status < 400) {
-				console.log("createRouteProxy.3xx", url.pathname, routeError.status, routeError.statusText);
-				const nextUrl = request.nextUrl.clone();
-				nextUrl.pathname = "/";
-				headers.set("x-forwarded-pathname", nextUrl.pathname);
-				return NextResponse.redirect(nextUrl, 307);
-			} else if (routeError.status && routeError.status >= 400 && routeError.status < 500) {
-				if (routeError.status === 404)
- /**
-				* A resolver miss is not necessarily a CMS 404: it may be a Next.js
-				* file-system route such as an API endpoint or static asset. Letting
-				* Next continue avoids routing those requests through a fallback
-				* render and keeps their fast native handling intact.
-				*/
-				return;
-				console.log("createRouteProxy.4xx", url.pathname, routeError.status, routeError.statusText);
-				const market = defaultMarket;
-				const locale = defaultLocale;
-				const nextUrl = request.nextUrl.clone();
-				nextUrl.pathname = `/${market}/${locale}/404`;
-				headers.set("x-market", market);
-				headers.set("x-locale", locale);
-				headers.set("x-schema", "not_found");
-				headers.set("x-id", "404");
-				headers.set("x-forwarded-pathname", nextUrl.pathname);
-				console.log("createRouteProxy.NotFound", pathname);
-				return NextResponse.rewrite(nextUrl, { request: { headers } });
-			}
-			console.log("createRouteProxy.error.5xx", url.pathname, routeError.url, routeError.status, routeError.statusText || error);
-			return;
-		}
-	};
-}
-//#endregion
+import { createProxy, getRequestOrigin } from "../proxy/proxy.js";
+import { protectedRouteProxy } from "../proxy/protected-route.js";
+import { detectCountry, detectLocale, routeAutoDetection } from "../proxy/route-auto-detection.js";
+import { createRouteProxy } from "../proxy/route-proxy.js";
 export { createProxy, createRouteProxy, detectCountry, detectLocale, getRequestOrigin, protectedRouteProxy, routeAutoDetection };
-
-//# sourceMappingURL=proxy.js.map