feat: enhance BlueBubbles group message handling by adding account-specific logging and improving typing signal conditions

This commit is contained in:
Tyler Yust
2026-01-20 01:03:34 -08:00
committed by Peter Steinberger
parent d9a2ac7e72
commit 199fef2a5e
7 changed files with 59 additions and 14 deletions

1
Peekaboo Submodule

Submodule Peekaboo added at 5c195f5e46

View File

@@ -43,21 +43,28 @@ function logGroupAllowlistHint(params: {
reason: string; reason: string;
entry: string | null; entry: string | null;
chatName?: string; chatName?: string;
accountId?: string;
}): void { }): void {
const logger = params.runtime.log; const logger = params.runtime.log;
if (!logger) return; if (!logger) return;
const nameHint = params.chatName ? ` (group name: ${params.chatName})` : ""; const nameHint = params.chatName ? ` (group name: ${params.chatName})` : "";
const accountHint = params.accountId
? ` (or channels.bluebubbles.accounts.${params.accountId}.groupAllowFrom)`
: "";
if (params.entry) { if (params.entry) {
logger( logger(
`[bluebubbles] group message blocked (${params.reason}). Allow this group by adding ` + `[bluebubbles] group message blocked (${params.reason}). Allow this group by adding ` +
`"${params.entry}" to channels.bluebubbles.groupAllowFrom${nameHint}.`, `"${params.entry}" to channels.bluebubbles.groupAllowFrom${nameHint}.`,
); );
logger(
`[bluebubbles] add to config: channels.bluebubbles.groupAllowFrom=["${params.entry}"]${accountHint}.`,
);
return; return;
} }
logger( logger(
`[bluebubbles] group message blocked (${params.reason}). Allow groups by setting ` + `[bluebubbles] group message blocked (${params.reason}). Allow groups by setting ` +
`channels.bluebubbles.groupPolicy="open" or adding a group id to ` + `channels.bluebubbles.groupPolicy="open" or adding a group id to ` +
`channels.bluebubbles.groupAllowFrom${nameHint}.`, `channels.bluebubbles.groupAllowFrom${accountHint}${nameHint}.`,
); );
} }
@@ -921,6 +928,7 @@ async function processMessage(
reason: "groupPolicy=disabled", reason: "groupPolicy=disabled",
entry: groupAllowEntry, entry: groupAllowEntry,
chatName: groupName, chatName: groupName,
accountId: account.accountId,
}); });
return; return;
} }
@@ -932,6 +940,7 @@ async function processMessage(
reason: "groupPolicy=allowlist (empty allowlist)", reason: "groupPolicy=allowlist (empty allowlist)",
entry: groupAllowEntry, entry: groupAllowEntry,
chatName: groupName, chatName: groupName,
accountId: account.accountId,
}); });
return; return;
} }
@@ -958,6 +967,7 @@ async function processMessage(
reason: "groupPolicy=allowlist (not allowlisted)", reason: "groupPolicy=allowlist (not allowlisted)",
entry: groupAllowEntry, entry: groupAllowEntry,
chatName: groupName, chatName: groupName,
accountId: account.accountId,
}); });
return; return;
} }

View File

@@ -116,7 +116,6 @@ export function createFollowupRunner(params: {
}; };
return async (queued: FollowupRun) => { return async (queued: FollowupRun) => {
await typingSignals.signalRunStart();
try { try {
const runId = crypto.randomUUID(); const runId = crypto.randomUUID();
if (queued.run.sessionKey) { if (queued.run.sessionKey) {

View File

@@ -456,10 +456,6 @@ export async function runPreparedReply(
}, },
}; };
if (typingSignals.shouldStartImmediately) {
await typingSignals.signalRunStart();
}
return runReplyAgent({ return runReplyAgent({
commandBody: prefixedCommandBody, commandBody: prefixedCommandBody,
followupRun, followupRun,

View File

@@ -106,8 +106,9 @@ describe("createTypingSignaler", () => {
await signaler.signalMessageStart(); await signaler.signalMessageStart();
expect(typing.startTypingLoop).toHaveBeenCalled(); expect(typing.startTypingLoop).not.toHaveBeenCalled();
expect(typing.startTypingOnText).not.toHaveBeenCalled(); await signaler.signalTextDelta("hello");
expect(typing.startTypingOnText).toHaveBeenCalledWith("hello");
}); });
it("signals on reasoning for thinking mode", async () => { it("signals on reasoning for thinking mode", async () => {
@@ -119,7 +120,8 @@ describe("createTypingSignaler", () => {
}); });
await signaler.signalReasoningDelta(); await signaler.signalReasoningDelta();
expect(typing.startTypingLoop).not.toHaveBeenCalled();
await signaler.signalTextDelta("hi");
expect(typing.startTypingLoop).toHaveBeenCalled(); expect(typing.startTypingLoop).toHaveBeenCalled();
}); });
@@ -133,11 +135,12 @@ describe("createTypingSignaler", () => {
await signaler.signalTextDelta("hi"); await signaler.signalTextDelta("hi");
expect(typing.startTypingLoop).toHaveBeenCalled();
expect(typing.refreshTypingTtl).toHaveBeenCalled(); expect(typing.refreshTypingTtl).toHaveBeenCalled();
expect(typing.startTypingOnText).not.toHaveBeenCalled(); expect(typing.startTypingOnText).not.toHaveBeenCalled();
}); });
it("starts typing on tool start when inactive", async () => { it("does not start typing on tool start before text", async () => {
const typing = createMockTypingController(); const typing = createMockTypingController();
const signaler = createTypingSignaler({ const signaler = createTypingSignaler({
typing, typing,
@@ -147,11 +150,11 @@ describe("createTypingSignaler", () => {
await signaler.signalToolStart(); await signaler.signalToolStart();
expect(typing.startTypingLoop).toHaveBeenCalled(); expect(typing.startTypingLoop).not.toHaveBeenCalled();
expect(typing.refreshTypingTtl).toHaveBeenCalled(); expect(typing.refreshTypingTtl).not.toHaveBeenCalled();
}); });
it("refreshes ttl on tool start when active", async () => { it("refreshes ttl on tool start when active after text", async () => {
const typing = createMockTypingController({ const typing = createMockTypingController({
isActive: vi.fn(() => true), isActive: vi.fn(() => true),
}); });
@@ -161,6 +164,10 @@ describe("createTypingSignaler", () => {
isHeartbeat: false, isHeartbeat: false,
}); });
await signaler.signalTextDelta("hello");
typing.startTypingLoop.mockClear();
typing.startTypingOnText.mockClear();
typing.refreshTypingTtl.mockClear();
await signaler.signalToolStart(); await signaler.signalToolStart();
expect(typing.refreshTypingTtl).toHaveBeenCalled(); expect(typing.refreshTypingTtl).toHaveBeenCalled();

View File

@@ -1,4 +1,5 @@
import type { TypingMode } from "../../config/types.js"; import type { TypingMode } from "../../config/types.js";
import { isSilentReplyText, SILENT_REPLY_TOKEN } from "../tokens.js";
import type { TypingController } from "./typing.js"; import type { TypingController } from "./typing.js";
export type TypingModeContext = { export type TypingModeContext = {
@@ -46,6 +47,13 @@ export function createTypingSignaler(params: {
const shouldStartOnText = mode === "message" || mode === "instant"; const shouldStartOnText = mode === "message" || mode === "instant";
const shouldStartOnReasoning = mode === "thinking"; const shouldStartOnReasoning = mode === "thinking";
const disabled = isHeartbeat || mode === "never"; const disabled = isHeartbeat || mode === "never";
let hasRenderableText = false;
const isRenderableText = (text?: string): boolean => {
const trimmed = text?.trim();
if (!trimmed) return false;
return !isSilentReplyText(trimmed, SILENT_REPLY_TOKEN);
};
const signalRunStart = async () => { const signalRunStart = async () => {
if (disabled || !shouldStartImmediately) return; if (disabled || !shouldStartImmediately) return;
@@ -54,28 +62,40 @@ export function createTypingSignaler(params: {
const signalMessageStart = async () => { const signalMessageStart = async () => {
if (disabled || !shouldStartOnMessageStart) return; if (disabled || !shouldStartOnMessageStart) return;
if (!hasRenderableText) return;
await typing.startTypingLoop(); await typing.startTypingLoop();
}; };
const signalTextDelta = async (text?: string) => { const signalTextDelta = async (text?: string) => {
if (disabled) return; if (disabled) return;
const renderable = isRenderableText(text);
if (renderable) {
hasRenderableText = true;
} else if (text?.trim()) {
return;
}
if (shouldStartOnText) { if (shouldStartOnText) {
await typing.startTypingOnText(text); await typing.startTypingOnText(text);
return; return;
} }
if (shouldStartOnReasoning) { if (shouldStartOnReasoning) {
if (!typing.isActive()) {
await typing.startTypingLoop();
}
typing.refreshTypingTtl(); typing.refreshTypingTtl();
} }
}; };
const signalReasoningDelta = async () => { const signalReasoningDelta = async () => {
if (disabled || !shouldStartOnReasoning) return; if (disabled || !shouldStartOnReasoning) return;
if (!hasRenderableText) return;
await typing.startTypingLoop(); await typing.startTypingLoop();
typing.refreshTypingTtl(); typing.refreshTypingTtl();
}; };
const signalToolStart = async () => { const signalToolStart = async () => {
if (disabled) return; if (disabled) return;
if (!hasRenderableText) return;
if (!typing.isActive()) { if (!typing.isActive()) {
await typing.startTypingLoop(); await typing.startTypingLoop();
typing.refreshTypingTtl(); typing.refreshTypingTtl();

View File

@@ -29,6 +29,17 @@ function isHeicSource(opts: { contentType?: string; fileName?: string }): boolea
return false; return false;
} }
function toJpegFileName(fileName?: string): string | undefined {
if (!fileName) return undefined;
const trimmed = fileName.trim();
if (!trimmed) return fileName;
const parsed = path.parse(trimmed);
if (!parsed.ext || HEIC_EXT_RE.test(parsed.ext)) {
return path.format({ dir: parsed.dir, name: parsed.name || trimmed, ext: ".jpg" });
}
return path.format({ dir: parsed.dir, name: parsed.name, ext: ".jpg" });
}
async function loadWebMediaInternal( async function loadWebMediaInternal(
mediaUrl: string, mediaUrl: string,
options: WebMediaOptions = {}, options: WebMediaOptions = {},
@@ -50,6 +61,7 @@ async function loadWebMediaInternal(
) => { ) => {
const originalSize = buffer.length; const originalSize = buffer.length;
const optimized = await optimizeImageToJpeg(buffer, cap, meta); const optimized = await optimizeImageToJpeg(buffer, cap, meta);
const fileName = meta && isHeicSource(meta) ? toJpegFileName(meta.fileName) : meta?.fileName;
if (optimized.optimizedSize < originalSize && shouldLogVerbose()) { if (optimized.optimizedSize < originalSize && shouldLogVerbose()) {
logVerbose( logVerbose(
`Optimized media from ${(originalSize / (1024 * 1024)).toFixed(2)}MB to ${(optimized.optimizedSize / (1024 * 1024)).toFixed(2)}MB (side≤${optimized.resizeSide}px, q=${optimized.quality})`, `Optimized media from ${(originalSize / (1024 * 1024)).toFixed(2)}MB to ${(optimized.optimizedSize / (1024 * 1024)).toFixed(2)}MB (side≤${optimized.resizeSide}px, q=${optimized.quality})`,
@@ -67,6 +79,7 @@ async function loadWebMediaInternal(
buffer: optimized.buffer, buffer: optimized.buffer,
contentType: "image/jpeg", contentType: "image/jpeg",
kind: "image" as const, kind: "image" as const,
fileName,
}; };
}; };
@@ -103,7 +116,6 @@ async function loadWebMediaInternal(
contentType: params.contentType, contentType: params.contentType,
fileName: params.fileName, fileName: params.fileName,
})), })),
fileName: params.fileName,
}; };
} }
if (params.buffer.length > cap) { if (params.buffer.length > cap) {