commit c5a7d252f3d8dba36282e00ea59a1bea30d7da87 · nekomimi.pet/wisp.place-monorepo

+116

src/lib/db.test.ts

···

       1
       1
       +
       import { describe, test, expect, beforeAll, afterAll } from 'bun:test'

     

       2
       2
       +
       import {

     

       3
       3
       +
       	claimCustomDomain,

     

       4
       4
       +
       	getCustomDomainInfo,

     

       5
       5
       +
       	deleteCustomDomain,

     

       6
       6
       +
       	updateCustomDomainVerification,

     

       7
       7
       +
       	db

     

       8
       8
       +
       } from './db'

     

       9
       9
       +
       

     

       10
       10
       +
       describe('custom domain claiming', () => {

     

       11
       11
       +
       	const testDid1 = 'did:plc:testuser1'

     

       12
       12
       +
       	const testDid2 = 'did:plc:testuser2'

     

       13
       13
       +
       	const testDomain = 'example-test-domain.com'

     

       14
       14
       +
       	const hash1 = 'testhash12345678'

     

       15
       15
       +
       	const hash2 = 'testhash87654321'

     

       16
       16
       +
       	const hash3 = 'testhash11111111'

     

       17
       17
       +
       

     

       18
       18
       +
       	beforeAll(async () => {

     

       19
       19
       +
       		// Clean up any existing test data

     

       20
       20
       +
       		try {

     

       21
       21
       +
       			await db`DELETE FROM custom_domains WHERE domain = ${testDomain}`

     

       22
       22
       +
       		} catch (err) {

     

       23
       23
       +
       			// Ignore errors if table doesn't exist or other issues

     

       24
       24
       +
       		}

     

       25
       25
       +
       	})

     

       26
       26
       +
       

     

       27
       27
       +
       	afterAll(async () => {

     

       28
       28
       +
       		// Clean up test data

     

       29
       29
       +
       		try {

     

       30
       30
       +
       			await db`DELETE FROM custom_domains WHERE domain = ${testDomain}`

     

       31
       31
       +
       		} catch (err) {

     

       32
       32
       +
       			// Ignore cleanup errors

     

       33
       33
       +
       		}

     

       34
       34
       +
       	})

     

       35
       35
       +
       

     

       36
       36
       +
       	test('should allow first user to claim a domain', async () => {

     

       37
       37
       +
       		const result = await claimCustomDomain(testDid1, testDomain, hash1)

     

       38
       38
       +
       		expect(result.success).toBe(true)

     

       39
       39
       +
       		expect(result.hash).toBe(hash1)

     

       40
       40
       +
       

     

       41
       41
       +
       		const domainInfo = await getCustomDomainInfo(testDomain)

     

       42
       42
       +
       		expect(domainInfo).toBeTruthy()

     

       43
       43
       +
       		expect(domainInfo!.domain).toBe(testDomain)

     

       44
       44
       +
       		expect(domainInfo!.did).toBe(testDid1)

     

       45
       45
       +
       		expect(domainInfo!.verified).toBe(false)

     

       46
       46
       +
       		expect(domainInfo!.id).toBe(hash1)

     

       47
       47
       +
       	})

     

       48
       48
       +
       

     

       49
       49
       +
       	test('should allow second user to claim an unverified domain', async () => {

     

       50
       50
       +
       		const result = await claimCustomDomain(testDid2, testDomain, hash2)

     

       51
       51
       +
       		expect(result.success).toBe(true)

     

       52
       52
       +
       		expect(result.hash).toBe(hash2)

     

       53
       53
       +
       

     

       54
       54
       +
       		const domainInfo = await getCustomDomainInfo(testDomain)

     

       55
       55
       +
       		expect(domainInfo).toBeTruthy()

     

       56
       56
       +
       		expect(domainInfo!.domain).toBe(testDomain)

     

       57
       57
       +
       		expect(domainInfo!.did).toBe(testDid2) // Should have changed

     

       58
       58
       +
       		expect(domainInfo!.verified).toBe(false)

     

       59
       59
       +
       		expect(domainInfo!.id).toBe(hash2) // Should have changed

     

       60
       60
       +
       	})

     

       61
       61
       +
       

     

       62
       62
       +
       	test('should prevent claiming a verified domain', async () => {

     

       63
       63
       +
       		// First verify the domain for testDid2

     

       64
       64
       +
       		await updateCustomDomainVerification(hash2, true)

     

       65
       65
       +
       

     

       66
       66
       +
       		// Now try to claim it with testDid1 - should fail

     

       67
       67
       +
       		try {

     

       68
       68
       +
       			await claimCustomDomain(testDid1, testDomain, hash3)

     

       69
       69
       +
       			expect.fail('Should have thrown an error when trying to claim a verified domain')

     

       70
       70
       +
       		} catch (err) {

     

       71
       71
       +
       			expect(err.message).toBe('conflict')

     

       72
       72
       +
       		}

     

       73
       73
       +
       

     

       74
       74
       +
       		// Verify the domain is still owned by testDid2 and verified

     

       75
       75
       +
       		const domainInfo = await getCustomDomainInfo(testDomain)

     

       76
       76
       +
       		expect(domainInfo).toBeTruthy()

     

       77
       77
       +
       		expect(domainInfo!.did).toBe(testDid2)

     

       78
       78
       +
       		expect(domainInfo!.verified).toBe(true)

     

       79
       79
       +
       		expect(domainInfo!.id).toBe(hash2)

     

       80
       80
       +
       	})

     

       81
       81
       +
       

     

       82
       82
       +
       	test('should allow claiming after unverification', async () => {

     

       83
       83
       +
       		// Unverify the domain

     

       84
       84
       +
       		await updateCustomDomainVerification(hash2, false)

     

       85
       85
       +
       

     

       86
       86
       +
       		// Now should be claimable again

     

       87
       87
       +
       		const result = await claimCustomDomain(testDid1, testDomain, hash3)

     

       88
       88
       +
       		expect(result.success).toBe(true)

     

       89
       89
       +
       		expect(result.hash).toBe(hash3)

     

       90
       90
       +
       

     

       91
       91
       +
       		const domainInfo = await getCustomDomainInfo(testDomain)

     

       92
       92
       +
       		expect(domainInfo).toBeTruthy()

     

       93
       93
       +
       		expect(domainInfo!.did).toBe(testDid1) // Should have changed back

     

       94
       94
       +
       		expect(domainInfo!.verified).toBe(false)

     

       95
       95
       +
       		expect(domainInfo!.id).toBe(hash3)

     

       96
       96
       +
       	})

     

       97
       97
       +
       

     

       98
       98
       +
       	test('should handle concurrent claims gracefully', async () => {

     

       99
       99
       +
       		// Both users try to claim at the same time - one should win

     

       100
       100
       +
       		const promise1 = claimCustomDomain(testDid1, testDomain, hash1)

     

       101
       101
       +
       		const promise2 = claimCustomDomain(testDid2, testDomain, hash2)

     

       102
       102
       +
       

     

       103
       103
       +
       		const [result1, result2] = await Promise.allSettled([promise1, promise2])

     

       104
       104
       +
       		

     

       105
       105
       +
       		// At least one should succeed

     

       106
       106
       +
       		const successCount = [result1, result2].filter(r => r.status === 'fulfilled').length

     

       107
       107
       +
       		expect(successCount).toBeGreaterThan(0)

     

       108
       108
       +
       		expect(successCount).toBeLessThanOrEqual(2)

     

       109
       109
       +
       

     

       110
       110
       +
       		// Final state should be consistent

     

       111
       111
       +
       		const domainInfo = await getCustomDomainInfo(testDomain)

     

       112
       112
       +
       		expect(domainInfo).toBeTruthy()

     

       113
       113
       +
       		expect(domainInfo!.verified).toBe(false)

     

       114
       114
       +
       		expect([hash1, hash2]).toContain(domainInfo!.id)

     

       115
       115
       +
       	})

     

       116
       116
       +
       })

+16 -1

src/lib/db.ts

···

       595
       595
        
       export const claimCustomDomain = async (did: string, domain: string, hash: string, rkey: string | null = null) => {

     

       596
       596
        
           const domainLower = domain.toLowerCase();

     

       597
       597
        
           try {

     

       598
       598
       -
               await db`

     

       598
       598
       +
               // Use UPSERT with ON CONFLICT to handle existing pending domains

     

       599
       599
       +
               const result = await db`

     

       599
       600
        
                   INSERT INTO custom_domains (id, domain, did, rkey, verified, created_at)

     

       600
       601
        
                   VALUES (${hash}, ${domainLower}, ${did}, ${rkey}, false, EXTRACT(EPOCH FROM NOW()))

     

       602
       602
       +
                   ON CONFLICT (domain) DO UPDATE SET

     

       603
       603
       +
                       id = EXCLUDED.id,

     

       604
       604
       +
                       did = EXCLUDED.did,

     

       605
       605
       +
                       rkey = EXCLUDED.rkey,

     

       606
       606
       +
                       verified = EXCLUDED.verified,

     

       607
       607
       +
                       created_at = EXCLUDED.created_at

     

       608
       608
       +
                   WHERE custom_domains.verified = false

     

       609
       609
       +
                   RETURNING *

     

       601
       610
        
               `;

     

       611
       611
       +
               

     

       612
       612
       +
               if (result.length === 0) {

     

       613
       613
       +
                   // No rows were updated, meaning the domain exists and is verified

     

       614
       614
       +
                   throw new Error('conflict');

     

       615
       615
       +
               }

     

       616
       616
       +
               

     

       602
       617
        
               return { success: true, hash };

     

       603
       618
        
           } catch (err) {

     

       604
       619
        
               console.error('Failed to claim custom domain', err);

+3 -3

src/routes/domain.ts

···

       241
       241
        
       					}

     

       242
       242
        
       				}

     

       243
       243
        
       

     

       244
       244
       -
       				// Check if already exists

     

       244
       244
       +
       				// Check if already exists and is verified

     

       245
       245
        
       				const existing = await getCustomDomainInfo(domainLower);

     

       246
       246
       -
       				if (existing) {

     

       247
       247
       -
       					throw new Error('Domain already claimed');

     

       246
       246
       +
       				if (existing && existing.verified) {

     

       247
       247
       +
       					throw new Error('Domain already verified and claimed');

     

       248
       248
        
       				}

     

       249
       249
        
       

     

       250
       250
        
       				// Create hash for ID