mirror of
https://github.com/openclaw/openclaw.git
synced 2026-03-14 11:30:41 +00:00
caf5d2dd7c
The Matrix channel previously hardcoded `listMatrixAccountIds` to always return only `DEFAULT_ACCOUNT_ID`, ignoring any accounts configured in `channels.matrix.accounts`. This prevented running multiple Matrix bot accounts simultaneously. Changes: - Update `listMatrixAccountIds` to read from `channels.matrix.accounts` config, falling back to `DEFAULT_ACCOUNT_ID` for legacy single-account configurations - Add `resolveMatrixConfigForAccount` to resolve config for a specific account ID, merging account-specific values with top-level defaults - Update `resolveMatrixAccount` to use account-specific config when available - The multi-account config structure (channels.matrix.accounts) was not defined in the MatrixConfig type, causing TypeScript to not recognize the field. Added the accounts field to properly type the multi-account configuration. - Add stopSharedClientForAccount() to stop only the specific account's client instead of all clients when an account shuts down - Wrap dynamic import in try/finally to prevent startup mutex deadlock if the import fails - Pass accountId to resolveSharedMatrixClient(), resolveMatrixAuth(), and createMatrixClient() to ensure the correct account's credentials are used for outbound messages - Add accountId parameter to resolveMediaMaxBytes to check account-specific config before falling back to top-level config - Maintain backward compatibility with existing single-account setups This follows the same pattern already used by the WhatsApp channel for multi-account support. Fixes #3165 Fixes #3085 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
56 lines
1.9 KiB
TypeScript
56 lines
1.9 KiB
TypeScript
import type { ChannelOutboundAdapter } from "openclaw/plugin-sdk";
|
|
import { sendMessageMatrix, sendPollMatrix } from "./matrix/send.js";
|
|
import { getMatrixRuntime } from "./runtime.js";
|
|
|
|
export const matrixOutbound: ChannelOutboundAdapter = {
|
|
deliveryMode: "direct",
|
|
chunker: (text, limit) => getMatrixRuntime().channel.text.chunkMarkdownText(text, limit),
|
|
chunkerMode: "markdown",
|
|
textChunkLimit: 4000,
|
|
sendText: async ({ to, text, deps, replyToId, threadId, accountId }) => {
|
|
const send = deps?.sendMatrix ?? sendMessageMatrix;
|
|
const resolvedThreadId =
|
|
threadId !== undefined && threadId !== null ? String(threadId) : undefined;
|
|
const result = await send(to, text, {
|
|
replyToId: replyToId ?? undefined,
|
|
threadId: resolvedThreadId,
|
|
accountId: accountId ?? undefined,
|
|
});
|
|
return {
|
|
channel: "matrix",
|
|
messageId: result.messageId,
|
|
roomId: result.roomId,
|
|
};
|
|
},
|
|
sendMedia: async ({ to, text, mediaUrl, deps, replyToId, threadId, accountId }) => {
|
|
const send = deps?.sendMatrix ?? sendMessageMatrix;
|
|
const resolvedThreadId =
|
|
threadId !== undefined && threadId !== null ? String(threadId) : undefined;
|
|
const result = await send(to, text, {
|
|
mediaUrl,
|
|
replyToId: replyToId ?? undefined,
|
|
threadId: resolvedThreadId,
|
|
accountId: accountId ?? undefined,
|
|
});
|
|
return {
|
|
channel: "matrix",
|
|
messageId: result.messageId,
|
|
roomId: result.roomId,
|
|
};
|
|
},
|
|
sendPoll: async ({ to, poll, threadId, accountId }) => {
|
|
const resolvedThreadId =
|
|
threadId !== undefined && threadId !== null ? String(threadId) : undefined;
|
|
const result = await sendPollMatrix(to, poll, {
|
|
threadId: resolvedThreadId,
|
|
accountId: accountId ?? undefined,
|
|
});
|
|
return {
|
|
channel: "matrix",
|
|
messageId: result.eventId,
|
|
roomId: result.roomId,
|
|
pollId: result.eventId,
|
|
};
|
|
},
|
|
};
|