oh-my-im 0.1.9 → 0.1.10

package/dist/dws-history.js

@@ -87,9 +87,17 @@ export function startDwsHistoryPolling(options) {
         }
     };
     void poll().catch((err) => log.warn(`history poll failed: ${String(err)}`));
-    const timer = setInterval(() => {
+    // Use a short scheduler tick instead of fixing the interval at startup, so
+    // changing 拉取间隔（秒） in the Web UI affects the current polling process.
+    let lastPollStartedAt = Date.now();
+    const scheduler = setInterval(() => {
+        const seconds = Number(options.getConfig().historyPollIntervalSeconds);
+        const intervalMs = Math.max(1, Number.isFinite(seconds) ? seconds : DEFAULT_POLL_INTERVAL_SECONDS) * 1_000;
+        if (Date.now() - lastPollStartedAt < intervalMs)
+            return;
+        lastPollStartedAt = Date.now();
         void poll().catch((err) => log.warn(`history poll failed: ${String(err)}`));
-    }, Math.max(1, Number(options.getConfig().historyPollIntervalSeconds || DEFAULT_POLL_INTERVAL_SECONDS)) * 1_000);
-    timer.unref();
-    return () => { stopped = true; clearInterval(timer); };
+    }, 1_000);
+    scheduler.unref();
+    return () => { stopped = true; clearInterval(scheduler); };
 }

package/dist/dws-listener.js

@@ -666,9 +666,10 @@ function isIgnoredRobotEvent(event, config) {
             return normalized.includes("robotcode") || normalized === "botid" || normalized === "openbotid";
         });
     };
+    const senderDisplay = senderDisplayName(event).trim().toLowerCase();
     const isRobot = robotMarker(sender) ||
-        (configuredRobotId && senderValues.includes(configuredRobotId)) ||
-        (robotName && senderValues.some((value) => value.includes(robotName)));
+        (configuredRobotId && senderId === configuredRobotId) ||
+        (robotName && (senderDisplay === robotName || senderValues.some((value) => value.includes(robotName))));
     if (isRobot)
         return true;
     // DWS history records are not consistent about exposing the sender name.
@@ -719,6 +720,7 @@ async function handleBatch(events, groupId, cardState, sessions, cardClient, get
     const sessionId = sessions.get(sessionKey);
     log.info(`processing batch size=${events.length} groupSession=${sessionId ? "resume" : "new"}`);
     let card;
+    let stopCardUpdates = () => undefined;
     let latestVisibleContent = `${label} 正在处理...`;
     let elapsedTimer;
     const title = `【${label}】`;
@@ -783,13 +785,23 @@ async function handleBatch(events, groupId, cardState, sessions, cardClient, get
         let pendingCardUpdate;
         let pendingCardTimer;
         let cardUpdateInFlight;
+        let cardUpdatesStopped = false;
+        stopCardUpdates = () => {
+            cardUpdatesStopped = true;
+            if (pendingCardTimer)
+                clearTimeout(pendingCardTimer);
+            pendingCardTimer = undefined;
+            pendingCardUpdate = undefined;
+        };
         // Pi emits very small deltas quickly. Coalesce them into one complete card
         // snapshot per second so DingTalk receives fresh content without a backlog.
-        const intervalMs = Math.max(500, getDashboardConfig().cardUpdateIntervalMs || 3_000);
+        const getCardIntervalMs = () => Math.max(500, getDashboardConfig().cardUpdateIntervalMs || 3_000);
         const pumpCardUpdate = () => {
-            if (cardUpdateInFlight || !pendingCardUpdate)
+            if (cardUpdatesStopped || cardUpdateInFlight || !pendingCardUpdate)
                 return;
-            const remaining = intervalMs - (Date.now() - lastCardUpdateAt);
+            // Read the setting for every update. A Web change therefore affects an
+            // already running task, not only the next task.
+            const remaining = getCardIntervalMs() - (Date.now() - lastCardUpdateAt);
             if (remaining > 0) {
                 if (!pendingCardTimer) {
                     pendingCardTimer = setTimeout(() => {
@@ -819,7 +831,7 @@ async function handleBatch(events, groupId, cardState, sessions, cardClient, get
             }
             if (cardUpdateInFlight)
                 await cardUpdateInFlight;
-            if (pendingCardUpdate) {
+            if (pendingCardUpdate && !cardUpdatesStopped) {
                 const latest = pendingCardUpdate;
                 pendingCardUpdate = undefined;
                 await cardClient.update(activeCard, latest.title, formatReply(latest.content, getDashboardConfig().replyFormat))
@@ -827,6 +839,8 @@ async function handleBatch(events, groupId, cardState, sessions, cardClient, get
             }
         };
         const updateCard = (title, content) => {
+            if (cardUpdatesStopped)
+                return;
             pendingCardUpdate = { title, content };
             pumpCardUpdate();
         };
@@ -905,6 +919,10 @@ async function handleBatch(events, groupId, cardState, sessions, cardClient, get
         if (card) {
             const stopped = queue?.paused === true;
             const stoppedContent = latestVisibleContent;
+            // Cancel the interval timer and all delayed updates before the final
+            // paused/failed card update. This prevents a queued update from arriving
+            // after stop and changing the title back to "处理中".
+            stopCardUpdates();
             await cardClient.update(card, stopped ? finishedTitle("🔴", "处理暂停") : finishedTitle("❌", "处理失败"), stopped ? stoppedContent : `${label} 处理失败：${message.slice(0, 2_000)}`)
                 .catch((updateErr) => log.warn(`card failure update skipped: ${String(updateErr)}`));
             cardState.cards[groupId] = { cardBizId: card.cardBizId, status: stopped ? "failed" : "failed" };
@@ -1023,6 +1041,14 @@ function startGroupListener(seen, queues, cardState, sessions, cardClient, getDa
             log.debug(`ignored robot message event=${event.event_id || "unknown"}`);
             return;
         }
+        // A bot acknowledgement may be returned by history before the sender
+        // metadata is complete. Never feed our own steer acknowledgement back into
+        // the active Pi task, even if robot detection missed that event.
+        const eventContent = (event.content || event.text || "").trim();
+        if (queues.get(groupId)?.running && /^已将这条消息作为引导发送给当前 Pi 任务[。.!！]?$/u.test(eventContent)) {
+            log.debug(`ignored self steer acknowledgement group=${groupId}`);
+            return;
+        }
         const key = eventKey(event, groupId);
         if (key && seen.has(key))
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-im",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "author": {
     "name": "杜振训",
     "email": "duzhenxun@126.com"