@reckona/mreact-router 0.0.74 → 0.0.76

package/src/cli-options.ts

@@ -3,6 +3,7 @@ import type {
   AppRouterBuildTarget,
   AppRouterClientSourceMapMode,
 } from "./config.js";
+import type { RequestHostPolicy } from "./serve.js";
 
 export type CliRequestLogMode = "requests";
 export type CliBuildTarget = AppRouterBuildTarget | "all";
@@ -10,10 +11,14 @@ export type CliBuildTarget = AppRouterBuildTarget | "all";
 export interface ParsedCliArguments {
   clientSourceMaps?: AppRouterClientSourceMapMode | undefined;
   command: string;
+  allowedHosts?: readonly string[] | undefined;
   from?: string | undefined;
   help?: boolean | undefined;
+  host?: string | undefined;
+  hostPolicy?: RequestHostPolicy | undefined;
   log?: CliRequestLogMode | undefined;
   out?: string | undefined;
+  port?: number | undefined;
   routeArg?: string | undefined;
   target?: CliBuildTarget | undefined;
 }
@@ -43,6 +48,50 @@ export function parseCliArguments(argv: readonly string[]): ParsedCliArguments {
       continue;
     }
 
+    if (value === "--port") {
+      parsed.port = parseCliPort(readOptionValue(argv, index, "port"));
+      index += 1;
+      continue;
+    }
+
+    if (value.startsWith("--port=")) {
+      parsed.port = parseCliPort(value.slice("--port=".length));
+      continue;
+    }
+
+    if (value === "--host") {
+      parsed.host = readOptionValue(argv, index, "host");
+      index += 1;
+      continue;
+    }
+
+    if (value.startsWith("--host=")) {
+      parsed.host = value.slice("--host=".length);
+      continue;
+    }
+
+    if (value === "--host-policy") {
+      parsed.hostPolicy = parseCliHostPolicy(readOptionValue(argv, index, "host-policy"));
+      index += 1;
+      continue;
+    }
+
+    if (value.startsWith("--host-policy=")) {
+      parsed.hostPolicy = parseCliHostPolicy(value.slice("--host-policy=".length));
+      continue;
+    }
+
+    if (value === "--allowed-hosts") {
+      parsed.allowedHosts = parseCliAllowedHosts(readOptionValue(argv, index, "allowed-hosts"));
+      index += 1;
+      continue;
+    }
+
+    if (value.startsWith("--allowed-hosts=")) {
+      parsed.allowedHosts = parseCliAllowedHosts(value.slice("--allowed-hosts=".length));
+      continue;
+    }
+
     if (value === "--from") {
       parsed.from = readOptionValue(argv, index, "from");
       index += 1;
@@ -134,17 +183,22 @@ export function formatCliHelp(command?: string | undefined): string {
 
   if (command === "package") {
     return [
-      "Usage: mreact-router package aws-lambda [options]",
+      "Usage: mreact-router package <target> [options]",
+      "",
+      "Package generated build output into a deployable artifact directory.",
       "",
-      "Package generated build output into a minimal AWS Lambda asset directory.",
+      "Targets:",
+      "  aws-lambda        Minimal AWS Lambda asset directory.",
+      "  cloudflare-pages  Cloudflare Pages advanced mode output with _worker.js.",
       "",
       "Options:",
-      "  --from <dir>    Build output directory. Default: .mreact",
-      "  --out <dir>     Lambda asset output directory. Default: .lambda",
-      "  -h, --help      Show this help message.",
+      "  --from <dir>      Build output directory. Default: .mreact",
+      "  --out <dir>       Output directory. Defaults to .lambda for aws-lambda and .mreact/pages for cloudflare-pages.",
+      "  -h, --help        Show this help message.",
       "",
-      "Example:",
+      "Examples:",
       "  mreact-router package aws-lambda --from .mreact --out .lambda",
+      "  mreact-router package cloudflare-pages --from .mreact --out .mreact/pages",
     ].join("\n");
   }
 
@@ -155,8 +209,21 @@ export function formatCliHelp(command?: string | undefined): string {
       "Serve built mreact app router output with the Node adapter.",
       "",
       "Options:",
+      "  --host <host>  Bind address. Default: 127.0.0.1. Use 0.0.0.0 inside containers behind explicit port publishing or a reverse proxy.",
+      "  --host-policy=strict|trusted-proxy",
+      "      Control Host header trust for request origin reconstruction.",
+      "  --allowed-hosts <host[,host...]>",
+      "      Exact Host header allow-list for public deployments.",
       "  --log=requests  Print request summaries.",
       "  -h, --help      Show this help message.",
+      "",
+      "Environment:",
+      "  HOST            Bind address when --host is not set.",
+      "  MREACT_ROUTER_HOST_POLICY",
+      "                  Host header trust policy when --host-policy is not set.",
+      "  MREACT_ROUTER_ALLOWED_HOSTS",
+      "                  Comma-separated Host header allow-list when --allowed-hosts is not set.",
+      "  PORT            TCP port. Default: 3001.",
     ].join("\n");
   }
 
@@ -167,8 +234,12 @@ export function formatCliHelp(command?: string | undefined): string {
       "Start the mreact app router development server.",
       "",
       "Options:",
+      "  --port <port>  TCP port. Overrides PORT and vite.config.ts server.port.",
       "  --log=requests  Print request summaries.",
       "  -h, --help      Show this help message.",
+      "",
+      "Environment:",
+      "  PORT            TCP port when --port is not set.",
     ].join("\n");
   }
 
@@ -182,6 +253,8 @@ export function formatCliHelp(command?: string | undefined): string {
     "  start [outDir]                            Serve built Node output.",
     "  package aws-lambda --from .mreact --out .lambda",
     "                                           Package a minimal AWS Lambda asset directory.",
+    "  package cloudflare-pages --from .mreact --out .mreact/pages",
+    "                                           Package Cloudflare Pages advanced mode output.",
     "  help [command]                            Show help.",
     "",
     "Options:",
@@ -222,6 +295,55 @@ export function resolveCliRequestLogMode(
   return parseCliRequestLogMode(envValue);
 }
 
+export function resolveCliHost(
+  flagValue: string | undefined,
+  env: { HOST?: string | undefined },
+): string {
+  if (flagValue !== undefined && flagValue !== "") {
+    return flagValue;
+  }
+
+  const envValue = env.HOST;
+  return envValue === undefined || envValue === "" ? "127.0.0.1" : envValue;
+}
+
+export function resolveCliDevPort(
+  flagValue: number | undefined,
+  env: { PORT?: string | undefined },
+  viteConfigPort: number | undefined,
+): number | undefined {
+  if (flagValue !== undefined) {
+    return flagValue;
+  }
+
+  const envValue = env.PORT;
+  return envValue === undefined || envValue === "" ? viteConfigPort : parseCliPort(envValue);
+}
+
+export function resolveCliHostPolicy(
+  flagValue: RequestHostPolicy | undefined,
+  env: { MREACT_ROUTER_HOST_POLICY?: string | undefined },
+): RequestHostPolicy | undefined {
+  if (flagValue !== undefined) {
+    return flagValue;
+  }
+
+  const envValue = env.MREACT_ROUTER_HOST_POLICY;
+  return envValue === undefined || envValue === "" ? undefined : parseCliHostPolicy(envValue);
+}
+
+export function resolveCliAllowedHosts(
+  flagValue: readonly string[] | undefined,
+  env: { MREACT_ROUTER_ALLOWED_HOSTS?: string | undefined },
+): readonly string[] | undefined {
+  if (flagValue !== undefined) {
+    return flagValue;
+  }
+
+  const envValue = env.MREACT_ROUTER_ALLOWED_HOSTS;
+  return envValue === undefined || envValue === "" ? undefined : parseCliAllowedHosts(envValue);
+}
+
 export function createCliRequestLogger(): AppRouterLogger {
   return {
     error(event) {
@@ -245,6 +367,33 @@ function parseCliRequestLogMode(value: string): CliRequestLogMode {
   throw new Error(`Unsupported log mode ${JSON.stringify(value)}. Expected "requests".`);
 }
 
+function parseCliPort(value: string): number {
+  const port = Number(value);
+
+  if (Number.isInteger(port) && port >= 0 && port <= 65535) {
+    return port;
+  }
+
+  throw new Error(`Unsupported port ${JSON.stringify(value)}. Expected an integer from 0 to 65535.`);
+}
+
+function parseCliHostPolicy(value: string): RequestHostPolicy {
+  if (value === "strict" || value === "trusted-proxy") {
+    return value;
+  }
+
+  throw new Error(
+    `Unsupported host policy ${JSON.stringify(value)}. Expected "strict" or "trusted-proxy".`,
+  );
+}
+
+function parseCliAllowedHosts(value: string): readonly string[] {
+  return value
+    .split(",")
+    .map((entry) => entry.trim())
+    .filter((entry) => entry !== "");
+}
+
 function parseCliBuildTarget(value: string): CliBuildTarget {
   if (value === "node" || value === "cloudflare" || value === "aws-lambda" || value === "all") {
     return value;

package/src/cli.ts

@@ -1,12 +1,16 @@
 #!/usr/bin/env node
 
 import { resolve } from "node:path";
-import { buildApp, packageAwsLambdaArtifact } from "./build.js";
+import { buildApp, packageAwsLambdaArtifact, packageCloudflarePagesArtifact } from "./build.js";
 import {
   buildTargetsFromCliTarget,
   createCliRequestLogger,
   formatCliHelp,
   parseCliArguments,
+  resolveCliAllowedHosts,
+  resolveCliDevPort,
+  resolveCliHost,
+  resolveCliHostPolicy,
   resolveCliRequestLogMode,
 } from "./cli-options.js";
 import { startDevServer } from "./dev-server.js";
@@ -51,18 +55,27 @@ if (parsed !== undefined) {
         });
         console.log(`Built ${result.routes.length} routes.`);
       } else if (command === "package") {
-        if (routeArg !== "aws-lambda") {
+        if (routeArg === "aws-lambda") {
+          const manifest = await packageAwsLambdaArtifact({
+            fromDir: resolve(parsed.from ?? ".mreact"),
+            outDir: resolve(parsed.out ?? ".lambda"),
+          });
+          console.log(
+            `Packaged AWS Lambda artifact with ${manifest.files.length} files (${manifest.totalBytes} bytes).`,
+          );
+        } else if (routeArg === "cloudflare-pages") {
+          const manifest = await packageCloudflarePagesArtifact({
+            fromDir: resolve(parsed.from ?? ".mreact"),
+            outDir: resolve(parsed.out ?? ".mreact/pages"),
+          });
+          console.log(
+            `Packaged Cloudflare Pages artifact with ${manifest.files.length} files (${manifest.totalBytes} bytes).`,
+          );
+        } else {
           throw new Error(
-            `Unsupported package target ${JSON.stringify(routeArg)}. Expected "aws-lambda".`,
+            `Unsupported package target ${JSON.stringify(routeArg)}. Expected "aws-lambda" or "cloudflare-pages".`,
           );
         }
-        const manifest = await packageAwsLambdaArtifact({
-          fromDir: resolve(parsed.from ?? ".mreact"),
-          outDir: resolve(parsed.out ?? ".lambda"),
-        });
-        console.log(
-          `Packaged AWS Lambda artifact with ${manifest.files.length} files (${manifest.totalBytes} bytes).`,
-        );
       } else if (command === "dev") {
         const loaded =
           routeArg === undefined
@@ -71,12 +84,15 @@ if (parsed !== undefined) {
         const server = await startDevServer({
           ...loaded.project,
           logger,
-          port: process.env.PORT === undefined ? loaded.serverPort : Number(process.env.PORT),
+          port: resolveCliDevPort(parsed.port, process.env, loaded.serverPort),
           viteConfig: loaded.viteConfig,
         });
         console.log(`mreact app router ready at ${server.url}`);
       } else if (command === "start") {
         const server = await startServer({
+          allowedHosts: resolveCliAllowedHosts(parsed.allowedHosts, process.env),
+          hostPolicy: resolveCliHostPolicy(parsed.hostPolicy, process.env),
+          hostname: resolveCliHost(parsed.host, process.env),
           logger,
           outDir: resolve(routeArg ?? ".mreact"),
           port: Number(process.env.PORT ?? 3001),

package/src/index.ts

@@ -1,4 +1,4 @@
-export { buildApp, packageAwsLambdaArtifact } from "./build.js";
+export { buildApp, packageAwsLambdaArtifact, packageCloudflarePagesArtifact } from "./build.js";
 export { assetHref, assetPreloadLinks } from "./assets.js";
 export { cacheControl, createMemoryRouteCache, revalidatePath } from "./cache.js";
 export { deleteCookie, parseCookieHeader, serializeCookie, setCookie } from "./cookies.js";
@@ -74,7 +74,9 @@ export type {
   BuildAppOptions,
   BuildAppResult,
   BuiltImportPolicyArtifact,
+  CloudflarePagesArtifactManifest,
   PackageAwsLambdaArtifactOptions,
+  PackageCloudflarePagesArtifactOptions,
 } from "./build.js";
 export type {
   InferLoaderData,