arcway 0.4.17 → 0.4.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arcway",
-  "version": "0.4.17",
+  "version": "0.4.18",
   "description": "A convention-based framework for building modular monoliths with strict domain boundaries.",
   "license": "MIT",
   "type": "module",

package/server/config/modules/database.js

@@ -1,4 +1,5 @@
 import path from 'node:path';
+import { normalizePort } from '../port.js';
 
 const DEFAULTS = {
   sqliteFilename: '.build/db/arcway.db',
@@ -15,6 +16,12 @@ function resolve(config, { rootDir } = {}) {
   const db = { ...DEFAULTS, ...config.database };
   // Resolve friendly client names to actual knex driver names
   db.client = CLIENT_MAP[db.client] ?? db.client;
+  if (db.connection && typeof db.connection === 'object' && db.connection.port !== undefined) {
+    db.connection = {
+      ...db.connection,
+      port: normalizePort(db.connection.port, 'database.connection.port'),
+    };
+  }
   if (db.dir && !path.isAbsolute(db.dir)) {
     db.dir = path.resolve(rootDir, db.dir);
   }

package/server/config/modules/mail.js

@@ -1,4 +1,5 @@
 import { normalizeDurationDays, normalizeDurationSeconds } from '../duration.js';
+import { normalizePort } from '../port.js';
 
 const DEFAULTS = {
   driver: 'console',
@@ -8,6 +9,12 @@ const DEFAULTS = {
 function resolve(config) {
   if (!config.mail) return config;
   const mail = { ...DEFAULTS, ...config.mail };
+  if (mail.smtp?.port !== undefined) {
+    mail.smtp = {
+      ...mail.smtp,
+      port: normalizePort(mail.smtp.port, 'mail.smtp.port'),
+    };
+  }
   if (mail.inbound?.imap?.pollIntervalSeconds !== undefined) {
     mail.inbound.imap.pollIntervalSeconds = normalizeDurationSeconds(
       mail.inbound.imap.pollIntervalSeconds,

package/server/config/modules/session.js

@@ -1,14 +1,15 @@
 import { resolveSessionConfig } from '../../session/index.js';
 
 function resolve(config, { mode } = {}) {
-  if (!config.session) return config;
+  if (config.session === false) return { ...config, session: undefined };
   const vaultSession = config.vault?.values?.session;
+  if (config.session == null && !vaultSession) return config;
   const sessionKeyring = config.vault?.keyring?.map((entry) => ({
     id: entry.id,
     password: entry.secrets.session,
   }));
   const sessionInput = {
-    ...config.session,
+    ...(config.session ?? {}),
     password: vaultSession,
     keyring: sessionKeyring,
   };

package/server/config/port.js

@@ -0,0 +1,10 @@
+function normalizePort(value, name) {
+  if (value === undefined || value === null || value === '') return value;
+  const port = typeof value === 'string' && /^\d+$/.test(value) ? Number(value) : value;
+  if (!Number.isInteger(port) || port < 1 || port > 65535) {
+    throw new TypeError(`Invalid config: ${name} must be an integer from 1 to 65535`);
+  }
+  return port;
+}
+
+export { normalizePort };

package/server/pages/vite-dev.js

@@ -224,7 +224,7 @@ function getViteServerOptions(config, hmrServer) {
   const hmr = config?.pages?.vite?.hmr;
   return {
     middlewareMode: true,
-    ...(hmr ? { hmr: { ...hmr, ...(hmrServer ? { server: hmrServer } : {}) } } : {}),
+    hmr: { ...hmr, server: hmrServer },
   };
 }
 
@@ -239,7 +239,7 @@ async function createViteHmrServer(log, { host = '0.0.0.0', port = 24678 } = {})
 
 async function createViteDevRouter({ rootDir, log, config }) {
   const appAliases = resolveAppAliases(rootDir);
-  const hmrServer = config?.pages?.vite?.hmr ? await createViteHmrServer(log) : null;
+  const hmrServer = await createViteHmrServer(log);
   let vite;
   try {
     vite = await createViteServer({