nothumanallowed 13.5.199 → 14.0.0

package/src/server/ws.mjs

@@ -0,0 +1,44 @@
+/**
+ * WebSocket handler — broadcasts daemon events to the React UI.
+ * Uses the `ws` package already bundled in nha-cli.
+ */
+
+import { createRequire } from 'module';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+// Resolve `ws` from nha-cli's node_modules
+const require = createRequire(import.meta.url);
+// __dirname = packages/nha-cli/src/server/ → ../../ = packages/nha-cli/
+const { WebSocketServer } = require(
+  path.resolve(__dirname, '../../node_modules/ws/index.js')
+);
+
+let wss = null;
+
+export function setupWebSocket(server) {
+  wss = new WebSocketServer({ server, path: '/api' });
+
+  wss.on('connection', (ws) => {
+    ws.send(JSON.stringify({ type: 'connected', ts: Date.now() }));
+
+    ws.on('message', (data) => {
+      try {
+        const msg = JSON.parse(data.toString());
+        // Echo back for now — route-specific handlers can call broadcast()
+        broadcast({ type: 'echo', payload: msg });
+      } catch { /* ignore malformed */ }
+    });
+
+    ws.on('error', () => {});
+  });
+}
+
+export function broadcast(msg) {
+  if (!wss) return;
+  const data = JSON.stringify(msg);
+  for (const client of wss.clients) {
+    if (client.readyState === 1) client.send(data);
+  }
+}

package/src/services/email-db.mjs

@@ -424,18 +424,31 @@ export function deleteLabel(id) {
   getDb().prepare('DELETE FROM email_labels WHERE id = ? AND is_system = 0').run(id);
 }
 
-export function updateLabelCounts(db, labelId) {
-  db.prepare(`
-    UPDATE email_labels SET
-      total_count = (SELECT COUNT(*) FROM email_message_labels eml
-        JOIN email_messages m ON m.id = eml.message_id
-        WHERE eml.label_id = ? AND m.permanently_deleted = 0),
-      unread_count = (SELECT COUNT(*) FROM email_message_labels eml
-        JOIN email_messages m ON m.id = eml.message_id
-        LEFT JOIN email_message_state s ON s.message_id = m.id
-        WHERE eml.label_id = ? AND m.permanently_deleted = 0 AND (s.is_read IS NULL OR s.is_read = 0))
-    WHERE id = ?
-  `).run(labelId, labelId, labelId);
+const UPDATE_LABEL_SQL = `
+  UPDATE email_labels SET
+    total_count = (SELECT COUNT(*) FROM email_message_labels eml
+      JOIN email_messages m ON m.id = eml.message_id
+      WHERE eml.label_id = ? AND m.permanently_deleted = 0),
+    unread_count = (SELECT COUNT(*) FROM email_message_labels eml
+      JOIN email_messages m ON m.id = eml.message_id
+      LEFT JOIN email_message_state s ON s.message_id = m.id
+      WHERE eml.label_id = ? AND m.permanently_deleted = 0 AND (s.is_read IS NULL OR s.is_read = 0))
+  WHERE id = ?
+`;
+
+// Called from email-imap.mjs after a folder sync — updates all labels for the account
+export function updateLabelCounts(accountId) {
+  const db = getDb();
+  const labels = db.prepare('SELECT id FROM email_labels WHERE account_id = ?').all(accountId);
+  const stmt = db.prepare(UPDATE_LABEL_SQL);
+  for (const lbl of labels) {
+    stmt.run(lbl.id, lbl.id, lbl.id);
+  }
+}
+
+// Called internally after adding/removing a single message from a label
+function updateSingleLabelCount(db, labelId) {
+  db.prepare(UPDATE_LABEL_SQL).run(labelId, labelId, labelId);
 }
 
 // ── MESSAGE CRUD ───────────────────────────────────────────────────────────
@@ -494,13 +507,13 @@ export function insertAttachments(messageId, attachments) {
 export function addMessageToLabel(messageId, labelId) {
   const db = getDb();
   db.prepare('INSERT OR IGNORE INTO email_message_labels (message_id, label_id) VALUES (?, ?)').run(messageId, labelId);
-  updateLabelCounts(db, labelId);
+  updateSingleLabelCount(db, labelId);
 }
 
 export function removeMessageFromLabel(messageId, labelId) {
   const db = getDb();
   db.prepare('DELETE FROM email_message_labels WHERE message_id = ? AND label_id = ?').run(messageId, labelId);
-  updateLabelCounts(db, labelId);
+  updateSingleLabelCount(db, labelId);
 }
 
 export function getMessageLabels(messageId) {
@@ -578,9 +591,13 @@ export function getThread(threadId, accountId) {
 // ── STATE MUTATIONS (local only — never touches IMAP) ─────────────────────
 
 export function markRead(messageId, isRead) {
-  getDb().prepare(`INSERT INTO email_message_state (message_id, is_read, is_starred) VALUES (?, ?, 0)
+  const db = getDb();
+  db.prepare(`INSERT INTO email_message_state (message_id, is_read, is_starred) VALUES (?, ?, 0)
     ON CONFLICT(message_id) DO UPDATE SET is_read = excluded.is_read, updated_at = datetime('now')`)
     .run(messageId, isRead ? 1 : 0);
+  // Refresh label unread counts for this message's account
+  const msg = db.prepare('SELECT account_id FROM email_messages WHERE id = ?').get(messageId);
+  if (msg?.account_id) updateLabelCounts(msg.account_id);
 }
 
 export function markStarred(messageId, isStarred) {