@arkstack/driver-express 0.14.22 → 0.15.1

package/dist/index.js

@@ -1,6 +1,7 @@
 import express from "express";
 import { ArkstackKitDriver } from "@arkstack/contract";
-import { ErrorHandler, Logger, RequestException, env, renderError, resolveRuntimeModule } from "@arkstack/common";
+import { ErrorHandler, Logger, RequestException, devTlsCredentials, env, localNetworkAddress, renderError, resolveRuntimeModule } from "@arkstack/common";
+import https from "node:https";
 import { resolveMiddleware } from "@arkstack/http";
 import ngrok from "@ngrok/ngrok";
 import { Router as Router$2 } from "clear-router/express";
@@ -191,9 +192,11 @@ var ExpressDriver = class extends ArkstackKitDriver {
 	*/
 	async start(app, port) {
 		const host = env("APP_HOST", env("HOST", "0.0.0.0"));
+		const secure = env("APP_SECURE", false) === true;
 		const tunneled = env("TUNNEL", false);
-		app.listen(port, host, async () => {
-			let log = [Logger.log([["Server is running on", "white"], [`http://${host}:${port}`, "cyan"]], " ", false)];
+		const scheme = secure ? "https" : "http";
+		const onListen = async () => {
+			let log = startupLogLines(scheme, host, port);
 			if (tunneled === true) {
 				const url = (await ngrok.forward({
 					addr: port,
@@ -208,8 +211,32 @@ var ExpressDriver = class extends ArkstackKitDriver {
 				}
 			}
 			console.log(log.join("\n"));
-		});
+		};
+		if (secure) {
+			const credentials = await devTlsCredentials();
+			https.createServer({
+				key: credentials.key,
+				cert: credentials.cert
+			}, app).listen(port, host, onListen);
+			return;
+		}
+		app.listen(port, host, onListen);
+	}
+};
+/**
+* Build the "Server is running" startup lines, adding a local-network URL when
+* the server is bound to all interfaces (`0.0.0.0`/`::`) so it is reachable from
+* other devices.
+*/
+const startupLogLines = (scheme, host, port) => {
+	const bindsAll = host === "0.0.0.0" || host === "::";
+	const localHost = bindsAll ? "localhost" : host;
+	const lines = [Logger.log([["Server is running on", "white"], [`${scheme}://${localHost}:${port}`, "cyan"]], " ", false)];
+	if (bindsAll) {
+		const address = localNetworkAddress();
+		if (address) lines.push(Logger.log([["Network access via", "white"], [`${scheme}://${address}:${port}`, "cyan"]], " ", false));
 	}
+	return lines;
 };
 //#endregion
 export { ExpressDriver, Router, defaultErrorHandler };

package/dist/middlewares/index.d.ts

@@ -22,6 +22,25 @@ declare class FormDataMiddleware {
   handler(req: Request, res: Response, next: NextFunction): unknown;
 }
 //#endregion
+//#region src/middlewares/inertia.d.ts
+/**
+ * Bind the Inertia request context for Express.
+ *
+ * Normalizes the Express request into the adapter's driver-agnostic shape and
+ * runs the downstream handler inside Inertia's async-local context (mirroring the
+ * `resora` middleware), so `inertia()` / `Inertia.*` resolve the active request.
+ *
+ * It also upgrades `302` redirects to `303 See Other` for `PUT`/`PATCH`/`DELETE`
+ * Inertia visits, which the Inertia client requires to follow the redirect with
+ * a `GET`.
+ *
+ * `@arkstack/inertia` is imported dynamically so the package stays optional.
+ */
+declare const inertia: () => Handler;
+declare class InertiaMiddleware {
+  handler(req: Request, res: Response, next: NextFunction): unknown;
+}
+//#endregion
 //#region src/middlewares/limiter.d.ts
 /**
  *  create a rate limiter middleware
@@ -66,4 +85,4 @@ declare class RequestLoggerMiddleware {
  */
 declare const resora: () => Handler;
 //#endregion
-export { AuthMiddleware, FormDataMiddleware, RequestLoggerMiddleware, auth, formdata, limiter, requestLogger, resora };
+export { AuthMiddleware, FormDataMiddleware, InertiaMiddleware, RequestLoggerMiddleware, auth, formdata, inertia, limiter, requestLogger, resora };

package/dist/middlewares/index.js

@@ -74,6 +74,53 @@ var FormDataMiddleware = class {
 	}
 };
 //#endregion
+//#region src/middlewares/inertia.ts
+/**
+* Bind the Inertia request context for Express.
+*
+* Normalizes the Express request into the adapter's driver-agnostic shape and
+* runs the downstream handler inside Inertia's async-local context (mirroring the
+* `resora` middleware), so `inertia()` / `Inertia.*` resolve the active request.
+*
+* It also upgrades `302` redirects to `303 See Other` for `PUT`/`PATCH`/`DELETE`
+* Inertia visits, which the Inertia client requires to follow the redirect with
+* a `GET`.
+*
+* `@arkstack/inertia` is imported dynamically so the package stays optional.
+*/
+const inertia = () => {
+	return async (req, res, next) => {
+		try {
+			const { runInertia, shouldUpgradeRedirect } = await import("@arkstack/inertia");
+			const request = {
+				method: String(req.method ?? "GET").toUpperCase(),
+				url: req.originalUrl || req.url || "/",
+				header: (name) => {
+					const value = req.headers[name.toLowerCase()];
+					return Array.isArray(value) ? value[0] : value;
+				}
+			};
+			if (request.header("x-inertia") === "true") {
+				const original = res.redirect.bind(res);
+				res.redirect = ((...args) => {
+					let status = typeof args[0] === "number" ? args[0] : 302;
+					const url = typeof args[0] === "number" ? args[1] : args[0];
+					if (shouldUpgradeRedirect(request.method, status)) status = 303;
+					return original(status, url);
+				});
+			}
+			runInertia(request, () => next());
+		} catch (error) {
+			next(error);
+		}
+	};
+};
+var InertiaMiddleware = class {
+	handler(req, res, next) {
+		return inertia()(req, res, next);
+	}
+};
+//#endregion
 //#region src/Exceptions/RateLimitExceededException.ts
 var RateLimitExceededException = class extends Exception {
 	statusCode = 429;
@@ -180,4 +227,4 @@ const resora = () => {
 	};
 };
 //#endregion
-export { AuthMiddleware, FormDataMiddleware, RequestLoggerMiddleware, auth, formdata, limiter, requestLogger, resora };
+export { AuthMiddleware, FormDataMiddleware, InertiaMiddleware, RequestLoggerMiddleware, auth, formdata, inertia, limiter, requestLogger, resora };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkstack/driver-express",
-  "version": "0.14.22",
+  "version": "0.15.1",
   "type": "module",
   "description": "Express driver for Arkstack, providing Express-based runtime integration for the framework.",
   "homepage": "https://arkstack.toneflix.net",
@@ -43,17 +43,21 @@
     "express-rate-limit": "^8.4.1",
     "multer": "^2.1.1",
     "resora": "^1.3.27",
-    "@arkstack/contract": "^0.14.22"
+    "@arkstack/contract": "^0.15.1"
   },
   "peerDependencies": {
     "express": "^5.2.1",
-    "@arkstack/common": "^0.14.22",
-    "@arkstack/foundry": "^0.14.22",
-    "@arkstack/auth": "^0.14.22"
+    "@arkstack/auth": "^0.15.1",
+    "@arkstack/common": "^0.15.1",
+    "@arkstack/foundry": "^0.15.1",
+    "@arkstack/inertia": "^0.15.1"
   },
   "peerDependenciesMeta": {
     "@arkstack/auth": {
       "optional": true
+    },
+    "@arkstack/inertia": {
+      "optional": true
     }
   },
   "devDependencies": {