@10x-media/analytics 0.1.0-beta.1 → 0.1.0-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +64 -0
- package/README.md +1 -0
- package/dist/adapters/ga4/ga4.js +17 -7
- package/dist/adapters/ga4/ga4.js.map +1 -1
- package/dist/adapters/plausible/plausible.js +5 -0
- package/dist/adapters/plausible/plausible.js.map +1 -1
- package/dist/adapters/posthog/posthog.js +28 -17
- package/dist/adapters/posthog/posthog.js.map +1 -1
- package/dist/adapters/umami/umami.js +1 -1
- package/dist/adapters/umami/umami.js.map +1 -1
- package/dist/binding/types.d.ts +9 -7
- package/dist/charts/TrendChart.js +17 -8
- package/dist/charts/TrendChart.js.map +1 -1
- package/dist/charts/bucket.js +31 -24
- package/dist/charts/bucket.js.map +1 -1
- package/dist/core/cacheKey.js +4 -7
- package/dist/core/cacheKey.js.map +1 -1
- package/dist/core/contract.d.ts +12 -1
- package/dist/core/contract.js.map +1 -1
- package/dist/core/options.d.ts +27 -2
- package/dist/core/options.js +15 -8
- package/dist/core/options.js.map +1 -1
- package/dist/exports/rsc.d.ts +6 -3
- package/dist/exports/rsc.js +5 -2
- package/dist/fields/AnalyticsPanelClient.js +193 -0
- package/dist/fields/AnalyticsPanelClient.js.map +1 -0
- package/dist/fields/AnalyticsPanelField.d.ts +28 -0
- package/dist/fields/AnalyticsPanelField.js +54 -0
- package/dist/fields/AnalyticsPanelField.js.map +1 -0
- package/dist/fields/AnalyticsStatField.d.ts +1 -1
- package/dist/fields/AnalyticsStatField.js +14 -3
- package/dist/fields/AnalyticsStatField.js.map +1 -1
- package/dist/fields/emptyState.js +46 -0
- package/dist/fields/emptyState.js.map +1 -0
- package/dist/fields/factories.d.ts +10 -2
- package/dist/fields/factories.js +33 -4
- package/dist/fields/factories.js.map +1 -1
- package/dist/fields/readForDocument.d.ts +57 -0
- package/dist/fields/readForDocument.js +50 -10
- package/dist/fields/readForDocument.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.js +29 -4
- package/dist/index.js.map +1 -1
- package/dist/native/ingest/endpoint.js +5 -2
- package/dist/native/ingest/endpoint.js.map +1 -1
- package/dist/native/ingest/normalizeEvent.js +3 -2
- package/dist/native/ingest/normalizeEvent.js.map +1 -1
- package/dist/native/ingest/writeEvent.js +2 -1
- package/dist/native/ingest/writeEvent.js.map +1 -1
- package/dist/native/nativeAdapter.js +7 -4
- package/dist/native/nativeAdapter.js.map +1 -1
- package/dist/native/rollupAcc.js +9 -6
- package/dist/native/rollupAcc.js.map +1 -1
- package/dist/native/rollups/bumpRollup.js +17 -1
- package/dist/native/rollups/bumpRollup.js.map +1 -1
- package/dist/native/rollups/deltas.js +2 -2
- package/dist/native/rollups/deltas.js.map +1 -1
- package/dist/plugin/documentEndpoint.js +80 -0
- package/dist/plugin/documentEndpoint.js.map +1 -0
- package/dist/plugin/paths.js +11 -0
- package/dist/plugin/paths.js.map +1 -0
- package/dist/plugin/runtime.js +2 -1
- package/dist/plugin/runtime.js.map +1 -1
- package/dist/plugin/warmTask.js +1 -1
- package/dist/surfacing/engine.js +5 -5
- package/dist/surfacing/engine.js.map +1 -1
- package/dist/sync/collection.js +11 -6
- package/dist/sync/collection.js.map +1 -1
- package/dist/sync/syncTask.js +1 -1
- package/dist/timeframe/presets.js +12 -16
- package/dist/timeframe/presets.js.map +1 -1
- package/dist/timeframe/tz.js +110 -0
- package/dist/timeframe/tz.js.map +1 -0
- package/dist/translations/de.js +78 -0
- package/dist/translations/de.js.map +1 -0
- package/dist/translations/en.js +5 -2
- package/dist/translations/en.js.map +1 -1
- package/dist/translations/index.d.ts +2 -1
- package/dist/translations/index.js +6 -2
- package/dist/translations/index.js.map +1 -1
- package/dist/translations/keys.d.ts +5 -2
- package/dist/translations/keys.js +5 -2
- package/dist/translations/keys.js.map +1 -1
- package/dist/translations/metricKeys.js +0 -2
- package/dist/translations/metricKeys.js.map +1 -1
- package/dist/widgets/AnalyticsBreakdownWidget.js +1 -1
- package/dist/widgets/AnalyticsMetricWidget.js +9 -1
- package/dist/widgets/AnalyticsMetricWidget.js.map +1 -1
- package/dist/widgets/AnalyticsRealtimeWidget.js +1 -1
- package/dist/widgets/AnalyticsTrendWidget.js +10 -2
- package/dist/widgets/AnalyticsTrendWidget.js.map +1 -1
- package/dist/widgets/ComparisonDelta.js +83 -0
- package/dist/widgets/ComparisonDelta.js.map +1 -0
- package/dist/widgets/cardChrome.d.ts +8 -0
- package/dist/widgets/comparison.js +43 -0
- package/dist/widgets/comparison.js.map +1 -0
- package/dist/widgets/readForWidget.d.ts +4 -0
- package/dist/widgets/readForWidget.js +26 -11
- package/dist/widgets/readForWidget.js.map +1 -1
- package/dist/widgets/readForWidgetBreakdown.js +13 -8
- package/dist/widgets/readForWidgetBreakdown.js.map +1 -1
- package/dist/widgets/readForWidgetRealtime.js +1 -1
- package/dist/widgets/readForWidgetRealtime.js.map +1 -1
- package/dist/widgets/readForWidgetSeries.d.ts +6 -0
- package/dist/widgets/readForWidgetSeries.js +60 -40
- package/dist/widgets/readForWidgetSeries.js.map +1 -1
- package/dist/widgets/registerWidgets.js +148 -169
- package/dist/widgets/registerWidgets.js.map +1 -1
- package/package.json +5 -5
|
@@ -1,8 +1,11 @@
|
|
|
1
|
+
import { resolveHostname, resolvePathCached } from "../binding/resolvePath.js";
|
|
1
2
|
import { satisfiesCapabilities } from "../core/capabilities.js";
|
|
2
|
-
import {
|
|
3
|
+
import { supportsGranularity } from "../core/granularity.js";
|
|
4
|
+
import { getRuntime, resolveTimezoneFor } from "../plugin/runtime.js";
|
|
3
5
|
import { resolveReadContext } from "../core/scopedRead.js";
|
|
4
6
|
import { resolveTimeframe } from "../timeframe/presets.js";
|
|
5
|
-
import {
|
|
7
|
+
import { previousWindow } from "../widgets/comparison.js";
|
|
8
|
+
import { fillDailySeries } from "../widgets/readForWidgetSeries.js";
|
|
6
9
|
//#region src/fields/readForDocument.ts
|
|
7
10
|
/**
|
|
8
11
|
* Resolve a document's analytics for one display field: look up the runtime, resolve
|
|
@@ -15,8 +18,8 @@ import { resolveHostname, resolvePathCached } from "../binding/resolvePath.js";
|
|
|
15
18
|
* survives or the adapter cannot query per page at all.
|
|
16
19
|
*/
|
|
17
20
|
const readForField = async (args) => {
|
|
18
|
-
const { req, collectionSlug, data, metrics, timeframe, adapterId, now } = args;
|
|
19
|
-
|
|
21
|
+
const { req, collectionSlug, data, metrics, timeframe, range, adapterId, now } = args;
|
|
22
|
+
let dateRange = range ?? resolveTimeframe(timeframe, now);
|
|
20
23
|
const empty = {
|
|
21
24
|
metrics: {},
|
|
22
25
|
supportedMetrics: [],
|
|
@@ -27,6 +30,7 @@ const readForField = async (args) => {
|
|
|
27
30
|
status: "not-bound",
|
|
28
31
|
adapterId: adapterId ?? "",
|
|
29
32
|
dateRange,
|
|
33
|
+
timezone: "UTC",
|
|
30
34
|
...empty
|
|
31
35
|
};
|
|
32
36
|
const binding = runtime.bindings[collectionSlug];
|
|
@@ -34,6 +38,7 @@ const readForField = async (args) => {
|
|
|
34
38
|
status: "not-bound",
|
|
35
39
|
adapterId: adapterId ?? "",
|
|
36
40
|
dateRange,
|
|
41
|
+
timezone: "UTC",
|
|
37
42
|
...empty
|
|
38
43
|
};
|
|
39
44
|
const ctx = await resolveReadContext({
|
|
@@ -46,8 +51,11 @@ const readForField = async (args) => {
|
|
|
46
51
|
status: "unavailable",
|
|
47
52
|
adapterId: adapterId ?? "",
|
|
48
53
|
dateRange,
|
|
54
|
+
timezone: "UTC",
|
|
49
55
|
...empty
|
|
50
56
|
};
|
|
57
|
+
const tz = await resolveTimezoneFor(runtime, req, ctx.scope);
|
|
58
|
+
dateRange = range ?? resolveTimeframe(timeframe, now, tz);
|
|
51
59
|
const adapter = ctx.adapter;
|
|
52
60
|
const bindingCtx = {
|
|
53
61
|
req,
|
|
@@ -63,12 +71,14 @@ const readForField = async (args) => {
|
|
|
63
71
|
status: "no-path",
|
|
64
72
|
adapterId: adapter.id,
|
|
65
73
|
dateRange,
|
|
74
|
+
timezone: tz,
|
|
66
75
|
...empty
|
|
67
76
|
};
|
|
68
77
|
if (!adapter.isConfigured()) return {
|
|
69
78
|
status: "not-configured",
|
|
70
79
|
adapterId: adapter.id,
|
|
71
80
|
dateRange,
|
|
81
|
+
timezone: tz,
|
|
72
82
|
...empty
|
|
73
83
|
};
|
|
74
84
|
const supportedMetrics = metrics.filter((m) => adapter.capabilities.metrics.has(m));
|
|
@@ -81,24 +91,54 @@ const readForField = async (args) => {
|
|
|
81
91
|
status: "unavailable",
|
|
82
92
|
adapterId: adapter.id,
|
|
83
93
|
dateRange,
|
|
94
|
+
timezone: tz,
|
|
84
95
|
metrics: {},
|
|
85
96
|
supportedMetrics: [],
|
|
86
97
|
droppedMetrics: metrics
|
|
87
98
|
};
|
|
88
|
-
const
|
|
99
|
+
const hostname = await resolveHostname(binding, data, bindingCtx);
|
|
100
|
+
const base = {
|
|
89
101
|
path,
|
|
90
|
-
hostname
|
|
91
|
-
|
|
92
|
-
dateRange,
|
|
102
|
+
hostname,
|
|
103
|
+
timezone: tz,
|
|
93
104
|
scope: ctx.queryScope
|
|
94
|
-
}
|
|
105
|
+
};
|
|
106
|
+
const comparisonRange = args.compare && runtime.comparison && adapter.capabilities.comparison ? previousWindow(dateRange, tz) ?? void 0 : void 0;
|
|
107
|
+
const wantsSeries = args.series && supportsGranularity(adapter.capabilities, "day");
|
|
108
|
+
const [result, previous, seriesResult] = await Promise.all([
|
|
109
|
+
runtime.engine.read(adapter, {
|
|
110
|
+
...base,
|
|
111
|
+
metrics: supportedMetrics,
|
|
112
|
+
dateRange
|
|
113
|
+
}),
|
|
114
|
+
comparisonRange ? runtime.engine.read(adapter, {
|
|
115
|
+
...base,
|
|
116
|
+
metrics: supportedMetrics,
|
|
117
|
+
dateRange: comparisonRange
|
|
118
|
+
}) : void 0,
|
|
119
|
+
wantsSeries ? runtime.engine.read(adapter, {
|
|
120
|
+
...base,
|
|
121
|
+
metrics: [supportedMetrics[0]],
|
|
122
|
+
dateRange,
|
|
123
|
+
granularity: "day"
|
|
124
|
+
}) : void 0
|
|
125
|
+
]);
|
|
95
126
|
return {
|
|
96
127
|
status: "ok",
|
|
97
128
|
adapterId: adapter.id,
|
|
98
129
|
dateRange,
|
|
130
|
+
timezone: tz,
|
|
99
131
|
metrics: result.totals ?? {},
|
|
100
132
|
supportedMetrics,
|
|
101
|
-
droppedMetrics
|
|
133
|
+
droppedMetrics,
|
|
134
|
+
previousMetrics: previous ? previous.totals ?? {} : void 0,
|
|
135
|
+
comparisonRange,
|
|
136
|
+
points: seriesResult ? fillDailySeries({
|
|
137
|
+
rows: seriesResult.rows,
|
|
138
|
+
dateRange,
|
|
139
|
+
metric: supportedMetrics[0],
|
|
140
|
+
tz
|
|
141
|
+
}) : void 0
|
|
102
142
|
};
|
|
103
143
|
};
|
|
104
144
|
//#endregion
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readForDocument.js","names":[],"sources":["../../src/fields/readForDocument.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\nimport { resolveHostname, resolvePathCached } from '../binding/resolvePath'\nimport type { BindingDoc } from '../binding/types'\nimport { satisfiesCapabilities } from '../core/capabilities'\nimport type { AnalyticsAdapter, DateRange, MetricKey } from '../core/contract'\nimport { resolveReadContext } from '../core/scopedRead'\nimport { getRuntime } from '../plugin/runtime'\nimport { resolveTimeframe, type TimeframePreset } from '../timeframe/presets'\n\nexport type FieldReadStatus = 'ok' | 'no-path' | 'not-bound' | 'not-configured' | 'unavailable'\n\nexport interface FieldReadResult {\n\tstatus: FieldReadStatus\n\tadapterId: string\n\tdateRange: DateRange\n\tmetrics: Partial<Record<MetricKey, number>>\n\t/** Requested metrics the adapter supports, in request order; the set actually read. */\n\tsupportedMetrics: MetricKey[]\n\t/** Requested metrics the adapter cannot serve, dropped from the read. */\n\tdroppedMetrics: MetricKey[]\n}\n\nexport interface ReadForFieldArgs {\n\treq: PayloadRequest\n\tcollectionSlug: string\n\tdata: BindingDoc\n\tmetrics: MetricKey[]\n\ttimeframe: TimeframePreset\n\tadapterId?: string\n\tnow: Date\n\t/** Explicit scope override; omitted resolves via the plugin's scopeResolver. */\n\tscope?: string | null\n}\n\n/**\n * Resolve a document's analytics for one display field: look up the runtime, resolve\n * the bound path, capability-gate the requested metrics against the active adapter,\n * then read through the surfacing engine. Returns a discriminated status so the\n * rendering component can show the right empty state without throwing.\n *\n * A metric the adapter does not support is dropped (with one warning per field\n * render), not fatal; `unavailable` is returned only when no requested metric\n * survives or the adapter cannot query per page at all.\n */\nexport const readForField = async (args: ReadForFieldArgs): Promise<FieldReadResult> => {\n\tconst { req, collectionSlug, data, metrics, timeframe, adapterId, now } = args\n\
|
|
1
|
+
{"version":3,"file":"readForDocument.js","names":[],"sources":["../../src/fields/readForDocument.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\nimport { resolveHostname, resolvePathCached } from '../binding/resolvePath'\nimport type { BindingDoc } from '../binding/types'\nimport { satisfiesCapabilities } from '../core/capabilities'\nimport type { AnalyticsAdapter, DateRange, MetricKey } from '../core/contract'\nimport { supportsGranularity } from '../core/granularity'\nimport { resolveReadContext } from '../core/scopedRead'\nimport { getRuntime, resolveTimezoneFor } from '../plugin/runtime'\nimport { resolveTimeframe, type TimeframePreset } from '../timeframe/presets'\nimport { DEFAULT_TIMEZONE } from '../timeframe/tz'\nimport { previousWindow } from '../widgets/comparison'\nimport { fillDailySeries, type SeriesPoint } from '../widgets/readForWidgetSeries'\n\nexport type FieldReadStatus = 'ok' | 'no-path' | 'not-bound' | 'not-configured' | 'unavailable'\n\nexport interface FieldReadResult {\n\tstatus: FieldReadStatus\n\tadapterId: string\n\tdateRange: DateRange\n\t/** The reporting timezone the read resolved in; the trend axis buckets in it. */\n\ttimezone: string\n\tmetrics: Partial<Record<MetricKey, number>>\n\t/** Requested metrics the adapter supports, in request order; the set actually read. */\n\tsupportedMetrics: MetricKey[]\n\t/** Requested metrics the adapter cannot serve, dropped from the read. */\n\tdroppedMetrics: MetricKey[]\n\t/** Previous-window totals, present only when comparison was requested and supported. */\n\tpreviousMetrics?: Partial<Record<MetricKey, number>>\n\t/** The previous comparable window, present only when comparison ran. */\n\tcomparisonRange?: DateRange\n\t/** Per-day series for the first supported metric, present only when requested. */\n\tpoints?: SeriesPoint[]\n}\n\nexport interface ReadForFieldArgs {\n\treq: PayloadRequest\n\tcollectionSlug: string\n\tdata: BindingDoc\n\tmetrics: MetricKey[]\n\ttimeframe: TimeframePreset\n\t/** Overrides the preset window (custom range). */\n\trange?: DateRange\n\tadapterId?: string\n\tnow: Date\n\t/** Explicit scope override; omitted resolves via the plugin's scopeResolver. */\n\tscope?: string | null\n\t/** Also read the previous comparable window when the adapter supports comparison. */\n\tcompare?: boolean\n\t/** Also read a daily series for the first supported metric when the adapter can. */\n\tseries?: boolean\n}\n\n/**\n * Resolve a document's analytics for one display field: look up the runtime, resolve\n * the bound path, capability-gate the requested metrics against the active adapter,\n * then read through the surfacing engine. Returns a discriminated status so the\n * rendering component can show the right empty state without throwing.\n *\n * A metric the adapter does not support is dropped (with one warning per field\n * render), not fatal; `unavailable` is returned only when no requested metric\n * survives or the adapter cannot query per page at all.\n */\nexport const readForField = async (args: ReadForFieldArgs): Promise<FieldReadResult> => {\n\tconst { req, collectionSlug, data, metrics, timeframe, range, adapterId, now } = args\n\tlet dateRange = range ?? resolveTimeframe(timeframe, now)\n\tconst empty = { metrics: {}, supportedMetrics: [], droppedMetrics: [] }\n\tconst runtime = getRuntime(req.payload)\n\tif (!runtime) {\n\t\treturn {\n\t\t\tstatus: 'not-bound',\n\t\t\tadapterId: adapterId ?? '',\n\t\t\tdateRange,\n\t\t\ttimezone: DEFAULT_TIMEZONE,\n\t\t\t...empty,\n\t\t}\n\t}\n\tconst binding = runtime.bindings[collectionSlug]\n\tif (!binding) {\n\t\treturn {\n\t\t\tstatus: 'not-bound',\n\t\t\tadapterId: adapterId ?? '',\n\t\t\tdateRange,\n\t\t\ttimezone: DEFAULT_TIMEZONE,\n\t\t\t...empty,\n\t\t}\n\t}\n\tconst ctx = await resolveReadContext({ runtime, req, adapterId, scope: args.scope })\n\tif (!ctx.ok) {\n\t\treturn {\n\t\t\tstatus: 'unavailable',\n\t\t\tadapterId: adapterId ?? '',\n\t\t\tdateRange,\n\t\t\ttimezone: DEFAULT_TIMEZONE,\n\t\t\t...empty,\n\t\t}\n\t}\n\tconst tz = await resolveTimezoneFor(runtime, req, ctx.scope)\n\tdateRange = range ?? resolveTimeframe(timeframe, now, tz)\n\tconst adapter: AnalyticsAdapter = ctx.adapter\n\tconst bindingCtx = { req, locale: req.locale ?? undefined }\n\tlet path: string | null\n\ttry {\n\t\tpath = await resolvePathCached(binding, data, bindingCtx)\n\t} catch {\n\t\tpath = null\n\t}\n\tif (!path) {\n\t\treturn { status: 'no-path', adapterId: adapter.id, dateRange, timezone: tz, ...empty }\n\t}\n\tif (!adapter.isConfigured()) {\n\t\treturn { status: 'not-configured', adapterId: adapter.id, dateRange, timezone: tz, ...empty }\n\t}\n\tconst supportedMetrics = metrics.filter((m) => adapter.capabilities.metrics.has(m))\n\tconst droppedMetrics = metrics.filter((m) => !adapter.capabilities.metrics.has(m))\n\tif (droppedMetrics.length > 0) {\n\t\treq.payload.logger.warn(\n\t\t\t`analytics: adapter \"${adapter.id}\" does not support metric(s) ${droppedMetrics.join(', ')}; dropped from the \"${collectionSlug}\" display field`\n\t\t)\n\t}\n\tif (\n\t\tsupportedMetrics.length === 0 ||\n\t\t!satisfiesCapabilities(adapter.capabilities, { metrics: supportedMetrics, perPageQuery: true })\n\t) {\n\t\treturn {\n\t\t\tstatus: 'unavailable',\n\t\t\tadapterId: adapter.id,\n\t\t\tdateRange,\n\t\t\ttimezone: tz,\n\t\t\tmetrics: {},\n\t\t\tsupportedMetrics: [],\n\t\t\tdroppedMetrics: metrics,\n\t\t}\n\t}\n\tconst hostname = await resolveHostname(binding, data, bindingCtx)\n\tconst base = { path, hostname, timezone: tz, scope: ctx.queryScope }\n\tconst comparisonRange =\n\t\targs.compare && runtime.comparison && adapter.capabilities.comparison\n\t\t\t? (previousWindow(dateRange, tz) ?? undefined)\n\t\t\t: undefined\n\tconst wantsSeries = args.series && supportsGranularity(adapter.capabilities, 'day')\n\tconst [result, previous, seriesResult] = await Promise.all([\n\t\truntime.engine.read(adapter, { ...base, metrics: supportedMetrics, dateRange }),\n\t\tcomparisonRange\n\t\t\t? runtime.engine.read(adapter, {\n\t\t\t\t\t...base,\n\t\t\t\t\tmetrics: supportedMetrics,\n\t\t\t\t\tdateRange: comparisonRange,\n\t\t\t\t})\n\t\t\t: undefined,\n\t\twantsSeries\n\t\t\t? runtime.engine.read(adapter, {\n\t\t\t\t\t...base,\n\t\t\t\t\tmetrics: [supportedMetrics[0] as MetricKey],\n\t\t\t\t\tdateRange,\n\t\t\t\t\tgranularity: 'day',\n\t\t\t\t})\n\t\t\t: undefined,\n\t])\n\treturn {\n\t\tstatus: 'ok',\n\t\tadapterId: adapter.id,\n\t\tdateRange,\n\t\ttimezone: tz,\n\t\tmetrics: result.totals ?? {},\n\t\tsupportedMetrics,\n\t\tdroppedMetrics,\n\t\tpreviousMetrics: previous ? (previous.totals ?? {}) : undefined,\n\t\tcomparisonRange,\n\t\tpoints: seriesResult\n\t\t\t? fillDailySeries({\n\t\t\t\t\trows: seriesResult.rows,\n\t\t\t\t\tdateRange,\n\t\t\t\t\tmetric: supportedMetrics[0] as MetricKey,\n\t\t\t\t\ttz,\n\t\t\t\t})\n\t\t\t: undefined,\n\t}\n}\n"],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { AnalyticsBinding, BindingContext, HostnameResolver, PathResolver } from
|
|
|
3
3
|
import { TimeframePreset } from "./timeframe/presets.js";
|
|
4
4
|
import { AnalyticsFieldsOptions, AnalyticsMetricLabel, AnalyticsMetricLabels, AnalyticsStatOptions, AnalyticsStatRowOptions, AnalyticsTabOptions, analyticsFields, analyticsStat, analyticsStatRow, analyticsTab, analyticsTabsField } from "./fields/factories.js";
|
|
5
5
|
import { CustomWidgetDef } from "./widgets/customWidget.js";
|
|
6
|
-
import { AnalyticsAccessOptions, AnalyticsPluginOptions, PlatformReadAccess, ProvidersCollectionOptions, ProvidersOptions, ProvidersResolve, ScopeResolver } from "./core/options.js";
|
|
6
|
+
import { AnalyticsAccessOptions, AnalyticsPluginOptions, PlatformReadAccess, ProvidersCollectionOptions, ProvidersOptions, ProvidersResolve, ScopeResolver, TimezoneResolver } from "./core/options.js";
|
|
7
7
|
import { analyticsDefaultWidgets } from "./widgets/defaults.js";
|
|
8
8
|
|
|
9
9
|
//#region src/index.d.ts
|
|
@@ -14,5 +14,5 @@ declare module 'payload' {
|
|
|
14
14
|
}
|
|
15
15
|
declare const analytics: (options: AnalyticsPluginOptions) => import("payload").Plugin;
|
|
16
16
|
//#endregion
|
|
17
|
-
export { type AnalyticsAccessOptions, type AnalyticsBinding, type AnalyticsFieldsOptions, type AnalyticsMetricLabel, type AnalyticsMetricLabels, type AnalyticsPluginOptions, type AnalyticsStatOptions, type AnalyticsStatRowOptions, type AnalyticsTabOptions, type BindingContext, type CustomWidgetDef, type HostnameResolver, PLATFORM_SCOPE, type PathResolver, type PlatformReadAccess, type AnalyticsPluginOptions as PluginOptions, type ProvidersCollectionOptions, type ProvidersOptions, type ProvidersResolve, type ScopeResolver, type TimeframePreset, analytics, analyticsDefaultWidgets, analyticsFields, analyticsStat, analyticsStatRow, analyticsTab, analyticsTabsField };
|
|
17
|
+
export { type AnalyticsAccessOptions, type AnalyticsBinding, type AnalyticsFieldsOptions, type AnalyticsMetricLabel, type AnalyticsMetricLabels, type AnalyticsPluginOptions, type AnalyticsStatOptions, type AnalyticsStatRowOptions, type AnalyticsTabOptions, type BindingContext, type CustomWidgetDef, type HostnameResolver, PLATFORM_SCOPE, type PathResolver, type PlatformReadAccess, type AnalyticsPluginOptions as PluginOptions, type ProvidersCollectionOptions, type ProvidersOptions, type ProvidersResolve, type ScopeResolver, type TimeframePreset, type TimezoneResolver, analytics, analyticsDefaultWidgets, analyticsFields, analyticsStat, analyticsStatRow, analyticsTab, analyticsTabsField };
|
|
18
18
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.js
CHANGED
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import { buildProvidersCollection } from "./providers/collection.js";
|
|
2
2
|
import { resolveOptions } from "./core/options.js";
|
|
3
3
|
import { createRegistry, staticRegistryResolver } from "./core/registry.js";
|
|
4
|
+
import { isValidTimeZone } from "./timeframe/tz.js";
|
|
4
5
|
import { setRuntime } from "./plugin/runtime.js";
|
|
5
6
|
import { PLATFORM_SCOPE } from "./core/contract.js";
|
|
7
|
+
import { DOCUMENT_PATH } from "./plugin/paths.js";
|
|
8
|
+
import { makeDocumentHandler } from "./plugin/documentEndpoint.js";
|
|
6
9
|
import { kvCacheStore } from "./surfacing/cacheStore.js";
|
|
7
10
|
import { REALTIME_PATH, makeRealtimeHandler } from "./plugin/realtimeEndpoint.js";
|
|
8
11
|
import { registerTranslations } from "./plugin/registerTranslations.js";
|
|
@@ -51,15 +54,35 @@ const analytics = definePlugin({
|
|
|
51
54
|
onChange: () => invalidateProviders()
|
|
52
55
|
})];
|
|
53
56
|
const resolveScope = async (req) => resolved.scopeResolver({ req });
|
|
57
|
+
const resolveTimezone = async (req, scope) => {
|
|
58
|
+
const opt = resolved.reportingTimezone;
|
|
59
|
+
if (opt === void 0) return "UTC";
|
|
60
|
+
try {
|
|
61
|
+
const tz = typeof opt === "string" ? opt : await opt({
|
|
62
|
+
req,
|
|
63
|
+
scope: scope !== void 0 ? scope : await resolveScope(req)
|
|
64
|
+
});
|
|
65
|
+
return tz && isValidTimeZone(tz) ? tz : "UTC";
|
|
66
|
+
} catch (err) {
|
|
67
|
+
req.payload?.logger?.warn?.(`analytics: reportingTimezone resolution failed, falling back to UTC: ${String(err)}`);
|
|
68
|
+
return "UTC";
|
|
69
|
+
}
|
|
70
|
+
};
|
|
54
71
|
for (const adapter of resolved.adapters) adapter.register?.(config, {
|
|
55
72
|
scoped: resolved.scoped,
|
|
56
|
-
resolveScope
|
|
73
|
+
resolveScope,
|
|
74
|
+
resolveTimezone
|
|
57
75
|
});
|
|
58
76
|
if (resolved.adapters.some((a) => a.capabilities.realtime && typeof a.realtime === "function")) config.endpoints = [...config.endpoints ?? [], {
|
|
59
77
|
method: "get",
|
|
60
78
|
path: REALTIME_PATH,
|
|
61
79
|
handler: makeRealtimeHandler()
|
|
62
80
|
}];
|
|
81
|
+
if (Object.keys(resolved.bindings).length > 0) config.endpoints = [...config.endpoints ?? [], {
|
|
82
|
+
method: "get",
|
|
83
|
+
path: DOCUMENT_PATH,
|
|
84
|
+
handler: makeDocumentHandler()
|
|
85
|
+
}];
|
|
63
86
|
if (resolved.widgets.enabled) registerWidgets(config, {
|
|
64
87
|
adapters: resolved.adapters,
|
|
65
88
|
multiProvider: registry.isMultiProvider(),
|
|
@@ -72,7 +95,7 @@ const analytics = definePlugin({
|
|
|
72
95
|
tasks: [...config.jobs?.tasks ?? [], warmTask(resolved.cache.warm.cron, defaultLayout)]
|
|
73
96
|
};
|
|
74
97
|
if (resolved.sync.enabled) {
|
|
75
|
-
config.collections = [...config.collections ?? [], syncCollection(resolved.sync.collectionSlug)];
|
|
98
|
+
config.collections = [...config.collections ?? [], syncCollection(resolved.sync.collectionSlug, resolved.sync.hidden)];
|
|
76
99
|
config.jobs = {
|
|
77
100
|
...config.jobs,
|
|
78
101
|
tasks: [...config.jobs?.tasks ?? [], syncTask({
|
|
@@ -85,7 +108,6 @@ const analytics = definePlugin({
|
|
|
85
108
|
}
|
|
86
109
|
const prevOnInit = config.onInit;
|
|
87
110
|
config.onInit = async (payload) => {
|
|
88
|
-
await prevOnInit?.(payload);
|
|
89
111
|
const engine = createEngine({
|
|
90
112
|
store: kvCacheStore(payload.kv),
|
|
91
113
|
queue: { concurrency: 4 },
|
|
@@ -95,12 +117,15 @@ const analytics = definePlugin({
|
|
|
95
117
|
registry,
|
|
96
118
|
resolveRegistry,
|
|
97
119
|
resolveScope,
|
|
120
|
+
resolveTimezone,
|
|
98
121
|
platformAdapterId: resolved.platformAdapter,
|
|
99
122
|
platformRead: resolved.access.platformRead,
|
|
100
123
|
bindings: resolved.bindings,
|
|
101
124
|
engine,
|
|
102
|
-
ttl: resolved.cache.ttl
|
|
125
|
+
ttl: resolved.cache.ttl,
|
|
126
|
+
comparison: resolved.widgets.comparison
|
|
103
127
|
});
|
|
128
|
+
await prevOnInit?.(payload);
|
|
104
129
|
};
|
|
105
130
|
return config;
|
|
106
131
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":[],"sources":["../src/index.ts"],"sourcesContent":["import { type Config, definePlugin, type PayloadRequest } from 'payload'\n\nimport { type AnalyticsPluginOptions, resolveOptions } from './core/options'\nimport { createRegistry, staticRegistryResolver } from './core/registry'\nimport { makeRealtimeHandler, REALTIME_PATH } from './plugin/realtimeEndpoint'\nimport { registerTranslations } from './plugin/registerTranslations'\nimport { setRuntime } from './plugin/runtime'\nimport { warmTask } from './plugin/warmTask'\nimport { buildProvidersCollection } from './providers/collection'\nimport {\n\tcollectionProvidersSource,\n\tcombineRegistries,\n\tcreateScopedRegistryResolver,\n} from './providers/resolver'\nimport { kvCacheStore } from './surfacing/cacheStore'\nimport { createEngine } from './surfacing/engine'\nimport { syncCollection } from './sync/collection'\nimport { syncTask } from './sync/syncTask'\nimport { registerWidgets } from './widgets/registerWidgets'\n\ndeclare module 'payload' {\n\tinterface RegisteredPlugins {\n\t\t'@10x-media/analytics': AnalyticsPluginOptions\n\t}\n}\n\nexport const analytics = definePlugin<AnalyticsPluginOptions>({\n\tslug: '@10x-media/analytics',\n\tplugin: ({ config, plugins: _plugins, ...options }): Config => {\n\t\tif (options.disabled === true) {\n\t\t\treturn config\n\t\t}\n\t\tconst resolved = resolveOptions(options)\n\t\tconst defaultLayout = config.admin?.dashboard?.defaultLayout\n\t\tregisterTranslations(config, options.translations)\n\t\tconst registry = createRegistry(resolved.adapters, resolved.defaultAdapter)\n\t\tconst registryBase = { adapters: resolved.adapters, defaultId: resolved.defaultAdapter }\n\t\tlet resolveRegistry = staticRegistryResolver(registry)\n\t\tlet invalidateProviders = () => {}\n\t\tconst providersResolve = resolved.providers.resolve\n\t\tif (providersResolve) {\n\t\t\tresolveRegistry = async (args) =>\n\t\t\t\tcombineRegistries(\n\t\t\t\t\tregistryBase,\n\t\t\t\t\tawait providersResolve({ payload: args.payload, req: args.req, scope: args.scope })\n\t\t\t\t)\n\t\t} else if (resolved.providers.collection.enabled) {\n\t\t\tconst scoped = createScopedRegistryResolver({\n\t\t\t\tbase: registryBase,\n\t\t\t\tsource: collectionProvidersSource(\n\t\t\t\t\tresolved.providers.collection.slug,\n\t\t\t\t\tresolved.providers.collection.scopeField\n\t\t\t\t),\n\t\t\t})\n\t\t\tresolveRegistry = scoped.resolver\n\t\t\tinvalidateProviders = scoped.invalidate\n\t\t}\n\t\tif (resolved.providers.collection.enabled) {\n\t\t\tconfig.collections = [\n\t\t\t\t...(config.collections ?? []),\n\t\t\t\tbuildProvidersCollection({\n\t\t\t\t\tslug: resolved.providers.collection.slug,\n\t\t\t\t\taccess: resolved.providers.collection.access,\n\t\t\t\t\toverrides: resolved.providers.collection.overrides,\n\t\t\t\t\tonChange: () => invalidateProviders(),\n\t\t\t\t}),\n\t\t\t]\n\t\t}\n\t\tconst resolveScope = async (req: PayloadRequest) => resolved.scopeResolver({ req })\n\t\tfor (const adapter of resolved.adapters) {\n\t\t\tadapter.register?.(config, { scoped: resolved.scoped, resolveScope })\n\t\t}\n\t\tif (\n\t\t\tresolved.adapters.some((a) => a.capabilities.realtime && typeof a.realtime === 'function')\n\t\t) {\n\t\t\tconfig.endpoints = [\n\t\t\t\t...(config.endpoints ?? []),\n\t\t\t\t{ method: 'get', path: REALTIME_PATH, handler: makeRealtimeHandler() },\n\t\t\t]\n\t\t}\n\t\tif (resolved.widgets.enabled) {\n\t\t\tregisterWidgets(config, {\n\t\t\t\tadapters: resolved.adapters,\n\t\t\t\tmultiProvider: registry.isMultiProvider(),\n\t\t\t\tdisabled: resolved.widgets.disabled,\n\t\t\t\tregister: resolved.widgets.register,\n\t\t\t\tlocalizeText: resolved.widgets.localizeText,\n\t\t\t})\n\t\t}\n\t\tif (resolved.cache.warm.enabled) {\n\t\t\tconfig.jobs = {\n\t\t\t\t...config.jobs,\n\t\t\t\ttasks: [...(config.jobs?.tasks ?? []), warmTask(resolved.cache.warm.cron, defaultLayout)],\n\t\t\t}\n\t\t}\n\t\tif (resolved.sync.enabled) {\n\t\t\tconfig.collections = [\n\t\t\t\t...(config.collections ?? []),\n\t\t\t\tsyncCollection(resolved.sync.collectionSlug),\n\t\t\t]\n\t\t\tconfig.jobs = {\n\t\t\t\t...config.jobs,\n\t\t\t\ttasks: [\n\t\t\t\t\t...(config.jobs?.tasks ?? []),\n\t\t\t\t\tsyncTask({\n\t\t\t\t\t\tcron: resolved.sync.cron,\n\t\t\t\t\t\tlookbackDays: resolved.sync.lookbackDays,\n\t\t\t\t\t\tcollectionSlug: resolved.sync.collectionSlug,\n\t\t\t\t\t\tadapterIds: resolved.sync.adapters,\n\t\t\t\t\t}),\n\t\t\t\t],\n\t\t\t}\n\t\t}\n\t\tconst prevOnInit = config.onInit\n\t\
|
|
1
|
+
{"version":3,"file":"index.js","names":[],"sources":["../src/index.ts"],"sourcesContent":["import { type Config, definePlugin, type PayloadRequest } from 'payload'\n\nimport { type AnalyticsPluginOptions, resolveOptions } from './core/options'\nimport { createRegistry, staticRegistryResolver } from './core/registry'\nimport { DOCUMENT_PATH, makeDocumentHandler } from './plugin/documentEndpoint'\nimport { makeRealtimeHandler, REALTIME_PATH } from './plugin/realtimeEndpoint'\nimport { registerTranslations } from './plugin/registerTranslations'\nimport { setRuntime } from './plugin/runtime'\nimport { warmTask } from './plugin/warmTask'\nimport { buildProvidersCollection } from './providers/collection'\nimport {\n\tcollectionProvidersSource,\n\tcombineRegistries,\n\tcreateScopedRegistryResolver,\n} from './providers/resolver'\nimport { kvCacheStore } from './surfacing/cacheStore'\nimport { createEngine } from './surfacing/engine'\nimport { syncCollection } from './sync/collection'\nimport { syncTask } from './sync/syncTask'\nimport { DEFAULT_TIMEZONE, isValidTimeZone } from './timeframe/tz'\nimport { registerWidgets } from './widgets/registerWidgets'\n\ndeclare module 'payload' {\n\tinterface RegisteredPlugins {\n\t\t'@10x-media/analytics': AnalyticsPluginOptions\n\t}\n}\n\nexport const analytics = definePlugin<AnalyticsPluginOptions>({\n\tslug: '@10x-media/analytics',\n\tplugin: ({ config, plugins: _plugins, ...options }): Config => {\n\t\tif (options.disabled === true) {\n\t\t\treturn config\n\t\t}\n\t\tconst resolved = resolveOptions(options)\n\t\tconst defaultLayout = config.admin?.dashboard?.defaultLayout\n\t\tregisterTranslations(config, options.translations)\n\t\tconst registry = createRegistry(resolved.adapters, resolved.defaultAdapter)\n\t\tconst registryBase = { adapters: resolved.adapters, defaultId: resolved.defaultAdapter }\n\t\tlet resolveRegistry = staticRegistryResolver(registry)\n\t\tlet invalidateProviders = () => {}\n\t\tconst providersResolve = resolved.providers.resolve\n\t\tif (providersResolve) {\n\t\t\tresolveRegistry = async (args) =>\n\t\t\t\tcombineRegistries(\n\t\t\t\t\tregistryBase,\n\t\t\t\t\tawait providersResolve({ payload: args.payload, req: args.req, scope: args.scope })\n\t\t\t\t)\n\t\t} else if (resolved.providers.collection.enabled) {\n\t\t\tconst scoped = createScopedRegistryResolver({\n\t\t\t\tbase: registryBase,\n\t\t\t\tsource: collectionProvidersSource(\n\t\t\t\t\tresolved.providers.collection.slug,\n\t\t\t\t\tresolved.providers.collection.scopeField\n\t\t\t\t),\n\t\t\t})\n\t\t\tresolveRegistry = scoped.resolver\n\t\t\tinvalidateProviders = scoped.invalidate\n\t\t}\n\t\tif (resolved.providers.collection.enabled) {\n\t\t\tconfig.collections = [\n\t\t\t\t...(config.collections ?? []),\n\t\t\t\tbuildProvidersCollection({\n\t\t\t\t\tslug: resolved.providers.collection.slug,\n\t\t\t\t\taccess: resolved.providers.collection.access,\n\t\t\t\t\toverrides: resolved.providers.collection.overrides,\n\t\t\t\t\tonChange: () => invalidateProviders(),\n\t\t\t\t}),\n\t\t\t]\n\t\t}\n\t\tconst resolveScope = async (req: PayloadRequest) => resolved.scopeResolver({ req })\n\t\tconst resolveTimezone = async (req: PayloadRequest, scope?: string | null): Promise<string> => {\n\t\t\tconst opt = resolved.reportingTimezone\n\t\t\tif (opt === undefined) {\n\t\t\t\treturn DEFAULT_TIMEZONE\n\t\t\t}\n\t\t\ttry {\n\t\t\t\tconst tz =\n\t\t\t\t\ttypeof opt === 'string'\n\t\t\t\t\t\t? opt\n\t\t\t\t\t\t: await opt({ req, scope: scope !== undefined ? scope : await resolveScope(req) })\n\t\t\t\treturn tz && isValidTimeZone(tz) ? tz : DEFAULT_TIMEZONE\n\t\t\t} catch (err) {\n\t\t\t\treq.payload?.logger?.warn?.(\n\t\t\t\t\t`analytics: reportingTimezone resolution failed, falling back to UTC: ${String(err)}`\n\t\t\t\t)\n\t\t\t\treturn DEFAULT_TIMEZONE\n\t\t\t}\n\t\t}\n\t\tfor (const adapter of resolved.adapters) {\n\t\t\tadapter.register?.(config, { scoped: resolved.scoped, resolveScope, resolveTimezone })\n\t\t}\n\t\tif (\n\t\t\tresolved.adapters.some((a) => a.capabilities.realtime && typeof a.realtime === 'function')\n\t\t) {\n\t\t\tconfig.endpoints = [\n\t\t\t\t...(config.endpoints ?? []),\n\t\t\t\t{ method: 'get', path: REALTIME_PATH, handler: makeRealtimeHandler() },\n\t\t\t]\n\t\t}\n\t\tif (Object.keys(resolved.bindings).length > 0) {\n\t\t\tconfig.endpoints = [\n\t\t\t\t...(config.endpoints ?? []),\n\t\t\t\t{ method: 'get', path: DOCUMENT_PATH, handler: makeDocumentHandler() },\n\t\t\t]\n\t\t}\n\t\tif (resolved.widgets.enabled) {\n\t\t\tregisterWidgets(config, {\n\t\t\t\tadapters: resolved.adapters,\n\t\t\t\tmultiProvider: registry.isMultiProvider(),\n\t\t\t\tdisabled: resolved.widgets.disabled,\n\t\t\t\tregister: resolved.widgets.register,\n\t\t\t\tlocalizeText: resolved.widgets.localizeText,\n\t\t\t})\n\t\t}\n\t\tif (resolved.cache.warm.enabled) {\n\t\t\tconfig.jobs = {\n\t\t\t\t...config.jobs,\n\t\t\t\ttasks: [...(config.jobs?.tasks ?? []), warmTask(resolved.cache.warm.cron, defaultLayout)],\n\t\t\t}\n\t\t}\n\t\tif (resolved.sync.enabled) {\n\t\t\tconfig.collections = [\n\t\t\t\t...(config.collections ?? []),\n\t\t\t\tsyncCollection(resolved.sync.collectionSlug, resolved.sync.hidden),\n\t\t\t]\n\t\t\tconfig.jobs = {\n\t\t\t\t...config.jobs,\n\t\t\t\ttasks: [\n\t\t\t\t\t...(config.jobs?.tasks ?? []),\n\t\t\t\t\tsyncTask({\n\t\t\t\t\t\tcron: resolved.sync.cron,\n\t\t\t\t\t\tlookbackDays: resolved.sync.lookbackDays,\n\t\t\t\t\t\tcollectionSlug: resolved.sync.collectionSlug,\n\t\t\t\t\t\tadapterIds: resolved.sync.adapters,\n\t\t\t\t\t}),\n\t\t\t\t],\n\t\t\t}\n\t\t}\n\t\tconst prevOnInit = config.onInit\n\t\t// The runtime is installed before the app's own onInit runs so consumer init code\n\t\t// (seeding, cache warming, sync passes) can already read through the plugin.\n\t\tconfig.onInit = async (payload) => {\n\t\t\tconst engine = createEngine({\n\t\t\t\tstore: kvCacheStore(payload.kv),\n\t\t\t\tqueue: { concurrency: 4 },\n\t\t\t\tttl: resolved.cache.ttl,\n\t\t\t})\n\t\t\tsetRuntime(payload, {\n\t\t\t\tregistry,\n\t\t\t\tresolveRegistry,\n\t\t\t\tresolveScope,\n\t\t\t\tresolveTimezone,\n\t\t\t\tplatformAdapterId: resolved.platformAdapter,\n\t\t\t\tplatformRead: resolved.access.platformRead,\n\t\t\t\tbindings: resolved.bindings,\n\t\t\t\tengine,\n\t\t\t\tttl: resolved.cache.ttl,\n\t\t\t\tcomparison: resolved.widgets.comparison,\n\t\t\t})\n\t\t\tawait prevOnInit?.(payload)\n\t\t}\n\t\treturn config\n\t},\n})\n\nexport type {\n\tAnalyticsBinding,\n\tBindingContext,\n\tHostnameResolver,\n\tPathResolver,\n} from './binding/types'\nexport { PLATFORM_SCOPE } from './core/contract'\nexport type {\n\tAnalyticsAccessOptions,\n\tAnalyticsPluginOptions,\n\tAnalyticsPluginOptions as PluginOptions,\n\tPlatformReadAccess,\n\tProvidersCollectionOptions,\n\tProvidersOptions,\n\tProvidersResolve,\n\tScopeResolver,\n\tTimezoneResolver,\n} from './core/options'\nexport type {\n\tAnalyticsFieldsOptions,\n\tAnalyticsMetricLabel,\n\tAnalyticsMetricLabels,\n\tAnalyticsStatOptions,\n\tAnalyticsStatRowOptions,\n\tAnalyticsTabOptions,\n} from './fields/factories'\nexport {\n\tanalyticsFields,\n\tanalyticsStat,\n\tanalyticsStatRow,\n\tanalyticsTab,\n\tanalyticsTabsField,\n} from './fields/factories'\nexport type { TimeframePreset } from './timeframe/presets'\nexport type { CustomWidgetDef } from './widgets/customWidget'\nexport { analyticsDefaultWidgets } from './widgets/defaults'\n"],"mappings":"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"}
|
|
@@ -2,19 +2,22 @@ import { flushBatch } from "./flushBatch.js";
|
|
|
2
2
|
import { normalizeEvent } from "./normalizeEvent.js";
|
|
3
3
|
import { dailySalt } from "./salt.js";
|
|
4
4
|
//#region src/native/ingest/endpoint.ts
|
|
5
|
-
const makeIngestHandler = (geoResolver, getBuffer = () => null,
|
|
5
|
+
const makeIngestHandler = (geoResolver, getBuffer = () => null, resolvers = {}) => async (req) => {
|
|
6
|
+
const { scope: resolveScope, timezone: resolveTimezone } = resolvers;
|
|
6
7
|
const raw = (req.headers.get("content-type") ?? "").startsWith("application/json") ? await req.json?.() : JSON.parse(await req.text?.() ?? "{}");
|
|
7
8
|
if (!raw?.path || !raw?.hostname || raw.type !== "pageview" && raw.type !== "event") return Response.json({ error: "invalid payload" }, { status: 400 });
|
|
8
9
|
const now = /* @__PURE__ */ new Date();
|
|
9
10
|
const salt = await dailySalt(req.payload, now);
|
|
10
11
|
const scope = resolveScope ? await resolveScope(req) ?? "" : void 0;
|
|
12
|
+
const timezone = resolveTimezone ? await resolveTimezone(req, scope ?? null) : void 0;
|
|
11
13
|
const event = await normalizeEvent({
|
|
12
14
|
raw,
|
|
13
15
|
headers: req.headers,
|
|
14
16
|
geoResolver,
|
|
15
17
|
salt,
|
|
16
18
|
now,
|
|
17
|
-
scope
|
|
19
|
+
scope,
|
|
20
|
+
timezone
|
|
18
21
|
});
|
|
19
22
|
const buffer = getBuffer();
|
|
20
23
|
if (buffer) buffer.add(event);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpoint.js","names":[],"sources":["../../../src/native/ingest/endpoint.ts"],"sourcesContent":["import type { PayloadHandler, PayloadRequest } from 'payload'\nimport type { GeoResolver } from '../geo/geoResolver'\nimport { flushBatch } from './flushBatch'\nimport { normalizeEvent, type RawEventInput, type StoredEvent } from './normalizeEvent'\nimport { dailySalt } from './salt'\nimport type { WriteBuffer } from './writeBuffer'\n\nexport const makeIngestHandler =\n\t(\n\t\tgeoResolver: GeoResolver,\n\t\tgetBuffer: () => WriteBuffer<StoredEvent> | null = () => null,\n\t\
|
|
1
|
+
{"version":3,"file":"endpoint.js","names":[],"sources":["../../../src/native/ingest/endpoint.ts"],"sourcesContent":["import type { PayloadHandler, PayloadRequest } from 'payload'\nimport type { GeoResolver } from '../geo/geoResolver'\nimport { flushBatch } from './flushBatch'\nimport { normalizeEvent, type RawEventInput, type StoredEvent } from './normalizeEvent'\nimport { dailySalt } from './salt'\nimport type { WriteBuffer } from './writeBuffer'\n\nexport interface IngestResolvers {\n\tscope?: (req: PayloadRequest) => Promise<string | null>\n\ttimezone?: (req: PayloadRequest, scope?: string | null) => Promise<string>\n}\n\nexport const makeIngestHandler =\n\t(\n\t\tgeoResolver: GeoResolver,\n\t\tgetBuffer: () => WriteBuffer<StoredEvent> | null = () => null,\n\t\tresolvers: IngestResolvers = {}\n\t): PayloadHandler =>\n\tasync (req) => {\n\t\tconst { scope: resolveScope, timezone: resolveTimezone } = resolvers\n\t\tconst ct = req.headers.get('content-type') ?? ''\n\t\tconst raw = (\n\t\t\tct.startsWith('application/json')\n\t\t\t\t? await req.json?.()\n\t\t\t\t: JSON.parse((await req.text?.()) ?? '{}')\n\t\t) as RawEventInput\n\t\tif (!raw?.path || !raw?.hostname || (raw.type !== 'pageview' && raw.type !== 'event')) {\n\t\t\treturn Response.json({ error: 'invalid payload' }, { status: 400 })\n\t\t}\n\t\tconst now = new Date()\n\t\tconst salt = await dailySalt(req.payload, now)\n\t\tconst scope = resolveScope ? ((await resolveScope(req)) ?? '') : undefined\n\t\tconst timezone = resolveTimezone ? await resolveTimezone(req, scope ?? null) : undefined\n\t\tconst event = await normalizeEvent({\n\t\t\traw,\n\t\t\theaders: req.headers,\n\t\t\tgeoResolver,\n\t\t\tsalt,\n\t\t\tnow,\n\t\t\tscope,\n\t\t\ttimezone,\n\t\t})\n\t\tconst buffer = getBuffer()\n\t\tif (buffer) {\n\t\t\tbuffer.add(event)\n\t\t} else {\n\t\t\tawait flushBatch(req.payload, [event])\n\t\t}\n\t\treturn Response.json({ ok: true }, { status: 202 })\n\t}\n"],"mappings":";;;;AAYA,MAAa,qBAEX,aACA,kBAAyD,MACzD,YAA6B,CAAC,MAE/B,OAAO,QAAQ;CACd,MAAM,EAAE,OAAO,cAAc,UAAU,oBAAoB;CAE3D,MAAM,OADK,IAAI,QAAQ,IAAI,cAAc,KAAK,IAE1C,WAAW,kBAAkB,IAC7B,MAAM,IAAI,OAAO,IACjB,KAAK,MAAO,MAAM,IAAI,OAAO,KAAM,IAAI;CAE3C,IAAI,CAAC,KAAK,QAAQ,CAAC,KAAK,YAAa,IAAI,SAAS,cAAc,IAAI,SAAS,SAC5E,OAAO,SAAS,KAAK,EAAE,OAAO,kBAAkB,GAAG,EAAE,QAAQ,IAAI,CAAC;CAEnE,MAAM,sBAAM,IAAI,KAAK;CACrB,MAAM,OAAO,MAAM,UAAU,IAAI,SAAS,GAAG;CAC7C,MAAM,QAAQ,eAAiB,MAAM,aAAa,GAAG,KAAM,KAAM,KAAA;CACjE,MAAM,WAAW,kBAAkB,MAAM,gBAAgB,KAAK,SAAS,IAAI,IAAI,KAAA;CAC/E,MAAM,QAAQ,MAAM,eAAe;EAClC;EACA,SAAS,IAAI;EACb;EACA;EACA;EACA;EACA;CACD,CAAC;CACD,MAAM,SAAS,UAAU;CACzB,IAAI,QACH,OAAO,IAAI,KAAK;MAEhB,MAAM,WAAW,IAAI,SAAS,CAAC,KAAK,CAAC;CAEtC,OAAO,SAAS,KAAK,EAAE,IAAI,KAAK,GAAG,EAAE,QAAQ,IAAI,CAAC;AACnD"}
|
|
@@ -2,7 +2,7 @@ import { classifyDevice } from "./device.js";
|
|
|
2
2
|
import { deriveSource } from "./source.js";
|
|
3
3
|
import { dailyVisitorHash, deriveSessionId } from "./visitorHash.js";
|
|
4
4
|
//#region src/native/ingest/normalizeEvent.ts
|
|
5
|
-
async function normalizeEvent({ raw, headers, geoResolver, salt, now, scope }) {
|
|
5
|
+
async function normalizeEvent({ raw, headers, geoResolver, salt, now, scope, timezone }) {
|
|
6
6
|
const geo = await geoResolver(headers);
|
|
7
7
|
const ip = (headers.get("x-forwarded-for")?.split(",")[0] ?? headers.get("x-real-ip") ?? "").trim();
|
|
8
8
|
const ua = headers.get("user-agent") ?? "";
|
|
@@ -29,7 +29,8 @@ async function normalizeEvent({ raw, headers, geoResolver, salt, now, scope }) {
|
|
|
29
29
|
sessionId: deriveSessionId(visitorHash, hourBucket),
|
|
30
30
|
durationMs: raw.durationMs,
|
|
31
31
|
props: raw.props,
|
|
32
|
-
...scope !== void 0 ? { scope } : {}
|
|
32
|
+
...scope !== void 0 ? { scope } : {},
|
|
33
|
+
...timezone !== void 0 ? { timezone } : {}
|
|
33
34
|
};
|
|
34
35
|
}
|
|
35
36
|
//#endregion
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalizeEvent.js","names":[],"sources":["../../../src/native/ingest/normalizeEvent.ts"],"sourcesContent":["import type { GeoResolver } from '../geo/geoResolver'\nimport { classifyDevice, type DeviceType } from './device'\nimport { deriveSource } from './source'\nimport { dailyVisitorHash, deriveSessionId } from './visitorHash'\n\nexport interface RawEventInput {\n\ttype: 'pageview' | 'event'\n\tname?: string\n\tpath: string\n\thostname: string\n\treferrer?: string\n\tdurationMs?: number\n\tprops?: Record<string, unknown>\n}\n\nexport interface StoredEvent {\n\ttimestamp: Date\n\ttype: 'pageview' | 'event'\n\tname?: string\n\tpath: string\n\thostname: string\n\treferrer?: string\n\tdevice?: DeviceType\n\tsource?: string\n\tcountry?: string\n\tregion?: string\n\tcity?: string\n\tvisitorHash: string\n\tsessionId: string\n\tdurationMs?: number\n\tprops?: Record<string, unknown>\n\t/** Set only in scoped installs; '' is the null scope. */\n\tscope?: string\n}\n\nexport interface NormalizeArgs {\n\traw: RawEventInput\n\theaders: Headers\n\tgeoResolver: GeoResolver\n\tsalt: string\n\tnow: Date\n\tscope?: string\n}\n\nexport async function normalizeEvent({\n\traw,\n\theaders,\n\tgeoResolver,\n\tsalt,\n\tnow,\n\tscope,\n}: NormalizeArgs): Promise<StoredEvent> {\n\tconst geo = await geoResolver(headers)\n\tconst ip = (\n\t\theaders.get('x-forwarded-for')?.split(',')[0] ??\n\t\theaders.get('x-real-ip') ??\n\t\t''\n\t).trim()\n\tconst ua = headers.get('user-agent') ?? ''\n\tconst visitorHash = dailyVisitorHash({ ip, ua, site: raw.hostname, salt })\n\tconst hourBucket = now.toISOString().slice(0, 13)\n\treturn {\n\t\ttimestamp: now,\n\t\ttype: raw.type,\n\t\tname: raw.name,\n\t\tpath: raw.path,\n\t\thostname: raw.hostname,\n\t\treferrer: raw.referrer,\n\t\tdevice: classifyDevice(ua),\n\t\tsource: deriveSource(raw.referrer, raw.hostname),\n\t\tcountry: geo.country,\n\t\tregion: geo.region,\n\t\tcity: geo.city,\n\t\tvisitorHash,\n\t\tsessionId: deriveSessionId(visitorHash, hourBucket),\n\t\tdurationMs: raw.durationMs,\n\t\tprops: raw.props,\n\t\t...(scope !== undefined ? { scope } : {}),\n\t}\n}\n"],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"normalizeEvent.js","names":[],"sources":["../../../src/native/ingest/normalizeEvent.ts"],"sourcesContent":["import type { GeoResolver } from '../geo/geoResolver'\nimport { classifyDevice, type DeviceType } from './device'\nimport { deriveSource } from './source'\nimport { dailyVisitorHash, deriveSessionId } from './visitorHash'\n\nexport interface RawEventInput {\n\ttype: 'pageview' | 'event'\n\tname?: string\n\tpath: string\n\thostname: string\n\treferrer?: string\n\tdurationMs?: number\n\tprops?: Record<string, unknown>\n}\n\nexport interface StoredEvent {\n\ttimestamp: Date\n\ttype: 'pageview' | 'event'\n\tname?: string\n\tpath: string\n\thostname: string\n\treferrer?: string\n\tdevice?: DeviceType\n\tsource?: string\n\tcountry?: string\n\tregion?: string\n\tcity?: string\n\tvisitorHash: string\n\tsessionId: string\n\tdurationMs?: number\n\tprops?: Record<string, unknown>\n\t/** Set only in scoped installs; '' is the null scope. */\n\tscope?: string\n\t/**\n\t * Reporting timezone the rollup day bucket is computed in. In-memory only: stripped\n\t * before the event row is persisted (day bucketing happens at rollup time). Absent\n\t * means UTC.\n\t */\n\ttimezone?: string\n}\n\nexport interface NormalizeArgs {\n\traw: RawEventInput\n\theaders: Headers\n\tgeoResolver: GeoResolver\n\tsalt: string\n\tnow: Date\n\tscope?: string\n\ttimezone?: string\n}\n\nexport async function normalizeEvent({\n\traw,\n\theaders,\n\tgeoResolver,\n\tsalt,\n\tnow,\n\tscope,\n\ttimezone,\n}: NormalizeArgs): Promise<StoredEvent> {\n\tconst geo = await geoResolver(headers)\n\tconst ip = (\n\t\theaders.get('x-forwarded-for')?.split(',')[0] ??\n\t\theaders.get('x-real-ip') ??\n\t\t''\n\t).trim()\n\tconst ua = headers.get('user-agent') ?? ''\n\tconst visitorHash = dailyVisitorHash({ ip, ua, site: raw.hostname, salt })\n\tconst hourBucket = now.toISOString().slice(0, 13)\n\treturn {\n\t\ttimestamp: now,\n\t\ttype: raw.type,\n\t\tname: raw.name,\n\t\tpath: raw.path,\n\t\thostname: raw.hostname,\n\t\treferrer: raw.referrer,\n\t\tdevice: classifyDevice(ua),\n\t\tsource: deriveSource(raw.referrer, raw.hostname),\n\t\tcountry: geo.country,\n\t\tregion: geo.region,\n\t\tcity: geo.city,\n\t\tvisitorHash,\n\t\tsessionId: deriveSessionId(visitorHash, hourBucket),\n\t\tdurationMs: raw.durationMs,\n\t\tprops: raw.props,\n\t\t...(scope !== undefined ? { scope } : {}),\n\t\t...(timezone !== undefined ? { timezone } : {}),\n\t}\n}\n"],"mappings":";;;;AAmDA,eAAsB,eAAe,EACpC,KACA,SACA,aACA,MACA,KACA,OACA,YACuC;CACvC,MAAM,MAAM,MAAM,YAAY,OAAO;CACrC,MAAM,MACL,QAAQ,IAAI,iBAAiB,GAAG,MAAM,GAAG,EAAE,MAC3C,QAAQ,IAAI,WAAW,KACvB,IACC,KAAK;CACP,MAAM,KAAK,QAAQ,IAAI,YAAY,KAAK;CACxC,MAAM,cAAc,iBAAiB;EAAE;EAAI;EAAI,MAAM,IAAI;EAAU;CAAK,CAAC;CACzE,MAAM,aAAa,IAAI,YAAY,EAAE,MAAM,GAAG,EAAE;CAChD,OAAO;EACN,WAAW;EACX,MAAM,IAAI;EACV,MAAM,IAAI;EACV,MAAM,IAAI;EACV,UAAU,IAAI;EACd,UAAU,IAAI;EACd,QAAQ,eAAe,EAAE;EACzB,QAAQ,aAAa,IAAI,UAAU,IAAI,QAAQ;EAC/C,SAAS,IAAI;EACb,QAAQ,IAAI;EACZ,MAAM,IAAI;EACV;EACA,WAAW,gBAAgB,aAAa,UAAU;EAClD,YAAY,IAAI;EAChB,OAAO,IAAI;EACX,GAAI,UAAU,KAAA,IAAY,EAAE,MAAM,IAAI,CAAC;EACvC,GAAI,aAAa,KAAA,IAAY,EAAE,SAAS,IAAI,CAAC;CAC9C;AACD"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { EVENTS_SLUG } from "../collections/events.js";
|
|
2
2
|
//#region src/native/ingest/writeEvent.ts
|
|
3
3
|
async function writeEvent(payload, event) {
|
|
4
|
+
const { timezone: _timezone, ...data } = event;
|
|
4
5
|
await payload.create({
|
|
5
6
|
collection: EVENTS_SLUG,
|
|
6
|
-
data
|
|
7
|
+
data,
|
|
7
8
|
overrideAccess: true
|
|
8
9
|
});
|
|
9
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writeEvent.js","names":[],"sources":["../../../src/native/ingest/writeEvent.ts"],"sourcesContent":["import type { CollectionSlug, Payload } from 'payload'\nimport { EVENTS_SLUG } from '../collections/events'\nimport type { StoredEvent } from './normalizeEvent'\n\nexport async function writeEvent(payload: Payload, event: StoredEvent): Promise<void> {\n\tawait payload.create({\n\t\tcollection: EVENTS_SLUG as CollectionSlug,\n\t\tdata:
|
|
1
|
+
{"version":3,"file":"writeEvent.js","names":[],"sources":["../../../src/native/ingest/writeEvent.ts"],"sourcesContent":["import type { CollectionSlug, Payload } from 'payload'\nimport { EVENTS_SLUG } from '../collections/events'\nimport type { StoredEvent } from './normalizeEvent'\n\nexport async function writeEvent(payload: Payload, event: StoredEvent): Promise<void> {\n\t// `timezone` drives rollup day bucketing only; it is not a stored events column.\n\tconst { timezone: _timezone, ...data } = event\n\tawait payload.create({\n\t\tcollection: EVENTS_SLUG as CollectionSlug,\n\t\tdata: data as never,\n\t\toverrideAccess: true,\n\t})\n}\n"],"mappings":";;AAIA,eAAsB,WAAW,SAAkB,OAAmC;CAErF,MAAM,EAAE,UAAU,WAAW,GAAG,SAAS;CACzC,MAAM,QAAQ,OAAO;EACpB,YAAY;EACN;EACN,gBAAgB;CACjB,CAAC;AACF"}
|
|
@@ -29,7 +29,7 @@ const baseCapabilities = {
|
|
|
29
29
|
perPageQuery: true,
|
|
30
30
|
realtime: true,
|
|
31
31
|
realtimeWindowMinutes: 60,
|
|
32
|
-
comparison:
|
|
32
|
+
comparison: true,
|
|
33
33
|
minGranularity: "day",
|
|
34
34
|
maxLookbackDays: null,
|
|
35
35
|
metrics,
|
|
@@ -75,7 +75,10 @@ function native(options = {}) {
|
|
|
75
75
|
config.endpoints = [...config.endpoints ?? [], {
|
|
76
76
|
method: "post",
|
|
77
77
|
path: options.ingestPath ?? "/analytics/ingest",
|
|
78
|
-
handler: makeIngestHandler(geoResolver, () => buffer,
|
|
78
|
+
handler: makeIngestHandler(geoResolver, () => buffer, {
|
|
79
|
+
scope: scoped ? context?.resolveScope : void 0,
|
|
80
|
+
timezone: context?.resolveTimezone
|
|
81
|
+
})
|
|
79
82
|
}];
|
|
80
83
|
if (options.retentionDays && options.retentionDays > 0) config.jobs = {
|
|
81
84
|
...config.jobs,
|
|
@@ -83,7 +86,6 @@ function native(options = {}) {
|
|
|
83
86
|
};
|
|
84
87
|
const prevOnInit = config.onInit;
|
|
85
88
|
config.onInit = async (p) => {
|
|
86
|
-
await prevOnInit?.(p);
|
|
87
89
|
payloadRef = p;
|
|
88
90
|
if (options.buffer) {
|
|
89
91
|
const cfg = options.buffer === true ? {} : options.buffer;
|
|
@@ -99,6 +101,7 @@ function native(options = {}) {
|
|
|
99
101
|
}
|
|
100
102
|
});
|
|
101
103
|
}
|
|
104
|
+
await prevOnInit?.(p);
|
|
102
105
|
};
|
|
103
106
|
},
|
|
104
107
|
async query(q) {
|
|
@@ -122,7 +125,7 @@ function native(options = {}) {
|
|
|
122
125
|
const totals = selectMetrics(totalsAcc, q.metrics);
|
|
123
126
|
if (!dim) {
|
|
124
127
|
if (q.granularity === "day") return {
|
|
125
|
-
rows: seriesFromRollups(totalsDocs, q.metrics),
|
|
128
|
+
rows: seriesFromRollups(totalsDocs, q.metrics, q.timezone),
|
|
126
129
|
totals,
|
|
127
130
|
meta: {
|
|
128
131
|
provider: "native",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nativeAdapter.js","names":["events"],"sources":["../../src/native/nativeAdapter.ts"],"sourcesContent":["import type { Config, Payload } from 'payload'\nimport type {\n\tAdapterContext,\n\tAnalyticsAdapter,\n\tAnalyticsCapabilities,\n\tAnalyticsQuery,\n\tAnalyticsResult,\n\tAnalyticsRow,\n\tDimensionKey,\n\tMetricKey,\n} from '../core/contract'\nimport { EVENTS_SLUG, eventsCollection } from './collections/events'\nimport { ROLLUPS_SLUG, rollupsCollection } from './collections/rollups'\nimport { seenCollection } from './collections/seen'\nimport { composeGeoResolvers } from './geo/composeGeoResolvers'\nimport { type GeoResolver, platformHeaderResolver } from './geo/geoResolver'\nimport { maxmindResolver } from './geo/maxmindResolver'\nimport { makeIngestHandler } from './ingest/endpoint'\nimport { flushBatch } from './ingest/flushBatch'\nimport type { StoredEvent } from './ingest/normalizeEvent'\nimport { createWriteBuffer, type WriteBuffer } from './ingest/writeBuffer'\nimport { buildRealtime, type RealtimeEvent } from './realtime/buildRealtime'\nimport { pruneEventsTask } from './retention/pruneTask'\nimport {\n\ttype Acc,\n\tadd,\n\temptyAcc,\n\ttype RollupDoc,\n\tselectMetrics,\n\tseriesFromRollups,\n} from './rollupAcc'\n\nexport interface NativeOptions {\n\tgeoResolver?: GeoResolver\n\tgeoDbPath?: string\n\tingestPath?: string\n\tretentionDays?: number\n\t/** Opt-in in-process write batching. `true` uses defaults (maxSize 50, maxAgeMs 2000). */\n\tbuffer?: boolean | { maxSize?: number; maxAgeMs?: number }\n}\n\nexport type NativeAdapter = AnalyticsAdapter & { flush: () => Promise<void> }\n\nconst metrics: ReadonlySet<MetricKey> = new Set([\n\t'pageviews',\n\t'visitors',\n\t'sessions',\n\t'events',\n\t'avgDuration',\n])\nconst dimensions: ReadonlySet<DimensionKey> = new Set(['page', 'country', 'source', 'device'])\n\nconst REALTIME_EVENT_LIMIT = 50_000\n\nconst baseCapabilities: AnalyticsCapabilities = {\n\tperPageQuery: true,\n\trealtime: true,\n\trealtimeWindowMinutes: 60,\n\tcomparison: false,\n\tminGranularity: 'day',\n\tmaxLookbackDays: null,\n\tmetrics,\n\tdimensions,\n\tbatchPageReport: true,\n\trateLimit: null,\n\trecommendedTtl: { realtime: 10, aggregate: 300 },\n}\n\nexport function native(options: NativeOptions = {}): NativeAdapter {\n\tconst geoResolver =\n\t\toptions.geoResolver ??\n\t\t(options.geoDbPath\n\t\t\t? composeGeoResolvers(platformHeaderResolver, maxmindResolver({ dbPath: options.geoDbPath }))\n\t\t\t: platformHeaderResolver)\n\t// Per-instance copy: register() flips scopedQueries when the install is scoped.\n\tconst capabilities: AnalyticsCapabilities = { ...baseCapabilities }\n\tlet payloadRef: Payload | null = null\n\tlet buffer: WriteBuffer<StoredEvent> | null = null\n\tlet scoped = false\n\n\tconst scopeWhere = (q: AnalyticsQuery): Record<string, unknown> =>\n\t\tscoped && q.scope !== undefined ? { scope: { equals: q.scope } } : {}\n\n\tconst readRollups = async (\n\t\tpayload: Payload,\n\t\twhere: Record<string, unknown>\n\t): Promise<RollupDoc[]> => {\n\t\tconst { docs } = await payload.find({\n\t\t\tcollection: ROLLUPS_SLUG as never,\n\t\t\twhere: where as never,\n\t\t\tlimit: 100_000,\n\t\t\tpagination: false,\n\t\t})\n\t\treturn docs as unknown as RollupDoc[]\n\t}\n\n\treturn {\n\t\tid: 'native',\n\t\tlabel: 'Native (Payload)',\n\t\tcapabilities,\n\t\tisConfigured: () => true,\n\t\tflush: () => buffer?.flush() ?? Promise.resolve(),\n\t\tregister(config: Config, context) {\n\t\t\tscoped = context?.scoped ?? false\n\t\t\tif (scoped) {\n\t\t\t\tcapabilities.scopedQueries = true\n\t\t\t}\n\t\t\tconfig.collections = [\n\t\t\t\t...(config.collections ?? []),\n\t\t\t\teventsCollection(scoped),\n\t\t\t\trollupsCollection(scoped),\n\t\t\t\tseenCollection(),\n\t\t\t]\n\t\t\tconfig.endpoints = [\n\t\t\t\t...(config.endpoints ?? []),\n\t\t\t\t{\n\t\t\t\t\tmethod: 'post',\n\t\t\t\t\tpath: options.ingestPath ?? '/analytics/ingest',\n\t\t\t\t\thandler: makeIngestHandler(\n\t\t\t\t\t\tgeoResolver,\n\t\t\t\t\t\t() => buffer,\n\t\t\t\t\t\tscoped ? context?.resolveScope : undefined\n\t\t\t\t\t),\n\t\t\t\t},\n\t\t\t]\n\t\t\tif (options.retentionDays && options.retentionDays > 0) {\n\t\t\t\tconfig.jobs = {\n\t\t\t\t\t...config.jobs,\n\t\t\t\t\ttasks: [...(config.jobs?.tasks ?? []), pruneEventsTask(options.retentionDays)],\n\t\t\t\t}\n\t\t\t}\n\t\t\tconst prevOnInit = config.onInit\n\t\t\tconfig.onInit = async (p) => {\n\t\t\t\tawait prevOnInit?.(p)\n\t\t\t\tpayloadRef = p\n\t\t\t\tif (options.buffer) {\n\t\t\t\t\tconst cfg = options.buffer === true ? {} : options.buffer\n\t\t\t\t\tbuffer = createWriteBuffer<StoredEvent>({\n\t\t\t\t\t\tmaxSize: cfg.maxSize ?? 50,\n\t\t\t\t\t\tmaxAgeMs: cfg.maxAgeMs ?? 2000,\n\t\t\t\t\t\tonFlush: (batch) => flushBatch(p, batch),\n\t\t\t\t\t\tonError: (error) => {\n\t\t\t\t\t\t\tp.logger.error({ err: error, msg: 'analytics: write buffer flush failed' })\n\t\t\t\t\t\t},\n\t\t\t\t\t})\n\t\t\t\t}\n\t\t\t}\n\t\t},\n\t\tasync query(q: AnalyticsQuery): Promise<AnalyticsResult> {\n\t\t\tif (!payloadRef) {\n\t\t\t\tthrow new Error('analytics: native adapter queried before init')\n\t\t\t}\n\t\t\tconst fetchedAt = q.dateRange.end.toISOString()\n\t\t\tconst periodWhere = {\n\t\t\t\tgreater_than_equal: q.dateRange.start.toISOString(),\n\t\t\t\tless_than_equal: q.dateRange.end.toISOString(),\n\t\t\t}\n\t\t\tconst dim = q.dimensions?.find((d) => dimensions.has(d))\n\n\t\t\t// Distinct metrics (visitors/sessions) must not be summed across breakdown rows.\n\t\t\t// Totals always come from the non-dimensioned aggregate row. A dimensioned query\n\t\t\t// reports site-wide totals (path=''), a plain query uses the path-scoped row.\n\t\t\tconst totalsPath = dim ? '' : (q.path ?? '')\n\t\t\tconst totalsDocs = await readRollups(payloadRef, {\n\t\t\t\tgranularity: { equals: 'day' },\n\t\t\t\tdimension: { equals: '' },\n\t\t\t\tpath: { equals: totalsPath },\n\t\t\t\tperiod: periodWhere,\n\t\t\t\t...scopeWhere(q),\n\t\t\t})\n\t\t\tconst totalsAcc = emptyAcc()\n\t\t\tfor (const d of totalsDocs) {\n\t\t\t\tadd(totalsAcc, d)\n\t\t\t}\n\t\t\tconst totals = selectMetrics(totalsAcc, q.metrics)\n\n\t\t\tif (!dim) {\n\t\t\t\tif (q.granularity === 'day') {\n\t\t\t\t\treturn {\n\t\t\t\t\t\trows: seriesFromRollups(totalsDocs, q.metrics),\n\t\t\t\t\t\ttotals,\n\t\t\t\t\t\tmeta: { provider: 'native', fetchedAt },\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\treturn { rows: [{ metrics: totals }], totals, meta: { provider: 'native', fetchedAt } }\n\t\t\t}\n\n\t\t\tconst breakdownWhere =\n\t\t\t\tdim === 'page'\n\t\t\t\t\t? {\n\t\t\t\t\t\t\tgranularity: { equals: 'day' },\n\t\t\t\t\t\t\tdimension: { equals: '' },\n\t\t\t\t\t\t\tpath: { not_equals: '' },\n\t\t\t\t\t\t\tperiod: periodWhere,\n\t\t\t\t\t\t\t...scopeWhere(q),\n\t\t\t\t\t\t}\n\t\t\t\t\t: {\n\t\t\t\t\t\t\tgranularity: { equals: 'day' },\n\t\t\t\t\t\t\tdimension: { equals: dim },\n\t\t\t\t\t\t\tpath: { equals: '' },\n\t\t\t\t\t\t\tperiod: periodWhere,\n\t\t\t\t\t\t\t...scopeWhere(q),\n\t\t\t\t\t\t}\n\t\t\tconst groups = new Map<string, Acc>()\n\t\t\tfor (const d of await readRollups(payloadRef, breakdownWhere)) {\n\t\t\t\tconst value = dim === 'page' ? d.path : d.dimvalue\n\t\t\t\tlet acc = groups.get(value)\n\t\t\t\tif (!acc) {\n\t\t\t\t\tacc = emptyAcc()\n\t\t\t\t\tgroups.set(value, acc)\n\t\t\t\t}\n\t\t\t\tadd(acc, d)\n\t\t\t}\n\t\t\tlet rows: AnalyticsRow[] = [...groups].map(([value, acc]) => ({\n\t\t\t\tdimensions: { [dim]: value } as Partial<Record<DimensionKey, string>>,\n\t\t\t\tmetrics: selectMetrics(acc, q.metrics),\n\t\t\t}))\n\t\t\tconst sortMetric = q.order?.metric ?? 'pageviews'\n\t\t\tconst direction = (q.order?.direction ?? 'desc') === 'asc' ? 1 : -1\n\t\t\trows.sort((a, b) => ((a.metrics[sortMetric] ?? 0) - (b.metrics[sortMetric] ?? 0)) * direction)\n\t\t\tif (q.limit) {\n\t\t\t\trows = rows.slice(0, q.limit)\n\t\t\t}\n\t\t\treturn { rows, totals, meta: { provider: 'native', fetchedAt } }\n\t\t},\n\t\tasync realtime(q: AnalyticsQuery, _ctx: AdapterContext): Promise<AnalyticsResult> {\n\t\t\tif (!payloadRef) {\n\t\t\t\tthrow new Error('analytics: native adapter queried before init')\n\t\t\t}\n\t\t\tconst fetchedAt = q.dateRange.end.toISOString()\n\t\t\tconst { docs } = await payloadRef.find({\n\t\t\t\tcollection: EVENTS_SLUG as never,\n\t\t\t\twhere: {\n\t\t\t\t\ttimestamp: {\n\t\t\t\t\t\tgreater_than_equal: q.dateRange.start.toISOString(),\n\t\t\t\t\t\tless_than_equal: q.dateRange.end.toISOString(),\n\t\t\t\t\t},\n\t\t\t\t\t...scopeWhere(q),\n\t\t\t\t} as never,\n\t\t\t\t// Newest-first under a hard cap: if a very busy site has more events than the\n\t\t\t\t// cap in the window, keep the most recent activity rather than the oldest.\n\t\t\t\t// Unbounded accuracy via DB-side aggregation is deferred to the hardening spec.\n\t\t\t\tlimit: REALTIME_EVENT_LIMIT,\n\t\t\t\tpagination: false,\n\t\t\t\tdepth: 0,\n\t\t\t\tsort: '-timestamp',\n\t\t\t})\n\t\t\tconst events = docs as unknown as RealtimeEvent[]\n\t\t\tconst { rows, totals } = buildRealtime(events, q.dateRange, q.metrics)\n\t\t\treturn { rows, totals, meta: { provider: 'native', fetchedAt } }\n\t\t},\n\t}\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"nativeAdapter.js","names":["events"],"sources":["../../src/native/nativeAdapter.ts"],"sourcesContent":["import type { Config, Payload } from 'payload'\nimport type {\n\tAdapterContext,\n\tAnalyticsAdapter,\n\tAnalyticsCapabilities,\n\tAnalyticsQuery,\n\tAnalyticsResult,\n\tAnalyticsRow,\n\tDimensionKey,\n\tMetricKey,\n} from '../core/contract'\nimport { EVENTS_SLUG, eventsCollection } from './collections/events'\nimport { ROLLUPS_SLUG, rollupsCollection } from './collections/rollups'\nimport { seenCollection } from './collections/seen'\nimport { composeGeoResolvers } from './geo/composeGeoResolvers'\nimport { type GeoResolver, platformHeaderResolver } from './geo/geoResolver'\nimport { maxmindResolver } from './geo/maxmindResolver'\nimport { makeIngestHandler } from './ingest/endpoint'\nimport { flushBatch } from './ingest/flushBatch'\nimport type { StoredEvent } from './ingest/normalizeEvent'\nimport { createWriteBuffer, type WriteBuffer } from './ingest/writeBuffer'\nimport { buildRealtime, type RealtimeEvent } from './realtime/buildRealtime'\nimport { pruneEventsTask } from './retention/pruneTask'\nimport {\n\ttype Acc,\n\tadd,\n\temptyAcc,\n\ttype RollupDoc,\n\tselectMetrics,\n\tseriesFromRollups,\n} from './rollupAcc'\n\nexport interface NativeOptions {\n\tgeoResolver?: GeoResolver\n\tgeoDbPath?: string\n\tingestPath?: string\n\tretentionDays?: number\n\t/** Opt-in in-process write batching. `true` uses defaults (maxSize 50, maxAgeMs 2000). */\n\tbuffer?: boolean | { maxSize?: number; maxAgeMs?: number }\n}\n\nexport type NativeAdapter = AnalyticsAdapter & { flush: () => Promise<void> }\n\nconst metrics: ReadonlySet<MetricKey> = new Set([\n\t'pageviews',\n\t'visitors',\n\t'sessions',\n\t'events',\n\t'avgDuration',\n])\nconst dimensions: ReadonlySet<DimensionKey> = new Set(['page', 'country', 'source', 'device'])\n\nconst REALTIME_EVENT_LIMIT = 50_000\n\nconst baseCapabilities: AnalyticsCapabilities = {\n\tperPageQuery: true,\n\trealtime: true,\n\trealtimeWindowMinutes: 60,\n\tcomparison: true,\n\tminGranularity: 'day',\n\tmaxLookbackDays: null,\n\tmetrics,\n\tdimensions,\n\tbatchPageReport: true,\n\trateLimit: null,\n\trecommendedTtl: { realtime: 10, aggregate: 300 },\n}\n\nexport function native(options: NativeOptions = {}): NativeAdapter {\n\tconst geoResolver =\n\t\toptions.geoResolver ??\n\t\t(options.geoDbPath\n\t\t\t? composeGeoResolvers(platformHeaderResolver, maxmindResolver({ dbPath: options.geoDbPath }))\n\t\t\t: platformHeaderResolver)\n\t// Per-instance copy: register() flips scopedQueries when the install is scoped.\n\tconst capabilities: AnalyticsCapabilities = { ...baseCapabilities }\n\tlet payloadRef: Payload | null = null\n\tlet buffer: WriteBuffer<StoredEvent> | null = null\n\tlet scoped = false\n\n\tconst scopeWhere = (q: AnalyticsQuery): Record<string, unknown> =>\n\t\tscoped && q.scope !== undefined ? { scope: { equals: q.scope } } : {}\n\n\tconst readRollups = async (\n\t\tpayload: Payload,\n\t\twhere: Record<string, unknown>\n\t): Promise<RollupDoc[]> => {\n\t\tconst { docs } = await payload.find({\n\t\t\tcollection: ROLLUPS_SLUG as never,\n\t\t\twhere: where as never,\n\t\t\tlimit: 100_000,\n\t\t\tpagination: false,\n\t\t})\n\t\treturn docs as unknown as RollupDoc[]\n\t}\n\n\treturn {\n\t\tid: 'native',\n\t\tlabel: 'Native (Payload)',\n\t\tcapabilities,\n\t\tisConfigured: () => true,\n\t\tflush: () => buffer?.flush() ?? Promise.resolve(),\n\t\tregister(config: Config, context) {\n\t\t\tscoped = context?.scoped ?? false\n\t\t\tif (scoped) {\n\t\t\t\tcapabilities.scopedQueries = true\n\t\t\t}\n\t\t\tconfig.collections = [\n\t\t\t\t...(config.collections ?? []),\n\t\t\t\teventsCollection(scoped),\n\t\t\t\trollupsCollection(scoped),\n\t\t\t\tseenCollection(),\n\t\t\t]\n\t\t\tconfig.endpoints = [\n\t\t\t\t...(config.endpoints ?? []),\n\t\t\t\t{\n\t\t\t\t\tmethod: 'post',\n\t\t\t\t\tpath: options.ingestPath ?? '/analytics/ingest',\n\t\t\t\t\thandler: makeIngestHandler(geoResolver, () => buffer, {\n\t\t\t\t\t\tscope: scoped ? context?.resolveScope : undefined,\n\t\t\t\t\t\ttimezone: context?.resolveTimezone,\n\t\t\t\t\t}),\n\t\t\t\t},\n\t\t\t]\n\t\t\tif (options.retentionDays && options.retentionDays > 0) {\n\t\t\t\tconfig.jobs = {\n\t\t\t\t\t...config.jobs,\n\t\t\t\t\ttasks: [...(config.jobs?.tasks ?? []), pruneEventsTask(options.retentionDays)],\n\t\t\t\t}\n\t\t\t}\n\t\t\tconst prevOnInit = config.onInit\n\t\t\t// payloadRef is set before the app's own onInit so consumer init code can\n\t\t\t// already query the native adapter.\n\t\t\tconfig.onInit = async (p) => {\n\t\t\t\tpayloadRef = p\n\t\t\t\tif (options.buffer) {\n\t\t\t\t\tconst cfg = options.buffer === true ? {} : options.buffer\n\t\t\t\t\tbuffer = createWriteBuffer<StoredEvent>({\n\t\t\t\t\t\tmaxSize: cfg.maxSize ?? 50,\n\t\t\t\t\t\tmaxAgeMs: cfg.maxAgeMs ?? 2000,\n\t\t\t\t\t\tonFlush: (batch) => flushBatch(p, batch),\n\t\t\t\t\t\tonError: (error) => {\n\t\t\t\t\t\t\tp.logger.error({ err: error, msg: 'analytics: write buffer flush failed' })\n\t\t\t\t\t\t},\n\t\t\t\t\t})\n\t\t\t\t}\n\t\t\t\tawait prevOnInit?.(p)\n\t\t\t}\n\t\t},\n\t\tasync query(q: AnalyticsQuery): Promise<AnalyticsResult> {\n\t\t\tif (!payloadRef) {\n\t\t\t\tthrow new Error('analytics: native adapter queried before init')\n\t\t\t}\n\t\t\tconst fetchedAt = q.dateRange.end.toISOString()\n\t\t\tconst periodWhere = {\n\t\t\t\tgreater_than_equal: q.dateRange.start.toISOString(),\n\t\t\t\tless_than_equal: q.dateRange.end.toISOString(),\n\t\t\t}\n\t\t\tconst dim = q.dimensions?.find((d) => dimensions.has(d))\n\n\t\t\t// Distinct metrics (visitors/sessions) must not be summed across breakdown rows.\n\t\t\t// Totals always come from the non-dimensioned aggregate row. A dimensioned query\n\t\t\t// reports site-wide totals (path=''), a plain query uses the path-scoped row.\n\t\t\tconst totalsPath = dim ? '' : (q.path ?? '')\n\t\t\tconst totalsDocs = await readRollups(payloadRef, {\n\t\t\t\tgranularity: { equals: 'day' },\n\t\t\t\tdimension: { equals: '' },\n\t\t\t\tpath: { equals: totalsPath },\n\t\t\t\tperiod: periodWhere,\n\t\t\t\t...scopeWhere(q),\n\t\t\t})\n\t\t\tconst totalsAcc = emptyAcc()\n\t\t\tfor (const d of totalsDocs) {\n\t\t\t\tadd(totalsAcc, d)\n\t\t\t}\n\t\t\tconst totals = selectMetrics(totalsAcc, q.metrics)\n\n\t\t\tif (!dim) {\n\t\t\t\tif (q.granularity === 'day') {\n\t\t\t\t\treturn {\n\t\t\t\t\t\trows: seriesFromRollups(totalsDocs, q.metrics, q.timezone),\n\t\t\t\t\t\ttotals,\n\t\t\t\t\t\tmeta: { provider: 'native', fetchedAt },\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\treturn { rows: [{ metrics: totals }], totals, meta: { provider: 'native', fetchedAt } }\n\t\t\t}\n\n\t\t\tconst breakdownWhere =\n\t\t\t\tdim === 'page'\n\t\t\t\t\t? {\n\t\t\t\t\t\t\tgranularity: { equals: 'day' },\n\t\t\t\t\t\t\tdimension: { equals: '' },\n\t\t\t\t\t\t\tpath: { not_equals: '' },\n\t\t\t\t\t\t\tperiod: periodWhere,\n\t\t\t\t\t\t\t...scopeWhere(q),\n\t\t\t\t\t\t}\n\t\t\t\t\t: {\n\t\t\t\t\t\t\tgranularity: { equals: 'day' },\n\t\t\t\t\t\t\tdimension: { equals: dim },\n\t\t\t\t\t\t\tpath: { equals: '' },\n\t\t\t\t\t\t\tperiod: periodWhere,\n\t\t\t\t\t\t\t...scopeWhere(q),\n\t\t\t\t\t\t}\n\t\t\tconst groups = new Map<string, Acc>()\n\t\t\tfor (const d of await readRollups(payloadRef, breakdownWhere)) {\n\t\t\t\tconst value = dim === 'page' ? d.path : d.dimvalue\n\t\t\t\tlet acc = groups.get(value)\n\t\t\t\tif (!acc) {\n\t\t\t\t\tacc = emptyAcc()\n\t\t\t\t\tgroups.set(value, acc)\n\t\t\t\t}\n\t\t\t\tadd(acc, d)\n\t\t\t}\n\t\t\tlet rows: AnalyticsRow[] = [...groups].map(([value, acc]) => ({\n\t\t\t\tdimensions: { [dim]: value } as Partial<Record<DimensionKey, string>>,\n\t\t\t\tmetrics: selectMetrics(acc, q.metrics),\n\t\t\t}))\n\t\t\tconst sortMetric = q.order?.metric ?? 'pageviews'\n\t\t\tconst direction = (q.order?.direction ?? 'desc') === 'asc' ? 1 : -1\n\t\t\trows.sort((a, b) => ((a.metrics[sortMetric] ?? 0) - (b.metrics[sortMetric] ?? 0)) * direction)\n\t\t\tif (q.limit) {\n\t\t\t\trows = rows.slice(0, q.limit)\n\t\t\t}\n\t\t\treturn { rows, totals, meta: { provider: 'native', fetchedAt } }\n\t\t},\n\t\tasync realtime(q: AnalyticsQuery, _ctx: AdapterContext): Promise<AnalyticsResult> {\n\t\t\tif (!payloadRef) {\n\t\t\t\tthrow new Error('analytics: native adapter queried before init')\n\t\t\t}\n\t\t\tconst fetchedAt = q.dateRange.end.toISOString()\n\t\t\tconst { docs } = await payloadRef.find({\n\t\t\t\tcollection: EVENTS_SLUG as never,\n\t\t\t\twhere: {\n\t\t\t\t\ttimestamp: {\n\t\t\t\t\t\tgreater_than_equal: q.dateRange.start.toISOString(),\n\t\t\t\t\t\tless_than_equal: q.dateRange.end.toISOString(),\n\t\t\t\t\t},\n\t\t\t\t\t...scopeWhere(q),\n\t\t\t\t} as never,\n\t\t\t\t// Newest-first under a hard cap: if a very busy site has more events than the\n\t\t\t\t// cap in the window, keep the most recent activity rather than the oldest.\n\t\t\t\t// Unbounded accuracy via DB-side aggregation is deferred to the hardening spec.\n\t\t\t\tlimit: REALTIME_EVENT_LIMIT,\n\t\t\t\tpagination: false,\n\t\t\t\tdepth: 0,\n\t\t\t\tsort: '-timestamp',\n\t\t\t})\n\t\t\tconst events = docs as unknown as RealtimeEvent[]\n\t\t\tconst { rows, totals } = buildRealtime(events, q.dateRange, q.metrics)\n\t\t\treturn { rows, totals, meta: { provider: 'native', fetchedAt } }\n\t\t},\n\t}\n}\n"],"mappings":"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"}
|
package/dist/native/rollupAcc.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { startOfDayInTz } from "../timeframe/tz.js";
|
|
1
2
|
//#region src/native/rollupAcc.ts
|
|
2
3
|
const emptyAcc = () => ({
|
|
3
4
|
pageviews: 0,
|
|
@@ -22,16 +23,18 @@ const selectMetrics = (acc, wanted) => {
|
|
|
22
23
|
if (wanted.includes("avgDuration")) out.avgDuration = acc.pageviews > 0 ? Math.round(acc.durationMs / acc.pageviews) : 0;
|
|
23
24
|
return out;
|
|
24
25
|
};
|
|
25
|
-
const startOfUtcDay = (d) => new Date(Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate()));
|
|
26
26
|
/**
|
|
27
|
-
* Collapse per-day rollup docs into one time-series row per
|
|
28
|
-
*
|
|
29
|
-
*
|
|
27
|
+
* Collapse per-day rollup docs into one time-series row per day in `tz` (UTC by
|
|
28
|
+
* default), ascending by day. Rollups are already bucketed to their reporting-timezone
|
|
29
|
+
* day at ingest, so flooring in the same `tz` is idempotent; passing the read's timezone
|
|
30
|
+
* keeps a trend aligned to that zone. Distinct metrics (visitors/sessions) come from each
|
|
31
|
+
* day's own rollup and are never summed across days, so a daily trend shows that day's
|
|
32
|
+
* uniques.
|
|
30
33
|
*/
|
|
31
|
-
const seriesFromRollups = (docs, metrics) => {
|
|
34
|
+
const seriesFromRollups = (docs, metrics, tz = "UTC") => {
|
|
32
35
|
const byDay = /* @__PURE__ */ new Map();
|
|
33
36
|
for (const d of docs) {
|
|
34
|
-
const day =
|
|
37
|
+
const day = startOfDayInTz(new Date(d.period), tz).toISOString();
|
|
35
38
|
let acc = byDay.get(day);
|
|
36
39
|
if (!acc) {
|
|
37
40
|
acc = emptyAcc();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rollupAcc.js","names":[],"sources":["../../src/native/rollupAcc.ts"],"sourcesContent":["import type { AnalyticsRow, MetricKey } from '../core/contract'\n\nexport interface RollupDoc {\n\tpath: string\n\tdimvalue: string\n\tperiod: string | Date\n\tpageviews: number\n\tevents: number\n\tdurationMs: number\n\tvisitors: number\n\tsessions: number\n}\n\nexport interface Acc {\n\tpageviews: number\n\tevents: number\n\tdurationMs: number\n\tvisitors: number\n\tsessions: number\n}\n\nexport const emptyAcc = (): Acc => ({\n\tpageviews: 0,\n\tevents: 0,\n\tdurationMs: 0,\n\tvisitors: 0,\n\tsessions: 0,\n})\n\nexport const add = (acc: Acc, d: Acc): void => {\n\tacc.pageviews += d.pageviews\n\tacc.events += d.events\n\tacc.durationMs += d.durationMs\n\tacc.visitors += d.visitors\n\tacc.sessions += d.sessions\n}\n\nexport const selectMetrics = (\n\tacc: Acc,\n\twanted: MetricKey[]\n): Partial<Record<MetricKey, number>> => {\n\tconst out: Partial<Record<MetricKey, number>> = {}\n\tif (wanted.includes('pageviews')) out.pageviews = acc.pageviews\n\tif (wanted.includes('events')) out.events = acc.events\n\tif (wanted.includes('visitors')) out.visitors = acc.visitors\n\tif (wanted.includes('sessions')) out.sessions = acc.sessions\n\tif (wanted.includes('avgDuration')) {\n\t\tout.avgDuration = acc.pageviews > 0 ? Math.round(acc.durationMs / acc.pageviews) : 0\n\t}\n\treturn out\n}\n\
|
|
1
|
+
{"version":3,"file":"rollupAcc.js","names":[],"sources":["../../src/native/rollupAcc.ts"],"sourcesContent":["import type { AnalyticsRow, MetricKey } from '../core/contract'\nimport { DEFAULT_TIMEZONE, startOfDayInTz } from '../timeframe/tz'\n\nexport interface RollupDoc {\n\tpath: string\n\tdimvalue: string\n\tperiod: string | Date\n\tpageviews: number\n\tevents: number\n\tdurationMs: number\n\tvisitors: number\n\tsessions: number\n}\n\nexport interface Acc {\n\tpageviews: number\n\tevents: number\n\tdurationMs: number\n\tvisitors: number\n\tsessions: number\n}\n\nexport const emptyAcc = (): Acc => ({\n\tpageviews: 0,\n\tevents: 0,\n\tdurationMs: 0,\n\tvisitors: 0,\n\tsessions: 0,\n})\n\nexport const add = (acc: Acc, d: Acc): void => {\n\tacc.pageviews += d.pageviews\n\tacc.events += d.events\n\tacc.durationMs += d.durationMs\n\tacc.visitors += d.visitors\n\tacc.sessions += d.sessions\n}\n\nexport const selectMetrics = (\n\tacc: Acc,\n\twanted: MetricKey[]\n): Partial<Record<MetricKey, number>> => {\n\tconst out: Partial<Record<MetricKey, number>> = {}\n\tif (wanted.includes('pageviews')) out.pageviews = acc.pageviews\n\tif (wanted.includes('events')) out.events = acc.events\n\tif (wanted.includes('visitors')) out.visitors = acc.visitors\n\tif (wanted.includes('sessions')) out.sessions = acc.sessions\n\tif (wanted.includes('avgDuration')) {\n\t\tout.avgDuration = acc.pageviews > 0 ? Math.round(acc.durationMs / acc.pageviews) : 0\n\t}\n\treturn out\n}\n\n/**\n * Collapse per-day rollup docs into one time-series row per day in `tz` (UTC by\n * default), ascending by day. Rollups are already bucketed to their reporting-timezone\n * day at ingest, so flooring in the same `tz` is idempotent; passing the read's timezone\n * keeps a trend aligned to that zone. Distinct metrics (visitors/sessions) come from each\n * day's own rollup and are never summed across days, so a daily trend shows that day's\n * uniques.\n */\nexport const seriesFromRollups = (\n\tdocs: RollupDoc[],\n\tmetrics: MetricKey[],\n\ttz: string = DEFAULT_TIMEZONE\n): AnalyticsRow[] => {\n\tconst byDay = new Map<string, Acc>()\n\tfor (const d of docs) {\n\t\tconst day = startOfDayInTz(new Date(d.period), tz).toISOString()\n\t\tlet acc = byDay.get(day)\n\t\tif (!acc) {\n\t\t\tacc = emptyAcc()\n\t\t\tbyDay.set(day, acc)\n\t\t}\n\t\tadd(acc, d)\n\t}\n\treturn [...byDay.entries()]\n\t\t.sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0))\n\t\t.map(([day, acc]) => ({ timestamp: day, metrics: selectMetrics(acc, metrics) }))\n}\n"],"mappings":";;AAsBA,MAAa,kBAAuB;CACnC,WAAW;CACX,QAAQ;CACR,YAAY;CACZ,UAAU;CACV,UAAU;AACX;AAEA,MAAa,OAAO,KAAU,MAAiB;CAC9C,IAAI,aAAa,EAAE;CACnB,IAAI,UAAU,EAAE;CAChB,IAAI,cAAc,EAAE;CACpB,IAAI,YAAY,EAAE;CAClB,IAAI,YAAY,EAAE;AACnB;AAEA,MAAa,iBACZ,KACA,WACwC;CACxC,MAAM,MAA0C,CAAC;CACjD,IAAI,OAAO,SAAS,WAAW,GAAG,IAAI,YAAY,IAAI;CACtD,IAAI,OAAO,SAAS,QAAQ,GAAG,IAAI,SAAS,IAAI;CAChD,IAAI,OAAO,SAAS,UAAU,GAAG,IAAI,WAAW,IAAI;CACpD,IAAI,OAAO,SAAS,UAAU,GAAG,IAAI,WAAW,IAAI;CACpD,IAAI,OAAO,SAAS,aAAa,GAChC,IAAI,cAAc,IAAI,YAAY,IAAI,KAAK,MAAM,IAAI,aAAa,IAAI,SAAS,IAAI;CAEpF,OAAO;AACR;;;;;;;;;AAUA,MAAa,qBACZ,MACA,SACA,KAAA,UACoB;CACpB,MAAM,wBAAQ,IAAI,IAAiB;CACnC,KAAK,MAAM,KAAK,MAAM;EACrB,MAAM,MAAM,eAAe,IAAI,KAAK,EAAE,MAAM,GAAG,EAAE,EAAE,YAAY;EAC/D,IAAI,MAAM,MAAM,IAAI,GAAG;EACvB,IAAI,CAAC,KAAK;GACT,MAAM,SAAS;GACf,MAAM,IAAI,KAAK,GAAG;EACnB;EACA,IAAI,KAAK,CAAC;CACX;CACA,OAAO,CAAC,GAAG,MAAM,QAAQ,CAAC,EACxB,MAAM,CAAC,IAAI,CAAC,OAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,CAAE,EAC/C,KAAK,CAAC,KAAK,UAAU;EAAE,WAAW;EAAK,SAAS,cAAc,KAAK,OAAO;CAAE,EAAE;AACjF"}
|
|
@@ -1,6 +1,22 @@
|
|
|
1
1
|
import { ROLLUPS_SLUG } from "../collections/rollups.js";
|
|
2
2
|
//#region src/native/rollups/bumpRollup.ts
|
|
3
3
|
const PG_TABLE_KEY = "analytics_rollups";
|
|
4
|
+
/**
|
|
5
|
+
* Loads the optional Postgres peer without a literal specifier: bundlers (Turbopack, webpack,
|
|
6
|
+
* Vite) resolve literal dynamic imports at build time, which fails a Mongo host's build even
|
|
7
|
+
* though this branch is unreachable there. The function-built specifier is opaque to their
|
|
8
|
+
* analyzers, the ignore comments cover bundlers that would still warn, and the type-only
|
|
9
|
+
* reference above erases at compile time, so the package is touched only when the Postgres
|
|
10
|
+
* branch actually runs.
|
|
11
|
+
*/
|
|
12
|
+
const importPostgresSql = () => {
|
|
13
|
+
return import(
|
|
14
|
+
/* webpackIgnore: true */
|
|
15
|
+
/* turbopackIgnore: true */
|
|
16
|
+
/* @vite-ignore */
|
|
17
|
+
["@payloadcms", "db-postgres"].join("/")
|
|
18
|
+
);
|
|
19
|
+
};
|
|
4
20
|
const ZERO = {
|
|
5
21
|
pageviews: 0,
|
|
6
22
|
events: 0,
|
|
@@ -21,7 +37,7 @@ async function bumpRollup(payload, key, inc) {
|
|
|
21
37
|
}, { upsert: true });
|
|
22
38
|
return;
|
|
23
39
|
}
|
|
24
|
-
const { sql } = await
|
|
40
|
+
const { sql } = await importPostgresSql();
|
|
25
41
|
const db = payload.db;
|
|
26
42
|
const tableName = db.tableNameMap.get(PG_TABLE_KEY);
|
|
27
43
|
if (!tableName) throw new Error(`analytics: drizzle table "${PG_TABLE_KEY}" not found`);
|