@mauroandre/velojs 0.0.25 → 0.0.27

package/dist/hooks.js

@@ -1,116 +1,176 @@
-import { signal as v, useSignal as c } from "@preact/signals";
-import { useEffect as h, useRef as p } from "preact/hooks";
-import { useLocation as w, useParams as g } from "wouter-preact";
-const S = v(!1);
-function L(e) {
+import { signal as g, useSignal as h } from "@preact/signals";
+import { useEffect as D, useRef as E } from "preact/hooks";
+import { useLocation as L, useParams as A } from "wouter-preact";
+const b = g(!1);
+function O(e) {
   e.value !== null && typeof e.value == "object" && (e.value = { ...e.value });
 }
-function m(e) {
-  const o = v(!1);
+function C(e) {
+  const c = g(!1);
   if (typeof window > "u")
     return { data: {
       get value() {
         return e ? globalThis.__veloServerData?.getStore?.()?.[e] ?? null : null;
       }
-    }, loading: o };
+    }, loading: c };
   const t = window.__PAGE_DATA__, r = e && t?.[e] ? t[e] : null;
-  return { data: v(r), loading: o };
+  return { data: g(r), loading: c };
 }
-function A(e, o) {
+function U(e, c) {
   let t, r;
-  Array.isArray(e) ? r = e : (t = e, r = o);
-  let n = null;
+  Array.isArray(e) ? r = e : (t = e, r = c);
+  let a = null;
   if (typeof window > "u" && t) {
-    const i = globalThis.__veloServerData?.getStore?.();
-    i?.[t] && (n = i[t]);
+    const _ = globalThis.__veloServerData?.getStore?.();
+    _?.[t] && (a = _[t]);
   }
   if (typeof window < "u" && t) {
-    const a = window.__PAGE_DATA__;
-    a?.[t] && (n = a[t], delete a[t]);
+    const n = window.__PAGE_DATA__;
+    n?.[t] && (a = n[t], delete n[t]);
   }
-  const u = c(n), s = c(!1), _ = () => {
+  const o = h(a), s = h(!1), f = () => {
     if (typeof window > "u" || !t) return;
-    const a = window.location.pathname;
+    const n = window.location.pathname;
     s.value = !0;
-    const f = typeof __VELO_STATIC__ < "u" && __VELO_STATIC__ ? `${a === "/" ? "" : a}/index.json` : (() => {
+    const p = typeof __VELO_STATIC__ < "u" && __VELO_STATIC__ ? `${n === "/" ? "" : n}/index.json` : (() => {
       const l = new URLSearchParams(window.location.search);
-      return l.set("_data", "1"), `${a}?${l.toString()}`;
+      return l.set("_data", "1"), `${n}?${l.toString()}`;
     })();
-    fetch(f, { cache: "no-cache" }).then((l) => l.json()).then((l) => {
-      typeof __VELO_BUILD_HASH__ < "u" && l.__buildHash && l.__buildHash !== __VELO_BUILD_HASH__ && (S.value = !0), u.value = l[t], s.value = !1;
+    fetch(p, { cache: "no-cache" }).then((l) => l.json()).then((l) => {
+      typeof __VELO_BUILD_HASH__ < "u" && l.__buildHash && l.__buildHash !== __VELO_BUILD_HASH__ && (b.value = !0), o.value = l[t], s.value = !1;
     }).catch(() => {
       s.value = !1;
     });
-  }, d = p(n !== null);
-  return h(() => {
-    if (d.current) {
-      d.current = !1;
+  }, y = E(a !== null);
+  return D(() => {
+    if (y.current) {
+      y.current = !1;
       return;
     }
-    _();
-  }, r ?? []), { data: u, loading: s, refetch: _ };
+    f();
+  }, r ?? []), { data: o, loading: s, refetch: f };
 }
-function P() {
-  const [, e] = w();
+function k() {
+  const [, e] = L();
   return e;
 }
-function T() {
-  return typeof window > "u" ? globalThis.__veloServerData?.getStore?.()?.__params ?? {} : g();
+function H() {
+  return typeof window > "u" ? globalThis.__veloServerData?.getStore?.()?.__params ?? {} : A();
 }
-function b() {
+function R() {
   if (typeof window > "u")
     return globalThis.__veloServerData?.getStore?.()?.__query ?? {};
   const e = window.__PAGE_DATA__;
   if (e?.__query)
     return e.__query;
-  const o = new URLSearchParams(window.location.search), t = {};
-  return o.forEach((r, n) => {
-    t[n] = r;
+  const c = new URLSearchParams(window.location.search), t = {};
+  return c.forEach((r, a) => {
+    t[a] = r;
   }), t;
 }
-function H() {
-  return typeof window > "u" ? globalThis.__veloServerData?.getStore?.()?.__pathname ?? "/" : (w(), window.location.pathname);
+function G() {
+  return typeof window > "u" ? globalThis.__veloServerData?.getStore?.()?.__pathname ?? "/" : (L(), window.location.pathname);
 }
-function U(e, o = {}) {
-  const t = c(null), r = c(null), n = c(!1), u = c(null), { channel: s, enabled: _ = !0 } = o;
-  return h(() => {
-    if (typeof window > "u" || !_) return;
+function W(e, c = {}) {
+  const t = h(null), r = h(null), a = h(!1), o = h(null), { channel: s, enabled: f = !0 } = c;
+  return D(() => {
+    if (typeof window > "u" || !f) return;
     if (!e.__path) {
       console.warn("[velojs] useEventStream: stream has no __path");
       return;
     }
-    t.value = null, r.value = null, n.value = !1, u.value = null;
-    const d = s ? `${e.__path}?channel=${encodeURIComponent(s)}` : e.__path, a = new EventSource(d);
-    return a.addEventListener("snapshot", (i) => {
+    t.value = null, r.value = null, a.value = !1, o.value = null;
+    const y = s ? `${e.__path}?channel=${encodeURIComponent(s)}` : e.__path, n = new EventSource(y);
+    return n.addEventListener("snapshot", (_) => {
       try {
-        r.value = JSON.parse(i.data);
-      } catch (f) {
-        u.value = f;
+        r.value = JSON.parse(_.data);
+      } catch (p) {
+        o.value = p;
       }
-    }), a.addEventListener("message", (i) => {
+    }), n.addEventListener("message", (_) => {
       try {
-        t.value = JSON.parse(i.data);
-      } catch (f) {
-        u.value = f;
+        t.value = JSON.parse(_.data);
+      } catch (p) {
+        o.value = p;
       }
-    }), a.addEventListener("heartbeat", () => {
-    }), a.addEventListener("close", () => {
-      n.value = !0, a.close();
-    }), a.addEventListener("error", () => {
-      a.readyState === EventSource.CLOSED && (n.value = !0);
+    }), n.addEventListener("heartbeat", () => {
+    }), n.addEventListener("close", () => {
+      a.value = !0, n.close();
+    }), n.addEventListener("error", () => {
+      n.readyState === EventSource.CLOSED && (a.value = !0);
+    }), () => {
+      n.close();
+    };
+  }, [e, s, f]), { data: t, snapshot: r, closed: a, error: o };
+}
+function q(e, c = {}) {
+  const t = h("connecting"), r = h(null), a = h(null), o = E(null), s = E([]), { channel: f, onMessage: y, onOpen: n, onClose: _, onError: p, enabled: l = !0 } = c;
+  return D(() => {
+    if (typeof window > "u" || !l) return;
+    if (!e.__path) {
+      console.warn("[velojs] useSocket: stub has no __path");
+      return;
+    }
+    t.value = "connecting", r.value = null, a.value = null;
+    const v = `${window.location.protocol === "https:" ? "wss:" : "ws:"}//${window.location.host}`, i = f ? `${v}${e.__path}?channel=${encodeURIComponent(f)}` : `${v}${e.__path}`, d = new WebSocket(i);
+    return d.binaryType = "arraybuffer", o.current = d, d.addEventListener("open", () => {
+      t.value = "open";
+      const u = s.current;
+      s.current = [];
+      for (const S of u)
+        try {
+          d.send(S);
+        } catch {
+        }
+      n?.();
+    }), d.addEventListener("message", (u) => {
+      let S;
+      if (typeof u.data == "string")
+        S = u.data;
+      else if (u.data instanceof ArrayBuffer)
+        S = new Uint8Array(u.data);
+      else
+        return;
+      r.value = S, y?.(S);
+    }), d.addEventListener("close", (u) => {
+      t.value = "closed", o.current = null, _?.(u);
+    }), d.addEventListener("error", (u) => {
+      a.value = u, p?.(u);
     }), () => {
-      a.close();
+      o.current = null;
+      try {
+        (d.readyState === WebSocket.OPEN || d.readyState === WebSocket.CONNECTING) && d.close();
+      } catch {
+      }
     };
-  }, [e, s, _]), { data: t, snapshot: r, closed: n, error: u };
+  }, [e.__path, f, l]), { send: (w) => {
+    let v;
+    typeof w == "string" || w instanceof Uint8Array ? v = w : v = JSON.stringify(w);
+    const i = o.current;
+    if (i && i.readyState === WebSocket.OPEN)
+      try {
+        i.send(v);
+      } catch {
+      }
+    else i && i.readyState === WebSocket.CONNECTING && s.current.push(v);
+  }, close: (w, v) => {
+    const i = o.current;
+    if (i)
+      try {
+        i.close(w, v);
+      } catch {
+      }
+  }, status: t, lastMessage: r, error: a };
 }
 export {
-  m as Loader,
-  S as __veloUpdatePending,
-  L as touch,
-  U as useEventStream,
-  A as useLoader,
-  P as useNavigate,
-  T as useParams,
-  H as usePathname,
-  b as useQuery
+  C as Loader,
+  b as __veloUpdatePending,
+  O as touch,
+  W as useEventStream,
+  U as useLoader,
+  k as useNavigate,
+  H as useParams,
+  G as usePathname,
+  R as useQuery,
+  q as useSocket
 };

package/dist/index.d.ts

@@ -1,7 +1,8 @@
-export type { AppRoutes, RouteNode, RouteModule, LoaderArgs, ActionArgs, Metadata, } from "./types.js";
+export type { AppRoutes, RouteNode, RouteModule, LoaderArgs, ActionArgs, Metadata, HTTPMethod, EndpointHandler, EndpointHandlerArgs, } from "./types.js";
 export type { VeloConfig } from "./config.js";
 export { defineConfig } from "./config.js";
 export { Scripts, Link } from "./components.js";
 export { createEventStream, poll } from "./events.js";
-export type { EventStream, EventStreamConfig, EmitFn, EmitOptions, SourceFn, PerChannelSourceFn, ChannelResolver, } from "./events.js";
+export type { EventStream, EventStreamConfig, EmitFn, EmitOptions, SourceFn, PerChannelSourceFn, StreamPipeFn, StreamPipeArgs, ChannelResolver, } from "./events.js";
+export type { SocketHandler, SocketHandlerArgs, SocketStub, } from "./sockets.js";
 export type { Context, MiddlewareHandler, Next } from "hono";

package/dist/server.js

@@ -1,200 +1,258 @@
-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 { jsx as g } from "preact/jsx-runtime";
+import { Hono as q } 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";
+import { Router as A } from "wouter-preact";
 import { AsyncLocalStorage as C } from "node:async_hooks";
-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(_);
+import { getAppContext as v } from "./app-context.js";
+import { flushPendingStreamRoutes as $, registerStreamHandler as D } from "./events.js";
+import { registerSocketRoutes as I, injectWebSocketServer as y } from "./sockets.js";
+const S = new C();
+globalThis.__veloServerData = S;
+let w = null;
+function Y(e) {
+  if (w) {
+    e(w);
     return;
   }
-  g().serverCallbacks.push(e);
+  v().serverCallbacks.push(e);
 }
-function y(e) {
-  _ = e;
-  const t = g();
+function P(e) {
+  w = e;
+  const t = v();
   for (const s of t.serverCallbacks) s(e);
   t.serverCallbacks.length = 0;
 }
-function J(e) {
-  g().pendingRoutes.push(e);
+function Z(e) {
+  v().pendingRoutes.push(e);
 }
 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 r = globalThis.__veloBuildHash || void 0, i = s ? { ...s, __buildHash: r } : { __buildHash: r };
+    return e.json(i);
   }
-  const n = e.req.path, o = v.run(
+  const a = e.req.path, o = S.run(
     s ?? {},
-    () => A(/* @__PURE__ */ p(R, { ssrPath: n, children: t }))
+    () => k(/* @__PURE__ */ g(A, { ssrPath: a, children: t }))
   );
   if (e.header("Cache-Control", "no-cache"), !s)
     return e.html(o);
-  const c = `<script>window.__PAGE_DATA__=${JSON.stringify(
+  const n = `<script>window.__PAGE_DATA__=${JSON.stringify(
     s
   )}<\/script>`;
-  return e.html(o.replace("</head>", `${c}</head>`));
+  return e.html(o.replace("</head>", `${n}</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;
+  const s = t.req.param(), a = t.req.query(), o = { params: s, query: a, c: t }, n = await Promise.all(
+    e.map(async (i) => {
+      if (!i.loader) return null;
+      const l = await i.loader(o), c = i.metadata?.moduleId;
+      return c ? { moduleId: c, loaderData: l } : null;
     })
-  ), a = {
+  ), r = {
     __params: s,
-    __query: n,
+    __query: a,
     __pathname: t.req.path
   };
-  for (const r of c)
-    r && (a[r.moduleId] = r.loaderData);
+  for (const i of n)
+    i && (r[i.moduleId] = i.loaderData);
   return {
-    components: e.map((r) => r.Component),
-    data: a
+    components: e.map((i) => i.Component),
+    data: r
   };
-}, j = (e) => {
+}, G = (e) => {
   if (e.length === 0) return null;
   const t = e.filter(Boolean);
   if (t.length === 0) return null;
   if (t.length === 1) {
     const o = t[0];
-    return /* @__PURE__ */ p(o, {});
+    return /* @__PURE__ */ g(o, {});
   }
   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 = []) => {
+  return t.slice(0, -1).reduceRight((o, n) => /* @__PURE__ */ g(n, { children: o }), /* @__PURE__ */ g(s, {}));
+}, _ = (e, t, s = [], a = []) => {
   for (const o of t) {
-    const c = [...s, o.module], a = [
-      ...n,
+    if (o.handler && !o.module) {
+      o.children && _(
+        e,
+        o.children,
+        s,
+        [...a, ...o.middlewares || []]
+      );
+      continue;
+    }
+    const n = o.module ? [...s, o.module] : s, r = [
+      ...a,
       ...o.middlewares || []
     ];
     if (o.children)
-      w(
+      _(
         e,
         o.children,
-        c,
-        a
+        n,
+        r
       );
-    else {
-      const r = o.module.metadata?.fullPath;
-      if (!r) {
+    else if (o.module) {
+      const i = o.module.metadata?.fullPath;
+      if (!i) {
         console.warn(
           `Module ${o.module.metadata?.moduleId} has no fullPath`
         );
         continue;
       }
-      const d = async (i) => {
-        const { components: u, data: m } = await O(c, i), l = j(u);
-        return N(i, l, m);
+      const l = async (c) => {
+        const { components: u, data: h } = await O(n, c), d = G(u);
+        return N(c, d, h);
       };
-      a.length > 0 ? e.on(["GET"], [r], ...a, d) : e.on(["GET"], [r], d);
-    }
+      r.length > 0 ? e.on(["GET"], [i], ...r, l) : e.on(["GET"], [i], l);
+    } else
+      continue;
   }
-}, S = (e, t, s = []) => {
-  for (const n of t) {
-    const o = n.module.metadata?.moduleId, c = [
+}, E = (e, t, s = []) => {
+  for (const a of t) {
+    const o = a.module?.metadata?.moduleId, n = [
       ...s,
-      ...n.middlewares || []
+      ...a.middlewares || []
     ];
-    if (o) {
-      const a = Object.keys(n.module).filter(
-        (r) => r.startsWith("action_")
+    if (a.module && o) {
+      const r = Object.keys(a.module).filter(
+        (i) => i.startsWith("action_")
       );
-      for (const r of a) {
-        const d = r.replace("action_", ""), i = n.module[r];
-        if (typeof i == "function") {
-          const u = `/_action/${o}/${d}`, m = async (l) => {
-            let f = {};
+      for (const i of r) {
+        const l = i.replace("action_", ""), c = a.module[i];
+        if (typeof c == "function") {
+          const u = `/_action/${o}/${l}`, h = async (d) => {
+            let m = {};
             try {
-              f = await l.req.json();
+              m = await d.req.json();
             } catch {
             }
-            const P = {
-              body: f,
-              params: l.req.param(),
-              query: l.req.query(),
-              c: l
+            const f = {
+              body: m,
+              params: d.req.param(),
+              query: d.req.query(),
+              c: d
             };
             try {
-              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);
+              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);
             }
           };
-          c.length > 0 ? e.on(
+          n.length > 0 ? e.on(
             ["POST"],
             [u],
-            ...c,
-            m
-          ) : e.on(["POST"], [u], m);
+            ...n,
+            h
+          ) : e.on(["POST"], [u], h);
         }
       }
     }
-    n.children && S(e, n.children, c);
+    a.children && E(e, a.children, n);
   }
-}, $ = async (e, t, s = []) => {
-  const n = (o, c) => {
-    for (const a of o) {
-      const r = a.module.metadata?.moduleId, d = [
-        ...c,
-        ...a.middlewares || []
+}, H = async (e, t, s = []) => {
+  const a = (o, n) => {
+    for (const r of o) {
+      const i = r.module?.metadata?.moduleId, l = [
+        ...n,
+        ...r.middlewares || []
       ];
-      if (r) {
-        const i = Object.keys(a.module).filter(
+      if (r.module && i) {
+        const c = Object.keys(r.module).filter(
           (u) => u.startsWith("stream_")
         );
-        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(
+        for (const u of c) {
+          const h = u.replace("stream_", ""), d = r.module[u];
+          if (d?.__isVeloEventStream) {
+            const m = `/_event/${i}/${h}`;
+            d.__path = m, D(
               e,
-              f,
-              l,
-              d
+              m,
+              d,
+              l
             );
           }
         }
       }
-      a.children && n(a.children, d);
+      r.children && a(r.children, l);
     }
   };
-  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);
+  a(t, s);
+}, x = (e, t) => t ? t.startsWith("/") ? e + t : e ? e + "/" + t : "/" + t : e || "", V = (e) => {
+  const t = /* @__PURE__ */ new Set(), s = (a) => {
+    for (const o of a) {
+      if (o.module && !o.children) {
+        const n = o.module.metadata?.fullPath;
+        n && t.add(n);
+      }
+      o.children && s(o.children);
+    }
+  };
+  return s(e), t;
+}, R = (e, t, s, a = "", o = []) => {
+  for (const n of t) {
+    const r = x(a, n.path), i = [
+      ...o,
+      ...n.middlewares || []
+    ], l = !!n.handler, c = !!n.method;
+    if (l && !c ? console.warn(
+      `[velojs] invalid route at "${r || "/"}" — "handler" set without "method"; endpoint skipped`
+    ) : c && !l ? console.warn(
+      `[velojs] invalid route at "${r || "/"}" — "method" set without "handler"; endpoint skipped`
+    ) : l && n.module ? console.warn(
+      `[velojs] ambiguous route at "${r || "/"}" — both "module" and "handler" set; endpoint ignored, page kept`
+    ) : l && n.isRoot && console.warn(
+      `[velojs] "isRoot" has no effect on endpoint at "${r || "/"}"; ignored`
+    ), l && c && !n.module) {
+      const h = n.method;
+      h === "GET" && s.has(r) && console.warn(
+        `[velojs] path "${r}" has both a page GET and an endpoint GET; endpoint will win. Consider renaming one.`
+      );
+      const d = n.handler, m = async (f) => await d({
+        c: f,
+        params: f.req.param(),
+        query: f.req.query()
+      });
+      i.length > 0 ? e.on([h], [r], ...i, m) : e.on([h], [r], m);
+    }
+    n.children && R(
+      e,
+      n.children,
+      s,
+      r,
+      i
+    );
+  }
+}, W = async (e) => {
+  const t = new q();
+  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);
+  const o = V(e);
+  if (R(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;
-}, z = async (e) => {
-  const { routes: t, port: s = Number(process.env.SERVER_PORT) || 3e3 } = e, n = await k(t);
+}, ee = async (e) => {
+  const { routes: t, port: s = Number(process.env.SERVER_PORT) || 3e3 } = e, a = await W(t);
   if (process.env.NODE_ENV === "production" && !process.env.VELO_STATIC) {
-    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);
+    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}`);
+    const c = o({ fetch: a.fetch, port: s });
+    await y(a, c), P(c);
   }
-  return n;
+  return a;
 };
 export {
-  J as addRoutes,
-  k as createApp,
-  k as default,
-  W as onServer,
-  v as serverDataStorage,
-  z as startServer
+  Z as addRoutes,
+  W as createApp,
+  W as default,
+  Y as onServer,
+  S as serverDataStorage,
+  ee as startServer
 };