weifuwu 0.17.5 → 0.17.7

package/dist/analytics.d.ts

@@ -1,8 +1,11 @@
-import { Router } from './router.ts';
+import type { Handler, Middleware } from './types.ts';
 export interface AnalyticsOptions {
+    excluded?: string[];
     pg?: {
-        sql: any;
+        sql: (strings: TemplateStringsArray, ...values: any[]) => Promise<any[]>;
     };
-    excluded?: string[];
 }
-export declare function analytics(options?: AnalyticsOptions): Router;
+export declare function analytics(options?: AnalyticsOptions): {
+    middleware: Middleware;
+    handler: Handler;
+};

package/dist/index.js

@@ -6819,11 +6819,10 @@ var MemStore = class {
     }
     let page = this.pages.get(path2);
     if (!page) {
-      page = { count: 0, dates: /* @__PURE__ */ new Set() };
+      page = { count: 0 };
       this.pages.set(path2, page);
     }
     page.count++;
-    page.dates.add(date);
     if (refDomain) {
       let refs = this.refs.get(date);
       if (!refs) {
@@ -6852,8 +6851,6 @@ var MemStore = class {
       for (const p of day.uv) allUv.add(p);
     }
     for (const [path2, page] of this.pages) {
-      let count = 0;
-      for (const d of page.dates) if (d >= sinceStr) count += page.count / page.dates.size;
       pageMap.set(path2, page.count);
     }
     const topPages = [...pageMap.entries()].sort((a, b) => b[1] - a[1]).slice(0, 20).map(([path2, count]) => ({ path: path2, pv: count }));
@@ -6874,44 +6871,41 @@ var MemStore = class {
     };
   }
 };
-function analytics(options) {
-  const excluded = options?.excluded ?? DEFAULT_EXCLUDED;
-  const store = new MemStore();
-  function shouldExclude(path2) {
-    return excluded.some((e) => path2.startsWith(e));
-  }
-  const middleware = async (req, ctx, next) => {
-    const url = new URL(req.url);
-    const path2 = url.pathname;
-    if (!shouldExclude(path2)) {
-      const date = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-      const ref = req.headers.get("referer") || "";
-      const refDomain = ref ? new URL(ref).hostname.replace(/^www\./, "") : "";
-      const ua = req.headers.get("user-agent") || "";
-      const mobile = /mobile|android|iphone|ipad/i.test(ua);
-      store.record(path2, date, refDomain, mobile);
+async function queryPg(sql2, days) {
+  const since = /* @__PURE__ */ new Date();
+  since.setDate(since.getDate() - days);
+  const daily = await sql2`
+    SELECT date, SUM(count) as pv, COUNT(DISTINCT path) as uv
+    FROM __analytics WHERE date >= ${since.toISOString().slice(0, 10)}
+    GROUP BY date ORDER BY date
+  `;
+  const pageRows = await sql2`
+    SELECT path, SUM(count) as pv
+    FROM __analytics WHERE date >= ${since.toISOString().slice(0, 10)}
+    GROUP BY path ORDER BY pv DESC LIMIT 20
+  `;
+  const totalRes = await sql2`
+    SELECT COALESCE(SUM(count), 0) as total_pv,
+           COALESCE(SUM(mobile), 0) as total_mobile,
+           COALESCE(SUM(desktop), 0) as total_desktop
+    FROM __analytics WHERE date >= ${since.toISOString().slice(0, 10)}
+  `;
+  const total = totalRes[0];
+  const totalMobileDesktop = total.total_mobile + total.total_desktop || 1;
+  return {
+    total_pv: total.total_pv,
+    total_uv: pageRows.length,
+    daily: daily.map((d) => ({ date: d.date, pv: Number(d.pv), uv: Number(d.uv) })),
+    top_pages: pageRows.map((p) => ({ path: p.path, pv: Number(p.pv) })),
+    referrers: [],
+    devices: {
+      mobile: Math.round(total.total_mobile / totalMobileDesktop * 1e3) / 10,
+      desktop: Math.round(total.total_desktop / totalMobileDesktop * 1e3) / 10
     }
-    return next(req, ctx);
   };
-  const router = new Router();
-  router.use(middleware);
-  router.get("/__analytics/data", async (req) => {
-    const url = new URL(req.url);
-    const days = Math.min(Math.max(Number(url.searchParams.get("days")) || 7, 1), 365);
-    return Response.json(store.query(days));
-  });
-  router.get("/analytics", async (req) => {
-    const url = new URL(req.url);
-    const days = Math.min(Math.max(Number(url.searchParams.get("days")) || 7, 1), 365);
-    const data = store.query(days);
-    return new Response(renderDashboard(days, data), {
-      headers: { "content-type": "text/html; charset=utf-8" }
-    });
-  });
-  return router;
 }
 function renderDashboard(days, data) {
-  const { total_pv, total_uv, daily, top_pages, referrers, devices } = data;
+  const { total_pv, total_uv, daily, top_pages, referrers } = data;
   const maxPv = Math.max(...daily.map((d) => d.pv), 1);
   const bars = daily.map(
     (d) => `<div class="bar-wrap"><div class="bar" style="height:${d.pv / maxPv * 100}%"></div><span class="bar-label">${d.date.slice(5)}</span></div>`
@@ -6924,10 +6918,7 @@ function renderDashboard(days, data) {
   ).join("");
   return `<!DOCTYPE html>
 <html lang="en">
-<head>
-<meta charset="utf-8"/>
-<meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>Analytics - weifuwu</title>
+<head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>Analytics - weifuwu</title>
 <style>
 *,:before,:after{box-sizing:border-box;margin:0;padding:0}
 body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,sans-serif;background:#f8f9fa;color:#333;padding:24px;max-width:960px;margin:0 auto}
@@ -6940,7 +6931,7 @@ h1{font-size:24px;font-weight:700;margin-bottom:24px}
 .section h2{font-size:14px;font-weight:600;color:#888;text-transform:uppercase;letter-spacing:.05em;margin-bottom:16px}
 .chart{display:flex;align-items:flex-end;gap:4px;height:160px;padding-top:8px}
 .bar-wrap{flex:1;display:flex;flex-direction:column;align-items:center;height:100%;justify-content:flex-end}
-.bar{width:100%;background:#2563eb;border-radius:4px 4px 0 0;min-height:2px;transition:height .3s}
+.bar{width:100%;background:#2563eb;border-radius:4px 4px 0 0;min-height:2px}
 .bar-label{font-size:10px;color:#888;margin-top:6px;white-space:nowrap}
 table{width:100%;border-collapse:collapse;font-size:13px}
 th{text-align:left;padding:6px 8px;color:#888;font-weight:500;border-bottom:1px solid #eee}
@@ -6948,27 +6939,58 @@ td{padding:6px 8px;border-bottom:1px solid #f0f0f0}
 .num{text-align:right;font-variant-numeric:tabular-nums}
 .path{font-family:ui-monospace,SFMono-Regular,monospace;font-size:12px}
 tr:hover td{background:#f8faff}
-</style>
-</head>
+</style></head>
 <body>
 <h1>Analytics</h1>
 <div class="cards">
   <div class="card"><div class="val">${total_pv}</div><div class="lbl">Page Views (${days}d)</div></div>
   <div class="card"><div class="val">${total_uv}</div><div class="lbl">Unique Pages</div></div>
-  <div class="card"><div class="val">${devices.mobile}%</div><div class="lbl">Mobile</div></div>
-  <div class="card"><div class="val">${devices.desktop}%</div><div class="lbl">Desktop</div></div>
-</div>
-<div class="section">
-  <h2>Daily Page Views</h2>
-  <div class="chart">${bars}</div>
-</div>
-<div class="section">
-  <h2>Top Pages</h2>
-  <table><thead><tr><th style="width:32px">#</th><th>Path</th><th style="width:64px">Views</th></tr></thead><tbody>${rows}</tbody></table>
+  <div class="card"><div class="val">${data.devices.mobile}%</div><div class="lbl">Mobile</div></div>
+  <div class="card"><div class="val">${data.devices.desktop}%</div><div class="lbl">Desktop</div></div>
 </div>
+<div class="section"><h2>Daily Page Views</h2><div class="chart">${bars}</div></div>
+<div class="section"><h2>Top Pages</h2>
+<table><thead><tr><th style="width:32px">#</th><th>Path</th><th style="width:64px">Views</th></tr></thead><tbody>${rows}</tbody></table></div>
 ${referrers.length ? `<div class="section"><h2>Referrers</h2><table><thead><tr><th>Domain</th><th style="width:64px">Views</th></tr></thead><tbody>${refRows}</tbody></table></div>` : ""}
-</body>
-</html>`;
+</body></html>`;
+}
+function analytics(options) {
+  const excluded = options?.excluded ?? DEFAULT_EXCLUDED;
+  const pg = options?.pg;
+  const store = pg ? null : new MemStore();
+  const middleware = async (req, ctx, next) => {
+    const url = new URL(req.url);
+    const path2 = url.pathname;
+    if (excluded.some((e) => path2.startsWith(e))) return next(req, ctx);
+    const date = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+    const ref = req.headers.get("referer") || "";
+    const ua = req.headers.get("user-agent") || "";
+    const mobile = /mobile|android|iphone|ipad/i.test(ua);
+    if (pg) {
+      await pg.sql`
+        INSERT INTO __analytics (date, path, count, mobile, desktop)
+        VALUES (${date}, ${path2}, 1, ${mobile ? 1 : 0}, ${mobile ? 0 : 1})
+        ON CONFLICT (date, path) DO UPDATE SET
+          count = __analytics.count + 1,
+          mobile = __analytics.mobile + ${mobile ? 1 : 0},
+          desktop = __analytics.desktop + ${mobile ? 0 : 1}
+      `;
+    } else {
+      const refDomain = ref ? new URL(ref).hostname.replace(/^www\./, "") : "";
+      store.record(path2, date, refDomain, mobile);
+    }
+    return next(req, ctx);
+  };
+  const handler = async (req) => {
+    const url = new URL(req.url);
+    const days = Math.min(Math.max(Number(url.searchParams.get("days")) || 7, 1), 365);
+    const data = pg ? await queryPg(pg.sql, days) : store.query(days);
+    if (url.pathname === "/__analytics/data") return Response.json(data);
+    return new Response(renderDashboard(days, data), {
+      headers: { "content-type": "text/html; charset=utf-8" }
+    });
+  };
+  return { middleware, handler };
 }
 
 // preferences.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weifuwu",
-  "version": "0.17.5",
+  "version": "0.17.7",
   "description": "Web-standard HTTP framework for Node.js — (req, ctx) => Response",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",