Skip to content

Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.

fix: address analytics review and shared UI boundaries

Timothy Yinf4e2fa9c7ff2
diff --git a/apps/cloud/app/pages/sites/[siteId]/overview.vue b/apps/cloud/app/pages/sites/[siteId]/overview.vue
index eddde8d0..aaa7ba50 100644
--- a/apps/cloud/app/pages/sites/[siteId]/overview.vue
+++ b/apps/cloud/app/pages/sites/[siteId]/overview.vue
@@ -165,9 +165,9 @@ const {
class="cf-dashboard-panel"
>
<div class="cf-dashboard-section-heading">
- <h2>{{ zh ? '最受欢迎' : 'Most popular' }}</h2>
+ <h2>{{ $t('cloud.dashboard.mostPopular') }}</h2>
<span class="cf-field-hint">{{
- zh ? '近 7 天 · 访问量' : 'Past 7 days · Page views'
+ $t('cloud.dashboard.popularRange')
}}</span>
</div>
<CfSkeleton
@@ -179,16 +179,14 @@ const {
role="status"
>
<p class="cf-field-hint">
- {{
- zh ? '暂时无法加载访问排名。' : 'Unable to load popular photos.'
- }}
+ {{ $t('cloud.dashboard.popularError') }}
</p>
<button
type="button"
class="cf-text-link"
@click="refreshPopular()"
>
- {{ zh ? '重试' : 'Retry' }}
+ {{ $t('cloud.messages.retry') }}
</button>
</div>
<ol
@@ -212,11 +210,7 @@ const {
v-else
class="cf-field-hint"
>
- {{
- zh
- ? '近 7 天暂无照片访问记录。'
- : 'No photo views in the past 7 days.'
- }}
+ {{ $t('cloud.dashboard.popularEmpty') }}
</p>
</CfCard>
<CfCard class="cf-dashboard-panel"
diff --git a/apps/cloud/i18n/locales/en.json b/apps/cloud/i18n/locales/en.json
index de561d51..27fe38f1 100644
--- a/apps/cloud/i18n/locales/en.json
+++ b/apps/cloud/i18n/locales/en.json
@@ -805,6 +805,10 @@
"cancelCheckoutSummary": "Verify and cancel this unpaid checkout."
},
"dashboard": {
+ "mostPopular": "Most popular",
+ "popularRange": "Past 7 days · Page views",
+ "popularError": "Unable to load popular photos.",
+ "popularEmpty": "No photo views in the past 7 days.",
"workspaceOverview": "Workspace overview",
"workspaceHelp": "Your galleries, resources and next steps in one place.",
"resources": "Workspace resources",
diff --git a/apps/cloud/i18n/locales/zh-Hans.json b/apps/cloud/i18n/locales/zh-Hans.json
index 2d5f779e..9c1d9538 100644
--- a/apps/cloud/i18n/locales/zh-Hans.json
+++ b/apps/cloud/i18n/locales/zh-Hans.json
@@ -805,6 +805,10 @@
"cancelCheckoutSummary": "核验并取消这次尚未付款的结账。"
},
"dashboard": {
+ "mostPopular": "最受欢迎",
+ "popularRange": "近 7 天 · 访问量",
+ "popularError": "暂时无法加载访问排名。",
+ "popularEmpty": "近 7 天暂无照片访问记录。",
"workspaceOverview": "工作区概览",
"workspaceHelp": "在这里查看站点、资源用量与下一步操作。",
"resources": "工作区资源",
diff --git a/packages/platform/src/analytics-pages.ts b/packages/platform/src/analytics-pages.ts
index ca0e17be..c7fe8194 100644
--- a/packages/platform/src/analytics-pages.ts
+++ b/packages/platform/src/analytics-pages.ts
@@ -1,6 +1,29 @@
import type { PlatformD1 } from './index.ts'
import { allRows } from './subscriptions.ts'
import type { AnalyticsFilter, AnalyticsRow } from './analytics.ts'
+type SiteRow = {
+ id: number
+ workspace_id: number
+ name: string
+ gallery_title: string | null
+ published: number
+ suspended: number
+ owner_suspended: number
+}
+type DomainRow = {
+ site_id: number
+ hostname: string
+ is_primary: number
+ kind: string
+}
+type PhotoRow = { site_id: number; id: string; title: string | null }
+type AlbumRow = {
+ site_id: number
+ id: string
+ title: string | null
+ slug: string | null
+ canonical: string | null
+}
/** Attribution survives multi-site aggregation and daily archival. */
export const PAGE_LABEL_SQL = "format('{}|{}|{}',blob4,blob5,blob6)"
export function decodeAnalyticsPage(value: string) {
@@ -43,11 +66,11 @@ export async function resolveAnalyticsPages<
entries.flatMap((e) => (e.context?.siteId ? [e.context.siteId] : [])),
),
]
- const sites = new Map<number, any>(),
- domains = new Map<number, any[]>()
+ const sites = new Map<number, SiteRow>(),
+ domains = new Map<number, DomainRow[]>()
if (ids.length) {
const marks = ids.map(() => '?').join(',')
- for (const site of await allRows<any>(
+ for (const site of await allRows<SiteRow>(
db
.prepare(
`SELECT s.id,s.workspace_id,s.name,s.gallery_title,s.published,s.suspended,COALESCE(c.suspended,0) AS owner_suspended FROM platform_sites s LEFT JOIN platform_workspaces w ON w.id=s.workspace_id LEFT JOIN platform_account_controls c ON c.user_id=w.owner_user_id WHERE s.id IN (${marks})${filter.workspaceId ? ' AND s.workspace_id=?' : ''}`,
@@ -55,7 +78,7 @@ export async function resolveAnalyticsPages<
.bind(...ids, ...(filter.workspaceId ? [filter.workspaceId] : [])),
))
sites.set(Number(site.id), site)
- for (const domain of await allRows<any>(
+ for (const domain of await allRows<DomainRow>(
db
.prepare(
`SELECT d.site_id,d.hostname,COALESCE(c.is_primary,0) AS is_primary,d.kind FROM platform_domains d LEFT JOIN platform_custom_domains c ON c.hostname=d.hostname AND c.site_id=d.site_id WHERE d.site_id IN (${marks}) AND d.active=1 AND d.verified=1 AND (d.kind<>'custom' OR (c.state='active' AND c.verified_at>=?)) AND (d.kind<>'alias' OR d.redirect_until>?) ORDER BY is_primary DESC,CASE WHEN d.kind='default' THEN 0 ELSE 1 END,d.hostname`,
@@ -90,10 +113,10 @@ export async function resolveAnalyticsPages<
}),
),
]
- const photos = new Map<string, any>(),
- albums = new Map<string, any>()
+ const photos = new Map<string, PhotoRow>(),
+ albums = new Map<string, AlbumRow>()
if (ids.length && photoIds.length)
- for (const p of await allRows<any>(
+ for (const p of await allRows<PhotoRow>(
db
.prepare(
`SELECT site_id,id,title FROM cloud_photos WHERE deleted=0 AND site_id IN (${ids.map(() => '?')}) AND id IN (${photoIds.map(() => '?')})`,
@@ -102,7 +125,7 @@ export async function resolveAnalyticsPages<
))
if (sites.has(Number(p.site_id))) photos.set(`${p.site_id}:${p.id}`, p)
if (ids.length && albumSlugs.length)
- for (const a of await allRows<any>(
+ for (const a of await allRows<AlbumRow>(
db
.prepare(
`SELECT a.site_id,a.id,a.title,sl.slug,current.slug AS canonical FROM cloud_albums a LEFT JOIN cloud_album_slugs sl ON sl.site_id=a.site_id AND sl.album_id=a.id LEFT JOIN cloud_album_slugs current ON current.site_id=a.site_id AND current.album_id=a.id AND current.is_current=1 WHERE a.site_id IN (${ids.map(() => '?')}) AND (sl.slug IN (${albumSlugs.map(() => '?')}) OR a.id IN (${albumSlugs.map(() => '?')}))`,
@@ -146,7 +169,7 @@ export async function resolveAnalyticsPages<
: undefined
: `https://${host}`
const available =
- !siteId || (site.published && !site.suspended && !site.owner_suspended)
+ !siteId || (site?.published && !site.suspended && !site.owner_suspended)
const url = (suffix: string) =>
available && origin ? origin + suffix : undefined
const page: AnalyticsPage = {
@@ -205,7 +228,7 @@ export async function resolveAnalyticsPages<
}
}
} else if (parts.length === 1 && photos.has(`${siteId}:${parts[0]}`)) {
- const photo = photos.get(`${siteId}:${parts[0]}`)
+ const photo = photos.get(`${siteId}:${parts[0]}`)!
page.segments.push({
title: photo.title || photo.id,
href: url(`/${encodeURIComponent(photo.id)}`),
diff --git a/packages/platform/src/analytics-popular.ts b/packages/platform/src/analytics-popular.ts
index 5d3edf74..48333451 100644
--- a/packages/platform/src/analytics-popular.ts
+++ b/packages/platform/src/analytics-popular.ts
@@ -5,7 +5,7 @@ import {
type AnalyticsRow,
} from './analytics.ts'
const cache = new Map<string, { until: number; rows: AnalyticsRow[] }>()
-/** Query every current photo, merging root and album views before ranking. Each chunk's top five suffices for the global top five. */
+/** Rank merged root/album photo views, paging past deleted photos only when necessary. */
export async function popularPhotos(
config: AnalyticsConfig,
filter: AnalyticsFilter,
@@ -27,53 +27,48 @@ export async function popularPhotos(
'',
)
const photo = 'substring(blob6, length(blob6) - 35, 36)'
- const chunks: string[][] = []
- for (let i = 0; i < valid.length; i += 100)
- chunks.push(valid.slice(i, i + 100))
+ const current = new Set(valid)
const rows: AnalyticsRow[] = []
- let cursor = 0
- await Promise.all(
- Array.from({ length: Math.min(4, chunks.length) }, async () => {
- while (cursor < chunks.length) {
- const chunk = chunks[cursor++]!
- const sql =
- base.replace('SELECT ', `SELECT ${photo} AS label, `) +
- ` AND (length(blob6) = 37 OR startsWith(blob6, '/albums/')) AND ${photo} IN (${chunk.map((id) => `'${id}'`).join(',')}) GROUP BY label ORDER BY pv DESC, label LIMIT 5 FORMAT JSON`
- const response = await fetcher(
- `https://api.cloudflare.com/client/v4/accounts/${config.accountId}/analytics_engine/sql`,
- {
- method: 'POST',
- headers: { Authorization: `Bearer ${config.token}` },
- body: sql,
- signal: AbortSignal.timeout(10000),
- },
+ const pageSize = 200
+ for (let offset = 0; current.size && rows.length < 5; offset += pageSize) {
+ const sql =
+ base.replace('SELECT ', `SELECT ${photo} AS label, `) +
+ ` AND (length(blob6) = 37 OR startsWith(blob6, '/albums/')) GROUP BY label ORDER BY pv DESC, label LIMIT ${pageSize} OFFSET ${offset} FORMAT JSON`
+ const response = await fetcher(
+ `https://api.cloudflare.com/client/v4/accounts/${config.accountId}/analytics_engine/sql`,
+ {
+ method: 'POST',
+ headers: { Authorization: `Bearer ${config.token}` },
+ body: sql,
+ signal: AbortSignal.timeout(10000),
+ },
+ )
+ if (!response.ok) {
+ const message = await response.text()
+ if (
+ response.status === 400 &&
+ /(?:unknown table|table[^\n]*(?:does not exist|not found))/i.test(
+ message,
)
- if (!response.ok) {
- const message = await response.text()
- if (
- response.status === 400 &&
- /(?:unknown table|table[^\n]*(?:does not exist|not found))/i.test(
- message,
- )
- )
- continue
- throw new Error('analytics_query_failed')
- }
- const data = (await response.json()) as {
- data?: Record<string, unknown>[]
- }
- if (!Array.isArray(data.data)) throw new Error('analytics_query_failed')
- for (const row of data.data)
- if (chunk.includes(String(row.label)))
- rows.push({
- label: `/${row.label}`,
- pv: Number(row.pv) || 0,
- uv: Number(row.uv) || 0,
- sampleInterval: Number(row.sampleInterval) || 1,
- })
- }
- }),
- )
+ )
+ break
+ throw new Error('analytics_query_failed')
+ }
+ const data = (await response.json()) as { data?: Record<string, unknown>[] }
+ if (!Array.isArray(data.data)) throw new Error('analytics_query_failed')
+ for (const row of data.data) {
+ const id = String(row.label)
+ if (current.delete(id))
+ rows.push({
+ label: `/${id}`,
+ pv: Number(row.pv ?? 0),
+ uv: Number(row.uv ?? 0),
+ sampleInterval: Number(row.sampleInterval ?? 1),
+ })
+ }
+ if (data.data.length < pageSize) break
+ }
+
if (
rows.some(
(row) =>
diff --git a/packages/saas-ui/app/components/CfAnalyticsPageLink.vue b/packages/saas-ui/app/components/CfAnalyticsPageLink.vue
index f4cf284e..e152acd5 100644
--- a/packages/saas-ui/app/components/CfAnalyticsPageLink.vue
+++ b/packages/saas-ui/app/components/CfAnalyticsPageLink.vue
@@ -1,7 +1,11 @@
<script setup lang="ts">
-import type { AnalyticsRow } from '../../../platform/src/analytics'
+type PageLink = { title: string; href?: string; kind?: string }
+type PageRow = {
+ label: string
+ page?: { site: PageLink; segments: PageLink[] }
+}
const props = defineProps<{
- row: AnalyticsRow
+ row: PageRow
admin?: boolean
zh?: boolean
}>()
diff --git a/packages/saas-ui/app/components/CfAnalyticsRange.vue b/packages/saas-ui/app/components/CfAnalyticsRange.vue
index f2c359d7..e73b3e03 100644
--- a/packages/saas-ui/app/components/CfAnalyticsRange.vue
+++ b/packages/saas-ui/app/components/CfAnalyticsRange.vue
@@ -401,7 +401,7 @@ function changeZone() {
border-top: 1px solid var(--border);
background: var(--background);
}
-.cf-range-footer select {
+.cf-range-footer .cf-select {
width: auto;
max-width: 70%;
font-size: 12px;
diff --git a/tests/analytics-links.test.ts b/tests/analytics-links.test.ts
index b0334160..4fb6f0ab 100644
--- a/tests/analytics-links.test.ts
+++ b/tests/analytics-links.test.ts
@@ -88,14 +88,14 @@ test('album photo tracking records only a validated photo identity and never arb
)
})
-test('popular photo ranking includes every current photo, merges path variants in SQL and ranks across chunks', async () => {
+test('popular ranking queries one page for a large current catalog and merges path variants', async () => {
const ids = Array.from(
- { length: 205 },
+ { length: 2005 },
(_, i) => `12345678-1234-1234-1234-${String(i).padStart(12, '0')}`,
)
let requests = 0
const rows = await popularPhotos(
- { accountId: 'a'.repeat(32), token: 'test', dataset: 'visits' },
+ { accountId: 'a'.repeat(32), token: 'test', dataset: 'large_catalog' },
{
kind: 'site',
workspaceId: 7,
@@ -111,23 +111,63 @@ test('popular photo ranking includes every current photo, merges path variants i
assert.match(sql, /blob4 = '1'/)
assert.match(sql, /substring\(blob6, length\(blob6\) - 35, 36\)/)
assert.match(sql, /startsWith\(blob6, '\/albums\/'\)/)
- const group = [...sql.matchAll(/'(12345678[^']+)'/g)].map((m) => m[1]!)
+ assert.doesNotMatch(sql, / IN \(/)
+ assert.match(sql, /LIMIT 200 OFFSET 0/)
return Response.json({
- data: group
- .map((id) => ({
+ data: ids
+ .slice(0, 200)
+ .map((id, i) => ({
label: id,
- pv: Number(id.slice(-12)) + 1,
+ pv: 200 - i,
uv: 1,
sampleInterval: 1,
- }))
- .sort((a, b) => b.pv - a.pv)
- .slice(0, 5),
+ })),
})
},
)
- assert.equal(requests, 3)
+ assert.equal(requests, 1)
assert.deepEqual(
rows.map((r) => r.pv),
- [205, 204, 203, 202, 201],
+ [200, 199, 198, 197, 196],
)
})
+test('popular ranking pages past deleted photos and stops at exhausted results', async () => {
+ const id = (i: number) =>
+ `12345678-1234-1234-1234-${String(i).padStart(12, '0')}`
+ for (const [dataset, count] of [
+ ['deleted_first', 5],
+ ['exhausted', 2],
+ ] as const) {
+ let requests = 0
+ const rows = await popularPhotos(
+ { accountId: 'a'.repeat(32), token: 'test', dataset },
+ {
+ kind: 'site',
+ workspaceId: 7,
+ siteId: 1,
+ from: '2026-11-01',
+ to: '2026-11-01',
+ },
+ Array.from({ length: count }, (_, i) => id(200 + i)),
+ async (_url, opts) => {
+ const sql = String(opts?.body),
+ offset = requests++ * 200
+ assert.ok(sql.includes(`OFFSET ${offset}`))
+ const length = offset === 0 ? 200 : count
+ return Response.json({
+ data: Array.from({ length }, (_, i) => ({
+ label: id(offset + i),
+ pv: 1000 - offset - i,
+ uv: 1,
+ sampleInterval: 1,
+ })),
+ })
+ },
+ )
+ assert.equal(requests, 2)
+ assert.deepEqual(
+ rows.map((r) => r.label),
+ Array.from({ length: count }, (_, i) => `/${id(200 + i)}`),
+ )
+ }
+})