@ecopages/core 0.2.0-beta.29 → 0.2.0-beta.30

package/src/adapters/shared/{server-route-handler.js → runtime/server-route-handler.js}

@@ -1,13 +1,10 @@
-import { appLogger } from "../../global/app-logger.js";
-import { HttpError } from "../../errors/http-error.js";
-import { injectHmrRuntimeIntoHtmlResponse, isHtmlResponse, shouldInjectHmrHtmlResponse } from "./hmr-html-response.js";
+import { appLogger } from "../../../global/app-logger.js";
+import { HttpError } from "../../../errors/http-error.js";
 class ServerRouteHandler {
   router;
   fileSystemResponseMatcher;
   explicitStaticRouteMatcher;
-  watch;
   hmrManager;
-  hostOwnsDevClient;
   /**
    * Creates a new ServerRouteHandler instance.
    *
@@ -17,33 +14,12 @@ class ServerRouteHandler {
     router,
     fileSystemResponseMatcher,
     explicitStaticRouteMatcher,
-    watch = false,
-    hmrManager,
-    hostOwnsDevClient = false
+    hmrManager
   }) {
     this.router = router;
     this.fileSystemResponseMatcher = fileSystemResponseMatcher;
     this.explicitStaticRouteMatcher = explicitStaticRouteMatcher;
-    this.watch = watch;
     this.hmrManager = hmrManager;
-    this.hostOwnsDevClient = hostOwnsDevClient;
-  }
-  /**
-   * Determines if HMR script should be injected.
-   *
-   * @returns true if in watch mode and HMR manager is enabled
-   */
-  shouldInjectHmrScript() {
-    return shouldInjectHmrHtmlResponse(this.watch, this.hmrManager, this.hostOwnsDevClient);
-  }
-  /**
-   * Checks if a response contains HTML content.
-   *
-   * @param response - The HTTP response to check
-   * @returns true if Content-Type header starts with 'text/html'
-   */
-  isHtmlResponse(response) {
-    return isHtmlResponse(response);
   }
   /**
    * Handles HTTP requests from the router adapter.
@@ -54,33 +30,16 @@ class ServerRouteHandler {
    * 3. Fall back to static file serving from disk
    *
    * @param request - The incoming HTTP request
-   * @returns HTTP response, potentially with injected HMR script in dev mode
+   * @returns HTTP response for the matched route
    */
   async handleResponse(request) {
     const pathname = new URL(request.url).pathname;
     const explicitMatch = this.explicitStaticRouteMatcher?.match(request.url);
     if (explicitMatch) {
-      const response2 = await this.explicitStaticRouteMatcher.handleMatch(explicitMatch);
-      return this.maybeInjectHmrScript(response2);
+      return await this.explicitStaticRouteMatcher.handleMatch(explicitMatch);
     }
     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);
-  }
-  /**
-   * Injects HMR script into HTML responses in development mode.
-   *
-   * The script is inserted before the closing </html> tag to enable
-   * hot module reloading without full page refreshes.
-   *
-   * @param response - The HTTP response to potentially modify
-   * @returns Original response or modified response with HMR script
-   */
-  async maybeInjectHmrScript(response) {
-    if (this.shouldInjectHmrScript() && this.isHtmlResponse(response)) {
-      return injectHmrRuntimeIntoHtmlResponse(response);
-    }
-    return response;
+    return await (fsMatch ? this.fileSystemResponseMatcher.handleMatch(fsMatch, request) : this.handleNoMatch(request));
   }
   /**
    * Handles requests that do not match any routes.

package/src/adapters/shared/{server-static-builder.d.ts → runtime/server-static-builder.d.ts}

@@ -1,9 +1,9 @@
-import type { EcoPagesAppConfig, IHmrManager } from '../../types/internal-types.js';
-import type { EcoBuildPlugin } from '../../build/contracts/build-types.js';
-import type { StaticRoute } from '../../types/public-types.js';
-import type { RouteRegistry } from '../../router/server/route-registry.js';
-import type { StaticSiteGenerator } from '../../static-site-generator/static-site-generator.js';
-import type { StaticGenerationRendererResolver } from '../../route-renderer/route-renderer.js';
+import type { EcoPagesAppConfig, IHmrManager } from '../../../types/internal-types.js';
+import type { EcoBuildPlugin } from '../../../build/contracts/build-types.js';
+import type { StaticRoute } from '../../../types/public-types.js';
+import type { RouteRegistry } from '../../../router/server/route-registry.js';
+import type { StaticSiteGenerator } from '../../../static-site-generator/static-site-generator.js';
+import type { StaticGenerationRendererResolver } from '../../../route-renderer/route-renderer.js';
 export interface StaticBuildOptions {
     baseUrl?: string;
     force?: boolean;

package/src/adapters/shared/{server-static-builder.js → runtime/server-static-builder.js}

@@ -1,22 +1,22 @@
 import path from "node:path";
 import { fileSystem } from "@ecopages/file-system";
-import { DEFAULT_ECOPAGES_HOSTNAME, DEFAULT_ECOPAGES_PORT } from "../../config/constants.js";
-import { appLogger } from "../../global/app-logger.js";
-import { build, getAppBuildAdapter, setupAppRuntimePlugins } from "../../build/build-adapter.js";
-import { createServerBuildRequest } from "../../build/runtime/build-request-policy.js";
-import { requireBuildRuntime } from "../../build/runtime/build-runtime.js";
+import { DEFAULT_ECOPAGES_HOSTNAME, DEFAULT_ECOPAGES_PORT } from "../../../config/constants.js";
+import { appLogger } from "../../../global/app-logger.js";
+import { build, getAppBuildAdapter, setupAppRuntimePlugins } from "../../../build/build-adapter.js";
+import { createServerBuildRequest } from "../../../build/runtime/build-request-policy.js";
+import { requireBuildRuntime } from "../../../build/runtime/build-runtime.js";
 import { attachHmrToIntegrations } from "./runtime-server-lifecycle.js";
 import {
   getServerBundleOutputPaths,
   lookupServerEntryBuildCache,
   recordServerEntryBuildCache,
   writeServerBundleDeployManifest
-} from "../../build/cache/server-entry-build-cache.js";
+} from "../../../build/cache/server-entry-build-cache.js";
 import {
   clearProductionBuildCaches,
   shouldResetStaticExportDirectory
-} from "../../static-site-generator/static-build-invalidation.js";
-import { resolveEntryFile, SERVER_BUNDLE_FILENAME } from "../../utils/resolve-entry-file.js";
+} from "../../../static-site-generator/static-build-invalidation.js";
+import { resolveEntryFile, SERVER_BUNDLE_FILENAME } from "../../../utils/resolve-entry-file.js";
 class ServerStaticBuilder {
   appConfig;
   staticSiteGenerator;

package/src/adapters/shared/{static-preview-host.d.ts → runtime/static-preview-host.d.ts}

@@ -1,4 +1,4 @@
-import type { EcoPagesAppConfig } from '../../types/internal-types.js';
+import type { EcoPagesAppConfig } from '../../../types/internal-types.js';
 export interface StaticPreviewHost {
     start(options: StaticPreviewHostStartOptions): Promise<number | null>;
     stop(force?: boolean): Promise<void>;

package/src/adapters/shared/{node-http-websocket-upgrades.d.ts → ws/node-http-websocket-upgrades.d.ts}

@@ -1,6 +1,6 @@
 import type { Duplex } from 'node:stream';
 import type { Server as NodeHttpServer, IncomingMessage } from 'node:http';
-import type { EcopagesWebSocketHandler } from '../../types/public-types.js';
+import type { EcopagesWebSocketHandler } from '../../../types/public-types.js';
 export type NodeHttpWebSocketUpgradePreflight = (req: IncomingMessage, socket: Duplex, head: Buffer) => boolean;
 export type AttachNodeHttpWebSocketUpgradesOptions = {
     runtimeOrigin: string;

package/src/adapters/shared/{node-http-websocket-upgrades.js → ws/node-http-websocket-upgrades.js}

@@ -1,6 +1,6 @@
 import { WebSocketServer } from "ws";
-import { appLogger } from "../../global/app-logger.js";
-import { findWebSocketRoute } from "../abstract/ws-pattern-matcher.js";
+import { appLogger } from "../../../global/app-logger.js";
+import { findWebSocketRoute } from "../../abstract/ws-pattern-matcher.js";
 import { createEcopagesSocket, invokeWebSocketHandlerHook, toWebSocketCloseInfo } from "./websocket-lifecycle.js";
 const attachedUpgradeServers = /* @__PURE__ */ new WeakSet();
 function adaptNodeWebSocket(ws, kind, params, search, context) {

package/src/adapters/shared/{websocket-lifecycle.d.ts → ws/websocket-lifecycle.d.ts}

@@ -1,4 +1,4 @@
-import type { EcopagesSocket, WebSocketCloseInfo } from '../../types/public-types.js';
+import type { EcopagesSocket, WebSocketCloseInfo } from '../../../types/public-types.js';
 /**
  * @remarks
  * Bun and Node expose different raw socket types but share the same

package/src/adapters/shared/{websocket-lifecycle.js → ws/websocket-lifecycle.js}

@@ -1,4 +1,4 @@
-import { appLogger } from "../../global/app-logger.js";
+import { appLogger } from "../../../global/app-logger.js";
 function sendOutgoingMessage(transport, message) {
   if (typeof message === "string") {
     transport.send(message);

package/src/build/app-build-manifest-runtime.d.ts

@@ -26,6 +26,10 @@ export declare function setupAppRuntimePlugins(options: {
 }): Promise<void>;
 /**
  * Activates one integration's runtime setup on first use.
+ *
+ * @remarks
+ * Concurrent callers share a single in-flight promise per integration name.
+ * Failed activations are evicted so a later caller can retry.
  */
 export declare function ensureIntegrationRuntimeReady(options: {
     appConfig: EcoPagesAppConfig;

package/src/build/app-build-manifest-runtime.js

@@ -90,22 +90,32 @@ async function setupAppRuntimePlugins(options) {
 async function ensureIntegrationRuntimeReady(options) {
   const runtime = options.appConfig.runtime ?? {};
   options.appConfig.runtime = runtime;
-  runtime.activatedIntegrations ??= /* @__PURE__ */ new Set();
-  if (runtime.activatedIntegrations.has(options.integrationName)) {
+  runtime.integrationActivations ??= /* @__PURE__ */ new Map();
+  const existing = runtime.integrationActivations.get(options.integrationName);
+  if (existing) {
+    await existing;
     return;
   }
   const integration = options.appConfig.integrations.find((plugin) => plugin.name === options.integrationName);
   if (!integration) {
     return;
   }
-  integration.setConfig(options.appConfig);
-  integration.setRuntimeOrigin(options.runtimeOrigin);
-  await integration.setup();
-  const onRuntimePlugin = options.onRuntimePlugin ?? options.appConfig.runtime?.onRuntimePlugin;
-  for (const plugin of integration.plugins ?? []) {
-    onRuntimePlugin?.(plugin);
+  const activation = (async () => {
+    integration.setConfig(options.appConfig);
+    integration.setRuntimeOrigin(options.runtimeOrigin);
+    await integration.setup();
+    const onRuntimePlugin = options.onRuntimePlugin ?? options.appConfig.runtime?.onRuntimePlugin;
+    for (const plugin of integration.plugins ?? []) {
+      onRuntimePlugin?.(plugin);
+    }
+  })();
+  runtime.integrationActivations.set(options.integrationName, activation);
+  try {
+    await activation;
+  } catch (error) {
+    runtime.integrationActivations.delete(options.integrationName);
+    throw error;
   }
-  runtime.activatedIntegrations.add(options.integrationName);
 }
 export {
   collectConfiguredAppBuildManifestContributions,

package/src/index.d.ts

@@ -1,7 +1,7 @@
 export type * from './types/public-types.js';
 export type * from './eco/eco.types.js';
 export { eco } from './eco/eco.js';
-export { defineApiHandler, defineGroupHandler, type GroupHandler } from './adapters/shared/define-api-handler.js';
+export { defineApiHandler, defineGroupHandler, defineGet, definePost, definePut, defineDelete, definePatch, defineOptions, defineHead, json, html, redirect, type GroupHandler, } from './adapters/shared/http/define-api-handler.js';
 export { createEcoBuildPluginFromSourceTransform, createVitePluginsFromAppSourceTransforms, getAppSourceTransforms, createVitePluginFromSourceTransform, normalizeTransformId, type EcoSourceTransform, type EcoSourceTransformResult, type EcoViteCompatiblePlugin, } from './plugins/source-transform.js';
 export { createEcoComponentMetaTransform } from './plugins/eco-component-meta-plugin.js';
 export { SchemaError, validateStandardSchema } from './services/validation/validate-standard-schema.js';

package/src/index.js

@@ -1,5 +1,18 @@
 import { eco } from "./eco/eco.js";
-import { defineApiHandler, defineGroupHandler } from "./adapters/shared/define-api-handler.js";
+import {
+  defineApiHandler,
+  defineGroupHandler,
+  defineGet,
+  definePost,
+  definePut,
+  defineDelete,
+  definePatch,
+  defineOptions,
+  defineHead,
+  json,
+  html,
+  redirect
+} from "./adapters/shared/http/define-api-handler.js";
 import {
   createEcoBuildPluginFromSourceTransform,
   createVitePluginsFromAppSourceTransforms,
@@ -16,9 +29,19 @@ export {
   createVitePluginFromSourceTransform,
   createVitePluginsFromAppSourceTransforms,
   defineApiHandler,
+  defineDelete,
+  defineGet,
   defineGroupHandler,
+  defineHead,
+  defineOptions,
+  definePatch,
+  definePost,
+  definePut,
   eco,
   getAppSourceTransforms,
+  html,
+  json,
   normalizeTransformId,
+  redirect,
   validateStandardSchema
 };

package/src/static-site-generator/static-site-generator.js

@@ -2,7 +2,7 @@ import path from "node:path";
 import { availableParallelism } from "node:os";
 import { appLogger } from "../global/app-logger.js";
 import { fileSystem } from "@ecopages/file-system";
-import { prepareExplicitStaticRender } from "../adapters/shared/explicit-static-render-preparation.js";
+import { prepareExplicitStaticRender } from "../adapters/shared/http/explicit-static-render-preparation.js";
 import { createRouteModuleStaticRenderCacheContext } from "./static-build-invalidation.js";
 import {
   getServerModuleBuildCacheOutdir,

package/src/types/internal-types.d.ts

@@ -175,8 +175,14 @@ export type EcoPagesAppConfig = {
         runtimeAssetsPrepared?: boolean;
         /** Registers integration runtime plugins when lazy activation completes. */
         onRuntimePlugin?: (plugin: import('../build/contracts/build-types.js').EcoBuildPlugin) => void;
-        /** Integration names that completed lazy runtime activation. */
-        activatedIntegrations?: Set<string>;
+        /**
+         * In-flight or completed lazy integration activation promises, keyed by integration name.
+         *
+         * @remarks
+         * Concurrent callers (background prewarm + first render) share the same promise.
+         * Failed activations are removed so a later caller can retry.
+         */
+        integrationActivations?: Map<string, Promise<void>>;
         /** When `'host'`, the embedded dev server owns browser dev-client bootstrap. */
         devClientOwner?: 'core' | 'host';
         /** Integration hooks run when a registered `dependencies.scripts` entrypoint changes. */

package/src/types/public-types.d.ts

@@ -1,5 +1,5 @@
 import type { Readable } from 'node:stream';
-import type { ApiResponseBuilder } from '../adapters/shared/api-response.js';
+import type { ApiResponseBuilder } from '../adapters/shared/http/api-response.js';
 import type { BuildExecutor } from '../build/build-adapter.js';
 import type { ForeignChildRuntime } from '../route-renderer/orchestration/foreign-child/component-render-context.js';
 import type { EcoPageComponent } from '../eco/eco.types.js';
@@ -336,6 +336,14 @@ export interface IHmrManager {
      * Gets the HMR dist directory.
      */
     getDistDir(): string;
+    /**
+     * Returns the on-disk path to the bundled HMR runtime script.
+     */
+    getRuntimePath(): string;
+    /**
+     * Serves a development HMR asset request when the URL matches a known HMR path.
+     */
+    tryHandleAssetRequest(request: Request): Response | null;
     /**
      * Gets the default HMR context.
      */

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

@@ -1,25 +0,0 @@
-import type { ApiHandler, ApiHandlerContext, Middleware, RouteSchema, TypedGroupHandlerContext } from '../../types/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'> & {
-    handler: (context: SchemaHandlerContext<TSchema, TContext>) => Promise<Response> | Response;
-    middleware?: Middleware<Request, unknown, TContext>[];
-    schema?: TSchema;
-}): ApiHandler<TPath, Request, unknown>;
-export interface GroupHandler<TPrefix extends string = string> {
-    prefix: TPrefix;
-    middleware?: readonly Middleware<Request, unknown, any>[];
-    routes: readonly ApiHandler<string, Request, unknown>[];
-}
-type GroupDefineHandler<TContext extends UniversalContext> = <const TPath extends string, TSchema extends RouteSchema | undefined = undefined>(handler: Omit<ApiHandler<TPath, Request, unknown>, 'handler' | 'middleware' | 'schema'> & {
-    path: TPath;
-    handler: (context: SchemaHandlerContext<TSchema, TContext>) => Promise<Response> | Response;
-    middleware?: Middleware<Request, unknown, TContext>[];
-    schema?: TSchema;
-}) => ApiHandler<TPath, Request, unknown>;
-export declare function defineGroupHandler<TPrefix extends string, TMiddleware extends readonly Middleware<Request, unknown, any>[] = [], TContext extends UniversalContext = TMiddleware extends readonly Middleware<Request, unknown, infer TGroupContext>[] ? TGroupContext : UniversalContext>(config: {
-    prefix: TPrefix;
-    middleware?: TMiddleware;
-    routes: (define: GroupDefineHandler<TContext>) => readonly ApiHandler<string, Request, unknown>[];
-}): GroupHandler<TPrefix>;
-export {};

package/src/adapters/shared/define-api-handler.js

@@ -1,15 +0,0 @@
-function defineApiHandler(handler) {
-  return handler;
-}
-function defineGroupHandler(config) {
-  const define = ((handler) => handler);
-  return {
-    prefix: config.prefix,
-    middleware: config.middleware,
-    routes: config.routes(define)
-  };
-}
-export {
-  defineApiHandler,
-  defineGroupHandler
-};