@litemetrics/node 0.2.0 → 0.3.1

package/dist/index.js

@@ -3,6 +3,36 @@ import { createClient } from "@clickhouse/client";
 
 // src/adapters/utils.ts
 import { randomBytes } from "crypto";
+function getTimezoneOffsetMs(date, timezone) {
+  const formatter = new Intl.DateTimeFormat("en-US", {
+    timeZone: timezone,
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit",
+    hour12: false
+  });
+  const parts = formatter.formatToParts(date);
+  const get = (type) => parts.find((p) => p.type === type).value;
+  const y = parseInt(get("year"));
+  const m = parseInt(get("month")) - 1;
+  const d = parseInt(get("day"));
+  const h = parseInt(get("hour") === "24" ? "0" : get("hour"));
+  const mi = parseInt(get("minute"));
+  const s = parseInt(get("second"));
+  return Date.UTC(y, m, d, h, mi, s) - date.getTime();
+}
+function toUTCDate(value) {
+  if (value instanceof Date) return value;
+  if (typeof value === "number") return new Date(value);
+  const s = String(value).trim();
+  if (s.length >= 10 && !s.endsWith("Z") && !/[+-]\d{2}:?\d{2}$/.test(s)) {
+    return /* @__PURE__ */ new Date(s.replace(" ", "T") + "Z");
+  }
+  return new Date(s);
+}
 function resolvePeriod(q) {
   const now = /* @__PURE__ */ new Date();
   const period = q.period ?? "7d";
@@ -69,60 +99,66 @@ function granularityToDateFormat(g) {
       return "%Y-%m";
   }
 }
-function fillBuckets(from, to, granularity, dateFormat, rows) {
+function fillBuckets(from, to, granularity, dateFormat, rows, timezone) {
   const map = new Map(rows.map((r) => [r._id, r.value]));
   const points = [];
-  const current = new Date(from);
+  const fromOffset = timezone ? getTimezoneOffsetMs(from, timezone) : 0;
+  const toOffset = timezone ? getTimezoneOffsetMs(to, timezone) : 0;
+  const current = new Date(from.getTime() + fromOffset);
+  const toWall = new Date(to.getTime() + toOffset);
   if (granularity === "hour") {
-    current.setMinutes(0, 0, 0);
+    current.setUTCMinutes(0, 0, 0);
   } else if (granularity === "day") {
-    current.setHours(0, 0, 0, 0);
+    current.setUTCHours(0, 0, 0, 0);
   } else if (granularity === "week") {
-    const day = current.getDay();
+    const day = current.getUTCDay();
     const diff = day === 0 ? -6 : 1 - day;
-    current.setDate(current.getDate() + diff);
-    current.setHours(0, 0, 0, 0);
+    current.setUTCDate(current.getUTCDate() + diff);
+    current.setUTCHours(0, 0, 0, 0);
   } else if (granularity === "month") {
-    current.setDate(1);
-    current.setHours(0, 0, 0, 0);
+    current.setUTCDate(1);
+    current.setUTCHours(0, 0, 0, 0);
   }
-  while (current <= to) {
+  while (current <= toWall) {
     const key = formatDateBucket(current, dateFormat);
-    points.push({ date: current.toISOString(), value: map.get(key) ?? 0 });
+    const approxUtc = new Date(current.getTime() - fromOffset);
+    const exactOffset = timezone ? getTimezoneOffsetMs(approxUtc, timezone) : 0;
+    const realUtc = new Date(current.getTime() - exactOffset);
+    points.push({ date: realUtc.toISOString(), value: map.get(key) ?? 0 });
     if (granularity === "hour") {
-      current.setHours(current.getHours() + 1);
+      current.setUTCHours(current.getUTCHours() + 1);
     } else if (granularity === "day") {
-      current.setDate(current.getDate() + 1);
+      current.setUTCDate(current.getUTCDate() + 1);
     } else if (granularity === "week") {
-      current.setDate(current.getDate() + 7);
+      current.setUTCDate(current.getUTCDate() + 7);
     } else if (granularity === "month") {
-      current.setMonth(current.getMonth() + 1);
+      current.setUTCMonth(current.getUTCMonth() + 1);
     }
   }
   return points;
 }
 function formatDateBucket(date, format) {
-  const y = date.getFullYear();
-  const m = String(date.getMonth() + 1).padStart(2, "0");
-  const d = String(date.getDate()).padStart(2, "0");
-  const h = String(date.getHours()).padStart(2, "0");
+  const y = date.getUTCFullYear();
+  const m = String(date.getUTCMonth() + 1).padStart(2, "0");
+  const d = String(date.getUTCDate()).padStart(2, "0");
+  const h = String(date.getUTCHours()).padStart(2, "0");
   if (format === "%Y-%m-%dT%H:00") return `${y}-${m}-${d}T${h}:00`;
   if (format === "%Y-%m-%d") return `${y}-${m}-${d}`;
   if (format === "%Y-%m") return `${y}-${m}`;
   if (format === "%G-W%V") {
-    const jan4 = new Date(y, 0, 4);
-    const dayOfYear = Math.ceil((date.getTime() - new Date(y, 0, 1).getTime()) / 864e5) + 1;
-    const jan4Day = jan4.getDay() || 7;
+    const jan4 = new Date(Date.UTC(y, 0, 4));
+    const dayOfYear = Math.ceil((date.getTime() - Date.UTC(y, 0, 1)) / 864e5) + 1;
+    const jan4Day = jan4.getUTCDay() || 7;
     const weekNum = Math.ceil((dayOfYear + jan4Day - 1) / 7);
     return `${y}-W${String(weekNum).padStart(2, "0")}`;
   }
   return date.toISOString();
 }
 function getISOWeek(date) {
-  const y = date.getFullYear();
-  const jan4 = new Date(y, 0, 4);
-  const dayOfYear = Math.ceil((date.getTime() - new Date(y, 0, 1).getTime()) / 864e5) + 1;
-  const jan4Day = jan4.getDay() || 7;
+  const y = date.getUTCFullYear();
+  const jan4 = new Date(Date.UTC(y, 0, 4));
+  const dayOfYear = Math.ceil((date.getTime() - Date.UTC(y, 0, 1)) / 864e5) + 1;
+  const jan4Day = jan4.getUTCDay() || 7;
   const weekNum = Math.ceil((dayOfYear + jan4Day - 1) / 7);
   return `${y}-W${String(weekNum).padStart(2, "0")}`;
 }
@@ -137,6 +173,38 @@ function generateSecretKey() {
   return `sk_${randomBytes(32).toString("hex")}`;
 }
 
+// src/query-helpers.ts
+function isValidTimezone(tz) {
+  try {
+    Intl.DateTimeFormat(void 0, { timeZone: tz });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function extractQueryParams(req) {
+  const q = req.query ?? Object.fromEntries(new URL(req.url, "http://localhost").searchParams);
+  let timezone;
+  if (typeof q.timezone === "string" && q.timezone) {
+    if (isValidTimezone(q.timezone)) {
+      timezone = q.timezone;
+    } else {
+      console.warn(`[litemetrics] Invalid timezone "${q.timezone}", falling back to UTC`);
+    }
+  }
+  return {
+    siteId: q.siteId,
+    metric: q.metric,
+    period: q.period,
+    dateFrom: q.dateFrom,
+    dateTo: q.dateTo,
+    limit: q.limit ? parseInt(q.limit, 10) : void 0,
+    filters: q.filters ? JSON.parse(q.filters) : void 0,
+    compare: q.compare === "true" || q.compare === "1",
+    timezone
+  };
+}
+
 // src/adapters/clickhouse.ts
 var EVENTS_TABLE = "litemetrics_events";
 var SITES_TABLE = "litemetrics_sites";
@@ -221,8 +289,15 @@ CREATE TABLE IF NOT EXISTS ${SITES_TABLE} (
   SETTINGS index_granularity = 8192
 `;
 function toCHDateTime(d) {
-  const iso = typeof d === "string" ? d : d.toISOString();
-  return iso.replace("T", " ").replace("Z", "");
+  const date = d instanceof Date ? d : toUTCDate(d);
+  const y = date.getUTCFullYear();
+  const mo = String(date.getUTCMonth() + 1).padStart(2, "0");
+  const da = String(date.getUTCDate()).padStart(2, "0");
+  const h = String(date.getUTCHours()).padStart(2, "0");
+  const mi = String(date.getUTCMinutes()).padStart(2, "0");
+  const s = String(date.getUTCSeconds()).padStart(2, "0");
+  const ms = String(date.getUTCMilliseconds()).padStart(3, "0");
+  return `${y}-${mo}-${da} ${h}:${mi}:${s}.${ms}`;
 }
 function normalizedUtmSourceExpr() {
   return `multiIf(
@@ -942,7 +1017,7 @@ var ClickHouseAdapter = class {
       dateTo: params.dateTo
     });
     const granularity = params.granularity ?? autoGranularity(period);
-    const bucketFn = this.granularityToClickHouseFunc(granularity);
+    const bucketFn = this.granularityToClickHouseFunc(granularity, params.timezone);
     const dateFormat = granularityToDateFormat(granularity);
     const filter = buildFilterConditions(params.filters);
     const filterSql = filter.conditions.length > 0 ? ` AND ${filter.conditions.join(" AND ")}` : "";
@@ -991,38 +1066,41 @@ var ClickHouseAdapter = class {
       new Date(dateRange.to),
       granularity,
       dateFormat,
-      mappedRows
+      mappedRows,
+      params.timezone
     );
     return { metric: params.metric, granularity, data };
   }
-  granularityToClickHouseFunc(g) {
+  granularityToClickHouseFunc(g, timezone) {
+    const safeTz = timezone && isValidTimezone(timezone) ? timezone : void 0;
+    const tz = safeTz ? `, '${safeTz}'` : "";
     switch (g) {
       case "hour":
-        return "toStartOfHour(timestamp)";
+        return `toStartOfHour(timestamp${tz})`;
       case "day":
-        return "toStartOfDay(timestamp)";
+        return `toStartOfDay(timestamp${tz})`;
       case "week":
-        return "toStartOfWeek(timestamp, 1)";
+        return `toStartOfWeek(timestamp, 1${tz})`;
       // 1 = Monday
       case "month":
-        return "toStartOfMonth(timestamp)";
+        return `toStartOfMonth(timestamp${tz})`;
     }
   }
   convertClickHouseBucket(bucket, granularity) {
-    const date = new Date(bucket);
-    const y = date.getFullYear();
-    const m = String(date.getMonth() + 1).padStart(2, "0");
-    const d = String(date.getDate()).padStart(2, "0");
-    const h = String(date.getHours()).padStart(2, "0");
+    const date = toUTCDate(bucket);
+    const y = date.getUTCFullYear();
+    const m = String(date.getUTCMonth() + 1).padStart(2, "0");
+    const d = String(date.getUTCDate()).padStart(2, "0");
+    const h = String(date.getUTCHours()).padStart(2, "0");
     switch (granularity) {
       case "hour":
         return `${y}-${m}-${d}T${h}:00`;
       case "day":
         return `${y}-${m}-${d}`;
       case "week": {
-        const jan4 = new Date(y, 0, 4);
-        const dayOfYear = Math.ceil((date.getTime() - new Date(y, 0, 1).getTime()) / 864e5) + 1;
-        const jan4Day = jan4.getDay() || 7;
+        const jan4 = new Date(Date.UTC(y, 0, 4));
+        const dayOfYear = Math.ceil((date.getTime() - Date.UTC(y, 0, 1)) / 864e5) + 1;
+        const jan4Day = jan4.getUTCDay() || 7;
         const weekNum = Math.ceil((dayOfYear + jan4Day - 1) / 7);
         return `${y}-W${String(weekNum).padStart(2, "0")}`;
       }
@@ -1051,7 +1129,7 @@ var ClickHouseAdapter = class {
     );
     const cohortMap = /* @__PURE__ */ new Map();
     for (const v of rows) {
-      const firstDate = new Date(v.first_event);
+      const firstDate = toUTCDate(v.first_event);
       const cohortWeek = getISOWeek(firstDate);
       if (!cohortMap.has(cohortWeek)) {
         cohortMap.set(cohortWeek, { visitors: /* @__PURE__ */ new Set(), weekSets: /* @__PURE__ */ new Map() });
@@ -1059,7 +1137,7 @@ var ClickHouseAdapter = class {
       const cohort = cohortMap.get(cohortWeek);
       cohort.visitors.add(v.visitor_id);
       const eventWeeks = (Array.isArray(v.active_weeks) ? v.active_weeks : []).map((w) => {
-        const d = new Date(w);
+        const d = toUTCDate(w);
         return getISOWeek(d);
       });
       for (const w of eventWeeks) {
@@ -1226,8 +1304,8 @@ var ClickHouseAdapter = class {
       visitorId: String(u.visitor_id),
       userId: u.userId ? String(u.userId) : void 0,
       traits: this.parseJSON(u.traits),
-      firstSeen: new Date(String(u.firstSeen)).toISOString(),
-      lastSeen: new Date(String(u.lastSeen)).toISOString(),
+      firstSeen: toUTCDate(String(u.firstSeen)).toISOString(),
+      lastSeen: toUTCDate(String(u.lastSeen)).toISOString(),
       totalEvents: Number(u.totalEvents),
       totalPageviews: Number(u.totalPageviews),
       totalSessions: Number(u.totalSessions),
@@ -1350,8 +1428,8 @@ var ClickHouseAdapter = class {
       visitorIds,
       userId,
       traits: this.parseJSON(u.traits),
-      firstSeen: new Date(String(u.firstSeen)).toISOString(),
-      lastSeen: new Date(String(u.lastSeen)).toISOString(),
+      firstSeen: toUTCDate(String(u.firstSeen)).toISOString(),
+      lastSeen: toUTCDate(String(u.lastSeen)).toISOString(),
       totalEvents: Number(u.totalEvents),
       totalPageviews: Number(u.totalPageviews),
       totalSessions: Number(u.totalSessions),
@@ -1625,15 +1703,15 @@ var ClickHouseAdapter = class {
       domain: row.domain ? String(row.domain) : void 0,
       allowedOrigins: row.allowed_origins ? JSON.parse(String(row.allowed_origins)) : void 0,
       conversionEvents: row.conversion_events ? JSON.parse(String(row.conversion_events)) : void 0,
-      createdAt: new Date(String(row.created_at)).toISOString(),
-      updatedAt: new Date(String(row.updated_at)).toISOString()
+      createdAt: toUTCDate(String(row.created_at)).toISOString(),
+      updatedAt: toUTCDate(String(row.updated_at)).toISOString()
     };
   }
   toEventListItem(row) {
     return {
       id: String(row.event_id ?? ""),
       type: String(row.type),
-      timestamp: new Date(String(row.timestamp)).toISOString(),
+      timestamp: toUTCDate(String(row.timestamp)).toISOString(),
       visitorId: String(row.visitor_id),
       sessionId: String(row.session_id),
       url: row.url ? String(row.url) : void 0,
@@ -3289,7 +3367,8 @@ async function createCollector(config) {
             dateFrom: params.dateFrom,
             dateTo: params.dateTo,
             granularity: q.granularity,
-            filters: q.filters ? JSON.parse(q.filters) : void 0
+            filters: q.filters ? JSON.parse(q.filters) : void 0,
+            timezone: params.timezone
           };
           if (tsParams.metric === "conversions") {
             const site = await db.getSite(params.siteId);
@@ -3591,19 +3670,6 @@ async function parseBody(req) {
     req.on("error", reject);
   });
 }
-function extractQueryParams(req) {
-  const q = req.query ?? Object.fromEntries(new URL(req.url, "http://localhost").searchParams);
-  return {
-    siteId: q.siteId,
-    metric: q.metric,
-    period: q.period,
-    dateFrom: q.dateFrom,
-    dateTo: q.dateTo,
-    limit: q.limit ? parseInt(q.limit, 10) : void 0,
-    filters: q.filters ? JSON.parse(q.filters) : void 0,
-    compare: q.compare === "true" || q.compare === "1"
-  };
-}
 function sendJson(res, status, body) {
   if (typeof res.status === "function" && typeof res.json === "function") {
     res.status(status).json(body);