Nicolas Cantu
42e3e7e692
**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
54 lines
1.9 KiB
TypeScript
54 lines
1.9 KiB
TypeScript
import { Event, EventTemplate, finalizeEvent } from 'nostr-tools'
|
|
import { hexToBytes } from 'nostr-tools/utils'
|
|
import type { ContentDeliveryTracking } from './platformTrackingTypes'
|
|
|
|
const TRACKING_KIND = 30078 // Custom kind for platform tracking
|
|
|
|
export function buildTrackingTags(tracking: ContentDeliveryTracking, platformPubkey: string): string[][] {
|
|
return [
|
|
['p', platformPubkey],
|
|
['article', tracking.articleId],
|
|
['author', tracking.articlePubkey],
|
|
['recipient', tracking.recipientPubkey],
|
|
['message', tracking.messageEventId],
|
|
['amount', tracking.amount.toString()],
|
|
...(tracking.authorAmount ? [['author_amount', tracking.authorAmount.toString()]] : []),
|
|
...(tracking.platformCommission ? [['platform_commission', tracking.platformCommission.toString()]] : []),
|
|
['verified', tracking.verified ? 'true' : 'false'],
|
|
['timestamp', tracking.timestamp.toString()],
|
|
...(tracking.zapReceiptId ? [['zap_receipt', tracking.zapReceiptId]] : []),
|
|
]
|
|
}
|
|
|
|
export function buildTrackingEvent(
|
|
tracking: ContentDeliveryTracking,
|
|
_authorPubkey: string,
|
|
authorPrivateKey: string,
|
|
platformPubkey: string
|
|
): Event {
|
|
const eventTemplate: EventTemplate = {
|
|
kind: TRACKING_KIND,
|
|
created_at: Math.floor(Date.now() / 1000),
|
|
tags: buildTrackingTags(tracking, platformPubkey),
|
|
content: JSON.stringify({
|
|
articleId: tracking.articleId,
|
|
articlePubkey: tracking.articlePubkey,
|
|
recipientPubkey: tracking.recipientPubkey,
|
|
messageEventId: tracking.messageEventId,
|
|
amount: tracking.amount,
|
|
authorAmount: tracking.authorAmount,
|
|
platformCommission: tracking.platformCommission,
|
|
verified: tracking.verified,
|
|
timestamp: tracking.timestamp,
|
|
zapReceiptId: tracking.zapReceiptId,
|
|
}),
|
|
}
|
|
|
|
const secretKey = hexToBytes(authorPrivateKey)
|
|
return finalizeEvent(eventTemplate, secretKey)
|
|
}
|
|
|
|
export function getTrackingKind(): number {
|
|
return TRACKING_KIND
|
|
}
|