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): isolate pending domain capacity and expire paused claims
Timothy Yinca978e798655
diff --git a/apps/cloud/app/pages/sites/[siteId]/domains.vue b/apps/cloud/app/pages/sites/[siteId]/domains.vueindex 18c74383..3257e355 100644--- a/apps/cloud/app/pages/sites/[siteId]/domains.vue+++ b/apps/cloud/app/pages/sites/[siteId]/domains.vue@@ -398,7 +398,7 @@ async function copy(value: string) {v-if="domain.dnsStatus === 'missing' && domain.status !== 'deleting'"- class="cf-field-hint"+ class="cf-field-hint break-all">{{t('cloud.domains.setCname', {diff --git a/apps/cloud/server/plugins/domains.ts b/apps/cloud/server/plugins/domains.tsindex beac01d4..9da3cdb8 100644--- a/apps/cloud/server/plugins/domains.ts+++ b/apps/cloud/server/plugins/domains.ts@@ -1,6 +1,6 @@import { domainServices } from '../../../shared/platform/domains'import type { PlatformD1 } from '@chronoframe/platform'-/** Production Cron and explicit checks use the same bounded, leased reconciliation path. */+/** A maximum of 20 provider reservations plus 10 unverified claims bounds this one-host-per-minute queue. */export default defineNitroPlugin((app) => {app.hooks.hook('cloudflare:scheduled', async ({ env }) => {const db = env.DB as PlatformD1 | undefineddiff --git a/packages/platform/src/domains.ts b/packages/platform/src/domains.tsindex d0071ecc..6268d5ad 100644--- a/packages/platform/src/domains.ts+++ b/packages/platform/src/domains.ts@@ -40,6 +40,9 @@ export interface DomainConfig {limit: number}export const DOMAIN_HEALTH_TTL = 60 * 60 * 1000+const PENDING_LIMIT = 10+const HAS_PROVIDER =+ '(provider_attempted=1 OR provider_id IS NOT NULL OR route_attempted=1 OR route_id IS NOT NULL)'const CLAIM_TTL = 48 * 60 * 60 * 1000interface Row {hostname: string@@ -191,6 +194,7 @@ export function createDomainManager(const insertion = stmt(`INSERT INTO platform_custom_domains(hostname,site_id,generation,created_at,expires_at,next_check_at,dns_status)SELECT ?,?,?,?,?,?,? WHERE ${memberGuard}+ AND (SELECT COUNT(*) FROM platform_custom_domains WHERE state<>'deleted' AND NOT ${HAS_PROVIDER})<?AND (SELECT COUNT(*) FROM platform_custom_domains WHERE state<>'deleted')<?AND (SELECT COUNT(*) FROM platform_custom_domains c JOIN platform_sites s ON s.id=c.site_id WHERE s.workspace_id=(SELECT workspace_id FROM platform_sites WHERE id=?) AND c.state<>'deleted')<?AND (SELECT COUNT(*) FROM platform_custom_domains WHERE site_id=? AND state<>'deleted')<2@@ -205,7 +209,8 @@ export function createDomainManager('missing',siteId,userId,- resourceLimit,+ PENDING_LIMIT,+ resourceLimit + PENDING_LIMIT,siteId,workspaceLimit,siteId,@@ -333,7 +338,8 @@ 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') AND next_check_at<=? AND (lease_until IS NULL OR lease_until<?) ${onlyHost ? 'AND hostname=?' : ''} ORDER BY next_check_at LIMIT ?)`,+ `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 verified_at IS NULL AND expires_at<=?)) AND next_check_at<=? AND (lease_until IS NULL OR lease_until<?) ${onlyHost ? 'AND hostname=?' : ''} ORDER BY next_check_at LIMIT ?)`,+ now(),now(),now(),...(onlyHost ? [onlyHost] : []),@@ -344,12 +350,13 @@ 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') 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='paused' AND verified_at IS NULL AND expires_at<=?)) RETURNING *`,token,time + 300000,host,time,time,+ time,).first<Row>()if (!row) continueconst guard =@@ -391,7 +398,7 @@ export function createDomainManager(if (row.state === 'deleting' ||row.state === 'expired' ||- (row.state === 'pending' &&+ ((row.state === 'pending' || row.state === 'paused') &&time >= row.expires_at &&!row.verified_at)) {@@ -471,7 +478,14 @@ export function createDomainManager(if (allocation.meta.changes !== 1)throw new DomainError(429, 'domain_wait')try {- if ((await dependencies.provider.count()) >= resourceLimit)+ const reserved = await stmt(+ `SELECT COUNT(*) AS n FROM platform_custom_domains WHERE state<>'deleted' AND hostname<>? AND ${HAS_PROVIDER}`,+ host,+ ).first<{ n: number }>()+ if (+ (reserved?.n ?? resourceLimit) >= resourceLimit ||+ (await dependencies.provider.count()) >= resourceLimit+ )throw new DomainError(429, 'domain_limit')await fenced('provider_attempted=1')provider = await dependencies.provider.create(host)diff --git a/tests/cloud-domains.test.ts b/tests/cloud-domains.test.tsindex 3765f324..95a3cd24 100644--- a/tests/cloud-domains.test.ts+++ b/tests/cloud-domains.test.ts@@ -757,6 +757,21 @@ test('Workspace quotas preserve capacity for other tenants and audit failures ro() => manager.request(1, claims[4]!.siteId, 'quota-4.example.com'),{ code: 'domain_limit' },)+ // Filled provider reservations do not consume the separate unverified queue.+ for (let i = 0; i < 20; i++)+ await db+ .prepare(+ "INSERT INTO platform_custom_domains(hostname,site_id,generation,state,provider_attempted,created_at,expires_at,next_check_at) VALUES(?,?,?,'paused',1,?,?,?)",+ )+ .bind(+ 'existing-' + i + '.example.com',+ claims[0]!.siteId,+ crypto.randomUUID(),+ time,+ time + 86400000,+ time,+ )+ .run()await manager.request(2, other.siteId, 'fair.example.com')const failAudit ="CREATE TRIGGER fail_domain_audit BEFORE INSERT ON platform_domain_audit BEGIN SELECT RAISE(ABORT,'audit unavailable'); END"@@ -831,6 +846,52 @@ test('Workspace quotas preserve capacity for other tenants and audit failures ro).n,1,)+ for (let i = 0; i < 5; i++)+ await db+ .prepare(+ 'INSERT INTO platform_custom_domains(hostname,site_id,generation,state,created_at,expires_at,next_check_at) VALUES(?,?,?,?,?,?,?)',+ )+ .bind(+ 'pending-' + i + '.example.com',+ claims[0]!.siteId,+ crypto.randomUUID(),+ i === 0 ? 'expired' : 'pending',+ time,+ time - 1,+ time,+ )+ .run()+ await assert.rejects(+ () => manager.request(2, other.siteId, 'queue-full.example.com'),+ { code: 'domain_limit' },+ )+ await db+ .prepare(+ "UPDATE platform_custom_domains SET state='deleted' WHERE hostname='pending-0.example.com'",+ )+ .run()+ const pausedClaim = await manager.request(+ 2,+ other.siteId,+ 'queue-full.example.com',+ )+ await manager.mutate(+ 2,+ other.siteId,+ pausedClaim.hostname,+ pausedClaim.generation,+ pausedClaim.revision,+ 'pause',+ )+ time += 49 * 3600000+ await manager.reconcile(pausedClaim.hostname)+ assert.equal(+ (await manager.list(2, other.siteId)).find(+ (d) => d.hostname === pausedClaim.hostname,+ ),+ undefined,+ 'pausing an unverified claim cannot retain queue capacity beyond its expiry',+ )} finally {await mf.dispose()}