@antelopejs/dms-marketing 0.3.3 → 0.4.1

package/dist/services/period.js

@@ -1,19 +1,109 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parsePeriodDays = parsePeriodDays;
 exports.periodStart = periodStart;
+exports.periodQueryOf = periodQueryOf;
+exports.comparisonKindOf = comparisonKindOf;
+exports.trailingWindow = trailingWindow;
+exports.resolveQueryWindow = resolveQueryWindow;
+exports.resolveCompareWindow = resolveCompareWindow;
+exports.previousWindow = previousWindow;
+exports.elapsedShare = elapsedShare;
+exports.windowDays = windowDays;
 const constants_1 = require("@/types/constants");
 const query_param_1 = require("./query-param");
 const rollup_write_1 = require("./rollup-write");
-const PERIOD_PATTERN = /^(\d{1,3})d$/;
-function parsePeriodDays(period) {
-    const match = (0, query_param_1.queryString)(period)?.match(PERIOD_PATTERN);
-    if (!match) {
-        return constants_1.DEFAULT_QUERY_PERIOD_DAYS;
-    }
-    return Math.min(Math.max(Number(match[1]), 1), constants_1.MAX_QUERY_PERIOD_DAYS);
-}
 function periodStart(days) {
     return new Date((0, rollup_write_1.getUtcMidnight)(new Date()) - (days - 1) * constants_1.MS_PER_DAY);
 }
+function periodQueryOf(url) {
+    const params = url.searchParams;
+    return {
+        from: params.get("from") ?? undefined,
+        to: params.get("to") ?? undefined,
+        compareFrom: params.get("compareFrom") ?? undefined,
+        compareTo: params.get("compareTo") ?? undefined,
+        preset: params.get("preset") ?? undefined,
+        comparison: params.get("comparison") ?? undefined,
+    };
+}
+function comparisonKindOf(query) {
+    return (0, query_param_1.queryString)(query.comparison) === "previous-year"
+        ? "previous-year"
+        : "previous-period";
+}
+function parseInstant(value) {
+    const raw = (0, query_param_1.queryString)(value);
+    if (!raw) {
+        return undefined;
+    }
+    const time = Date.parse(raw);
+    return Number.isFinite(time) ? time : undefined;
+}
+function firstDayOf(instant) {
+    return Math.round(instant / constants_1.MS_PER_DAY) * constants_1.MS_PER_DAY;
+}
+function lastDayOf(instant) {
+    return Math.round((instant + 1) / constants_1.MS_PER_DAY) * constants_1.MS_PER_DAY - constants_1.MS_PER_DAY;
+}
+function windowOfDays(firstDay, lastDay, localOffset = 0) {
+    const capped = Math.max(firstDay, lastDay - (constants_1.MAX_QUERY_PERIOD_DAYS - 1) * constants_1.MS_PER_DAY);
+    const now = Date.now();
+    return {
+        firstDay: capped,
+        lastDay,
+        days: Math.round((lastDay - capped) / constants_1.MS_PER_DAY) + 1,
+        since: new Date(capped),
+        until: new Date(Math.min(lastDay + constants_1.MS_PER_DAY - 1, now)),
+        inProgress: lastDay === (0, rollup_write_1.getUtcMidnight)(new Date(now)),
+        localOffset,
+    };
+}
+function boundedDays(from, to) {
+    if (from === undefined || to === undefined || to < from) {
+        return null;
+    }
+    const firstDay = firstDayOf(from);
+    return { firstDay, lastDay: lastDayOf(to), localOffset: firstDay - from };
+}
+function daysAhead(bounds) {
+    return Math.max(0, bounds.lastDay - (0, rollup_write_1.getUtcMidnight)(new Date()));
+}
+function shiftedWindow(bounds, shift) {
+    return windowOfDays(bounds.firstDay - shift, bounds.lastDay - shift, bounds.localOffset);
+}
+function readBounds(query) {
+    return boundedDays(parseInstant(query.from), parseInstant(query.to));
+}
+function trailingWindow(days) {
+    const today = (0, rollup_write_1.getUtcMidnight)(new Date());
+    return windowOfDays(today - (days - 1) * constants_1.MS_PER_DAY, today);
+}
+function resolveQueryWindow(query) {
+    const bounds = readBounds(query);
+    if (bounds) {
+        return shiftedWindow(bounds, daysAhead(bounds));
+    }
+    return trailingWindow(constants_1.DEFAULT_QUERY_PERIOD_DAYS);
+}
+function resolveCompareWindow(query) {
+    const bounds = boundedDays(parseInstant(query.compareFrom), parseInstant(query.compareTo));
+    if (!bounds) {
+        return null;
+    }
+    const read = readBounds(query);
+    return shiftedWindow(bounds, read ? daysAhead(read) : 0);
+}
+function previousWindow(window) {
+    const lastDay = window.firstDay - constants_1.MS_PER_DAY;
+    return windowOfDays(lastDay - (window.days - 1) * constants_1.MS_PER_DAY, lastDay, window.localOffset);
+}
+function elapsedShare(window) {
+    if (!window.inProgress) {
+        return 1;
+    }
+    return Math.min(1, (Date.now() - window.lastDay) / constants_1.MS_PER_DAY);
+}
+function windowDays(window) {
+    return Array.from({ length: window.days }, (_, index) => window.firstDay + index * constants_1.MS_PER_DAY);
+}
 //# sourceMappingURL=period.js.map

package/dist/services/period.js.map

@@ -1 +1 @@
-{"version":3,"file":"period.js","sourceRoot":"","sources":["../../src/services/period.ts"],"names":[],"mappings":";;AAeA,0CAMC;AAGD,kCAEC;AA1BD,iDAI2B;AAC3B,+CAA4C;AAC5C,iDAAgD;AAEhD,MAAM,cAAc,GAAG,cAAc,CAAC;AAOtC,SAAgB,eAAe,CAAC,MAAe;IAC7C,MAAM,KAAK,GAAG,IAAA,yBAAW,EAAC,MAAM,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IACzD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,qCAAyB,CAAC;IACnC,CAAC;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,iCAAqB,CAAC,CAAC;AACxE,CAAC;AAGD,SAAgB,WAAW,CAAC,IAAY;IACtC,OAAO,IAAI,IAAI,CAAC,IAAA,6BAAc,EAAC,IAAI,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,sBAAU,CAAC,CAAC;AACxE,CAAC"}
+{"version":3,"file":"period.js","sourceRoot":"","sources":["../../src/services/period.ts"],"names":[],"mappings":"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"}

package/dist/services/prune.d.ts

@@ -4,4 +4,10 @@ export declare function pruneSessions(model: MarketingSessionsModel): Promise<nu
 export declare function pruneStatistics(model: WebsiteStatisticsModel): Promise<number>;
 export declare function pruneStatisticsTops(model: WebsiteStatisticsModel): Promise<number>;
 export declare function pruneSnapshots(model: PageSnapshotsModel): Promise<number>;
+export declare function countRawEventsBefore(cutoff: Date): Promise<number>;
+export declare function countSnapshotsBefore(cutoff: Date): Promise<number>;
+export declare function countStatisticsBefore(cutoff: Date): Promise<{
+    sessions: number;
+    days: number;
+}>;
 export declare function pruneAllTenants(onError: (err: unknown) => void): Promise<void>;

package/dist/services/prune.js

@@ -5,6 +5,9 @@ exports.pruneSessions = pruneSessions;
 exports.pruneStatistics = pruneStatistics;
 exports.pruneStatisticsTops = pruneStatisticsTops;
 exports.pruneSnapshots = pruneSnapshots;
+exports.countRawEventsBefore = countRawEventsBefore;
+exports.countSnapshotsBefore = countSnapshotsBefore;
+exports.countStatisticsBefore = countStatisticsBefore;
 exports.pruneAllTenants = pruneAllTenants;
 const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
 const config_1 = require("@/config");
@@ -31,6 +34,38 @@ async function pruneSnapshots(model) {
     const cutoff = new Date(Date.now() - Math.min(config.snapshotRetention, config.rawEventsRetention));
     return model.deleteOlderThan(cutoff);
 }
+const EPOCH_LOWER_BOUND = new Date(0);
+async function countAcrossTenants(count) {
+    const tenantIds = await (0, interface_database_decorators_1.GetModel)(db_1.WebsitesModel).listTenantIds();
+    let total = 0;
+    for (const tenantId of tenantIds) {
+        total += await count(tenantId);
+    }
+    return total;
+}
+function countRawEventsBefore(cutoff) {
+    return countAcrossTenants((id) => (0, interface_database_decorators_1.GetModel)(db_1.MarketingEventsModel, id)
+        .table.between("timestamp", EPOCH_LOWER_BOUND, cutoff)
+        .count()
+        .run());
+}
+function countSnapshotsBefore(cutoff) {
+    return countAcrossTenants((id) => (0, interface_database_decorators_1.GetModel)(db_1.PageSnapshotsModel, id)
+        .table.between("capturedAt", EPOCH_LOWER_BOUND, cutoff)
+        .count()
+        .run());
+}
+async function countStatisticsBefore(cutoff) {
+    const sessions = await countAcrossTenants((id) => (0, interface_database_decorators_1.GetModel)(db_1.MarketingSessionsModel, id)
+        .table.between("lastSeenAt", EPOCH_LOWER_BOUND, cutoff)
+        .count()
+        .run());
+    const days = await countAcrossTenants((id) => (0, interface_database_decorators_1.GetModel)(db_1.WebsiteStatisticsModel, id)
+        .table.between("day", 0, cutoff.getTime())
+        .count()
+        .run());
+    return { sessions, days };
+}
 const TENANT_PRUNES = [
     (id) => pruneRawEvents((0, interface_database_decorators_1.GetModel)(db_1.MarketingEventsModel, id)),
     (id) => pruneSnapshots((0, interface_database_decorators_1.GetModel)(db_1.PageSnapshotsModel, id)),

package/dist/services/prune.js.map

@@ -1 +1 @@
-{"version":3,"file":"prune.js","sourceRoot":"","sources":["../../src/services/prune.ts"],"names":[],"mappings":";;AAWA,wCAKC;AAOD,sCAKC;AAED,0CAKC;AASD,kDAKC;AAID,wCAQC;AAgBD,0CASC;AAtFD,6FAAqE;AACrE,qCAAqC;AACrC,6BAMc;AACd,iDAAwE;AAEjE,KAAK,UAAU,cAAc,CAClC,KAA2B;IAE3B,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAA,kBAAS,GAAE,CAAC,kBAAkB,CAAC,CAAC;IACrE,OAAO,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;AACvC,CAAC;AAOM,KAAK,UAAU,aAAa,CACjC,KAA6B;IAE7B,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAA,kBAAS,GAAE,CAAC,mBAAmB,CAAC,CAAC;IACtE,OAAO,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;AACvC,CAAC;AAEM,KAAK,UAAU,eAAe,CACnC,KAA6B;IAE7B,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAA,kBAAS,GAAE,CAAC,mBAAmB,CAAC;IAC5D,OAAO,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;AACxC,CAAC;AASM,KAAK,UAAU,mBAAmB,CACvC,KAA6B;IAE7B,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,mCAAuB,GAAG,sBAAU,CAAC;IACjE,OAAO,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;AACvC,CAAC;AAIM,KAAK,UAAU,cAAc,CAClC,KAAyB;IAEzB,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,IAAI,IAAI,CACrB,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAC3E,CAAC;IACF,OAAO,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,aAAa,GAAG;IACpB,CAAC,EAAU,EAAE,EAAE,CAAC,cAAc,CAAC,IAAA,wCAAQ,EAAC,yBAAoB,EAAE,EAAE,CAAC,CAAC;IAClE,CAAC,EAAU,EAAE,EAAE,CAAC,cAAc,CAAC,IAAA,wCAAQ,EAAC,uBAAkB,EAAE,EAAE,CAAC,CAAC;IAChE,CAAC,EAAU,EAAE,EAAE,CAAC,aAAa,CAAC,IAAA,wCAAQ,EAAC,2BAAsB,EAAE,EAAE,CAAC,CAAC;IACnE,CAAC,EAAU,EAAE,EAAE,CAAC,eAAe,CAAC,IAAA,wCAAQ,EAAC,2BAAsB,EAAE,EAAE,CAAC,CAAC;IACrE,CAAC,EAAU,EAAE,EAAE,CAAC,mBAAmB,CAAC,IAAA,wCAAQ,EAAC,2BAAsB,EAAE,EAAE,CAAC,CAAC;CAC1E,CAAC;AAQK,KAAK,UAAU,eAAe,CACnC,OAA+B;IAE/B,MAAM,SAAS,GAAG,MAAM,IAAA,wCAAQ,EAAC,kBAAa,CAAC,CAAC,aAAa,EAAE,CAAC;IAChE,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC;YAClC,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"prune.js","sourceRoot":"","sources":["../../src/services/prune.ts"],"names":[],"mappings":"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"}

package/dist/services/request-body.d.ts

@@ -1,2 +1 @@
-import type { RequestContext } from "@antelopejs/interface-api";
-export declare function readBoundedBody(context: RequestContext, maxBytes: number): Promise<Buffer | undefined>;
+export declare function parseJsonOr400(body: Buffer): unknown;

package/dist/services/request-body.js

@@ -1,41 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readBoundedBody = readBoundedBody;
-function readBoundedBody(context, maxBytes) {
-    const request = context.rawRequest;
-    const declared = Number(request.headers["content-length"]);
-    if (Number.isFinite(declared) && declared > maxBytes) {
-        return Promise.resolve(undefined);
+exports.parseJsonOr400 = parseJsonOr400;
+const interface_api_1 = require("@antelopejs/interface-api");
+const constants_1 = require("@/types/constants");
+const INVALID_BODY_MESSAGE = "invalid body";
+function parseJsonOr400(body) {
+    try {
+        return JSON.parse(body.toString("utf8"));
+    }
+    catch {
+        throw new interface_api_1.HTTPResult(constants_1.HTTP_BAD_REQUEST, INVALID_BODY_MESSAGE);
     }
-    return new Promise((resolve, reject) => {
-        const chunks = [];
-        let size = 0;
-        let cut = false;
-        request.on("data", (chunk) => {
-            if (cut) {
-                return;
-            }
-            size += chunk.length;
-            if (size > maxBytes) {
-                cut = true;
-                request.destroy();
-                resolve(undefined);
-                return;
-            }
-            chunks.push(chunk);
-        });
-        request.on("end", () => {
-            if (!cut) {
-                resolve(Buffer.concat(chunks));
-            }
-        });
-        request.on("error", (err) => {
-            if (cut) {
-                resolve(undefined);
-                return;
-            }
-            reject(err);
-        });
-    });
 }
 //# sourceMappingURL=request-body.js.map

package/dist/services/request-body.js.map

@@ -1 +1 @@
-{"version":3,"file":"request-body.js","sourceRoot":"","sources":["../../src/services/request-body.ts"],"names":[],"mappings":";;AAQA,0CAuCC;AAvCD,SAAgB,eAAe,CAC7B,OAAuB,EACvB,QAAgB;IAEhB,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;IACnC,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC3D,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,QAAQ,EAAE,CAAC;QACrD,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,IAAI,GAAG,GAAG,KAAK,CAAC;QAChB,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACnC,IAAI,GAAG,EAAE,CAAC;gBACR,OAAO;YACT,CAAC;YACD,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC;YACrB,IAAI,IAAI,GAAG,QAAQ,EAAE,CAAC;gBACpB,GAAG,GAAG,IAAI,CAAC;gBACX,OAAO,CAAC,OAAO,EAAE,CAAC;gBAClB,OAAO,CAAC,SAAS,CAAC,CAAC;gBACnB,OAAO;YACT,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;YACrB,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC1B,IAAI,GAAG,EAAE,CAAC;gBACR,OAAO,CAAC,SAAS,CAAC,CAAC;gBACnB,OAAO;YACT,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"request-body.js","sourceRoot":"","sources":["../../src/services/request-body.ts"],"names":[],"mappings":";;AAUA,wCAMC;AAhBD,6DAAuD;AACvD,iDAAqD;AAErD,MAAM,oBAAoB,GAAG,cAAc,CAAC;AAO5C,SAAgB,cAAc,CAAC,IAAY;IACzC,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3C,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,0BAAU,CAAC,4BAAgB,EAAE,oBAAoB,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC"}

package/dist/services/request-meta.d.ts

@@ -1,3 +1,2 @@
 import type { RequestContext } from "@antelopejs/interface-api";
-export declare function clientIp(context: RequestContext): string;
 export declare function userAgentOf(context: RequestContext): string;

package/dist/services/request-meta.js

@@ -1,17 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clientIp = clientIp;
 exports.userAgentOf = userAgentOf;
-function clientIp(context) {
-    const fwd = context.rawRequest.headers["x-forwarded-for"];
-    if (typeof fwd === "string") {
-        return fwd.split(",")[0].trim();
-    }
-    if (Array.isArray(fwd) && fwd.length > 0) {
-        return fwd[0];
-    }
-    return context.rawRequest.socket.remoteAddress ?? "";
-}
 function userAgentOf(context) {
     const header = context.rawRequest.headers["user-agent"];
     return typeof header === "string" ? header : "";

package/dist/services/request-meta.js.map

@@ -1 +1 @@
-{"version":3,"file":"request-meta.js","sourceRoot":"","sources":["../../src/services/request-meta.ts"],"names":[],"mappings":";;AASA,4BASC;AAED,kCAGC;AAdD,SAAgB,QAAQ,CAAC,OAAuB;IAC9C,MAAM,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC1D,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAClC,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC;IAChB,CAAC;IACD,OAAO,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,IAAI,EAAE,CAAC;AACvD,CAAC;AAED,SAAgB,WAAW,CAAC,OAAuB;IACjD,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACxD,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;AAClD,CAAC"}
+{"version":3,"file":"request-meta.js","sourceRoot":"","sources":["../../src/services/request-meta.ts"],"names":[],"mappings":";;AASA,kCAGC;AAHD,SAAgB,WAAW,CAAC,OAAuB;IACjD,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACxD,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;AAClD,CAAC"}

package/dist/services/rollups.d.ts

@@ -0,0 +1,25 @@
+import type { WebsiteStatistics } from "@/db/tables/website_statistics.table";
+import type { Website } from "@/db/tables/websites.table";
+import type { MarketingDayCounters, TopDimension, TopEntries } from "@/types";
+import { type QueryWindow } from "./period";
+export type RollupTotals = Omit<MarketingDayCounters, "day">;
+export interface RollupRead {
+    window: QueryWindow;
+    rows: WebsiteStatistics[];
+    compare: QueryWindow | null;
+    compareRows: WebsiteStatistics[];
+    compareDays: WebsiteStatistics[];
+}
+export declare const EMPTY_TOTALS: RollupTotals;
+export declare function readRollups(website: Website, window: QueryWindow): Promise<WebsiteStatistics[]>;
+export declare function readRollupsWithComparison(website: Website, window: QueryWindow, compare: QueryWindow | null): Promise<RollupRead>;
+export declare function sumRollups(rows: readonly WebsiteStatistics[]): RollupTotals;
+export declare function dailyValues(rows: readonly WebsiteStatistics[], window: QueryWindow, pick: (row: WebsiteStatistics) => number): number[];
+export declare function mergeDimension(rows: ReadonlyArray<Pick<WebsiteStatistics, "tops">>, dimension: TopDimension): TopEntries;
+export interface RankedEntry {
+    key: string;
+    value: number;
+}
+export declare function rankEntries(entries: TopEntries, limit?: number): RankedEntry[];
+export declare function percentChange(current: number, previous: number | undefined): number | null;
+export declare function shareOf(value: number, total: number): number;

package/dist/services/rollups.js

@@ -0,0 +1,102 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EMPTY_TOTALS = void 0;
+exports.readRollups = readRollups;
+exports.readRollupsWithComparison = readRollupsWithComparison;
+exports.sumRollups = sumRollups;
+exports.dailyValues = dailyValues;
+exports.mergeDimension = mergeDimension;
+exports.rankEntries = rankEntries;
+exports.percentChange = percentChange;
+exports.shareOf = shareOf;
+const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
+const db_1 = require("@/db");
+const period_1 = require("./period");
+exports.EMPTY_TOTALS = {
+    pageviews: 0,
+    sessions: 0,
+    newVisitors: 0,
+    customEvents: 0,
+    bouncedSessions: 0,
+    sessionDurationMs: 0,
+};
+async function readRollups(website, window) {
+    return (0, interface_database_decorators_1.GetModel)(db_1.WebsiteStatisticsModel, website.tenantId).getDaysBetween(website._id, window.firstDay, window.lastDay);
+}
+async function readRollupsWithComparison(website, window, compare) {
+    const [rows, stored] = await Promise.all([
+        readRollups(website, window),
+        compare ? readRollups(website, compare) : Promise.resolve([]),
+    ]);
+    if (!compare || stored.length === 0) {
+        return { window, rows, compare: null, compareRows: [], compareDays: [] };
+    }
+    const share = (0, period_1.elapsedShare)(window);
+    const compareRows = share < 1
+        ? stored.map((row) => row.day === compare.lastDay ? scaleRow(row, share) : row)
+        : stored;
+    return { window, rows, compare, compareRows, compareDays: stored };
+}
+function scaleEntries(entries, share) {
+    return Object.fromEntries(Object.entries(entries).map(([key, count]) => [key, count * share]));
+}
+function scaleRow(row, share) {
+    const tops = row.tops
+        ? Object.fromEntries(Object.entries(row.tops).map(([dimension, entries]) => [
+            dimension,
+            entries ? scaleEntries(entries, share) : entries,
+        ]))
+        : row.tops;
+    return Object.assign({}, row, {
+        pageviews: row.pageviews * share,
+        sessions: row.sessions * share,
+        newVisitors: row.newVisitors * share,
+        customEvents: row.customEvents * share,
+        bouncedSessions: (row.bouncedSessions ?? 0) * share,
+        sessionDurationMs: (row.sessionDurationMs ?? 0) * share,
+        tops,
+    });
+}
+function sumRollups(rows) {
+    return rows.reduce((totals, row) => ({
+        pageviews: totals.pageviews + row.pageviews,
+        sessions: totals.sessions + row.sessions,
+        newVisitors: totals.newVisitors + row.newVisitors,
+        customEvents: totals.customEvents + row.customEvents,
+        bouncedSessions: totals.bouncedSessions + (row.bouncedSessions ?? 0),
+        sessionDurationMs: totals.sessionDurationMs + (row.sessionDurationMs ?? 0),
+    }), { ...exports.EMPTY_TOTALS });
+}
+function dailyValues(rows, window, pick) {
+    const byDay = new Map(rows.map((row) => [row.day, row]));
+    return (0, period_1.windowDays)(window).map((day) => {
+        const row = byDay.get(day);
+        return row ? pick(row) : 0;
+    });
+}
+function mergeDimension(rows, dimension) {
+    const merged = {};
+    for (const row of rows) {
+        for (const [key, count] of Object.entries(row.tops?.[dimension] ?? {})) {
+            merged[key] = (merged[key] ?? 0) + count;
+        }
+    }
+    return merged;
+}
+function rankEntries(entries, limit) {
+    const ranked = Object.entries(entries)
+        .filter(([, value]) => value > 0)
+        .map(([key, value]) => ({ key, value }))
+        .sort((a, b) => b.value - a.value);
+    return limit === undefined ? ranked : ranked.slice(0, limit);
+}
+function percentChange(current, previous) {
+    if (previous === undefined || previous === 0) {
+        return null;
+    }
+    return ((current - previous) / previous) * 100;
+}
+function shareOf(value, total) {
+    return total > 0 ? (value / total) * 100 : 0;
+}
+//# sourceMappingURL=rollups.js.map

package/dist/services/rollups.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rollups.js","sourceRoot":"","sources":["../../src/services/rollups.ts"],"names":[],"mappings":"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"}

package/dist/services/sessionize.d.ts

@@ -5,6 +5,8 @@ export interface SessionInput {
     websiteId: string;
     visitorId: string;
     now: Date;
+    startedAt: Date;
+    opensSession: boolean;
     sessionIdleTimeoutMs: number;
     entryUrl: string;
     referrerDomain?: string;
@@ -19,5 +21,7 @@ export interface SessionResolution {
     session: MarketingSession;
     isNewSession: boolean;
     isNewVisitor: boolean;
+    extendsSession: boolean;
 }
-export declare function resolveSession(model: MarketingSessionsModel, input: SessionInput): Promise<SessionResolution>;
+export declare function resolveSession(model: MarketingSessionsModel, input: SessionInput): Promise<SessionResolution | undefined>;
+export declare function findOpenSession(model: MarketingSessionsModel, websiteId: string, visitorId: string, now: Date, idleTimeoutMs: number): Promise<MarketingSession | undefined>;

package/dist/services/sessionize.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveSession = resolveSession;
+exports.findOpenSession = findOpenSession;
 const node_crypto_1 = require("node:crypto");
 const constants_1 = require("@/types/constants");
 const bounded_cache_1 = require("./bounded-cache");
@@ -13,16 +14,44 @@ function cacheKey(websiteId, visitorId) {
 function cacheSession(key, session) {
     (0, bounded_cache_1.setBounded)(sessionCache, key, session, constants_1.SESSION_CACHE_MAX_ENTRIES);
 }
-function isFresh(session, input) {
-    const elapsed = input.now.getTime() - session.lastSeenAt.getTime();
-    return elapsed < input.sessionIdleTimeoutMs;
+function isFresh(session, now, idleTimeoutMs) {
+    return now.getTime() - session.lastSeenAt.getTime() < idleTimeoutMs;
+}
+const ACQUISITION_FIELDS = [
+    ["utmSource", "source"],
+    ["utmMedium", "medium"],
+    ["utmCampaign", "campaign"],
+    ["utmTerm", "term"],
+    ["utmContent", "content"],
+];
+function startsNewCampaign(session, input) {
+    const hasCampaign = input.clickIdParam !== undefined ||
+        ACQUISITION_FIELDS.some(([, field]) => input.utm[field] !== undefined);
+    return (hasCampaign &&
+        ((session.clickIdParam ?? undefined) !== input.clickIdParam ||
+            ACQUISITION_FIELDS.some(([column, field]) => (session[column] ?? undefined) !== input.utm[field])));
+}
+function joins(session, input) {
+    if (!input.opensSession) {
+        return true;
+    }
+    return (isFresh(session, input.now, input.sessionIdleTimeoutMs) &&
+        !startsNewCampaign(session, input));
+}
+function joined(session, input) {
+    return {
+        session,
+        isNewSession: false,
+        isNewVisitor: false,
+        extendsSession: isFresh(session, input.now, input.sessionIdleTimeoutMs),
+    };
 }
 function cachedResolution(key, input) {
     const cached = sessionCache.get(key);
-    if (!cached || !isFresh(cached, input)) {
+    if (!cached || !joins(cached, input)) {
         return undefined;
     }
-    return { session: cached, isNewSession: false, isNewVisitor: false };
+    return joined(cached, input);
 }
 async function resolveSession(model, input) {
     const key = cacheKey(input.websiteId, input.visitorId);
@@ -38,21 +67,29 @@ async function resolveUncached(model, input, key) {
         return cached;
     }
     const latest = await model.findLatestForVisitor(input.websiteId, input.visitorId);
-    if (latest && isFresh(latest, input)) {
+    if (latest && joins(latest, input)) {
         cacheSession(key, latest);
-        return { session: latest, isNewSession: false, isNewVisitor: false };
+        return joined(latest, input);
+    }
+    if (!input.opensSession) {
+        return undefined;
     }
     const session = await createSession(model, input, latest === undefined);
     cacheSession(key, session);
-    return { session, isNewSession: true, isNewVisitor: latest === undefined };
+    return {
+        session,
+        isNewSession: true,
+        isNewVisitor: latest === undefined,
+        extendsSession: true,
+    };
 }
 async function createSession(model, input, isNewVisitor) {
     const session = {
         _id: (0, node_crypto_1.randomUUID)(),
         websiteId: input.websiteId,
         visitorId: input.visitorId,
-        startedAt: input.now,
-        lastSeenAt: input.now,
+        startedAt: input.startedAt,
+        lastSeenAt: input.startedAt,
         isNewVisitor,
         entryUrl: input.entryUrl,
         exitUrl: input.entryUrl,
@@ -75,4 +112,9 @@ async function createSession(model, input, isNewVisitor) {
     await model.insert(session);
     return session;
 }
+async function findOpenSession(model, websiteId, visitorId, now, idleTimeoutMs) {
+    const session = sessionCache.get(cacheKey(websiteId, visitorId)) ??
+        (await model.findLatestForVisitor(websiteId, visitorId));
+    return session && isFresh(session, now, idleTimeoutMs) ? session : undefined;
+}
 //# sourceMappingURL=sessionize.js.map

package/dist/services/sessionize.js.map

@@ -1 +1 @@
-{"version":3,"file":"sessionize.js","sourceRoot":"","sources":["../../src/services/sessionize.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sessionize.js","sourceRoot":"","sources":["../../src/services/sessionize.ts"],"names":[],"mappings":"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"}

package/dist/services/settings.d.ts

@@ -1,6 +1,45 @@
+import type { BannerContent } from "@antelopejs/interface-dms/base/banner";
+import type { ComposedText } from "@antelopejs/interface-dms/base/types/composed-text";
 import type { MarketingSettingsModel } from "@/db";
-import { type SettingsFormValues } from "@/types/settings";
+import type { MarketingSettings } from "@/db/tables/marketing_settings.table";
+import { type NumberSetting, type SettingsConfigKey, type SettingsFormValues } from "@/types/settings";
+type SettingsDocument = Pick<MarketingSettings, SettingsConfigKey>;
 export declare function getVisitorHashSecret(): string;
+export declare function reloadSettings(model: MarketingSettingsModel): Promise<void>;
 export declare function settingsFormValues(): SettingsFormValues;
+export declare function defaultInUiUnits(setting: NumberSetting): number;
+declare const RETENTION_CUTS: readonly [{
+    readonly id: "rawEventsRetentionDays";
+    readonly key: "rawEventsRetention";
+}, {
+    readonly id: "statisticsRetentionDays";
+    readonly key: "statisticsRetention";
+}, {
+    readonly id: "snapshotRetentionDays";
+    readonly key: "snapshotRetention";
+}];
+export type RetentionCutField = (typeof RETENTION_CUTS)[number]["id"];
+export type RetentionCutCounter = (field: RetentionCutField, cutoff: Date) => Promise<{
+    count: number;
+    what: string;
+}>;
+export declare const countRetentionCut: RetentionCutCounter;
+export declare function confirmRetentionCuts(actor: string, current: SettingsDocument | undefined, next: SettingsDocument, count?: RetentionCutCounter): Promise<void>;
+export type SettingsSaveGuard = (current: SettingsDocument | undefined, next: SettingsDocument) => Promise<void>;
 export declare function loadSettings(model: MarketingSettingsModel): Promise<void>;
-export declare function applySettingsForm(model: MarketingSettingsModel, values: SettingsFormValues): Promise<SettingsFormValues>;
+export declare function applySettingsForm(model: MarketingSettingsModel, values: SettingsFormValues, guard?: SettingsSaveGuard): Promise<SettingsFormValues>;
+export interface CollectionStatus {
+    enabled: boolean;
+    websites: number;
+    sessions: number;
+}
+export declare function collectionStatus(tenantId: string): Promise<CollectionStatus>;
+export interface RetentionMeter {
+    value: number;
+    max: number;
+    valueLabel: ComposedText;
+}
+export declare function retentionGlance(item: unknown): RetentionMeter | null;
+export declare function collectionBanner(status: CollectionStatus, collectionUrl: string): BannerContent;
+export declare function collectionPausedNotice(): BannerContent | null;
+export {};