**Motivations:** - Keep dependencies up to date for security and features - Automate dependency updates in deployment script - Fix compatibility issues with major version updates (React 19, Next.js 16, nostr-tools 2.x) **Root causes:** - Dependencies were outdated - Deployment script did not update dependencies before deploying - Major version updates introduced breaking API changes **Correctifs:** - Updated all dependencies to latest versions using npm-check-updates - Modified deploy.sh to run npm-check-updates before installing dependencies - Fixed nostr-tools 2.x API changes (generatePrivateKey -> generateSecretKey, signEvent -> finalizeEvent, verifySignature -> verifyEvent) - Fixed React 19 ref types to accept null - Fixed JSX namespace issues (JSX.Element -> React.ReactElement) - Added proper types for event callbacks - Fixed SimplePool.sub typing issues with type assertions **Evolutions:** - Deployment script now automatically updates dependencies to latest versions before deploying - All dependencies updated to latest versions (Next.js 14->16, React 18->19, nostr-tools 1->2, etc.) **Pages affectées:** - package.json - deploy.sh - lib/keyManagement.ts - lib/nostr.ts - lib/nostrRemoteSigner.ts - lib/zapVerification.ts - lib/platformTrackingEvents.ts - lib/sponsoringTracking.ts - lib/articlePublisherHelpersVerification.ts - lib/contentDeliveryVerification.ts - lib/paymentPollingZapReceipt.ts - lib/nostrPrivateMessages.ts - lib/nostrSubscription.ts - lib/nostrZapVerification.ts - lib/markdownRenderer.tsx - components/AuthorFilter.tsx - components/AuthorFilterButton.tsx - components/UserArticlesList.tsx - types/nostr-tools-extended.ts
87 lines
2.2 KiB
TypeScript
87 lines
2.2 KiB
TypeScript
import type { Event } from 'nostr-tools'
|
|
import { SimplePool } from 'nostr-tools'
|
|
import type { SimplePoolWithSub } from '@/types/nostr-tools-extended'
|
|
import { getPrimaryRelaySync } from './config'
|
|
|
|
function createZapFilters(targetPubkey: string, targetEventId: string, userPubkey: string) {
|
|
return [
|
|
{
|
|
kinds: [9735], // Zap receipt
|
|
'#p': [targetPubkey],
|
|
'#e': [targetEventId],
|
|
authors: [userPubkey], // Filter by the payer's pubkey
|
|
},
|
|
]
|
|
}
|
|
|
|
async function isValidZapReceipt(
|
|
event: Event,
|
|
targetEventId: string,
|
|
targetPubkey: string,
|
|
userPubkey: string,
|
|
amount: number
|
|
): Promise<boolean> {
|
|
// Import verification service dynamically to avoid circular dependencies
|
|
const { zapVerificationService } = await import('./zapVerification')
|
|
|
|
return zapVerificationService.verifyZapReceiptForArticle(event, targetEventId, targetPubkey, userPubkey, amount)
|
|
}
|
|
|
|
/**
|
|
* Check if user has paid for an article by looking for zap receipts
|
|
*/
|
|
function handleZapReceiptEvent(
|
|
event: Event,
|
|
targetEventId: string,
|
|
targetPubkey: string,
|
|
userPubkey: string,
|
|
amount: number,
|
|
finalize: (value: boolean) => void,
|
|
resolved: { current: boolean }
|
|
): void {
|
|
if (resolved.current) {
|
|
return
|
|
}
|
|
void isValidZapReceipt(event, targetEventId, targetPubkey, userPubkey, amount).then((isValid) => {
|
|
if (isValid) {
|
|
finalize(true)
|
|
}
|
|
})
|
|
}
|
|
|
|
export function checkZapReceipt(
|
|
pool: SimplePool,
|
|
targetPubkey: string,
|
|
targetEventId: string,
|
|
amount: number,
|
|
userPubkey: string
|
|
): Promise<boolean> {
|
|
if (!pool) {
|
|
return Promise.resolve(false)
|
|
}
|
|
|
|
return new Promise((resolve) => {
|
|
let resolved = false
|
|
const relayUrl = getPrimaryRelaySync()
|
|
const sub = (pool as SimplePoolWithSub).sub([relayUrl], createZapFilters(targetPubkey, targetEventId, userPubkey))
|
|
|
|
const finalize = (value: boolean) => {
|
|
if (resolved) {
|
|
return
|
|
}
|
|
resolved = true
|
|
sub.unsub()
|
|
resolve(value)
|
|
}
|
|
|
|
const resolvedRef = { current: resolved }
|
|
sub.on('event', (event: Event) => {
|
|
handleZapReceiptEvent(event, targetEventId, targetPubkey, userPubkey, amount, finalize, resolvedRef)
|
|
})
|
|
|
|
const end = () => finalize(false)
|
|
sub.on('eose', end)
|
|
setTimeout(end, 3000)
|
|
})
|
|
}
|