Ayuriel/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(mattermost): use patchInflight in flushPendingPatch and divergent-target wait

Browse Source 
flushPendingPatch and the divergent-target branch were still using a 2-second
busy-wait on patchSending, which has the same race as the onSettled wait that was
already fixed: patchSending clears in the finally block before the network request
actually settles. Both paths now await patchInflight directly. (ID=2965256849)
This commit is contained in:
teconomix 2026-03-20 11:39:22 +00:00
parent 6bea6df33f
commit 75b79f6f59
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
extensions/mattermost/src/mattermost/monitor.ts
View File

@ -1436,14 +1436,11 @@ export async function monitorMattermostProvider(opts: MonitorMattermostOpts = {}
const flushPendingPatch = async () => {
stopPatchInterval();
if (!blockStreamingClient) return;
// Wait for any in-flight interval tick to settle before flushing.
// Without this, an interval tick that set lastSentText synchronously but hasn't
// completed the async send yet would cause flushPendingPatch to exit early
// (text === lastSentText guard), leaving streamMessageId null and causing
// final delivery to fall through to a new post instead of patching in place.
const deadline = Date.now() + 2000;
while (patchSending && Date.now() < deadline) {
await new Promise<void>((r) => setTimeout(r, 20));
// Await the in-flight promise directly so we never miss a late-resolving
// POST/PATCH — the busy-wait on patchSending had a race where patchSending
// could clear before the network request settled (ID=2965256849).
if (patchInflight) {
await patchInflight.catch(() => {});
}
const rawText = pendingPatchText;
if (!rawText) return;
@ -1567,9 +1564,8 @@ export async function monitorMattermostProvider(opts: MonitorMattermostOpts = {}
// first sendMessageMattermost resolves during this window, so the orphan
// cleanup below can capture and delete it.
stopPatchInterval();
const deadline = Date.now() + 2000;
while (patchSending && Date.now() < deadline) {
await new Promise<void>((r) => setTimeout(r, 20));
if (patchInflight) {
await patchInflight.catch(() => {});
}
} else {
// Same thread: flush pending patches normally.