@mauroandre/velojs 0.0.27 → 0.0.29

package/README.md

@@ -1247,7 +1247,7 @@ Callbacks queue until the server starts. If called after startup, executes immed
 
 | Variable | Default | Description |
 |----------|---------|-------------|
-| `SERVER_PORT` | `3000` | Server port |
+| `PORT` | `3000` | Server port. Overrides the `port` set in `defineConfig` |
 | `NODE_ENV` | — | Set automatically by `velojs start`. Enables static file serving |
 | `STATIC_BASE_URL` | `""` | CDN/bucket prefix for static assets |
 
@@ -1528,7 +1528,7 @@ COPY package.json package-lock.json ./
 RUN npm ci --omit=dev
 COPY --from=builder /app/dist ./dist
 
-ENV SERVER_PORT=3000
+ENV PORT=3000
 EXPOSE 3000
 CMD ["npx", "velojs", "start"]
 ```

package/dist/config.d.ts

@@ -19,5 +19,11 @@ export interface VeloConfig {
      * @default "client.tsx"
      */
     clientInit?: string;
+    /**
+     * Porta usada tanto pelo dev server quanto pelo servidor de produção.
+     * A env `PORT` (injetada pela maioria dos hosts) sempre tem precedência.
+     * @default 3000
+     */
+    port?: number;
 }
 export declare function defineConfig(config: VeloConfig): VeloConfig;

package/dist/hooks.d.ts

@@ -1,6 +1,6 @@
 import { type Signal } from "@preact/signals";
 import type { EventStream } from "./events.js";
-import type { SocketStub } from "./sockets.js";
+import type { SocketHandler, SocketStub } from "./sockets.js";
 export declare const __veloUpdatePending: Signal<boolean>;
 /**
  * Força o signal a notificar mudanças após mutação de propriedades aninhadas
@@ -201,7 +201,7 @@ export interface UseSocketApi {
  * send({ type: "resize", cols: 80, rows: 24 });
  * ```
  */
-export declare function useSocket(stub: SocketStub | {
+export declare function useSocket(stub: SocketHandler | SocketStub | {
     __path: string;
 }, options?: UseSocketOptions): UseSocketApi;
 export {};

package/dist/server.js

@@ -1,5 +1,5 @@
 import { jsx as g } from "preact/jsx-runtime";
-import { Hono as q } from "hono";
+import { Hono as R } from "hono";
 import { logger as T } from "hono/logger";
 import { trimTrailingSlash as j } from "hono/trailing-slash";
 import { render as k } from "preact-render-to-string";
@@ -108,7 +108,7 @@ const N = (e, t, s) => {
     } else
       continue;
   }
-}, E = (e, t, s = []) => {
+}, b = (e, t, s = []) => {
   for (const a of t) {
     const o = a.module?.metadata?.moduleId, n = [
       ...s,
@@ -137,8 +137,8 @@ const N = (e, t, s) => {
               const p = await c(f);
               return d.json(p ?? { ok: !0 });
             } catch (p) {
-              const b = p instanceof Error ? p.message : "Action failed";
-              return d.json({ error: b }, 500);
+              const E = p instanceof Error ? p.message : "Action failed";
+              return d.json({ error: E }, 500);
             }
           };
           n.length > 0 ? e.on(
@@ -150,7 +150,7 @@ const N = (e, t, s) => {
         }
       }
     }
-    a.children && E(e, a.children, n);
+    a.children && b(e, a.children, n);
   }
 }, H = async (e, t, s = []) => {
   const a = (o, n) => {
@@ -191,7 +191,7 @@ const N = (e, t, s) => {
     }
   };
   return s(e), t;
-}, R = (e, t, s, a = "", o = []) => {
+}, q = (e, t, s, a = "", o = []) => {
   for (const n of t) {
     const r = x(a, n.path), i = [
       ...o,
@@ -217,7 +217,7 @@ const N = (e, t, s) => {
       });
       i.length > 0 ? e.on([h], [r], ...i, m) : e.on([h], [r], m);
     }
-    n.children && R(
+    n.children && q(
       e,
       n.children,
       s,
@@ -226,20 +226,20 @@ const N = (e, t, s) => {
     );
   }
 }, W = async (e) => {
-  const t = new q();
+  const t = new R();
   t.use(j()), process.env.NODE_ENV !== "production" && t.use("*", T());
   const a = v().pendingRoutes.splice(0);
   for (const n of a)
     await n(t);
-  _(t, e), E(t, e), await H(t, e);
+  _(t, e), b(t, e), await H(t, e);
   const o = V(e);
-  if (R(t, e, o), await I(t, e), $(t), process.env.NODE_ENV !== "production" && !w) {
+  if (q(t, e, o), await I(t, e), $(t), process.env.NODE_ENV !== "production" && !w) {
     const n = globalThis.__veloDevServer;
     n && (P(n), await y(t, n));
   }
   return t;
 }, ee = async (e) => {
-  const { routes: t, port: s = Number(process.env.SERVER_PORT) || 3e3 } = e, a = await W(t);
+  const { routes: t } = e, s = Number(process.env.PORT) || e.port || 3e3, a = await W(t);
   if (process.env.NODE_ENV === "production" && !process.env.VELO_STATIC) {
     const { serve: o } = await import("@hono/node-server"), { serveStatic: n } = await import("@hono/node-server/serve-static"), { join: r } = await import("node:path"), i = r(process.cwd(), "dist/client");
     (process.env.STATIC_BASE_URL || "").startsWith("http") || a.use("/*", n({ root: i })), console.log(`Server running on http://localhost:${s}`);

package/dist/sockets.d.ts

@@ -52,7 +52,15 @@ export interface SocketHandlerArgs {
     /** Query-string values. */
     query: Record<string, string>;
 }
-export type SocketHandler = (args: SocketHandlerArgs) => void | Promise<void>;
+export type SocketHandler = ((args: SocketHandlerArgs) => void | Promise<void>) & {
+    /**
+     * Populated at runtime by the socket registrar (and by the Vite plugin on the
+     * client bundle, where the function is replaced by a stub). Lets consumers
+     * pass the declared `socket_*` value straight into `useSocket(...)` without
+     * casting.
+     */
+    readonly __path?: string;
+};
 /** Client-side stub shape — what the Vite plugin replaces `socket_*` with on the client bundle. */
 export interface SocketStub {
     readonly __isVeloSocket: true;
@@ -89,6 +97,13 @@ export declare function registerSocketRoutes(app: Hono, nodes: RouteNode[], pare
  * returns (prod) or with Vite's dev http server (dev).
  *
  * No-op when no sockets are registered on `app`.
+ *
+ * The server is wrapped so that `upgrade` listeners registered by
+ * `@hono/node-ws` only fire for requests whose pathname matches a registered
+ * `socket_*` route. Without this, the adapter's listener treats every upgrade
+ * as a candidate and replies with an HTTP status, which corrupts the handshake
+ * for other listeners on the same server (notably Vite's HMR WebSocket in
+ * dev mode).
  */
 export declare function injectWebSocketServer(app: Hono, server: any): Promise<void>;
 export {};

package/dist/sockets.js

@@ -8,28 +8,28 @@ async function* W(e) {
     }
   }
 }
-const S = /* @__PURE__ */ new WeakMap(), g = /* @__PURE__ */ new WeakMap(), k = /* @__PURE__ */ new WeakMap();
-async function m(e) {
-  let t = S.get(e);
+const g = /* @__PURE__ */ new WeakMap(), k = /* @__PURE__ */ new WeakMap(), S = /* @__PURE__ */ new WeakMap();
+async function p(e) {
+  let t = g.get(e);
   if (t) return t;
   try {
-    return t = (await import("@hono/node-ws")).createNodeWebSocket({ app: e }), S.set(e, t), t;
+    return t = (await import("@hono/node-ws")).createNodeWebSocket({ app: e }), g.set(e, t), t;
   } catch (n) {
     return console.error("[velojs] failed to load @hono/node-ws:", n), null;
   }
 }
-function p(e, t) {
-  let n = k.get(e);
-  n || (n = /* @__PURE__ */ new Set(), k.set(e, n)), n.add(t);
-}
 function b(e, t) {
-  k.get(e)?.delete(t);
+  let n = S.get(e);
+  n || (n = /* @__PURE__ */ new Set(), S.set(e, n)), n.add(t);
+}
+function m(e, t) {
+  S.get(e)?.delete(t);
 }
 function _(e, t) {
-  return p(e, t), () => b(e, t);
+  return b(e, t), () => m(e, t);
 }
 function M(e) {
-  const t = k.get(e);
+  const t = S.get(e);
   if (t) {
     for (const n of t)
       try {
@@ -39,64 +39,64 @@ function M(e) {
     t.clear();
   }
 }
-function O(e) {
-  return g.get(e) ?? /* @__PURE__ */ new Map();
+function x(e) {
+  return k.get(e) ?? /* @__PURE__ */ new Map();
 }
 function j(e, t, n) {
-  const s = [];
-  let a = null, i = !1, c = !1, o = null;
-  const f = new AbortController();
-  p(e, f);
+  const i = [];
+  let r = null, s = !1, c = !1, o = null;
+  const l = new AbortController();
+  b(e, l);
   const u = {
     async *[Symbol.asyncIterator]() {
       for (; ; ) {
-        for (; s.length > 0; )
-          yield s.shift();
-        if (i) return;
-        await new Promise((l) => {
-          a = l;
-        }), a = null;
+        for (; i.length > 0; )
+          yield i.shift();
+        if (s) return;
+        await new Promise((f) => {
+          r = f;
+        }), r = null;
       }
     }
-  }, d = (l) => {
-    if (!(!o || i))
+  }, d = (f) => {
+    if (!(!o || s))
       try {
-        typeof l == "string" || l instanceof Uint8Array ? o.send(l) : o.send(JSON.stringify(l));
-      } catch (r) {
-        console.error("[velojs] socket send failed:", r);
+        typeof f == "string" || f instanceof Uint8Array ? o.send(f) : o.send(JSON.stringify(f));
+      } catch (a) {
+        console.error("[velojs] socket send failed:", a);
       }
-  }, h = (l, r) => {
+  }, w = (f, a) => {
     if (o)
       try {
-        o.close(l, r);
+        o.close(f, a);
       } catch {
       }
   }, y = () => {
     c = !0;
-  }, w = () => {
-    if (i || (i = !0, a?.()), !f.signal.aborted)
+  }, h = () => {
+    if (s || (s = !0, r?.()), !l.signal.aborted)
       try {
-        f.abort();
+        l.abort();
       } catch {
       }
-    b(e, f);
+    m(e, l);
   };
   return {
     events: {
-      onOpen(l, r) {
-        o = r, Promise.resolve(
+      onOpen(f, a) {
+        o = a, Promise.resolve(
           t({
             incoming: u,
             send: d,
-            close: h,
+            close: w,
             keepOpen: y,
-            abortSignal: f.signal,
+            abortSignal: l.signal,
             c: n,
             params: n.req.param(),
             query: n.req.query()
           })
         ).then(() => {
-          if (!c && o && !i)
+          if (!c && o && !s)
             try {
               o.close();
             } catch {
@@ -109,33 +109,33 @@ function j(e, t, n) {
           }
         });
       },
-      onMessage(l) {
-        if (i) return;
-        const r = l.data;
-        typeof r == "string" ? s.push(r) : r instanceof ArrayBuffer ? s.push(new Uint8Array(r)) : r && typeof r == "object" && "buffer" in r && r.buffer instanceof ArrayBuffer && s.push(new Uint8Array(r.buffer)), a?.();
+      onMessage(f) {
+        if (s) return;
+        const a = f.data;
+        typeof a == "string" ? i.push(a) : a instanceof ArrayBuffer ? i.push(new Uint8Array(a)) : a && typeof a == "object" && "buffer" in a && a.buffer instanceof ArrayBuffer && i.push(new Uint8Array(a.buffer)), r?.();
       },
       onClose() {
-        w();
+        h();
       },
       onError() {
-        w();
+        h();
       }
     },
-    cleanup: w
+    cleanup: h
   };
 }
-async function A(e, t, n, s = []) {
-  let a = g.get(e);
-  a || (a = /* @__PURE__ */ new Map(), g.set(e, a)), a.set(t, { path: t, handler: n, middlewares: s });
-  const i = await m(e);
-  if (!i) return;
-  const c = i.upgradeWebSocket((o) => j(e, n, o).events);
-  s.length > 0 ? e.on(["GET"], [t], ...s, c) : e.on(["GET"], [t], c);
+async function A(e, t, n, i = []) {
+  let r = k.get(e);
+  r || (r = /* @__PURE__ */ new Map(), k.set(e, r)), r.set(t, { path: t, handler: n, middlewares: i });
+  const s = await p(e);
+  if (!s) return;
+  const c = s.upgradeWebSocket((o) => j(e, n, o).events);
+  i.length > 0 ? e.on(["GET"], [t], ...i, c) : e.on(["GET"], [t], c);
 }
-async function q(e, t, n = []) {
-  const s = async (a, i) => {
-    for (const c of a) {
-      const o = c.module?.metadata?.moduleId, f = [...i, ...c.middlewares ?? []];
+async function O(e, t, n = []) {
+  const i = async (r, s) => {
+    for (const c of r) {
+      const o = c.module?.metadata?.moduleId, l = [...s, ...c.middlewares ?? []];
       if (c.module && o)
         for (const u of Object.keys(c.module)) {
           if (!u.startsWith("socket_")) continue;
@@ -146,7 +146,7 @@ async function q(e, t, n = []) {
             );
             continue;
           }
-          const h = u.replace("socket_", ""), y = `/_socket/${o}/${h}`;
+          const w = u.replace("socket_", ""), y = `/_socket/${o}/${w}`;
           try {
             d.__path = y;
           } catch {
@@ -155,28 +155,42 @@ async function q(e, t, n = []) {
             d.__isVeloSocket = !0;
           } catch {
           }
-          await A(e, y, d, f);
+          await A(e, y, d, l);
         }
-      c.children && await s(c.children, f);
+      c.children && await i(c.children, l);
     }
   };
-  await s(t, n);
+  await i(t, n);
 }
-async function x(e, t) {
-  const n = S.get(e);
-  if (n)
-    try {
-      n.injectWebSocket(t);
-    } catch (s) {
-      console.error("[velojs] injectWebSocket failed:", s);
+async function J(e, t) {
+  const n = g.get(e);
+  if (!n) return;
+  const i = new Proxy(t, {
+    get(r, s, c) {
+      return s === "on" || s === "addListener" ? (o, l) => o !== "upgrade" ? r[s](o, l) : r[s]("upgrade", (u, d, w) => {
+        const y = u.headers?.host ?? "localhost";
+        let h;
+        try {
+          h = new URL(u.url ?? "/", `http://${y}`).pathname;
+        } catch {
+          return;
+        }
+        k.get(e)?.has(h) && l(u, d, w);
+      }) : Reflect.get(r, s, c);
     }
+  });
+  try {
+    n.injectWebSocket(i);
+  } catch (r) {
+    console.error("[velojs] injectWebSocket failed:", r);
+  }
 }
 export {
   M as abortAllSocketSessions,
-  O as getAppSockets,
-  x as injectWebSocketServer,
+  x as getAppSockets,
+  J as injectWebSocketServer,
   W as parseJson,
   A as registerSocketHandler,
-  q as registerSocketRoutes,
+  O as registerSocketRoutes,
   _ as trackSocketSession
 };

package/dist/vite.js

@@ -1,14 +1,14 @@
-import m from "node:path";
+import y from "node:path";
 import S from "node:fs";
 import R from "@preact/preset-vite";
 import $ from "@hono/vite-dev-server";
-import { parse as y } from "@babel/parser";
+import { parse as _ } from "@babel/parser";
 import g from "@babel/traverse";
 import j from "@babel/generator";
 import * as e from "@babel/types";
 const d = typeof g == "function" ? g : g.default, h = typeof j == "function" ? j : j.default;
 function U(p, c, i, n) {
-  const o = y(p, {
+  const o = _(p, {
     sourceType: "module",
     plugins: ["typescript", "jsx"]
   });
@@ -21,23 +21,23 @@ function U(p, c, i, n) {
         const r = a.declarations[0];
         if (r && e.isIdentifier(r.id, { name: "metadata" }) && e.isObjectExpression(r.init)) {
           t = !0;
-          const f = r.init.properties.filter((_) => e.isObjectProperty(_) && e.isIdentifier(_.key) ? _.key.name !== "moduleId" && _.key.name !== "fullPath" && _.key.name !== "path" : !0), x = [
+          const f = r.init.properties.filter((v) => e.isObjectProperty(v) && e.isIdentifier(v.key) ? v.key.name !== "moduleId" && v.key.name !== "fullPath" && v.key.name !== "path" : !0), m = [
             e.objectProperty(
               e.identifier("moduleId"),
               e.stringLiteral(c)
             )
           ];
-          i !== void 0 && x.push(
+          i !== void 0 && m.push(
             e.objectProperty(
               e.identifier("fullPath"),
               e.stringLiteral(i)
             )
-          ), n !== void 0 && x.push(
+          ), n !== void 0 && m.push(
             e.objectProperty(
               e.identifier("path"),
               e.stringLiteral(n)
             )
-          ), r.init.properties = [...x, ...f];
+          ), r.init.properties = [...m, ...f];
         }
       }
     }
@@ -72,7 +72,7 @@ function U(p, c, i, n) {
   return h(o, { retainLines: !0 }).code;
 }
 function W(p, c) {
-  const i = y(p, {
+  const i = _(p, {
     sourceType: "module",
     plugins: ["typescript", "jsx"]
   });
@@ -86,7 +86,7 @@ function W(p, c) {
   }), h(i, { retainLines: !0 }).code;
 }
 function J(p, c) {
-  const i = y(p, {
+  const i = _(p, {
     sourceType: "module",
     plugins: ["typescript", "jsx"]
   });
@@ -202,7 +202,7 @@ function B(p, c) {
   }
 }
 function H(p, c) {
-  const i = y(p, {
+  const i = _(p, {
     sourceType: "module",
     plugins: ["typescript", "jsx"]
   });
@@ -229,7 +229,7 @@ function H(p, c) {
   }), h(i, { retainLines: !0 }).code;
 }
 function z(p, c) {
-  const i = y(p, {
+  const i = _(p, {
     sourceType: "module",
     plugins: ["typescript", "jsx"]
   });
@@ -255,8 +255,8 @@ function z(p, c) {
     }
   }), h(i, { retainLines: !0 }).code;
 }
-function Y(p) {
-  const c = y(p, {
+function G(p) {
+  const c = _(p, {
     sourceType: "module",
     plugins: ["typescript", "jsx"]
   });
@@ -269,8 +269,8 @@ function Y(p) {
     }
   }), h(c, { retainLines: !0 }).code;
 }
-function q(p) {
-  const c = y(p, {
+function Y(p) {
+  const c = _(p, {
     sourceType: "module",
     plugins: ["typescript", "jsx"]
   }), i = /* @__PURE__ */ new Set();
@@ -295,7 +295,7 @@ function q(p) {
     }
   }), h(c, { retainLines: !0 }).code);
 }
-function A(p, c) {
+function O(p, c) {
   const i = (n) => {
     if (!(!n || typeof n != "object")) {
       if (Array.isArray(n)) {
@@ -321,7 +321,7 @@ function A(p, c) {
   };
   i(p);
 }
-function G(p) {
+function q(p) {
   for (const c of p.properties)
     if (e.isObjectProperty(c) && e.isIdentifier(c.key) && c.key.name === "handler")
       return !0;
@@ -334,14 +334,14 @@ function K(p) {
   return null;
 }
 function Q(p) {
-  const c = y(p, {
+  const c = _(p, {
     sourceType: "module",
     plugins: ["typescript", "jsx"]
   }), i = [], n = (a) => {
     for (let r = a.elements.length - 1; r >= 0; r--) {
       const u = a.elements[r];
       if (!e.isObjectExpression(u)) continue;
-      if (G(u)) {
+      if (q(u)) {
         i.push(u), a.elements.splice(r, 1);
         continue;
       }
@@ -358,9 +358,9 @@ function Q(p) {
   }), i.length === 0) return p;
   const o = /* @__PURE__ */ new Set();
   for (const a of i)
-    A(a, o);
+    O(a, o);
   const t = /* @__PURE__ */ new Set();
-  A(c.program, t);
+  O(c.program, t);
   const s = /* @__PURE__ */ new Set();
   for (const a of o)
     t.has(a) || s.add(a);
@@ -371,8 +371,8 @@ function Q(p) {
     }
   }), h(c, { retainLines: !0 }).code;
 }
-function P(p) {
-  const c = y(p, {
+function A(p) {
+  const c = _(p, {
     sourceType: "module",
     plugins: ["typescript", "jsx"]
   }), i = /* @__PURE__ */ new Map();
@@ -420,29 +420,29 @@ function C(p, c, i) {
     l && C(l.elements, t, i);
   }
 }
-const b = "virtual:velo/server-entry", E = "virtual:velo/client-entry", N = "\0" + b, O = "\0" + E;
+const E = "virtual:velo/server-entry", b = "virtual:velo/client-entry", P = "\0" + E, N = "\0" + b;
 function X(p, c) {
-  let i = m.resolve(process.cwd(), c);
+  let i = y.resolve(process.cwd(), c);
   const n = p.routesFile ?? "routes.tsx", o = /* @__PURE__ */ new Map();
   return {
     name: "velo:transform",
     enforce: "pre",
     configResolved(t) {
-      i = m.resolve(t.root, c);
+      i = y.resolve(t.root, c);
     },
     buildStart() {
-      const t = m.join(i, n);
+      const t = y.join(i, n);
       if (S.existsSync(t)) {
-        const s = S.readFileSync(t, "utf-8"), l = P(s);
+        const s = S.readFileSync(t, "utf-8"), l = A(s);
         o.clear();
         for (const [a, r] of l)
           o.set(a, r);
       }
     },
     handleHotUpdate({ file: t, server: s }) {
-      const l = m.join(i, n);
+      const l = y.join(i, n);
       if (t === l) {
-        const a = S.readFileSync(l, "utf-8"), r = P(a);
+        const a = S.readFileSync(l, "utf-8"), r = A(a);
         o.clear();
         for (const [u, f] of r)
           o.set(u, f);
@@ -450,11 +450,11 @@ function X(p, c) {
       }
     },
     resolveId(t) {
-      return t === b || t.endsWith(b) ? N : t === E || t.endsWith(E) || t === "/__velo_client.js" ? O : null;
+      return t === E || t.endsWith(E) ? P : t === b || t.endsWith(b) || t === "/__velo_client.js" ? N : null;
     },
     load(t) {
-      const s = p.routesFile ?? "routes.tsx", l = p.serverInit ?? "server.tsx", a = p.clientInit ?? "client.tsx", r = m.join(i, s).replace(/\.tsx?$/, ".js"), u = m.join(i, l).replace(/\.tsx?$/, ".js"), f = m.join(i, a).replace(/\.tsx?$/, ".js");
-      return t === N ? `
+      const s = p.routesFile ?? "routes.tsx", l = p.serverInit ?? "server.tsx", a = p.clientInit ?? "client.tsx", r = y.join(i, s).replace(/\.tsx?$/, ".js"), u = y.join(i, l).replace(/\.tsx?$/, ".js"), f = y.join(i, a).replace(/\.tsx?$/, ".js");
+      return t === P ? `
 globalThis.__veloBuildHash = __VELO_BUILD_HASH__;
 globalThis.__veloClientJs = __VELO_CLIENT_JS__;
 globalThis.__veloClientCss = __VELO_CLIENT_CSS__;
@@ -463,8 +463,8 @@ import routes from "${r}";
 import { startServer } from "@mauroandre/velojs/server";
 
 export { routes };
-export default await startServer({ routes });
-` : t === O ? `
+export default await startServer({ routes, port: __VELO_CONFIG_PORT__ });
+` : t === N ? `
 import "${f}";
 import routes from "${r}";
 import { startClient } from "@mauroandre/velojs/client";
@@ -476,21 +476,21 @@ startClient({ routes });
       const a = l?.ssr === !0;
       if (s.startsWith("\0") || s.includes("/.velojs/") || !s.endsWith(".tsx") && !s.endsWith(".ts") || !s.startsWith(i)) return null;
       let r = t, u = !1;
-      const f = /middlewares:\s*\[/.test(t), x = /export\s+(const|function)\s+Component/.test(
+      const f = /middlewares:\s*\[/.test(t), m = /export\s+(const|function)\s+Component/.test(
         t
-      ), _ = /export\s+(const|function)\s+loader/.test(t), D = /export\s+const\s+action_\w+/.test(t), L = /export\s+const\s+stream_\w+/.test(t), I = /export\s+const\s+socket_\w+/.test(t), w = /\bLoader\s*</.test(t) || /\bLoader\s*\(/.test(t), k = /\buseLoader\s*</.test(t) || /\buseLoader\s*\(/.test(t), F = /\bhandler\s*:/.test(t), V = m.join(i, n);
-      if (!a && f && (r = q(r), u = !0), !a && F && s === V && (r = Q(r), u = !0), x || _ || D || L || I || w || k) {
-        const v = m.relative(i, s).replace(/\.(tsx?|jsx?)$/, "").replace(/\\/g, "/"), T = o.get(v);
-        r = U(r, v, T?.fullPath, T?.path), r = W(r, v), a || (r = J(
+      ), v = /export\s+(const|function)\s+loader/.test(t), D = /export\s+const\s+action_\w+/.test(t), L = /export\s+const\s+stream_\w+/.test(t), I = /export\s+const\s+socket_\w+/.test(t), w = /\bLoader\s*</.test(t) || /\bLoader\s*\(/.test(t), F = /\buseLoader\s*</.test(t) || /\buseLoader\s*\(/.test(t), k = /\bhandler\s*:/.test(t), V = y.join(i, n);
+      if (!a && f && (r = Y(r), u = !0), !a && k && s === V && (r = Q(r), u = !0), m || v || D || L || I || w || F) {
+        const x = y.relative(i, s).replace(/\.(tsx?|jsx?)$/, "").replace(/\\/g, "/"), T = o.get(x);
+        r = U(r, x, T?.fullPath, T?.path), r = W(r, x), a || (r = J(
           r,
-          v
+          x
         )), !a && L && (r = H(
           r,
-          v
+          x
         )), !a && I && (r = z(
           r,
-          v
-        )), a || (r = Y(r)), u = !0;
+          x
+        )), a || (r = G(r)), u = !0;
       }
       return u ? {
         code: r,
@@ -499,36 +499,42 @@ startClient({ routes });
     }
   };
 }
-function Z() {
+function Z(p) {
   return {
     name: "velo:config",
-    config(p, { mode: c }) {
-      const i = c === "server", n = c === "development", o = !!process.env.VELO_STATIC;
-      let t = "client.js", s = "client.css";
-      if (i)
+    config(c, { mode: i }) {
+      const n = i === "server", o = i === "development", t = !!process.env.VELO_STATIC, s = Number(process.env.PORT) || p.port || 3e3;
+      let l = "client.js", a = "client.css";
+      if (n)
         try {
-          const a = m.resolve(process.cwd(), "dist/client/.vite/manifest.json"), u = JSON.parse(S.readFileSync(a, "utf-8"))[E];
-          u && (t = u.file || t, u.css?.[0] && (s = u.css[0]));
+          const u = y.resolve(process.cwd(), "dist/client/.vite/manifest.json"), m = JSON.parse(S.readFileSync(u, "utf-8"))[b];
+          m && (l = m.file || l, m.css?.[0] && (a = m.css[0]));
         } catch {
         }
-      const l = {
+      const r = {
         define: {
-          "process.env.NODE_ENV": JSON.stringify(n ? "development" : "production"),
-          "process.env.STATIC_BASE_URL": JSON.stringify(process.env.STATIC_BASE_URL || (o ? "/client" : "")),
-          __VELO_STATIC__: JSON.stringify(o),
+          "process.env.NODE_ENV": JSON.stringify(o ? "development" : "production"),
+          "process.env.STATIC_BASE_URL": JSON.stringify(process.env.STATIC_BASE_URL || (t ? "/client" : "")),
+          __VELO_STATIC__: JSON.stringify(t),
           __VELO_BUILD_HASH__: JSON.stringify(process.env.VELO_BUILD_HASH || Date.now().toString(36)),
-          __VELO_CLIENT_JS__: JSON.stringify(t),
-          __VELO_CLIENT_CSS__: JSON.stringify(s)
+          __VELO_CLIENT_JS__: JSON.stringify(l),
+          __VELO_CLIENT_CSS__: JSON.stringify(a),
+          // Baked into the server bundle as startServer's port fallback.
+          // null when unset → startServer falls back to PORT env / 3000.
+          __VELO_CONFIG_PORT__: JSON.stringify(p.port ?? null)
         },
         resolve: {
           alias: {
             react: "preact/compat",
             "react-dom": "preact/compat"
           }
+        },
+        server: {
+          port: s
         }
       };
-      return i ? l.build = {
-        ssr: b,
+      return n ? r.build = {
+        ssr: E,
         outDir: "dist",
         emptyOutDir: !1,
         copyPublicDir: !1,
@@ -537,17 +543,17 @@ function Z() {
             entryFileNames: "server.js"
           }
         }
-      } : n || (l.build = {
+      } : o || (r.build = {
         manifest: !0,
         outDir: "dist/client",
         rollupOptions: {
-          input: E,
+          input: b,
           output: {
             entryFileNames: "client.[hash].js",
-            assetFileNames: (a) => a.names?.[0]?.endsWith(".css") ? "client.[hash].css" : "[name].[hash][extname]"
+            assetFileNames: (u) => u.names?.[0]?.endsWith(".css") ? "client.[hash].css" : "[name].[hash][extname]"
           }
         }
-      }), l;
+      }), r;
     }
   };
 }
@@ -570,12 +576,12 @@ function ee() {
 function le(p) {
   const c = p ?? {}, i = c.appDirectory ?? "./app";
   return [
-    Z(),
+    Z(c),
     X(c, i),
     ee(),
     R(),
     $({
-      entry: b
+      entry: E
     }),
     te()
   ];
@@ -589,12 +595,12 @@ function te() {
   };
 }
 export {
-  P as buildFullPathMap,
+  A as buildFullPathMap,
   C as collectFullPaths,
   U as injectMetadata,
   Q as removeEndpointRoutes,
-  Y as removeLoaders,
-  q as removeMiddlewares,
+  G as removeLoaders,
+  Y as removeMiddlewares,
   J as transformActionsForClient,
   W as transformLoaderFunctions,
   z as transformSocketsForClient,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mauroandre/velojs",
-    "version": "0.0.27",
+    "version": "0.0.29",
     "type": "module",
     "description": "Fullstack web framework built on Hono + Preact with Vite-powered AST transforms",
     "keywords": [