aljaz/boris
1
1
Fork 0
mirror of https://github.com/dergigi/boris.git synced 2026-01-31 12:44:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(bookmarks): try NIP-44 then NIP-04 for manual decryption; cache decrypted hidden tags for display/debug

Browse Source
This commit is contained in:
Gigi
2025-10-02 21:30:12 +02:00
parent 18d936e222
commit 51f009a489
1 changed files with 26 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/services/bookmarkService.ts
View File

@@ -246,65 +246,44 @@ export const fetchBookmarks = async (
}
// For events that have content but aren't recognized as supporting hidden tags (like kind 30001)
else if (evt.content && evt.content.length > 0 && signerCandidate) {
console.log('🔓 Attempting manual decryption for event with unrecognized kind...')
console.log('📄 Content to decrypt:', evt.content.slice(0, 100) + '...')
// Try NIP-44 first (common for bookmark lists), then fall back to NIP-04
let decryptedContent: string | undefined
try {
console.log('🔓 Attempting manual decryption for event with unrecognized kind...')
console.log('📄 Content to decrypt:', evt.content.slice(0, 100) + '...')
// Try direct decryption using the signer's nip04 capabilities
console.log('🔐 Calling nip04.decrypt with:', {
pubkey: evt.pubkey,
contentLength: evt.content.length,
contentPrefix: evt.content.slice(0, 20) + '...',
signerType: typeof signerCandidate
})
let decryptedContent
try {
decryptedContent = await (signerCandidate as any).nip04?.decrypt(evt.pubkey, evt.content)
console.log('✅ Successfully decrypted content manually:', decryptedContent.slice(0, 100) + '...')
} catch (decryptError) {
console.warn('❌ Browser extension decryption failed:', decryptError)
// Try alternative content formatting (maybe it needs to be a string)
try {
console.log('🔄 Trying alternative content format...')
const contentStr = String(evt.content)
decryptedContent = await (signerCandidate as any).nip04?.decrypt(evt.pubkey, contentStr)
console.log('✅ Successfully decrypted with string format:', decryptedContent.slice(0, 100) + '...')
} catch (secondError) {
console.warn('❌ Second decryption attempt also failed:', secondError)
// Check if the error contains the actual response from the extension
if (decryptError?.message?.includes('result:')) {
const resultMatch = decryptError.message.match(/result:\s*(\{.*\})/)
if (resultMatch) {
const extensionResult = JSON.parse(resultMatch[1])
console.warn('❌ Extension returned:', extensionResult)
}
}
throw decryptError
}
if ((signerCandidate as any).nip44?.decrypt) {
console.log('🧪 Trying NIP-44 decryption...')
decryptedContent = await (signerCandidate as any).nip44.decrypt(evt.pubkey, evt.content)
}
} catch (nip44Err) {
console.warn('❌ NIP-44 manual decryption failed, will try NIP-04:', nip44Err)
}
if (!decryptedContent) {
try {
if ((signerCandidate as any).nip04?.decrypt) {
console.log('🧪 Trying NIP-04 decryption...')
decryptedContent = await (signerCandidate as any).nip04.decrypt(evt.pubkey, evt.content)
}
} catch (nip04Err) {
console.warn('❌ NIP-04 manual decryption failed:', nip04Err)
}
}
if (decryptedContent) {
console.log('✅ Successfully decrypted content manually')
// Parse the decrypted content as JSON (should be array of tags)
try {
const hiddenTags = JSON.parse(decryptedContent)
console.log('📋 Decrypted hidden tags:', hiddenTags.length, 'tags')
// Set the cached value on the event so getHiddenBookmarks can find it
// Cache so applesauce can read hidden tags downstream
Reflect.set(evt, BookmarkHiddenSymbol, hiddenTags)
Reflect.set(evt, 'EncryptedContentSymbol', decryptedContent)
if (!latestContent) { latestContent = decryptedContent }
} catch (parseError) {
console.warn('❌ Failed to parse decrypted content as JSON:', parseError)
}
} catch (error) {
console.warn('❌ Failed manual decryption:', error)
console.warn('❌ Error details:', {
message: error?.message,
stack: error?.stack,
name: error?.name
})
}
}