wacrawl-dashboard 0.1.2 → 0.2.0

package/apps/api/dist/pathsResolve.js

@@ -23,13 +23,24 @@ export function dashboardPathsFile() {
     }
     return path.join(os.homedir(), '.wacrawl', 'dashboard-paths.json');
 }
+let cachedOverride = null;
+export function invalidateDashboardPathsCache() {
+    cachedOverride = null;
+}
 export function readDashboardPathsOverride() {
+    const filePath = dashboardPathsFile();
+    if (cachedOverride && cachedOverride.filePath === filePath) {
+        return cachedOverride.value;
+    }
     try {
-        const raw = fs.readFileSync(dashboardPathsFile(), 'utf8');
+        const raw = fs.readFileSync(filePath, 'utf8');
         const parsed = JSON.parse(raw);
-        return parsed && typeof parsed === 'object' ? parsed : null;
+        const value = parsed && typeof parsed === 'object' ? parsed : null;
+        cachedOverride = { filePath, value };
+        return value;
     }
     catch {
+        cachedOverride = { filePath, value: null };
         return null;
     }
 }
@@ -37,14 +48,17 @@ export function writeDashboardPathsOverride(data) {
     const filePath = dashboardPathsFile();
     fs.mkdirSync(path.dirname(filePath), { recursive: true });
     fs.writeFileSync(filePath, `${JSON.stringify(data, null, 2)}\n`, 'utf8');
+    cachedOverride = { filePath, value: { ...data } };
 }
 export function clearDashboardPathsOverride() {
+    const filePath = dashboardPathsFile();
     try {
-        fs.unlinkSync(dashboardPathsFile());
+        fs.unlinkSync(filePath);
     }
     catch {
         // Missing file is fine.
     }
+    cachedOverride = { filePath, value: null };
 }
 export function resolvePathsFromEnv() {
     const DEFAULT_DB = path.join(os.homedir(), '.wacrawl', 'wacrawl.db');

package/apps/api/dist/routes/data.js

@@ -1,9 +1,20 @@
 import { Router } from 'express';
 import { getDb } from '../db.js';
-import { cleanDisplayNameSql, contactDisplayNameSql, contactLeftJoins } from '../lib/displayName.js';
-import { resolveArchiveMediaPath } from '../lib/mediaFsPath.js';
-import { parseLimit, parseOffset, unixSecondsToIso } from '../lib/query.js';
+import { chatKindSql, parseChatKind } from '../lib/chatKind.js';
+import { canonicalJidSql, cleanDisplayNameSql, contactDisplayNameSql, contactLeftJoins, isPersonJidSql } from '../lib/displayName.js';
+import { mediaResponseHeaders, resolveArchiveMediaPath } from '../lib/mediaFsPath.js';
+import { nameLikePattern, parseLimit, parseOffset, unixSecondsToIso } from '../lib/query.js';
+import { parseSearchFilters } from '../lib/searchFilters.js';
 import { hasMessageSearchIndex, MESSAGE_SEARCH_FTS_TABLE } from '../lib/searchIndex.js';
+/**
+ * Socket errors that mean "the client went away", not "the server failed".
+ * EPIPE and ECONNRESET surface when we are still writing a file the browser has
+ * already stopped reading; ECONNABORTED is send()'s own name for the same thing.
+ */
+const CLIENT_DISCONNECT_CODES = new Set(['ECONNABORTED', 'ECONNRESET', 'EPIPE']);
+export function isClientDisconnect(errCode) {
+    return errCode !== undefined && CLIENT_DISCONNECT_CODES.has(errCode);
+}
 function asPagination(data, limit, offset, total) {
     return { data, pagination: { limit, offset, total } };
 }
@@ -23,9 +34,6 @@ function mapMessage(row) {
         mediaPath: row.mediaPath,
     };
 }
-function escapeLike(value) {
-    return value.replace(/[\\%_]/g, (match) => `\\${match}`);
-}
 function buildFtsQuery(query) {
     const terms = query
         .toLowerCase()
@@ -40,7 +48,9 @@ function buildFtsQuery(query) {
 function formatSearchResults(rows, query, limit, offset, total) {
     return asPagination(rows.map((row) => {
         const message = mapMessage(row);
-        const text = row.text ?? row.chatName ?? '';
+        // With no query there is nothing a chat name could be explaining, so a
+        // caption-less photo stays caption-less instead of showing the chat's name.
+        const text = row.text ?? (query ? row.chatName : null) ?? '';
         const ftsSnippet = row.snippet?.trim();
         const snippetSource = ftsSnippet || (text.toLowerCase().includes(query.toLowerCase())
             ? text
@@ -54,27 +64,20 @@ function formatSearchResults(rows, query, limit, offset, total) {
 export function getPeople(params, db = getDb()) {
     const limit = parseLimit(params.limit, 50, 200);
     const offset = parseOffset(params.offset);
-    const total = db.prepare(`
-    SELECT COUNT(*) AS count
-    FROM (
-      SELECT CASE WHEN from_me = 1 THEN chat_jid ELSE COALESCE(sender_jid, chat_jid) END AS jid
-      FROM messages
-      UNION
-      SELECT jid FROM contacts
-    )
-    WHERE jid IS NOT NULL AND jid <> ''
-  `).get().count;
-    const rows = db.prepare(`
+    const like = nameLikePattern(params.q);
+    const targetJid = typeof params.jid === 'string' && params.jid.trim() ? params.jid.trim() : undefined;
+    const rawCounterpartySql = 'CASE WHEN messages.from_me = 1 THEN messages.chat_jid ELSE COALESCE(messages.sender_jid, messages.chat_jid) END';
+    const peopleSql = `
     WITH normalized_messages AS (
       SELECT
-        CASE WHEN from_me = 1 THEN chat_jid ELSE COALESCE(sender_jid, chat_jid) END AS jid,
+        ${canonicalJidSql('contacts', rawCounterpartySql)} AS jid,
         ${contactDisplayNameSql('contacts')} AS contact_name,
-        ${cleanDisplayNameSql('CASE WHEN from_me = 1 THEN messages.chat_name ELSE messages.sender_name END')} AS message_name,
+        ${cleanDisplayNameSql('CASE WHEN messages.from_me = 1 THEN messages.chat_name ELSE messages.sender_name END')} AS message_name,
         ${cleanDisplayNameSql(`
           COALESCE(
             chats.name,
             CASE
-              WHEN messages.chat_jid = CASE WHEN messages.from_me = 1 THEN messages.chat_jid ELSE COALESCE(messages.sender_jid, messages.chat_jid) END
+              WHEN messages.chat_jid = ${rawCounterpartySql}
               THEN messages.chat_name
               ELSE NULL
             END
@@ -84,8 +87,8 @@ export function getPeople(params, db = getDb()) {
         ts,
         media_type
       FROM messages
-      LEFT JOIN chats ON chats.jid = CASE WHEN messages.from_me = 1 THEN messages.chat_jid ELSE COALESCE(messages.sender_jid, messages.chat_jid) END
-      ${contactLeftJoins('contacts', 'CASE WHEN messages.from_me = 1 THEN messages.chat_jid ELSE COALESCE(messages.sender_jid, messages.chat_jid) END')}
+      LEFT JOIN chats ON chats.jid = ${rawCounterpartySql}
+      ${contactLeftJoins('contacts', rawCounterpartySql)}
     ),
     all_people AS (
       SELECT jid, ${contactDisplayNameSql('contacts', false)} AS contact_name, NULL AS message_name, NULL AS direct_chat_name, NULL AS from_me, NULL AS ts, NULL AS media_type
@@ -102,11 +105,34 @@ export function getPeople(params, db = getDb()) {
       SUM(CASE WHEN from_me = 0 THEN 1 ELSE 0 END) AS sentByThem,
       MAX(ts) AS lastMessageTs
     FROM all_people
-    WHERE jid IS NOT NULL AND jid <> ''
+    WHERE ${isPersonJidSql('jid')} ${targetJid ? 'AND jid = @targetJid' : ''}
     GROUP BY jid
+    ${like ? `
+      HAVING name LIKE @like ESCAPE '\\'
+        OR SUM(CASE WHEN contact_name LIKE @like ESCAPE '\\'
+          OR message_name LIKE @like ESCAPE '\\'
+          OR direct_chat_name LIKE @like ESCAPE '\\' THEN 1 ELSE 0 END) > 0
+    ` : ''}
+  `;
+    // The unfiltered count needs no names, which makes it much cheaper than the page.
+    const total = (like || targetJid
+        ? db.prepare(`SELECT COUNT(*) AS count FROM (${peopleSql})`).get({ like, targetJid })
+        : db.prepare(`
+      SELECT COUNT(*) AS count
+      FROM (
+        SELECT ${canonicalJidSql('contacts', rawCounterpartySql)} AS jid
+        FROM messages
+        ${contactLeftJoins('contacts', rawCounterpartySql)}
+        UNION
+        SELECT jid FROM contacts
+      )
+      WHERE ${isPersonJidSql('jid')}
+    `).get());
+    const rows = db.prepare(`
+    ${peopleSql}
     ORDER BY messageCount DESC, name COLLATE NOCASE ASC
     LIMIT @limit OFFSET @offset
-  `).all({ limit, offset });
+  `).all({ limit, offset, like, targetJid });
     return asPagination(rows.map((row) => ({
         jid: row.jid,
         name: row.name ?? row.jid,
@@ -115,18 +141,39 @@ export function getPeople(params, db = getDb()) {
         sentByMe: row.sentByMe ?? 0,
         sentByThem: row.sentByThem ?? 0,
         lastMessageAt: unixSecondsToIso(row.lastMessageTs),
-    })), limit, offset, total);
+    })), limit, offset, total.count);
+}
+/**
+ * A chat matches on the name the list shows or on its contact's own name, which
+ * the list hides whenever the chat carries a name of its own.
+ */
+function chatNameMatchSql() {
+    return `
+    (
+      COALESCE(
+        ${cleanDisplayNameSql('chats.name')},
+        (SELECT ${cleanDisplayNameSql('MAX(chat_name)')} FROM messages WHERE chat_jid = chats.jid),
+        ${cleanDisplayNameSql('chats.jid')}
+      ) LIKE @like ESCAPE '\\'
+      OR EXISTS (
+        SELECT 1
+        FROM contacts AS named_contact
+        WHERE (named_contact.jid = chats.jid OR named_contact.lid = chats.jid)
+          AND ${contactDisplayNameSql('named_contact', false)} LIKE @like ESCAPE '\\'
+      )
+    )
+  `;
 }
 export function getChats(params, db = getDb()) {
     const limit = parseLimit(params.limit, 50, 200);
     const offset = parseOffset(params.offset);
-    const kind = params.kind === 'direct' || params.kind === 'group' ? params.kind : undefined;
+    const kind = parseChatKind(params.kind);
     const targetJid = typeof params.jid === 'string' && params.jid.trim() ? params.jid.trim() : undefined;
-    let where = kind ? 'WHERE chats.kind = @kind' : 'WHERE chats.kind IN (\'direct\', \'group\')';
-    if (targetJid) {
-        where = 'WHERE chats.jid = @targetJid';
-    }
-    const total = db.prepare(`SELECT COUNT(*) AS count FROM chats ${where}`).get({ kind, targetJid }).count;
+    const like = nameLikePattern(params.q);
+    const where = targetJid
+        ? 'WHERE chats.jid = @targetJid'
+        : `WHERE ${chatKindSql(kind)} ${like ? `AND ${chatNameMatchSql()}` : ''}`;
+    const total = db.prepare(`SELECT COUNT(*) AS count FROM chats ${where}`).get({ targetJid, like }).count;
     const rows = db.prepare(`
     WITH chat_page AS (
       SELECT
@@ -178,7 +225,7 @@ export function getChats(params, db = getDb()) {
     LEFT JOIN latest ON latest.chat_jid = chat_page.jid
     ${contactLeftJoins('chat_contacts', 'chat_page.jid')}
     ORDER BY COALESCE(message_stats.lastMessageTs, chat_page.last_message_at, 0) DESC, name COLLATE NOCASE ASC
-  `).all({ kind, limit, offset, targetJid });
+  `).all({ limit, offset, targetJid, like });
     return asPagination(rows.map((row) => ({
         jid: row.jid,
         kind: row.kind,
@@ -265,21 +312,57 @@ export function getMediaItems(params, db = getDb()) {
         fileUrl: `/api/media/file?path=${encodeURIComponent(row.mediaPath)}`,
     })), limit, offset, total);
 }
+const SEARCH_COLUMNS_SQL = `
+  messages.rowid AS id,
+  msg_id AS msgId,
+  chat_jid AS chatJid,
+  COALESCE(${cleanDisplayNameSql('chats.name')}, ${cleanDisplayNameSql('messages.chat_name')}, ${contactDisplayNameSql('chat_contacts')}, ${cleanDisplayNameSql('messages.chat_jid')}, 'Unknown') AS chatName,
+  sender_jid AS senderJid,
+  COALESCE(${cleanDisplayNameSql('messages.sender_name')}, ${contactDisplayNameSql('sender_contacts')}) AS senderName,
+  ts,
+  from_me AS fromMe,
+  text,
+  message_type AS messageType,
+  media_type AS mediaType,
+  media_path AS mediaPath
+`;
+const SEARCH_JOINS_SQL = `
+  LEFT JOIN chats ON chats.jid = messages.chat_jid
+  ${contactLeftJoins('chat_contacts', 'messages.chat_jid')}
+  ${contactLeftJoins('sender_contacts', 'messages.sender_jid')}
+`;
 export function searchMessages(params, db = getDb()) {
     const query = typeof params.q === 'string' ? params.q.trim() : '';
     const limit = parseLimit(params.limit, 50, 100);
     const offset = parseOffset(params.offset);
-    if (query.length < 2) {
+    const { conditions, bindings } = parseSearchFilters(params, db);
+    // A filter is a question in its own right, so only an unfiltered search needs
+    // enough of a query to be worth running.
+    if (conditions.length === 0 && query.length < 2) {
         return asPagination([], limit, offset, 0);
     }
+    const andFilters = conditions.map((condition) => `AND (${condition})`).join('\n');
+    if (!query) {
+        const total = db.prepare(`SELECT COUNT(*) AS count FROM messages WHERE 1 = 1 ${andFilters}`).get(bindings).count;
+        const rows = db.prepare(`
+      SELECT ${SEARCH_COLUMNS_SQL}
+      FROM messages
+      ${SEARCH_JOINS_SQL}
+      WHERE 1 = 1 ${andFilters}
+      ORDER BY ts DESC, messages.rowid DESC
+      LIMIT @limit OFFSET @offset
+    `).all({ ...bindings, limit, offset });
+        return formatSearchResults(rows, query, limit, offset, total);
+    }
     const ftsQuery = buildFtsQuery(query);
     if (ftsQuery && hasMessageSearchIndex(db)) {
         try {
             const total = db.prepare(`
         SELECT COUNT(*) AS count
         FROM ${MESSAGE_SEARCH_FTS_TABLE}
-        WHERE ${MESSAGE_SEARCH_FTS_TABLE} MATCH @ftsQuery
-      `).get({ ftsQuery }).count;
+        JOIN messages ON messages.rowid = ${MESSAGE_SEARCH_FTS_TABLE}.rowid
+        WHERE ${MESSAGE_SEARCH_FTS_TABLE} MATCH @ftsQuery ${andFilters}
+      `).get({ ...bindings, ftsQuery }).count;
             const rows = db.prepare(`
         WITH matched AS (
           SELECT
@@ -289,34 +372,22 @@ export function searchMessages(params, db = getDb()) {
           WHERE ${MESSAGE_SEARCH_FTS_TABLE} MATCH @ftsQuery
         )
         SELECT
-          messages.rowid AS id,
-          msg_id AS msgId,
-          chat_jid AS chatJid,
-          COALESCE(${cleanDisplayNameSql('chats.name')}, ${cleanDisplayNameSql('messages.chat_name')}, ${contactDisplayNameSql('chat_contacts')}, ${cleanDisplayNameSql('messages.chat_jid')}, 'Unknown') AS chatName,
-          sender_jid AS senderJid,
-          COALESCE(${cleanDisplayNameSql('messages.sender_name')}, ${contactDisplayNameSql('sender_contacts')}) AS senderName,
-          ts,
-          from_me AS fromMe,
-          text,
-          message_type AS messageType,
-          media_type AS mediaType,
-          media_path AS mediaPath,
+          ${SEARCH_COLUMNS_SQL},
           matched.snippet AS snippet
         FROM matched
         JOIN messages ON messages.rowid = matched.rowid
-        LEFT JOIN chats ON chats.jid = messages.chat_jid
-        ${contactLeftJoins('chat_contacts', 'messages.chat_jid')}
-        ${contactLeftJoins('sender_contacts', 'messages.sender_jid')}
+        ${SEARCH_JOINS_SQL}
+        WHERE 1 = 1 ${andFilters}
         ORDER BY ts DESC, messages.rowid DESC
         LIMIT @limit OFFSET @offset
-      `).all({ ftsQuery, limit, offset });
+      `).all({ ...bindings, ftsQuery, limit, offset });
             return formatSearchResults(rows, query, limit, offset, total);
         }
         catch {
             // If an older archive has an incompatible FTS table, keep search working.
         }
     }
-    const like = `%${escapeLike(query)}%`;
+    const like = nameLikePattern(query);
     const where = `
     (messages.text LIKE @like ESCAPE '\\'
       OR messages.chat_name LIKE @like ESCAPE '\\'
@@ -324,37 +395,22 @@ export function searchMessages(params, db = getDb()) {
       OR chats.name LIKE @like ESCAPE '\\'
       OR ${contactDisplayNameSql('chat_contacts')} LIKE @like ESCAPE '\\'
       OR ${contactDisplayNameSql('sender_contacts')} LIKE @like ESCAPE '\\')
+    ${andFilters}
   `;
     const total = db.prepare(`
     SELECT COUNT(*) AS count
     FROM messages
-    LEFT JOIN chats ON chats.jid = messages.chat_jid
-    ${contactLeftJoins('chat_contacts', 'messages.chat_jid')}
-    ${contactLeftJoins('sender_contacts', 'messages.sender_jid')}
+    ${SEARCH_JOINS_SQL}
     WHERE ${where}
-  `).get({ like }).count;
+  `).get({ ...bindings, like }).count;
     const rows = db.prepare(`
-    SELECT
-      messages.rowid AS id,
-      msg_id AS msgId,
-      chat_jid AS chatJid,
-      COALESCE(${cleanDisplayNameSql('chats.name')}, ${cleanDisplayNameSql('messages.chat_name')}, ${contactDisplayNameSql('chat_contacts')}, ${cleanDisplayNameSql('messages.chat_jid')}, 'Unknown') AS chatName,
-      sender_jid AS senderJid,
-      COALESCE(${cleanDisplayNameSql('messages.sender_name')}, ${contactDisplayNameSql('sender_contacts')}) AS senderName,
-      ts,
-      from_me AS fromMe,
-      text,
-      message_type AS messageType,
-      media_type AS mediaType,
-      media_path AS mediaPath
+    SELECT ${SEARCH_COLUMNS_SQL}
     FROM messages
-    LEFT JOIN chats ON chats.jid = messages.chat_jid
-    ${contactLeftJoins('chat_contacts', 'messages.chat_jid')}
-    ${contactLeftJoins('sender_contacts', 'messages.sender_jid')}
+    ${SEARCH_JOINS_SQL}
     WHERE ${where}
     ORDER BY ts DESC, messages.rowid DESC
     LIMIT @limit OFFSET @offset
-  `).all({ like, limit, offset });
+  `).all({ ...bindings, like, limit, offset });
     return formatSearchResults(rows, query, limit, offset, total);
 }
 export const dataRouter = Router();
@@ -394,10 +450,18 @@ dataRouter.get('/media/file', (req, res, next) => {
         res.status(400).json({ error: { code: 'VALIDATION_ERROR', message: 'Invalid media path.' } });
         return;
     }
-    res.sendFile(absolutePath, (err) => {
+    // Passed to sendFile rather than set here so an error response doesn't carry them.
+    res.sendFile(absolutePath, { headers: mediaResponseHeaders(absolutePath) }, (err) => {
         if (!err)
             return;
         const errCode = err.code;
+        // Browsers hang up on media requests constantly — <video> probing for
+        // metadata, the user scrolling a thumbnail out of view, seeking to a new
+        // range. The socket is gone and the response is half-written, so there is
+        // no one to report to and nothing left to send.
+        if (isClientDisconnect(errCode) || res.headersSent) {
+            return;
+        }
         if (errCode === 'ENOENT') {
             res.status(404).json({ error: { code: 'NOT_FOUND', message: 'Media file was not found on disk.' } });
             return;
@@ -422,13 +486,13 @@ dataRouter.get('/search', (req, res) => {
 dataRouter.get('/messages/:id/offset', (req, res) => {
     const id = Number(req.params.id);
     if (isNaN(id)) {
-        res.status(400).json({ error: 'Invalid message ID' });
+        res.status(400).json({ error: { code: 'VALIDATION_ERROR', message: 'Invalid message ID.' } });
         return;
     }
     const db = getDb();
     const msg = db.prepare('SELECT chat_jid, ts FROM messages WHERE rowid = ?').get(id);
     if (!msg) {
-        res.status(404).json({ error: 'Message not found' });
+        res.status(404).json({ error: { code: 'NOT_FOUND', message: 'Message not found.' } });
         return;
     }
     const countRow = db.prepare(`

package/apps/api/dist/routes/settings.js

@@ -1,5 +1,6 @@
 import { Router } from 'express';
 import { closeDb } from '../db.js';
+import { clearStatsCache } from '../lib/statsCache.js';
 import { clearDashboardPathsOverride, mergePathPatch, readDashboardPathsOverride, resolvePathsFromEnv, resolvePathsForRequest, writeDashboardPathsOverride, } from '../pathsResolve.js';
 export const settingsRouter = Router();
 settingsRouter.get('/paths', (req, res) => {
@@ -28,11 +29,13 @@ settingsRouter.post('/paths', (req, res) => {
     };
     writeDashboardPathsOverride(patch);
     closeDb();
+    clearStatsCache();
     const effective = mergePathPatch(resolvePathsFromEnv(), patch);
     res.json({ ok: true, effective });
 });
 settingsRouter.delete('/paths', (_req, res) => {
     clearDashboardPathsOverride();
     closeDb();
+    clearStatsCache();
     res.json({ ok: true, effective: resolvePathsFromEnv() });
 });