npm - veryfront - Versions diffs - 0.1.1127 → 0.1.1132 - Mend

veryfront 0.1.1127 → 0.1.1132

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (118) hide show

package/esm/src/server/handlers/response/not-found.d.ts CHANGED Viewed

@@ -3,6 +3,5 @@ import type { HandlerContext, HandlerMetadata, HandlerResult } from "../types.js
 export declare class NotFoundHandler extends BaseHandler {
     metadata: HandlerMetadata;
     handle(req: Request, ctx: HandlerContext): Promise<HandlerResult>;
-    private generate404Html;
 }
 //# sourceMappingURL=not-found.d.ts.map

package/esm/src/server/handlers/response/not-found.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"not-found.d.ts","sourceRoot":"","sources":["../../../../../src/src/server/handlers/response/not-found.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAmB,aAAa,EAAE,MAAM,aAAa,CAAC;~~AASnG~~,qBAAa,eAAgB,SAAQ,WAAW;IAC9C,QAAQ,EAAE,eAAe,CAIvB;IAEF,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;~~IA8BjE,OAAO,CAAC,eAAe;CA4GxB~~"}
1	+ {"version":3,"file":"not-found.d.ts","sourceRoot":"","sources":["../../../../../src/src/server/handlers/response/not-found.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAmB,aAAa,EAAE,MAAM,aAAa,CAAC;AAUnG,qBAAa,eAAgB,SAAQ,WAAW;IAC9C,QAAQ,EAAE,eAAe,CAIvB;IAEF,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;CAmClE"}

package/esm/src/server/handlers/response/not-found.js CHANGED Viewed

@@ -1,7 +1,8 @@
 import { BaseHandler } from "./base.js";
 import { ResponseBuilder } from "../../../security/index.js";
 import { HTTP_INTERNAL_SERVER_ERROR, HTTP_NOT_FOUND, PRIORITY_FALLBACK, } from "../../../utils/constants/index.js";
-import { buildNonceAttribute, escapeHtml } from "../../../html/html-escape.js";
+import { ErrorPages } from "../../utils/error-html.js";
+import { addNonceToHtmlTags } from "../../../html/nonce-injection.js";
 export class NotFoundHandler extends BaseHandler {
     metadata = {
         name: "NotFoundHandler",
@@ -12,7 +13,13 @@ export class NotFoundHandler extends BaseHandler {
         const pathname = new URL(req.url).pathname;
         try {
             const builder = this.createResponseBuilder(ctx);
-            const html = this.generate404Html(pathname, builder.nonce);
+            // Render the SAME 404 page as the SSR miss path (ssr.handler /
+            // ssr.service) so every not-found — including a fallthrough like
+            // /_veryfront/<missing> that never reaches SSR — looks identical.
+            // Nonce the inline <style>/<script> exactly like the SSR response builder
+            // (ssr-response-builder addNonceToHtmlTags) so the page still renders
+            // styled under a strict nonce-based CSP.
+            const html = addNonceToHtmlTags(ErrorPages.notFound(pathname), builder.nonce);
             const response = builder
                 .withCORS(req, ctx.securityConfig?.cors)
                 .withSecurity(ctx.securityConfig ?? undefined, req)
@@ -29,112 +36,4 @@ export class NotFoundHandler extends BaseHandler {
             return Promise.resolve(this.respond(response));
         }
     }
-    generate404Html(pathname, nonce) {
-        const nonceAttr = buildNonceAttribute(nonce);
-        return `<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1"/>
-    <title>404 Not Found</title>
-    <style${nonceAttr}>
-        body {
-            font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-            margin: 0;
-            padding: 40px;
-            background: #f5f5f5;
-            color: #333;
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            justify-content: center;
-            min-height: 100vh;
-            box-sizing: border-box;
-        }
-        .container {
-            background: white;
-            border-radius: 8px;
-            box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-            padding: 40px;
-            max-width: 600px;
-            text-align: center;
-        }
-        h1 {
-            font-size: 48px;
-            margin: 0 0 16px 0;
-            color: #000;
-        }
-        h2 {
-            font-size: 24px;
-            font-weight: normal;
-            margin: 0 0 24px 0;
-            color: #666;
-        }
-        p {
-            line-height: 1.6;
-            margin: 0 0 32px 0;
-            color: #666;
-        }
-        code {
-            background: #f5f5f5;
-            padding: 2px 6px;
-            border-radius: 3px;
-            font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, monospace;
-            font-size: 14px;
-        }
-        a {
-            color: #0066cc;
-            text-decoration: none;
-            font-weight: 500;
-            transition: color 0.2s;
-        }
-        a:hover {
-            color: #0052a3;
-            text-decoration: underline;
-        }
-        .actions {
-            display: flex;
-            gap: 16px;
-            justify-content: center;
-            flex-wrap: wrap;
-        }
-        .button {
-            display: inline-block;
-            padding: 12px 24px;
-            background: #0066cc;
-            color: white;
-            border-radius: 6px;
-            font-weight: 500;
-            transition: background 0.2s;
-        }
-        .button:hover {
-            background: #0052a3;
-            text-decoration: none;
-        }
-        .secondary {
-            background: transparent;
-            color: #0066cc;
-            border: 2px solid #0066cc;
-        }
-        .secondary:hover {
-            background: #0066cc;
-            color: white;
-        }
-    </style>
-</head>
-<body>
-    <div class="container">
-        <h1>404</h1>
-        <h2>Page Not Found</h2>
-        <p>
-            The path <code>${escapeHtml(pathname)}</code> was not found on this server.
-        </p>
-        <div class="actions">
-            <a href="/" class="button">Go Home</a>
-            <a href=".." class="button secondary">Go Back</a>
-        </div>
-    </div>
-</body>
-</html>`;
-    }
 }

package/esm/src/server/runtime-handler/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/src/server/runtime-handler/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;~~AAqCpD~~,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;~~AAuErE~~,OAAO,EAAE,qBAAqB,EAAE,KAAK,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAMtF,2CAA2C;AAC3C,eAAO,MAAM,aAAa,4vBAqChB,CAAC;AAEX,6CAA6C;AAC7C,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAEzD;;;;GAIG;AACH,MAAM,WAAW,mBAAmB;IAClC,8CAA8C;IAC9C,SAAS,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;IAClD,mDAAmD;IACnD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AA6CD;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,IAAI,GAAE,mBAAwB,GAC7B;IAAE,QAAQ,EAAE,aAAa,CAAC;IAAC,UAAU,EAAE,iBAAiB,CAAA;CAAE,CAuB5D;AAED,MAAM,WAAW,qBAAqB;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,kDAAkD;IAClD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,wEAAwE;IACxE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,0DAA0D;IAC1D,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,oFAAoF;IACpF,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC,sFAAsF;IACtF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,oFAAoF;IACpF,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,8FAA8F;IAC9F,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uGAAuG;IACvG,kBAAkB,CAAC,EAAE,SAAS,GAAG,YAAY,CAAC;CAC/C;AAED,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,IAAI,GAAE,qBAAsC,GAC3C,CAAC,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,~~CAwenE~~;AAGD,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/src/server/runtime-handler/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAkCpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAkErE,OAAO,EAAE,qBAAqB,EAAE,KAAK,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAMtF,2CAA2C;AAC3C,eAAO,MAAM,aAAa,4vBAqChB,CAAC;AAEX,6CAA6C;AAC7C,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAEzD;;;;GAIG;AACH,MAAM,WAAW,mBAAmB;IAClC,8CAA8C;IAC9C,SAAS,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;IAClD,mDAAmD;IACnD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AA6CD;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,IAAI,GAAE,mBAAwB,GAC7B;IAAE,QAAQ,EAAE,aAAa,CAAC;IAAC,UAAU,EAAE,iBAAiB,CAAA;CAAE,CAuB5D;AAED,MAAM,WAAW,qBAAqB;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,kDAAkD;IAClD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,wEAAwE;IACxE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,0DAA0D;IAC1D,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,oFAAoF;IACpF,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC,sFAAsF;IACtF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,oFAAoF;IACpF,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,8FAA8F;IAC9F,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uGAAuG;IACvG,kBAAkB,CAAC,EAAE,SAAS,GAAG,YAAY,CAAC;CAC/C;AAED,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,IAAI,GAAE,qBAAsC,GAC3C,CAAC,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAsYnE;AAGD,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC"}

package/esm/src/server/runtime-handler/index.js CHANGED Viewed

@@ -11,10 +11,7 @@ import { getConfig } from "../../config/loader.js";
 import { errorToRFC9457Response, getErrorMessage, UNKNOWN_ERROR } from "../../errors/index.js";
 import { RouteRegistry } from "../../routing/registry/index.js";
 import { SecurityConfigLoader } from "../../security/http/config.js";
-import { getHostEnv } from "../../platform/compat/process.js";
-import { normalizeSourceIntegrationPolicy } from "../../integrations/source-policy.js";
 import { runWithExactSourceIntegrationPolicy } from "../../integrations/source-policy-context.js";
-import { createRequestContext } from "../context/request-context.js";
 // Handler imports
 import { AuthHandler } from "../../security/http/auth.js";
 import { CsrfHandler } from "../../security/http/csrf/csrf-handler.js";
@@ -57,19 +54,16 @@ import { ProjectsHandler } from "../handlers/dev/projects/index.js";
 // Extracted modules
 import { endRequestTracing, executeWithTracingContext, setProjectAttributes, setRequestAttributes, SpanNames, startRequestTracing, withSpan, } from "./tracing.js";
 import { completeRequestTracking, completeRequestTrackingOnResponseEnd, endContentMetrics, endRequestLifecycle, incrementRequestMetrics, startContentMetrics, startRequestLifecycle, startRequestTracking, timeAsync, } from "./request-lifecycle.js";
-import { extractRequestHeaders, resolveProject } from "./project-resolution.js";
 import { checkRequestIsolation, completeIsolatedRequest, completeIsolatedRequestOnSettlement, createIsolationErrorResponse, startIsolatedRequest, } from "./isolation.js";
-import { resolveAdapter } from "./adapter-factory.js";
 import { defaultDiscoveryCache } from "./local-project-discovery.js";
-import { resolveEnvironment } from "./environment-resolution.js";
-import { buildHandlerContext, buildMinimalContext } from "./handler-context-builder.js";
+import { buildMinimalContext } from "./handler-context-builder.js";
 import { handleProjectsRequest, shouldHandleProjectsUI } from "./projects-handler.js";
-import { HTTP_GATEWAY_TIMEOUT, isLightweightPath, isMonitoringPath, isWebSocketPath, shouldSkipEnrichedContext, } from "./request-utils.js";
+import { HTTP_GATEWAY_TIMEOUT, isLightweightPath, isMonitoringPath } from "./request-utils.js";
 import { withRequestTimeout } from "./timeout-manager.js";
 import { EnvironmentVariableCache, fetchProjectEnvVars, filterRuntimeProjectEnv, runWithProjectEnv, } from "../project-env/index.js";
 import { SCANNER_PATH_PATTERN } from "../../utils/constants/security.js";
-import { isProxyTrusted } from "../utils/proxy-trust.js";
 import { projectMiddlewareRuntime } from "./project-middleware.js";
+import { prepareProjectRequest, resolveProjectIdentity, resolveProjectRuntimeContext, } from "./project-runtime-context.js";
 // Re-export from dedicated module for lightweight imports
 export { parseProxyEnvironment } from "./proxy-environment.js";
 const baseLogger = getBaseLogger("SERVER");
@@ -249,36 +243,35 @@ export function createVeryfrontHandler(projectDir, adapter, opts = { projectDir
                 endRequestLifecycle(lifecycle);
             }
         }
-        // Build logger context
-        const hostHeader = req.headers.get("host") ?? url.host;
-        const domain = hostHeader.replace(/:\d+$/, "");
-        const proxyTrustPublicKeyPem = adapter.env.get("CHANNEL_DISPATCH_SIGNING_PUBLIC_KEY") ??
-            getHostEnv("CHANNEL_DISPATCH_SIGNING_PUBLIC_KEY");
-        const proxyTrusted = isProxyMode
-            ? await isProxyTrusted(req, { publicKeyPem: proxyTrustPublicKeyPem })
-            : undefined;
-        const headers = extractRequestHeaders(req, url, proxyTrusted);
+        const preparedRequest = await prepareProjectRequest({
+            req,
+            url,
+            isProxyMode,
+            adapterEnv: adapter.env,
+        });
+        const { headers, requestContext: reqCtx } = preparedRequest;
+        const { proxyTrusted } = preparedRequest.proxyTrust;
         const loggerContext = {
             logger: logger.child({
                 requestId: lifecycle.requestId,
                 request_url: req.url,
-                domain,
-                project_slug: headers.projectSlug,
-                project_id: headers.projectId,
-                release_id: headers.releaseId,
-                branch_id: headers.branchId,
-                branch_name: headers.branchName,
-                pathname: url.pathname,
+                domain: preparedRequest.loggerFacts.domain,
+                project_slug: preparedRequest.loggerFacts.projectSlug,
+                project_id: preparedRequest.loggerFacts.projectId,
+                release_id: preparedRequest.loggerFacts.releaseId,
+                branch_id: preparedRequest.loggerFacts.branchId,
+                branch_name: preparedRequest.loggerFacts.branchName,
+                pathname: preparedRequest.loggerFacts.pathname,
             }),
             requestId: lifecycle.requestId,
-            projectSlug: headers.projectSlug,
-            projectId: headers.projectId,
-            domain,
+            projectSlug: preparedRequest.loggerFacts.projectSlug,
+            projectId: preparedRequest.loggerFacts.projectId,
+            domain: preparedRequest.loggerFacts.domain,
         };
         return runWithRequestContextAsync(loggerContext, async () => {
             const spanInfo = startRequestTracing(req, url.pathname);
             setRequestAttributes(spanInfo.span, req, url);
-            startRequestTracking(lifecycle.requestId, headers.projectSlug, url.pathname, req.method, headers.environment, headers.releaseId);
+            startRequestTracking(lifecycle.requestId, preparedRequest.trackingFacts.projectSlug, preparedRequest.trackingFacts.pathname, preparedRequest.trackingFacts.method, preparedRequest.trackingFacts.environment, preparedRequest.trackingFacts.releaseId);
             startContentMetrics();
             // Check isolation
             const isolationCheck = checkRequestIsolation(headers.projectSlug, lifecycle.shouldCheckIsolation);
@@ -295,50 +288,23 @@ export function createVeryfrontHandler(projectDir, adapter, opts = { projectDir
             }
             startIsolatedRequest(headers.projectSlug, lifecycle.shouldCheckIsolation);
             try {
-                // Early validation: in proxy mode, required context headers must be present.
-                // Without these, the server cannot authenticate or resolve the project, and
-                // proceeding would cause cryptic 500s deep in the rendering pipeline.
-                if (isProxyMode && !isLightweightPath(url.pathname) && !isWebSocketPath(url.pathname)) {
-                    const token = req.headers.get("x-token");
-                    const missingHeader = !headers.projectSlug
-                        ? {
-                            error: "Missing project context",
-                            detail: "x-project-slug header is required in proxy mode",
-                        }
-                        : !token
-                            ? {
-                                error: "Missing authentication context",
-                                detail: "x-token header is required in proxy mode",
-                            }
-                            : null;
-                    const hasTrustSensitiveProxyHeaders = !!req.headers.get("x-project-path");
-                    const untrustedProxyContext = !missingHeader && hasTrustSensitiveProxyHeaders &&
-                        !proxyTrusted;
-                    const proxyContextError = untrustedProxyContext
-                        ? {
-                            error: "Untrusted proxy context",
-                            detail: "proxy context headers require a trusted upstream proxy",
-                        }
-                        : null;
-                    const proxyGuardError = missingHeader ?? proxyContextError;
-                    if (proxyGuardError) {
-                        logger.warn(proxyGuardError.detail, {
-                            pathname: url.pathname,
-                            domain,
-                            projectSlug: headers.projectSlug,
-                            host: req.headers.get("host"),
-                            forwardedHost: req.headers.get("x-forwarded-host"),
-                        });
-                        endContentMetrics({
-                            requestId: lifecycle.requestId,
-                            pathname: url.pathname,
-                            mode: "proxy",
-                        });
-                        completeRequestTracking(lifecycle.requestId, 502, false);
-                        completeIsolatedRequest(headers.projectSlug, lifecycle.shouldCheckIsolation, false);
-                        endRequestTracing(spanInfo.span, 502);
-                        return new Response(JSON.stringify(proxyGuardError), { status: 502, headers: { "Content-Type": "application/json" } });
-                    }
+                if (preparedRequest.proxyGuard) {
+                    logger.warn(preparedRequest.proxyGuard.detail, {
+                        pathname: url.pathname,
+                        domain: preparedRequest.loggerFacts.domain,
+                        projectSlug: headers.projectSlug,
+                        host: req.headers.get("host"),
+                        forwardedHost: req.headers.get("x-forwarded-host"),
+                    });
+                    endContentMetrics({
+                        requestId: lifecycle.requestId,
+                        pathname: url.pathname,
+                        mode: "proxy",
+                    });
+                    completeRequestTracking(lifecycle.requestId, 502, false);
+                    completeIsolatedRequest(headers.projectSlug, lifecycle.shouldCheckIsolation, false);
+                    endRequestTracing(spanInfo.span, 502);
+                    return preparedRequest.proxyGuard.response;
                 }
                 const profileCategory = url.pathname.startsWith("/_vf_styles/")
                     ? "css"
@@ -362,17 +328,19 @@ export function createVeryfrontHandler(projectDir, adapter, opts = { projectDir
                     await timeAsync("config:load", () => profilePhase("runtime.config_load", async () => {
                         await configPromise;
                     }));
-                    const reqCtx = createRequestContext(request, { proxyTrusted });
                     const wsSlugOverride = url.searchParams.get("x-project-slug") || undefined;
                     // Resolve project from various sources
-                    const projectRes = await profilePhase("runtime.resolve_project", () => resolveProject(request, url, headers, {
+                    const projectRes = await profilePhase("runtime.resolve_project", () => resolveProjectIdentity({
+                        req: request,
+                        url,
+                        headers,
                         config,
-                        reqCtx,
+                        requestContext: reqCtx,
                         defaultProjectSlug: opts.defaultProjectSlug,
                         defaultProjectId: opts.defaultProjectId,
                         defaultReleaseId: opts.defaultReleaseId,
                         wsSlugOverride,
-                        proxyTrusted,
+                        proxyTrust: { proxyTrusted },
                     }));
                     updateRequestProfileContext({ projectSlug: projectRes.projectSlug });
                     setProjectAttributes(spanInfo.span, projectRes.projectSlug, projectRes.proxyEnv);
@@ -382,87 +350,40 @@ export function createVeryfrontHandler(projectDir, adapter, opts = { projectDir
                         if (response)
                             return response;
                     }
-                    // Resolve adapter and config for project.
-                    // Note: `x-project-path` is NOT forwarded via `headers.projectPath` anymore;
-                    // `resolveAdapter` reads it directly from `req` and only honours it when the
-                    // request is proxy-trusted (see isProxyTrusted).
-                    const adapterRes = await profilePhase("runtime.resolve_adapter", () => resolveAdapter({
+                    const runtimeContext = await resolveProjectRuntimeContext({
                         req: request,
+                        url,
                         projectDir,
                         adapter,
                         config,
-                        projectSlug: projectRes.projectSlug,
-                        projectId: projectRes.projectId,
-                        proxyToken: reqCtx.token,
-                        releaseId: projectRes.releaseId,
-                        proxyEnv: projectRes.proxyEnv,
-                        branch: reqCtx.branch,
-                        environmentName: projectRes.environmentName,
-                        parsedDomain: projectRes.parsedDomain,
-                        pathname: url.pathname,
-                        isProxyMode,
-                        proxyTrusted,
-                    }));
-                    // Resolve environment and validate
-                    const host = request.headers.get("x-forwarded-host") ||
-                        request.headers.get("host") || url.host;
-                    const envRes = resolveEnvironment({
-                        proxyEnv: projectRes.proxyEnv,
-                        reqCtxMode: reqCtx.mode,
-                        releaseId: projectRes.releaseId,
-                        projectSlug: projectRes.projectSlug,
-                        projectId: projectRes.projectId,
-                        environmentName: projectRes.environmentName,
-                        host,
-                        isLocalProject: adapterRes.isLocalProject,
+                        projectIdentity: projectRes,
+                        headers,
+                        requestContext: reqCtx,
                         isProxyMode,
-                        pathname: url.pathname,
-                        defaultEnvironment: opts.defaultEnvironment,
-                    });
-                    if (envRes.errorResponse) {
-                        return envRes.errorResponse;
-                    }
-                    updateRequestProfileContext({ requestMode: envRes.resolvedEnvironment });
-                    const skipRenderEnrichedContext = shouldSkipEnrichedContext(url.pathname);
-                    // Build handler context
-                    const ctx = buildHandlerContext({
-                        projectDir: adapterRes.projectDir,
-                        adapter: adapterRes.adapter,
+                        proxyTrust: { proxyTrusted },
                         securityConfig: securityLoader.getSecurityConfig(),
                         cspUserHeader: securityLoader.getCspUserHeader(),
                         debug: opts.debug,
-                        config: adapterRes.config,
-                        parsedDomain: projectRes.parsedDomain,
-                        projectSlug: projectRes.projectSlug,
-                        projectId: projectRes.projectId,
-                        releaseId: envRes.releaseId,
-                        proxyToken: reqCtx.token,
-                        environmentName: projectRes.environmentName,
-                        resolvedEnvironment: envRes.resolvedEnvironment ?? "preview",
-                        requestContext: reqCtx,
                         routeRegistry: registry,
-                        isLocalProject: adapterRes.isLocalProject,
                         moduleServerUrl: opts.moduleServerUrl,
-                        environmentId: headers.environmentId,
-                        skipEnrichedContext: skipRenderEnrichedContext,
+                        defaultEnvironment: opts.defaultEnvironment,
+                        envVarCache,
+                        profileAdapter: (operation) => profilePhase("runtime.resolve_adapter", operation),
+                        profileEnvVars: (operation) => profilePhase("runtime.load_env_vars", operation),
+                        onEnvironmentResolved: (envRes) => {
+                            updateRequestProfileContext({ requestMode: envRes.resolvedEnvironment });
+                        },
+                        logDebug,
                     });
-                    // Fetch per-project env vars for remote projects
-                    let envVarsForRequest = {};
-                    if (!adapterRes.isLocalProject &&
-                        headers.environmentId &&
-                        reqCtx.token &&
-                        projectRes.projectSlug) {
-                        const environmentId = headers.environmentId;
-                        const projectSlug = projectRes.projectSlug;
-                        envVarsForRequest = await profilePhase("runtime.load_env_vars", () => envVarCache.get(environmentId, reqCtx.token, projectSlug));
-                        logDebug("[runtime-handler] Project env vars fetched", {
-                            projectSlug,
-                            environmentId,
-                            count: Object.keys(envVarsForRequest).length,
-                        });
+                    const adapterRes = runtimeContext.adapter;
+                    const envRes = runtimeContext.environment;
+                    if (envRes.errorResponse) {
+                        return envRes.errorResponse;
                     }
+                    const ctx = runtimeContext.handlerContext;
+                    const envVarsForRequest = runtimeContext.rawEnvVars;
                     await incrementRequestMetrics();
-                    const sourceIntegrationPolicy = normalizeSourceIntegrationPolicy(adapterRes.config?.integrations);
+                    const sourceIntegrationPolicy = runtimeContext.sourceIntegrationPolicy;
                     const executeProjectRoute = () => projectMiddlewareRuntime.execute({
                         request,
                         handlerContext: ctx,

package/esm/src/server/runtime-handler/project-runtime-context.d.ts ADDED Viewed

@@ -0,0 +1,118 @@
+import type { VeryfrontConfig } from "../../config/index.js";
+import type { RuntimeAdapter } from "../../platform/adapters/base.js";
+import type { RouteRegistry } from "../../routing/registry/index.js";
+import type { SecurityConfig } from "../../types/index.js";
+import { normalizeSourceIntegrationPolicy } from "../../integrations/source-policy.js";
+import { createRequestContext } from "../context/request-context.js";
+import type { HandlerContext } from "../handlers/types.js";
+import { resolveAdapter } from "./adapter-factory.js";
+import { resolveEnvironment } from "./environment-resolution.js";
+import { extractRequestHeaders, resolveProject } from "./project-resolution.js";
+type AdapterEnvLike = {
+    get(key: string): string | undefined;
+};
+type ProxyTrustVerifier = (req: Request, options: {
+    publicKeyPem?: string;
+}) => Promise<boolean>;
+export interface PrepareProjectRequestInput {
+    req: Request;
+    url: URL;
+    isProxyMode: boolean;
+    adapterEnv?: AdapterEnvLike;
+    trustProxy?: ProxyTrustVerifier;
+}
+type ProjectRequestHeaders = ReturnType<typeof extractRequestHeaders>;
+type ProjectRequestContext = ReturnType<typeof createRequestContext>;
+type ProjectIdentityResolution = Awaited<ReturnType<typeof resolveProject>>;
+type ProjectAdapterResolution = Awaited<ReturnType<typeof resolveAdapter>>;
+type ProjectEnvironmentResolution = ReturnType<typeof resolveEnvironment>;
+type SourceIntegrationPolicy = ReturnType<typeof normalizeSourceIntegrationPolicy>;
+type ProjectEnvVarCacheLike = {
+    get(environmentId: string, token: string, projectSlug: string): Promise<Record<string, string>>;
+};
+type RuntimeContextProfiler = <T>(operation: () => Promise<T>) => Promise<T>;
+export interface PreparedProjectRequest {
+    url: URL;
+    headers: ProjectRequestHeaders;
+    requestContext: ProjectRequestContext;
+    proxyTrust: {
+        proxyTrusted: boolean | undefined;
+    };
+    loggerFacts: RequestContextFacts;
+    trackingFacts: RequestTrackingFacts;
+    proxyGuard?: ProxyGuardResult;
+}
+export interface ResolveProjectIdentityInput {
+    operation?: string;
+    req: Request;
+    url: URL;
+    headers: ProjectRequestHeaders;
+    requestContext: ProjectRequestContext;
+    config: VeryfrontConfig | undefined;
+    defaultProjectSlug: string | undefined;
+    defaultProjectId: string | undefined;
+    defaultReleaseId: string | undefined;
+    wsSlugOverride: string | undefined;
+    proxyTrust: {
+        proxyTrusted: boolean | undefined;
+    };
+}
+export interface ResolveProjectRuntimeContextInput {
+    req: Request;
+    url: URL;
+    projectDir: string;
+    adapter: RuntimeAdapter;
+    config: VeryfrontConfig | undefined;
+    projectIdentity: ProjectIdentityResolution;
+    headers: ProjectRequestHeaders;
+    requestContext: ProjectRequestContext;
+    isProxyMode: boolean;
+    proxyTrust: {
+        proxyTrusted: boolean | undefined;
+    };
+    securityConfig: SecurityConfig | null;
+    cspUserHeader: string | null;
+    debug: boolean | undefined;
+    routeRegistry: RouteRegistry;
+    moduleServerUrl: string | undefined;
+    environmentId?: string;
+    defaultEnvironment?: "preview" | "production";
+    skipEnrichedContext?: boolean;
+    envVarCache: ProjectEnvVarCacheLike;
+    profileAdapter?: RuntimeContextProfiler;
+    profileEnvVars?: RuntimeContextProfiler;
+    onEnvironmentResolved?: (environment: ProjectEnvironmentResolution) => void;
+    logDebug?: (message: string, extra?: Record<string, unknown>) => void;
+}
+export interface ProjectRuntimeContextResolution {
+    adapter: ProjectAdapterResolution;
+    environment: ProjectEnvironmentResolution;
+    handlerContext: HandlerContext | undefined;
+    rawEnvVars: Record<string, string>;
+    sourceIntegrationPolicy: SourceIntegrationPolicy;
+}
+interface RequestContextFacts {
+    domain: string;
+    projectSlug: string | undefined;
+    projectId: string | undefined;
+    releaseId: string | undefined;
+    branchId: string | undefined;
+    branchName: string | undefined;
+    pathname: string;
+}
+interface RequestTrackingFacts {
+    projectSlug: string | undefined;
+    pathname: string;
+    method: string;
+    environment: string | undefined;
+    releaseId: string | undefined;
+}
+interface ProxyGuardResult {
+    detail: string;
+    response: Response;
+}
+export declare function prepareProjectRequest(input: PrepareProjectRequestInput): Promise<PreparedProjectRequest>;
+export declare function resolveProjectIdentity(input: ResolveProjectIdentityInput): Promise<ProjectIdentityResolution>;
+export declare function resolveProjectRuntimeContext(input: ResolveProjectRuntimeContextInput): Promise<ProjectRuntimeContextResolution>;
+export {};
+//# sourceMappingURL=project-runtime-context.d.ts.map

package/esm/src/server/runtime-handler/project-runtime-context.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"project-runtime-context.d.ts","sourceRoot":"","sources":["../../../../src/src/server/runtime-handler/project-runtime-context.ts"],"names":[],"mappings":"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"}