claudia.keller/openclaw-matrix-multiaccounts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: deduplicate E2EE events + add debug logs

Browse source 
- Add event deduplication to prevent double-processing from room.message + room.decrypted_event
- Add console.log DEBUG output for decrypted_event and failed_decryption to diagnose E2EE file issues
This commit is contained in:
Claudia 2026-02-01 19:37:25 +01:00
parent 8e36620140
commit fc96f0e967
1 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/matrix/monitor/events.ts
View file

@ -26,7 +26,41 @@ export function registerMatrixMonitorEvents(params: {
onRoomMessage,
} = params;
client.on("room.message", onRoomMessage);
// Track processed event IDs to avoid double-processing from room.message + room.decrypted_event
const processedEvents = new Set<string>();
const PROCESSED_EVENTS_MAX = 1000;
const deduplicatedHandler = async (roomId: string, event: MatrixRawEvent, source: string) => {
const eventId = event?.event_id;
if (!eventId) {
logVerboseMessage(`matrix: ${source} event has no id, processing anyway`);
await onRoomMessage(roomId, event);
return;
}
if (processedEvents.has(eventId)) {
logVerboseMessage(`matrix: ${source} skipping duplicate event id=${eventId}`);
return;
}
processedEvents.add(eventId);
// Prevent memory leak by clearing old entries
if (processedEvents.size > PROCESSED_EVENTS_MAX) {
const iterator = processedEvents.values();
for (let i = 0; i < 100; i++) {
const next = iterator.next();
if (next.done) break;
processedEvents.delete(next.value);
}
}
logVerboseMessage(`matrix: ${source} processing event id=${eventId} room=${roomId}`);
await onRoomMessage(roomId, event);
};
client.on("room.message", (roomId: string, event: MatrixRawEvent) => {
deduplicatedHandler(roomId, event, "room.message");
});
client.on("room.encrypted_event", (roomId: string, event: MatrixRawEvent) => {
const eventId = event?.event_id ?? "unknown";
@ -37,14 +71,21 @@ export function registerMatrixMonitorEvents(params: {
client.on("room.decrypted_event", (roomId: string, event: MatrixRawEvent) => {
const eventId = event?.event_id ?? "unknown";
const eventType = event?.type ?? "unknown";
const content = event?.content as Record<string, unknown> | undefined;
const hasFile = content && "file" in content;
const hasUrl = content && "url" in content;
// DEBUG: Always log decrypted events with file info
console.log(`[MATRIX-E2EE-DEBUG] decrypted_event room=${roomId} type=${eventType} id=${eventId} hasFile=${hasFile} hasUrl=${hasUrl}`);
logVerboseMessage(`matrix: decrypted event room=${roomId} type=${eventType} id=${eventId}`);
// Process decrypted messages through the normal handler
onRoomMessage(roomId, event);
// Process decrypted messages through the deduplicated handler
deduplicatedHandler(roomId, event, "room.decrypted_event");
});
client.on(
"room.failed_decryption",
async (roomId: string, event: MatrixRawEvent, error: Error) => {
// DEBUG: Always log failed decryption
console.log(`[MATRIX-E2EE-DEBUG] FAILED_DECRYPTION room=${roomId} id=${event.event_id ?? "unknown"} error=${error.message}`);
logger.warn(
{ roomId, eventId: event.event_id, error: error.message },
"Failed to decrypt message",