@mauroandre/velojs 0.0.57 → 0.0.59

package/dist/server.js

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

package/dist/sockets.d.ts

@@ -89,7 +89,10 @@ export declare function trackSocketSession(app: Hono, ctrl: AbortController): ()
 export declare function abortAllSocketSessions(app: Hono): void;
 /** @internal Returns registered sockets for `app` (used by the testing toolkit). */
 export declare function getAppSockets(app: Hono): ReadonlyMap<string, RegisteredSocket>;
-export declare function registerSocketHandler(app: Hono, path: string, handler: SocketHandler, middlewares?: MiddlewareHandler[]): Promise<void>;
+export declare function registerSocketHandler(app: Hono, path: string, handler: SocketHandler, middlewares?: MiddlewareHandler[], info?: {
+    moduleId?: string | undefined;
+    name?: string | undefined;
+}): Promise<void>;
 /** Walks the route tree and registers every `socket_*` export. */
 export declare function registerSocketRoutes(app: Hono, nodes: RouteNode[], parentMiddlewares?: MiddlewareHandler[]): Promise<void>;
 /**