@mauroandre/velojs 0.0.50 → 0.0.52

package/dist/server.js

@@ -1,94 +1,94 @@
-import { jsx as _ } from "preact/jsx-runtime";
-import { Hono as j } from "hono";
-import { logger as E } from "hono/logger";
-import { trimTrailingSlash as T } from "hono/trailing-slash";
+import { jsx as v } from "preact/jsx-runtime";
+import { Hono as R } from "hono";
+import { logger as T } from "hono/logger";
+import { trimTrailingSlash as E } from "hono/trailing-slash";
 import { render as C } from "preact-render-to-string";
-import { Router as k } from "wouter-preact";
-import { AsyncLocalStorage as A } from "node:async_hooks";
-import { getAppContext as w } from "./app-context.js";
-import { flushPendingStreamRoutes as D, registerStreamHandler as $ } from "./events.js";
-import { registerSocketRoutes as I, injectWebSocketServer as S } from "./sockets.js";
-const P = new A();
+import { Router as $ } from "wouter-preact";
+import { AsyncLocalStorage as k } from "node:async_hooks";
+import { getAppContext as _ } from "./app-context.js";
+import { flushPendingStreamRoutes as A, registerStreamHandler as D } from "./events.js";
+import { registerSocketRoutes as O, injectWebSocketServer as S } from "./sockets.js";
+const P = new k();
 globalThis.__veloServerData = P;
-let v = null;
+let g = null;
 function Z(e) {
-  if (v) {
-    e(v);
+  if (g) {
+    e(g);
     return;
   }
-  w().serverCallbacks.push(e);
+  _().serverCallbacks.push(e);
 }
 function b(e) {
-  v = e;
-  const t = w();
+  g = e;
+  const t = _();
   for (const s of t.serverCallbacks) s(e);
   t.serverCallbacks.length = 0;
 }
 function ee(e) {
-  w().pendingRoutes.push(e);
+  _().pendingRoutes.push(e);
 }
-const N = (e) => JSON.stringify(e).replace(/</g, "\\u003c").replace(/>/g, "\\u003e").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029"), O = (e, t, s, r) => {
-  if (r && r !== 200 && e.status(r), e.req.query("_data") === "1") {
-    const c = globalThis.__veloBuildHash || void 0, i = s ? { ...s, __buildHash: c } : { __buildHash: c };
-    return e.json(i);
+const I = (e) => JSON.stringify(e).replace(/</g, "\\u003c").replace(/>/g, "\\u003e").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029"), N = (e, t, s, a) => {
+  if (a && a !== 200 && e.status(a), e.req.query("_data") === "1") {
+    const c = globalThis.__veloBuildHash || void 0, r = s ? { ...s, __buildHash: c } : { __buildHash: c };
+    return e.json(r);
   }
   const o = e.req.path, n = P.run(
     s ?? {},
-    () => C(/* @__PURE__ */ _(k, { ssrPath: o, children: t }))
+    () => C(/* @__PURE__ */ v($, { ssrPath: o, children: t }))
   );
   if (e.header("Cache-Control", "no-cache"), !s)
     return e.html(n);
-  const a = `<script>window.__PAGE_DATA__=${N(s)}<\/script>`;
-  return e.html(n.replace("</head>", () => `${a}</head>`));
-}, G = async (e, t) => {
-  const s = t.req.param(), r = t.req.query(), o = { params: s, query: r, c: t }, n = await Promise.all(
-    e.map(async (i) => {
-      if (!i.loader) return null;
-      const l = await i.loader(o), d = i.metadata?.moduleId;
-      return d ? { moduleId: d, loaderData: l } : null;
+  const i = `<script>window.__PAGE_DATA__=${I(s)}<\/script>`;
+  return e.html(n.replace("</head>", () => `${i}</head>`));
+}, H = async (e, t) => {
+  const s = t.req.param(), a = t.req.query(), o = { params: s, query: a, c: t }, n = await Promise.all(
+    e.map(async (r) => {
+      if (!r.loader) return null;
+      const f = await r.loader(o), l = r.metadata?.moduleId;
+      return l ? { moduleId: l, loaderData: f } : null;
     })
   );
-  let a;
-  for (const i of n)
-    if (i && i.loaderData instanceof Response) {
-      a = i.loaderData;
+  let i;
+  for (const r of n)
+    if (r && r.loaderData instanceof Response) {
+      i = r.loaderData;
       break;
     }
   const c = {
     __params: s,
-    __query: r,
+    __query: a,
     __pathname: t.req.path
   };
-  for (const i of n)
-    i && !(i.loaderData instanceof Response) && (c[i.moduleId] = i.loaderData);
+  for (const r of n)
+    r && !(r.loaderData instanceof Response) && (c[r.moduleId] = r.loaderData);
   return {
-    components: e.map((i) => i.Component),
+    components: e.map((r) => r.Component),
     data: c,
-    shortCircuit: a
+    shortCircuit: i
   };
-}, H = (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__ */ _(o, {});
+    return /* @__PURE__ */ v(o, {});
   }
   const s = t[t.length - 1];
-  return t.slice(0, -1).reduceRight((o, n) => /* @__PURE__ */ _(n, { children: o }), /* @__PURE__ */ _(s, {}));
-}, y = (e, t, s = [], r = []) => {
+  return t.slice(0, -1).reduceRight((o, n) => /* @__PURE__ */ v(n, { children: o }), /* @__PURE__ */ v(s, {}));
+}, y = (e, t, s = [], a = []) => {
   for (const o of t) {
     if (o.handler && !o.module) {
       o.children && y(
         e,
         o.children,
         s,
-        [...r, ...o.middlewares || []]
+        [...a, ...o.middlewares || []]
       );
       continue;
     }
-    const n = o.module ? [...s, o.module] : s, a = [
-      ...r,
+    const n = o.module ? [...s, o.module] : s, i = [
+      ...a,
       ...o.middlewares || []
     ];
     if (o.children)
@@ -96,104 +96,104 @@ const N = (e) => JSON.stringify(e).replace(/</g, "\\u003c").replace(/>/g, "\\u00
         e,
         o.children,
         n,
-        a
+        i
       );
     else if (o.module) {
-      const c = o.path === "*", i = o.statusCode ?? (c ? 404 : void 0), l = o.module.metadata?.fullPath;
-      if (!l && !c) {
+      const c = o.path === "*", r = o.statusCode ?? (c ? 404 : void 0), f = o.module.metadata?.fullPath;
+      if (!f && !c) {
         console.warn(
           `Module ${o.module.metadata?.moduleId} has no fullPath`
         );
         continue;
       }
-      const d = async (h) => {
-        const { components: u, data: m, shortCircuit: f } = await G(n, h);
-        if (f) {
-          const g = f.headers.get("Location");
-          return h.req.query("_data") === "1" && g && f.status >= 300 && f.status < 400 ? h.json({ __redirect: g }) : f;
+      const l = async (d) => {
+        const { components: u, data: h, shortCircuit: m } = await H(n, d);
+        if (m) {
+          const w = m.headers.get("Location");
+          return d.req.query("_data") === "1" && w && m.status >= 300 && m.status < 400 ? d.json({ __redirect: w }) : m;
         }
-        const p = H(u);
-        return O(h, p, m, i);
+        const p = G(u);
+        return N(d, p, h, r);
       };
-      c ? e.notFound(d) : a.length > 0 ? e.on(["GET"], [l], ...a, d) : e.on(["GET"], [l], d);
+      c ? e.notFound(l) : i.length > 0 ? e.on(["GET"], [f], ...i, l) : e.on(["GET"], [f], l);
     } else
       continue;
   }
 }, q = (e, t, s = []) => {
-  for (const r of t) {
-    const o = r.module?.metadata?.moduleId, n = [
+  for (const a of t) {
+    const o = a.module?.metadata?.moduleId, n = [
       ...s,
-      ...r.middlewares || []
+      ...a.middlewares || []
     ];
-    if (r.module && o) {
-      const a = Object.keys(r.module).filter(
+    if (a.module && o) {
+      const i = Object.keys(a.module).filter(
         (c) => c.startsWith("action_")
       );
-      for (const c of a) {
-        const i = c.replace("action_", ""), l = r.module[c];
-        if (typeof l == "function") {
-          const d = `/_action/${o}/${i}`, h = async (u) => {
-            let m = {};
+      for (const c of i) {
+        const r = c.replace("action_", ""), f = a.module[c];
+        if (typeof f == "function") {
+          const l = `/_action/${o}/${r}`, d = async (u) => {
+            let h = {};
             try {
-              m = await u.req.json();
+              h = await u.req.json();
             } catch {
             }
-            const f = {
-              body: m,
+            const m = {
+              body: h,
               params: u.req.param(),
               query: u.req.query(),
               c: u
             };
             try {
-              const p = await l(f);
+              const p = await f(m);
               return u.json(p ?? { ok: !0 });
             } catch (p) {
-              const g = p instanceof Error ? p.message : "Action failed";
-              return u.json({ error: g }, 500);
+              const w = p instanceof Error ? p.message : "Action failed";
+              return u.json({ error: w }, 500);
             }
           };
           n.length > 0 ? e.on(
             ["POST"],
-            [d],
+            [l],
             ...n,
-            h
-          ) : e.on(["POST"], [d], h);
+            d
+          ) : e.on(["POST"], [l], d);
         }
       }
     }
-    r.children && q(e, r.children, n);
+    a.children && q(e, a.children, n);
   }
 }, x = async (e, t, s = []) => {
-  const r = (o, n) => {
-    for (const a of o) {
-      const c = a.module?.metadata?.moduleId, i = [
+  const a = (o, n) => {
+    for (const i of o) {
+      const c = i.module?.metadata?.moduleId, r = [
         ...n,
-        ...a.middlewares || []
+        ...i.middlewares || []
       ];
-      if (a.module && c) {
-        const l = Object.keys(a.module).filter(
-          (d) => d.startsWith("stream_")
+      if (i.module && c) {
+        const f = Object.keys(i.module).filter(
+          (l) => l.startsWith("stream_")
         );
-        for (const d of l) {
-          const h = d.replace("stream_", ""), u = a.module[d];
+        for (const l of f) {
+          const d = l.replace("stream_", ""), u = i.module[l];
           if (u?.__isVeloEventStream) {
-            const m = `/_event/${c}/${h}`;
-            u.__path = m, $(
+            const h = `/_event/${c}/${d}`;
+            u.__path = h, D(
               e,
-              m,
+              h,
               u,
-              i
+              r
             );
           }
         }
       }
-      a.children && r(a.children, i);
+      i.children && a(i.children, r);
     }
   };
-  r(t, s);
+  a(t, s);
 }, V = (e, t) => t ? t.startsWith("/") ? e + t : e ? e + "/" + t : "/" + t : e || "", W = (e) => {
-  const t = /* @__PURE__ */ new Set(), s = (r) => {
-    for (const o of r) {
+  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);
@@ -202,68 +202,77 @@ const N = (e) => JSON.stringify(e).replace(/</g, "\\u003c").replace(/>/g, "\\u00
     }
   };
   return s(e), t;
-}, R = (e, t, s, r = "", o = []) => {
+}, j = (e, t, s, a = "", o = []) => {
   for (const n of t) {
-    const a = V(r, n.path), c = [
+    const i = V(a, n.path), c = [
       ...o,
       ...n.middlewares || []
-    ], i = !!n.handler, l = !!n.method;
-    if (i && !l ? console.warn(
-      `[velojs] invalid route at "${a || "/"}" — "handler" set without "method"; endpoint skipped`
-    ) : l && !i ? console.warn(
-      `[velojs] invalid route at "${a || "/"}" — "method" set without "handler"; endpoint skipped`
-    ) : i && n.module ? console.warn(
-      `[velojs] ambiguous route at "${a || "/"}" — both "module" and "handler" set; endpoint ignored, page kept`
-    ) : i && n.isRoot && console.warn(
-      `[velojs] "isRoot" has no effect on endpoint at "${a || "/"}"; ignored`
-    ), i && l && !n.module) {
-      const h = n.method;
-      h === "GET" && s.has(a) && console.warn(
-        `[velojs] path "${a}" has both a page GET and an endpoint GET; the page wins and the endpoint is unreachable. Consider renaming one.`
+    ], r = !!n.handler, f = !!n.method;
+    if (r && !f ? console.warn(
+      `[velojs] invalid route at "${i || "/"}" — "handler" set without "method"; endpoint skipped`
+    ) : f && !r ? console.warn(
+      `[velojs] invalid route at "${i || "/"}" — "method" set without "handler"; endpoint skipped`
+    ) : r && n.module ? console.warn(
+      `[velojs] ambiguous route at "${i || "/"}" — both "module" and "handler" set; endpoint ignored, page kept`
+    ) : r && n.isRoot && console.warn(
+      `[velojs] "isRoot" has no effect on endpoint at "${i || "/"}"; ignored`
+    ), r && f && !n.module) {
+      const d = n.method;
+      d === "GET" && s.has(i) && console.warn(
+        `[velojs] path "${i}" has both a page GET and an endpoint GET; the page wins and the endpoint is unreachable. Consider renaming one.`
       );
-      const u = n.handler, m = async (f) => await u({
-        c: f,
-        params: f.req.param(),
-        query: f.req.query()
+      const u = n.handler, h = async (m) => await u({
+        c: m,
+        params: m.req.param(),
+        query: m.req.query()
       });
-      c.length > 0 ? e.on([h], [a], ...c, m) : e.on([h], [a], m);
+      c.length > 0 ? e.on([d], [i], ...c, h) : e.on([d], [i], h);
     }
-    n.children && R(
+    n.children && j(
       e,
       n.children,
       s,
-      a,
+      i,
       c
     );
   }
 }, K = async (e) => {
-  const t = new j();
-  t.use(T()), process.env.NODE_ENV !== "production" && t.use("*", E());
-  const r = w().pendingRoutes.splice(0);
-  for (const n of r)
+  const t = new R();
+  t.use(E()), process.env.NODE_ENV !== "production" && t.use("*", T());
+  const a = _().pendingRoutes.splice(0);
+  for (const n of a)
     await n(t);
   y(t, e), q(t, e), await x(t, e);
   const o = W(e);
-  if (R(t, e, o), await I(t, e), D(t), process.env.NODE_ENV !== "production" && !v) {
+  if (j(t, e, o), await O(t, e), A(t), process.env.NODE_ENV !== "production" && !g) {
     const n = globalThis.__veloDevServer;
     n && (b(n), await S(t, n));
   }
   return t;
 }, te = async (e) => {
-  const { routes: t } = e, s = Number(process.env.PORT) || e.port || 3e3, r = await K(t);
+  const { routes: t } = e, s = Number(process.env.PORT) || e.port || 3e3, a = process.env.HOST || e.hostname || void 0, o = await K(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: a } = await import("node:path"), c = a(process.cwd(), "dist/client");
-    (process.env.STATIC_BASE_URL || "").startsWith("http") || r.use("/*", n({ root: c })), console.log(`Server running on http://localhost:${s}`);
-    const l = o({ fetch: r.fetch, port: s });
-    await S(r, l), b(l);
+    const { serve: n } = await import("@hono/node-server"), { serveStatic: i } = await import("@hono/node-server/serve-static"), { join: c } = await import("node:path"), r = c(process.cwd(), "dist/client");
+    (process.env.STATIC_BASE_URL || "").startsWith("http") || o.use("/*", i({ root: r }));
+    const l = n({ fetch: o.fetch, port: s, ...a ? { hostname: a } : {} });
+    l.listening || await new Promise((u) => l.once("listening", u));
+    const d = l.address();
+    if (d && typeof d == "object") {
+      const h = d.address === "::" || d.address === "0.0.0.0" ? "0.0.0.0 (all interfaces)" : d.address;
+      console.log(`Server running on ${h}:${d.port}`);
+    } else
+      console.log(`Server running on port ${s}`);
+    await S(o, l), b(l), l.once("close", () => {
+      g === l && (g = null);
+    });
   }
-  return r;
+  return o;
 };
 export {
   ee as addRoutes,
   K as createApp,
   K as default,
-  N as jsonForScript,
+  I as jsonForScript,
   Z as onServer,
   P as serverDataStorage,
   te as startServer