weifuwu 0.16.4 → 0.16.6

package/README.md

@@ -451,7 +451,7 @@ The hydration bundle also injects `self.process = { env: {} }` as a safety net s
 #### useWebsocket — auto-reconnecting WebSocket
 
 ```tsx
-import { useWebsocket } from 'weifuwu'
+import { useWebsocket } from 'weifuwu/react'
 
 function Chat() {
   const { send, lastMessage, readyState, close, reconnect } = useWebsocket('/ws/chat', {
@@ -472,7 +472,7 @@ function Chat() {
 #### useAction — async form submission
 
 ```tsx
-import { useAction } from 'weifuwu'
+import { useAction } from 'weifuwu/react'
 
 function FeedbackForm() {
   const { submit, data, error, pending, reset } = useAction('/api/feedback', { method: 'POST' })
@@ -490,7 +490,7 @@ Auto-serializes JSON, auto-reads `_csrf` cookie and sends as `X-CSRF-Token`. Ret
 ### Client-side navigation
 
 ```tsx
-import { Link, useNavigate } from 'weifuwu'
+import { Link, useNavigate } from 'weifuwu/react'
 
 function Nav() {
   const navigate = useNavigate()

package/cli.ts

@@ -123,7 +123,7 @@ async function cmdInit(name: string) {
 
   await writeFile(join(targetDir, 'ui', 'pages', 'page.tsx'), [
     "import { useState } from 'react'",
-    "import { useWebsocket } from 'weifuwu'",
+    "import { useWebsocket } from 'weifuwu/react'",
     '',
     'export default function Home() {',
     '  const [input, setInput] = useState("")',

package/dist/cli.js

@@ -110,7 +110,7 @@ async function cmdInit(name) {
   ].join("\n"));
   await writeFile(join(targetDir, "ui", "pages", "page.tsx"), [
     "import { useState } from 'react'",
-    "import { useWebsocket } from 'weifuwu'",
+    "import { useWebsocket } from 'weifuwu/react'",
     "",
     "export default function Home() {",
     '  const [input, setInput] = useState("")',

package/dist/index.d.ts

@@ -60,11 +60,6 @@ export { seo, seoMiddleware, seoTags } from './seo.ts';
 export type { SeoOptions, RobotsRule, SitemapUrl, SitemapConfig, SeoHeadersConfig, SeoTagsConfig, } from './seo.ts';
 export { mailer } from './mailer.ts';
 export type { MailerOptions, MailOptions, Mailer } from './mailer.ts';
-export { useWebsocket } from './use-websocket.ts';
-export type { UseWebsocketOptions, UseWebsocketReturn } from './use-websocket.ts';
-export { useAction } from './use-action.ts';
-export type { UseActionOptions, UseActionReturn } from './use-action.ts';
-export { Link, useNavigate, navigate } from './client-router.ts';
 export { csrf } from './csrf.ts';
 export type { CsrfOptions } from './csrf.ts';
 export { logdb } from './logdb/index.ts';

package/dist/index.js

@@ -123,12 +123,15 @@ function serve(handler, options) {
     resolveReady = r;
   });
   if (options?.shutdown !== false) {
-    process.on("SIGTERM", () => {
+    let shuttingDown = false;
+    const shutdown = () => {
+      if (shuttingDown) return;
+      shuttingDown = true;
       server.close();
-    });
-    process.on("SIGINT", () => {
-      server.close();
-    });
+      process.exit(0);
+    };
+    process.on("SIGTERM", shutdown);
+    process.on("SIGINT", shutdown);
   }
   if (options?.signal) {
     if (options.signal.aborted) {
@@ -995,6 +998,7 @@ ${src}`;
         alias: resolveAliases(),
         banner: { js: "self.process={env:{}};" },
         define: Object.keys(publicEnv).length > 0 ? publicEnv : void 0,
+        loader: { ".node": "empty" },
         write: false,
         minify: true
       });
@@ -1773,7 +1777,7 @@ function upload(options) {
 // rate-limit.ts
 function rateLimit(options) {
   const max = options?.max ?? 100;
-  const window2 = options?.window ?? 6e4;
+  const window = options?.window ?? 6e4;
   const getKey = options?.key ?? ((req) => {
     const forwarded = req.headers.get("x-forwarded-for");
     if (forwarded) return forwarded.split(",")[0].trim();
@@ -1790,19 +1794,19 @@ function rateLimit(options) {
     for (const [key, entry] of hits) {
       if (entry.reset < now) hits.delete(key);
     }
-  }, window2);
+  }, window);
   if (interval.unref) interval.unref();
   const mw = async (req, ctx, next) => {
     const key = getKey(req);
     const now = Date.now();
     const entry = hits.get(key);
     if (!entry || entry.reset < now) {
-      hits.set(key, { count: 1, reset: now + window2 });
+      hits.set(key, { count: 1, reset: now + window });
       const res2 = await next(req, ctx);
       const headers2 = new Headers(res2.headers);
       headers2.set("X-RateLimit-Limit", String(max));
       headers2.set("X-RateLimit-Remaining", String(max - 1));
-      headers2.set("X-RateLimit-Reset", String(Math.ceil((now + window2) / 1e3)));
+      headers2.set("X-RateLimit-Reset", String(Math.ceil((now + window) / 1e3)));
       return new Response(res2.body, { status: res2.status, statusText: res2.statusText, headers: headers2 });
     }
     entry.count++;
@@ -6380,7 +6384,7 @@ async function buildRouter4(deps) {
       skills: allSkills,
       systemPrompt: session.system_prompt || systemPrompt
     });
-    const history2 = await getHistory(sql2, sessionId);
+    const history = await getHistory(sql2, sessionId);
     await addTextMessage(sql2, sessionId, "user", content);
     const stream = executeGenerator({
       sessionId,
@@ -6388,7 +6392,7 @@ async function buildRouter4(deps) {
       model,
       tools,
       systemPrompt: sysPrompt,
-      messages: history2,
+      messages: history,
       sql: sql2
     });
     return createSSEStream(stream);
@@ -6468,7 +6472,7 @@ function createWSHandler2(deps) {
               skills: allSkills,
               systemPrompt: session.system_prompt || systemPrompt
             });
-            const history2 = await getHistory(sql2, session_id);
+            const history = await getHistory(sql2, session_id);
             await addTextMessage(sql2, session_id, "user", content);
             const stream = executeGenerator({
               sessionId: session_id,
@@ -6476,7 +6480,7 @@ function createWSHandler2(deps) {
               model,
               tools,
               systemPrompt: sysPrompt,
-              messages: history2,
+              messages: history,
               sql: sql2,
               abortSignal: controller.signal
             });
@@ -6913,207 +6917,6 @@ function mailer(options) {
   return { send, close };
 }
 
-// use-websocket.ts
-import { useEffect, useRef, useCallback, useState } from "react";
-var RECONNECT_DELAY = 3e3;
-var MAX_RETRIES = 10;
-function resolveUrl(url) {
-  return typeof url === "function" ? url() : url;
-}
-function useWebsocket(url, options) {
-  const { onMessage, reconnect: reconnectOpt = true, protocols, enabled = true } = options ?? {};
-  const [lastMessage, setLastMessage] = useState(null);
-  const [readyState, setReadyState] = useState(WebSocket.CLOSED);
-  const wsRef = useRef(null);
-  const retryRef = useRef(0);
-  const timerRef = useRef(void 0);
-  const mountedRef = useRef(true);
-  const shouldReconnectRef = useRef(true);
-  const urlRef = useRef(url);
-  const optsRef = useRef({ onMessage, reconnectOpt, protocols });
-  urlRef.current = url;
-  optsRef.current = { onMessage, reconnectOpt, protocols };
-  const cleanup = useCallback(() => {
-    clearTimeout(timerRef.current);
-    wsRef.current?.close();
-    wsRef.current = null;
-  }, []);
-  const connect = useCallback(() => {
-    if (!mountedRef.current || !enabled) return;
-    const resolved = resolveUrl(urlRef.current);
-    if (!resolved) return;
-    wsRef.current?.close();
-    const ws = new WebSocket(resolved, optsRef.current.protocols);
-    wsRef.current = ws;
-    setReadyState(WebSocket.CONNECTING);
-    ws.addEventListener("open", () => {
-      if (!mountedRef.current) return;
-      retryRef.current = 0;
-      setReadyState(WebSocket.OPEN);
-    });
-    ws.addEventListener("message", (e) => {
-      if (!mountedRef.current) return;
-      const data = typeof e.data === "string" ? e.data : String(e.data);
-      setLastMessage(data);
-      optsRef.current.onMessage?.(data);
-    });
-    ws.addEventListener("close", () => {
-      if (!mountedRef.current) return;
-      setReadyState(WebSocket.CLOSED);
-      const ro = optsRef.current.reconnectOpt;
-      if (ro && shouldReconnectRef.current && mountedRef.current) {
-        const maxRetries = typeof ro === "object" ? ro.maxRetries ?? MAX_RETRIES : MAX_RETRIES;
-        const delay = typeof ro === "object" ? ro.delay ?? RECONNECT_DELAY : RECONNECT_DELAY;
-        if (retryRef.current < maxRetries) {
-          retryRef.current++;
-          timerRef.current = setTimeout(() => connect(), delay);
-        }
-      }
-    });
-  }, [enabled]);
-  useEffect(() => {
-    mountedRef.current = true;
-    shouldReconnectRef.current = true;
-    if (enabled) connect();
-    return () => {
-      mountedRef.current = false;
-      cleanup();
-    };
-  }, [enabled, connect, cleanup]);
-  const send = useCallback((data) => {
-    wsRef.current?.send(data);
-  }, []);
-  const close = useCallback(() => {
-    shouldReconnectRef.current = false;
-    cleanup();
-    setReadyState(WebSocket.CLOSED);
-  }, [cleanup]);
-  const reconnectFn = useCallback(() => {
-    retryRef.current = 0;
-    shouldReconnectRef.current = true;
-    cleanup();
-    connect();
-  }, [cleanup, connect]);
-  return { send, close, readyState, lastMessage, reconnect: reconnectFn };
-}
-
-// use-action.ts
-import { useState as useState2, useCallback as useCallback2, useRef as useRef2 } from "react";
-function getCsrfToken() {
-  if (typeof document === "undefined") return void 0;
-  const match = document.cookie.match(/(?:^|;\s*)_csrf=([^;]+)/);
-  return match ? decodeURIComponent(match[1]) : void 0;
-}
-function useAction(url, options) {
-  const { method = "POST", headers, onSuccess, onError } = options ?? {};
-  const [data, setData] = useState2(null);
-  const [error, setError] = useState2(null);
-  const [pending, setPending] = useState2(false);
-  const mountedRef = useRef2(true);
-  const submit = useCallback2(async (body) => {
-    setPending(true);
-    setError(null);
-    try {
-      const csrfToken = getCsrfToken();
-      const hdrs = { ...headers };
-      if (csrfToken) hdrs["x-csrf-token"] = csrfToken;
-      if (body && typeof body === "object" && !(body instanceof FormData)) {
-        hdrs["content-type"] = "application/json";
-      }
-      const res = await fetch(url, {
-        method,
-        headers: hdrs,
-        body: body instanceof FormData ? body : body !== void 0 ? JSON.stringify(body) : void 0
-      });
-      if (!res.ok) {
-        const text2 = await res.text();
-        throw new Error(text2 || `HTTP ${res.status}`);
-      }
-      const result = res.status === 204 ? void 0 : await res.json();
-      if (mountedRef.current) {
-        setData(result);
-        onSuccess?.(result);
-      }
-      return result;
-    } catch (err) {
-      const e = err instanceof Error ? err : new Error(String(err));
-      if (mountedRef.current) {
-        setError(e);
-        onError?.(e);
-      }
-      return void 0;
-    } finally {
-      if (mountedRef.current) setPending(false);
-    }
-  }, [url, method, headers, onSuccess, onError]);
-  const reset = useCallback2(() => {
-    setData(null);
-    setError(null);
-  }, []);
-  return { submit, data, error, pending, reset };
-}
-
-// client-router.ts
-import { createElement as createElement2, useCallback as useCallback3 } from "react";
-async function navigate(href) {
-  if (typeof document === "undefined") return;
-  const url = new URL(href, location.origin);
-  if (url.origin !== location.origin) {
-    location.href = href;
-    return;
-  }
-  const html = await fetch(url.pathname + url.search, {
-    headers: { accept: "text/html" }
-  }).then((r) => r.text());
-  const doc = new DOMParser().parseFromString(html, "text/html");
-  const rootEl = doc.getElementById("__weifuwu_root");
-  if (!rootEl) {
-    location.href = href;
-    return;
-  }
-  const newHtml = rootEl.innerHTML;
-  const propsMatch = html.match(/window\.__WEIFUWU_PROPS=(.+?)<\/script>/);
-  if (!propsMatch) {
-    location.href = href;
-    return;
-  }
-  const bundleMatch = html.match(/src="(\/__wfw\/client\/[^"]+\.js)"/);
-  const bundleUrl = bundleMatch ? bundleMatch[1] : null;
-  const currentRoot = document.getElementById("__weifuwu_root");
-  if (!currentRoot) {
-    location.href = href;
-    return;
-  }
-  ;
-  window.__WEIFUWU_ROOT?.unmount();
-  currentRoot.innerHTML = newHtml;
-  window.__WEIFUWU_PROPS = JSON.parse(propsMatch[1]);
-  history.pushState(null, "", url.pathname + url.search);
-  if (bundleUrl) {
-    const cacheBust = bundleUrl.includes("?") ? "&_t=" : "?_t=";
-    try {
-      await import(
-        /* @vite-ignore */
-        `${bundleUrl}${cacheBust}${Date.now()}`
-      );
-    } catch (e) {
-      console.error("[weifuwu/router] hydration failed:", e);
-    }
-  }
-}
-function useNavigate() {
-  return useCallback3((href) => navigate(href), []);
-}
-function Link({ href, children, onClick, ...props }) {
-  const handleClick = useCallback3((e) => {
-    if (e.button !== 0 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) return;
-    e.preventDefault();
-    navigate(href);
-    onClick?.(e);
-  }, [href, onClick]);
-  return createElement2("a", { href, onClick: handleClick, ...props }, children);
-}
-
 // csrf.ts
 function csrf(options) {
   const cookieName = options?.cookie ?? "_csrf";
@@ -8305,7 +8108,6 @@ function registerWorker(url) {
   };
 }
 export {
-  Link,
   Router,
   TsxContext,
   agent,
@@ -8339,7 +8141,6 @@ export {
   logger,
   mailer,
   messager,
-  navigate,
   openai,
   opencode,
   postgres,
@@ -8362,10 +8163,7 @@ export {
   tool2 as tool,
   tsx,
   upload,
-  useAction,
-  useNavigate,
   useTsx,
-  useWebsocket,
   user,
   validate
 };

package/dist/react.d.ts

@@ -0,0 +1,6 @@
+export { useWebsocket } from './use-websocket.ts';
+export type { UseWebsocketOptions, UseWebsocketReturn } from './use-websocket.ts';
+export { useAction } from './use-action.ts';
+export type { UseActionOptions, UseActionReturn } from './use-action.ts';
+export { Link, useNavigate, navigate } from './client-router.ts';
+export { TsxContext, useTsx } from './tsx-context.ts';

package/dist/react.js

@@ -0,0 +1,216 @@
+// use-websocket.ts
+import { useEffect, useRef, useCallback, useState } from "react";
+var RECONNECT_DELAY = 3e3;
+var MAX_RETRIES = 10;
+function resolveUrl(url) {
+  return typeof url === "function" ? url() : url;
+}
+function useWebsocket(url, options) {
+  const { onMessage, reconnect: reconnectOpt = true, protocols, enabled = true } = options ?? {};
+  const [lastMessage, setLastMessage] = useState(null);
+  const [readyState, setReadyState] = useState(WebSocket.CLOSED);
+  const wsRef = useRef(null);
+  const retryRef = useRef(0);
+  const timerRef = useRef(void 0);
+  const mountedRef = useRef(true);
+  const shouldReconnectRef = useRef(true);
+  const urlRef = useRef(url);
+  const optsRef = useRef({ onMessage, reconnectOpt, protocols });
+  urlRef.current = url;
+  optsRef.current = { onMessage, reconnectOpt, protocols };
+  const cleanup = useCallback(() => {
+    clearTimeout(timerRef.current);
+    wsRef.current?.close();
+    wsRef.current = null;
+  }, []);
+  const connect = useCallback(() => {
+    if (!mountedRef.current || !enabled) return;
+    const resolved = resolveUrl(urlRef.current);
+    if (!resolved) return;
+    wsRef.current?.close();
+    const ws = new WebSocket(resolved, optsRef.current.protocols);
+    wsRef.current = ws;
+    setReadyState(WebSocket.CONNECTING);
+    ws.addEventListener("open", () => {
+      if (!mountedRef.current) return;
+      retryRef.current = 0;
+      setReadyState(WebSocket.OPEN);
+    });
+    ws.addEventListener("message", (e) => {
+      if (!mountedRef.current) return;
+      const data = typeof e.data === "string" ? e.data : String(e.data);
+      setLastMessage(data);
+      optsRef.current.onMessage?.(data);
+    });
+    ws.addEventListener("close", () => {
+      if (!mountedRef.current) return;
+      setReadyState(WebSocket.CLOSED);
+      const ro = optsRef.current.reconnectOpt;
+      if (ro && shouldReconnectRef.current && mountedRef.current) {
+        const maxRetries = typeof ro === "object" ? ro.maxRetries ?? MAX_RETRIES : MAX_RETRIES;
+        const delay = typeof ro === "object" ? ro.delay ?? RECONNECT_DELAY : RECONNECT_DELAY;
+        if (retryRef.current < maxRetries) {
+          retryRef.current++;
+          timerRef.current = setTimeout(() => connect(), delay);
+        }
+      }
+    });
+  }, [enabled]);
+  useEffect(() => {
+    mountedRef.current = true;
+    shouldReconnectRef.current = true;
+    if (enabled) connect();
+    return () => {
+      mountedRef.current = false;
+      cleanup();
+    };
+  }, [enabled, connect, cleanup]);
+  const send = useCallback((data) => {
+    wsRef.current?.send(data);
+  }, []);
+  const close = useCallback(() => {
+    shouldReconnectRef.current = false;
+    cleanup();
+    setReadyState(WebSocket.CLOSED);
+  }, [cleanup]);
+  const reconnectFn = useCallback(() => {
+    retryRef.current = 0;
+    shouldReconnectRef.current = true;
+    cleanup();
+    connect();
+  }, [cleanup, connect]);
+  return { send, close, readyState, lastMessage, reconnect: reconnectFn };
+}
+
+// use-action.ts
+import { useState as useState2, useCallback as useCallback2, useRef as useRef2 } from "react";
+function getCsrfToken() {
+  if (typeof document === "undefined") return void 0;
+  const match = document.cookie.match(/(?:^|;\s*)_csrf=([^;]+)/);
+  return match ? decodeURIComponent(match[1]) : void 0;
+}
+function useAction(url, options) {
+  const { method = "POST", headers, onSuccess, onError } = options ?? {};
+  const [data, setData] = useState2(null);
+  const [error, setError] = useState2(null);
+  const [pending, setPending] = useState2(false);
+  const mountedRef = useRef2(true);
+  const submit = useCallback2(async (body) => {
+    setPending(true);
+    setError(null);
+    try {
+      const csrfToken = getCsrfToken();
+      const hdrs = { ...headers };
+      if (csrfToken) hdrs["x-csrf-token"] = csrfToken;
+      if (body && typeof body === "object" && !(body instanceof FormData)) {
+        hdrs["content-type"] = "application/json";
+      }
+      const res = await fetch(url, {
+        method,
+        headers: hdrs,
+        body: body instanceof FormData ? body : body !== void 0 ? JSON.stringify(body) : void 0
+      });
+      if (!res.ok) {
+        const text = await res.text();
+        throw new Error(text || `HTTP ${res.status}`);
+      }
+      const result = res.status === 204 ? void 0 : await res.json();
+      if (mountedRef.current) {
+        setData(result);
+        onSuccess?.(result);
+      }
+      return result;
+    } catch (err) {
+      const e = err instanceof Error ? err : new Error(String(err));
+      if (mountedRef.current) {
+        setError(e);
+        onError?.(e);
+      }
+      return void 0;
+    } finally {
+      if (mountedRef.current) setPending(false);
+    }
+  }, [url, method, headers, onSuccess, onError]);
+  const reset = useCallback2(() => {
+    setData(null);
+    setError(null);
+  }, []);
+  return { submit, data, error, pending, reset };
+}
+
+// client-router.ts
+import { createElement, useCallback as useCallback3 } from "react";
+async function navigate(href) {
+  if (typeof document === "undefined") return;
+  const url = new URL(href, location.origin);
+  if (url.origin !== location.origin) {
+    location.href = href;
+    return;
+  }
+  const html = await fetch(url.pathname + url.search, {
+    headers: { accept: "text/html" }
+  }).then((r) => r.text());
+  const doc = new DOMParser().parseFromString(html, "text/html");
+  const rootEl = doc.getElementById("__weifuwu_root");
+  if (!rootEl) {
+    location.href = href;
+    return;
+  }
+  const newHtml = rootEl.innerHTML;
+  const propsMatch = html.match(/window\.__WEIFUWU_PROPS=(.+?)<\/script>/);
+  if (!propsMatch) {
+    location.href = href;
+    return;
+  }
+  const bundleMatch = html.match(/src="(\/__wfw\/client\/[^"]+\.js)"/);
+  const bundleUrl = bundleMatch ? bundleMatch[1] : null;
+  const currentRoot = document.getElementById("__weifuwu_root");
+  if (!currentRoot) {
+    location.href = href;
+    return;
+  }
+  ;
+  window.__WEIFUWU_ROOT?.unmount();
+  currentRoot.innerHTML = newHtml;
+  window.__WEIFUWU_PROPS = JSON.parse(propsMatch[1]);
+  history.pushState(null, "", url.pathname + url.search);
+  if (bundleUrl) {
+    const cacheBust = bundleUrl.includes("?") ? "&_t=" : "?_t=";
+    try {
+      await import(
+        /* @vite-ignore */
+        `${bundleUrl}${cacheBust}${Date.now()}`
+      );
+    } catch (e) {
+      console.error("[weifuwu/router] hydration failed:", e);
+    }
+  }
+}
+function useNavigate() {
+  return useCallback3((href) => navigate(href), []);
+}
+function Link({ href, children, onClick, ...props }) {
+  const handleClick = useCallback3((e) => {
+    if (e.button !== 0 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) return;
+    e.preventDefault();
+    navigate(href);
+    onClick?.(e);
+  }, [href, onClick]);
+  return createElement("a", { href, onClick: handleClick, ...props }, children);
+}
+
+// tsx-context.ts
+import { createContext, useContext } from "react";
+var TsxContext = createContext({ params: {}, query: {} });
+function useTsx() {
+  return useContext(TsxContext);
+}
+export {
+  Link,
+  TsxContext,
+  navigate,
+  useAction,
+  useNavigate,
+  useTsx,
+  useWebsocket
+};

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "weifuwu",
-  "version": "0.16.4",
+  "version": "0.16.6",
   "description": "Web-standard HTTP framework for Node.js — (req, ctx) => Response",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js",
-    "./tsx": "./dist/index.js"
+    "./react": "./dist/react.js"
   },
   "bin": {
     "weifuwu": "dist/cli.js"
@@ -18,7 +18,7 @@
     "LICENSE"
   ],
   "scripts": {
-    "build": "esbuild index.ts --bundle --format=esm --platform=node --outfile=dist/index.js --packages=external && esbuild cli.ts --bundle --format=esm --platform=node --outfile=dist/cli.js --packages=external",
+    "build": "esbuild index.ts --bundle --format=esm --platform=node --outfile=dist/index.js --packages=external && esbuild cli.ts --bundle --format=esm --platform=node --outfile=dist/cli.js --packages=external && esbuild react.ts --bundle --format=esm --outfile=dist/react.js --external:react --external:react-dom",
     "prepublishOnly": "npm run build && tsc --emitDeclarationOnly --outdir dist",
     "test": "node --test 'test/**/*.test.ts'"
   },