Integrate recoverable native purchases, registered rentals and explicit payment consent
This commit is contained in:
@@ -7,8 +7,9 @@ vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
|
||||
vi.mock('@/api/rpc-client', () => ({ rpcClient: { call: vi.fn(), federationListNodes: vi.fn(), payLightningInvoice: vi.fn() } }))
|
||||
vi.mock('@/composables/useAudioPlayer', () => ({ useAudioPlayer: () => ({ play: vi.fn() }) }))
|
||||
const hash = 'a'.repeat(64)
|
||||
const item = { id: 'paid-file', filename: 'bought.txt', mime_type: 'text/plain', size_bytes: 4, description: '', access: { paid: { price_sats: 5, accepted: ['lightning'] } } }
|
||||
const item = { id: 'paid-file', filename: 'bought.txt', mime_type: 'text/plain', size_bytes: 4, description: '', access: { paid: { price_sats: 5, accepted: ['lightning', 'ecash'] } } }
|
||||
const receiptKey = 'peer-file-lightning:peer.onion:paid-file'
|
||||
const cashuQuoteFixture = { state: 'confirmation_required', network: 'mainnet', mint_url: 'https://original-mint.example.test', operation_id: '12345678-1234-4234-8234-123456789abc', envelope_sha256: 'b'.repeat(64), gross_token_sats: 6, seller_net_sats: 5, wallet_debit_sats: 7, expires_at: 2_000_000_000 }
|
||||
const download = vi.fn()
|
||||
async function open() {
|
||||
const wrapper = mount(PeerFiles, { props: { peerId: 'peer.onion' }, global: { plugins: [createPinia()], stubs: { Teleport: true } } })
|
||||
@@ -23,9 +24,10 @@ beforeEach(() => {
|
||||
localStorage.clear(); vi.clearAllMocks()
|
||||
vi.mocked(rpcClient.federationListNodes).mockResolvedValue({ nodes: [] } as never)
|
||||
vi.mocked(rpcClient.call).mockImplementation(async ({ method }) => {
|
||||
if (method === 'content.purchase') return cashuQuoteFixture
|
||||
if (method === 'content.request-invoice') return { bolt11: 'ln-test', payment_hash: hash, price_sats: 5 }
|
||||
if (method === 'content.download-peer-invoice') return download()
|
||||
return { items: [] }
|
||||
return { items: [], attempts: [] }
|
||||
})
|
||||
vi.mocked(rpcClient.payLightningInvoice).mockResolvedValue({ status: 'succeeded' } as never)
|
||||
})
|
||||
@@ -34,7 +36,7 @@ describe('Lightning file delivery recovery', () => {
|
||||
vi.mocked(rpcClient.call).mockImplementation(async ({ method }) => {
|
||||
if (method === 'content.onchain-status') return { paid: true }
|
||||
if (method === 'content.download-peer-onchain') return { owned: true, mime_type: 'video/mp4', size_bytes: 200000000 }
|
||||
return { items: [] }
|
||||
return { items: [], attempts: [] }
|
||||
})
|
||||
const { wrapper, vm } = await open()
|
||||
await vm.pollOnchain('bc1test')
|
||||
@@ -47,29 +49,29 @@ describe('Lightning file delivery recovery', () => {
|
||||
})
|
||||
it('opens a cached ecash purchase without transferring base64 into the UI', async () => {
|
||||
vi.mocked(rpcClient.call).mockImplementation(async ({ method }) => {
|
||||
if (method === 'content.download-peer-paid') return { owned: true, mime_type: 'video/mp4', size_bytes: 200000000 }
|
||||
return { items: [] }
|
||||
if (method === 'content.purchase') return { state: 'delivered', owned: true, owned_content_id: item.id, mime_type: 'video/mp4', size_bytes: 200000000 }
|
||||
return { items: [], attempts: [] }
|
||||
})
|
||||
const { wrapper, vm } = await open()
|
||||
vm.ecashPlan = { cashu: 10, fedimint: 0, ark: 0, total: 10, chosen: 'cashu' }
|
||||
await vm.confirmEcashPay()
|
||||
expect(vm.viewerUrl).toBe('/api/peer-content/peer.onion/paid-file')
|
||||
expect(vm.viewerMime).toBe('video/mp4')
|
||||
expect(vi.mocked(rpcClient.call).mock.calls.find(([v]) => v.method === 'content.download-peer-paid')![0].params).toMatchObject({ cache_only: true, method: 'cashu' })
|
||||
expect(vi.mocked(rpcClient.call).mock.calls.find(([v]) => v.method === 'content.download-peer-paid')![0].maxRetries).toBe(1)
|
||||
expect(vi.mocked(rpcClient.call).mock.calls.find(([v]) => v.method === 'content.purchase')![0].params).toMatchObject({ content_id: item.id, max_wallet_debit: Number.MAX_SAFE_INTEGER })
|
||||
expect(vi.mocked(rpcClient.call).mock.calls.find(([v]) => v.method === 'content.purchase')![0].maxRetries).toBe(1)
|
||||
wrapper.unmount()
|
||||
})
|
||||
it('does not issue a duplicate ecash purchase while delivery is pending', async () => {
|
||||
let finish!: (value: unknown) => void
|
||||
vi.mocked(rpcClient.call).mockImplementation(async ({ method }) => {
|
||||
if (method === 'content.download-peer-paid') return await new Promise(resolve => { finish = resolve })
|
||||
return { items: [] }
|
||||
if (method === 'content.purchase') return await new Promise(resolve => { finish = resolve })
|
||||
return { items: [], attempts: [] }
|
||||
})
|
||||
const { wrapper, vm } = await open()
|
||||
vm.ecashPlan = { cashu: 10, fedimint: 0, ark: 0, total: 10, chosen: 'cashu' }
|
||||
const first = vm.confirmEcashPay()
|
||||
await vm.confirmEcashPay()
|
||||
expect(vi.mocked(rpcClient.call).mock.calls.filter(([v]) => v.method === 'content.download-peer-paid')).toHaveLength(1)
|
||||
expect(vi.mocked(rpcClient.call).mock.calls.filter(([v]) => v.method === 'content.purchase')).toHaveLength(1)
|
||||
finish({ error: 'Delivery needs recovery; do not pay again' })
|
||||
await first
|
||||
expect(vm.purchaseError).toContain('do not pay again')
|
||||
@@ -214,9 +216,11 @@ describe('Lightning file delivery recovery', () => {
|
||||
it('does not pay when an invoice arrives after closing and reopening the same file', async () => {
|
||||
let reply!: (value: unknown) => void
|
||||
vi.mocked(rpcClient.call).mockImplementation(async ({ method }) => method === 'content.request-invoice'
|
||||
? await new Promise(resolve => { reply = resolve }) : { items: [] })
|
||||
? await new Promise(resolve => { reply = resolve }) : { items: [], attempts: [] })
|
||||
const { wrapper, vm } = await open()
|
||||
const pending = vm.payWithLightning()
|
||||
await flushPromises()
|
||||
expect(typeof reply).toBe('function')
|
||||
vm.closePayModal(); vm.openPayModal(item)
|
||||
reply({ bolt11: 'ln-test', payment_hash: hash, price_sats: 5 })
|
||||
await pending
|
||||
@@ -229,9 +233,11 @@ it('does not pay when an invoice arrives after closing and reopening the same fi
|
||||
it('retains a late invoice for its original file without changing another file modal', async () => {
|
||||
let reply!: (value: unknown) => void
|
||||
vi.mocked(rpcClient.call).mockImplementation(async ({ method }) => method === 'content.request-invoice'
|
||||
? await new Promise(resolve => { reply = resolve }) : { items: [] })
|
||||
? await new Promise(resolve => { reply = resolve }) : { items: [], attempts: [] })
|
||||
const { wrapper, vm } = await open()
|
||||
const pending = vm.payWithInvoice()
|
||||
await flushPromises()
|
||||
expect(typeof reply).toBe('function')
|
||||
await vm.payWithInvoice()
|
||||
expect(vi.mocked(rpcClient.call).mock.calls.filter(([v]) => v.method === 'content.request-invoice')).toHaveLength(1)
|
||||
vm.closePayModal(); vm.openPayModal({ ...item, id: 'second-file' })
|
||||
@@ -247,11 +253,15 @@ it('retains a late invoice for its original file without changing another file m
|
||||
it('keeps a new file balance preparation busy when an older preparation finishes', async () => {
|
||||
const replies: ((value: unknown) => void)[] = []
|
||||
vi.mocked(rpcClient.call).mockImplementation(async ({ method }) => method === 'wallet.ecash-balance'
|
||||
? await new Promise(resolve => { replies.push(resolve) }) : { items: [] })
|
||||
? await new Promise(resolve => { replies.push(resolve) }) : { items: [], attempts: [] })
|
||||
const { wrapper, vm } = await open()
|
||||
const first = vm.prepareEcashPay()
|
||||
await flushPromises()
|
||||
expect(replies).toHaveLength(1)
|
||||
vm.closePayModal(); vm.openPayModal({ ...item, id: 'second-file' })
|
||||
const second = vm.prepareEcashPay()
|
||||
await flushPromises()
|
||||
expect(replies).toHaveLength(2)
|
||||
replies[0]!({ cashu_sats: 100 })
|
||||
await first
|
||||
expect(vm.ecashPreparing).toBe(true)
|
||||
@@ -267,7 +277,7 @@ it('cannot deliver a late paid invoice into another file modal', async () => {
|
||||
vi.mocked(rpcClient.call).mockImplementation(async ({ method }) => {
|
||||
if (method === 'content.invoice-status') return { paid: true }
|
||||
if (method === 'content.download-peer-invoice') return await new Promise(resolve => { reply = resolve })
|
||||
return { items: [] }
|
||||
return { items: [], attempts: [] }
|
||||
})
|
||||
const { wrapper, vm } = await open()
|
||||
const invoice = { bolt11: 'ln-test', payment_hash: hash, price_sats: 5 }
|
||||
@@ -304,9 +314,11 @@ it('persists a dispatched Lightning result after closing without changing anothe
|
||||
it('does not dispatch Lightning when its invoice arrives after component unmount', async () => {
|
||||
let reply!: (value: unknown) => void
|
||||
vi.mocked(rpcClient.call).mockImplementation(async ({ method }) => method === 'content.request-invoice'
|
||||
? await new Promise(resolve => { reply = resolve }) : { items: [] })
|
||||
? await new Promise(resolve => { reply = resolve }) : { items: [], attempts: [] })
|
||||
const { wrapper, vm } = await open()
|
||||
const pending = vm.payWithLightning()
|
||||
await flushPromises()
|
||||
expect(typeof reply).toBe('function')
|
||||
wrapper.unmount()
|
||||
reply({ bolt11: 'ln-test', payment_hash: hash, price_sats: 5 })
|
||||
await pending
|
||||
@@ -341,7 +353,7 @@ it('retains already dispatched Lightning evidence after unmount without opening
|
||||
it('allows the exact 546-sat boundary and never dispatches a changed seller amount', async () => {
|
||||
vi.mocked(rpcClient.call).mockImplementation(async ({ method }) => {
|
||||
if (method === 'content.request-onchain') return { address: 'bc1test', amount_sats: 547 }
|
||||
return { items: [] }
|
||||
return { items: [], attempts: [] }
|
||||
})
|
||||
const { wrapper, vm } = await open()
|
||||
vm.openPayModal({ ...item, access: { paid: { price_sats: 546, accepted: ['onchain', 'lightning', 'ecash'] } } })
|
||||
@@ -404,3 +416,151 @@ it('retains already dispatched Lightning evidence after unmount without opening
|
||||
})
|
||||
|
||||
})
|
||||
|
||||
|
||||
describe('Seller-authoritative external invoice lifecycle', () => {
|
||||
it('unlocks alternate methods only after the seller confirms the saved external invoice canceled and unpaid', async () => {
|
||||
localStorage.setItem(receiptKey, JSON.stringify({ bolt11: 'ln-test', payment_hash: hash, price_sats: 5, state: 'pending' }))
|
||||
vi.mocked(rpcClient.call).mockImplementation(async ({ method }) => {
|
||||
if (method === 'lnd.paymentstatus') throw new Error('Unknown external payment')
|
||||
if (method === 'content.invoice-status') return { paid: false, state: 'canceled', can_switch_method: true }
|
||||
return { items: [], attempts: [] }
|
||||
})
|
||||
const { wrapper, vm } = await open()
|
||||
await vm.payWithLightning()
|
||||
expect(vm.hasBlockingLightningReceipt).toBe(false)
|
||||
expect(JSON.parse(localStorage.getItem(receiptKey)!)).toMatchObject({ payment_hash: hash, state: 'failed' })
|
||||
expect(vm.lnError).toContain('seller confirmed')
|
||||
expect(rpcClient.payLightningInvoice).not.toHaveBeenCalled()
|
||||
expect(vi.mocked(rpcClient.call).mock.calls.some(([call]) => ['content.request-invoice', 'content.download-peer-invoice'].includes(call.method))).toBe(false)
|
||||
wrapper.unmount()
|
||||
})
|
||||
it.each([
|
||||
{ paid: false },
|
||||
{ paid: false, state: 'open', expires_at: 1, can_switch_method: false },
|
||||
{ paid: false, state: 'unknown', can_switch_method: false },
|
||||
{ paid: false, state: 'canceled' },
|
||||
{ paid: false, state: 'accepted', can_switch_method: true },
|
||||
])('retains the saved attempt when seller status does not prove terminal cancellation: %j', async response => {
|
||||
localStorage.setItem(receiptKey, JSON.stringify({ bolt11: 'ln-test', payment_hash: hash, price_sats: 5, state: 'pending' }))
|
||||
vi.mocked(rpcClient.call).mockImplementation(async ({ method }) => {
|
||||
if (method === 'lnd.paymentstatus') throw new Error('Unknown external payment')
|
||||
if (method === 'content.invoice-status') return response
|
||||
if (method === 'content.download-peer-invoice') return { error: 'Payment is still pending' }
|
||||
return { items: [], attempts: [] }
|
||||
})
|
||||
const { wrapper, vm } = await open()
|
||||
await vm.payWithLightning()
|
||||
expect(vm.hasBlockingLightningReceipt).toBe(true)
|
||||
expect(JSON.parse(localStorage.getItem(receiptKey)!)).toMatchObject({ payment_hash: hash, state: 'pending' })
|
||||
expect(rpcClient.payLightningInvoice).not.toHaveBeenCalled()
|
||||
expect(vi.mocked(rpcClient.call).mock.calls.some(([call]) => call.method === 'content.request-invoice')).toBe(false)
|
||||
wrapper.unmount()
|
||||
})
|
||||
})
|
||||
|
||||
describe('Durable node Cashu purchases', () => {
|
||||
it('shows the exact quoted debit and confirms its immutable terms without the legacy send RPC', async () => {
|
||||
let purchaseCalls = 0
|
||||
vi.mocked(rpcClient.call).mockImplementation(async ({method}) => {
|
||||
if (method === 'content.purchase') return ++purchaseCalls === 1 ? cashuQuoteFixture : {state:'delivered',owned:true,owned_content_id:item.id,mime_type:'text/plain'}
|
||||
return {items:[],attempts:[]}
|
||||
})
|
||||
const {wrapper,vm}=await open()
|
||||
await vm.prepareEcashPay()
|
||||
expect(vm.cashuQuote.wallet_debit_sats).toBe(7)
|
||||
expect(wrapper.text()).toContain('fees/rounding: 2 sats')
|
||||
expect(purchaseCalls).toBe(1)
|
||||
await vm.confirmEcashPay()
|
||||
const calls=vi.mocked(rpcClient.call).mock.calls.map(([call])=>call)
|
||||
const requests=calls.filter(call=>call.method==='content.purchase')
|
||||
expect(requests[0]?.params).not.toHaveProperty('consent')
|
||||
expect(requests[1]?.params).toMatchObject({max_wallet_debit:7,consent:{operation_id:cashuQuoteFixture.operation_id,envelope_sha256:cashuQuoteFixture.envelope_sha256,wallet_debit_sats:7}})
|
||||
expect(calls.some(call=>call.method==='content.download-peer-paid')).toBe(false)
|
||||
expect(vm.viewerUrl).toContain('/paid-file')
|
||||
wrapper.unmount()
|
||||
})
|
||||
it('recovers after a lost submit reply and remount without confirming another payment', async () => {
|
||||
let count=0
|
||||
vi.mocked(rpcClient.call).mockImplementation(async ({method})=>{
|
||||
if (method==='content.purchase') {
|
||||
count++
|
||||
if(count===1)return cashuQuoteFixture
|
||||
if(count===2)throw new Error('Connection lost; original purchase saved')
|
||||
return {state:'delivered',owned:true,owned_content_id:item.id,mime_type:'text/plain'}
|
||||
}
|
||||
return {items:[],attempts:[]}
|
||||
})
|
||||
const first=await open();await first.vm.prepareEcashPay();await first.vm.confirmEcashPay();first.wrapper.unmount()
|
||||
const next=await open();expect(next.vm.hasBlockingCashuPurchase).toBe(true)
|
||||
await next.vm.payWithLightning();expect(rpcClient.payLightningInvoice).not.toHaveBeenCalled()
|
||||
await next.vm.prepareEcashPay()
|
||||
const requests=vi.mocked(rpcClient.call).mock.calls.filter(([call])=>call.method==='content.purchase')
|
||||
expect(requests).toHaveLength(3)
|
||||
expect(requests[2]?.[0].params).not.toHaveProperty('consent')
|
||||
expect(next.vm.viewerUrl).toContain('/paid-file')
|
||||
next.wrapper.unmount()
|
||||
})
|
||||
it('keeps the original operation until seller cancellation acknowledgement, then permits a new quote', async () => {
|
||||
let canceled=false, cancelCalls=0
|
||||
vi.mocked(rpcClient.call).mockImplementation(async ({method})=>{
|
||||
if(method==='content.purchase')return canceled?{...cashuQuoteFixture,operation_id:'87654321-1234-4234-8234-123456789abc'}:cashuQuoteFixture
|
||||
if(method==='content.cancel-purchase'){
|
||||
if(++cancelCalls===1)throw new Error('Cancellation reply lost')
|
||||
canceled=true;return {state:'cancelled_unspent',operation_id:cashuQuoteFixture.operation_id}
|
||||
}
|
||||
return {items:[],attempts:[]}
|
||||
})
|
||||
const {wrapper,vm}=await open();await vm.prepareEcashPay();await vm.cancelCashuPurchase()
|
||||
expect(vm.hasBlockingCashuPurchase).toBe(true)
|
||||
await vm.payWithLightning();expect(rpcClient.payLightningInvoice).not.toHaveBeenCalled()
|
||||
await vm.cancelCashuPurchase();expect(vm.hasBlockingCashuPurchase).toBe(false)
|
||||
await vm.prepareEcashPay();expect(vm.cashuQuote.operation_id).not.toBe(cashuQuoteFixture.operation_id)
|
||||
wrapper.unmount()
|
||||
})
|
||||
it('finds a node-owned pending purchase after browser state loss before another rail can dispatch', async () => {
|
||||
vi.mocked(rpcClient.call).mockImplementation(async ({method})=>{
|
||||
if(method==='content.payment-status')return {attempts:[{operation_id:cashuQuoteFixture.operation_id,state:'token_prepared_settlement_unconfirmed'}]}
|
||||
if(method==='content.purchase')return {state:'delivered',owned:true,owned_content_id:item.id,mime_type:'text/plain'}
|
||||
return {items:[],attempts:[]}
|
||||
})
|
||||
const {wrapper,vm}=await open();await vm.payWithLightning()
|
||||
expect(rpcClient.payLightningInvoice).not.toHaveBeenCalled()
|
||||
expect(vi.mocked(rpcClient.call).mock.calls.some(([call])=>call.method==='content.request-invoice')).toBe(false)
|
||||
await vm.prepareEcashPay();expect(vm.viewerUrl).toContain('/paid-file')
|
||||
wrapper.unmount()
|
||||
})
|
||||
})
|
||||
|
||||
describe('Malformed browser Cashu marker recovery', () => {
|
||||
const marker='peer-file-cashu:peer.onion:paid-file'
|
||||
it('queries node-owned state without consent, archives the malformed marker and restores the authoritative quote', async () => {
|
||||
localStorage.setItem(marker,'{original broken marker')
|
||||
const {wrapper,vm}=await open()
|
||||
expect(vm.cashuRecoveryError).toBe(true)
|
||||
await vm.prepareEcashPay()
|
||||
expect(localStorage.getItem(`${marker}:unreadable`)).toBe('{original broken marker')
|
||||
expect(JSON.parse(localStorage.getItem(marker)!)).toMatchObject({quote:cashuQuoteFixture,dispatched:false})
|
||||
expect(vm.cashuRecoveryError).toBe(false)
|
||||
expect(vm.hasBlockingCashuPurchase).toBe(true)
|
||||
const calls=vi.mocked(rpcClient.call).mock.calls.filter(([call])=>call.method==='content.purchase')
|
||||
expect(calls).toHaveLength(1)
|
||||
expect(calls[0]?.[0].params).not.toHaveProperty('consent')
|
||||
expect(rpcClient.payLightningInvoice).not.toHaveBeenCalled()
|
||||
wrapper.unmount()
|
||||
})
|
||||
it('keeps original malformed data and all replacement methods blocked when node recovery is unavailable', async () => {
|
||||
localStorage.setItem(marker,'{original broken marker')
|
||||
vi.mocked(rpcClient.call).mockImplementation(async ({method})=>{
|
||||
if(method==='content.purchase')throw new Error('Node purchase journal is unavailable')
|
||||
return {items:[],attempts:[]}
|
||||
})
|
||||
const {wrapper,vm}=await open();await vm.prepareEcashPay();await vm.payWithLightning()
|
||||
expect(localStorage.getItem(marker)).toBe('{original broken marker')
|
||||
expect(localStorage.getItem(`${marker}:unreadable`)).toBeNull()
|
||||
expect(vm.hasBlockingCashuPurchase).toBe(true)
|
||||
expect(vm.purchaseError).toContain('journal is unavailable')
|
||||
expect(rpcClient.payLightningInvoice).not.toHaveBeenCalled()
|
||||
wrapper.unmount()
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user