Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.
TypeScript albumsexif-extractiongeocodinglive-photomotion-photophoto-galleryphoto-sharingwebgl-viewer
fix(analytics): retain top archive labels per scope and align long ranges to UTC days
coderabbitai[bot]45c209aa20c6
diff --git a/apps/cloud/app/pages/analytics.vue b/apps/cloud/app/pages/analytics.vueindex 3f2697c9..9fecc35a 100644--- a/apps/cloud/app/pages/analytics.vue+++ b/apps/cloud/app/pages/analytics.vue@@ -1,5 +1,5 @@<script setup lang="ts">-import { relativeRange } from '#saas-ui/utils/analytics-range'+import { archiveRange, relativeRange } from '#saas-ui/utils/analytics-range'definePageMeta({ layout: 'portal' })const { locale } = useI18n()const zh = computed(() => locale.value.startsWith('zh'))@@ -43,12 +43,13 @@ async function load() {error.value = ''report.value = nulltry {+ const bounds = archiveRange(range.value)const result = await fetcher('/api/analytics/report', {query: {workspaceId: billing.selected.value,siteId: siteId.value || undefined,- from: range.value.from,- to: range.value.to,+ from: bounds.from,+ to: bounds.to,allTime: range.value.allTime ? '1' : undefined,},timeout: 20000,@@ -129,8 +130,8 @@ await load()<p class="cf-field-hint">{{tr(- 'Custom ranges support the past year; all-time reports use daily archives.',- '自定义范围支持最近一年;所有时间使用按天归档数据。',+ 'Custom ranges support the past year; ranges over 31 days use full UTC days.',+ '自定义范围支持最近一年;超过 31 天的范围使用完整的 UTC 日期。',)}}</p>diff --git a/packages/platform/migrations/0039_restart_analytics_archive.sql b/packages/platform/migrations/0039_restart_analytics_archive.sqlnew file mode 100644index 00000000..85f6543e--- /dev/null+++ b/packages/platform/migrations/0039_restart_analytics_archive.sql@@ -0,0 +1,11 @@+-- Restart unfinished snapshots: their page offsets used the previous global cap.+UPDATE platform_analytics_archive_state SET phase=0,page_offset=0,lease_token=NULL,lease_until=0;+DELETE FROM platform_analytics_archive_rows WHERE EXISTS (+ SELECT 1 FROM platform_analytics_archive_state s+ WHERE s.dataset=platform_analytics_archive_rows.dataset+ AND s.snapshot=platform_analytics_archive_rows.snapshot+) AND NOT EXISTS (+ SELECT 1 FROM platform_analytics_archive_days d+ WHERE d.dataset=platform_analytics_archive_rows.dataset+ AND d.snapshot=platform_analytics_archive_rows.snapshot+);diff --git a/packages/platform/src/analytics-archive.ts b/packages/platform/src/analytics-archive.tsindex 4b98aeb0..2ff70ddf 100644--- a/packages/platform/src/analytics-archive.ts+++ b/packages/platform/src/analytics-archive.ts@@ -165,7 +165,7 @@ export async function archiveAnalytics(const [dimension, column] = dimensions[Math.floor(state.phase / 2)]!const perSite = state.phase % 2 === 1const end = isoDay(Date.parse(state.cursor_day) + DAY)- const sql = `SELECT * FROM (SELECT blob2 AS kind,blob3 AS workspaceId,${perSite ? 'blob4' : "'0'"} AS siteId,${column} AS label,SUM(_sample_interval) AS pv,COUNT(DISTINCT blob7) AS uv,MAX(_sample_interval) AS sampleInterval FROM ${config.dataset} WHERE blob1='v1' AND timestamp>=toDateTime('${state.cursor_day} 00:00:00') AND timestamp<toDateTime('${end} 00:00:00')${perSite ? " AND blob2='site'" : ''} GROUP BY kind,workspaceId,siteId,label ORDER BY pv DESC,kind,workspaceId,siteId,label LIMIT ${DETAIL_LIMIT}) ORDER BY kind,workspaceId,siteId,label LIMIT ${PAGE} OFFSET ${state.page_offset} FORMAT JSON`+ const sql = `SELECT blob2 AS kind,blob3 AS workspaceId,${perSite ? 'blob4' : "'0'"} AS siteId,${column} AS label,SUM(_sample_interval) AS pv,COUNT(DISTINCT blob7) AS uv,MAX(_sample_interval) AS sampleInterval FROM ${config.dataset} WHERE blob1='v1' AND timestamp>=toDateTime('${state.cursor_day} 00:00:00') AND timestamp<toDateTime('${end} 00:00:00')${perSite ? " AND blob2='site'" : ''} GROUP BY kind,workspaceId,siteId,label ORDER BY kind,workspaceId,siteId,label LIMIT ${PAGE} OFFSET ${state.page_offset} FORMAT JSON`const rows = await sqlRows(config, sql, fetcher)if (rows.some(@@ -195,6 +195,20 @@ export async function archiveAnalytics(config.dataset,token,),+ // Keep the best labels per scope, including those seen on earlier pages.+ db+ .prepare(+ `DELETE FROM platform_analytics_archive_rows WHERE rowid IN (SELECT rowid FROM (SELECT r.rowid,ROW_NUMBER() OVER (PARTITION BY r.kind,r.workspace_id,r.site_id ORDER BY r.pv DESC,r.label) AS rank FROM platform_analytics_archive_rows r WHERE r.dataset=? AND r.snapshot=? AND r.dimension=? AND (r.kind,r.workspace_id,r.site_id) IN (SELECT json_extract(value,'$.kind'),CAST(json_extract(value,'$.workspaceId') AS INTEGER),CAST(json_extract(value,'$.siteId') AS INTEGER) FROM json_each(?))) WHERE rank>?) AND EXISTS(SELECT 1 FROM platform_analytics_archive_state WHERE dataset=? AND lease_token=?)`,+ )+ .bind(+ config.dataset,+ state.snapshot,+ dimension,+ JSON.stringify(rows),+ DETAIL_LIMIT,+ config.dataset,+ token,+ ),db.prepare('UPDATE platform_analytics_archive_state SET phase=?,page_offset=?,updated_at=? WHERE dataset=? AND lease_token=?',diff --git a/packages/saas-ui/app/utils/analytics-range.ts b/packages/saas-ui/app/utils/analytics-range.tsindex 8cbd72ef..f1813d19 100644--- a/packages/saas-ui/app/utils/analytics-range.ts+++ b/packages/saas-ui/app/utils/analytics-range.ts@@ -26,6 +26,17 @@ export function relativeRange(preset: seconds,}}+// Daily archives cannot represent partial days; preserve half-open end semantics.+export function archiveRange(range: AnalyticsDateRange): AnalyticsDateRange {+ const start = Date.parse(range.from),+ end = Date.parse(range.to)+ if (range.allTime || end - start <= 31 * 86400000) return range+ return {+ ...range,+ from: new Date(start).toISOString().slice(0, 10),+ to: new Date(end - 1).toISOString().slice(0, 10),+ }+}export function rangeInput(value: string, utc: boolean) {const date = new Date(value)return new Date(date.getTime() - (utc ? 0 : date.getTimezoneOffset() * 60000))diff --git a/tests/analytics-archive.test.ts b/tests/analytics-archive.test.tsindex 62b86dce..2b013d8a 100644--- a/tests/analytics-archive.test.ts+++ b/tests/analytics-archive.test.ts@@ -8,6 +8,7 @@ import {archiveAnalytics,historicalAnalytics,} from '../packages/platform/src/analytics-archive.ts'+import { archiveRange } from '../packages/saas-ui/app/utils/analytics-range.ts'const require = createRequire(import.meta.url)const { Miniflare, convertV4MiniflareOptions } = createRequire(require.resolve('wrangler/package.json'),@@ -168,53 +169,24 @@ test('daily archive resumes failures, publishes complete snapshots atomically, a)assert.equal(historic.summary.pv, 10)assert.equal(historic.summary.uv, 3)- // Execute the generated ranking and pagination over more labels than the cap.- const sqlite = new DatabaseSync(':memory:')- try {- sqlite.function('toDateTime', (value) => value)- sqlite.exec(- 'CREATE TABLE archive_fixture (blob1, blob2, blob3, blob4, blob6, blob7, timestamp, _sample_interval)',- )- const insert = sqlite.prepare(- 'INSERT INTO archive_fixture VALUES (?, ?, ?, ?, ?, ?, ?, ?)',- )- for (let i = 0; i < 5001; i++)- insert.run(- 'v1',- 'site',- '1',- '11',- `label-${String(i).padStart(4, '0')}`,- `visitor-${i}`,- '2026-10-28 12:00:00',- i === 5000 ? 10 : 1,- )- const query = pageSql- .replace(- /timestamp>=toDateTime\('[^']+'\)/,- "timestamp>=toDateTime('2026-10-28 00:00:00')",- )- .replace(- /timestamp<toDateTime\('[^']+'\)/,- "timestamp<toDateTime('2026-10-29 00:00:00')",- )- .replace(' FORMAT JSON', '')- const labels: string[] = []- for (let offset = 0; offset < 5000; offset += 250)- labels.push(- ...sqlite- .prepare(query.replace(/OFFSET \d+/, `OFFSET ${offset}`))- .all()- .map((row) => String(row.label)),- )- assert.equal(labels.length, 5000)- assert.equal(new Set(labels).size, 5000)- assert.ok(labels.includes('label-5000'))- assert.ok(!labels.includes('label-4999'))- assert.deepEqual(labels, [...labels].sort())- } finally {- sqlite.close()- }+ const longRange = archiveRange({+ from: '2026-08-01T12:00:00.000Z',+ to: '2026-10-29T00:00:00.000Z',+ })+ const longReport = await historicalAnalytics(+ db,+ config,+ { ...longRange, kind: 'site', workspaceId: 1 },+ now,+ fetcher,+ )+ assert.equal(longReport.to, '2026-10-28')+ assert.equal(longReport.summary.pv, 10)+ assert.match(+ pageSql,+ /ORDER BY kind,workspaceId,siteId,label LIMIT 250 OFFSET \d+ FORMAT JSON$/,+ )+ assert.doesNotMatch(pageSql, /FROM \(/)} finally {await mf.dispose()}@@ -249,3 +221,196 @@ test('historical timestamp bounds are rejected before archive or live queries',{ message: 'analytics_range_precision_unavailable' },)})++test('archive pages keep the top labels independently per workspace and site', async () => {+ const mf = new Miniflare(+ convertV4MiniflareOptions({+ modules: true,+ compatibilityDate: '2026-10-26',+ script: 'export default {fetch(){return new Response("ok")}}',+ d1Databases: ['DB'],+ }),+ )+ const sqlite = new DatabaseSync(':memory:')+ try {+ const db = await mf.getD1Database('DB')+ for (const sql of splitSqlQuery(+ await readFile(+ new URL(+ '../packages/platform/migrations/0038_analytics_archive.sql',+ import.meta.url,+ ),+ 'utf8',+ ),+ ))+ await db.prepare(sql).run()+ await db+ .prepare(+ "INSERT INTO platform_analytics_archive_state(dataset,start_day,cursor_day,snapshot,phase) VALUES('archive_fixture','2026-10-28','2026-10-28','snapshot',3)",+ )+ .run()+ sqlite.function('toDateTime', (value) => value)+ sqlite.exec(+ 'CREATE TABLE archive_fixture (blob1, blob2, blob3, blob4, blob6, blob7, timestamp, _sample_interval)',+ )+ const insert = sqlite.prepare(+ 'INSERT INTO archive_fixture VALUES (?, ?, ?, ?, ?, ?, ?, ?)',+ )+ for (let i = 0; i < 5001; i++)+ insert.run(+ 'v1',+ 'site',+ '1',+ '11',+ `label-${String(i).padStart(4, '0')}`,+ `visitor-${i}`,+ '2026-10-28 12:00:00',+ i === 5000 ? 10 : 1,+ )+ insert.run(+ 'v1',+ 'site',+ '1',+ '12',+ 'other-site',+ 'visitor-b',+ '2026-10-28 12:00:00',+ 1,+ )+ insert.run(+ 'v1',+ 'site',+ '2',+ '21',+ 'other-workspace',+ 'visitor-c',+ '2026-10-28 12:00:00',+ 1,+ )+ const offsets: number[] = []+ const fetcher: typeof fetch = async (_url, opts) => {+ const sql = String(opts?.body)+ if (!sql.includes('blob6 AS label')) return Response.json({ data: [] })+ assert.doesNotMatch(sql, /FROM \(/)+ offsets.push(Number(/OFFSET (\d+)/.exec(sql)![1]))+ return Response.json({+ data: sqlite.prepare(sql.replace(' FORMAT JSON', '')).all(),+ })+ }+ const config = {+ accountId: 'a'.repeat(32),+ token: 'fixture',+ dataset: 'archive_fixture',+ }+ const now = Date.parse('2026-10-29T12:00:00Z')+ for (let i = 0; i < 5; i++)+ await archiveAnalytics(db, config, now + i, fetcher)+ assert.deepEqual(+ offsets,+ Array.from({ length: 21 }, (_, i) => i * 250),+ )+ const rows = (+ await db+ .prepare(+ "SELECT workspace_id,site_id,label FROM platform_analytics_archive_rows WHERE dimension='pages' ORDER BY workspace_id,site_id,label",+ )+ .all()+ ).results as any[]+ assert.equal(rows.length, 5002)+ assert.ok(rows.some((r) => r.label === 'label-5000'))+ assert.ok(!rows.some((r) => r.label === 'label-4999'))+ assert.ok(+ rows.some(+ (r) =>+ r.workspace_id === 1 && r.site_id === 12 && r.label === 'other-site',+ ),+ )+ assert.ok(+ rows.some(+ (r) =>+ r.workspace_id === 2 &&+ r.site_id === 21 &&+ r.label === 'other-workspace',+ ),+ )+ await db+ .prepare(+ "UPDATE platform_analytics_archive_state SET cursor_day='2026-10-28',snapshot='workspace',phase=2,page_offset=0",+ )+ .run()+ offsets.length = 0+ for (let i = 0; i < 5; i++)+ await archiveAnalytics(db, config, now + i, fetcher)+ assert.deepEqual(+ offsets,+ Array.from({ length: 42 }, (_, i) => (i % 21) * 250),+ )+ const workspaceRows = (+ await db+ .prepare(+ "SELECT workspace_id,site_id,label FROM platform_analytics_archive_rows WHERE snapshot='workspace' AND dimension='pages' AND site_id=0",+ )+ .all()+ ).results as any[]+ assert.equal(workspaceRows.length, 5001)+ assert.equal(workspaceRows.filter((r) => r.workspace_id === 1).length, 5000)+ assert.ok(workspaceRows.some((r) => r.label === 'label-5000'))+ assert.ok(+ workspaceRows.some(+ (r) =>+ r.workspace_id === 2 &&+ r.site_id === 0 &&+ r.label === 'other-workspace',+ ),+ )+ } finally {+ sqlite.close()+ await mf.dispose()+ }+})++test('migration restarts unfinished snapshots without deleting published archive rows', async () => {+ const db = new DatabaseSync(':memory:')+ try {+ db.exec(+ await readFile(+ new URL(+ '../packages/platform/migrations/0038_analytics_archive.sql',+ import.meta.url,+ ),+ 'utf8',+ ),+ )+ db.exec(`INSERT INTO platform_analytics_archive_state(dataset,start_day,cursor_day,snapshot,phase,page_offset,lease_token,lease_until) VALUES('fixture','2026-10-27','2026-10-28','pending',3,250,'lease',123);+ INSERT INTO platform_analytics_archive_days VALUES('fixture','2026-10-27','published',1);+ INSERT INTO platform_analytics_archive_rows VALUES('fixture','published','2026-10-27','site',1,0,'pages','old',1,1,1),('fixture','pending','2026-10-28','site',1,0,'pages','partial',1,1,1);`)+ db.exec(+ await readFile(+ new URL(+ '../packages/platform/migrations/0039_restart_analytics_archive.sql',+ import.meta.url,+ ),+ 'utf8',+ ),+ )+ assert.deepEqual(+ {+ ...db+ .prepare(+ 'SELECT phase,page_offset,lease_token,lease_until FROM platform_analytics_archive_state',+ )+ .get(),+ },+ { phase: 0, page_offset: 0, lease_token: null, lease_until: 0 },+ )+ assert.deepEqual(+ db+ .prepare('SELECT label FROM platform_analytics_archive_rows')+ .all()+ .map((r) => r.label),+ ['old'],+ )+ } finally {+ db.close()+ }+})diff --git a/tests/analytics-presentation.test.ts b/tests/analytics-presentation.test.tsindex 45bd15ee..f2d2a337 100644--- a/tests/analytics-presentation.test.ts+++ b/tests/analytics-presentation.test.ts@@ -8,6 +8,7 @@ import {} from '../packages/saas-ui/app/utils/traffic-chart.ts'import {relativeRange,+ archiveRange,rangeInput,inputInstant,ANALYTICS_PRESETS,@@ -72,6 +73,28 @@ test('relative presets and local/UTC inputs retain actual instants across timezoelse process.env.TZ = previous}})+test('long picker ranges request full UTC archive days while short ranges stay precise', () => {+ const year = relativeRange(365 * 86400, Date.parse('2026-11-01T12:00:00Z'))+ assert.deepEqual(archiveRange(year), {+ ...year,+ from: '2025-11-01',+ to: '2026-11-01',+ })+ const custom = {+ from: '2026-08-01T23:30:00.000Z',+ to: '2026-10-01T00:00:00.000Z',+ }+ assert.deepEqual(archiveRange(custom), {+ from: '2026-08-01',+ to: '2026-09-30',+ })+ const short = relativeRange(30 * 86400, Date.parse('2026-11-01T12:00:00Z'))+ assert.deepEqual(archiveRange(short), short)+ assert.deepEqual(archiveRange({ ...year, allTime: true }), {+ ...year,+ allTime: true,+ })+})test('the registered ECharts modules render a single-day report as a valid colored SVG without browser globals', async () => {const require = createRequire(new URL('../packages/saas-ui/package.json', import.meta.url),