LaLeV/wacrm
1
0
Fork 0
mirror of https://github.com/Luchexx/wacrm.git synced 2026-11-02 09:19:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #126 from ArnasDon/feat/flows-drop-reread-and-limit

Browse Source 
perf(flows): drop wasted re-read after reprompt reset + defensive limit(1)
This commit is contained in:
Arnas Donauskas 2026-05-22 15:57:27 +03:00 committed by GitHub
commit ce9c7925a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/lib/flows/engine.ts
View File

@ -173,18 +173,26 @@ async function loadActiveRunForContact(
userId: string, userId: string,
contactId: string, contactId: string,
): Promise<FlowRunRow | null> { ): Promise<FlowRunRow | null> {
// The partial unique index `idx_one_active_run_per_contact` makes
// "two active runs for one contact" impossible by design. But a
// future migration glitch or manual SQL could create one, and
// .maybeSingle() throws on >1 row — which would kill dispatch for
// that contact's webhook entirely. .limit(1) is forgiving: pick the
// newest, let the cron sweep clean up the stale one.
const { data, error } = await db const { data, error } = await db
.from("flow_runs") .from("flow_runs")
.select("*") .select("*")
.eq("user_id", userId) .eq("user_id", userId)
.eq("contact_id", contactId) .eq("contact_id", contactId)
.eq("status", "active") .eq("status", "active")
.maybeSingle(); .order("started_at", { ascending: false })
.limit(1);
if (error) { if (error) {
console.error("[flows] loadActiveRunForContact error:", error.message); console.error("[flows] loadActiveRunForContact error:", error.message);
return null; return null;
} }
return (data as FlowRunRow | null) ?? null; const rows = (data as FlowRunRow[] | null) ?? [];
return rows[0] ?? null;
} }
async function loadFlow( async function loadFlow(
@ -889,14 +897,20 @@ async function handleReplyForActiveRun(
const captured = message.text.trim(); const captured = message.text.trim();
if (captured.length > 0 && cfg.var_key) { if (captured.length > 0 && cfg.var_key) {
// Persist captured value + reset reprompt count atomically. // Persist captured value + reset reprompt count atomically.
const newVars = { ...run.vars, [cfg.var_key]: captured };
const { error: capErr } = await db const { error: capErr } = await db
.from("flow_runs") .from("flow_runs")
.update({ .update({
vars: { ...run.vars, [cfg.var_key]: captured }, vars: newVars,
reprompt_count: 0, reprompt_count: 0,
}) })
.eq("id", run.id); .eq("id", run.id);
if (!capErr) { if (!capErr) {
// Mirror the UPDATE in-memory so downstream interpolation in
// the advance loop sees the captured var without us having to
// re-SELECT the whole row.
run.vars = newVars;
run.reprompt_count = 0;
await logEvent(db, run.id, "node_entered", currentNode.node_key, { await logEvent(db, run.id, "node_entered", currentNode.node_key, {
captured_key: cfg.var_key, captured_key: cfg.var_key,
captured_length: captured.length, captured_length: captured.length,
@ -907,19 +921,21 @@ async function handleReplyForActiveRun(
} }
if (matched) { if (matched) {
// Reset reprompt count on a successful match. // Reset reprompt count on a successful match. Skip the write when
await db // already 0 — the collect_input capture branch above already
// zeroed it, and interactive-reply matches against a fresh run
// (post-prior-reset) are also already 0. The previous re-read of
// the whole row was needed only because we weren't mirroring the
// capture UPDATE into the in-memory `run`; now that we do, the
// local copy is the source of truth.
if (run.reprompt_count !== 0) {
const { error } = await db
.from("flow_runs") .from("flow_runs")
.update({ reprompt_count: 0 }) .update({ reprompt_count: 0 })
.eq("id", run.id); .eq("id", run.id);
// Re-read so the advance loop sees the fresh reprompt_count. if (!error) run.reprompt_count = 0;
const fresh = await db }
.from("flow_runs") const outcome = await advanceFromNodeKey(db, run, matched, nodes);
.select("*")
.eq("id", run.id)
.maybeSingle();
const next = (fresh.data as FlowRunRow | null) ?? run;
const outcome = await advanceFromNodeKey(db, next, matched, nodes);
return { return {
consumed: true, consumed: true,
flow_run_id: run.id, flow_run_id: run.id,