@mauroandre/velojs 0.0.23 → 0.0.25

package/dist/events.js

@@ -1,8 +1,8 @@
 import { getAppContext as A } from "./app-context.js";
-const M = 2e4, R = 300 * 1e3, v = "";
+const M = 2e4, R = 300 * 1e3, m = "";
 function x(t) {
-  const o = A().pendingStreamRoutes.splice(0);
-  for (const c of o) c(t);
+  const n = A().pendingStreamRoutes.splice(0);
+  for (const l of n) l(t);
 }
 const I = /* @__PURE__ */ new Set();
 function y() {
@@ -15,116 +15,116 @@ function L(t = {}) {
     throw new Error(
       "[velojs] createEventStream: `source` and `perChannelSource` are mutually exclusive. Use `source` for stream-wide producers or `perChannelSource` for per-channel resources, not both."
     );
-  const a = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Set(), f = /* @__PURE__ */ new Map();
-  let l = null, w = 0;
+  const a = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map(), l = /* @__PURE__ */ new Set(), h = /* @__PURE__ */ new Map();
+  let c = null, w = 0;
   const i = /* @__PURE__ */ new Map(), b = () => {
-    t.source && (l || (l = new AbortController(), Promise.resolve(
-      t.source(p, { abortSignal: l.signal })
+    t.source && (c || (c = new AbortController(), Promise.resolve(
+      t.source(_, { abortSignal: c.signal })
     ).catch((e) => {
       console.error("[velojs] event stream source threw:", e);
     })));
-  }, m = () => {
-    w > 0 || l && (l.abort(), l = null);
-  }, u = (e) => {
+  }, g = () => {
+    w > 0 || c && (c.abort(), c = null);
+  }, d = (e) => {
     if (!t.perChannelSource || i.has(e)) return;
-    const n = new AbortController();
-    i.set(e, n);
-    const s = (r, S) => {
-      h.emit(e, r, S);
+    const r = new AbortController();
+    i.set(e, r);
+    const o = (s, f) => {
+      p.emit(e, s, f);
     };
     Promise.resolve(
-      t.perChannelSource(e, s, { abortSignal: n.signal })
-    ).catch((r) => {
+      t.perChannelSource(e, o, { abortSignal: r.signal })
+    ).catch((s) => {
       console.error(
         `[velojs] perChannelSource threw for channel "${e}":`,
-        r
+        s
       );
     });
-  }, d = (e) => {
-    const n = i.get(e);
-    n && (n.abort(), i.delete(e));
+  }, S = (e) => {
+    const r = i.get(e);
+    r && (r.abort(), i.delete(e));
   };
-  function p(e, n, s) {
-    let r, S, E;
-    if (!!t.broadcast ? (r = v, S = e, E = n) : (r = e, S = n, E = s), c.has(r)) {
+  function _(e, r, o) {
+    let s, f, u;
+    if (!!t.broadcast ? (s = m, f = e, u = r) : (s = e, f = r, u = o), l.has(s)) {
       console.warn(
-        `[velojs] emit() called on closed channel "${r}" — ignored. Reopen the channel by emitting to a fresh ID, or remove the close() call.`
+        `[velojs] emit() called on closed channel "${s}" — ignored. Reopen the channel by emitting to a fresh ID, or remove the close() call.`
       );
       return;
     }
-    if (E?.snapshot) {
-      const _ = o.get(r) ?? [];
-      _.push(S);
+    if (u?.snapshot) {
+      const v = n.get(s) ?? [];
+      v.push(f);
       const T = t.bufferSize ?? 1 / 0;
-      _.length > T && _.splice(0, _.length - T), o.set(r, _);
+      v.length > T && v.splice(0, v.length - T), n.set(s, v);
     }
-    const C = a.get(r);
-    if (C)
-      for (const _ of C) _(S);
+    const E = a.get(s);
+    if (E)
+      for (const v of E) v(f);
   }
-  function g(e = v) {
-    if (c.has(e)) return;
-    c.add(e);
-    const n = a.get(e);
-    if (n)
-      for (const S of n) S.close();
-    const s = t.retainMs ?? R, r = f.get(e);
-    r && clearTimeout(r), f.set(
+  function C(e = m) {
+    if (l.has(e)) return;
+    l.add(e);
+    const r = a.get(e);
+    if (r)
+      for (const f of r) f.close();
+    const o = t.retainMs ?? R, s = h.get(e);
+    s && clearTimeout(s), h.set(
       e,
       setTimeout(() => {
-        o.delete(e), f.delete(e), c.delete(e);
-      }, s)
+        n.delete(e), h.delete(e), l.delete(e);
+      }, o)
     );
   }
-  const h = {
-    emit: p,
-    close: g,
+  const p = {
+    emit: _,
+    close: C,
     __isVeloEventStream: !0,
     __config: t,
     __listeners: a,
-    __buffers: o,
+    __buffers: n,
     __path: t.path,
-    __onConnect(e, n) {
-      let s = a.get(e);
-      const r = !s || s.size === 0;
-      s || (s = /* @__PURE__ */ new Set(), a.set(e, s)), s.add(n), w++, b(), r && u(e);
+    __onConnect(e, r) {
+      let o = a.get(e);
+      const s = !o || o.size === 0;
+      o || (o = /* @__PURE__ */ new Set(), a.set(e, o)), o.add(r), w++, b(), s && d(e);
     },
-    __onDisconnect(e, n) {
-      const s = a.get(e);
-      s && (s.delete(n), s.size === 0 && (a.delete(e), d(e)), w--, m());
+    __onDisconnect(e, r) {
+      const o = a.get(e);
+      o && (o.delete(r), o.size === 0 && (a.delete(e), S(e)), w--, g());
     },
     __reset() {
       for (const e of a.values())
-        for (const n of e)
+        for (const r of e)
           try {
-            n.close();
+            r.close();
           } catch {
           }
-      a.clear(), o.clear(), c.clear();
-      for (const e of f.values()) clearTimeout(e);
-      f.clear(), l && (l.abort(), l = null);
+      a.clear(), n.clear(), l.clear();
+      for (const e of h.values()) clearTimeout(e);
+      h.clear(), c && (c.abort(), c = null);
       for (const e of i.values()) e.abort();
       i.clear(), w = 0;
     }
   };
   return t.path && A().pendingStreamRoutes.push((e) => {
-    D(e, t.path, h, t.middlewares ?? []);
-  }), I.add(h), h;
+    P(e, t.path, p, t.middlewares ?? []);
+  }), I.add(p), p;
 }
 function B(t) {
-  return async (a, { abortSignal: o }) => {
-    for (; !o.aborted; ) {
+  return async (a, { abortSignal: n }) => {
+    for (; !n.aborted; ) {
       try {
         await t.tick(a);
-      } catch (c) {
-        console.error("[velojs] poll tick threw:", c);
+      } catch (l) {
+        console.error("[velojs] poll tick threw:", l);
       }
-      await new Promise((c) => {
-        const f = setTimeout(c, t.intervalMs);
-        o.addEventListener(
+      await new Promise((l) => {
+        const h = setTimeout(l, t.intervalMs);
+        n.addEventListener(
           "abort",
           () => {
-            clearTimeout(f), c();
+            clearTimeout(h), l();
           },
           { once: !0 }
         );
@@ -133,67 +133,69 @@ function B(t) {
   };
 }
 function j(t) {
-  return t.req.query("channel") ?? v;
+  return t.req.query("channel") ?? m;
 }
-function D(t, a, o, c = []) {
-  const f = async (l) => {
+function P(t, a, n, l = []) {
+  const h = async (c) => {
     const { streamSSE: w } = await import("hono/streaming");
     let i;
-    if (o.__config.broadcast)
-      i = v;
+    if (n.__config.broadcast)
+      i = m;
     else {
-      const u = o.__config.channel ?? j;
-      let d;
+      const d = n.__config.channel ?? j;
+      let S;
       try {
-        d = await u(l);
-      } catch (p) {
-        return console.error("[velojs] channel resolver threw:", p), l.json({ error: "internal" }, 500);
+        S = await d(c);
+      } catch (_) {
+        return console.error("[velojs] channel resolver threw:", _), c.json({ error: "internal" }, 500);
       }
-      if (d == null)
-        return l.json({ error: "forbidden" }, 403);
-      i = d;
+      if (S == null)
+        return c.json({ error: "forbidden" }, 403);
+      i = S;
     }
-    const b = o.__config.heartbeatMs, m = b === !1 ? 0 : b ?? M;
-    return w(l, async (u) => {
-      const d = o.__buffers.get(i);
-      if (d && d.length > 0 && await u.writeSSE({
+    const b = n.__config.heartbeatMs, g = b === !1 ? 0 : b ?? M;
+    return w(c, async (d) => {
+      const S = n.__buffers.get(i);
+      if (S && S.length > 0 && await d.writeSSE({
         event: "snapshot",
-        data: JSON.stringify(d)
-      }), o.__config.snapshot) {
-        const r = await o.__config.snapshot(
-          i === v ? void 0 : i
+        data: JSON.stringify(S)
+      }), n.__config.snapshot) {
+        const u = await n.__config.snapshot(
+          i === m ? void 0 : i
         );
-        r !== void 0 && await u.writeSSE({
+        u !== void 0 && await d.writeSSE({
           event: "snapshot",
-          data: JSON.stringify(r)
+          data: JSON.stringify(u)
         });
       }
-      let p;
-      const g = new Promise((r) => {
-        p = r;
+      let _;
+      const C = new Promise((u) => {
+        _ = u;
       });
-      let h = !1, e = null;
-      const n = () => {
-        h || (h = !0, e && clearInterval(e), o.__onDisconnect(i, s), p());
-      }, s = ((r) => {
-        h || (u.writeSSE({ data: JSON.stringify(r) }).catch(() => {
-        }), o.__config.closeOn?.(r) && (u.close(), n()));
+      let p = !1, e = null, r = Promise.resolve();
+      const o = (u) => (r = r.then(() => d.writeSSE(u)).catch(() => {
+      }), r), s = () => {
+        p || (p = !0, e && clearInterval(e), n.__onDisconnect(i, f), _());
+      }, f = ((u) => {
+        p || (o({ data: JSON.stringify(u) }), n.__config.closeOn?.(u) && r.then(() => {
+          d.close(), s();
+        }));
       });
-      s.close = () => {
-        h || (u.writeSSE({ event: "close", data: "" }).catch(() => {
-        }), u.close(), n());
-      }, o.__onConnect(i, s), e = m > 0 ? setInterval(() => {
-        h || u.writeSSE({ event: "heartbeat", data: "" }).catch(() => {
-        });
-      }, m) : null, u.onAbort(n), await g;
+      f.close = () => {
+        p || (o({ event: "close", data: "" }), r.then(() => {
+          d.close(), s();
+        }));
+      }, n.__onConnect(i, f), e = g > 0 ? setInterval(() => {
+        p || o({ event: "heartbeat", data: "" });
+      }, g) : null, d.onAbort(s), await C;
     });
   };
-  c.length > 0 ? t.on(["GET"], [a], ...c, f) : t.on(["GET"], [a], f);
+  l.length > 0 ? t.on(["GET"], [a], ...l, h) : t.on(["GET"], [a], h);
 }
 export {
   L as createEventStream,
   x as flushPendingStreamRoutes,
   y as getRegisteredStreams,
   B as poll,
-  D as registerStreamHandler
+  P as registerStreamHandler
 };

package/dist/server.js

@@ -1,201 +1,200 @@
-import { jsx as _ } from "preact/jsx-runtime";
+import { jsx as p } from "preact/jsx-runtime";
 import { Hono as b } from "hono";
 import { logger as q } from "hono/logger";
 import { trimTrailingSlash as T } from "hono/trailing-slash";
 import { render as A } from "preact-render-to-string";
 import { Router as R } from "wouter-preact";
 import { AsyncLocalStorage as C } from "node:async_hooks";
-import { getAppContext as v } from "./app-context.js";
-const y = new C();
-globalThis.__veloServerData = y;
-let g = null;
-function G(t) {
-  if (g) {
-    t(g);
+import { getAppContext as g } from "./app-context.js";
+import { flushPendingStreamRoutes as D, registerStreamHandler as I } from "./events.js";
+const v = new C();
+globalThis.__veloServerData = v;
+let _ = null;
+function W(e) {
+  if (_) {
+    e(_);
     return;
   }
-  v().serverCallbacks.push(t);
+  g().serverCallbacks.push(e);
 }
-function w(t) {
-  g = t;
-  const e = v();
-  for (const n of e.serverCallbacks) n(t);
-  e.serverCallbacks.length = 0;
+function y(e) {
+  _ = e;
+  const t = g();
+  for (const s of t.serverCallbacks) s(e);
+  t.serverCallbacks.length = 0;
 }
-function L(t) {
-  v().pendingRoutes.push(t);
+function J(e) {
+  g().pendingRoutes.push(e);
 }
-const D = (t, e, n) => {
-  if (t.req.query("_data") === "1") {
-    const c = globalThis.__veloBuildHash || void 0, o = n ? { ...n, __buildHash: c } : { __buildHash: c };
-    return t.json(o);
+const N = (e, t, s) => {
+  if (e.req.query("_data") === "1") {
+    const a = globalThis.__veloBuildHash || void 0, r = s ? { ...s, __buildHash: a } : { __buildHash: a };
+    return e.json(r);
   }
-  const s = t.req.path, r = y.run(
-    n ?? {},
-    () => A(/* @__PURE__ */ _(R, { ssrPath: s, children: e }))
+  const n = e.req.path, o = v.run(
+    s ?? {},
+    () => A(/* @__PURE__ */ p(R, { ssrPath: n, children: t }))
   );
-  if (t.header("Cache-Control", "no-cache"), !n)
-    return t.html(r);
-  const a = `<script>window.__PAGE_DATA__=${JSON.stringify(
-    n
+  if (e.header("Cache-Control", "no-cache"), !s)
+    return e.html(o);
+  const c = `<script>window.__PAGE_DATA__=${JSON.stringify(
+    s
   )}<\/script>`;
-  return t.html(r.replace("</head>", `${a}</head>`));
-}, I = async (t, e) => {
-  const n = e.req.param(), s = e.req.query(), r = { params: n, query: s, c: e }, a = await Promise.all(
-    t.map(async (o) => {
-      if (!o.loader) return null;
-      const l = await o.loader(r), i = o.metadata?.moduleId;
-      return i ? { moduleId: i, loaderData: l } : null;
+  return e.html(o.replace("</head>", `${c}</head>`));
+}, O = async (e, t) => {
+  const s = t.req.param(), n = t.req.query(), o = { params: s, query: n, c: t }, c = await Promise.all(
+    e.map(async (r) => {
+      if (!r.loader) return null;
+      const d = await r.loader(o), i = r.metadata?.moduleId;
+      return i ? { moduleId: i, loaderData: d } : null;
     })
-  ), c = {
-    __params: n,
-    __query: s,
-    __pathname: e.req.path
+  ), a = {
+    __params: s,
+    __query: n,
+    __pathname: t.req.path
   };
-  for (const o of a)
-    o && (c[o.moduleId] = o.loaderData);
+  for (const r of c)
+    r && (a[r.moduleId] = r.loaderData);
   return {
-    components: t.map((o) => o.Component),
-    data: c
+    components: e.map((r) => r.Component),
+    data: a
   };
-}, N = (t) => {
-  if (t.length === 0) return null;
-  const e = t.filter(Boolean);
+}, j = (e) => {
   if (e.length === 0) return null;
-  if (e.length === 1) {
-    const r = e[0];
-    return /* @__PURE__ */ _(r, {});
+  const t = e.filter(Boolean);
+  if (t.length === 0) return null;
+  if (t.length === 1) {
+    const o = t[0];
+    return /* @__PURE__ */ p(o, {});
   }
-  const n = e[e.length - 1];
-  return e.slice(0, -1).reduceRight((r, a) => /* @__PURE__ */ _(a, { children: r }), /* @__PURE__ */ _(n, {}));
-}, S = (t, e, n = [], s = []) => {
-  for (const r of e) {
-    const a = [...n, r.module], c = [
-      ...s,
-      ...r.middlewares || []
+  const s = t[t.length - 1];
+  return t.slice(0, -1).reduceRight((o, c) => /* @__PURE__ */ p(c, { children: o }), /* @__PURE__ */ p(s, {}));
+}, w = (e, t, s = [], n = []) => {
+  for (const o of t) {
+    const c = [...s, o.module], a = [
+      ...n,
+      ...o.middlewares || []
     ];
-    if (r.children)
-      S(
-        t,
-        r.children,
-        a,
-        c
+    if (o.children)
+      w(
+        e,
+        o.children,
+        c,
+        a
       );
     else {
-      const o = r.module.metadata?.fullPath;
-      if (!o) {
+      const r = o.module.metadata?.fullPath;
+      if (!r) {
         console.warn(
-          `Module ${r.module.metadata?.moduleId} has no fullPath`
+          `Module ${o.module.metadata?.moduleId} has no fullPath`
         );
         continue;
       }
-      const l = async (i) => {
-        const { components: m, data: u } = await I(a, i), d = N(m);
-        return D(i, d, u);
+      const d = async (i) => {
+        const { components: u, data: m } = await O(c, i), l = j(u);
+        return N(i, l, m);
       };
-      c.length > 0 ? t.on(["GET"], [o], ...c, l) : t.on(["GET"], [o], l);
+      a.length > 0 ? e.on(["GET"], [r], ...a, d) : e.on(["GET"], [r], d);
     }
   }
-}, P = (t, e, n = []) => {
-  for (const s of e) {
-    const r = s.module.metadata?.moduleId, a = [
-      ...n,
-      ...s.middlewares || []
+}, S = (e, t, s = []) => {
+  for (const n of t) {
+    const o = n.module.metadata?.moduleId, c = [
+      ...s,
+      ...n.middlewares || []
     ];
-    if (r) {
-      const c = Object.keys(s.module).filter(
-        (o) => o.startsWith("action_")
+    if (o) {
+      const a = Object.keys(n.module).filter(
+        (r) => r.startsWith("action_")
       );
-      for (const o of c) {
-        const l = o.replace("action_", ""), i = s.module[o];
+      for (const r of a) {
+        const d = r.replace("action_", ""), i = n.module[r];
         if (typeof i == "function") {
-          const m = `/_action/${r}/${l}`, u = async (d) => {
+          const u = `/_action/${o}/${d}`, m = async (l) => {
             let f = {};
             try {
-              f = await d.req.json();
+              f = await l.req.json();
             } catch {
             }
-            const h = {
+            const P = {
               body: f,
-              params: d.req.param(),
-              query: d.req.query(),
-              c: d
+              params: l.req.param(),
+              query: l.req.query(),
+              c: l
             };
             try {
-              const p = await i(h);
-              return d.json(p ?? { ok: !0 });
-            } catch (p) {
-              const E = p instanceof Error ? p.message : "Action failed";
-              return d.json({ error: E }, 500);
+              const h = await i(P);
+              return l.json(h ?? { ok: !0 });
+            } catch (h) {
+              const E = h instanceof Error ? h.message : "Action failed";
+              return l.json({ error: E }, 500);
             }
           };
-          a.length > 0 ? t.on(
+          c.length > 0 ? e.on(
             ["POST"],
-            [m],
-            ...a,
-            u
-          ) : t.on(["POST"], [m], u);
+            [u],
+            ...c,
+            m
+          ) : e.on(["POST"], [u], m);
         }
       }
     }
-    s.children && P(t, s.children, a);
+    n.children && S(e, n.children, c);
   }
-}, O = async (t, e, n = []) => {
-  const { registerStreamHandler: s } = await import("./events.js"), r = (a, c) => {
-    for (const o of a) {
-      const l = o.module.metadata?.moduleId, i = [
+}, $ = async (e, t, s = []) => {
+  const n = (o, c) => {
+    for (const a of o) {
+      const r = a.module.metadata?.moduleId, d = [
         ...c,
-        ...o.middlewares || []
+        ...a.middlewares || []
       ];
-      if (l) {
-        const m = Object.keys(o.module).filter(
+      if (r) {
+        const i = Object.keys(a.module).filter(
           (u) => u.startsWith("stream_")
         );
-        for (const u of m) {
-          const d = u.replace("stream_", ""), f = o.module[u];
-          if (f?.__isVeloEventStream) {
-            const h = `/_event/${l}/${d}`;
-            f.__path = h, s(
-              t,
-              h,
+        for (const u of i) {
+          const m = u.replace("stream_", ""), l = a.module[u];
+          if (l?.__isVeloEventStream) {
+            const f = `/_event/${r}/${m}`;
+            l.__path = f, I(
+              e,
               f,
-              i
+              l,
+              d
             );
           }
         }
       }
-      o.children && r(o.children, i);
+      a.children && n(a.children, d);
     }
   };
-  r(e, n);
-}, j = async (t) => {
-  const e = new b();
-  e.use(T()), process.env.NODE_ENV !== "production" && e.use("*", q());
-  const s = v().pendingRoutes.splice(0);
-  for (const a of s)
-    await a(e);
-  S(e, t), P(e, t), await O(e, t);
-  const { flushPendingStreamRoutes: r } = await import("./events.js");
-  if (r(e), process.env.NODE_ENV !== "production" && !g) {
-    const a = globalThis.__veloDevServer;
-    a && w(a);
+  n(t, s);
+}, k = async (e) => {
+  const t = new b();
+  t.use(T()), process.env.NODE_ENV !== "production" && t.use("*", q());
+  const n = g().pendingRoutes.splice(0);
+  for (const o of n)
+    await o(t);
+  if (w(t, e), S(t, e), await $(t, e), D(t), process.env.NODE_ENV !== "production" && !_) {
+    const o = globalThis.__veloDevServer;
+    o && y(o);
   }
-  return e;
-}, U = async (t) => {
-  const { routes: e, port: n = Number(process.env.SERVER_PORT) || 3e3 } = t, s = await j(e);
+  return t;
+}, z = async (e) => {
+  const { routes: t, port: s = Number(process.env.SERVER_PORT) || 3e3 } = e, n = await k(t);
   if (process.env.NODE_ENV === "production" && !process.env.VELO_STATIC) {
-    const { serve: r } = await import("@hono/node-server"), { serveStatic: a } = await import("@hono/node-server/serve-static"), { join: c } = await import("node:path"), o = c(process.cwd(), "dist/client");
-    (process.env.STATIC_BASE_URL || "").startsWith("http") || s.use("/*", a({ root: o })), console.log(`Server running on http://localhost:${n}`);
-    const i = r({ fetch: s.fetch, port: n });
-    w(i);
+    const { serve: o } = await import("@hono/node-server"), { serveStatic: c } = await import("@hono/node-server/serve-static"), { join: a } = await import("node:path"), r = a(process.cwd(), "dist/client");
+    (process.env.STATIC_BASE_URL || "").startsWith("http") || n.use("/*", c({ root: r })), console.log(`Server running on http://localhost:${s}`);
+    const i = o({ fetch: n.fetch, port: s });
+    y(i);
   }
-  return s;
+  return n;
 };
 export {
-  L as addRoutes,
-  j as createApp,
-  j as default,
-  G as onServer,
-  y as serverDataStorage,
-  U as startServer
+  J as addRoutes,
+  k as createApp,
+  k as default,
+  W as onServer,
+  v as serverDataStorage,
+  z as startServer
 };

package/package.json

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