lduck 0.0.4 → 0.0.6

package/dist/index.js

@@ -631,8 +631,12 @@ class LogDatabase {
     const rangeStartMs = Math.min(startTime.getTime(), endTime.getTime());
     const rangeEndMs = Math.max(startTime.getTime(), endTime.getTime());
     const spanMs = Math.max(1e3, rangeEndMs - rangeStartMs);
-    const intervalMs = Math.max(1e3, Math.floor(spanMs / buckets));
-    const interval = intervalMsToIntervalString(intervalMs);
+    const rawIntervalMs = Math.max(1e3, Math.floor(spanMs / buckets));
+    const interval = intervalMsToIntervalString(rawIntervalMs);
+    const normalizedMs = normalizeIntervalMs(rawIntervalMs);
+    const actualBuckets = Math.ceil(spanMs / normalizedMs);
+    const alignedStart = Math.floor(rangeStartMs / normalizedMs) * normalizedMs;
+    const origin = new Date(alignedStart).toISOString();
     const conditions = buildFilterConditions({
       ...params,
       startTime: new Date(rangeStartMs),
@@ -643,7 +647,7 @@ class LogDatabase {
     const whereClause = `WHERE ${conditions.join(" AND ")}`;
     const reader = await conn.runAndReadAll(
       `SELECT
-         time_bucket(INTERVAL '${interval}', timestamp) AS bucket,
+         time_bucket(INTERVAL '${interval}', timestamp, TIMESTAMP '${origin}') AS bucket,
          UPPER(level) AS lvl,
          COUNT(*) AS cnt
        FROM logs
@@ -660,9 +664,8 @@ class LogDatabase {
       current[level] = count;
       countsByBucket.set(bucketIso, current);
     }
-    const alignedStart = Math.floor(rangeStartMs / intervalMs) * intervalMs;
-    const histogramBuckets = Array.from({ length: buckets }, (_, i) => {
-      const timestamp = new Date(alignedStart + i * intervalMs).toISOString();
+    const histogramBuckets = Array.from({ length: actualBuckets }, (_, i) => {
+      const timestamp = new Date(alignedStart + i * normalizedMs).toISOString();
       return {
         timestamp,
         counts: countsByBucket.get(timestamp) ?? {}
@@ -795,6 +798,27 @@ function intervalMsToIntervalString(intervalMs) {
   const seconds = Math.max(1, Math.floor(intervalMs / secondMs));
   return `${seconds} ${seconds === 1 ? "second" : "seconds"}`;
 }
+function normalizeIntervalMs(intervalMs) {
+  const interval = intervalMsToIntervalString(intervalMs);
+  const match = interval.match(/^(\d+)\s+(\w+)$/);
+  if (!match) return intervalMs;
+  const value = parseInt(match[1], 10);
+  const unit = match[2].replace(/s$/, "");
+  switch (unit) {
+    case "day":
+      return value * 24 * 60 * 60 * 1e3;
+    case "hour":
+      return value * 60 * 60 * 1e3;
+    case "minute":
+      return value * 60 * 1e3;
+    case "second":
+      return value * 1e3;
+    case "millisecond":
+      return value;
+    default:
+      return intervalMs;
+  }
+}
 function appendNullableVarchar(appender, value) {
   if (value !== null) {
     appender.appendVarchar(value);