let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add command timeout and async polling auto-replies

Browse Source
This commit is contained in:
Peter Steinberger
2025-11-24 16:06:45 +01:00
parent b4a995dbe5
commit a5e2636e17
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/index.ts
View File

@@ -66,6 +66,10 @@ type TwilioChannelsSender = {
sender_id?: string; sender_id?: string;
}; };
type ChannelSenderUpdater = {
update: (params: Record<string, string>) => Promise<unknown>;
};
type IncomingPhoneNumberUpdater = { type IncomingPhoneNumberUpdater = {
update: (params: Record<string, string>) => Promise<unknown>; update: (params: Record<string, string>) => Promise<unknown>;
}; };
@@ -88,9 +92,8 @@ type TwilioSenderListClient = {
}) => Promise<TwilioChannelsSender[]>; }) => Promise<TwilioChannelsSender[]>;
( (
sid: string, sid: string,
): { ): ChannelSenderUpdater & {
fetch: () => Promise<TwilioChannelsSender>; fetch: () => Promise<TwilioChannelsSender>;
update: (params: Record<string, string>) => Promise<unknown>;
}; };
}; };
}; };
@@ -321,6 +324,7 @@ type WarelayConfig = {
text?: string; // for mode=text, can contain {{Body}} text?: string; // for mode=text, can contain {{Body}}
command?: string[]; // for mode=command, argv with templates command?: string[]; // for mode=command, argv with templates
template?: string; // prepend template string when building command/prompt template?: string; // prepend template string when building command/prompt
timeoutSeconds?: number; // optional command timeout; defaults to 600s
}; };
}; };
}; };
@@ -360,6 +364,8 @@ async function getReplyFromConfig(
// Choose reply from config: static text or external command stdout. // Choose reply from config: static text or external command stdout.
const cfg = loadConfig(); const cfg = loadConfig();
const reply = cfg.inbound?.reply; const reply = cfg.inbound?.reply;
const timeoutSeconds = Math.max(reply?.timeoutSeconds ?? 600, 1);
const timeoutMs = timeoutSeconds * 1000;
// Optional allowlist by origin number (E.164 without whatsapp: prefix) // Optional allowlist by origin number (E.164 without whatsapp: prefix)
const allowFrom = cfg.inbound?.allowFrom; const allowFrom = cfg.inbound?.allowFrom;
@@ -395,6 +401,7 @@ async function getReplyFromConfig(
try { try {
const { stdout } = await execFileAsync(finalArgv[0], finalArgv.slice(1), { const { stdout } = await execFileAsync(finalArgv[0], finalArgv.slice(1), {
maxBuffer: 1024 * 1024, maxBuffer: 1024 * 1024,
timeout: timeoutMs,
}); });
const trimmed = stdout.trim(); const trimmed = stdout.trim();
logVerbose( logVerbose(
@@ -999,7 +1006,7 @@ async function monitor(intervalSeconds: number, lookbackMinutes: number) {
const fromNum = m.from ?? "unknown sender"; const fromNum = m.from ?? "unknown sender";
console.log(`\n[${time}] ${fromNum} -> ${m.to}: ${m.body ?? ""}`); console.log(`\n[${time}] ${fromNum} -> ${m.to}: ${m.body ?? ""}`);
updateSince(m.dateCreated); updateSince(m.dateCreated);
await autoReplyIfConfigured(client, m); void autoReplyIfConfigured(client, m);
} }
} catch (err) { } catch (err) {
console.error("Error while polling messages", err); console.error("Error while polling messages", err);