hn-bits 0.7.0 → 0.7.1

package/dist/notify/desktop.js

@@ -27,14 +27,15 @@ export function findAlerter() {
     }
     return null;
 }
-function wrapperArguments({ subscription, story }, timeoutSeconds, alerterPath) {
+function wrapperArguments({ subscriptions, story }, timeoutSeconds, alerterPath) {
+    const names = subscriptions.map((s) => s.name).join(', ');
     return [
         'sh',
-        `🔔 ${subscription.name}`,
+        `🔔 ${names}`,
         `${story.score} pts · ${story.descendants} comments`,
         story.title,
         String(timeoutSeconds),
-        `hn-${subscription.id}-${story.id}`,
+        `hn-${story.id}`,
         story.url ?? hnItemUrl(story.id),
         alerterPath,
     ];

package/dist/notify/telegram.js

@@ -5,8 +5,9 @@ export class NotifyError extends Error {
 function escapeHtml(text) {
     return text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 }
-function buildMessage({ subscription, story }) {
-    const lines = [`🔔 <b>${escapeHtml(subscription.name)}</b>`];
+function buildMessage({ subscriptions, story }) {
+    const names = subscriptions.map((s) => s.name).join(', ');
+    const lines = [`🔔 <b>${escapeHtml(names)}</b>`];
     if (story.url) {
         lines.push(`<a href="${story.url}">${escapeHtml(story.title)}</a>`);
         lines.push(`${story.score} points · ${story.descendants} comments · by ${escapeHtml(story.by)}`);

package/dist/watch.js

@@ -32,57 +32,77 @@ function buildNotifiers() {
     }
     return { notifiers, desktopSkipped };
 }
-async function notifyStory(sub, story, notifiers) {
+/** Query plus unseen filter for one subscription. null on query failure. */
+async function fetchMatches(sub, now) {
     try {
-        for (const notifier of notifiers)
-            await notifier.send({ subscription: sub, story });
-        return true;
-    }
-    catch (err) {
-        log(`${sub.name}: notify failed for ${story.id} - ${err.message}`);
-        return false;
-    }
-}
-async function processSubscription(sub, notifiers, now, dryRun) {
-    let stories;
-    try {
-        stories = await searchRecent(sub.query, {
+        const stories = await searchRecent(sub.query, {
             createdAfter: windowStart(sub.lastRunAt, now),
             minPoints: sub.minPoints,
             minComments: sub.minComments,
         });
+        return stories.filter((story) => !isSeen(story.id, sub.id));
     }
     catch (err) {
         log(`${sub.name}: query failed - ${err.message}`);
-        return { notified: 0, hadFailure: true };
+        return null;
     }
-    const matches = stories.filter((story) => !isSeen(story.id, sub.id)).sort((a, b) => a.time - b.time);
-    if (matches.length === 0) {
-        log(`${sub.name}: no new matches`);
-        if (!dryRun)
-            touchLastRun(sub.id, now);
-        return { notified: 0, hadFailure: false };
+}
+/** Phase A: fetch every subscription, merging stories matched by more than one. */
+async function collectPending(subs, now) {
+    const pending = new Map();
+    const fetchedSubs = [];
+    let failedSubs = 0;
+    for (const sub of subs) {
+        const matches = await fetchMatches(sub, now);
+        if (matches === null) {
+            failedSubs++;
+            continue;
+        }
+        fetchedSubs.push(sub);
+        for (const story of matches) {
+            const entry = pending.get(story.id);
+            if (entry)
+                entry.subscriptions.push(sub);
+            else
+                pending.set(story.id, { story, subscriptions: [sub] });
+        }
     }
-    log(`${sub.name}: ${matches.length} new matches`);
-    let notified = 0;
+    return { pending, fetchedSubs, failedSubs };
+}
+async function notifyStory(subscriptions, story, notifiers) {
+    const names = subscriptions.map((s) => s.name).join(', ');
+    try {
+        for (const notifier of notifiers)
+            await notifier.send({ subscriptions, story });
+        return true;
+    }
+    catch (err) {
+        log(`${names}: notify failed for ${story.id} - ${err.message}`);
+        return false;
+    }
+}
+/** Phase B: one notify per story, oldest first. */
+async function dispatchPending(pending, notifiers, now, dryRun) {
+    const ordered = [...pending.values()].sort((a, b) => a.story.time - b.story.time);
+    let totalNotified = 0;
     let hadFailure = false;
-    for (const story of matches) {
+    for (const { story, subscriptions } of ordered) {
+        const names = subscriptions.map((s) => s.name).join(', ');
         if (dryRun) {
-            log(`would notify: [${sub.name}] ${story.title} (${story.score} pts)`);
+            log(`would notify: [${names}] ${story.title} (${story.score} pts)`);
             continue;
         }
-        const sent = await notifyStory(sub, story, notifiers);
+        const sent = await notifyStory(subscriptions, story, notifiers);
         if (!sent) {
             hadFailure = true;
             continue;
         }
-        markSeen(story.id, sub.id, now);
-        log(`${sub.name}: notified ${story.id} "${story.title}" (${story.score} pts)`);
-        notified++;
+        for (const sub of subscriptions)
+            markSeen(story.id, sub.id, now);
+        log(`${names}: notified ${story.id} "${story.title}" (${story.score} pts)`);
+        totalNotified++;
     }
-    if (!dryRun)
-        touchLastRun(sub.id, now);
-    return { notified, hadFailure };
+    return { totalNotified, hadFailure };
 }
 /** hn watch --once: one-shot pass over all subscriptions. Returns the process exit code. */
 export async function runWatch(options) {
@@ -100,14 +120,13 @@ export async function runWatch(options) {
     }
     log(`watch: ${subs.length} subscriptions`);
     const now = Math.floor(Date.now() / 1000);
-    let totalNotified = 0;
-    let failedSubs = 0;
-    for (const sub of subs) {
-        const result = await processSubscription(sub, notifiers, now, options.dryRun);
-        totalNotified += result.notified;
-        if (result.hadFailure)
-            failedSubs++;
-    }
+    const { pending, fetchedSubs, failedSubs } = await collectPending(subs, now);
+    if (pending.size === 0)
+        log('no new matches');
+    const { totalNotified, hadFailure } = await dispatchPending(pending, notifiers, now, options.dryRun);
+    if (!options.dryRun)
+        for (const sub of fetchedSubs)
+            touchLastRun(sub.id, now);
     log(`done: ${totalNotified} notified, ${failedSubs} failed`);
-    return failedSubs > 0 ? 1 : 0;
+    return failedSubs > 0 || hadFailure ? 1 : 0;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hn-bits",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Terminal-first Hacker News client",
   "type": "module",
   "repository": {