Use raw WebSocket for reliability, support hex pubkeys

- Replace nostr-tools SimplePool with direct WebSocket (ws)
- Use did:nostr:<hex> format for trusted keys
- Read privkey from git config or CLI args
- Tested end-to-end: daemon receives and verifies 30618 events

Author: melvincarvalho

package-lock.json

@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "nostr-tools": "^2.19.4",
-    "websocket-polyfill": "^0.0.3"
+    "ws": "^8.18.0"
   },
   "engines": {
     "node": ">=18.0.0"

package.json

@@ -1,44 +1,79 @@
-import 'websocket-polyfill'
-import { SimplePool, nip19 } from 'nostr-tools'
+import WebSocket from 'ws'
 import { loadConfig } from './config.js'
 import { verifyEvent, verifyAnchor } from './verify.js'
 import { gitSync, getCurrentCommit, runPostSync } from './git.js'
 
 export async function startDaemon(configPath) {
   const config = loadConfig(configPath)
-  const pool = new SimplePool()
-
   const repoIds = Object.keys(config.repos)
 
   console.log('[daemon] Starting nostr-git-sync')
   console.log(`[daemon] Watching ${repoIds.length} repo(s): ${repoIds.join(', ')}`)
   console.log(`[daemon] Relays: ${config.relays.join(', ')}`)
 
-  // Subscribe to 30618 events for our repos
-  const sub = pool.subscribeMany(
-    config.relays,
-    [{ kinds: [30618], '#d': repoIds }],
-    {
-      onevent: async (event) => {
-        await handleEvent(event, config, nip19)
-      },
-      oneose: () => {
-        console.log('[daemon] Caught up with relay history')
-      }
-    }
-  )
+  const sockets = []
 
-  console.log('[daemon] Subscribed, waiting for events...')
+  // Connect to each relay
+  config.relays.forEach((url, index) => {
+    connectToRelay(url, index, repoIds, config, sockets)
+  })
 
   // Keep alive
   process.on('SIGINT', () => {
     console.log('\n[daemon] Shutting down...')
-    sub.close()
+    sockets.forEach(ws => ws.close())
     process.exit(0)
   })
 }
 
-async function handleEvent(event, config, nip19) {
+function connectToRelay(url, index, repoIds, config, sockets) {
+  const ws = new WebSocket(url)
+
+  ws.on('open', () => {
+    console.log(`[daemon] Connected to ${url}`)
+    sockets.push(ws)
+
+    // Subscribe to 30618 events for our repos
+    const subscription = JSON.stringify([
+      'REQ',
+      `git-sync-${index}`,
+      { kinds: [30618], '#d': repoIds }
+    ])
+    ws.send(subscription)
+  })
+
+  ws.on('message', async (data) => {
+    try {
+      const message = JSON.parse(data.toString())
+
+      if (message[0] === 'EVENT' && message[2]) {
+        await handleEvent(message[2], config)
+      } else if (message[0] === 'EOSE') {
+        console.log(`[daemon] Caught up with ${url}`)
+      } else if (message[0] === 'NOTICE') {
+        console.log(`[notice] ${url}: ${message[1]}`)
+      }
+    } catch (err) {
+      console.error('[daemon] Error parsing message:', err.message)
+    }
+  })
+
+  ws.on('error', (err) => {
+    console.log(`[daemon] Error from ${url}: ${err.message}`)
+  })
+
+  ws.on('close', () => {
+    console.log(`[daemon] Disconnected from ${url}, reconnecting in 10s...`)
+    const idx = sockets.indexOf(ws)
+    if (idx > -1) sockets.splice(idx, 1)
+
+    setTimeout(() => {
+      connectToRelay(url, index, repoIds, config, sockets)
+    }, 10000)
+  })
+}
+
+async function handleEvent(event, config) {
   // Extract repo ID from d tag
   const dTag = event.tags.find(t => t[0] === 'd')
   if (!dTag) return
@@ -48,7 +83,7 @@ async function handleEvent(event, config, nip19) {
   if (!repo) return
 
   console.log(`\n[event] Received 30618 for ${repoId}`)
-  console.log(`[event] From: ${nip19.npubEncode(event.pubkey).slice(0, 20)}...`)
+  console.log(`[event] From: ${event.pubkey.slice(0, 16)}...`)
 
   // Find branch ref
   const refTag = event.tags.find(t => t[0].startsWith('refs/heads/'))
@@ -69,7 +104,7 @@ async function handleEvent(event, config, nip19) {
   }
 
   // Verify pubkey is trusted
-  const verification = verifyEvent(event, repo, nip19)
+  const verification = verifyEvent(event, repo)
   if (!verification.ok) {
     console.log(`[event] ✗ Rejected: ${verification.reason}`)
     return
@@ -78,8 +113,7 @@ async function handleEvent(event, config, nip19) {
 
   // Optional: verify Blocktrails anchor
   if (repo.requireAnchor) {
-    const npub = nip19.npubEncode(event.pubkey)
-    const anchor = await verifyAnchor(npub, commit)
+    const anchor = await verifyAnchor(event.pubkey, commit)
     if (!anchor.ok) {
       console.log(`[event] ✗ Anchor required but not found: ${anchor.reason}`)
       return