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): bind domain claims to unique CNAME proofs
Timothy Yin3614814dccbf
diff --git a/apps/cloud/app/pages/sites/[siteId]/domains.vue b/apps/cloud/app/pages/sites/[siteId]/domains.vueindex 29f11173..18c74383 100644--- a/apps/cloud/app/pages/sites/[siteId]/domains.vue+++ b/apps/cloud/app/pages/sites/[siteId]/domains.vue@@ -327,19 +327,9 @@ async function copy(value: string) {)}}</p>- <div class="rounded-lg border border-[var(--border)] p-3 space-y-2">- <p class="cf-field-label">{{ t('cloud.domains.cnameRecord') }}</p>- <code class="block break-all text-sm">{{ data.cnameTarget }}</code- ><CloudButton- variant="ghost"- size="sm"- @click="copy(data.cnameTarget)"- ><Copy :size="14" />{{- t('cloud.domains.copyTarget')- }}</CloudButton- >- <p class="cf-field-hint">{{ t('cloud.domains.dnsOnly') }}</p>- </div>+ <p class="cf-field-hint">+ {{ t('cloud.domains.targetHelp', { target: data.cnameTarget }) }}+ </p><pv-if="!data.domains.length"class="cf-field-hint"@@ -372,6 +362,20 @@ async function copy(value: string) {>{{ t('cloud.domains.states.' + domain.status) }}</CloudBadge></div>+ <div class="space-y-2">+ <p class="cf-field-label">{{ t('cloud.domains.cnameRecord') }}</p>+ <code class="block break-all text-sm">{{+ domain.cnameTarget+ }}</code>+ <CloudButton+ variant="ghost"+ size="sm"+ @click="copy(domain.cnameTarget)"+ ><Copy :size="14" />{{+ t('cloud.domains.copyTarget')+ }}</CloudButton+ >+ </div><dl class="grid grid-cols-1 sm:grid-cols-3 gap-2 text-xs"><div><dt>{{ t('cloud.domains.dns') }}</dt>@@ -391,13 +395,7 @@ async function copy(value: string) {</div></dl><p- v-if="domain.dnsStatus === 'awaiting_change'"- class="cf-notice"- >- {{ t('cloud.domains.resetCname') }}- </p>- <p- v-else-if="+ v-if="domain.dnsStatus === 'missing' && domain.status !== 'deleting'"class="cf-field-hint"@@ -405,7 +403,7 @@ async function copy(value: string) {{{t('cloud.domains.setCname', {hostname: domain.hostname,- target: data.cnameTarget,+ target: domain.cnameTarget,})}}</p>diff --git a/apps/cloud/i18n/locales/en.json b/apps/cloud/i18n/locales/en.jsonindex c154f89d..12b8d991 100644--- a/apps/cloud/i18n/locales/en.json+++ b/apps/cloud/i18n/locales/en.json@@ -494,7 +494,6 @@"dns": "DNS","provider": "Hostname status","certificate": "Certificate status",- "resetCname": "This hostname already pointed here before this request. Remove that CNAME, check until DNS shows missing, then add it again and recheck. This prevents an existing shared CNAME from being claimed by another account.","setCname": "Create a CNAME for {hostname} pointing to {target}, then check again.","checked": "Last checked: {time}","check": "Check status",@@ -515,8 +514,7 @@"expired": "Expired"},"dnsStates": {- "awaiting_change": "Existing CNAME needs reset",- "missing": "CNAME not detected",+ "missing": "This binding’s CNAME was not detected","ready": "CNAME verified","unknown": "DNS temporarily unavailable"},@@ -538,7 +536,8 @@"domain_provider_missing": "A managed provider resource is missing or changed. Ask the operator to inspect it.","domain_routing_unavailable": "The domain route needs deployment configuration before activation."},- "useDefault": "Use default address as primary"+ "useDefault": "Use default address as primary",+ "targetHelp": "Each binding has its own CNAME target below. Traffic enters through {target}; no additional TXT record is required."}}}diff --git a/apps/cloud/i18n/locales/zh-Hans.json b/apps/cloud/i18n/locales/zh-Hans.jsonindex 5ca84b01..7d5ecbc8 100644--- a/apps/cloud/i18n/locales/zh-Hans.json+++ b/apps/cloud/i18n/locales/zh-Hans.json@@ -494,7 +494,6 @@"dns": "DNS","provider": "域名状态","certificate": "证书状态",- "resetCname": "此域名在申请前已指向平台。请先移除该 CNAME,检查至显示未解析后,再重新添加并检查,避免其他账户直接认领已有解析。","setCname": "请为 {hostname} 添加指向 {target} 的 CNAME,然后重新检查。","checked": "上次检查:{time}","check": "检查状态",@@ -515,8 +514,7 @@"expired": "已过期"},"dnsStates": {- "awaiting_change": "需要重设已有 CNAME",- "missing": "未检测到 CNAME",+ "missing": "未检测到此绑定的专属 CNAME","ready": "CNAME 已验证","unknown": "DNS 暂不可用"},@@ -538,7 +536,8 @@"domain_provider_missing": "托管的服务商资源缺失或发生变化,请联系平台管理员检查。","domain_routing_unavailable": "启用前需要完成域名路由的部署配置。"},- "useDefault": "使用默认地址作为主域名"+ "useDefault": "使用默认地址作为主域名",+ "targetHelp": "请使用下方为各绑定单独生成的 CNAME 目标。流量统一经由 {target} 接入,无需额外配置 TXT 记录。"}}}diff --git a/packages/contracts/src/domains.ts b/packages/contracts/src/domains.tsindex d81dd940..d85f7217 100644--- a/packages/contracts/src/domains.ts+++ b/packages/contracts/src/domains.ts@@ -62,6 +62,16 @@ export function normalizeDomain(value: unknown): string {throw new Error('Invalid domain')return host}+/** A generation-specific target proves control without an additional DNS record. */+export function domainClaimTarget(+ generation: string,+ base = DEFAULT_CNAME_TARGET,+): string {+ const token = generation.replaceAll('-', '').toLowerCase()+ if (!/^[a-f0-9]{32}$/.test(token))+ throw new Error('Invalid domain generation')+ return normalizeDomain(token + '.' + normalizeDomain(base))+}export function defaultSiteHost(slug: string,base = DEFAULT_SITE_BASE,@@ -80,9 +90,10 @@ export interface CustomDomain {hostname: stringsiteId: numbergeneration: string+ cnameTarget: stringrevision: numberstatus: DomainStatus- dnsStatus: 'awaiting_change' | 'missing' | 'ready' | 'unknown'+ dnsStatus: 'missing' | 'ready' | 'unknown'hostnameStatus: stringsslStatus: stringerror: string | nulldiff --git a/packages/platform/migrations/0013_custom_domains.sql b/packages/platform/migrations/0013_custom_domains.sqlindex f9f40d27..50a42104 100644--- a/packages/platform/migrations/0013_custom_domains.sql+++ b/packages/platform/migrations/0013_custom_domains.sql@@ -14,7 +14,6 @@ CREATE TABLE platform_custom_domains (revision INTEGER NOT NULL DEFAULT 1,state TEXT NOT NULL DEFAULT 'pending' CHECK(state IN ('pending','active','paused','deleting','deleted','expired')),dns_status TEXT NOT NULL DEFAULT 'missing',- saw_absent INTEGER NOT NULL DEFAULT 0,provider_id TEXT,route_id TEXT,hostname_status TEXT NOT NULL DEFAULT 'unknown',diff --git a/packages/platform/src/domains.ts b/packages/platform/src/domains.tsindex 8b2009b4..d0071ecc 100644--- a/packages/platform/src/domains.ts+++ b/packages/platform/src/domains.ts@@ -2,6 +2,7 @@ import {DEFAULT_CNAME_TARGET,DEFAULT_SITE_BASE,defaultSiteHost,+ domainClaimTarget,normalizeDomain,validSiteSlug,} from '@chronoframe/contracts/domains'@@ -47,7 +48,6 @@ interface Row {revision: numberstate: DomainStatusdns_status: CustomDomain['dnsStatus']- saw_absent: numberprovider_id: string | nullroute_id: string | nullprovider_attempted: number@@ -67,11 +67,15 @@ interface Row {lease_until: number | nullverified_at: number | null}-export function domainDTO(row: Row): CustomDomain {+export function domainDTO(+ row: Row,+ target = DEFAULT_CNAME_TARGET,+): CustomDomain {return {hostname: row.hostname,siteId: row.site_id,generation: row.generation,+ cnameTarget: domainClaimTarget(row.generation, target),revision: row.revision,status: row.state,dnsStatus: row.dns_status,@@ -102,6 +106,8 @@ export function createDomainManager(db.prepare(sql).bind(...args)const base = normalizeDomain(config.baseDomain || DEFAULT_SITE_BASE)const target = normalizeDomain(config.cnameTarget || DEFAULT_CNAME_TARGET)+ const resourceLimit = Math.max(1, Math.min(config.limit, 20))+ const workspaceLimit = Math.min(4, Math.max(1, Math.floor(resourceLimit / 2)))const memberGuard = `EXISTS(SELECT 1 FROM platform_sites s JOIN platform_memberships m ON m.workspace_id=s.workspace_id WHERE s.id=? AND m.user_id=? AND m.role='admin')`async function authorize(userId: number, siteId: number, admin = true) {const row = await stmt(@@ -119,16 +125,19 @@ export function createDomainManager(hostname: string,generation: string,action: string,- userId: number | null = null,+ userId: number | null,+ guard: string,+ args: (string | number | null)[],): D1Statement {return stmt(- 'INSERT INTO platform_domain_audit(site_id,hostname,generation,action,user_id,created_at) VALUES(?,?,?,?,?,?)',+ `INSERT INTO platform_domain_audit(site_id,hostname,generation,action,user_id,created_at) SELECT ?,?,?,?,?,? WHERE EXISTS(SELECT 1 FROM platform_custom_domains WHERE ${guard})`,siteId,hostname,generation,action,userId,now(),+ ...args,)}async function list(userId: number, siteId: number) {@@ -137,7 +146,9 @@ export function createDomainManager(`SELECT json_group_array(json_object('hostname',hostname,'site_id',site_id,'generation',generation,'revision',revision,'state',state,'dns_status',dns_status,'hostname_status',hostname_status,'ssl_status',ssl_status,'error',error,'is_primary',is_primary,'redirects',redirects,'created_at',created_at,'checked_at',checked_at,'expires_at',expires_at,'next_check_at',next_check_at)) AS items FROM (SELECT * FROM platform_custom_domains WHERE site_id=? AND state<>'deleted' ORDER BY created_at)`,siteId,).first<{ items: string }>()- return (JSON.parse(rows?.items ?? '[]') as Row[]).map(domainDTO)+ return (JSON.parse(rows?.items ?? '[]') as Row[]).map((row) =>+ domainDTO(row, target),+ )}async function request(userId: number, siteId: number, input: unknown) {await authorize(userId, siteId)@@ -170,35 +181,51 @@ export function createDomainManager(if (existing && existing.state !== 'deleted') {if (existing.site_id !== siteId)throw new DomainError(409, 'domain_conflict')- return domainDTO(existing)+ return domainDTO(existing, target)}- const dns = await dependencies.dns(host, target)- if (dns === 'unknown') throw new DomainError(503, 'domain_dns_unavailable')- // An already-present shared CNAME does not identify the requesting account.if (existing && (existing.provider_id || existing.route_id))throw new DomainError(409, 'domain_cleanup_pending')const generation = dependencies.id(),time = now()try {- const result = await stmt(- `INSERT INTO platform_custom_domains(hostname,site_id,generation,created_at,expires_at,next_check_at,dns_status,saw_absent)- SELECT ?,?,?,?,?,?,?,? WHERE ${memberGuard}+ 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 (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- ON CONFLICT(hostname) DO UPDATE SET site_id=excluded.site_id,generation=excluded.generation,revision=platform_custom_domains.revision+1,state='pending',created_at=excluded.created_at,expires_at=excluded.expires_at,next_check_at=excluded.next_check_at,dns_status=excluded.dns_status,saw_absent=excluded.saw_absent,provider_attempted=0,route_attempted=0,retry_requested=0,attempts=0,checked_at=NULL,verified_at=NULL,hostname_status='unknown',ssl_status='unknown',error=NULL,is_primary=0,redirects=0,lease_token=NULL,lease_until=NULL- WHERE platform_custom_domains.state='deleted' AND platform_custom_domains.provider_id IS NULL AND platform_custom_domains.route_id IS NULL RETURNING *`,+ ON CONFLICT(hostname) DO UPDATE SET site_id=excluded.site_id,generation=excluded.generation,revision=platform_custom_domains.revision+1,state='pending',created_at=excluded.created_at,expires_at=excluded.expires_at,next_check_at=excluded.next_check_at,dns_status=excluded.dns_status,provider_attempted=0,route_attempted=0,retry_requested=0,attempts=0,checked_at=NULL,verified_at=NULL,hostname_status='unknown',ssl_status='unknown',error=NULL,is_primary=0,redirects=0,lease_token=NULL,lease_until=NULL+ WHERE platform_custom_domains.state='deleted' AND platform_custom_domains.provider_id IS NULL AND platform_custom_domains.route_id IS NULL`,host,siteId,generation,time,time + CLAIM_TTL,time,- dns === 'ready' ? 'awaiting_change' : 'missing',- dns === 'missing' ? 1 : 0,+ 'missing',siteId,userId,- Math.max(1, Math.min(config.limit, 100)),+ resourceLimit,+ siteId,+ workspaceLimit,siteId,+ )+ await db.batch([+ insertion,+ audit(+ siteId,+ host,+ generation,+ 'requested',+ userId,+ 'hostname=? AND generation=?',+ [host, generation],+ ),+ ])+ const result = await stmt(+ 'SELECT * FROM platform_custom_domains WHERE hostname=? AND generation=?',+ host,+ generation,).first<Row>()if (!result) {const concurrent = await stmt(@@ -210,12 +237,11 @@ export function createDomainManager(concurrent.site_id === siteId &&concurrent.state !== 'deleted')- return domainDTO(concurrent)+ return domainDTO(concurrent, target)if (concurrent) throw new DomainError(409, 'domain_conflict')throw new DomainError(429, 'domain_limit')}- await audit(siteId, host, generation, 'requested', userId).run()- return domainDTO(result)+ return domainDTO(result, target)} catch (error) {if (String(error).includes('UNIQUE constraint'))throw new DomainError(409, 'domain_conflict')@@ -258,7 +284,9 @@ export function createDomainManager(throw new DomainError(429, 'domain_wait')const guard = `hostname=? AND site_id=? AND generation=? AND revision=? AND ${memberGuard}${action === 'primary' || action === 'redirects' ? ` AND state='active' AND verified_at>=${now() - DOMAIN_HEALTH_TTL}` : ''}`const args = [host, siteId, generation, revision, siteId, userId]- const statements: D1Statement[] = []+ const statements: D1Statement[] = [+ audit(siteId, host, generation, action, userId, guard, args),+ ]if (action === 'primary')statements.push(stmt(@@ -280,28 +308,25 @@ export function createDomainManager(: action === 'redirects'? `redirects=${value ? 1 : 0}`: 'error=NULL,retry_requested=1'- statements.push(- stmt(- `UPDATE platform_custom_domains SET ${set},revision=revision+1,next_check_at=? WHERE ${guard}`,- now(),- ...args,- ),- )if (action === 'pause' || action === 'delete' || action === 'resume')statements.push(stmt(- `UPDATE platform_domains SET active=0 WHERE hostname=? AND site_id=? AND EXISTS(SELECT 1 FROM platform_custom_domains WHERE hostname=? AND generation=? AND revision=?)`,+ `UPDATE platform_domains SET active=0 WHERE hostname=? AND site_id=? AND EXISTS(SELECT 1 FROM platform_custom_domains WHERE ${guard})`,host,siteId,- host,- generation,- revision + 1,+ ...args,),)+ statements.push(+ stmt(+ `UPDATE platform_custom_domains SET ${set},revision=revision+1,next_check_at=? WHERE ${guard}`,+ now(),+ ...args,+ ),+ )const results = await db.batch(statements)- if (results[action === 'primary' ? 1 : 0]?.meta.changes !== 1)+ if (results.at(-1)?.meta.changes !== 1)throw new DomainError(409, 'domain_changed')- await audit(siteId, host, generation, action, userId).run()return { ok: true }}/** Claim only a bounded due batch; API checks and scheduled checks share the lease. */@@ -342,8 +367,23 @@ export function createDomainManager(if (result.meta.changes !== 1)throw new DomainError(409, 'domain_changed')}- const complete = async (statements: D1Statement[]) => {- const results = await db.batch(statements)+ const complete = async (statements: D1Statement[], action?: string) => {+ const results = await db.batch([+ ...(action+ ? [+ audit(+ row.site_id,+ host,+ row.generation,+ action,+ null,+ guard,+ args,+ ),+ ]+ : []),+ ...statements,+ ])if (results.at(-1)?.meta.changes !== 1)throw new DomainError(409, 'domain_changed')}@@ -368,28 +408,33 @@ export function createDomainManager(}if (routeId) await dependencies.provider.removeRoute(routeId, host)if (providerId) await dependencies.provider.remove(providerId)- await complete([- stmt(- `DELETE FROM platform_domains WHERE hostname=? AND site_id=? AND kind='custom' AND EXISTS(SELECT 1 FROM platform_custom_domains WHERE ${guard})`,- host,- row.site_id,- ...args,- ),- stmt(- `UPDATE platform_custom_domains SET revision=revision+1,state='deleted',is_primary=0,provider_id=NULL,route_id=NULL,error=NULL,checked_at=?,next_check_at=?,lease_token=NULL,lease_until=NULL WHERE ${guard}`,- time,- time,- ...args,- ),- ])- await audit(row.site_id, host, row.generation, 'removed').run()+ await complete(+ [+ stmt(+ `DELETE FROM platform_domains WHERE hostname=? AND site_id=? AND kind='custom' AND EXISTS(SELECT 1 FROM platform_custom_domains WHERE ${guard})`,+ host,+ row.site_id,+ ...args,+ ),+ stmt(+ `UPDATE platform_custom_domains SET revision=revision+1,state='deleted',is_primary=0,provider_id=NULL,route_id=NULL,error=NULL,checked_at=?,next_check_at=?,lease_token=NULL,lease_until=NULL WHERE ${guard}`,+ time,+ time,+ ...args,+ ),+ ],+ 'removed',+ )checked++continue}- const dns = await dependencies.dns(host, target)+ const dns = await dependencies.dns(+ host,+ domainClaimTarget(row.generation, target),+ )if (dns === 'unknown')throw new DomainError(503, 'domain_dns_unavailable')- if (dns === 'missing' || !row.saw_absent) {+ if (dns === 'missing') {await complete([stmt(`UPDATE platform_domains SET active=0 WHERE hostname=? AND site_id=? AND EXISTS(SELECT 1 FROM platform_custom_domains WHERE ${guard})`,@@ -398,9 +443,8 @@ export function createDomainManager(...args,),stmt(- `UPDATE platform_custom_domains SET revision=revision+1,state='pending',is_primary=0,dns_status=?,saw_absent=?,checked_at=?,next_check_at=?,error=NULL,lease_token=NULL,lease_until=NULL WHERE ${guard}`,- dns === 'ready' ? 'awaiting_change' : 'missing',- dns === 'missing' ? 1 : 0,+ `UPDATE platform_custom_domains SET revision=revision+1,state='pending',is_primary=0,dns_status=?,checked_at=?,next_check_at=?,error=NULL,lease_token=NULL,lease_until=NULL WHERE ${guard}`,+ 'missing',time,time + 30000,...args,@@ -427,10 +471,7 @@ export function createDomainManager(if (allocation.meta.changes !== 1)throw new DomainError(429, 'domain_wait')try {- if (- (await dependencies.provider.count()) >=- Math.max(1, Math.min(config.limit, 100))- )+ if ((await dependencies.provider.count()) >= resourceLimit)throw new DomainError(429, 'domain_limit')await fenced('provider_attempted=1')provider = await dependencies.provider.create(host)@@ -478,36 +519,36 @@ export function createDomainManager(provider.ssl === 'active' &&!!routeId &&config.routingReady- await complete([- stmt(- `INSERT INTO platform_domains(hostname,site_id,verified,active,kind) SELECT ?,?,1,?,'custom' WHERE EXISTS(SELECT 1 FROM platform_custom_domains WHERE ${guard}) ON CONFLICT(hostname) DO UPDATE SET active=excluded.active,verified=1,kind='custom' WHERE platform_domains.site_id=excluded.site_id`,- host,- row.site_id,- active ? 1 : 0,- ...args,- ),- stmt(- `UPDATE platform_custom_domains SET revision=revision+1,state=?,is_primary=CASE WHEN ?=1 THEN is_primary ELSE 0 END,error=?,attempts=CASE WHEN state='active' THEN 0 ELSE attempts+1 END,checked_at=?,verified_at=CASE WHEN ?=1 THEN ? ELSE verified_at END,next_check_at=?,lease_token=NULL,lease_until=NULL WHERE ${guard}`,- active ? 'active' : 'pending',- active ? 1 : 0,- config.routingReady ? null : 'domain_routing_unavailable',- time,- active ? 1 : 0,- time,- time +- (active- ? 900000- : Math.min(1800000, 60000 * 2 ** Math.min(row.attempts, 5))),- ...args,- ),- ])- if (active !== (row.state === 'active'))- await audit(- row.site_id,- host,- row.generation,- active ? 'activated' : 'pending',- ).run()+ await complete(+ [+ stmt(+ `INSERT INTO platform_domains(hostname,site_id,verified,active,kind) SELECT ?,?,1,?,'custom' WHERE EXISTS(SELECT 1 FROM platform_custom_domains WHERE ${guard}) ON CONFLICT(hostname) DO UPDATE SET active=excluded.active,verified=1,kind='custom' WHERE platform_domains.site_id=excluded.site_id`,+ host,+ row.site_id,+ active ? 1 : 0,+ ...args,+ ),+ stmt(+ `UPDATE platform_custom_domains SET revision=revision+1,state=?,is_primary=CASE WHEN ?=1 THEN is_primary ELSE 0 END,error=?,attempts=CASE WHEN state='active' THEN 0 ELSE attempts+1 END,checked_at=?,verified_at=CASE WHEN ?=1 THEN ? ELSE verified_at END,next_check_at=?,lease_token=NULL,lease_until=NULL WHERE ${guard}`,+ active ? 'active' : 'pending',+ active ? 1 : 0,+ config.routingReady ? null : 'domain_routing_unavailable',+ time,+ active ? 1 : 0,+ time,+ time ++ (active+ ? 900000+ : Math.min(1800000, 60000 * 2 ** Math.min(row.attempts, 5))),+ ...args,+ ),+ ],+ active !== (row.state === 'active')+ ? active+ ? 'activated'+ : 'pending'+ : undefined,+ )checked++} catch (error) {const code =diff --git a/scripts/domain-deployment.mjs b/scripts/domain-deployment.mjsindex fdbb3fee..b140892c 100644--- a/scripts/domain-deployment.mjs+++ b/scripts/domain-deployment.mjs@@ -27,8 +27,8 @@ export function domainDeploymentValues(environment, values = {}) {const worker = values.PLATFORM_DOMAIN_SITE_WORKER || 'chronoframe-site'const zone = values.PLATFORM_DOMAIN_ZONE_ID || ''const limit = Number(values.PLATFORM_DOMAIN_RESOURCE_LIMIT || 20)- if (!Number.isInteger(limit) || limit < 1 || limit > 100)- throw new Error('Domain resource limit must be between 1 and 100')+ if (!Number.isInteger(limit) || limit < 1 || limit > 20)+ throw new Error('Domain resource limit must be between 1 and 20')if (enabled &&(!/^[a-f0-9]{32}$/i.test(zone) ||diff --git a/tests/cloud-domains.test.ts b/tests/cloud-domains.test.tsindex 29591fc8..3765f324 100644--- a/tests/cloud-domains.test.ts+++ b/tests/cloud-domains.test.ts@@ -12,13 +12,11 @@ import {renameDefaultDomain,DOMAIN_HEALTH_TTL,} from '../packages/platform/src/domains.ts'-import type {- DomainProvider,- DnsState,-} from '../packages/platform/src/domains.ts'+import type { DomainProvider } from '../packages/platform/src/domains.ts'import {normalizeDomain,validSiteSlug,+ domainClaimTarget,} from '../packages/contracts/src/domains.ts'import {checkDomainCname,@@ -119,7 +117,7 @@ test('Real D1 custom domains fence claims, CNAME ownership transitions, provider{ id: string; status: string; ssl: string }>(),routes = new Map<string, { id: string; owned: boolean }>(),- dns = new Map<string, DnsState>()+ dns = new Map<string, string>()let creates = 0,routeCreates = 0,loseCreate = false,@@ -167,7 +165,7 @@ test('Real D1 custom domains fence claims, CNAME ownership transitions, provider}const manager = createDomainManager(db, config, {provider,- dns: async (h) => dns.get(h) ?? 'missing',+ dns: async (h, target) => (dns.get(h) === target ? 'ready' : 'missing'),id: nextId,now: () => time,}),@@ -191,11 +189,20 @@ test('Real D1 custom domains fence claims, CNAME ownership transitions, provider{ statusCode: 404 },)let domain = await manager.request(1, one.siteId, ' Photos.Example.com ')+ dns.set(domain.hostname, 'cname.chronoframe.art')+ await manager.reconcile()+ assert.equal(+ creates,+ 0,+ 'a claimant cannot activate when the real owner later points at the shared ingress',+ )+ time += 60000+ assert.equal(domain.cnameTarget, domainClaimTarget(domain.generation))await assert.rejects(() => manager.request(2, two.siteId, domain.hostname),{ code: 'domain_conflict' },)- dns.set(domain.hostname, 'ready')+ dns.set(domain.hostname, domain.cnameTarget)await db.prepare('UPDATE platform_domain_provider_lock SET lease_token=?,lease_until=? WHERE id=1',@@ -284,19 +291,25 @@ test('Real D1 custom domains fence claims, CNAME ownership transitions, providerawait manager.reconcile()assert.equal((await manager.list(1, one.siteId)).length, 0)assert.equal(hosts.size, 0)- dns.set('photos.example.com', 'ready')+ dns.set('photos.example.com', domain.cnameTarget)let rebound = await manager.request(2, two.siteId, 'photos.example.com')- assert.equal(rebound.dnsStatus, 'awaiting_change')+ assert.equal(rebound.dnsStatus, 'missing')+ assert.notEqual(rebound.cnameTarget, domain.cnameTarget)await manager.reconcile()assert.equal(creates,1,- 'pre-existing shared CNAME must not establish account ownership',+ 'a prior generation CNAME must not establish account ownership',)- dns.set(rebound.hostname, 'missing')+ dns.set(rebound.hostname, 'cname.chronoframe.art')time += 60000await manager.reconcile()- dns.set(rebound.hostname, 'ready')+ assert.equal(+ creates,+ 1,+ 'a shared CNAME does not authorize the new generation',+ )+ dns.set(rebound.hostname, rebound.cnameTarget)time += 60000await manager.reconcile()rebound = (await manager.list(2, two.siteId))[0]!@@ -320,7 +333,7 @@ test('Real D1 custom domains fence claims, CNAME ownership transitions, provider)loseCreate = truelet lost = await manager.request(1, one.siteId, 'lost.example.com')- dns.set(lost.hostname, 'ready')+ dns.set(lost.hostname, lost.cnameTarget)await manager.reconcile()assert.equal((await manager.list(1, one.siteId))[0]?.error,@@ -364,7 +377,7 @@ test('Real D1 custom domains fence claims, CNAME ownership transitions, providerreturn result}let leased = await manager.request(1, one.siteId, 'leased.example.com')- dns.set(leased.hostname, 'ready')+ dns.set(leased.hostname, leased.cnameTarget)const pending = manager.reconcile(leased.hostname)await enteredleased = (await manager.list(1, one.siteId)).find(@@ -523,6 +536,13 @@ test('DNS validation uses fixed CNAME-only resolvers and provider credentials netest('Deployment isolates named Previews and leaves customer route ownership with the domain controller', async () => {const { configureDomainDeployment, domainDeploymentValues } =await import('../scripts/domain-deployment.mjs')+ assert.throws(+ () =>+ domainDeploymentValues('production', {+ PLATFORM_DOMAIN_RESOURCE_LIMIT: '21',+ }),+ /between 1 and 20/,+ )const config: Record<string, any> = {name: 'chronoframe-cloud',routes: [{ pattern: 'old.example.com/*' }],@@ -651,3 +671,167 @@ test('Default-domain migration preserves reserved names and mappings owned by anawait mf.dispose()}})++test('Workspace quotas preserve capacity for other tenants and audit failures roll back domain actions', async () => {+ const mf = new Miniflare(+ convertV4MiniflareOptions({+ modules: true,+ script: 'export default {fetch(){return new Response("test")}}',+ compatibilityDate: '2026-10-22',+ d1Databases: ['DB'],+ }),+ )+ try {+ const db = await mf.getD1Database('DB')+ for (const file of (await readdir('packages/platform/migrations'))+ .filter((f) => f.endsWith('.sql'))+ .sort())+ for (const q of (+ await readFile('packages/platform/migrations/' + file, 'utf8')+ )+ .replace(/^--.*$/gm, '')+ .split(';')+ .map((s) => s.trim())+ .filter(Boolean))+ await db.prepare(q).run()+ let time = Date.now()+ await db+ .prepare(+ 'INSERT INTO platform_users(id,email,name,email_verified,created_at,updated_at) VALUES(1,?,?,1,?,?),(2,?,?,1,?,?)',+ )+ .bind(+ '[email protected]',+ 'One',+ time,+ time,+ '[email protected]',+ 'Two',+ time,+ time,+ )+ .run()+ const sites = createD1Provisioning(db),+ claims = []+ for (let i = 0; i < 5; i++)+ claims.push(+ await sites.create(1, {+ name: 'Quota ' + i,+ slug: 'quota-' + i,+ requestId: crypto.randomUUID(),+ }),+ )+ const other = await sites.create(2, {+ name: 'Other',+ slug: 'fair-other',+ requestId: crypto.randomUUID(),+ })+ const provider = new Proxy(+ {},+ {+ get() {+ return () => {+ throw new Error('Unverified claims must not allocate resources')+ }+ },+ },+ ) as DomainProvider+ const manager = createDomainManager(+ db,+ {+ baseDomain: 'chronoframe.art',+ cnameTarget: 'cname.chronoframe.art',+ enabled: true,+ routingReady: true,+ limit: 20,+ },+ {+ provider,+ dns: async () => 'missing',+ id: () => crypto.randomUUID(),+ now: () => time,+ },+ )+ for (let i = 0; i < 4; i++)+ await manager.request(1, claims[i]!.siteId, 'quota-' + i + '.example.com')+ await assert.rejects(+ () => manager.request(1, claims[4]!.siteId, 'quota-4.example.com'),+ { code: 'domain_limit' },+ )+ 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"+ await db.prepare(failAudit).run()+ await assert.rejects(+ () => manager.request(2, other.siteId, 'atomic.example.com'),+ /audit unavailable/,+ )+ assert.equal(+ await db+ .prepare(+ "SELECT hostname FROM platform_custom_domains WHERE hostname='atomic.example.com'",+ )+ .first(),+ null,+ )+ await db.prepare('DROP TRIGGER fail_domain_audit').run()+ const domain = await manager.request(2, other.siteId, 'atomic.example.com')+ await db.prepare(failAudit).run()+ await assert.rejects(+ () =>+ manager.mutate(+ 2,+ other.siteId,+ domain.hostname,+ domain.generation,+ domain.revision,+ 'pause',+ ),+ /audit unavailable/,+ )+ const unchanged = (await manager.list(2, other.siteId)).find(+ (d) => d.hostname === domain.hostname,+ )!+ assert.equal(unchanged.status, 'pending')+ assert.equal(unchanged.revision, domain.revision)+ await db.prepare('DROP TRIGGER fail_domain_audit').run()+ await manager.mutate(+ 2,+ other.siteId,+ domain.hostname,+ domain.generation,+ domain.revision,+ 'delete',+ )+ await db.prepare(failAudit).run()+ await manager.reconcile(domain.hostname)+ assert.equal(+ (await manager.list(2, other.siteId)).find(+ (d) => d.hostname === domain.hostname,+ )?.status,+ 'deleting',+ 'failed removal audit must not commit deleted state',+ )+ await db.prepare('DROP TRIGGER fail_domain_audit').run()+ time += 1800000+ await manager.reconcile(domain.hostname)+ assert.equal(+ (await manager.list(2, other.siteId)).find(+ (d) => d.hostname === domain.hostname,+ ),+ undefined,+ )+ assert.equal(+ (+ await db+ .prepare(+ "SELECT COUNT(*) AS n FROM platform_domain_audit WHERE hostname=? AND action='removed'",+ )+ .bind(domain.hostname)+ .first()+ ).n,+ 1,+ )+ } finally {+ await mf.dispose()+ }+})