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(cloud): retry domain purge and refresh held claims

Timothy Yinb43207f64f8b
diff --git a/packages/platform/src/domains.ts b/packages/platform/src/domains.ts
index b9cb159b..b5843a19 100644
--- a/packages/platform/src/domains.ts
+++ b/packages/platform/src/domains.ts
@@ -380,7 +380,7 @@ export function createDomainManager(
async function reconcile(onlyHost?: string, batchSize = 5) {
if (!config.enabled) return { checked: 0 }
const rows = await stmt(
- `SELECT json_group_array(hostname) AS items FROM (SELECT hostname FROM platform_custom_domains WHERE (state IN ('pending','active','deleting','expired') OR (state='paused' AND ((hold_reason IS NOT NULL AND hold_reason<>'manual') OR provider_attempted=1 OR route_attempted=1 OR (verified_at IS NULL AND expires_at<=?)))) AND next_check_at<=? AND (lease_until IS NULL OR lease_until<?) ${onlyHost ? 'AND hostname=?' : ''} ORDER BY CASE WHEN ${HAS_PROVIDER} THEN 0 WHEN next_check_at=0 THEN 1 WHEN state='pending' THEN 2 ELSE 3 END,next_check_at,hostname LIMIT ?)`,
+ `SELECT json_group_array(hostname) AS items FROM (SELECT hostname FROM platform_custom_domains WHERE (state IN ('pending','active','deleting','expired') OR (state='deleted' AND purge_requested=1) OR (state='paused' AND ((hold_reason IS NOT NULL AND hold_reason<>'manual') OR provider_attempted=1 OR route_attempted=1 OR (verified_at IS NULL AND expires_at<=?)))) AND next_check_at<=? AND (lease_until IS NULL OR lease_until<?) ${onlyHost ? 'AND hostname=?' : ''} ORDER BY CASE WHEN ${HAS_PROVIDER} THEN 0 WHEN next_check_at=0 THEN 1 WHEN state='pending' THEN 2 ELSE 3 END,next_check_at,hostname LIMIT ?)`,
now(),
now(),
now(),
@@ -392,7 +392,7 @@ export function createDomainManager(
const token = dependencies.id(),
time = now()
const row = await stmt(
- `UPDATE platform_custom_domains SET lease_token=?,lease_until=? WHERE hostname=? AND (lease_until IS NULL OR lease_until<?) AND next_check_at<=? AND (state IN ('pending','active','deleting','expired') OR (state='paused' AND ((hold_reason IS NOT NULL AND hold_reason<>'manual') OR provider_attempted=1 OR route_attempted=1 OR (verified_at IS NULL AND expires_at<=?)))) RETURNING *`,
+ `UPDATE platform_custom_domains SET lease_token=?,lease_until=? WHERE hostname=? AND (lease_until IS NULL OR lease_until<?) AND next_check_at<=? AND (state IN ('pending','active','deleting','expired') OR (state='deleted' AND purge_requested=1) OR (state='paused' AND ((hold_reason IS NOT NULL AND hold_reason<>'manual') OR provider_attempted=1 OR route_attempted=1 OR (verified_at IS NULL AND expires_at<=?)))) RETURNING *`,
token,
time + 300000,
host,
@@ -453,9 +453,30 @@ export function createDomainManager(
time >= row.expires_at &&
!row.verified_at
const deleting =
- row.state === 'deleting' || row.state === 'expired' || expired
+ row.state === 'deleting' ||
+ (row.state === 'deleted' && row.purge_requested === 1) ||
+ row.state === 'expired' ||
+ expired
const hold = row.user_paused ? 'manual' : eligibility.reason
if (deleting || hold) {
+ if (
+ !deleting &&
+ row.state === 'paused' &&
+ row.hold_reason === hold &&
+ !row.provider_id &&
+ !row.route_id &&
+ !row.provider_attempted &&
+ !row.route_attempted &&
+ !row.is_primary
+ ) {
+ await fenced(
+ 'checked_at=?,next_check_at=?,lease_token=NULL,lease_until=NULL',
+ time,
+ time + 1800000,
+ )
+ checked++
+ continue
+ }
// Delete only resources owned by this claim, recovering IDs after uncertain writes.
let providerId = row.provider_id,
routeId = row.route_id
@@ -483,7 +504,9 @@ export function createDomainManager(
deleting ? 1 : 0,
deleting ? null : hold,
time,
- time + 86400000,
+ deleting && row.purge_requested
+ ? time
+ : time + (deleting ? 86400000 : 1800000),
...args,
),
],
diff --git a/tests/cloud-domains.test.ts b/tests/cloud-domains.test.ts
index 6660d685..dd8e276a 100644
--- a/tests/cloud-domains.test.ts
+++ b/tests/cloud-domains.test.ts
@@ -272,6 +272,30 @@ test('Real D1 custom domains fence claims, CNAME ownership transitions, provider
assert.equal(hosts.size, 0)
assert.equal(routes.size, 0)
assert.equal(held.generation, claimGeneration)
+ const heldRevision = held.revision
+ const suspendedAudits = (await db
+ .prepare(
+ "SELECT COUNT(*) AS n FROM platform_domain_audit WHERE hostname=? AND action='suspended'",
+ )
+ .bind(domain.hostname)
+ .first())!.n
+ time += 1800001
+ await manager.reconcile(domain.hostname)
+ assert.equal(
+ (await manager.list(1, one.siteId))[0]!.revision,
+ heldRevision,
+ 'unchanged holds only heartbeat, without revision churn',
+ )
+ assert.equal(
+ (await db
+ .prepare(
+ "SELECT COUNT(*) AS n FROM platform_domain_audit WHERE hostname=? AND action='suspended'",
+ )
+ .bind(domain.hostname)
+ .first())!.n,
+ suspendedAudits,
+ 'unchanged holds do not duplicate audit entries',
+ )
await db
.prepare(
"UPDATE platform_plans SET policy_json=json_set(policy_json,'$.limits.customDomains',4) WHERE id='free'",
@@ -544,6 +568,23 @@ test('Real D1 custom domains fence claims, CNAME ownership transitions, provider
.first(),
)
time += 1800001
+ await db
+ .prepare(
+ "CREATE TRIGGER fail_purge BEFORE DELETE ON platform_custom_domains BEGIN SELECT RAISE(ABORT,'forced purge failure'); END",
+ )
+ .run()
+ await manager.reconcile(lost.hostname)
+ assert.equal(
+ (
+ await db
+ .prepare('SELECT state FROM platform_custom_domains WHERE hostname=?')
+ .bind(lost.hostname)
+ .first()
+ )?.state,
+ 'deleted',
+ 'confirmed upstream removal survives a failed final database purge',
+ )
+ await db.prepare('DROP TRIGGER fail_purge').run()
await manager.reconcile(lost.hostname)
assert.equal(hosts.has(lost.hostname), false)
assert.equal(