glashjs 0.13.0 → 0.13.2

package/bin/glash.mjs

@@ -12,7 +12,10 @@ import { createProject } from '../src/create.mjs';
 import { generateTypedRoutes } from '../src/typed-routes.mjs';
 
 const VERSION = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version;
-const [, , cmd, ...rest] = process.argv;
+let [, , cmd, ...rest] = process.argv;
+if (cmd === 'run') {
+  cmd = rest.shift() || 'dev';
+}
 
 function arg(name, fallback) {
   const i = rest.indexOf(name);
@@ -55,11 +58,12 @@ function lanAddresses() {
 async function serve(dev) {
   const root = arg('--root', process.cwd());
   const { listen, cfg, routes } = await createGlashServer({ root, dev });
-  const port = Number(arg('--port', cfg.port || 3000));
-  await listen(port);
+  const preferredPort = Number(arg('--port', cfg.port || 3000));
+  const port = await listenOnAvailablePort(listen, preferredPort);
   const pages = routes.filter((r) => !r.isApi).length;
   const apis = routes.filter((r) => r.isApi).length;
   console.log(`\nglashjs ${dev ? 'dev' : 'serve'} — "${cfg.name}"`);
+  if (port !== preferredPort) console.log(`  Port ${preferredPort} is in use; using ${port} instead.`);
   console.log(`  ${pages} page route(s), ${apis} api route(s)`);
   routes.forEach((r) => console.log(`    ${r.isApi ? 'api ' : 'page'}  ${r.pattern}`));
   console.log('');
@@ -69,6 +73,18 @@ async function serve(dev) {
   console.log('');
 }
 
+async function listenOnAvailablePort(listen, preferredPort) {
+  for (let port = preferredPort; port < preferredPort + 20; port += 1) {
+    try {
+      await listen(port);
+      return port;
+    } catch (error) {
+      if (error?.code !== 'EADDRINUSE') throw error;
+    }
+  }
+  throw new Error(`No available port found from ${preferredPort} to ${preferredPort + 19}`);
+}
+
 async function main() {
   switch (cmd) {
     case 'create':
@@ -144,6 +160,7 @@ async function main() {
       console.log(`glashjs — fast, offline-capable, hard-to-hack sites
 
 Usage: (run as "glashjs <cmd>"; "glash <cmd>" also works unless the glashdb deploy CLI owns that name)
+  glashjs run dev               Alias for glashjs dev (also: glash run dev)
   glashjs create [name]          Create a new Glash project (interactive)
   glashjs dev [--port 3000]     Run the dev server (routing, SSR, API, live reload) + Network preview URL
   glashjs serve [--port 3000]   Run the production server over routes/ + built assets

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glashjs",
-  "version": "0.13.0",
+  "version": "0.13.2",
   "description": "glashjs — The Postgres-native full-stack framework for builders who want to ship without DevOps. Framework, hosting, database, auth, and deploy in one GlashDB-native runtime.",
   "type": "module",
   "bin": {

package/src/server/server.mjs

@@ -34,6 +34,7 @@ export async function createGlashServer({ root = process.cwd(), dev = false } =
   const cfg = await loadConfig(root);
   const routesDir = path.resolve(root, cfg.routesDir || 'routes');
   const outDir = path.resolve(root, cfg.outDir);
+  const publicDir = path.resolve(root, cfg.publicDir || 'public');
   const secHeaders = securityHeaders(cfg.security);
   let routes = await discoverRoutes(routesDir);
 
@@ -72,6 +73,7 @@ export async function createGlashServer({ root = process.cwd(), dev = false } =
       // Static first: in production this serves prebuilt /_glash/<id>.js bundles
       // (written by `glash build`) — no runtime esbuild needed.
       if (await serveStatic(res, outDir, pathname, req, secHeaders)) return;
+      if (dev && publicDir !== outDir && await serveStatic(res, publicDir, pathname, req, secHeaders)) return;
       // Dynamic hydration bundles (dev, or when not prebuilt): /_glash/<routeId>.js
       if (pathname.startsWith('/_glash/')) {
         const id = pathname.slice('/_glash/'.length).replace(/\.js$/, '');
@@ -120,9 +122,21 @@ export async function createGlashServer({ root = process.cwd(), dev = false } =
   });
 
   const listen = (port = cfg.port || 3000, host = '0.0.0.0') =>
-    new Promise((resolve) => server.listen(port, host, () => resolve({ port, host })));
-
-  return { server, listen, cfg, routes, routesDir, outDir };
+    new Promise((resolve, reject) => {
+      const onError = (error) => {
+        server.off('listening', onListening);
+        reject(error);
+      };
+      const onListening = () => {
+        server.off('error', onError);
+        resolve({ port, host });
+      };
+      server.once('error', onError);
+      server.once('listening', onListening);
+      server.listen(port, host);
+    });
+
+  return { server, listen, cfg, routes, routesDir, outDir, publicDir };
 }
 
 async function handleApi(res, mod, req, ctx, secHeaders) {