@ecopages/core 0.2.0-alpha.8 → 0.2.1-beta.0

package/src/adapters/abstract/router-adapter.d.ts

@@ -6,7 +6,7 @@
  *
  * @module RouterAdapter
  */
-import type { Routes } from '../../internal-types.js';
+import type { Routes } from '../../types/internal-types.js';
 /**
  * Abstract base class for router adapters across different runtimes
  */

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

@@ -6,8 +6,8 @@
  *
  * @module ServerAdapter
  */
-import type { EcoPagesAppConfig } from '../../internal-types.js';
-import type { ApiHandler } from '../../public-types.js';
+import type { EcoPagesAppConfig } from '../../types/internal-types.js';
+import type { ApiHandler } from '../../types/public-types.js';
 /**
  * Configuration options for all server adapters
  */

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

@@ -1,5 +1,5 @@
 import type { ServerWebSocket } from 'bun';
-import type { ClientBridgeEvent, IClientBridge } from '../../public-types';
+import type { ClientBridgeEvent, IClientBridge } from '../../types/public-types.js';
 type BunSocket = ServerWebSocket<unknown>;
 /**
  * Manages WebSocket subscribers and broadcasts development events.

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

@@ -8,18 +8,12 @@
  * @module EcopagesApp
  */
 import type { Server } from 'bun';
-import type { EcoPagesAppConfig } from '../../internal-types.js';
-import type { ApiHandlerContext, RouteGroupBuilder } from '../../public-types.js';
-import { type ApplicationAdapterOptions } from '../abstract/application-adapter.js';
+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';
-/**
- * Configuration options for the Bun application adapter
- */
-export interface EcopagesAppOptions extends ApplicationAdapterOptions {
-    appConfig: EcoPagesAppConfig;
-    serverOptions?: Record<string, any>;
-}
 /**
  * Bun-specific route group builder that properly infers route params from path patterns.
  * When you define a route like `/posts/:slug`, the handler context will have
@@ -34,9 +28,15 @@ export type BunRouteGroupBuilder<WebSocketData = undefined, TContext extends Api
  * This class extends the {@link AbstractApplicationAdapter}
  * and provides methods for handling HTTP requests and managing the server.
  */
-export declare class EcopagesApp<WebSocketData = undefined> extends SharedApplicationAdapter<EcopagesAppOptions, Server<WebSocketData>, Request> {
+export declare class BunEcopagesApp<WebSocketData = undefined> extends SharedApplicationAdapter<EcopagesAppOptions, Server<WebSocketData>, Request> {
     serverAdapter: BunServerAdapterResult | undefined;
     private server;
+    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
@@ -57,4 +57,4 @@ export declare class EcopagesApp<WebSocketData = undefined> extends SharedApplic
 /**
  * Factory function to create a Bun application
  */
-export declare function createApp<WebSocketData = undefined>(options: EcopagesAppOptions): Promise<EcopagesApp<WebSocketData>>;
+export declare function createApp<WebSocketData = undefined>(options: EcopagesAppOptions): Promise<BunEcopagesApp<WebSocketData>>;

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

@@ -1,12 +1,20 @@
-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 { getBunRuntime } from "../../utils/runtime.js";
-import {} from "../abstract/application-adapter.js";
 import { SharedApplicationAdapter } from "../shared/application-adapter.js";
+import { resolveRuntimeBinding, resolveStaticRuntimeMode } from "../shared/runtime-app-bootstrap.js";
 import { createBunServerAdapter } from "./server-adapter.js";
-class EcopagesApp extends SharedApplicationAdapter {
+import { BunStaticPreviewHost } from "./static-preview-host.js";
+import { BunRuntimeHost } from "./runtime-host.js";
+class BunEcopagesApp extends SharedApplicationAdapter {
   serverAdapter;
   server = null;
+  runtimeHost;
+  previewHost;
+  constructor(options, dependencies) {
+    super(options);
+    this.runtimeHost = dependencies.runtimeHost;
+    this.previewHost = dependencies.previewHost;
+  }
   async fetch(request) {
     if (!this.serverAdapter) {
       this.serverAdapter = await this.initializeServerAdapter();
@@ -28,34 +36,28 @@ class EcopagesApp 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
     });
   }
   /**
@@ -68,11 +70,11 @@ class EcopagesApp 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");
@@ -83,23 +85,41 @@ class EcopagesApp extends SharedApplicationAdapter {
     }
     const enableHmr = dev || !preview && !build;
     const serverOptions = this.serverAdapter.getServerOptions({ enableHmr });
-    const bun = getBunRuntime();
-    if (!bun) {
-      throw new Error("Bun runtime is required for the Bun adapter");
-    }
-    const bunServer = bun.serve(serverOptions);
-    this.server = bunServer;
+    const configuredHostname = String(serverOptions.hostname ?? DEFAULT_ECOPAGES_HOSTNAME);
+    const configuredPort = Number(serverOptions.port ?? DEFAULT_ECOPAGES_PORT);
+    const runtimeServerOptions = (preview || build) && staticRuntimeMode.requiresFetchRuntime ? {
+      ...serverOptions,
+      port: 0
+    } : serverOptions;
+    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 });
-      this.server.stop(true);
+      await this.serverAdapter.buildStatic({ preview: false });
+      await this.runtimeHost.stop(this.server, { force: true });
+      if (preview) {
+        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) {
         process.exit(0);
@@ -109,9 +129,12 @@ class EcopagesApp extends SharedApplicationAdapter {
   }
 }
 async function createApp(options) {
-  return new EcopagesApp(options);
+  return new BunEcopagesApp(options, {
+    runtimeHost: new BunRuntimeHost(),
+    previewHost: new BunStaticPreviewHost()
+  });
 }
 export {
-  EcopagesApp,
+  BunEcopagesApp,
   createApp
 };

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

@@ -1,17 +1,13 @@
 import type { WebSocketHandler } from 'bun';
-import type { DefaultHmrContext, EcoPagesAppConfig, IHmrManager } from '../../internal-types';
-import type { EcoBuildPlugin } from '../../build/build-types.js';
-import { type HmrStrategy } from '../../hmr/hmr-strategy';
-import type { ClientBridge } from './client-bridge';
-import type { ClientBridgeEvent } from '../../public-types';
+import type { EcoPagesAppConfig } from '../../types/internal-types.js';
+import type { ClientBridge } from './client-bridge.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,124 +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 runtimeSpecifierRegistry;
-    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.
+     * 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.
      */
-    private shouldJsStrategyProcessEntrypoint;
-    /**
-     * Initializes core HMR strategies.
-     * Strategies are evaluated in priority order (highest first).
-     */
-    private initializeStrategies;
+    constructor({ appConfig, bridge }: HmrManagerParams);
     /**
-     * Registers a custom HMR strategy.
-     * Used by integrations to provide framework-specific HMR handling.
-     * @param strategy - The HMR strategy to register
+     * Reuses the shared in-memory dependency graph when possible and otherwise
+     * creates the Bun-compatible default graph implementation.
      */
-    registerStrategy(strategy: HmrStrategy): void;
-    setPlugins(plugins: EcoBuildPlugin[]): void;
-    setEnabled(enabled: boolean): void;
-    isEnabled(): boolean;
+    protected createEntrypointDependencyGraph(existingEntrypointDependencyGraph: EntrypointDependencyGraph): InMemoryEntrypointDependencyGraph;
     /**
-     * Registers runtime bare-specifier mappings exposed by integrations.
+     * Returns the Bun websocket hooks that attach and detach live HMR subscribers.
      *
      * @remarks
-     * These mappings are consumed by framework-owned HMR strategies that preserve
-     * shared runtime imports in browser bundles. The registry stays generic so
-     * these mappings can later support broader import-map-style runtime features
-     * without moving integration semantics into core.
+     * `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.
      */
-    registerSpecifierMap(map: Record<string, string>): void;
     getWebSocketHandler(): BunSocketHandler;
-    /**
-     * Builds the client-side HMR runtime script.
-     */
-    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>;
-    getSpecifierMap(): 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;
-    /**
-     * Performs registration for a generic script asset.
-     *
-     * @remarks
-     * Strategies get the first chance to emit output. If no output exists after
-     * that pass, Bun falls back to the generic browser build for this explicit
-     * script-only path.
-     */
-    private emitScriptEntrypoint;
-    /**
-     * Stops active watchers and releases retained registration state.
-     *
-     * @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 and specifier maps cannot leak through a reused manager object.
-     */
-    stop(): void;
 }
 export {};