fix: make web inbox non-blocking
This commit is contained in:
@@ -227,12 +227,13 @@ export async function monitorWebInbox(options: {
|
|||||||
"inbound message",
|
"inbound message",
|
||||||
);
|
);
|
||||||
try {
|
try {
|
||||||
await options.onMessage({
|
const task = Promise.resolve(
|
||||||
id,
|
options.onMessage({
|
||||||
from,
|
id,
|
||||||
conversationId: from,
|
from,
|
||||||
to: selfE164 ?? "me",
|
conversationId: from,
|
||||||
body,
|
to: selfE164 ?? "me",
|
||||||
|
body,
|
||||||
pushName: senderName,
|
pushName: senderName,
|
||||||
timestamp,
|
timestamp,
|
||||||
chatType: group ? "group" : "direct",
|
chatType: group ? "group" : "direct",
|
||||||
@@ -248,8 +249,12 @@ export async function monitorWebInbox(options: {
|
|||||||
sendComposing,
|
sendComposing,
|
||||||
reply,
|
reply,
|
||||||
sendMedia,
|
sendMedia,
|
||||||
mediaPath,
|
mediaPath,
|
||||||
mediaType,
|
mediaType,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
void task.catch((err) => {
|
||||||
|
console.error("Failed handling inbound web message:", String(err));
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error("Failed handling inbound web message:", String(err));
|
console.error("Failed handling inbound web message:", String(err));
|
||||||
|
|||||||
@@ -114,6 +114,43 @@ describe("web monitor inbox", () => {
|
|||||||
await listener.close();
|
await listener.close();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("does not block follow-up messages when handler is pending", async () => {
|
||||||
|
let resolveFirst: (() => void) | null = null;
|
||||||
|
const onMessage = vi.fn(async () => {
|
||||||
|
if (!resolveFirst) {
|
||||||
|
await new Promise<void>((resolve) => {
|
||||||
|
resolveFirst = resolve;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const listener = await monitorWebInbox({ verbose: false, onMessage });
|
||||||
|
const sock = await createWaSocket();
|
||||||
|
const upsert = {
|
||||||
|
type: "notify",
|
||||||
|
messages: [
|
||||||
|
{
|
||||||
|
key: { id: "abc1", fromMe: false, remoteJid: "999@s.whatsapp.net" },
|
||||||
|
message: { conversation: "ping" },
|
||||||
|
messageTimestamp: 1_700_000_000,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: { id: "abc2", fromMe: false, remoteJid: "999@s.whatsapp.net" },
|
||||||
|
message: { conversation: "pong" },
|
||||||
|
messageTimestamp: 1_700_000_001,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
sock.ev.emit("messages.upsert", upsert);
|
||||||
|
await new Promise((resolve) => setImmediate(resolve));
|
||||||
|
|
||||||
|
expect(onMessage).toHaveBeenCalledTimes(2);
|
||||||
|
|
||||||
|
resolveFirst?.();
|
||||||
|
await listener.close();
|
||||||
|
});
|
||||||
|
|
||||||
it("captures media path for image messages", async () => {
|
it("captures media path for image messages", async () => {
|
||||||
const onMessage = vi.fn();
|
const onMessage = vi.fn();
|
||||||
const listener = await monitorWebInbox({ verbose: false, onMessage });
|
const listener = await monitorWebInbox({ verbose: false, onMessage });
|
||||||
|
|||||||
Reference in New Issue
Block a user