**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
42 lines
1.1 KiB
TypeScript
42 lines
1.1 KiB
TypeScript
import type { Event, Filter } from 'nostr-tools'
|
|
import { SimplePool } from 'nostr-tools'
|
|
import { getPrimaryRelaySync } from './config'
|
|
import type { SimplePoolWithSub } from '@/types/nostr-tools-extended'
|
|
|
|
/**
|
|
* Subscribe to events with timeout
|
|
*/
|
|
export function subscribeWithTimeout<T>(
|
|
pool: SimplePool,
|
|
filters: Filter[],
|
|
parser: (event: Event) => T | null,
|
|
timeout: number = 5000
|
|
): Promise<T | null> {
|
|
return new Promise((resolve) => {
|
|
const resolved = { value: false }
|
|
const relayUrl = getPrimaryRelaySync()
|
|
const sub = (pool as SimplePoolWithSub).sub([relayUrl], filters)
|
|
let timeoutId: NodeJS.Timeout | null = null
|
|
|
|
const cleanup = () => {
|
|
if (timeoutId) {
|
|
clearTimeout(timeoutId)
|
|
}
|
|
sub.unsub()
|
|
}
|
|
|
|
const resolveOnce = (value: T | null) => {
|
|
if (resolved.value) {
|
|
return
|
|
}
|
|
resolved.value = true
|
|
cleanup()
|
|
resolve(value)
|
|
}
|
|
|
|
sub.on('event', (event: Event) => resolveOnce(parser(event)))
|
|
sub.on('eose', () => resolveOnce(null))
|
|
timeoutId = setTimeout(() => resolveOnce(null), timeout)
|
|
})
|
|
}
|