@ecopages/core 0.2.0-alpha.3 → 0.2.0-alpha.31

package/src/adapters/shared/runtime-bootstrap.js

@@ -0,0 +1,43 @@
+import path from "node:path";
+import { fileSystem } from "@ecopages/file-system";
+import { getAppBrowserBuildPlugins, setupAppRuntimePlugins } from "../../build/build-adapter.js";
+import { installAppRuntimeBuildExecutor } from "../../build/runtime-build-executor.js";
+import { RESOLVED_ASSETS_DIR } from "../../config/constants.js";
+import { ProjectWatcher } from "../../watchers/project-watcher.js";
+function installSharedRuntimeBuildExecutor(appConfig, options) {
+  return installAppRuntimeBuildExecutor(appConfig, options);
+}
+function prepareSharedRuntimePublicDir(appConfig) {
+  const srcPublicDir = path.join(appConfig.rootDir, appConfig.srcDir, appConfig.publicDir);
+  if (fileSystem.exists(srcPublicDir)) {
+    fileSystem.copyDir(srcPublicDir, path.join(appConfig.rootDir, appConfig.distDir));
+  }
+  fileSystem.ensureDir(path.join(appConfig.absolutePaths.distDir, RESOLVED_ASSETS_DIR));
+}
+async function initializeSharedRuntimePlugins(options) {
+  await setupAppRuntimePlugins(options);
+}
+async function startSharedProjectWatching(options) {
+  const watcher = new ProjectWatcher({
+    config: options.appConfig,
+    refreshRouterRoutesCallback: options.refreshRouterRoutesCallback,
+    hmrManager: options.hmrManager,
+    bridge: options.bridge
+  });
+  await watcher.createWatcherSubscription();
+}
+function bindSharedRuntimeHmrManager(appConfig, hmrManager) {
+  const browserBuildPlugins = getAppBrowserBuildPlugins(appConfig);
+  hmrManager.setPlugins(browserBuildPlugins);
+  for (const integration of appConfig.integrations) {
+    integration.setHmrManager(hmrManager);
+  }
+  return browserBuildPlugins;
+}
+export {
+  bindSharedRuntimeHmrManager,
+  initializeSharedRuntimePlugins,
+  installSharedRuntimeBuildExecutor,
+  prepareSharedRuntimePublicDir,
+  startSharedProjectWatching
+};

package/src/adapters/shared/server-adapter.d.ts

@@ -1,30 +1,47 @@
 import { AbstractServerAdapter } from '../abstract/server-adapter.js';
 import type { ServerAdapterOptions, ServerAdapterResult } from '../abstract/server-adapter.js';
 import { RouteRendererFactory } from '../../route-renderer/route-renderer.js';
-import { FSRouter } from '../../router/fs-router.js';
-import { SchemaValidationService } from '../../services/schema-validation-service.js';
+import { RouteRegistry } from '../../router/server/route-registry.js';
+import { SchemaValidationService } from '../../services/validation/schema-validation-service.js';
 import { StaticSiteGenerator } from '../../static-site-generator/static-site-generator.js';
 import { ServerStaticBuilder } from './server-static-builder.js';
 import { FileSystemResponseMatcher } from './fs-server-response-matcher.js';
 import { ServerRouteHandler } from './server-route-handler.js';
-import type { ApiHandler, CacheInvalidator, ErrorHandler, RenderContext, StaticRoute } from '../../public-types.js';
+import type { ApiHandler, CacheInvalidator, ErrorHandler, RenderContext, StaticRoute } from '../../types/public-types.js';
+type SharedRequestContext = {
+    apiHandlers: ApiHandler[];
+    errorHandler?: ErrorHandler;
+    serverInstance?: any;
+    hmrManager?: any;
+};
 export declare abstract class SharedServerAdapter<TOptions extends ServerAdapterOptions, TResult extends ServerAdapterResult> extends AbstractServerAdapter<TOptions, TResult> {
-    protected router: FSRouter;
+    protected router: RouteRegistry;
     protected fileSystemResponseMatcher: FileSystemResponseMatcher;
     protected routeRendererFactory: RouteRendererFactory;
     protected routeHandler: ServerRouteHandler;
     protected staticSiteGenerator: StaticSiteGenerator;
     protected staticBuilder: ServerStaticBuilder;
     protected readonly schemaValidator: SchemaValidationService;
+    protected initializeSharedRouteHandling(options: {
+        staticRoutes: StaticRoute[];
+        hmrManager?: any;
+    }): Promise<void>;
+    protected createSharedWatchRefreshCallback(options: {
+        staticRoutes: StaticRoute[];
+        hmrManager?: any;
+        onRoutesReady?: () => Promise<void> | void;
+        onError?: (error: Error) => Promise<void> | void;
+    }): () => Promise<void>;
     /**
-     * Scans the filesystem and dynamically constructs the universal router map.
+     * Scans the filesystem and dynamically constructs the Route Registry.
      *
      * This process runs identically across both Bun and Node wrappers. It analyzes the configured pages
      * directory, building a map of all available UI routes and API endpoints.
-     * The resulting `FSRouter` instance becomes the central nervous system for mapping WinterCG incoming
+     * The resulting `RouteRegistry` instance becomes the central nervous system for mapping WinterCG incoming
      * Web Requests (`Request`) to their corresponding internal execution paths.
      */
     protected initSharedRouter(): Promise<void>;
+    private createRouteRegistryPageModuleAdapter;
     /**
      * Sets up the unified rendering pipeline and response matching chain.
      *
@@ -40,6 +57,8 @@ export declare abstract class SharedServerAdapter<TOptions extends ServerAdapter
      * @param hmrManager - The runtime-specific Hot Module Replacement orchestrator (if watching).
      */
     protected configureSharedResponseHandlers(staticRoutes: StaticRoute[], hmrManager?: any): void;
+    private createSharedResponseHandlerDependencies;
+    private createSharedPageCacheService;
     protected getCacheService(): CacheInvalidator | null;
     protected getRenderContext(): RenderContext;
     /**
@@ -60,6 +79,10 @@ export declare abstract class SharedServerAdapter<TOptions extends ServerAdapter
      * @returns The resulting Web standard `Response` constructed by the user's handler.
      */
     protected executeApiHandler(request: Request, params: Record<string, string | string[]>, routeConfig: ApiHandler, serverInstance: any, errorHandler?: ErrorHandler): Promise<Response>;
+    private createApiHandlerContext;
+    private normalizeApiParams;
+    private applyApiRequestSchema;
+    private runApiMiddlewareChain;
     private normalizePath;
     private matchApiPath;
     private getApiPathScore;
@@ -67,6 +90,8 @@ export declare abstract class SharedServerAdapter<TOptions extends ServerAdapter
         routeConfig: ApiHandler;
         params: Record<string, string | string[]>;
     } | null;
+    private tryHandleSharedHmrRequest;
+    private tryHandleSharedApiRequest;
     /**
      * Universally processes an incoming WinterCG Web standard Request.
      *
@@ -78,10 +103,6 @@ export declare abstract class SharedServerAdapter<TOptions extends ServerAdapter
      * Both Bun and Node bindings fall back to this exact function once they have mapped their
      * native HTTP objects into Web Standard Requests.
      */
-    handleSharedRequest(request: Request, context: {
-        apiHandlers: ApiHandler[];
-        errorHandler?: ErrorHandler;
-        serverInstance?: any;
-        hmrManager?: any;
-    }): Promise<Response>;
+    handleSharedRequest(request: Request, context: SharedRequestContext): Promise<Response>;
 }
+export {};

package/src/adapters/shared/server-adapter.js

@@ -1,11 +1,10 @@
 import path from "node:path";
 import { AbstractServerAdapter } from "../abstract/server-adapter.js";
 import { RouteRendererFactory } from "../../route-renderer/route-renderer.js";
-import { FSRouter } from "../../router/fs-router.js";
-import { FSRouterScanner } from "../../router/fs-router-scanner.js";
+import { RouteRegistry } from "../../router/server/route-registry.js";
 import { MemoryCacheStore } from "../../services/cache/memory-cache-store.js";
 import { PageCacheService } from "../../services/cache/page-cache-service.js";
-import { SchemaValidationService } from "../../services/schema-validation-service.js";
+import { SchemaValidationService } from "../../services/validation/schema-validation-service.js";
 import { StaticSiteGenerator } from "../../static-site-generator/static-site-generator.js";
 import { ServerStaticBuilder } from "./server-static-builder.js";
 import { ExplicitStaticRouteMatcher } from "./explicit-static-route-matcher.js";
@@ -17,6 +16,9 @@ import { createRequire } from "../../utils/locals-utils.js";
 import { HttpError } from "../../errors/http-error.js";
 import { ApiResponseBuilder } from "./api-response.js";
 import { appLogger } from "../../global/app-logger.js";
+import { fileSystem } from "@ecopages/file-system";
+import { getAppServerModuleTranspiler } from "../../services/module-loading/app-server-module-transpiler.service.js";
+import { resolveInternalExecutionDir } from "../../utils/resolve-work-dir.js";
 class SharedServerAdapter extends AbstractServerAdapter {
   router;
   fileSystemResponseMatcher;
@@ -25,31 +27,67 @@ class SharedServerAdapter extends AbstractServerAdapter {
   staticSiteGenerator;
   staticBuilder;
   schemaValidator = new SchemaValidationService();
+  async initializeSharedRouteHandling(options) {
+    await this.initSharedRouter();
+    this.configureSharedResponseHandlers(options.staticRoutes, options.hmrManager);
+  }
+  createSharedWatchRefreshCallback(options) {
+    return async () => {
+      try {
+        await this.initializeSharedRouteHandling({
+          staticRoutes: options.staticRoutes,
+          hmrManager: options.hmrManager
+        });
+        if (options.onRoutesReady) {
+          await options.onRoutesReady();
+        }
+      } catch (error) {
+        if (options.onError) {
+          await options.onError(error instanceof Error ? error : new Error(String(error)));
+          return;
+        }
+        throw error;
+      }
+    };
+  }
   /**
-   * Scans the filesystem and dynamically constructs the universal router map.
+   * Scans the filesystem and dynamically constructs the Route Registry.
    *
    * This process runs identically across both Bun and Node wrappers. It analyzes the configured pages
    * directory, building a map of all available UI routes and API endpoints.
-   * The resulting `FSRouter` instance becomes the central nervous system for mapping WinterCG incoming
+   * The resulting `RouteRegistry` instance becomes the central nervous system for mapping WinterCG incoming
    * Web Requests (`Request`) to their corresponding internal execution paths.
    */
   async initSharedRouter() {
-    const scanner = new FSRouterScanner({
-      dir: path.join(this.appConfig.rootDir, this.appConfig.srcDir, this.appConfig.pagesDir),
+    this.router = new RouteRegistry({
+      pagesDir: path.join(this.appConfig.rootDir, this.appConfig.srcDir, this.appConfig.pagesDir),
       appConfig: this.appConfig,
       origin: this.runtimeOrigin,
       templatesExt: this.appConfig.templatesExt,
-      options: {
-        buildMode: !this.options?.watch
-      }
-    });
-    this.router = new FSRouter({
-      origin: this.runtimeOrigin,
-      assetPrefix: path.join(this.appConfig.rootDir, this.appConfig.distDir),
-      scanner
+      buildMode: !this.options?.watch,
+      pageModuleAdapter: this.createRouteRegistryPageModuleAdapter()
     });
     await this.router.init();
   }
+  createRouteRegistryPageModuleAdapter() {
+    const serverModuleTranspiler = getAppServerModuleTranspiler(this.appConfig);
+    return {
+      loadPageModule: async (filePath) => {
+        const module = await serverModuleTranspiler.importModule({
+          filePath,
+          outdir: path.join(resolveInternalExecutionDir(this.appConfig), ".server-route-modules"),
+          externalPackages: false,
+          transpileErrorMessage: (details) => `Error transpiling route module: ${details}`,
+          noOutputMessage: (targetFilePath) => `No transpiled output generated for route module: ${targetFilePath}`
+        });
+        const page = module.default;
+        return {
+          staticPaths: page?.staticPaths ?? module.getStaticPaths,
+          staticProps: page?.staticProps ?? module.getStaticProps
+        };
+      }
+    };
+  }
   /**
    * Sets up the unified rendering pipeline and response matching chain.
    *
@@ -67,47 +105,62 @@ class SharedServerAdapter extends AbstractServerAdapter {
   configureSharedResponseHandlers(staticRoutes, hmrManager) {
     this.routeRendererFactory = new RouteRendererFactory({
       appConfig: this.appConfig,
+      rendererModules: this.appConfig.runtime?.rendererModuleContext,
       runtimeOrigin: this.runtimeOrigin
     });
+    const { fileSystemResponseMatcher, explicitStaticRouteMatcher } = this.createSharedResponseHandlerDependencies(staticRoutes);
+    this.fileSystemResponseMatcher = fileSystemResponseMatcher;
+    this.routeHandler = new ServerRouteHandler({
+      router: this.router,
+      fileSystemResponseMatcher: this.fileSystemResponseMatcher,
+      explicitStaticRouteMatcher,
+      watch: !!this.options?.watch,
+      hmrManager
+    });
+  }
+  createSharedResponseHandlerDependencies(staticRoutes) {
     const fileSystemResponseFactory = new FileSystemServerResponseFactory({
-      appConfig: this.appConfig,
-      routeRendererFactory: this.routeRendererFactory,
       options: {
         watchMode: !!this.options?.watch
       }
     });
-    const cacheConfig = this.appConfig.cache;
-    const isCacheEnabled = cacheConfig?.enabled ?? !this.options?.watch;
-    let cacheService = null;
-    if (isCacheEnabled) {
-      const store = cacheConfig?.store === "memory" || !cacheConfig?.store ? new MemoryCacheStore({ maxEntries: cacheConfig?.maxEntries }) : cacheConfig.store;
-      cacheService = new PageCacheService({ store, enabled: true });
-    }
-    this.fileSystemResponseMatcher = new FileSystemResponseMatcher({
+    const cacheService = this.createSharedPageCacheService();
+    const fileSystemResponseMatcher = new FileSystemResponseMatcher({
+      appConfig: this.appConfig,
+      assetPrefix: path.join(this.appConfig.rootDir, this.appConfig.distDir),
       router: this.router,
       routeRendererFactory: this.routeRendererFactory,
       fileSystemResponseFactory,
       cacheService,
-      defaultCacheStrategy: cacheConfig?.defaultStrategy ?? "static"
-    });
-    const explicitStaticRouteMatcher = staticRoutes.length > 0 ? new ExplicitStaticRouteMatcher({
-      appConfig: this.appConfig,
-      routeRendererFactory: this.routeRendererFactory,
-      staticRoutes
-    }) : void 0;
-    this.routeHandler = new ServerRouteHandler({
-      router: this.router,
-      fileSystemResponseMatcher: this.fileSystemResponseMatcher,
-      explicitStaticRouteMatcher,
-      watch: !!this.options?.watch,
-      hmrManager
+      defaultCacheStrategy: this.appConfig.cache?.defaultStrategy ?? "static"
     });
+    return {
+      cacheService,
+      fileSystemResponseMatcher,
+      explicitStaticRouteMatcher: staticRoutes.length > 0 ? new ExplicitStaticRouteMatcher({
+        appConfig: this.appConfig,
+        routeRendererFactory: this.routeRendererFactory,
+        staticRoutes
+      }) : void 0
+    };
+  }
+  createSharedPageCacheService() {
+    const cacheConfig = this.appConfig.cache;
+    const isCacheEnabled = cacheConfig?.enabled ?? !this.options?.watch;
+    if (!isCacheEnabled) {
+      return null;
+    }
+    const store = cacheConfig?.store === "memory" || !cacheConfig?.store ? new MemoryCacheStore({ maxEntries: cacheConfig?.maxEntries }) : cacheConfig.store;
+    return new PageCacheService({ store, enabled: true });
   }
   getCacheService() {
     return this.fileSystemResponseMatcher?.getCacheService() ?? null;
   }
   getRenderContext() {
-    return createRenderContext({ integrations: this.appConfig.integrations });
+    return createRenderContext({
+      integrations: this.appConfig.integrations,
+      rendererModules: this.appConfig.runtime?.rendererModuleContext
+    });
   }
   /**
    * Executes an Application Programming Interface (API) handler in an environment-agnostic manner.
@@ -129,87 +182,18 @@ class SharedServerAdapter extends AbstractServerAdapter {
   async executeApiHandler(request, params, routeConfig, serverInstance, errorHandler) {
     let context;
     try {
-      const middleware = routeConfig.middleware || [];
-      const schema = routeConfig.schema;
-      const locals = {};
-      const normalizedParams = Object.fromEntries(
-        Object.entries(params).map(([key, value]) => [key, Array.isArray(value) ? value.join("/") : value])
-      );
-      context = {
-        request,
-        params: normalizedParams,
-        response: new ApiResponseBuilder(),
-        server: serverInstance,
-        locals,
-        require: createRequire(() => locals),
-        services: {
-          cache: this.getCacheService()
-        },
-        ...this.getRenderContext()
-      };
-      if (schema) {
-        const url = new URL(request.url);
-        const queryParams = Object.fromEntries(url.searchParams);
-        const headers = Object.fromEntries(request.headers);
-        let body;
-        if (schema.body) {
-          try {
-            const contentType = request.headers.get("Content-Type") || "";
-            if (contentType.includes("application/json")) body = await request.clone().json();
-            else if (contentType.includes("text/plain")) body = await request.clone().text();
-          } catch {
-            return context.response.status(400).json({ error: "Invalid request body" });
-          }
-        }
-        const validationResult = await this.schemaValidator.validateRequest(
-          { body, query: queryParams, headers, params: normalizedParams },
-          schema
-        );
-        if (!validationResult.success) {
-          return context.response.status(400).json({
-            error: "Validation failed",
-            issues: validationResult.errors
-          });
-        }
-        const validated = validationResult.data;
-        if (validated.body !== void 0) context.body = validated.body;
-        if (validated.query !== void 0) context.query = validated.query;
-        if (validated.headers !== void 0) context.headers = validated.headers;
-        if (validated.params !== void 0) context.params = validated.params;
-      }
-      if (middleware.length === 0) {
-        return await routeConfig.handler(context);
+      context = this.createApiHandlerContext(request, params, serverInstance);
+      const schemaResponse = await this.applyApiRequestSchema(context, routeConfig.schema);
+      if (schemaResponse) {
+        return schemaResponse;
       }
-      let index = 0;
-      const executeNext = async () => {
-        if (index < middleware.length) {
-          const currentMiddleware = middleware[index++];
-          return await currentMiddleware(context, executeNext);
-        }
-        return await routeConfig.handler(context);
-      };
-      return await executeNext();
+      return await this.runApiMiddlewareChain(context, routeConfig);
     } catch (error) {
       if (error instanceof Response) return error;
       if (errorHandler) {
         try {
           if (!context) {
-            const locals = {};
-            context = {
-              request,
-              params: Object.fromEntries(
-                Object.entries(params).map(([key, value]) => [
-                  key,
-                  Array.isArray(value) ? value.join("/") : value
-                ])
-              ),
-              response: new ApiResponseBuilder(),
-              server: serverInstance,
-              locals,
-              require: createRequire(() => locals),
-              services: { cache: this.getCacheService() },
-              ...this.getRenderContext()
-            };
+            context = this.createApiHandlerContext(request, params, serverInstance);
           }
           return await errorHandler(error, context);
         } catch (handlerError) {
@@ -221,6 +205,76 @@ class SharedServerAdapter extends AbstractServerAdapter {
       return new Response("Internal Server Error", { status: 500 });
     }
   }
+  createApiHandlerContext(request, params, serverInstance) {
+    const locals = {};
+    const normalizedParams = this.normalizeApiParams(params);
+    return {
+      request,
+      params: normalizedParams,
+      response: new ApiResponseBuilder(),
+      server: serverInstance,
+      locals,
+      require: createRequire(() => locals),
+      services: {
+        cache: this.getCacheService()
+      },
+      ...this.getRenderContext()
+    };
+  }
+  normalizeApiParams(params) {
+    return Object.fromEntries(
+      Object.entries(params).map(([key, value]) => [key, Array.isArray(value) ? value.join("/") : value])
+    );
+  }
+  async applyApiRequestSchema(context, schema) {
+    if (!schema) {
+      return void 0;
+    }
+    const url = new URL(context.request.url);
+    const queryParams = Object.fromEntries(url.searchParams);
+    const headers = Object.fromEntries(context.request.headers);
+    let body;
+    if (schema.body) {
+      try {
+        const contentType = context.request.headers.get("Content-Type") || "";
+        if (contentType.includes("application/json")) body = await context.request.clone().json();
+        else if (contentType.includes("text/plain")) body = await context.request.clone().text();
+      } catch {
+        return context.response.status(400).json({ error: "Invalid request body" });
+      }
+    }
+    const validationResult = await this.schemaValidator.validateRequest(
+      { body, query: queryParams, headers, params: context.params },
+      schema
+    );
+    if (!validationResult.success) {
+      return context.response.status(400).json({
+        error: "Validation failed",
+        issues: validationResult.errors
+      });
+    }
+    const validated = validationResult.data;
+    if (validated.body !== void 0) context.body = validated.body;
+    if (validated.query !== void 0) context.query = validated.query;
+    if (validated.headers !== void 0) context.headers = validated.headers;
+    if (validated.params !== void 0) context.params = validated.params;
+    return void 0;
+  }
+  async runApiMiddlewareChain(context, routeConfig) {
+    const middleware = routeConfig.middleware || [];
+    if (middleware.length === 0) {
+      return await routeConfig.handler(context);
+    }
+    let index = 0;
+    const executeNext = async () => {
+      if (index < middleware.length) {
+        const currentMiddleware = middleware[index++];
+        return await currentMiddleware(context, executeNext);
+      }
+      return await routeConfig.handler(context);
+    };
+    return await executeNext();
+  }
   normalizePath(pathname) {
     if (pathname.length > 1 && pathname.endsWith("/")) {
       return pathname.slice(0, -1);
@@ -313,6 +367,40 @@ class SharedServerAdapter extends AbstractServerAdapter {
     }
     return null;
   }
+  tryHandleSharedHmrRequest(request, context) {
+    const url = new URL(request.url);
+    if (url.pathname === "/_hmr_runtime.js" && context.hmrManager) {
+      const runtimePath = context.hmrManager.getRuntimePath();
+      if (fileSystem.exists(runtimePath)) {
+        return new Response(fileSystem.readFileAsBuffer(runtimePath), {
+          headers: { "Content-Type": "application/javascript" }
+        });
+      }
+    }
+    if (url.pathname.startsWith("/assets/_hmr/") && context.hmrManager) {
+      const relativePath = url.pathname.slice("/assets/_hmr/".length);
+      const assetPath = path.join(context.hmrManager.getDistDir(), relativePath);
+      if (fileSystem.exists(assetPath)) {
+        return new Response(fileSystem.readFileAsBuffer(assetPath), {
+          headers: { "Content-Type": "application/javascript" }
+        });
+      }
+    }
+    return null;
+  }
+  async tryHandleSharedApiRequest(request, context) {
+    const apiMatch = this.matchApiHandler(request, context.apiHandlers);
+    if (!apiMatch) {
+      return null;
+    }
+    return await this.executeApiHandler(
+      request,
+      apiMatch.params,
+      apiMatch.routeConfig,
+      context.serverInstance,
+      context.errorHandler
+    );
+  }
   /**
    * Universally processes an incoming WinterCG Web standard Request.
    *
@@ -325,25 +413,13 @@ class SharedServerAdapter extends AbstractServerAdapter {
    * native HTTP objects into Web Standard Requests.
    */
   async handleSharedRequest(request, context) {
-    const url = new URL(request.url);
-    if (url.pathname === "/_hmr_runtime.js" && context.hmrManager) {
-      const runtimePath = context.hmrManager.getRuntimePath();
-      const fileSystem = (await import("@ecopages/file-system")).fileSystem;
-      if (fileSystem.exists(runtimePath)) {
-        return new Response(fileSystem.readFileAsBuffer(runtimePath), {
-          headers: { "Content-Type": "application/javascript" }
-        });
-      }
+    const hmrResponse = this.tryHandleSharedHmrRequest(request, context);
+    if (hmrResponse) {
+      return hmrResponse;
     }
-    const apiMatch = this.matchApiHandler(request, context.apiHandlers);
-    if (apiMatch) {
-      return this.executeApiHandler(
-        request,
-        apiMatch.params,
-        apiMatch.routeConfig,
-        context.serverInstance,
-        context.errorHandler
-      );
+    const apiResponse = await this.tryHandleSharedApiRequest(request, context);
+    if (apiResponse) {
+      return apiResponse;
     }
     return this.routeHandler.handleResponse(request);
   }

package/src/adapters/shared/server-route-handler.d.ts

@@ -1,13 +1,13 @@
-import type { IHmrManager } from '../../public-types';
-import type { FSRouter } from '../../router/fs-router';
-import type { ExplicitStaticRouteMatcher } from './explicit-static-route-matcher';
-import type { FileSystemResponseMatcher } from './fs-server-response-matcher';
+import type { IHmrManager } from '../../types/public-types.js';
+import type { RouteRegistry } from '../../router/server/route-registry.js';
+import type { ExplicitStaticRouteMatcher } from './explicit-static-route-matcher.js';
+import type { FileSystemResponseMatcher } from './fs-server-response-matcher.js';
 /**
  * Configuration parameters for ServerRouteHandler.
  */
 export interface ServerRouteHandlerParams {
     /** File system router for matching request URLs to route handlers. */
-    router: FSRouter;
+    router: RouteRegistry;
     /** Matcher for handling file system route responses. */
     fileSystemResponseMatcher: FileSystemResponseMatcher;
     /** Optional matcher for explicit static routes like processed images or sitemaps. */

package/src/adapters/shared/server-route-handler.js

@@ -1,5 +1,6 @@
-import { appLogger } from "../../global/app-logger";
-import { HttpError } from "../../errors/http-error";
+import { appLogger } from "../../global/app-logger.js";
+import { HttpError } from "../../errors/http-error.js";
+import { injectHmrRuntimeIntoHtmlResponse, isHtmlResponse, shouldInjectHmrHtmlResponse } from "./hmr-html-response.js";
 class ServerRouteHandler {
   router;
   fileSystemResponseMatcher;
@@ -30,7 +31,7 @@ class ServerRouteHandler {
    * @returns true if in watch mode and HMR manager is enabled
    */
   shouldInjectHmrScript() {
-    return this.watch && this.hmrManager?.isEnabled() === true;
+    return shouldInjectHmrHtmlResponse(this.watch, this.hmrManager);
   }
   /**
    * Checks if a response contains HTML content.
@@ -39,8 +40,7 @@ class ServerRouteHandler {
    * @returns true if Content-Type header starts with 'text/html'
    */
   isHtmlResponse(response) {
-    const contentType = response.headers.get("Content-Type");
-    return contentType !== null && contentType.startsWith("text/html");
+    return isHtmlResponse(response);
   }
   /**
    * Handles HTTP requests from the router adapter.
@@ -60,7 +60,7 @@ class ServerRouteHandler {
       const response2 = await this.explicitStaticRouteMatcher.handleMatch(explicitMatch);
       return this.maybeInjectHmrScript(response2);
     }
-    const fsMatch = !pathname.includes(".") && this.router.match(request.url);
+    const fsMatch = !pathname.includes(".") && this.router.matchRequest(request.url);
     const response = await (fsMatch ? this.fileSystemResponseMatcher.handleMatch(fsMatch, request) : this.handleNoMatch(request));
     return this.maybeInjectHmrScript(response);
   }
@@ -75,16 +75,7 @@ class ServerRouteHandler {
    */
   async maybeInjectHmrScript(response) {
     if (this.shouldInjectHmrScript() && this.isHtmlResponse(response)) {
-      const html = await response.text();
-      const hmrScript = `<script type="module">import '/_hmr_runtime.js';<\/script>`;
-      const updatedHtml = html.replace(/<\/html>/i, `${hmrScript}</html>`);
-      const headers = new Headers(response.headers);
-      headers.delete("Content-Length");
-      return new Response(updatedHtml, {
-        status: response.status,
-        statusText: response.statusText,
-        headers
-      });
+      return injectHmrRuntimeIntoHtmlResponse(response);
     }
     return response;
   }