@ecopages/core 0.2.0-alpha.39 → 0.2.0-alpha.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecopages/core",
-  "version": "0.2.0-alpha.39",
+  "version": "0.2.0-alpha.40",
   "description": "Core package for Ecopages",
   "keywords": [
     "ecopages",
@@ -17,7 +17,7 @@
     "directory": "packages/core"
   },
   "dependencies": {
-    "@ecopages/file-system": "0.2.0-alpha.39",
+    "@ecopages/file-system": "0.2.0-alpha.40",
     "@ecopages/logger": "^0.2.3",
     "@ecopages/scripts-injector": "^0.1.5",
     "@worker-tools/html-rewriter": "0.1.0-pre.19",

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

@@ -10,6 +10,8 @@
 import type { Server } from 'bun';
 import type { ApiHandlerContext, RouteGroupBuilder } from '../../types/public-types.js';
 import { SharedApplicationAdapter } from '../shared/application-adapter.js';
+import type { RuntimeHost } from '../shared/runtime-host.js';
+import type { StaticPreviewHost } from '../shared/static-preview-host.js';
 import type { EcopagesAppOptions } from '../create-app.js';
 import { type BunServerAdapterResult } from './server-adapter.js';
 /**
@@ -29,7 +31,12 @@ export type BunRouteGroupBuilder<WebSocketData = undefined, TContext extends Api
 export declare class BunEcopagesApp<WebSocketData = undefined> extends SharedApplicationAdapter<EcopagesAppOptions, Server<WebSocketData>, Request> {
     serverAdapter: BunServerAdapterResult | undefined;
     private server;
-    private startStaticPreviewServer;
+    private readonly runtimeHost;
+    private readonly previewHost;
+    constructor(options: EcopagesAppOptions, dependencies: {
+        runtimeHost: RuntimeHost<Server<WebSocketData>, Bun.Serve.Options<WebSocketData>>;
+        previewHost: StaticPreviewHost;
+    });
     fetch(request: Request): Promise<Response>;
     /**
      * Complete the initialization of the server adapter by processing dynamic routes

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

@@ -1,36 +1,19 @@
 import { DEFAULT_ECOPAGES_HOSTNAME, DEFAULT_ECOPAGES_PORT } from "../../config/constants.js";
-import { StaticContentServer } from "../../dev/sc-server.js";
 import { appLogger } from "../../global/app-logger.js";
-import { getBunRuntime } from "../../utils/runtime.js";
 import { SharedApplicationAdapter } from "../shared/application-adapter.js";
+import { resolveRuntimeBinding, resolveStaticRuntimeMode } from "../shared/runtime-app-bootstrap.js";
 import { createBunServerAdapter } from "./server-adapter.js";
+import { BunStaticPreviewHost } from "./static-preview-host.js";
+import { BunRuntimeHost } from "./runtime-host.js";
 class BunEcopagesApp extends SharedApplicationAdapter {
   serverAdapter;
   server = null;
-  async startStaticPreviewServer(port, hostname) {
-    await new Promise((resolve) => setTimeout(resolve, 100));
-    for (let attempt = 0; attempt < 20; attempt += 1) {
-      try {
-        const previewServer = StaticContentServer.createServer({
-          appConfig: this.appConfig,
-          options: { port }
-        });
-        if (previewServer.server?.port) {
-          appLogger.info(`Preview running at http://${hostname}:${previewServer.server.port}`);
-          return;
-        }
-        break;
-      } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        const errorCode = typeof error === "object" && error !== null && "code" in error ? String(error.code) : void 0;
-        const isPortReleaseRace = errorCode === "EADDRINUSE" || errorMessage.includes("EADDRINUSE");
-        if (!isPortReleaseRace || attempt === 19) {
-          throw error;
-        }
-        await new Promise((resolve) => setTimeout(resolve, 100));
-      }
-    }
-    appLogger.error("Failed to start preview server");
+  runtimeHost;
+  previewHost;
+  constructor(options, dependencies) {
+    super(options);
+    this.runtimeHost = dependencies.runtimeHost;
+    this.previewHost = dependencies.previewHost;
   }
   async fetch(request) {
     if (!this.serverAdapter) {
@@ -53,34 +36,28 @@ class BunEcopagesApp extends SharedApplicationAdapter {
    * Initialize the Bun server adapter
    */
   async initializeServerAdapter() {
-    const { dev } = this.cliArgs;
-    const { port: cliPort, hostname: cliHostname } = this.cliArgs;
-    const envPort = process.env.ECOPAGES_PORT ? process.env.ECOPAGES_PORT : void 0;
-    const envHostname = process.env.ECOPAGES_HOSTNAME;
-    const preferredPort = cliPort ?? envPort ?? DEFAULT_ECOPAGES_PORT;
-    const preferredHostname = cliHostname ?? envHostname ?? DEFAULT_ECOPAGES_HOSTNAME;
+    const binding = resolveRuntimeBinding({
+      cliArgs: this.cliArgs,
+      serverOptions: this.serverOptions
+    });
     appLogger.debug("initializeServerAdapter", {
-      dev,
-      cliPort,
-      cliHostname,
-      envPort,
-      envHostname,
-      preferredPort,
-      preferredHostname,
-      composedUrl: `http://${preferredHostname}:${preferredPort}`
+      dev: this.cliArgs.dev,
+      cliPort: this.cliArgs.port,
+      cliHostname: this.cliArgs.hostname,
+      envPort: process.env.ECOPAGES_PORT,
+      envHostname: process.env.ECOPAGES_HOSTNAME,
+      preferredPort: binding.preferredPort,
+      preferredHostname: binding.preferredHostname,
+      composedUrl: binding.runtimeOrigin
     });
     return await createBunServerAdapter({
-      runtimeOrigin: `http://${preferredHostname}:${preferredPort}`,
+      runtimeOrigin: binding.runtimeOrigin,
       appConfig: this.appConfig,
       apiHandlers: this.apiHandlers,
       staticRoutes: this.staticRoutes,
       errorHandler: this.errorHandler,
-      options: { watch: dev },
-      serveOptions: {
-        port: preferredPort,
-        hostname: preferredHostname,
-        ...this.serverOptions
-      }
+      options: { watch: binding.watch },
+      serveOptions: binding.serveOptions
     });
   }
   /**
@@ -93,11 +70,11 @@ class BunEcopagesApp extends SharedApplicationAdapter {
       this.serverAdapter = await this.initializeServerAdapter();
     }
     const { dev, preview, build } = this.cliArgs;
-    const requiresFetchRuntime = this.appConfig.integrations.some(
-      (integration) => integration.staticBuildStep === "fetch"
-    );
-    const canBuildWithoutRuntimeServer = (build || preview) && !requiresFetchRuntime;
-    if (canBuildWithoutRuntimeServer) {
+    const staticRuntimeMode = resolveStaticRuntimeMode({
+      appConfig: this.appConfig,
+      cliArgs: this.cliArgs
+    });
+    if (staticRuntimeMode.canBuildWithoutRuntimeServer) {
       appLogger.debugTime("Building static pages");
       await this.serverAdapter.buildStatic({ preview });
       appLogger.debugTimeEnd("Building static pages");
@@ -110,31 +87,38 @@ class BunEcopagesApp extends SharedApplicationAdapter {
     const serverOptions = this.serverAdapter.getServerOptions({ enableHmr });
     const configuredHostname = String(serverOptions.hostname ?? DEFAULT_ECOPAGES_HOSTNAME);
     const configuredPort = Number(serverOptions.port ?? DEFAULT_ECOPAGES_PORT);
-    const runtimeServerOptions = (preview || build) && requiresFetchRuntime ? {
+    const runtimeServerOptions = (preview || build) && staticRuntimeMode.requiresFetchRuntime ? {
       ...serverOptions,
       port: 0
     } : serverOptions;
-    const bun = getBunRuntime();
-    if (!bun) {
-      throw new Error("Bun runtime is required for the Bun adapter");
-    }
-    const bunServer = bun.serve(runtimeServerOptions);
-    this.server = bunServer;
+    this.server = await this.runtimeHost.start({
+      serveOptions: runtimeServerOptions,
+      handleRequest: async () => new Response(null, { status: 500 }),
+      onError: async () => {
+      }
+    });
     await this.serverAdapter.completeInitialization(this.server).catch((error) => {
       appLogger.error(`Failed to complete initialization: ${error}`);
     });
     if (!this.server) {
       throw new Error("Server failed to start");
     }
-    appLogger.info(`Server running at http://${this.server.hostname}:${this.server.port}`);
+    appLogger.info(
+      `Server running at ${this.runtimeHost.getOrigin(this.server, runtimeServerOptions)}`
+    );
     if (build || preview) {
       appLogger.debugTime("Building static pages");
       await this.serverAdapter.buildStatic({ preview: false });
-      this.server.stop(true);
+      await this.runtimeHost.stop(this.server, { force: true });
       if (preview) {
-        const previewHostname = configuredHostname;
-        const previewPort = configuredPort;
-        await this.startStaticPreviewServer(previewPort, previewHostname);
+        const previewPort = await this.previewHost.start({
+          appConfig: this.appConfig,
+          hostname: configuredHostname,
+          port: configuredPort
+        });
+        if (previewPort) {
+          appLogger.info(`Preview running at http://${configuredHostname}:${previewPort}`);
+        }
       }
       appLogger.debugTimeEnd("Building static pages");
       if (build) {
@@ -145,7 +129,10 @@ class BunEcopagesApp extends SharedApplicationAdapter {
   }
 }
 async function createApp(options) {
-  return new BunEcopagesApp(options);
+  return new BunEcopagesApp(options, {
+    runtimeHost: new BunRuntimeHost(),
+    previewHost: new BunStaticPreviewHost()
+  });
 }
 export {
   BunEcopagesApp,

package/src/adapters/bun/hmr-manager.d.ts

@@ -1,17 +1,13 @@
 import type { WebSocketHandler } from 'bun';
-import type { DefaultHmrContext, EcoPagesAppConfig, IHmrManager } from '../../types/internal-types.js';
-import type { EcoBuildPlugin } from '../../build/build-types.js';
-import { type HmrStrategy } from '../../hmr/hmr-strategy.js';
+import type { EcoPagesAppConfig } from '../../types/internal-types.js';
 import type { ClientBridge } from './client-bridge.js';
-import type { ClientBridgeEvent } from '../../types/public-types.js';
+import { InMemoryEntrypointDependencyGraph, type EntrypointDependencyGraph } from '../../services/runtime-state/entrypoint-dependency-graph.service.js';
+import { SharedHmrManager } from '../shared/shared-hmr-manager.js';
 type BunSocketHandler = WebSocketHandler<unknown>;
 export interface HmrManagerParams {
     appConfig: EcoPagesAppConfig;
     bridge: ClientBridge;
 }
-type HandleFileChangeOptions = {
-    broadcast?: boolean;
-};
 /**
  * Bun development HMR manager.
  *
@@ -20,112 +16,32 @@ type HandleFileChangeOptions = {
  * strict integration-owned registrations, while generic script assets use their
  * own explicit registration path.
  */
-export declare class HmrManager implements IHmrManager {
-    private static readonly entrypointRegistrationTimeoutMs;
-    readonly appConfig: EcoPagesAppConfig;
-    private readonly bridge;
-    /** Keep track of watchers */
-    private watchers;
-    /** entrypoint -> output path */
-    private watchedFiles;
-    private entrypointRegistrations;
-    private distDir;
-    private plugins;
-    private enabled;
-    private strategies;
-    private readonly entrypointRegistrar;
-    private readonly browserBundleService;
-    private readonly entrypointDependencyGraph;
-    private readonly serverModuleTranspiler;
+export declare class HmrManager extends SharedHmrManager {
     private wsHandler;
-    constructor({ appConfig, bridge }: HmrManagerParams);
-    /**
-     * Ensures the HMR output directory exists.
-     *
-     * This must not remove the directory because multiple app processes
-     * can share the same dist path during e2e runs.
-     */
-    private cleanDistDir;
     /**
-     * Returns whether the generic JS strategy may rebuild an entrypoint.
+     * Creates the Bun HMR manager around the shared HMR orchestration pipeline.
      *
      * @remarks
-     * Integration-owned page entrypoints are excluded so a shared dependency
-     * invalidation cannot replace framework-owned browser output with a generic JS
-     * rebuild.
-     */
-    private shouldJsStrategyProcessEntrypoint;
-    /**
-     * Initializes core HMR strategies.
-     * Strategies are evaluated in priority order (highest first).
-     */
-    private initializeStrategies;
-    /**
-     * Registers a custom HMR strategy.
-     * Used by integrations to provide framework-specific HMR handling.
-     * @param strategy - The HMR strategy to register
-     */
-    registerStrategy(strategy: HmrStrategy): void;
-    setPlugins(plugins: EcoBuildPlugin[]): void;
-    setEnabled(enabled: boolean): void;
-    isEnabled(): boolean;
-    getWebSocketHandler(): BunSocketHandler;
-    /**
-     * Builds the client-side HMR runtime script.
+     * Bun delegates route watching, rebuild dispatch, and runtime bundle
+     * generation to `SharedHmrManager`. The Bun subclass only supplies the
+     * transport-specific dependency graph policy and websocket hook surface.
      */
-    buildRuntime(): Promise<void>;
-    getRuntimePath(): string;
-    broadcast(event: ClientBridgeEvent): void;
-    handleFileChange(filePath: string, options?: HandleFileChangeOptions): Promise<void>;
-    getOutputUrl(entrypointPath: string): string | undefined;
-    getWatchedFiles(): Map<string, string>;
-    getDistDir(): string;
-    getPlugins(): EcoBuildPlugin[];
-    getDefaultContext(): DefaultHmrContext;
-    private clearFailedEntrypointRegistration;
-    /**
-     * Registers one integration-owned page entrypoint.
-     *
-     * @remarks
-     * Concurrent callers share one in-flight registration. The registration is
-     * cleared from the dedupe map when it settles so later callers cannot inherit a
-     * stale promise.
-     */
-    registerEntrypoint(entrypointPath: string): Promise<string>;
-    /**
-     * Registers one generic script entrypoint.
-     *
-     * @remarks
-     * This explicit path keeps the page-entrypoint contract strict while still
-     * allowing generic script assets to use the fallback build path.
-     */
-    registerScriptEntrypoint(entrypointPath: string): Promise<string>;
-    /**
-     * Performs strict integration-owned registration for one normalized path.
-     *
-     * @remarks
-     * The manager reserves the output URL, removes any stale emitted file, runs
-     * strategy processing without broadcasting, and then verifies that the owning
-     * integration emitted the expected file.
-     */
-    private emitStrictEntrypoint;
+    constructor({ appConfig, bridge }: HmrManagerParams);
     /**
-     * Performs registration for a generic script asset.
-     *
-     * @remarks
-     * This path performs a targeted browser bundle for the requested script
-     * entrypoint only. The resulting dependency graph is retained so later file
-     * changes can invalidate just the affected script entrypoints.
+     * Reuses the shared in-memory dependency graph when possible and otherwise
+     * creates the Bun-compatible default graph implementation.
      */
-    private emitScriptEntrypoint;
+    protected createEntrypointDependencyGraph(existingEntrypointDependencyGraph: EntrypointDependencyGraph): InMemoryEntrypointDependencyGraph;
     /**
-     * Stops active watchers and releases retained registration state.
+     * Returns the Bun websocket hooks that attach and detach live HMR subscribers.
      *
      * @remarks
-     * Emitted `_hmr` files remain on disk because parallel app processes may share
-     * the same dist directory. The in-memory indexes are cleared so stale
-     * entrypoints cannot leak through a reused manager object.
+     * `SharedHmrManager` stores the bridge behind the transport-agnostic
+     * `IClientBridge` contract because most HMR coordination only needs broadcast
+     * behavior. Bun connection lifecycle wiring is the point where that abstraction
+     * intentionally narrows back to the concrete Bun bridge so websocket instances
+     * can be tracked directly.
      */
-    stop(): void;
+    getWebSocketHandler(): BunSocketHandler;
 }
 export {};