fix(ci): restore main checks after bulk merges

This commit is contained in:
Peter Steinberger
2026-02-16 23:47:27 +00:00
parent 8c241449f5
commit 12a947223b
8 changed files with 71 additions and 79 deletions

View File

@@ -366,7 +366,10 @@ export async function monitorWebInbox(options: {
const sendApi = createWebSendApi({
sock: {
sendMessage: (jid, content, options) => sock.sendMessage(jid, content, options),
sendMessage: (jid, content, options) =>
options === undefined
? sock.sendMessage(jid, content)
: sock.sendMessage(jid, content, options),
sendPresenceUpdate: (presence, jid?: string) => sock.sendPresenceUpdate(presence, jid),
},
defaultAccountId: options.accountId,

View File

@@ -7,6 +7,8 @@ import { describe, expect, it, vi } from "vitest";
import { setLoggerOverride } from "../logging.js";
import { monitorWebInbox } from "./inbound.js";
import {
DEFAULT_ACCOUNT_ID,
getAuthDir,
getSock,
installWebMonitorInboxUnitTestHooks,
mockLoadConfig,
@@ -15,9 +17,18 @@ import {
describe("web monitor inbox", () => {
installWebMonitorInboxUnitTestHooks();
async function openMonitor(onMessage = vi.fn()) {
return await monitorWebInbox({
verbose: false,
accountId: DEFAULT_ACCOUNT_ID,
authDir: getAuthDir(),
onMessage,
});
}
it("captures media path for image messages", async () => {
const onMessage = vi.fn();
const listener = await monitorWebInbox({ verbose: false, onMessage });
const listener = await openMonitor(onMessage);
const sock = getSock();
const upsert = {
type: "notify",
@@ -52,7 +63,7 @@ describe("web monitor inbox", () => {
it("sets gifPlayback on outbound video payloads when requested", async () => {
const onMessage = vi.fn();
const listener = await monitorWebInbox({ verbose: false, onMessage });
const listener = await openMonitor(onMessage);
const sock = getSock();
const buf = Buffer.from("gifvid");
@@ -71,10 +82,7 @@ describe("web monitor inbox", () => {
});
it("resolves onClose when the socket closes", async () => {
const listener = await monitorWebInbox({
verbose: false,
onMessage: vi.fn(),
});
const listener = await openMonitor(vi.fn());
const sock = getSock();
const reasonPromise = listener.onClose;
sock.ev.emit("connection.update", {
@@ -92,7 +100,7 @@ describe("web monitor inbox", () => {
setLoggerOverride({ level: "trace", file: logPath });
const onMessage = vi.fn();
const listener = await monitorWebInbox({ verbose: false, onMessage });
const listener = await openMonitor(onMessage);
const sock = getSock();
const upsert = {
type: "notify",
@@ -109,7 +117,16 @@ describe("web monitor inbox", () => {
sock.ev.emit("messages.upsert", upsert);
await new Promise((resolve) => setImmediate(resolve));
const content = fsSync.readFileSync(logPath, "utf-8");
const content = await (async () => {
const deadline = Date.now() + 2_000;
while (Date.now() < deadline) {
if (fsSync.existsSync(logPath)) {
return fsSync.readFileSync(logPath, "utf-8");
}
await new Promise((resolve) => setTimeout(resolve, 25));
}
throw new Error(`expected log file to exist: ${logPath}`);
})();
expect(content).toMatch(/web-inbound/);
expect(content).toMatch(/ping/);
await listener.close();
@@ -117,7 +134,7 @@ describe("web monitor inbox", () => {
it("includes participant when marking group messages read", async () => {
const onMessage = vi.fn();
const listener = await monitorWebInbox({ verbose: false, onMessage });
const listener = await openMonitor(onMessage);
const sock = getSock();
const upsert = {
type: "notify",
@@ -150,7 +167,7 @@ describe("web monitor inbox", () => {
it("passes through group messages with participant metadata", async () => {
const onMessage = vi.fn();
const listener = await monitorWebInbox({ verbose: false, onMessage });
const listener = await openMonitor(onMessage);
const sock = getSock();
const upsert = {
type: "notify",
@@ -190,7 +207,7 @@ describe("web monitor inbox", () => {
it("unwraps ephemeral messages, preserves mentions, and still delivers group pings", async () => {
const onMessage = vi.fn();
const listener = await monitorWebInbox({ verbose: false, onMessage });
const listener = await openMonitor(onMessage);
const sock = getSock();
const upsert = {
type: "notify",
@@ -249,7 +266,7 @@ describe("web monitor inbox", () => {
});
const onMessage = vi.fn();
const listener = await monitorWebInbox({ verbose: false, onMessage });
const listener = await openMonitor(onMessage);
const sock = getSock();
const upsert = {
type: "notify",