@ecopages/core 0.2.0-beta.4 → 0.2.0-beta.41

package/src/services/cache/page-request-cache-coordinator.service.js

@@ -1,109 +1,113 @@
-import { getCacheControlHeader } from "./page-cache-service.js";
-class PageRequestCacheCoordinator {
-  cacheService;
-  defaultCacheStrategy;
-  constructor(cacheService, defaultCacheStrategy) {
-    this.cacheService = cacheService;
-    this.defaultCacheStrategy = defaultCacheStrategy;
-  }
-  /**
-   * Builds the cache key used for page lookups.
-   *
-   * Query parameters are part of the key so two requests that hit the same
-   * pathname but differ by search params do not share the same rendered entry.
-   *
-   * @param input Pathname plus optional query record.
-   * @returns Stable cache key for the request.
-   */
-  buildCacheKey(input) {
-    let key = input.pathname;
-    if (input.query && Object.keys(input.query).length > 0) {
-      const queryString = new URLSearchParams(input.query).toString();
-      key += `?${queryString}`;
+import { getCacheControlHeader } from './page-cache-service.js';
+import { getRequestPipelineMetricsHeaderName, isRequestPipelineMetricsEnabled, serializeRequestPipelineMetricsHeader, } from '../../diagnostics/request-pipeline-metrics.js';
+/**
+ * Coordinates request-time page caching concerns around one render invocation.
+ *
+ * This service keeps `FileSystemResponseMatcher` from owning low-level cache
+ * policy mechanics such as cache key construction, `dynamic` bypass behavior,
+ * body normalization for cache storage, and final cache header generation.
+ */
+export class PageRequestCacheCoordinator {
+    cacheService;
+    defaultCacheStrategy;
+    constructor(cacheService, defaultCacheStrategy) {
+        this.cacheService = cacheService;
+        this.defaultCacheStrategy = defaultCacheStrategy;
     }
-    return key;
-  }
-  /**
-   * Resolves a render request through the configured cache policy.
-   *
-   * Pages using `dynamic` rendering, or applications without a cache service,
-   * bypass cache lookup entirely and still receive the same response header
-   * contract as cached pages.
-   *
-   * @param options Cache coordination inputs for one page request.
-   * @returns HTTP response with cache headers applied.
-   */
-  async render(options) {
-    if (!this.cacheService || options.pageCacheStrategy === "dynamic") {
-      const { html, strategy } = await options.renderFn();
-      return this.createCachedResponse(html, strategy, "disabled");
+    /**
+     * Builds the cache key used for page lookups.
+     *
+     * Query parameters are part of the key so two requests that hit the same
+     * pathname but differ by search params do not share the same rendered entry.
+     *
+     * @param input Pathname plus optional query record.
+     * @returns Stable cache key for the request.
+     */
+    buildCacheKey(input) {
+        let key = input.pathname;
+        if (input.query && Object.keys(input.query).length > 0) {
+            const queryString = new URLSearchParams(input.query).toString();
+            key += `?${queryString}`;
+        }
+        return key;
     }
-    const result = await this.cacheService.getOrCreate(
-      options.cacheKey,
-      options.pageCacheStrategy,
-      options.renderFn
-    );
-    return this.createCachedResponse(result.html, result.strategy, result.status);
-  }
-  /**
-   * Exposes the underlying cache service for invalidation and adapter plumbing.
-   *
-   * @returns Configured cache service or `null` when caching is disabled.
-   */
-  getCacheService() {
-    return this.cacheService;
-  }
-  /**
-   * Returns the default render strategy used when a page does not declare one.
-   *
-   * @returns Application-level fallback cache strategy.
-   */
-  getDefaultCacheStrategy() {
-    return this.defaultCacheStrategy;
-  }
-  /**
-   * Normalizes various route render body shapes into a cacheable string.
-   *
-   * Page rendering may produce strings, buffers, byte arrays, or streams. The
-   * matcher needs a single representation before passing HTML through the cache
-   * layer, so this method centralizes the conversion rules.
-   *
-   * @param body Render output body in any supported form.
-   * @returns HTML string representation.
-   */
-  async bodyToString(body) {
-    if (typeof body === "string") {
-      return body;
+    /**
+     * Resolves a render request through the configured cache policy.
+     *
+     * Pages using `dynamic` rendering, or applications without a cache service,
+     * bypass cache lookup entirely and still receive the same response header
+     * contract as cached pages.
+     *
+     * @param options Cache coordination inputs for one page request.
+     * @returns HTTP response with cache headers applied.
+     */
+    async render(options) {
+        if (!this.cacheService || options.pageCacheStrategy === 'dynamic') {
+            const { html, strategy } = await options.renderFn();
+            return this.createCachedResponse(html, strategy, 'disabled');
+        }
+        const result = await this.cacheService.getOrCreate(options.cacheKey, options.pageCacheStrategy, options.renderFn);
+        return this.createCachedResponse(result.html, result.strategy, result.status);
     }
-    if (Buffer.isBuffer(body)) {
-      return body.toString("utf-8");
+    /**
+     * Exposes the underlying cache service for invalidation and adapter plumbing.
+     *
+     * @returns Configured cache service or `null` when caching is disabled.
+     */
+    getCacheService() {
+        return this.cacheService;
     }
-    if (body instanceof ReadableStream) {
-      return new Response(body).text();
+    /**
+     * Returns the default render strategy used when a page does not declare one.
+     *
+     * @returns Application-level fallback cache strategy.
+     */
+    getDefaultCacheStrategy() {
+        return this.defaultCacheStrategy;
     }
-    if (body instanceof Uint8Array) {
-      return new TextDecoder().decode(body);
+    /**
+     * Normalizes various route render body shapes into a cacheable string.
+     *
+     * Page rendering may produce strings, buffers, byte arrays, or streams. The
+     * matcher needs a single representation before passing HTML through the cache
+     * layer, so this method centralizes the conversion rules.
+     *
+     * @param body Render output body in any supported form.
+     * @returns HTML string representation.
+     */
+    async bodyToString(body) {
+        if (typeof body === 'string') {
+            return body;
+        }
+        if (Buffer.isBuffer(body)) {
+            return body.toString('utf-8');
+        }
+        if (body instanceof ReadableStream) {
+            return new Response(body).text();
+        }
+        if (body instanceof Uint8Array) {
+            return new TextDecoder().decode(body);
+        }
+        return String(body);
+    }
+    /**
+     * Creates the final HTML response with the current cache semantics encoded in
+     * response headers.
+     *
+     * @param html Rendered page HTML.
+     * @param strategy Effective cache strategy for the response.
+     * @param cacheStatus Status used for `X-Cache` and `Cache-Control` generation.
+     * @returns HTTP response ready to send to the client.
+     */
+    createCachedResponse(html, strategy, cacheStatus) {
+        const headers = {
+            'Content-Type': 'text/html',
+            'Cache-Control': getCacheControlHeader(cacheStatus === 'disabled' ? 'disabled' : strategy),
+            'X-Cache': cacheStatus.toUpperCase(),
+        };
+        if (isRequestPipelineMetricsEnabled()) {
+            headers[getRequestPipelineMetricsHeaderName()] = serializeRequestPipelineMetricsHeader();
+        }
+        return new Response(html, { headers });
     }
-    return String(body);
-  }
-  /**
-   * Creates the final HTML response with the current cache semantics encoded in
-   * response headers.
-   *
-   * @param html Rendered page HTML.
-   * @param strategy Effective cache strategy for the response.
-   * @param cacheStatus Status used for `X-Cache` and `Cache-Control` generation.
-   * @returns HTTP response ready to send to the client.
-   */
-  createCachedResponse(html, strategy, cacheStatus) {
-    const headers = {
-      "Content-Type": "text/html",
-      "Cache-Control": getCacheControlHeader(cacheStatus === "disabled" ? "disabled" : strategy),
-      "X-Cache": cacheStatus.toUpperCase()
-    };
-    return new Response(html, { headers });
-  }
 }
-export {
-  PageRequestCacheCoordinator
-};

package/src/services/html/html-rewriter-provider.service.js

@@ -1,68 +1,68 @@
-import { appLogger } from "../../global/app-logger.js";
-class DefaultHtmlRewriterProvider {
-  htmlRewriterConstructorPromise;
-  htmlRewriterMode;
-  logger;
-  getNativeHtmlRewriter;
-  loadWorkerToolsHtmlRewriter;
-  constructor(options = {}) {
-    this.htmlRewriterMode = options.mode ?? "auto";
-    this.logger = options.logger ?? appLogger;
-    this.getNativeHtmlRewriter = options.getNativeHtmlRewriter ?? (() => globalThis.HTMLRewriter);
-    this.loadWorkerToolsHtmlRewriter = options.loadWorkerToolsHtmlRewriter ?? loadWorkerToolsHtmlRewriter;
-  }
-  setMode(mode) {
-    this.htmlRewriterMode = mode;
-    this.htmlRewriterConstructorPromise = void 0;
-  }
-  async createHtmlRewriter() {
-    const RuntimeHtmlRewriter = await this.resolveHtmlRewriterConstructor();
-    return RuntimeHtmlRewriter ? new RuntimeHtmlRewriter() : null;
-  }
-  async resolveHtmlRewriterConstructor() {
-    if (!this.htmlRewriterConstructorPromise) {
-      const mode = this.htmlRewriterMode;
-      const RuntimeHtmlRewriter = this.getNativeHtmlRewriter();
-      if (mode === "fallback") {
-        this.htmlRewriterConstructorPromise = Promise.resolve(null);
-      } else if (mode === "native") {
-        if (RuntimeHtmlRewriter) {
-          this.htmlRewriterConstructorPromise = Promise.resolve(RuntimeHtmlRewriter);
-        } else {
-          this.logger.warn(
-            "[HtmlTransformerService] Native HTMLRewriter was forced but is unavailable, falling back to string injection."
-          );
-          this.htmlRewriterConstructorPromise = Promise.resolve(null);
+import { appLogger } from '../../global/app-logger.js';
+export class DefaultHtmlRewriterProvider {
+    htmlRewriterConstructorPromise;
+    htmlRewriterMode;
+    logger;
+    getNativeHtmlRewriter;
+    loadWorkerToolsHtmlRewriter;
+    constructor(options = {}) {
+        this.htmlRewriterMode = options.mode ?? 'auto';
+        this.logger = options.logger ?? appLogger;
+        this.getNativeHtmlRewriter =
+            options.getNativeHtmlRewriter ??
+                (() => globalThis.HTMLRewriter);
+        this.loadWorkerToolsHtmlRewriter = options.loadWorkerToolsHtmlRewriter ?? loadWorkerToolsHtmlRewriter;
+    }
+    setMode(mode) {
+        this.htmlRewriterMode = mode;
+        this.htmlRewriterConstructorPromise = undefined;
+    }
+    async createHtmlRewriter() {
+        const RuntimeHtmlRewriter = await this.resolveHtmlRewriterConstructor();
+        return RuntimeHtmlRewriter ? new RuntimeHtmlRewriter() : null;
+    }
+    async resolveHtmlRewriterConstructor() {
+        if (!this.htmlRewriterConstructorPromise) {
+            const mode = this.htmlRewriterMode;
+            const RuntimeHtmlRewriter = this.getNativeHtmlRewriter();
+            if (mode === 'fallback') {
+                this.htmlRewriterConstructorPromise = Promise.resolve(null);
+            }
+            else if (mode === 'native') {
+                if (RuntimeHtmlRewriter) {
+                    this.htmlRewriterConstructorPromise = Promise.resolve(RuntimeHtmlRewriter);
+                }
+                else {
+                    this.logger.warn('[HtmlTransformerService] Native HTMLRewriter was forced but is unavailable, falling back to string injection.');
+                    this.htmlRewriterConstructorPromise = Promise.resolve(null);
+                }
+            }
+            else if (mode === 'auto' && RuntimeHtmlRewriter) {
+                this.htmlRewriterConstructorPromise = Promise.resolve(RuntimeHtmlRewriter);
+            }
+            else {
+                this.htmlRewriterConstructorPromise = this.loadWorkerToolsHtmlRewriter();
+            }
         }
-      } else if (mode === "auto" && RuntimeHtmlRewriter) {
-        this.htmlRewriterConstructorPromise = Promise.resolve(RuntimeHtmlRewriter);
-      } else {
-        this.htmlRewriterConstructorPromise = this.loadWorkerToolsHtmlRewriter();
-      }
+        return this.htmlRewriterConstructorPromise;
     }
-    return this.htmlRewriterConstructorPromise;
-  }
 }
 async function loadWorkerToolsHtmlRewriter() {
-  try {
-    const module = await import("@worker-tools/html-rewriter/base64");
-    return module.HTMLRewriter;
-  } catch (primaryError) {
     try {
-      const runtimeLocalModule = await import(
-        /* @vite-ignore */
-        new URL("../node_modules/@worker-tools/html-rewriter/base64.js", import.meta.url).href
-      );
-      return runtimeLocalModule.HTMLRewriter;
-    } catch {
-      const message = primaryError instanceof Error ? primaryError.message : String(primaryError);
-      appLogger.warn(
-        `[HtmlTransformerService] Failed to load @worker-tools/html-rewriter/base64, falling back to string injection: ${message}`
-      );
-      return null;
+        const module = await import('@worker-tools/html-rewriter/base64');
+        return module.HTMLRewriter;
+    }
+    catch (primaryError) {
+        try {
+            const runtimeLocalModule = await import(
+            /* @vite-ignore */ new URL('../node_modules/@worker-tools/html-rewriter/base64.js', import.meta.url)
+                .href);
+            return runtimeLocalModule.HTMLRewriter;
+        }
+        catch {
+            const message = primaryError instanceof Error ? primaryError.message : String(primaryError);
+            appLogger.warn(`[HtmlTransformerService] Failed to load @worker-tools/html-rewriter/base64, falling back to string injection: ${message}`);
+            return null;
+        }
     }
-  }
 }
-export {
-  DefaultHtmlRewriterProvider
-};

package/src/services/html/html-transformer.service.d.ts

@@ -83,7 +83,7 @@ export declare class HtmlTransformerService {
      * string-based fallback remains in place for runtimes that cannot provide one
      * of those rewriter implementations.
      */
-    transform(res: Response, contributions?: HtmlDocumentContribution[]): Promise<Response>;
+    transform(res: Response, contributions?: HtmlDocumentContribution[], pagePackage?: PagePackageResult): Promise<Response>;
     /**
      * Splits processed assets into head and body injection groups.
      */