github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-07 04:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: eliminate remaining duplicate blocks across draft streams and tests

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-21 23:56:58 +00:00
parent abf3dfc375
commit ad1c07e7c0
16 changed files with 316 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/discord/draft-stream.ts
View File

@@ -1,6 +1,6 @@
import type { RequestClient } from "@buape/carbon";
import { Routes } from "discord-api-types/v10";
import { createDraftStreamLoop } from "../channels/draft-stream-loop.js";
import { createFinalizableDraftLifecycle } from "../channels/draft-stream-controls.js";
/** Discord messages cap at 2000 characters. */
const DISCORD_STREAM_MAX_CHARS = 2000;
@@ -37,14 +37,13 @@ export function createDiscordDraftStream(params: {
? params.replyToMessageId()
: params.replyToMessageId;
const streamState = { stopped: false, final: false };
let streamMessageId: string | undefined;
let lastSentText = "";
let stopped = false;
let isFinal = false;
const sendOrEditStreamMessage = async (text: string): Promise<boolean> => {
// Allow final flush even if stopped (e.g., after clear()).
if (stopped && !isFinal) {
if (streamState.stopped && !streamState.final) {
return false;
}
const trimmed = text.trimEnd();
@@ -54,7 +53,7 @@ export function createDiscordDraftStream(params: {
if (trimmed.length > maxChars) {
// Discord messages cap at 2000 chars.
// Stop streaming once we exceed the cap to avoid repeated API failures.
stopped = true;
streamState.stopped = true;
params.warn?.(`discord stream preview stopped (text length ${trimmed.length} > ${maxChars})`);
return false;
}
@@ -63,7 +62,7 @@ export function createDiscordDraftStream(params: {
}
// Debounce first preview send for better push notification quality.
if (streamMessageId === undefined && minInitialChars != null && !isFinal) {
if (streamMessageId === undefined && minInitialChars != null && !streamState.final) {
if (trimmed.length < minInitialChars) {
return false;
}
@@ -91,14 +90,14 @@ export function createDiscordDraftStream(params: {
})) as { id?: string } | undefined;
const sentMessageId = sent?.id;
if (typeof sentMessageId !== "string" || !sentMessageId) {
stopped = true;
streamState.stopped = true;
params.warn?.("discord stream preview stopped (missing message id from send)");
return false;
}
streamMessageId = sentMessageId;
return true;
} catch (err) {
stopped = true;
streamState.stopped = true;
params.warn?.(
`discord stream preview failed: ${err instanceof Error ? err.message : String(err)}`,
);
@@ -106,42 +105,20 @@ export function createDiscordDraftStream(params: {
}
};
const loop = createDraftStreamLoop({
const { loop, update, stop, clear } = createFinalizableDraftLifecycle({
throttleMs,
isStopped: () => stopped,
state: streamState,
sendOrEditStreamMessage,
readMessageId: () => streamMessageId,
clearMessageId: () => {
streamMessageId = undefined;
},
isValidMessageId: (value): value is string => typeof value === "string",
deleteMessage: (messageId) => rest.delete(Routes.channelMessage(channelId, messageId)),
warn: params.warn,
warnPrefix: "discord stream preview cleanup failed",
});
const update = (text: string) => {
if (stopped || isFinal) {
return;
}
loop.update(text);
};
const stop = async (): Promise<void> => {
isFinal = true;
await loop.flush();
};
const clear = async () => {
stopped = true;
loop.stop();
await loop.waitForInFlight();
const messageId = streamMessageId;
streamMessageId = undefined;
if (typeof messageId !== "string") {
return;
}
try {
await rest.delete(Routes.channelMessage(channelId, messageId));
} catch (err) {
params.warn?.(
`discord stream preview cleanup failed: ${err instanceof Error ? err.message : String(err)}`,
);
}
};
const forceNewMessage = () => {
streamMessageId = undefined;
lastSentText = "";