veryfront 0.1.812 → 0.1.813

package/esm/src/proxy/handler.js

@@ -5,6 +5,7 @@ import { computeContentSourceId } from "../cache/keys.js";
 import { checkProtectedProxyAccess } from "./proxy-access-control.js";
 import { createLocalProjectResolver } from "./local-project-resolver.js";
 import { isMissingCustomDomainProjectError, resolveProxyRequestToken, } from "./proxy-token-resolution.js";
+import { createProjectNotFoundProxyContext, createProxyErrorContext, createReleaseNotFoundProxyContext, } from "./proxy-error-context.js";
 export { __resetCachedAuthProviderForTests } from "./proxy-access-control.js";
 export const INTERNAL_PROXY_HEADERS = [
     "x-token",
@@ -113,23 +114,6 @@ export function createProxyHandler(options) {
             missing.push("VERYFRONT_PROXY_API_CLIENT_SECRET");
         return missing;
     }
-    function makeErrorContext(base, status, message, token, redirectUrl, slug) {
-        return {
-            token,
-            projectSlug: undefined,
-            projectId: undefined,
-            environment: base.scope,
-            contentSourceId: "error",
-            localPath: undefined,
-            host: base.host,
-            parsedDomain: base.parsedDomain,
-            isLocalProject: false,
-            error: { status, message, redirectUrl, slug },
-        };
-    }
-    function makeProjectNotFoundContext(base, message, token) {
-        return makeErrorContext(base, 404, message, token, undefined, "project-not-found");
-    }
     async function resolveReleaseAndProtection(req, url, token, userToken, lookupKey, envMatcher, logContext) {
         const lookupResult = await lookupProjectByDomain(lookupKey, config.apiBaseUrl, token, logger);
         if (!lookupResult)
@@ -213,10 +197,10 @@ export function createProxyHandler(options) {
                 if (status === 404) {
                     if (scope === "preview") {
                         logger?.info("Preview project not found", { projectSlug, host });
-                        return makeProjectNotFoundContext(base, "Preview project not found");
+                        return createProjectNotFoundProxyContext(base, "Preview project not found");
                     }
                     logger?.info("Project not found", { projectSlug, host, scope });
-                    return makeProjectNotFoundContext(base, "Project not found");
+                    return createProjectNotFoundProxyContext(base, "Project not found");
                 }
                 const message = scope === "preview"
                     ? "Failed to authenticate preview request"
@@ -228,7 +212,7 @@ export function createProxyHandler(options) {
                     hadUserToken: !!userToken,
                     hadTokenFetchError: !!tokenFetchError,
                 });
-                return makeErrorContext(base, 502, message);
+                return createProxyErrorContext(base, { status: 502, message });
             }
             if (isCustomDomain && !projectSlug) {
                 if (!token) {
@@ -236,15 +220,26 @@ export function createProxyHandler(options) {
                         logger?.info("Custom domain project not found during token fetch", {
                             domain: host,
                         });
-                        return makeErrorContext(base, 404, `No project configured for domain: ${host}`);
+                        return createProxyErrorContext(base, {
+                            status: 404,
+                            message: `No project configured for domain: ${host}`,
+                        });
                     }
                     logger?.error("Cannot process custom domain without token", undefined, { domain: host });
-                    return makeErrorContext(base, 502, `Failed to authenticate for domain: ${host}`, token);
+                    return createProxyErrorContext(base, {
+                        status: 502,
+                        message: `Failed to authenticate for domain: ${host}`,
+                        token,
+                    });
                 }
                 const lookupResult = await lookupProjectByDomain(host, config.apiBaseUrl, token, logger);
                 if (!lookupResult) {
                     logger?.info("Custom domain not found", { domain: host });
-                    return makeErrorContext(base, 404, `No project configured for domain: ${host}`, token);
+                    return createProxyErrorContext(base, {
+                        status: 404,
+                        message: `No project configured for domain: ${host}`,
+                        token,
+                    });
                 }
                 projectSlug = lookupResult.slug;
                 projectId = lookupResult.id;
@@ -264,7 +259,12 @@ export function createProxyHandler(options) {
                     isSignedInternalControlPlaneRequest: isSignedInternalControlPlaneRequest(req, url),
                 });
                 if (protectionError) {
-                    return makeErrorContext(base, protectionError.status, protectionError.message, token, protectionError.redirectUrl);
+                    return createProxyErrorContext(base, {
+                        status: protectionError.status,
+                        message: protectionError.message,
+                        token,
+                        redirectUrl: protectionError.redirectUrl,
+                    });
                 }
                 logger?.info("Resolved custom domain to project", {
                     domain: host,
@@ -278,7 +278,12 @@ export function createProxyHandler(options) {
                 const targetEnv = parsedDomain.environment.toLowerCase();
                 const resolved = await resolveReleaseAndProtection(req, url, token, userToken, projectSlug, (env) => env.name.toLowerCase() === targetEnv, { projectSlug });
                 if ("error" in resolved) {
-                    return makeErrorContext(base, resolved.error.status, resolved.error.message, token, resolved.error.redirectUrl);
+                    return createProxyErrorContext(base, {
+                        status: resolved.error.status,
+                        message: resolved.error.message,
+                        token,
+                        redirectUrl: resolved.error.redirectUrl,
+                    });
                 }
                 if (!resolved.projectId) {
                     logger?.info("Project not found after lookup", {
@@ -287,7 +292,7 @@ export function createProxyHandler(options) {
                         scope,
                         targetEnvName: parsedDomain.environment,
                     });
-                    return makeProjectNotFoundContext(base, "Project not found", token);
+                    return createProjectNotFoundProxyContext(base, "Project not found", token);
                 }
                 projectId = resolved.projectId;
                 releaseId = resolved.releaseId;
@@ -305,11 +310,16 @@ export function createProxyHandler(options) {
                 // still enforce the environment's `protected` flag like other scopes.
                 const resolved = await resolveReleaseAndProtection(req, url, token, userToken, projectSlug, (env) => env.name.toLowerCase() === "preview", { projectSlug });
                 if ("error" in resolved) {
-                    return makeErrorContext(base, resolved.error.status, resolved.error.message, token, resolved.error.redirectUrl);
+                    return createProxyErrorContext(base, {
+                        status: resolved.error.status,
+                        message: resolved.error.message,
+                        token,
+                        redirectUrl: resolved.error.redirectUrl,
+                    });
                 }
                 if (!resolved.projectId) {
                     logger?.info("Preview project not found after lookup", { projectSlug, host });
-                    return makeProjectNotFoundContext(base, "Preview project not found", token);
+                    return createProjectNotFoundProxyContext(base, "Preview project not found", token);
                 }
                 projectId = resolved.projectId;
                 environmentId = resolved.environmentId;
@@ -329,7 +339,7 @@ export function createProxyHandler(options) {
                 host,
                 environment: scope,
             });
-            return makeErrorContext({ scope, host, parsedDomain }, 404, "No active release found", token, undefined, "release-not-found");
+            return createReleaseNotFoundProxyContext({ scope, host, parsedDomain }, token);
         }
         const contentSourceId = computeContentSourceId(isLocalProject, scope, parsedDomain.branch, releaseId);
         return {

package/esm/src/proxy/main.js

@@ -35,6 +35,8 @@ import { exit, getEnv, onSignal } from "../platform/compat/process.js";
 import { createHttpServer, upgradeWebSocket } from "../platform/compat/http/index.js";
 import { createProxyErrorResponse, jsonErrorResponse } from "./error-response.js";
 import { handleReleaseAssetRequest, isReleaseAssetPath } from "./asset-handler.js";
+import { runProxyRequestLifecycle } from "./request-lifecycle.js";
+import { createUpstreamFailureResponse, createUpstreamTimeoutResponse, UPSTREAM_FAILURE_STATUS, UPSTREAM_TIMEOUT_STATUS, } from "./upstream-error-response.js";
 function getLocalProjects() {
     const raw = getEnv("LOCAL_PROJECTS");
     return raw ? JSON.parse(raw) : {};
@@ -231,9 +233,7 @@ function forwardToServer(req, url) {
     const startTime = performance.now();
     const requestId = dntShim.crypto.randomUUID();
     const host = req.headers.get("host") || "";
-    const parentContext = extractContext(req.headers);
-    const spanInfo = startServerSpan(req.method, url.pathname, parentContext);
-    const execute = async () => {
+    const execute = async (lifecycle) => {
         try {
             const ctx = await proxyHandler.processRequest(req, { url });
             return runWithProxyRequestContext({
@@ -250,7 +250,7 @@ function forwardToServer(req, url) {
                     const ms = Math.round(performance.now() - startTime);
                     const logLevel = getProxyFailureLogLevel(ctx.error.status, req.method, url.pathname);
                     proxyLogger[logLevel](`${ctx.error.status} ${req.method} ${url.pathname}`, { ms });
-                    endSpan(spanInfo?.span, ctx.error.status);
+                    lifecycle.end(ctx.error.status);
                     return createProxyErrorResponse(ctx.error);
                 }
                 const reqLogger = proxyLogger.child({
@@ -332,7 +332,6 @@ function forwardToServer(req, url) {
                         else {
                             reqLogger.info(`${response.status} ${req.method} ${url.pathname}`, { ms });
                         }
-                        endSpan(spanInfo?.span, response.status);
                         return new Response(response.body, {
                             status: response.status,
                             statusText: response.statusText,
@@ -344,15 +343,12 @@ function forwardToServer(req, url) {
                         lastError = error;
                         if (error instanceof Error && error.name === "AbortError") {
                             const ms = Math.round(performance.now() - startTime);
-                            proxyLogger.error(`504 ${req.method} ${url.pathname}`, {
+                            proxyLogger.error(`${UPSTREAM_TIMEOUT_STATUS} ${req.method} ${url.pathname}`, {
                                 ms,
                                 timeoutMs: VERYFRONT_SERVER_REQUEST_TIMEOUT_MS,
                             });
-                            endSpan(spanInfo?.span, 504, error);
-                            return jsonErrorResponse(504, {
-                                error: "Gateway Timeout",
-                                message: `Server request timed out after ${VERYFRONT_SERVER_REQUEST_TIMEOUT_MS}ms`,
-                            });
+                            lifecycle.end(UPSTREAM_TIMEOUT_STATUS, error);
+                            return createUpstreamTimeoutResponse(VERYFRONT_SERVER_REQUEST_TIMEOUT_MS);
                         }
                         // Check if this is a retryable error and we have retries left
                         if (isRetryableConnectionError(error) && attempt < maxRetries) {
@@ -379,26 +375,31 @@ function forwardToServer(req, url) {
                 }
                 // All retries exhausted or non-retryable error
                 const ms = Math.round(performance.now() - startTime);
-                const logLevel = getProxyFailureLogLevel(502, req.method, url.pathname);
-                proxyLogger[logLevel](`502 ${req.method} ${url.pathname}`, { ms }, lastError);
-                endSpan(spanInfo?.span, 502, lastError);
-                return jsonErrorResponse(502, {
-                    error: "Proxy Error",
-                    message: lastError instanceof Error ? lastError.message : "Unknown error",
-                });
+                const logLevel = getProxyFailureLogLevel(UPSTREAM_FAILURE_STATUS, req.method, url.pathname);
+                proxyLogger[logLevel](`${UPSTREAM_FAILURE_STATUS} ${req.method} ${url.pathname}`, { ms }, lastError);
+                lifecycle.end(UPSTREAM_FAILURE_STATUS, lastError);
+                return createUpstreamFailureResponse(lastError);
             });
         }
         catch (error) {
             const ms = Math.round(performance.now() - startTime);
             proxyLogger.error(`500 ${req.method} ${url.pathname}`, { ms }, error);
-            endSpan(spanInfo?.span, 500, error);
+            lifecycle.end(500, error);
             return jsonErrorResponse(500, {
                 error: "Internal Proxy Error",
                 message: error instanceof Error ? error.message : "Unknown error",
             });
         }
     };
-    return spanInfo?.context ? withContext(spanInfo.context, execute) : execute();
+    return runProxyRequestLifecycle({
+        req,
+        url,
+        startServerSpan,
+        endSpan,
+        extractContext,
+        withContext,
+        handle: execute,
+    });
 }
 /**
  * Handle stats endpoint for monitoring.

package/esm/src/proxy/proxy-error-context.d.ts

@@ -0,0 +1,20 @@
+import type { ParsedDomain } from "../server/utils/domain-parser.js";
+import type { TokenScope } from "./token-manager.js";
+import type { ProxyContext } from "./handler.js";
+export type ProxyErrorSlug = "authentication-failed" | "project-not-found" | "release-not-found";
+export interface ProxyErrorContextBase {
+    scope: TokenScope;
+    host: string;
+    parsedDomain: ParsedDomain;
+}
+export interface ProxyErrorContextOptions {
+    status: number;
+    message: string;
+    token?: string;
+    redirectUrl?: string;
+    slug?: ProxyErrorSlug;
+}
+export declare function createProxyErrorContext(base: ProxyErrorContextBase, options: ProxyErrorContextOptions): ProxyContext;
+export declare function createProjectNotFoundProxyContext(base: ProxyErrorContextBase, message: "Preview project not found" | "Project not found", token?: string): ProxyContext;
+export declare function createReleaseNotFoundProxyContext(base: ProxyErrorContextBase, token?: string): ProxyContext;
+//# sourceMappingURL=proxy-error-context.d.ts.map

package/esm/src/proxy/proxy-error-context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxy-error-context.d.ts","sourceRoot":"","sources":["../../../src/src/proxy/proxy-error-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,MAAM,cAAc,GACtB,uBAAuB,GACvB,mBAAmB,GACnB,mBAAmB,CAAC;AAExB,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,UAAU,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,cAAc,CAAC;CACvB;AAED,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,qBAAqB,EAC3B,OAAO,EAAE,wBAAwB,GAChC,YAAY,CAkBd;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,qBAAqB,EAC3B,OAAO,EAAE,2BAA2B,GAAG,mBAAmB,EAC1D,KAAK,CAAC,EAAE,MAAM,GACb,YAAY,CAOd;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,qBAAqB,EAC3B,KAAK,CAAC,EAAE,MAAM,GACb,YAAY,CAOd"}

package/esm/src/proxy/proxy-error-context.js

@@ -0,0 +1,35 @@
+export function createProxyErrorContext(base, options) {
+    return {
+        token: options.token,
+        projectSlug: undefined,
+        projectId: undefined,
+        environment: base.scope,
+        contentSourceId: "error",
+        localPath: undefined,
+        host: base.host,
+        parsedDomain: base.parsedDomain,
+        isLocalProject: false,
+        error: {
+            status: options.status,
+            message: options.message,
+            redirectUrl: options.redirectUrl,
+            slug: options.slug,
+        },
+    };
+}
+export function createProjectNotFoundProxyContext(base, message, token) {
+    return createProxyErrorContext(base, {
+        status: 404,
+        message,
+        token,
+        slug: "project-not-found",
+    });
+}
+export function createReleaseNotFoundProxyContext(base, token) {
+    return createProxyErrorContext(base, {
+        status: 404,
+        message: "No active release found",
+        token,
+        slug: "release-not-found",
+    });
+}

package/esm/src/proxy/request-lifecycle.d.ts

@@ -0,0 +1,19 @@
+import type { Context, Span } from "../observability/tracing/api-shim.js";
+export interface ProxyRequestLifecycle {
+    end(statusCode: number, error?: Error): void;
+}
+export interface RunProxyRequestLifecycleOptions {
+    req: Request;
+    url: URL;
+    extractContext(headers: Headers): Context | undefined;
+    startServerSpan(method: string, path: string, parentContext?: Context): {
+        span: Span;
+        context: Context;
+    } | null;
+    withContext<T>(spanContext: Context, fn: () => Promise<T>): Promise<T>;
+    endSpan(span: Span | undefined, statusCode: number, error?: Error): void;
+    handle(lifecycle: ProxyRequestLifecycle): Promise<Response>;
+}
+/** Run a proxied HTTP request with tracing context and exactly-once span finalization. */
+export declare function runProxyRequestLifecycle(options: RunProxyRequestLifecycleOptions): Promise<Response>;
+//# sourceMappingURL=request-lifecycle.d.ts.map

package/esm/src/proxy/request-lifecycle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-lifecycle.d.ts","sourceRoot":"","sources":["../../../src/src/proxy/request-lifecycle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,sCAAsC,CAAC;AAE1E,MAAM,WAAW,qBAAqB;IACpC,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;CAC9C;AAED,MAAM,WAAW,+BAA+B;IAC9C,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,GAAG,CAAC;IACT,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;IACtD,eAAe,CACb,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,aAAa,CAAC,EAAE,OAAO,GACtB;QAAE,IAAI,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;IAC3C,WAAW,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACvE,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IACzE,MAAM,CAAC,SAAS,EAAE,qBAAqB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC7D;AAED,0FAA0F;AAC1F,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,+BAA+B,GACvC,OAAO,CAAC,QAAQ,CAAC,CA0BnB"}

package/esm/src/proxy/request-lifecycle.js

@@ -0,0 +1,27 @@
+/** Run a proxied HTTP request with tracing context and exactly-once span finalization. */
+export async function runProxyRequestLifecycle(options) {
+    const parentContext = options.extractContext(options.req.headers);
+    const spanInfo = options.startServerSpan(options.req.method, options.url.pathname, parentContext);
+    let ended = false;
+    const lifecycle = {
+        end(statusCode, error) {
+            if (ended)
+                return;
+            ended = true;
+            options.endSpan(spanInfo?.span, statusCode, error);
+        },
+    };
+    const execute = async () => {
+        try {
+            const response = await options.handle(lifecycle);
+            lifecycle.end(response.status);
+            return response;
+        }
+        catch (error) {
+            const spanError = error instanceof Error ? error : new Error(String(error));
+            lifecycle.end(500, spanError);
+            throw error;
+        }
+    };
+    return spanInfo?.context ? options.withContext(spanInfo.context, execute) : execute();
+}

package/esm/src/proxy/upstream-error-response.d.ts

@@ -0,0 +1,5 @@
+export declare const UPSTREAM_TIMEOUT_STATUS = 504;
+export declare const UPSTREAM_FAILURE_STATUS = 502;
+export declare function createUpstreamTimeoutResponse(timeoutMs: number): Response;
+export declare function createUpstreamFailureResponse(error: unknown): Response;
+//# sourceMappingURL=upstream-error-response.d.ts.map

package/esm/src/proxy/upstream-error-response.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"upstream-error-response.d.ts","sourceRoot":"","sources":["../../../src/src/proxy/upstream-error-response.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAC3C,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAE3C,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,MAAM,GAAG,QAAQ,CAKzE;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,OAAO,GAAG,QAAQ,CAKtE"}

package/esm/src/proxy/upstream-error-response.js

@@ -0,0 +1,15 @@
+import { jsonErrorResponse } from "./error-response.js";
+export const UPSTREAM_TIMEOUT_STATUS = 504;
+export const UPSTREAM_FAILURE_STATUS = 502;
+export function createUpstreamTimeoutResponse(timeoutMs) {
+    return jsonErrorResponse(UPSTREAM_TIMEOUT_STATUS, {
+        error: "Gateway Timeout",
+        message: `Server request timed out after ${timeoutMs}ms`,
+    });
+}
+export function createUpstreamFailureResponse(error) {
+    return jsonErrorResponse(UPSTREAM_FAILURE_STATUS, {
+        error: "Proxy Error",
+        message: error instanceof Error ? error.message : "Unknown error",
+    });
+}

package/esm/src/release-assets/client-module-map.d.ts

@@ -0,0 +1,3 @@
+import type { ReleaseAssetManifest } from "./manifest-schema.js";
+export declare function buildReleaseAssetModules(manifest?: ReleaseAssetManifest | null): Record<string, string> | undefined;
+//# sourceMappingURL=client-module-map.d.ts.map

package/esm/src/release-assets/client-module-map.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-module-map.d.ts","sourceRoot":"","sources":["../../../src/src/release-assets/client-module-map.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEjE,wBAAgB,wBAAwB,CACtC,QAAQ,CAAC,EAAE,oBAAoB,GAAG,IAAI,GACrC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CASpC"}

package/esm/src/release-assets/client-module-map.js

@@ -0,0 +1,10 @@
+import { releaseAssetUrl } from "./constants.js";
+export function buildReleaseAssetModules(manifest) {
+    if (!manifest)
+        return undefined;
+    const modules = {};
+    for (const [path, entry] of Object.entries(manifest.modules)) {
+        modules[path] = releaseAssetUrl(entry.contentHash, "js");
+    }
+    return Object.keys(modules).length > 0 ? modules : undefined;
+}

package/esm/src/rendering/orchestrator/module-loader/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/module-loader/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAuBzE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAkBpE;;;;;;;;;GASG;AACH,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,cAAc,EAC5B,MAAM,EAAE,kBAAkB,EAC1B,eAAe,UAAQ,GACtB,OAAO,CAAC,MAAM,CAAC,CAgIjB;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,cAAc,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAyBD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAI5D;AAED;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA6DlC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/module-loader/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAiBzE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAOpE;;;;;;;;;GASG;AACH,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,cAAc,EAC5B,MAAM,EAAE,kBAAkB,EAC1B,eAAe,UAAQ,GACtB,OAAO,CAAC,MAAM,CAAC,CAsFjB;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,cAAc,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAyBD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAI5D;AAED;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA6DlC"}

package/esm/src/rendering/orchestrator/module-loader/index.js

@@ -8,23 +8,18 @@
  */
 import { rendererLogger } from "../../../utils/index.js";
 import { getLocalAdapter } from "../../../platform/adapters/registry.js";
-import { createFileSystem } from "../../../platform/compat/fs.js";
 import { getProjectTmpDir } from "../../../modules/react-loader/index.js";
 import { getHttpBundleCacheDir, getMdxEsmCacheDir } from "../../../utils/cache-dir.js";
 import { join } from "../../../platform/compat/path/index.js";
-import { invalidateMdxEsmModule, lookupMdxEsmCache, } from "../../../transforms/mdx/esm-module-loader/cache/index.js";
+import { invalidateMdxEsmModule } from "../../../transforms/mdx/esm-module-loader/cache/index.js";
 import { resolveModuleDependencies, rewriteResolvedDependencyImports, } from "./dependency-resolver.js";
 import { persistTransformedModule } from "./module-persistence.js";
-import { transformModuleCodeWithCache, UNRESOLVED_VF_MODULES_RE, } from "./module-transform-cache.js";
+import { transformModuleCodeWithCache } from "./module-transform-cache.js";
+import { getModuleCacheKey, resolveCachedModulePath } from "./module-cache-lookup.js";
 const logger = rendererLogger.component("module-loader");
 // Re-export utilities
 export { createEsmCache, createModuleCache, generateHash } from "./cache.js";
 export { fetchEsmModule, rewriteEsmPaths } from "./esm-rewriter.js";
-function getModuleCacheKey(filePath, projectId, projectDir, contentSourceId) {
-    const base = projectId ?? projectDir ?? "default";
-    const source = contentSourceId ?? "default";
-    return `${base}:${source}:${filePath}`;
-}
 function decodeFileContent(fileContent) {
     if (typeof fileContent === "string")
         return fileContent;
@@ -43,48 +38,17 @@ function decodeFileContent(fileContent) {
 export async function transformModuleWithDeps(filePath, tmpDir, localAdapter, config, useLocalAdapter = false) {
     const { moduleCache, projectDir, projectId, contentSourceId, adapter, mode } = config;
     const cacheKey = getModuleCacheKey(filePath, projectId, projectDir, contentSourceId);
-    const cachedPath = moduleCache.get(cacheKey);
+    const cachedPath = await resolveCachedModulePath({
+        cacheKey,
+        filePath,
+        projectDir,
+        projectId,
+        contentSourceId,
+        moduleCache,
+        reactVersion: config.reactVersion,
+    });
     if (cachedPath) {
-        // Validate cached file doesn't contain unresolved /_vf_modules/ imports
-        // These would fail at runtime and indicate stale cache from before framework import fix
-        try {
-            const cachedCode = await createFileSystem().readTextFile(cachedPath);
-            if (UNRESOLVED_VF_MODULES_RE.test(cachedCode)) {
-                logger.warn("[ModuleLoader] In-memory cache contains unresolved _vf_modules, invalidating", {
-                    filePath: filePath.slice(-60),
-                    cachedPath: cachedPath.slice(-60),
-                });
-                moduleCache.delete(cacheKey);
-                // Don't return - fall through to re-transform
-            }
-            else {
-                return cachedPath;
-            }
-        }
-        catch (_) {
-            /* expected: cached file may no longer exist on disk */
-            moduleCache.delete(cacheKey);
-        }
-    }
-    if (projectId && contentSourceId) {
-        const baseCacheDir = getMdxEsmCacheDir();
-        const projectKey = encodeURIComponent(projectId);
-        const sourceKey = encodeURIComponent(contentSourceId);
-        const mdxCacheDir = join(baseCacheDir, projectKey, sourceKey);
-        const mdxCacheResult = await lookupMdxEsmCache(filePath, mdxCacheDir, projectDir, undefined, {
-            projectId,
-            contentSourceId,
-        }, config.reactVersion);
-        if (mdxCacheResult.status === "hit") {
-            moduleCache.set(cacheKey, mdxCacheResult.path);
-            return mdxCacheResult.path;
-        }
-        if (mdxCacheResult.status === "corrupted") {
-            logger.warn("MDX-ESM cache corrupted, will re-transform", {
-                filePath,
-                reason: mdxCacheResult.reason,
-            });
-        }
+        return cachedPath;
     }
     const readAdapter = useLocalAdapter ? localAdapter : adapter;
     let fileContent = decodeFileContent(await readAdapter.fs.readFile(filePath));

package/esm/src/rendering/orchestrator/module-loader/module-cache-lookup.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Cache lookup phase for the SSR module loader.
+ *
+ * @module rendering/orchestrator/module-loader/module-cache-lookup
+ */
+import { createFileSystem } from "../../../platform/compat/fs.js";
+import { lookupMdxEsmCache } from "../../../transforms/mdx/esm-module-loader/cache/index.js";
+export declare function getModuleCacheKey(filePath: string, projectId?: string, projectDir?: string, contentSourceId?: string): string;
+type LookupMdxCache = typeof lookupMdxEsmCache;
+type FileSystemReader = Pick<ReturnType<typeof createFileSystem>, "readTextFile">;
+export interface ResolveCachedModulePathInput {
+    cacheKey: string;
+    filePath: string;
+    projectDir: string;
+    projectId?: string;
+    contentSourceId?: string;
+    reactVersion?: string;
+    moduleCache: Map<string, string>;
+    readTextFile?: (path: string) => Promise<string>;
+    fileSystem?: FileSystemReader;
+    lookupMdxCache?: LookupMdxCache;
+}
+export declare function resolveCachedModulePath(input: ResolveCachedModulePathInput): Promise<string | undefined>;
+export {};
+//# sourceMappingURL=module-cache-lookup.d.ts.map

package/esm/src/rendering/orchestrator/module-loader/module-cache-lookup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"module-cache-lookup.d.ts","sourceRoot":"","sources":["../../../../../src/src/rendering/orchestrator/module-loader/module-cache-lookup.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAEL,iBAAiB,EAClB,MAAM,0DAA0D,CAAC;AAOlE,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,CAIR;AAED,KAAK,cAAc,GAAG,OAAO,iBAAiB,CAAC;AAC/C,KAAK,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,gBAAgB,CAAC,EAAE,cAAc,CAAC,CAAC;AAElF,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACjD,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAuED,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,4BAA4B,GAClC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAK7B"}

package/esm/src/rendering/orchestrator/module-loader/module-cache-lookup.js

@@ -0,0 +1,69 @@
+/**
+ * Cache lookup phase for the SSR module loader.
+ *
+ * @module rendering/orchestrator/module-loader/module-cache-lookup
+ */
+import { join } from "../../../platform/compat/path/index.js";
+import { createFileSystem } from "../../../platform/compat/fs.js";
+import { lookupMdxEsmCache, } from "../../../transforms/mdx/esm-module-loader/cache/index.js";
+import { getMdxEsmCacheDir } from "../../../utils/cache-dir.js";
+import { rendererLogger } from "../../../utils/index.js";
+import { UNRESOLVED_VF_MODULES_RE } from "./module-transform-cache.js";
+const logger = rendererLogger.component("module-loader");
+export function getModuleCacheKey(filePath, projectId, projectDir, contentSourceId) {
+    const base = projectId ?? projectDir ?? "default";
+    const source = contentSourceId ?? "default";
+    return `${base}:${source}:${filePath}`;
+}
+async function resolveInMemoryCachedPath(input) {
+    const cachedPath = input.moduleCache.get(input.cacheKey);
+    if (!cachedPath)
+        return undefined;
+    try {
+        const fileSystem = input.fileSystem ?? createFileSystem();
+        const readTextFile = input.readTextFile ??
+            ((path) => fileSystem.readTextFile(path));
+        const cachedCode = await readTextFile(cachedPath);
+        if (!UNRESOLVED_VF_MODULES_RE.test(cachedCode))
+            return cachedPath;
+        logger.warn("[ModuleLoader] In-memory cache contains unresolved _vf_modules, invalidating", {
+            filePath: input.filePath.slice(-60),
+            cachedPath: cachedPath.slice(-60),
+        });
+    }
+    catch (_) {
+        /* expected: cached file may no longer exist on disk */
+    }
+    input.moduleCache.delete(input.cacheKey);
+    return undefined;
+}
+async function resolveMdxEsmCachedPath(input) {
+    if (!input.projectId || !input.contentSourceId)
+        return undefined;
+    const baseCacheDir = getMdxEsmCacheDir();
+    const projectKey = encodeURIComponent(input.projectId);
+    const sourceKey = encodeURIComponent(input.contentSourceId);
+    const mdxCacheDir = join(baseCacheDir, projectKey, sourceKey);
+    const lookup = input.lookupMdxCache ?? lookupMdxEsmCache;
+    const mdxCacheResult = await lookup(input.filePath, mdxCacheDir, input.projectDir, undefined, {
+        projectId: input.projectId,
+        contentSourceId: input.contentSourceId,
+    }, input.reactVersion);
+    if (mdxCacheResult.status === "hit") {
+        input.moduleCache.set(input.cacheKey, mdxCacheResult.path);
+        return mdxCacheResult.path;
+    }
+    if (mdxCacheResult.status === "corrupted") {
+        logger.warn("MDX-ESM cache corrupted, will re-transform", {
+            filePath: input.filePath,
+            reason: mdxCacheResult.reason,
+        });
+    }
+    return undefined;
+}
+export async function resolveCachedModulePath(input) {
+    const inMemoryPath = await resolveInMemoryCachedPath(input);
+    if (inMemoryPath)
+        return inMemoryPath;
+    return await resolveMdxEsmCachedPath(input);
+}

package/esm/src/rendering/orchestrator/pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/pipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAsBH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AA6ChF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAE1D;;;;GAIG;AACH,MAAM,WAAW,wBAAwB;IACvC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACxE,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrF;AAED,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,wBAAwB,CAAC;IAC3C,YAAY,EAAE,YAAY,CAAC;IAC3B,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,eAAe,EAAE,eAAe,CAAC;IACjC,OAAO,EAAE,cAAc,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,iBAAiB,CAAC,EAAE,OAAO,qBAAqB,EAAE,sBAAsB,CAAC;CAC1E;AA0BD,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,kBAAkB,CAAqB;gBAEnC,MAAM,EAAE,oBAAoB;IAaxC;;;OAGG;IACH,gBAAgB,IAAI,IAAI;IAKxB,OAAO,CAAC,UAAU;YAIJ,0BAA0B;IAaxC;;;;;;;;;OASG;YACW,qBAAqB;IAyDnC;;;OAGG;YACW,mBAAmB;IAiGjC,OAAO,CAAC,uBAAuB;IAkCzB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IA8O9E,+EAA+E;IACzE,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAqFzE,kBAAkB;YA2ClB,cAAc;IAW5B,OAAO,CAAC,uBAAuB;YAYjB,kBAAkB;IA8EhC,OAAO,CAAC,kBAAkB;YAMZ,uBAAuB;IAmBrC;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;CAetB"}
+{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/pipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAuBH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AA8ChF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAE1D;;;;GAIG;AACH,MAAM,WAAW,wBAAwB;IACvC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACxE,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrF;AAED,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,wBAAwB,CAAC;IAC3C,YAAY,EAAE,YAAY,CAAC;IAC3B,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,eAAe,EAAE,eAAe,CAAC;IACjC,OAAO,EAAE,cAAc,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,iBAAiB,CAAC,EAAE,OAAO,qBAAqB,EAAE,sBAAsB,CAAC;CAC1E;AA0BD,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,kBAAkB,CAAqB;gBAEnC,MAAM,EAAE,oBAAoB;IAaxC;;;OAGG;IACH,gBAAgB,IAAI,IAAI;IAKxB,OAAO,CAAC,UAAU;YAIJ,0BAA0B;IAaxC;;;;;;;;;OASG;YACW,qBAAqB;IAyDnC;;;OAGG;YACW,mBAAmB;IAiGjC,OAAO,CAAC,uBAAuB;IAkCzB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IA8O9E,+EAA+E;IACzE,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAsFzE,kBAAkB;YA2ClB,cAAc;IAW5B,OAAO,CAAC,uBAAuB;YAYjB,kBAAkB;IA8EhC,OAAO,CAAC,kBAAkB;YAQZ,uBAAuB;IAmBrC;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;CAStB"}