@ecopages/core 0.2.0-alpha.1 → 0.2.0-alpha.10

package/src/adapters/node/write-runtime-manifest.d.ts

@@ -0,0 +1,26 @@
+import { type NodeRuntimeManifest } from '../../services/runtime-manifest/node-runtime-manifest.service.js';
+/**
+ * Writes the app-owned Node runtime manifest from a bundled manifest-writer
+ * entrypoint.
+ *
+ * @remarks
+ * The Node thin-host launch plan executes a bundled JavaScript prep artifact
+ * instead of evaluating TypeScript config directly in the launcher. This helper
+ * is the narrow bridge between that bundle and the core-owned manifest writer.
+ */
+export declare function writeBundledNodeRuntimeManifest(appConfig: {
+    rootDir: string;
+    absolutePaths: {
+        config: string;
+        srcDir: string;
+        distDir: string;
+        workDir?: string;
+    };
+    loaders: Map<string, unknown>;
+    runtime?: {
+        nodeRuntimeManifest?: NodeRuntimeManifest;
+    };
+}, options: {
+    entryModulePath: string;
+    manifestFilePath: string;
+}): void;

package/src/adapters/node/write-runtime-manifest.js

@@ -0,0 +1,12 @@
+import {
+  writeAppNodeRuntimeManifest
+} from "../../services/runtime-manifest/node-runtime-manifest.service.js";
+function writeBundledNodeRuntimeManifest(appConfig, options) {
+  writeAppNodeRuntimeManifest(appConfig, {
+    entryModulePath: options.entryModulePath,
+    manifestFilePath: options.manifestFilePath
+  });
+}
+export {
+  writeBundledNodeRuntimeManifest
+};

package/src/{define-api-handler.d.ts → adapters/shared/define-api-handler.d.ts}

@@ -1,4 +1,4 @@
-import type { ApiHandler, ApiHandlerContext, Middleware, RouteSchema, TypedGroupHandlerContext } from './public-types.js';
+import type { ApiHandler, ApiHandlerContext, Middleware, RouteSchema, TypedGroupHandlerContext } from '../../public-types.js';
 type UniversalContext = ApiHandlerContext<Request, unknown>;
 type SchemaHandlerContext<TSchema extends RouteSchema | undefined, TContext extends UniversalContext> = TSchema extends RouteSchema ? TypedGroupHandlerContext<TSchema, TContext> : TContext;
 export declare function defineApiHandler<TPath extends string, TSchema extends RouteSchema | undefined = undefined, TContext extends UniversalContext = UniversalContext>(handler: Omit<ApiHandler<TPath, Request, unknown>, 'handler' | 'middleware' | 'schema'> & {

package/src/adapters/shared/explicit-static-route-matcher.js

@@ -3,6 +3,9 @@ const EXPLICIT_STATIC_ROUTE_MATCHER_ERRORS = {
   missingIntegration: (routePath) => `View at ${routePath} is missing __eco.integration. Ensure it's defined with eco.page() and exported as default.`,
   noRendererForIntegration: (integrationName) => `No renderer found for integration: ${integrationName}`
 };
+function getViewIntegrationName(view) {
+  return view.config?.integration ?? view.config?.__eco?.integration;
+}
 class ExplicitStaticRouteMatcher {
   appConfig;
   routeRendererFactory;
@@ -71,7 +74,7 @@ class ExplicitStaticRouteMatcher {
     try {
       const mod = await route.loader();
       const view = mod.default;
-      const integrationName = view.config?.__eco?.integration;
+      const integrationName = getViewIntegrationName(view);
       if (!integrationName) {
         throw new Error(EXPLICIT_STATIC_ROUTE_MATCHER_ERRORS.missingIntegration(route.path));
       }

package/src/adapters/shared/file-route-middleware-pipeline.js

@@ -7,6 +7,7 @@ const FILE_ROUTE_MIDDLEWARE_PIPELINE_ERRORS = {
   middlewareRequiresDynamic: (filePath) => `[ecopages] Page middleware requires cache: 'dynamic'. Page: ${filePath}`
 };
 class FileRouteMiddlewarePipeline {
+  cacheService;
   constructor(cacheService) {
     this.cacheService = cacheService;
   }

package/src/adapters/shared/fs-server-response-matcher.d.ts

@@ -1,6 +1,6 @@
-import type { MatchResult } from '../../internal-types.js';
+import type { EcoPagesAppConfig, MatchResult } from '../../internal-types.js';
 import type { RouteRendererFactory } from '../../route-renderer/route-renderer.js';
-import type { FSRouter } from '../../router/fs-router.js';
+import type { FSRouter } from '../../router/server/fs-router.js';
 import type { PageCacheService } from '../../services/cache/page-cache-service.js';
 import type { CacheStrategy } from '../../services/cache/cache.types.js';
 import type { FileSystemServerResponseFactory } from './fs-server-response-factory.js';
@@ -9,6 +9,7 @@ export declare const FILE_SYSTEM_RESPONSE_MATCHER_ERRORS: {
     readonly noTranspiledOutputForPageModule: (filePath: string) => string;
 };
 export interface FileSystemResponseMatcherOptions {
+    appConfig: EcoPagesAppConfig;
     router: FSRouter;
     routeRendererFactory: RouteRendererFactory;
     fileSystemResponseFactory: FileSystemServerResponseFactory;
@@ -26,13 +27,14 @@ export interface FileSystemResponseMatcherOptions {
  * error translation.
  */
 export declare class FileSystemResponseMatcher {
+    private appConfig;
     private router;
     private routeRendererFactory;
     private fileSystemResponseFactory;
-    private pageModuleImportService;
+    private serverModuleTranspiler;
     private pageRequestCacheCoordinator;
     private fileRouteMiddlewarePipeline;
-    constructor({ router, routeRendererFactory, fileSystemResponseFactory, cacheService, defaultCacheStrategy, }: FileSystemResponseMatcherOptions);
+    constructor({ appConfig, router, routeRendererFactory, fileSystemResponseFactory, cacheService, defaultCacheStrategy, }: FileSystemResponseMatcherOptions);
     /**
      * Resolves unmatched paths either as static asset requests or as the custom
      * not-found page.
@@ -58,7 +60,9 @@ export declare class FileSystemResponseMatcher {
      *
      * The matcher needs access to page-level metadata such as `cache` and
      * `middleware` before full rendering starts, so it uses the shared module
-     * import service directly rather than going through route rendering.
+     * import service directly rather than going through route rendering. The
+     * app config is injected explicitly so build ownership stays at the adapter
+     * boundary instead of leaking through nested router collaborators.
      *
      * @param filePath Absolute page module path.
      * @returns Imported page module.

package/src/adapters/shared/fs-server-response-matcher.js

@@ -1,7 +1,8 @@
 import path from "node:path";
 import { appLogger } from "../../global/app-logger.js";
-import { PageModuleImportService } from "../../services/page-module-import.service.js";
-import { PageRequestCacheCoordinator } from "../../services/page-request-cache-coordinator.service.js";
+import { PageRequestCacheCoordinator } from "../../services/cache/page-request-cache-coordinator.service.js";
+import { getAppServerModuleTranspiler } from "../../services/module-loading/app-server-module-transpiler.service.js";
+import { resolveInternalExecutionDir } from "../../utils/resolve-work-dir.js";
 import { ServerUtils } from "../../utils/server-utils.module.js";
 import { FileRouteMiddlewarePipeline } from "./file-route-middleware-pipeline.js";
 import { LocalsAccessError } from "../../errors/locals-access-error.js";
@@ -11,23 +12,26 @@ const FILE_SYSTEM_RESPONSE_MATCHER_ERRORS = {
   noTranspiledOutputForPageModule: (filePath) => `No transpiled output generated for page module: ${filePath}`
 };
 class FileSystemResponseMatcher {
+  appConfig;
   router;
   routeRendererFactory;
   fileSystemResponseFactory;
-  pageModuleImportService;
+  serverModuleTranspiler;
   pageRequestCacheCoordinator;
   fileRouteMiddlewarePipeline;
   constructor({
+    appConfig,
     router,
     routeRendererFactory,
     fileSystemResponseFactory,
     cacheService = null,
     defaultCacheStrategy = "static"
   }) {
+    this.appConfig = appConfig;
     this.router = router;
     this.routeRendererFactory = routeRendererFactory;
     this.fileSystemResponseFactory = fileSystemResponseFactory;
-    this.pageModuleImportService = new PageModuleImportService();
+    this.serverModuleTranspiler = getAppServerModuleTranspiler(appConfig);
     this.pageRequestCacheCoordinator = new PageRequestCacheCoordinator(cacheService, defaultCacheStrategy);
     this.fileRouteMiddlewarePipeline = new FileRouteMiddlewarePipeline(cacheService);
   }
@@ -128,16 +132,17 @@ class FileSystemResponseMatcher {
    *
    * The matcher needs access to page-level metadata such as `cache` and
    * `middleware` before full rendering starts, so it uses the shared module
-   * import service directly rather than going through route rendering.
+   * import service directly rather than going through route rendering. The
+   * app config is injected explicitly so build ownership stays at the adapter
+   * boundary instead of leaking through nested router collaborators.
    *
    * @param filePath Absolute page module path.
    * @returns Imported page module.
    */
   async importPageModule(filePath) {
-    return this.pageModuleImportService.importModule({
+    return this.serverModuleTranspiler.importModule({
       filePath,
-      rootDir: path.dirname(this.router.assetPrefix),
-      outdir: path.join(this.router.assetPrefix, ".server-modules-meta"),
+      outdir: path.join(resolveInternalExecutionDir(this.appConfig), ".server-modules-meta"),
       transpileErrorMessage: FILE_SYSTEM_RESPONSE_MATCHER_ERRORS.transpilePageModuleFailed,
       noOutputMessage: FILE_SYSTEM_RESPONSE_MATCHER_ERRORS.noTranspiledOutputForPageModule
     });

package/src/adapters/shared/hmr-entrypoint-registrar.d.ts

@@ -0,0 +1,55 @@
+/**
+ * Shared runtime state used while registering HMR-owned entrypoints.
+ */
+export interface HmrEntrypointRegistrarOptions {
+    /** Absolute source directory used to derive the emitted HMR path. */
+    srcDir: string;
+    /** Absolute distribution directory where HMR outputs are written. */
+    distDir: string;
+    /** In-flight registrations keyed by normalized absolute entrypoint path. */
+    entrypointRegistrations: Map<string, Promise<string>>;
+    /** Stable entrypoint-to-output mapping retained once an entrypoint is registered. */
+    watchedFiles: Map<string, string>;
+    /** Runtime-specific cleanup invoked when an entrypoint registration fails. */
+    clearFailedRegistration?: (entrypointPath: string) => void;
+    /** Development-only guardrail for integrations that never finish producing output. */
+    registrationTimeoutMs: number;
+}
+/**
+ * Runtime-specific hooks required to materialize a single HMR entrypoint.
+ */
+export interface HmrEntrypointRegistrationOptions {
+    /**
+     * Emits the browser-consumable HMR artifact for an entrypoint.
+     */
+    emit(entrypointPath: string, outputPath: string): Promise<void>;
+    /**
+     * Creates the runtime-specific error raised when the emit hook completes without producing output.
+     */
+    getMissingOutputError(entrypointPath: string, outputPath: string): Error;
+}
+/**
+ * Coordinates the shared HMR entrypoint registration lifecycle for both Node and Bun managers.
+ *
+ * The registrar owns the cross-runtime policy: normalize entrypoint identities, dedupe concurrent
+ * registrations, derive the emitted `_hmr` output path, clear stale output before rebuilding, and
+ * apply the development timeout that prevents unresolved registrations from hanging navigation.
+ * Runtime-specific managers remain responsible for the actual emit step and any cleanup outside
+ * this shared registration flow.
+ */
+export declare class HmrEntrypointRegistrar {
+    private readonly options;
+    constructor(options: HmrEntrypointRegistrarOptions);
+    /**
+     * Registers a single source entrypoint and returns the browser URL for its emitted HMR module.
+     *
+     * Concurrent requests for the same normalized entrypoint share the same in-flight promise so the
+     * integration only builds once per registration cycle.
+     */
+    registerEntrypoint(entrypointPath: string, registrationOptions: HmrEntrypointRegistrationOptions): Promise<string>;
+    private registerEntrypointInternal;
+    private awaitEntrypointRegistration;
+    private getEntrypointOutput;
+    private removeStaleEntrypointOutput;
+    private encodeDynamicSegments;
+}

package/src/adapters/shared/hmr-entrypoint-registrar.js

@@ -0,0 +1,87 @@
+import path from "node:path";
+import { fileSystem } from "@ecopages/file-system";
+import { appLogger } from "../../global/app-logger.js";
+import { RESOLVED_ASSETS_DIR } from "../../constants.js";
+class HmrEntrypointRegistrar {
+  options;
+  constructor(options) {
+    this.options = options;
+  }
+  /**
+   * Registers a single source entrypoint and returns the browser URL for its emitted HMR module.
+   *
+   * Concurrent requests for the same normalized entrypoint share the same in-flight promise so the
+   * integration only builds once per registration cycle.
+   */
+  async registerEntrypoint(entrypointPath, registrationOptions) {
+    const normalizedEntrypoint = path.resolve(entrypointPath);
+    const existingRegistration = this.options.entrypointRegistrations.get(normalizedEntrypoint);
+    if (existingRegistration) {
+      return await this.awaitEntrypointRegistration(existingRegistration, normalizedEntrypoint);
+    }
+    const registration = this.registerEntrypointInternal(normalizedEntrypoint, registrationOptions);
+    this.options.entrypointRegistrations.set(normalizedEntrypoint, registration);
+    try {
+      return await this.awaitEntrypointRegistration(registration, normalizedEntrypoint);
+    } catch (error) {
+      this.options.clearFailedRegistration?.(normalizedEntrypoint);
+      throw error;
+    } finally {
+      this.options.entrypointRegistrations.delete(normalizedEntrypoint);
+    }
+  }
+  async registerEntrypointInternal(entrypointPath, registrationOptions) {
+    if (this.options.watchedFiles.has(entrypointPath)) {
+      return this.options.watchedFiles.get(entrypointPath);
+    }
+    const { outputPath, outputUrl } = this.getEntrypointOutput(entrypointPath);
+    this.options.watchedFiles.set(entrypointPath, outputUrl);
+    this.removeStaleEntrypointOutput(outputPath);
+    await registrationOptions.emit(entrypointPath, outputPath);
+    if (!fileSystem.exists(outputPath)) {
+      throw registrationOptions.getMissingOutputError(entrypointPath, outputPath);
+    }
+    return outputUrl;
+  }
+  async awaitEntrypointRegistration(registration, entrypointPath) {
+    if (process.env.NODE_ENV !== "development") {
+      return await registration;
+    }
+    return await Promise.race([
+      registration,
+      new Promise((_, reject) => {
+        setTimeout(() => {
+          reject(new Error(`[HMR] Timed out registering entrypoint: ${entrypointPath}`));
+        }, this.options.registrationTimeoutMs);
+      })
+    ]);
+  }
+  getEntrypointOutput(entrypointPath) {
+    const relativePath = path.relative(this.options.srcDir, entrypointPath);
+    const relativePathJs = relativePath.replace(/\.(tsx?|jsx?|mdx?)$/, ".js");
+    const encodedPathJs = this.encodeDynamicSegments(relativePathJs);
+    const urlPath = encodedPathJs.split(path.sep).join("/");
+    return {
+      outputUrl: `/${path.join(RESOLVED_ASSETS_DIR, "_hmr", urlPath)}`,
+      outputPath: path.join(this.options.distDir, urlPath)
+    };
+  }
+  removeStaleEntrypointOutput(outputPath) {
+    if (!fileSystem.exists(outputPath)) {
+      return;
+    }
+    try {
+      fileSystem.remove(outputPath);
+    } catch (error) {
+      appLogger.warn(
+        `[HMR] Failed to remove stale entrypoint output ${outputPath}: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
+  encodeDynamicSegments(filepath) {
+    return filepath.replace(/\[([^\]]+)\]/g, "_$1_");
+  }
+}
+export {
+  HmrEntrypointRegistrar
+};

package/src/adapters/shared/hmr-html-response.d.ts

@@ -0,0 +1,22 @@
+import type { IHmrManager } from '../../public-types';
+/**
+ * Returns whether a response is HTML and therefore eligible for development HMR
+ * runtime injection.
+ */
+export declare function isHtmlResponse(response: Response): boolean;
+/**
+ * Returns whether HTML responses should receive the HMR runtime bootstrap.
+ *
+ * This is shared because filesystem page responses and adapter-level HTML
+ * responses flow through different layers, but both need identical injection
+ * behavior in watch mode.
+ */
+export declare function shouldInjectHmrHtmlResponse(watch: boolean, hmrManager?: Pick<IHmrManager, 'isEnabled'>): boolean;
+/**
+ * Injects the development HMR runtime script into an HTML response if it is not
+ * already present.
+ *
+ * The check is intentionally idempotent because an HTML response can pass
+ * through more than one development-layer wrapper before reaching the client.
+ */
+export declare function injectHmrRuntimeIntoHtmlResponse(response: Response): Promise<Response>;

package/src/adapters/shared/hmr-html-response.js

@@ -0,0 +1,32 @@
+const HMR_RUNTIME_IMPORT = "import '/_hmr_runtime.js'";
+const HMR_RUNTIME_SCRIPT = `<script type="module">${HMR_RUNTIME_IMPORT};<\/script>`;
+function isHtmlResponse(response) {
+  const contentType = response.headers.get("Content-Type");
+  return contentType !== null && contentType.startsWith("text/html");
+}
+function shouldInjectHmrHtmlResponse(watch, hmrManager) {
+  return watch && hmrManager?.isEnabled() === true;
+}
+async function injectHmrRuntimeIntoHtmlResponse(response) {
+  const html = await response.text();
+  if (html.includes(HMR_RUNTIME_IMPORT)) {
+    return new Response(html, {
+      status: response.status,
+      statusText: response.statusText,
+      headers: response.headers
+    });
+  }
+  const updatedHtml = html.replace(/<\/html>/i, `${HMR_RUNTIME_SCRIPT}</html>`);
+  const headers = new Headers(response.headers);
+  headers.delete("Content-Length");
+  return new Response(updatedHtml, {
+    status: response.status,
+    statusText: response.statusText,
+    headers
+  });
+}
+export {
+  injectHmrRuntimeIntoHtmlResponse,
+  isHtmlResponse,
+  shouldInjectHmrHtmlResponse
+};

package/src/adapters/shared/render-context.js

@@ -17,10 +17,10 @@ function createRenderContext(options) {
     invariant(!!integration, `No integration found for: ${integrationName}`);
     return integration.initializeRenderer();
   };
-  return {
+  const renderContext = {
     async render(view, props, renderOptions) {
       const locals = this?.locals;
-      const mergedProps = mergePropsWithLocals(props, locals);
+      const mergedProps = mergePropsWithLocals(props ?? {}, locals);
       const renderer = getRendererForView(view);
       const ctx = {
         partial: false,
@@ -63,6 +63,7 @@ function createRenderContext(options) {
       });
     }
   };
+  return renderContext;
 }
 export {
   createRenderContext

package/src/adapters/shared/runtime-bootstrap.d.ts

@@ -0,0 +1,38 @@
+import { type BuildExecutor } from '../../build/build-adapter.js';
+import type { EcoBuildPlugin } from '../../build/build-types.js';
+import type { EcoPagesAppConfig, IClientBridge, IHmrManager } from '../../internal-types.js';
+/**
+ * Installs and returns the app-owned runtime build executor used by adapter
+ * startup and follow-up runtime work.
+ */
+export declare function installSharedRuntimeBuildExecutor(appConfig: EcoPagesAppConfig, options: {
+    development: boolean;
+}): BuildExecutor;
+/**
+ * Copies app public assets into dist and ensures the resolved assets directory
+ * exists before request handling begins.
+ */
+export declare function prepareSharedRuntimePublicDir(appConfig: EcoPagesAppConfig): void;
+/**
+ * Runs runtime plugin setup against app-owned config/runtime state and optional
+ * host plugin registration hooks.
+ */
+export declare function initializeSharedRuntimePlugins(options: {
+    appConfig: EcoPagesAppConfig;
+    runtimeOrigin: string;
+    hmrManager?: IHmrManager;
+    onRuntimePlugin?: (plugin: unknown) => void;
+}): Promise<void>;
+/**
+ * Starts shared project watching for runtime adapters.
+ */
+export declare function startSharedProjectWatching(options: {
+    appConfig: EcoPagesAppConfig;
+    refreshRouterRoutesCallback: () => Promise<void>;
+    hmrManager: IHmrManager;
+    bridge: IClientBridge;
+}): Promise<void>;
+/**
+ * Binds a runtime HMR manager to app-owned plugin and integration state.
+ */
+export declare function bindSharedRuntimeHmrManager(appConfig: EcoPagesAppConfig, hmrManager: IHmrManager): EcoBuildPlugin[];

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 "../../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,8 +1,8 @@
 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 { FSRouter } from '../../router/server/fs-router.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';
@@ -16,6 +16,16 @@ export declare abstract class SharedServerAdapter<TOptions extends ServerAdapter
     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.
      *

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

@@ -1,11 +1,11 @@
 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 { FSRouter } from "../../router/server/fs-router.js";
+import { FSRouterScanner } from "../../router/server/fs-router-scanner.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 +17,7 @@ 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";
 class SharedServerAdapter extends AbstractServerAdapter {
   router;
   fileSystemResponseMatcher;
@@ -25,6 +26,29 @@ 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.
    *
@@ -84,6 +108,7 @@ class SharedServerAdapter extends AbstractServerAdapter {
       cacheService = new PageCacheService({ store, enabled: true });
     }
     this.fileSystemResponseMatcher = new FileSystemResponseMatcher({
+      appConfig: this.appConfig,
       router: this.router,
       routeRendererFactory: this.routeRendererFactory,
       fileSystemResponseFactory,
@@ -328,13 +353,21 @@ class SharedServerAdapter extends AbstractServerAdapter {
     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" }
         });
       }
     }
+    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" }
+        });
+      }
+    }
     const apiMatch = this.matchApiHandler(request, context.apiHandlers);
     if (apiMatch) {
       return this.executeApiHandler(

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

@@ -1,5 +1,5 @@
 import type { IHmrManager } from '../../public-types';
-import type { FSRouter } from '../../router/fs-router';
+import type { FSRouter } from '../../router/server/fs-router';
 import type { ExplicitStaticRouteMatcher } from './explicit-static-route-matcher';
 import type { FileSystemResponseMatcher } from './fs-server-response-matcher';
 /**

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 { injectHmrRuntimeIntoHtmlResponse, isHtmlResponse, shouldInjectHmrHtmlResponse } from "./hmr-html-response";
 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.
@@ -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;
   }