appstage 0.2.28 → 0.3.0

package/dist/bin.js

@@ -690,9 +690,9 @@ async function build(params) {
   let serverProcess = null;
   let inited = false;
   let nodeArgs = [`${params.serverDir}/server/index.js`];
+  let envFiles = null;
   if (params.useEnvFiles !== false) {
-    let envFiles = await getEnvFiles();
-    for (let envFile of envFiles) log(`Using ${envFile}`);
+    envFiles = await getEnvFiles();
     nodeArgs.unshift(...envFiles.map((file) => `--env-file=${file}`));
   }
   function handleServerRebuild() {
@@ -702,6 +702,9 @@ async function build(params) {
     }
     if (!inited) {
       log(`Build completed +${(0, import_dateshape.formatDuration)(Date.now() - startTime)}`);
+      if (envFiles) {
+        for (let envFile of envFiles) log(`Using ${envFile}`);
+      }
       inited = true;
     }
     if (params.start)
@@ -764,10 +767,8 @@ async function run() {
   if (scriptName === "build") return await cli(args);
   let nodeEnv = nodeEnvMap[scriptName];
   if (nodeEnv !== void 0) process.env.NODE_ENV = nodeEnv;
-  if (args.length !== 0 && !(0, import_args_json2.isKey)(args[0])) {
-    let [hostname, port] = args[0].split(":");
-    if (hostname) process.env.APP_HOST = hostname;
-    if (port) process.env.APP_PORT = port;
+  if (args.length !== 0 && args[0] && !(0, import_args_json2.isKey)(args[0])) {
+    process.env.SERVER_URL = args[0];
     args.shift();
   }
   if (!(0, import_args_json2.hasKey)("--client-dir")) args.push("--client-dir", "src/public/-");

package/dist/index.cjs

@@ -612,9 +612,9 @@ async function build(params) {
   let serverProcess = null;
   let inited = false;
   let nodeArgs = [`${params.serverDir}/server/index.js`];
+  let envFiles = null;
   if (params.useEnvFiles !== false) {
-    let envFiles = await getEnvFiles();
-    for (let envFile of envFiles) log(`Using ${envFile}`);
+    envFiles = await getEnvFiles();
     nodeArgs.unshift(...envFiles.map((file) => `--env-file=${file}`));
   }
   function handleServerRebuild() {
@@ -624,6 +624,7 @@ async function build(params) {
     }
     if (!inited) {
       log(`Build completed +${(0, dateshape.formatDuration)(Date.now() - startTime)}`);
+      if (envFiles) for (let envFile of envFiles) log(`Using ${envFile}`);
       inited = true;
     }
     if (params.start) serverProcess = (0, node_child_process.spawn)("node", nodeArgs, { stdio: "inherit" });
@@ -671,6 +672,33 @@ async function cli(input = []) {
   await build(params);
 }
 
+const defaultPorts = {
+  "http:": 80,
+  "https:": 443
+};
+function getServerURL() {
+  let { SERVER_URL: href, SERVER_HOSTNAME: hostname = "localhost", SERVER_PORT: port = "3000" } = process.env;
+  let protocol = "http:";
+  if (href) {
+    if (href.startsWith("//")) href = `${protocol}${href}`;
+    else if (!href.includes("://")) href = `${protocol}//${href}`;
+    else protocol = href.slice(0, href.indexOf("://") + 1);
+    let matches = href.match(/^\w+:\/\/([^/:]+)(:(\d+))?(\/|$)/);
+    if (matches?.[1]) hostname = matches[1];
+    if (matches?.[3]) port = matches[3];
+  } else href = `${protocol}//${hostname}:${port}`;
+  let parsedPort = Number(port);
+  let origin = `${protocol}//${hostname}`;
+  if (parsedPort !== defaultPorts[protocol]) origin += `:${port}`;
+  return {
+    href,
+    origin,
+    protocol,
+    hostname,
+    port: parsedPort
+  };
+}
+
 const renderStatus = async (req, res) => {
   let { id, nonce } = req.ctx;
   let statusText = `${res.statusCode} ${node_http.STATUS_CODES[res.statusCode]}`;
@@ -681,11 +709,10 @@ const renderStatus = async (req, res) => {
 function createApp(callback) {
   let app = (0, express.default)();
   if (!app.events) app.events = new node_events.default();
-  let host = process.env.APP_HOST || "localhost";
-  let port = Number(process.env.APP_PORT) || 3e3;
   let listen = () => {
-    app.listen(port, host, () => {
-      emitLog(app, `Server running at ${`http://${host}:${port}/`} (${`NODE_ENV=${process.env.NODE_ENV}`})`);
+    let { href, protocol, hostname, port } = getServerURL();
+    if (protocol === "http:") app.listen(port, hostname, () => {
+      emitLog(app, `Server running at ${href} (NODE_ENV=${process.env.NODE_ENV})`);
     });
   };
   if (process.env.NODE_ENV === "development") app.events?.on("log", ({ message, ...payload }) => {
@@ -741,6 +768,7 @@ exports.emitLog = emitLog;
 exports.files = files;
 exports.getEffectiveLocale = getEffectiveLocale;
 exports.getLocales = getLocales;
+exports.getServerURL = getServerURL;
 exports.getStatusMessage = getStatusMessage;
 exports.init = init;
 exports.injectNonce = injectNonce;

package/dist/index.d.ts

@@ -1127,6 +1127,14 @@ declare const cspNonce: (req: IncomingMessage) => string;
 
 declare function emitLog(app: Application, message?: LogEventPayload["message"] | LogEventPayload, payload?: LogEventPayload): any;
 
+declare function getServerURL(): {
+  href: string;
+  origin: string;
+  protocol: string;
+  hostname: string;
+  port: number;
+};
+
 declare function getStatusMessage(prefix: string, statusCode: number): string;
 
 declare const injectNonce: TransformContent;
@@ -1142,4 +1150,4 @@ declare function servePipeableStream(req: Request, res: Response): ({
   pipe
 }: PipeableStream, error?: unknown) => Promise<void>;
 
-export { Controller, ErrorController, FilesParams, LangParams, LogEventPayload, LogLevel, LogOptions, Middleware, MiddlewareSet, RedirectParams, RenderStatus, ReqCtx, TransformContent, build, cli, createApp, cspNonce, emitLog, files, getEffectiveLocale, getLocales, getStatusMessage, init, injectNonce, lang, log, redirect, renderStatus, requestEvents, serializeState, servePipeableStream, toLanguage, unhandledError, unhandledRoute };
+export { Controller, ErrorController, FilesParams, LangParams, LogEventPayload, LogLevel, LogOptions, Middleware, MiddlewareSet, RedirectParams, RenderStatus, ReqCtx, TransformContent, build, cli, createApp, cspNonce, emitLog, files, getEffectiveLocale, getLocales, getServerURL, getStatusMessage, init, injectNonce, lang, log, redirect, renderStatus, requestEvents, serializeState, servePipeableStream, toLanguage, unhandledError, unhandledRoute };

package/dist/index.mjs

@@ -586,9 +586,9 @@ async function build(params) {
   let serverProcess = null;
   let inited = false;
   let nodeArgs = [`${params.serverDir}/server/index.js`];
+  let envFiles = null;
   if (params.useEnvFiles !== false) {
-    let envFiles = await getEnvFiles();
-    for (let envFile of envFiles) log(`Using ${envFile}`);
+    envFiles = await getEnvFiles();
     nodeArgs.unshift(...envFiles.map((file) => `--env-file=${file}`));
   }
   function handleServerRebuild() {
@@ -598,6 +598,7 @@ async function build(params) {
     }
     if (!inited) {
       log(`Build completed +${formatDuration(Date.now() - startTime)}`);
+      if (envFiles) for (let envFile of envFiles) log(`Using ${envFile}`);
       inited = true;
     }
     if (params.start) serverProcess = spawn("node", nodeArgs, { stdio: "inherit" });
@@ -645,6 +646,33 @@ async function cli(input = []) {
   await build(params);
 }
 
+const defaultPorts = {
+  "http:": 80,
+  "https:": 443
+};
+function getServerURL() {
+  let { SERVER_URL: href, SERVER_HOSTNAME: hostname = "localhost", SERVER_PORT: port = "3000" } = process.env;
+  let protocol = "http:";
+  if (href) {
+    if (href.startsWith("//")) href = `${protocol}${href}`;
+    else if (!href.includes("://")) href = `${protocol}//${href}`;
+    else protocol = href.slice(0, href.indexOf("://") + 1);
+    let matches = href.match(/^\w+:\/\/([^/:]+)(:(\d+))?(\/|$)/);
+    if (matches?.[1]) hostname = matches[1];
+    if (matches?.[3]) port = matches[3];
+  } else href = `${protocol}//${hostname}:${port}`;
+  let parsedPort = Number(port);
+  let origin = `${protocol}//${hostname}`;
+  if (parsedPort !== defaultPorts[protocol]) origin += `:${port}`;
+  return {
+    href,
+    origin,
+    protocol,
+    hostname,
+    port: parsedPort
+  };
+}
+
 const renderStatus = async (req, res) => {
   let { id, nonce } = req.ctx;
   let statusText = `${res.statusCode} ${STATUS_CODES[res.statusCode]}`;
@@ -655,11 +683,10 @@ const renderStatus = async (req, res) => {
 function createApp(callback) {
   let app = express();
   if (!app.events) app.events = new EventEmitter();
-  let host = process.env.APP_HOST || "localhost";
-  let port = Number(process.env.APP_PORT) || 3e3;
   let listen = () => {
-    app.listen(port, host, () => {
-      emitLog(app, `Server running at ${`http://${host}:${port}/`} (${`NODE_ENV=${process.env.NODE_ENV}`})`);
+    let { href, protocol, hostname, port } = getServerURL();
+    if (protocol === "http:") app.listen(port, hostname, () => {
+      emitLog(app, `Server running at ${href} (NODE_ENV=${process.env.NODE_ENV})`);
     });
   };
   if (process.env.NODE_ENV === "development") app.events?.on("log", ({ message, ...payload }) => {
@@ -707,4 +734,4 @@ function servePipeableStream(req, res) {
   };
 }
 
-export { build, cli, createApp, cspNonce, emitLog, files, getEffectiveLocale, getLocales, getStatusMessage, init, injectNonce, lang, log, redirect, renderStatus, requestEvents, serializeState, servePipeableStream, toLanguage, unhandledError, unhandledRoute };
+export { build, cli, createApp, cspNonce, emitLog, files, getEffectiveLocale, getLocales, getServerURL, getStatusMessage, init, injectNonce, lang, log, redirect, renderStatus, requestEvents, serializeState, servePipeableStream, toLanguage, unhandledError, unhandledRoute };

package/index.ts

@@ -24,6 +24,7 @@ export * from "./src/types/TransformContent.ts";
 export * from "./src/utils/createApp.ts";
 export * from "./src/utils/cspNonce.ts";
 export * from "./src/utils/emitLog.ts";
+export * from "./src/utils/getServerURL.ts";
 export * from "./src/utils/getStatusMessage.ts";
 export * from "./src/utils/injectNonce.ts";
 export * from "./src/utils/renderStatus.ts";

package/package.json

@@ -1,36 +1,36 @@
-{
-  "name": "appstage",
-  "version": "0.2.28",
-  "description": "",
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
-  "type": "module",
-  "bin": {
-    "appstage": "./dist/bin.js"
-  },
-  "scripts": {
-    "compile-bin": "esbuild src/scripts/bin.ts --bundle --outfile=dist/bin.js --platform=node --external:esbuild --format=esm",
-    "preversion": "npx npm-run-all shape compile-bin",
-    "shape": "npx codeshape",
-    "typecheck": "npx codeshape typecheck"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/axtk/appstage.git"
-  },
-  "author": "axtk",
-  "license": "MIT",
-  "peerDependencies": {
-    "express": ">=5"
-  },
-  "devDependencies": {
-    "@types/express": "^5.0.6",
-    "@types/node": "^25.4.0"
-  },
-  "dependencies": {
-    "args-json": "^1.4.3",
-    "dateshape": "^1.1.2",
-    "esbuild": "^0.28.0"
-  }
-}
+{
+  "name": "appstage",
+  "version": "0.3.0",
+  "description": "",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
+  "type": "module",
+  "bin": {
+    "appstage": "./dist/bin.js"
+  },
+  "scripts": {
+    "compile-bin": "esbuild src/scripts/bin.ts --bundle --outfile=dist/bin.js --platform=node --external:esbuild --format=esm",
+    "preversion": "npx npm-run-all shape compile-bin",
+    "shape": "npx codeshape",
+    "typecheck": "npx codeshape typecheck"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/axtk/appstage.git"
+  },
+  "author": "axtk",
+  "license": "MIT",
+  "peerDependencies": {
+    "express": ">=5"
+  },
+  "devDependencies": {
+    "@types/express": "^5.0.6",
+    "@types/node": "^25.4.0"
+  },
+  "dependencies": {
+    "args-json": "^1.4.3",
+    "dateshape": "^1.1.2",
+    "esbuild": "^0.28.0"
+  }
+}

package/src/scripts/bin.ts

@@ -23,12 +23,8 @@ async function run() {
 
   if (nodeEnv !== undefined) process.env.NODE_ENV = nodeEnv;
 
-  if (args.length !== 0 && !isKey(args[0])) {
-    let [hostname, port] = args[0].split(":");
-
-    if (hostname) process.env.APP_HOST = hostname;
-    if (port) process.env.APP_PORT = port;
-
+  if (args.length !== 0 && args[0] && !isKey(args[0])) {
+    process.env.SERVER_URL = args[0];
     args.shift();
   }
 

package/src/scripts/build.ts

@@ -38,13 +38,12 @@ export async function build(params: BuildParams) {
 
   let serverProcess: ChildProcess | null = null;
   let inited = false;
+
   let nodeArgs = [`${params.serverDir}/server/index.js`];
+  let envFiles: string[] | null = null;
 
   if (params.useEnvFiles !== false) {
-    let envFiles = await getEnvFiles();
-
-    for (let envFile of envFiles) log(`Using ${envFile}`);
-
+    envFiles = await getEnvFiles();
     nodeArgs.unshift(...envFiles.map((file) => `--env-file=${file}`));
   }
 
@@ -56,6 +55,11 @@ export async function build(params: BuildParams) {
 
     if (!inited) {
       log(`Build completed +${formatDuration(Date.now() - startTime)}`);
+
+      if (envFiles) {
+        for (let envFile of envFiles) log(`Using ${envFile}`);
+      }
+
       inited = true;
     }
 

package/src/utils/createApp.ts

@@ -5,6 +5,7 @@ import { init } from "../middleware/init.ts";
 import { requestEvents } from "../middleware/requestEvents.ts";
 import type { LogEventPayload } from "../types/LogEventPayload.ts";
 import { emitLog } from "./emitLog.ts";
+import { getServerURL } from "./getServerURL.ts";
 import { renderStatus } from "./renderStatus.ts";
 
 export function createApp(callback?: () => void | Promise<void>) {
@@ -12,16 +13,16 @@ export function createApp(callback?: () => void | Promise<void>) {
 
   if (!app.events) app.events = new EventEmitter();
 
-  let host = process.env.APP_HOST || "localhost";
-  let port = Number(process.env.APP_PORT) || 3000;
-
   let listen = () => {
-    app.listen(port, host, () => {
-      let location = `http://${host}:${port}/`;
-      let env = `NODE_ENV=${process.env.NODE_ENV}`;
-
-      emitLog(app, `Server running at ${location} (${env})`);
-    });
+    let { href, protocol, hostname, port } = getServerURL();
+
+    if (protocol === "http:")
+      app.listen(port, hostname, () => {
+        emitLog(
+          app,
+          `Server running at ${href} (NODE_ENV=${process.env.NODE_ENV})`,
+        );
+      });
   };
 
   if (process.env.NODE_ENV === "development")

package/src/utils/getServerURL.ts

@@ -0,0 +1,38 @@
+const defaultPorts: Record<string, number> = {
+  "http:": 80,
+  "https:": 443,
+};
+
+export function getServerURL() {
+  let {
+    SERVER_URL: href,
+    SERVER_HOSTNAME: hostname = "localhost",
+    SERVER_PORT: port = "3000",
+  } = process.env;
+
+  let protocol = "http:";
+
+  if (href) {
+    if (href.startsWith("//")) href = `${protocol}${href}`;
+    else if (!href.includes("://")) href = `${protocol}//${href}`;
+    else protocol = href.slice(0, href.indexOf("://") + 1);
+
+    let matches = href.match(/^\w+:\/\/([^/:]+)(:(\d+))?(\/|$)/);
+
+    if (matches?.[1]) hostname = matches[1];
+    if (matches?.[3]) port = matches[3];
+  } else href = `${protocol}//${hostname}:${port}`;
+
+  let parsedPort = Number(port);
+  let origin = `${protocol}//${hostname}`;
+
+  if (parsedPort !== defaultPorts[protocol]) origin += `:${port}`;
+
+  return {
+    href,
+    origin,
+    protocol,
+    hostname,
+    port: parsedPort,
+  };
+}