@ecopages/core 0.2.0-alpha.2 → 0.2.0-alpha.21

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

@@ -1,13 +1,20 @@
+import { DEFAULT_ECOPAGES_HOSTNAME, DEFAULT_ECOPAGES_PORT } from "../../config/constants.js";
 import { appLogger } from "../../global/app-logger.js";
 import { HttpError } from "../../errors/http-error.js";
 import { createRequire } from "../../utils/locals-utils.js";
 import { fileSystem } from "@ecopages/file-system";
 import { SharedServerAdapter } from "../shared/server-adapter.js";
 import { ApiResponseBuilder } from "../shared/api-response.js";
+import { installSharedRuntimeBuildExecutor } from "../shared/runtime-bootstrap.js";
 import { ServerRouteHandler } from "../shared/server-route-handler.js";
-import { ServerStaticBuilder } from "../shared/server-static-builder";
-import { ClientBridge } from "./client-bridge";
-import { HmrManager } from "./hmr-manager";
+import { ServerStaticBuilder } from "../shared/server-static-builder.js";
+import {
+  injectHmrRuntimeIntoHtmlResponse,
+  isHtmlResponse,
+  shouldInjectHmrHtmlResponse
+} from "../shared/hmr-html-response.js";
+import { ClientBridge } from "./client-bridge.js";
+import { HmrManager } from "./hmr-manager.js";
 import { ServerLifecycle } from "./server-lifecycle.js";
 class BunServerAdapter extends SharedServerAdapter {
   apiHandlers;
@@ -52,14 +59,13 @@ class BunServerAdapter extends SharedServerAdapter {
    * Only injects in watch mode when HMR manager is enabled.
    */
   shouldInjectHmrScript() {
-    return this.options?.watch === true && this.hmrManager?.isEnabled() === true;
+    return shouldInjectHmrHtmlResponse(this.options?.watch === true, this.hmrManager);
   }
   /**
    * Checks if a response contains HTML content.
    */
   isHtmlResponse(response) {
-    const contentType = response.headers.get("Content-Type");
-    return contentType !== null && contentType.startsWith("text/html");
+    return isHtmlResponse(response);
   }
   /**
    * Injects HMR script into HTML responses in development mode.
@@ -67,16 +73,7 @@ class BunServerAdapter extends SharedServerAdapter {
    */
   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;
   }
@@ -85,6 +82,9 @@ class BunServerAdapter extends SharedServerAdapter {
    * Delegates to ServerLifecycle for setup.
    */
   async initialize() {
+    installSharedRuntimeBuildExecutor(this.appConfig, {
+      development: this.options?.watch === true
+    });
     this.bridge = this.bridgeFactory ?? new ClientBridge();
     this.hmrManager = this.hmrManagerFactory ?? new HmrManager({ appConfig: this.appConfig, bridge: this.bridge });
     this.lifecycle = this.lifecycleFactory ?? new ServerLifecycle({
@@ -97,7 +97,8 @@ class BunServerAdapter extends SharedServerAdapter {
     const staticBuilderOptions = {
       appConfig: this.appConfig,
       staticSiteGenerator: this.staticSiteGenerator,
-      serveOptions: this.serveOptions
+      serveOptions: this.serveOptions,
+      apiHandlers: this.apiHandlers
     };
     this.staticBuilder = this.staticBuilderFactory ? this.staticBuilderFactory(staticBuilderOptions) : new ServerStaticBuilder(staticBuilderOptions);
     await this.lifecycle.initializePlugins({ watch: this.options?.watch });
@@ -106,22 +107,23 @@ class BunServerAdapter extends SharedServerAdapter {
    * Refreshes the router routes during watch mode.
    */
   async refreshRouterRoutes() {
-    if (this.serverInstance && typeof this.serverInstance.reload === "function") {
-      try {
-        await this.initSharedRouter();
-        this.configureSharedResponseHandlers(this.staticRoutes, this.hmrManager);
+    if (!this.serverInstance || typeof this.serverInstance.reload !== "function") {
+      appLogger.error("Server instance is not available for reloading");
+      return;
+    }
+    await this.createSharedWatchRefreshCallback({
+      staticRoutes: this.staticRoutes,
+      hmrManager: this.hmrManager,
+      onRoutesReady: () => {
         const options = this.getServerOptions({ enableHmr: true });
         this.serverInstance.reload(options);
         appLogger.debug("Server routes updated with dynamic routes");
-      } catch (error) {
-        if (error instanceof Error) {
-          this.hmrManager.broadcast({ type: "error", message: error.message });
-          appLogger.error("Failed to refresh router routes:", error);
-        }
+      },
+      onError: (error) => {
+        this.hmrManager.broadcast({ type: "error", message: error.message });
+        appLogger.error("Failed to refresh router routes:", error);
       }
-    } else {
-      appLogger.error("Server instance is not available for reloading");
-    }
+    })();
   }
   async watch() {
     await this.lifecycle.startWatching({
@@ -246,8 +248,10 @@ class BunServerAdapter extends SharedServerAdapter {
    */
   async buildStatic(options) {
     if (!this.fullyInitialized) {
-      await this.initSharedRouter();
-      this.configureSharedResponseHandlers(this.staticRoutes, this.hmrManager);
+      await this.initializeSharedRouteHandling({
+        staticRoutes: this.staticRoutes,
+        hmrManager: this.hmrManager
+      });
     }
     await this.staticBuilder.build(options, {
       router: this.router,
@@ -278,8 +282,10 @@ class BunServerAdapter extends SharedServerAdapter {
   async _performInitialization(server) {
     this.serverInstance = server;
     appLogger.debug("Completing server initialization with dynamic routes");
-    await this.initSharedRouter();
-    this.configureSharedResponseHandlers(this.staticRoutes, this.hmrManager);
+    await this.initializeSharedRouteHandling({
+      staticRoutes: this.staticRoutes,
+      hmrManager: this.hmrManager
+    });
     this.fullyInitialized = true;
     if (this.options?.watch) await this.watch();
     if (server && typeof server.reload === "function") {
@@ -342,7 +348,7 @@ class BunServerAdapter extends SharedServerAdapter {
   }
 }
 async function createBunServerAdapter(params) {
-  const runtimeOrigin = params.runtimeOrigin ?? `http://${params.serveOptions.hostname || "localhost"}:${params.serveOptions.port || 3e3}`;
+  const runtimeOrigin = params.runtimeOrigin ?? `http://${params.serveOptions.hostname || DEFAULT_ECOPAGES_HOSTNAME}:${params.serveOptions.port || DEFAULT_ECOPAGES_PORT}`;
   const bridge = params.bridge ?? new ClientBridge();
   const hmrManager = params.hmrManager ?? new HmrManager({ appConfig: params.appConfig, bridge });
   const lifecycle = params.lifecycle ?? new ServerLifecycle({

package/src/adapters/bun/server-lifecycle.d.ts

@@ -1,8 +1,8 @@
-import type { EcoPagesAppConfig } from '../../internal-types';
+import type { EcoPagesAppConfig } from '../../types/internal-types.js';
 import type { EcoBuildPlugin } from '../../build/build-types.js';
-import { StaticSiteGenerator } from '../../static-site-generator/static-site-generator';
-import type { ClientBridge } from './client-bridge';
-import type { HmrManager } from './hmr-manager';
+import { StaticSiteGenerator } from '../../static-site-generator/static-site-generator.js';
+import type { ClientBridge } from './client-bridge.js';
+import type { HmrManager } from './hmr-manager.js';
 export interface WatcherCallbacks {
     refreshRouterRoutesCallback: () => Promise<void>;
 }
@@ -13,7 +13,13 @@ export interface ServerLifecycleParams {
     bridge: ClientBridge;
 }
 /**
- * Handles server lifecycle: initialization, plugins, loaders, and file watching.
+ * Coordinates Bun-runtime server startup side effects for one app instance.
+ *
+ * @remarks
+ * This class keeps runtime-only concerns together: build-runtime bootstrapping,
+ * Bun loader registration, public asset preparation, plugin setup, and file
+ * watching. Core config/build state is expected to already be finalized before
+ * this lifecycle runs.
  */
 export declare class ServerLifecycle {
     private readonly appConfig;
@@ -23,30 +29,35 @@ export declare class ServerLifecycle {
     private staticSiteGenerator;
     constructor({ appConfig, runtimeOrigin, hmrManager, bridge }: ServerLifecycleParams);
     /**
-     * Initializes the server's core components.
-     * @returns The static site generator instance for use by other components
+     * Initializes the runtime services that Bun startup depends on.
+     *
+     * @returns The static-site generator instance reused by the adapter.
      */
     initialize(): Promise<StaticSiteGenerator>;
     /**
-     * Sets up Bun loaders from config.
-     * Note: This will be abstracted to a LoaderStrategy interface in #4 Runtime Abstraction.
+     * Registers config-owned build loaders with Bun's runtime plugin API.
+     *
+     * @remarks
+     * Bun remains responsible only for transport-level plugin registration here.
+     * Loader ownership and composition were already finalized during config build.
      */
     setupLoaders(): void;
     /**
-     * Copies public directory contents to dist root.
-     * Static files are served from root (e.g., /favicon.ico, /robots.txt).
-     */
-    copyPublicDir(): void;
-    /**
-     * Initializes processors and integrations.
-     * @param options.watch - Whether watch mode is enabled
+     * Runs runtime-only processor and integration setup for this Bun app session.
+     *
+     * @param options.watch Whether watch mode is enabled.
+     * @returns The browser build plugins visible to HMR after runtime setup.
      */
     initializePlugins(options?: {
         watch?: boolean;
     }): Promise<EcoBuildPlugin[]>;
     /**
-     * Starts file watching for HMR.
+     * Starts file watching and wires change events back into the adapter refresh
+     * callback.
      */
     startWatching(callbacks: WatcherCallbacks): Promise<void>;
+    /**
+     * Returns the static-site generator created during initialization.
+     */
     getStaticSiteGenerator(): StaticSiteGenerator;
 }

package/src/adapters/bun/server-lifecycle.js

@@ -1,11 +1,12 @@
-import path from "node:path";
 import { getBunRuntime } from "../../utils/runtime.js";
-import { RESOLVED_ASSETS_DIR } from "../../constants";
-import { defaultBuildAdapter } from "../../build/build-adapter.js";
-import { appLogger } from "../../global/app-logger";
-import { fileSystem } from "@ecopages/file-system";
-import { StaticSiteGenerator } from "../../static-site-generator/static-site-generator";
-import { ProjectWatcher } from "../../watchers/project-watcher";
+import { appLogger } from "../../global/app-logger.js";
+import { StaticSiteGenerator } from "../../static-site-generator/static-site-generator.js";
+import {
+  bindSharedRuntimeHmrManager,
+  initializeSharedRuntimePlugins,
+  prepareSharedRuntimePublicDir,
+  startSharedProjectWatching
+} from "../shared/runtime-bootstrap.js";
 class ServerLifecycle {
   appConfig;
   hmrManager;
@@ -19,98 +20,69 @@ class ServerLifecycle {
     this.bridge = bridge;
   }
   /**
-   * Initializes the server's core components.
-   * @returns The static site generator instance for use by other components
+   * Initializes the runtime services that Bun startup depends on.
+   *
+   * @returns The static-site generator instance reused by the adapter.
    */
   async initialize() {
     this.staticSiteGenerator = new StaticSiteGenerator({ appConfig: this.appConfig });
     await this.hmrManager.buildRuntime();
     this.setupLoaders();
-    this.copyPublicDir();
+    prepareSharedRuntimePublicDir(this.appConfig);
     return this.staticSiteGenerator;
   }
   /**
-   * Sets up Bun loaders from config.
-   * Note: This will be abstracted to a LoaderStrategy interface in #4 Runtime Abstraction.
+   * Registers config-owned build loaders with Bun's runtime plugin API.
+   *
+   * @remarks
+   * Bun remains responsible only for transport-level plugin registration here.
+   * Loader ownership and composition were already finalized during config build.
    */
   setupLoaders() {
     const loaders = this.appConfig.loaders;
     for (const loader of loaders.values()) {
-      defaultBuildAdapter.registerPlugin(loader);
       getBunRuntime()?.plugin(loader);
     }
   }
   /**
-   * Copies public directory contents to dist root.
-   * Static files are served from root (e.g., /favicon.ico, /robots.txt).
-   */
-  copyPublicDir() {
-    try {
-      const srcPublicDir = path.join(this.appConfig.rootDir, this.appConfig.srcDir, this.appConfig.publicDir);
-      if (fileSystem.exists(srcPublicDir)) {
-        fileSystem.copyDir(srcPublicDir, path.join(this.appConfig.rootDir, this.appConfig.distDir));
-      }
-      fileSystem.ensureDir(path.join(this.appConfig.absolutePaths.distDir, RESOLVED_ASSETS_DIR));
-    } catch (error) {
-      appLogger.error(
-        `Failed to copy public directory: ${error instanceof Error ? error.message : String(error)}`
-      );
-      throw error;
-    }
-  }
-  /**
-   * Initializes processors and integrations.
-   * @param options.watch - Whether watch mode is enabled
+   * Runs runtime-only processor and integration setup for this Bun app session.
+   *
+   * @param options.watch Whether watch mode is enabled.
+   * @returns The browser build plugins visible to HMR after runtime setup.
    */
   async initializePlugins(options) {
     try {
       const hmrEnabled = !!options?.watch;
       this.hmrManager.setEnabled(hmrEnabled);
-      const processorBuildPlugins = [];
-      const processorPromises = Array.from(this.appConfig.processors.values()).map(async (processor) => {
-        await processor.setup();
-        if (processor.plugins) {
-          for (const plugin of processor.plugins) {
-            defaultBuildAdapter.registerPlugin(plugin);
-            getBunRuntime()?.plugin(plugin);
-          }
-        }
-        if (processor.buildPlugins) {
-          processorBuildPlugins.push(...processor.buildPlugins);
-        }
-      });
-      const integrationPromises = this.appConfig.integrations.map(async (integration) => {
-        integration.setConfig(this.appConfig);
-        integration.setRuntimeOrigin(this.runtimeOrigin);
-        integration.setHmrManager(this.hmrManager);
-        await integration.setup();
-        for (const plugin of integration.plugins) {
-          defaultBuildAdapter.registerPlugin(plugin);
+      await initializeSharedRuntimePlugins({
+        appConfig: this.appConfig,
+        runtimeOrigin: this.runtimeOrigin,
+        hmrManager: this.hmrManager,
+        onRuntimePlugin: (plugin) => {
           getBunRuntime()?.plugin(plugin);
         }
       });
-      await Promise.all([...processorPromises, ...integrationPromises]);
-      const loaderPlugins = Array.from(this.appConfig.loaders.values());
-      const allBuildPlugins = [...loaderPlugins, ...processorBuildPlugins];
-      this.hmrManager.setPlugins(allBuildPlugins);
-      return allBuildPlugins;
+      return bindSharedRuntimeHmrManager(this.appConfig, this.hmrManager);
     } catch (error) {
       appLogger.error(`Failed to initialize plugins: ${error instanceof Error ? error.message : String(error)}`);
       throw error;
     }
   }
   /**
-   * Starts file watching for HMR.
+   * Starts file watching and wires change events back into the adapter refresh
+   * callback.
    */
   async startWatching(callbacks) {
-    const watcherInstance = new ProjectWatcher({
-      config: this.appConfig,
+    await startSharedProjectWatching({
+      appConfig: this.appConfig,
       refreshRouterRoutesCallback: callbacks.refreshRouterRoutesCallback,
       hmrManager: this.hmrManager,
       bridge: this.bridge
     });
-    await watcherInstance.createWatcherSubscription();
   }
+  /**
+   * Returns the static-site generator created during initialization.
+   */
   getStaticSiteGenerator() {
     return this.staticSiteGenerator;
   }

package/src/{create-app.d.ts → adapters/create-app.d.ts}

@@ -1,9 +1,12 @@
-import type { EcopagesAppOptions as BunOptions } from './adapters/bun/create-app.js';
-import type { EcopagesAppOptions as NodeOptions } from './adapters/node/create-app.js';
-import { AbstractApplicationAdapter } from './adapters/abstract/application-adapter.js';
-import { SharedApplicationAdapter } from './adapters/shared/application-adapter.js';
-export type EcopagesAppOptions = BunOptions | NodeOptions;
-export type UniversalEcopagesApp = AbstractApplicationAdapter<EcopagesAppOptions, any, Request>;
+import type { EcoPagesAppConfig } from '../types/internal-types.js';
+import { AbstractApplicationAdapter } from './abstract/application-adapter.js';
+import type { ApplicationAdapterOptions } from './abstract/application-adapter.js';
+import { SharedApplicationAdapter } from './shared/application-adapter.js';
+export interface EcopagesAppOptions extends ApplicationAdapterOptions {
+    appConfig: EcoPagesAppConfig;
+    serverOptions?: Record<string, any>;
+}
+export type UniversalEcopagesApp = AbstractApplicationAdapter<EcopagesAppOptions, unknown, Request>;
 export declare function createApp<WebSocketData = undefined>(options: EcopagesAppOptions): Promise<UniversalEcopagesApp>;
 export declare class EcopagesApp extends SharedApplicationAdapter<EcopagesAppOptions, unknown, Request> {
     private readonly appOptions;

package/src/{create-app.js → adapters/create-app.js}

@@ -1,12 +1,12 @@
-import { AbstractApplicationAdapter } from "./adapters/abstract/application-adapter.js";
-import { SharedApplicationAdapter } from "./adapters/shared/application-adapter.js";
+import { AbstractApplicationAdapter } from "./abstract/application-adapter.js";
+import { SharedApplicationAdapter } from "./shared/application-adapter.js";
 async function createRuntimeApp(options) {
   const bun = globalThis.Bun;
   if (bun) {
-    const { createApp: createBunApp } = await import("./adapters/bun/create-app.js");
+    const { createApp: createBunApp } = await import("./bun/create-app.js");
     return await createBunApp(options);
   }
-  const { createNodeApp } = await import("./adapters/node/create-app.js");
+  const { createApp: createNodeApp } = await import("./node/create-app.js");
   return await createNodeApp(options);
 }
 async function createApp(options) {

package/src/adapters/index.d.ts

@@ -1,6 +1,2 @@
-export { EcopagesApp, createApp } from './bun/create-app.js';
-export { defineApiHandler, defineGroupHandler } from './bun/define-api-handler.js';
-export { NodeServerAdapter, createNodeServerAdapter } from './node/server-adapter.js';
-export { EcopagesApp as NodeAdapterEcopagesApp, createNodeApp } from './node/create-app.js';
-export type { NodeServerAdapterParams, NodeServerAdapterResult } from './node/server-adapter.js';
-export type { EcopagesAppOptions as NodeEcopagesAppOptions } from './node/create-app.js';
+export { EcopagesApp, createApp } from './create-app.js';
+export { defineApiHandler, defineGroupHandler, type GroupHandler } from './shared/define-api-handler.js';

package/src/adapters/index.js

@@ -1,14 +1,8 @@
-import { EcopagesApp, createApp } from "./bun/create-app.js";
-import { defineApiHandler, defineGroupHandler } from "./bun/define-api-handler.js";
-import { NodeServerAdapter, createNodeServerAdapter } from "./node/server-adapter.js";
-import { EcopagesApp as EcopagesApp2, createNodeApp } from "./node/create-app.js";
+import { EcopagesApp, createApp } from "./create-app.js";
+import { defineApiHandler, defineGroupHandler } from "./shared/define-api-handler.js";
 export {
   EcopagesApp,
-  EcopagesApp2 as NodeAdapterEcopagesApp,
-  NodeServerAdapter,
   createApp,
-  createNodeApp,
-  createNodeServerAdapter,
   defineApiHandler,
   defineGroupHandler
 };

package/src/adapters/node/create-app.d.ts

@@ -1,16 +1,12 @@
 import { type Server as NodeServerInstance } from 'node:http';
-import type { EcoPagesAppConfig } from '../../internal-types.js';
-import { type ApplicationAdapterOptions } from '../abstract/application-adapter.js';
 import { SharedApplicationAdapter } from '../shared/application-adapter.js';
-import { type NodeServerAdapterResult } from './server-adapter.js';
-export interface EcopagesAppOptions extends ApplicationAdapterOptions {
-    appConfig: EcoPagesAppConfig;
-    serverOptions?: Record<string, any>;
-}
-export declare class EcopagesApp extends SharedApplicationAdapter<EcopagesAppOptions, NodeServerInstance, Request> {
+import type { EcopagesAppOptions } from '../create-app.js';
+import { type NodeServerAdapterResult, createNodeServerAdapter } from './server-adapter.js';
+export declare class NodeEcopagesApp extends SharedApplicationAdapter<EcopagesAppOptions, NodeServerInstance, Request> {
     serverAdapter: NodeServerAdapterResult | undefined;
     private server;
     private runtimeOrigin;
+    protected createServerAdapter(params: Parameters<typeof createNodeServerAdapter>[0]): Promise<NodeServerAdapterResult>;
     stop(force?: boolean): Promise<void>;
     protected initializeServerAdapter(): Promise<NodeServerAdapterResult>;
     start(): Promise<NodeServerInstance | void>;
@@ -18,4 +14,5 @@ export declare class EcopagesApp extends SharedApplicationAdapter<EcopagesAppOpt
     private sendNodeResponse;
     fetch(request: Request): Promise<Response>;
 }
-export declare function createNodeApp(options: EcopagesAppOptions): Promise<EcopagesApp>;
+export declare function createNodeApp(options: EcopagesAppOptions): Promise<NodeEcopagesApp>;
+export declare function createApp(options: EcopagesAppOptions): Promise<NodeEcopagesApp>;

package/src/adapters/node/create-app.js

@@ -1,14 +1,16 @@
 import { createServer } from "node:http";
 import { Readable } from "node:stream";
-import { DEFAULT_ECOPAGES_HOSTNAME, DEFAULT_ECOPAGES_PORT } from "../../constants.js";
+import { DEFAULT_ECOPAGES_HOSTNAME, DEFAULT_ECOPAGES_PORT } from "../../config/constants.js";
 import { appLogger } from "../../global/app-logger.js";
-import {} from "../abstract/application-adapter.js";
 import { SharedApplicationAdapter } from "../shared/application-adapter.js";
 import { createNodeServerAdapter } from "./server-adapter.js";
-class EcopagesApp extends SharedApplicationAdapter {
+class NodeEcopagesApp extends SharedApplicationAdapter {
   serverAdapter;
   server = null;
   runtimeOrigin = "";
+  createServerAdapter(params) {
+    return createNodeServerAdapter(params);
+  }
   async stop(force = true) {
     if (!this.server) {
       return;
@@ -36,7 +38,7 @@ class EcopagesApp extends SharedApplicationAdapter {
     const preferredPort = cliPort ?? (envPort ? Number(envPort) : void 0) ?? DEFAULT_ECOPAGES_PORT;
     const preferredHostname = cliHostname ?? envHostname ?? DEFAULT_ECOPAGES_HOSTNAME;
     this.runtimeOrigin = `http://${preferredHostname}:${preferredPort}`;
-    return createNodeServerAdapter({
+    return this.createServerAdapter({
       runtimeOrigin: this.runtimeOrigin,
       appConfig: this.appConfig,
       apiHandlers: this.apiHandlers,
@@ -135,9 +137,13 @@ class EcopagesApp extends SharedApplicationAdapter {
   }
 }
 async function createNodeApp(options) {
-  return new EcopagesApp(options);
+  return new NodeEcopagesApp(options);
+}
+async function createApp(options) {
+  return createNodeApp(options);
 }
 export {
-  EcopagesApp,
+  NodeEcopagesApp,
+  createApp,
   createNodeApp
 };

package/src/adapters/node/node-client-bridge.d.ts

@@ -1,5 +1,5 @@
 import type { WebSocket } from 'ws';
-import type { ClientBridgeEvent, IClientBridge } from '../../public-types.js';
+import type { ClientBridgeEvent, IClientBridge } from '../../types/public-types.js';
 export declare class NodeClientBridge implements IClientBridge {
     private subscribers;
     private heartbeatTimer;