@mauroandre/velojs 0.0.27 → 0.0.28

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/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/package.json

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