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(cloud): persist activity retries before allowing lifecycle scans
HoshinoSuzumi5bdb9aa90d61
diff --git a/apps/cloud/server/middleware/00-account-session.ts b/apps/cloud/server/middleware/00-account-session.tsindex ea77ac18..ce588ef7 100644--- a/apps/cloud/server/middleware/00-account-session.ts+++ b/apps/cloud/server/middleware/00-account-session.ts@@ -25,7 +25,7 @@ export default defineEventHandler((event) => {const db = platformDatabase(event)const control = await db.prepare(- 'SELECT COALESCE(c.suspended,0) AS suspended,u.last_active_at FROM platform_users u LEFT JOIN platform_account_controls c ON c.user_id=u.id WHERE u.id=?',+ 'SELECT COALESCE(c.suspended,0) AS suspended,NULLIF(MAX(COALESCE(u.last_active_at,0),COALESCE(a.active_at,0)),0) AS last_active_at FROM platform_users u LEFT JOIN platform_account_controls c ON c.user_id=u.id LEFT JOIN platform_account_activity_retries a ON a.user_id=u.id WHERE u.id=?',).bind(id).first<{ suspended: number; last_active_at: number | null }>()@@ -35,9 +35,7 @@ export default defineEventHandler((event) => {control.last_active_at === null ||control.last_active_at <= now - ACCOUNT_ACTIVITY_INTERVAL)- await recordAccountActivity(db, id, now).catch(() => {- console.error('Account activity write failed')- })+ await recordAccountActivity(db, id, now)return {userId: id,expiresAt: new Date(session.session.expiresAt).getTime(),diff --git a/packages/platform/migrations/0043_account_activity_retries.sql b/packages/platform/migrations/0043_account_activity_retries.sqlnew file mode 100644index 00000000..018b81d5--- /dev/null+++ b/packages/platform/migrations/0043_account_activity_retries.sql@@ -0,0 +1,6 @@+CREATE TABLE platform_account_activity_retries (+ user_id INTEGER PRIMARY KEY REFERENCES platform_users(id) ON DELETE CASCADE,+ active_at INTEGER NOT NULL+);++CREATE INDEX platform_activity_retries_due ON platform_account_activity_retries(active_at,user_id);diff --git a/packages/platform/src/account-activity.ts b/packages/platform/src/account-activity.tsindex 1636fbf2..a5ef67ee 100644--- a/packages/platform/src/account-activity.ts+++ b/packages/platform/src/account-activity.ts@@ -1,19 +1,54 @@import type { PlatformD1 } from './index.ts'+import { SubscriptionError } from './subscriptions.ts'export const ACCOUNT_ACTIVITY_INTERVAL = 5 * 60 * 1000+const eligible =+ 'email_verified=1 AND NOT EXISTS(SELECT 1 FROM platform_account_controls c WHERE c.user_id=platform_users.id AND c.suspended=1) AND NOT EXISTS(SELECT 1 FROM platform_account_deletions d WHERE d.user_id=platform_users.id)'-/** Authenticated API activity never restores frozen accounts or changes login timestamps. */+/** Persist activity or a durable retry; fail only when neither can be saved safely. */export async function recordAccountActivity(db: PlatformD1,userId: number,now = Date.now(),) {if (!Number.isSafeInteger(userId) || userId < 1) return false- const result = await db- .prepare(- 'UPDATE platform_users SET last_active_at=? WHERE id=? AND email_verified=1 AND (last_active_at IS NULL OR last_active_at<=?) AND NOT EXISTS(SELECT 1 FROM platform_account_controls c WHERE c.user_id=platform_users.id AND c.suspended=1) AND NOT EXISTS(SELECT 1 FROM platform_account_deletions d WHERE d.user_id=platform_users.id)',- )- .bind(now, userId, now - ACCOUNT_ACTIVITY_INTERVAL)- .run()- return result.meta.changes > 0+ try {+ const result = await db+ .prepare(+ `UPDATE platform_users SET last_active_at=? WHERE id=? AND (last_active_at IS NULL OR last_active_at<=?) AND ${eligible}`,+ )+ .bind(now, userId, now - ACCOUNT_ACTIVITY_INTERVAL)+ .run()+ return result.meta.changes > 0+ } catch {+ console.error('Account activity write failed')+ try {+ const queued = await db+ .prepare(+ `INSERT INTO platform_account_activity_retries(user_id,active_at) SELECT id,? FROM platform_users WHERE id=? AND ${eligible} ON CONFLICT(user_id) DO UPDATE SET active_at=MAX(platform_account_activity_retries.active_at,excluded.active_at)`,+ )+ .bind(now, userId)+ .run()+ if (queued.meta.changes) return true+ } catch {+ /* Neither activity nor its retry is durable: do not claim success. */+ }+ throw new SubscriptionError(503, 'account_activity_unavailable')+ }+}++/** Replay before scanning; atomic deletion never discards newer or unpersisted activity. */+export async function replayAccountActivity(db: PlatformD1, limit = 50) {+ await db.batch([+ db+ .prepare(+ `UPDATE platform_users SET last_active_at=MAX(COALESCE(last_active_at,0),(SELECT active_at FROM platform_account_activity_retries a WHERE a.user_id=platform_users.id)) WHERE id IN(SELECT user_id FROM platform_account_activity_retries ORDER BY active_at,user_id LIMIT ?) AND ${eligible}`,+ )+ .bind(limit),+ db+ .prepare(+ `DELETE FROM platform_account_activity_retries WHERE user_id IN(SELECT user_id FROM platform_account_activity_retries ORDER BY active_at,user_id LIMIT ?) AND (EXISTS(SELECT 1 FROM platform_users WHERE id=platform_account_activity_retries.user_id AND last_active_at>=platform_account_activity_retries.active_at) OR NOT EXISTS(SELECT 1 FROM platform_users WHERE id=platform_account_activity_retries.user_id AND ${eligible}))`,+ )+ .bind(limit),+ ])}diff --git a/packages/platform/src/account-lifecycle.ts b/packages/platform/src/account-lifecycle.tsindex 1e8f6f1e..834a2eb7 100644--- a/packages/platform/src/account-lifecycle.ts+++ b/packages/platform/src/account-lifecycle.ts@@ -5,6 +5,7 @@ import {type LifecycleExemptions,} from './lifecycle-exemptions.ts'import type { PlatformD1 } from './index.ts'+import { replayAccountActivity } from './account-activity.ts'import { allRows } from './subscriptions.ts'import { sendMail, type MailBinding, type MailKind } from './mail.ts'export const DAY = 86400000@@ -130,7 +131,7 @@ export async function markAccount(await db.batch([db.prepare(- `INSERT INTO platform_account_deletions(user_id,generation,source,reason,marked_at,purge_at,previous_suspended,previous_reason) SELECT u.id,?,?,?,?,?,COALESCE(c.suspended,0),COALESCE(c.public_reason,'') FROM platform_users u LEFT JOIN platform_account_controls c ON c.user_id=u.id WHERE u.id=? AND NOT EXISTS(SELECT 1 FROM platform_account_deletions WHERE user_id=u.id) ${expected ? 'AND u.last_login_at IS ? AND u.last_active_at IS ? AND u.email_verified=? AND EXISTS(SELECT 1 FROM platform_lifecycle_settings WHERE id=1 AND enabled=1 AND revision=?) AND EXISTS(SELECT 1 FROM platform_policy_epoch WHERE id=1 AND revision=?)' : ''}`,+ `INSERT INTO platform_account_deletions(user_id,generation,source,reason,marked_at,purge_at,previous_suspended,previous_reason) SELECT u.id,?,?,?,?,?,COALESCE(c.suspended,0),COALESCE(c.public_reason,'') FROM platform_users u LEFT JOIN platform_account_controls c ON c.user_id=u.id WHERE u.id=? AND NOT EXISTS(SELECT 1 FROM platform_account_deletions WHERE user_id=u.id) ${expected ? 'AND u.last_login_at IS ? AND u.last_active_at IS ? AND NOT EXISTS(SELECT 1 FROM platform_account_activity_retries a WHERE a.user_id=u.id) AND u.email_verified=? AND EXISTS(SELECT 1 FROM platform_lifecycle_settings WHERE id=1 AND enabled=1 AND revision=?) AND EXISTS(SELECT 1 FROM platform_policy_epoch WHERE id=1 AND revision=?)' : ''}`,).bind(generation,@@ -328,6 +329,16 @@ export async function scanAccounts(now = Date.now(),limit = 50,) {+ try {+ await replayAccountActivity(db, limit)+ await db+ .prepare(+ "DELETE FROM platform_lifecycle_errors WHERE scope='activity-retries'",+ )+ .run()+ } catch {+ await lifecycleFailure(db, 'activity-retries', now)+ }const s = await lifecycleSettings(db)if (!s.enabled) return// Keyset cursor prevents a fixed first page from starving older or newer accounts.@@ -337,7 +348,7 @@ export async function scanAccounts(const users = await allRows<any>(db.prepare(- 'SELECT * FROM platform_users WHERE id>? AND NOT EXISTS(SELECT 1 FROM platform_account_deletions WHERE user_id=platform_users.id) ORDER BY id LIMIT ?',+ 'SELECT * FROM platform_users WHERE id>? AND NOT EXISTS(SELECT 1 FROM platform_account_deletions WHERE user_id=platform_users.id) AND NOT EXISTS(SELECT 1 FROM platform_account_activity_retries a WHERE a.user_id=platform_users.id) ORDER BY id LIMIT ?',).bind(state?.value ?? 0, limit),)@@ -463,7 +474,9 @@ export async function deliverLifecycleMail(try {const p = JSON.parse(row.payload_json),u = await db- .prepare('SELECT * FROM platform_users WHERE id=?')+ .prepare(+ 'SELECT u.*,a.active_at AS pending_active_at FROM platform_users u LEFT JOIN platform_account_activity_retries a ON a.user_id=u.id WHERE u.id=?',+ ).bind(row.user_id).first<any>(),marked = await db@@ -476,6 +489,7 @@ export async function deliverLifecycleMail(? marked?.generation === row.cycle: s.enabled &&!marked &&+ !u.pending_active_at &&!(await accountExemption(db, row.user_id, s.exemptions!, now)) &&deletionDeadline(u, s) === p.deadline &&p.deadline > now)diff --git a/tests/account-lifecycle-mail.test.ts b/tests/account-lifecycle-mail.test.tsindex d68b3a83..d87d9897 100644--- a/tests/account-lifecycle-mail.test.ts+++ b/tests/account-lifecycle-mail.test.ts@@ -1,3 +1,7 @@+import {+ recordAccountActivity,+ replayAccountActivity,+} from '../packages/platform/src/account-activity.ts'import { splitSqlQuery } from './helpers/sql.ts'import test from 'node:test'import assert from 'node:assert/strict'@@ -1566,3 +1570,223 @@ test('authenticated API activity racing the scanner prevents automatic freezing'await mf.dispose()}})++test('failed activity writes are durable, block stale scans until replay, and never revive frozen accounts', async (t) => {+ const { mf, db } = await fixture()+ try {+ const now = Date.now(),+ old = now - 100 * DAY+ const logs: unknown[][] = []+ t.mock.method(console, 'error', (...args: unknown[]) => logs.push(args))+ await db+ .prepare(+ 'UPDATE platform_lifecycle_settings SET enabled=1,activated_at=1 WHERE id=1',+ )+ .run()+ await db+ .prepare(+ "INSERT INTO platform_users(id,email,email_verified,created_at,last_login_at,last_active_at) VALUES(1,'[email protected]',1,?,?,?),(2,'[email protected]',1,?,?,?)",+ )+ .bind(old, old, old, now - 89 * DAY, now - 89 * DAY, now - 89 * DAY)+ .run()+ await db+ .prepare(+ "CREATE TRIGGER fail_activity_update BEFORE UPDATE OF last_active_at ON platform_users BEGIN SELECT RAISE(ABORT,'secret activity SQL details'); END",+ )+ .run()+ assert.equal(await recordAccountActivity(db, 1, now), true)+ assert.equal(await recordAccountActivity(db, 2, now), true)+ assert.equal(+ (+ await db+ .prepare('SELECT last_active_at FROM platform_users WHERE id=1')+ .first()+ ).last_active_at,+ old,+ )+ assert.equal(+ (+ await db+ .prepare(+ 'SELECT active_at FROM platform_account_activity_retries WHERE user_id=1',+ )+ .first()+ ).active_at,+ now,+ )+ assert.equal(+ await markAccount(db, 1, 'Stale inactivity scan', 'inactive', null, now, {+ login: old,+ activity: old,+ verified: 1,+ settingsRevision: 1,+ }),+ false,+ )+ await scanAccounts(db, now)+ assert.equal(+ await db+ .prepare(+ 'SELECT user_id FROM platform_account_deletions WHERE user_id=1',+ )+ .first(),+ null,+ )+ assert.ok(+ await db+ .prepare(+ "SELECT scope FROM platform_lifecycle_errors WHERE scope='activity-retries'",+ )+ .first(),+ )+ await db+ .prepare(+ "INSERT INTO platform_mail_outbox(id,user_id,kind,cycle,to_email,payload_json,available_at) VALUES('old-warning',2,'deletion-warning','old','[email protected]',?,?)",+ )+ .bind(JSON.stringify({ deadline: now + DAY }), now)+ .run()+ const sent: unknown[] = []+ await deliverLifecycleMail(+ db,+ {+ send: async (m: unknown) => {+ sent.push(m)+ return { messageId: 'test' }+ },+ },+ 'https://app.chronoframe.art',+ now,+ )+ assert.equal(sent.length, 0)+ assert.equal(+ (+ await db+ .prepare(+ "SELECT state FROM platform_mail_outbox WHERE id='old-warning'",+ )+ .first()+ ).state,+ 'cancelled',+ )+ await db+ .prepare(+ "CREATE TRIGGER fail_activity_retry BEFORE INSERT ON platform_account_activity_retries BEGIN SELECT RAISE(ABORT,'secret retry details'); END",+ )+ .run()+ await assert.rejects(recordAccountActivity(db, 1, now + DAY), {+ statusCode: 503,+ code: 'account_activity_unavailable',+ })+ assert(!JSON.stringify(logs).includes('secret'))+ await db.prepare('DROP TRIGGER fail_activity_retry').run()+ await db.prepare('DROP TRIGGER fail_activity_update').run()+ await scanAccounts(db, now)+ assert.equal(+ (+ await db+ .prepare('SELECT last_active_at FROM platform_users WHERE id=1')+ .first()+ ).last_active_at,+ now,+ )+ assert.equal(+ (+ await db+ .prepare('SELECT last_login_at FROM platform_users WHERE id=1')+ .first()+ ).last_login_at,+ old,+ )+ assert.equal(+ (+ await db+ .prepare(+ 'SELECT COUNT(*) AS n FROM platform_account_activity_retries',+ )+ .first()+ ).n,+ 0,+ )+ assert.equal(+ await db+ .prepare(+ 'SELECT user_id FROM platform_account_deletions WHERE user_id=1',+ )+ .first(),+ null,+ )+ assert.equal(+ await db+ .prepare(+ "SELECT scope FROM platform_lifecycle_errors WHERE scope='activity-retries'",+ )+ .first(),+ null,+ )+ await db+ .prepare(+ 'INSERT INTO platform_account_activity_retries(user_id,active_at) VALUES(1,?)',+ )+ .bind(now - 1000)+ .run()+ const concurrent = {+ prepare: db.prepare.bind(db),+ batch: async (statements: any[]) => {+ await db+ .prepare(+ 'UPDATE platform_account_activity_retries SET active_at=? WHERE user_id=1',+ )+ .bind(now + 1000)+ .run()+ return db.batch(statements)+ },+ }+ await replayAccountActivity(concurrent as any)+ assert.equal(+ (+ await db+ .prepare('SELECT last_active_at FROM platform_users WHERE id=1')+ .first()+ ).last_active_at,+ now + 1000,+ )+ await db+ .prepare(+ 'INSERT INTO platform_account_activity_retries(user_id,active_at) VALUES(1,?)',+ )+ .bind(now + 2000)+ .run()+ await markAccount(db, 1, 'Manual freeze still applies', 'manual', null, now)+ await replayAccountActivity(db)+ assert.equal(+ (+ await db+ .prepare(+ 'SELECT suspended FROM platform_account_controls WHERE user_id=1',+ )+ .first()+ ).suspended,+ 1,+ )+ assert.equal(+ (+ await db+ .prepare('SELECT last_active_at FROM platform_users WHERE id=1')+ .first()+ ).last_active_at,+ now + 1000,+ )+ assert.equal(+ (+ await db+ .prepare(+ 'SELECT COUNT(*) AS n FROM platform_account_activity_retries',+ )+ .first()+ ).n,+ 0,+ )+ } finally {+ await mf.dispose()+ }+})diff --git a/tests/cloud-session-activity.test.ts b/tests/cloud-session-activity.test.tsindex 5abd2993..08193c72 100644--- a/tests/cloud-session-activity.test.ts+++ b/tests/cloud-session-activity.test.ts@@ -23,7 +23,7 @@ const code = transpileModule(},).outputText-test('session activity validates identities, throttles writes and tolerates write failures without leaking details', async (t) => {+test('session activity validates identities and throttles writes; unavailable durable tracking remains an error', async (t) => {let cookie = truelet verified = truelet suspended = 0@@ -74,8 +74,7 @@ test('session activity validates identities, throttles writes and tolerates writ}),async (_db: unknown, id: number, now: number) => {assert.equal(id, 1)- if (failWrite)- throw new Error('secret session details must not be logged')+ if (failWrite) throw new Error('account_activity_unavailable')writes++lastActive = now},@@ -118,20 +117,16 @@ test('session activity validates identities, throttles writes and tolerates writfailWrite = trueconst logged: unknown[][] = []t.mock.method(console, 'error', (...args: unknown[]) => logged.push(args))- assert.equal(- (await request()).userId,- 1,- 'activity write failure cannot invalidate a valid session',- )+ await assert.rejects(request(), /account_activity_unavailable/)assert.equal(writes, 2)assert.equal(lastActive, null)- assert.deepEqual(logged, [['Account activity write failed']])+ assert.deepEqual(logged, [])failWrite = falsefailRead = trueawait assert.rejects(request(), /Account control lookup failed/)assert.equal(logged.length,- 1,+ 0,'critical account control errors are not swallowed',)})