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

Merge cf4d2659d882549df89a63769303d1883f152ee4 into 9fb78453e088cd7b553d7779faa0de5c83708e70

Browse Source
This commit is contained in:
Andrew Barnes 2026-03-20 22:19:05 -07:00 committed by GitHub
commit 043ee41c4d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
extensions/synology-chat/src/webhook-handler.ts
View File

@ -371,17 +371,22 @@ export function createWebhookHandler(deps: WebhookHandlerDeps) {
chatUserId: replyUserId,
});
const timeoutPromise = new Promise<null>((_, reject) =>
setTimeout(() => reject(new Error("Agent response timeout (120s)")), 120_000),
);
let timer: ReturnType<typeof setTimeout> | undefined;
const timeoutPromise = new Promise<null>((_, reject) => {
timer = setTimeout(() => reject(new Error("Agent response timeout (120s)")), 120_000);
});
const reply = await Promise.race([deliverPromise, timeoutPromise]);
try {
const reply = await Promise.race([deliverPromise, timeoutPromise]);
// Send reply back to Synology Chat using the resolved Chat user_id
if (reply) {
await sendMessage(account.incomingUrl, reply, replyUserId, account.allowInsecureSsl);
const replyPreview = reply.length > 100 ? `${reply.slice(0, 100)}...` : reply;
log?.info(`Reply sent to ${payload.username} (${replyUserId}): ${replyPreview}`);
// Send reply back to Synology Chat using the resolved Chat user_id
if (reply) {
await sendMessage(account.incomingUrl, reply, replyUserId, account.allowInsecureSsl);
const replyPreview = reply.length > 100 ? `${reply.slice(0, 100)}...` : reply;
log?.info(`Reply sent to ${payload.username} (${replyUserId}): ${replyPreview}`);
}
} finally {
clearTimeout(timer);
}
} catch (err) {
const errMsg = err instanceof Error ? `${err.message}\n${err.stack}` : String(err);

9
extensions/twitch/src/probe.ts
View File

@ -82,12 +82,17 @@ export async function probeTwitch(
});
});
let timer: ReturnType<typeof setTimeout> | undefined;
const timeout = new Promise<never>((_, reject) => {
setTimeout(() => reject(new Error(`timeout after ${timeoutMs}ms`)), timeoutMs);
timer = setTimeout(() => reject(new Error(`timeout after ${timeoutMs}ms`)), timeoutMs);
});
client.connect();
await Promise.race([connectionPromise, timeout]);
try {
await Promise.race([connectionPromise, timeout]);
} finally {
clearTimeout(timer);
}
client.quit();
client = undefined;

22
extensions/zalouser/src/probe.ts
View File

@ -11,14 +11,22 @@ export async function probeZalouser(
timeoutMs?: number,
): Promise<ZalouserProbeResult> {
try {
const user = timeoutMs
? await Promise.race([
let user: ZcaUserInfo | null;
if (timeoutMs) {
let timer: ReturnType<typeof setTimeout> | undefined;
try {
user = await Promise.race([
getZaloUserInfo(profile),
new Promise<null>((resolve) =>
setTimeout(() => resolve(null), Math.max(timeoutMs, 1000)),
),
])
: await getZaloUserInfo(profile);
new Promise<null>((resolve) => {
timer = setTimeout(() => resolve(null), Math.max(timeoutMs, 1000));
}),
]);
} finally {
clearTimeout(timer);
}
} else {
user = await getZaloUserInfo(profile);
}
if (!user) {
return { ok: false, error: "Not authenticated" };