* fix(feishu): comprehensive reply mechanism fix — outbound replyToId forwarding + topic-aware reply targeting - Forward replyToId from ChannelOutboundContext through sendText/sendMedia to sendMessageFeishu/sendMarkdownCardFeishu/sendMediaFeishu, enabling reply-to-message via the message tool. - Fix group reply targeting: use ctx.messageId (triggering message) in normal groups to prevent silent topic thread creation (#32980). Preserve ctx.rootId targeting for topic-mode groups (group_topic/group_topic_sender) and groups with explicit replyInThread config. - Add regression tests for both fixes. Fixes #32980 Fixes #32958 Related #19784 * fix: normalize Feishu delivery.to before comparing with messaging tool targets - Add normalizeDeliveryTarget helper to strip user:/chat: prefixes for Feishu - Apply normalization in matchesMessagingToolDeliveryTarget before comparison - This ensures cron duplicate suppression works when session uses prefixed targets (user:ou_xxx) but messaging tool extract uses normalized bare IDs (ou_xxx) Fixes review comment on PR #32755 (cherry picked from commit fc20106f16ccc88a5f02e58922bb7b7999fe9dcd) * fix(feishu): catch thrown SDK errors for withdrawn reply targets The Feishu Lark SDK can throw exceptions (SDK errors with .code or AxiosErrors with .response.data.code) for withdrawn/deleted reply targets, in addition to returning error codes in the response object. Wrap reply calls in sendMessageFeishu and sendCardFeishu with try-catch to handle thrown withdrawn/not-found errors (230011, 231003) and fall back to client.im.message.create, matching the existing response-level fallback behavior. Also extract sendFallbackDirect helper to deduplicate the direct-send fallback block across both functions. Closes #33496 (cherry picked from commit ad0901aec103a2c52f186686cfaf5f8ba54b4a48) * feishu: forward outbound reply target context (cherry picked from commit c129a691fcf552a1cebe1e8a22ea8611ffc3b377) * feishu extension: tighten reply target fallback semantics (cherry picked from commit f85ec610f267020b66713c09e648ec004b2e26f1) * fix(feishu): align synthesized fallback typing and changelog attribution * test(feishu): cover group_topic_sender reply targeting --------- Co-authored-by: Xu Zimo <xuzimojimmy@163.com> Co-authored-by: Munem Hashmi <munem.hashmi@gmail.com> Co-authored-by: bmendonca3 <bmendonca3@users.noreply.github.com> Co-authored-by: Tak Hoffman <781889+Takhoffman@users.noreply.github.com>
176 lines
5.2 KiB
TypeScript
176 lines
5.2 KiB
TypeScript
import fs from "fs";
|
|
import path from "path";
|
|
import type { ChannelOutboundAdapter } from "openclaw/plugin-sdk/feishu";
|
|
import { resolveFeishuAccount } from "./accounts.js";
|
|
import { sendMediaFeishu } from "./media.js";
|
|
import { getFeishuRuntime } from "./runtime.js";
|
|
import { sendMarkdownCardFeishu, sendMessageFeishu } from "./send.js";
|
|
|
|
function normalizePossibleLocalImagePath(text: string | undefined): string | null {
|
|
const raw = text?.trim();
|
|
if (!raw) return null;
|
|
|
|
// Only auto-convert when the message is a pure path-like payload.
|
|
// Avoid converting regular sentences that merely contain a path.
|
|
const hasWhitespace = /\s/.test(raw);
|
|
if (hasWhitespace) return null;
|
|
|
|
// Ignore links/data URLs; those should stay in normal mediaUrl/text paths.
|
|
if (/^(https?:\/\/|data:|file:\/\/)/i.test(raw)) return null;
|
|
|
|
const ext = path.extname(raw).toLowerCase();
|
|
const isImageExt = [".jpg", ".jpeg", ".png", ".gif", ".webp", ".bmp", ".ico", ".tiff"].includes(
|
|
ext,
|
|
);
|
|
if (!isImageExt) return null;
|
|
|
|
if (!path.isAbsolute(raw)) return null;
|
|
if (!fs.existsSync(raw)) return null;
|
|
|
|
// Fix race condition: wrap statSync in try-catch to handle file deletion
|
|
// between existsSync and statSync
|
|
try {
|
|
if (!fs.statSync(raw).isFile()) return null;
|
|
} catch {
|
|
// File may have been deleted or became inaccessible between checks
|
|
return null;
|
|
}
|
|
|
|
return raw;
|
|
}
|
|
|
|
function shouldUseCard(text: string): boolean {
|
|
return /```[\s\S]*?```/.test(text) || /\|.+\|[\r\n]+\|[-:| ]+\|/.test(text);
|
|
}
|
|
|
|
function resolveReplyToMessageId(params: {
|
|
replyToId?: string | null;
|
|
threadId?: string | number | null;
|
|
}): string | undefined {
|
|
const replyToId = params.replyToId?.trim();
|
|
if (replyToId) {
|
|
return replyToId;
|
|
}
|
|
if (params.threadId == null) {
|
|
return undefined;
|
|
}
|
|
const trimmed = String(params.threadId).trim();
|
|
return trimmed || undefined;
|
|
}
|
|
|
|
async function sendOutboundText(params: {
|
|
cfg: Parameters<typeof sendMessageFeishu>[0]["cfg"];
|
|
to: string;
|
|
text: string;
|
|
replyToMessageId?: string;
|
|
accountId?: string;
|
|
}) {
|
|
const { cfg, to, text, accountId, replyToMessageId } = params;
|
|
const account = resolveFeishuAccount({ cfg, accountId });
|
|
const renderMode = account.config?.renderMode ?? "auto";
|
|
|
|
if (renderMode === "card" || (renderMode === "auto" && shouldUseCard(text))) {
|
|
return sendMarkdownCardFeishu({ cfg, to, text, accountId, replyToMessageId });
|
|
}
|
|
|
|
return sendMessageFeishu({ cfg, to, text, accountId, replyToMessageId });
|
|
}
|
|
|
|
export const feishuOutbound: ChannelOutboundAdapter = {
|
|
deliveryMode: "direct",
|
|
chunker: (text, limit) => getFeishuRuntime().channel.text.chunkMarkdownText(text, limit),
|
|
chunkerMode: "markdown",
|
|
textChunkLimit: 4000,
|
|
sendText: async ({ cfg, to, text, accountId, replyToId, threadId }) => {
|
|
const replyToMessageId = resolveReplyToMessageId({ replyToId, threadId });
|
|
// Scheme A compatibility shim:
|
|
// when upstream accidentally returns a local image path as plain text,
|
|
// auto-upload and send as Feishu image message instead of leaking path text.
|
|
const localImagePath = normalizePossibleLocalImagePath(text);
|
|
if (localImagePath) {
|
|
try {
|
|
const result = await sendMediaFeishu({
|
|
cfg,
|
|
to,
|
|
mediaUrl: localImagePath,
|
|
accountId: accountId ?? undefined,
|
|
replyToMessageId,
|
|
});
|
|
return { channel: "feishu", ...result };
|
|
} catch (err) {
|
|
console.error(`[feishu] local image path auto-send failed:`, err);
|
|
// fall through to plain text as last resort
|
|
}
|
|
}
|
|
|
|
const result = await sendOutboundText({
|
|
cfg,
|
|
to,
|
|
text,
|
|
accountId: accountId ?? undefined,
|
|
replyToMessageId,
|
|
});
|
|
return { channel: "feishu", ...result };
|
|
},
|
|
sendMedia: async ({
|
|
cfg,
|
|
to,
|
|
text,
|
|
mediaUrl,
|
|
accountId,
|
|
mediaLocalRoots,
|
|
replyToId,
|
|
threadId,
|
|
}) => {
|
|
const replyToMessageId = resolveReplyToMessageId({ replyToId, threadId });
|
|
// Send text first if provided
|
|
if (text?.trim()) {
|
|
await sendOutboundText({
|
|
cfg,
|
|
to,
|
|
text,
|
|
accountId: accountId ?? undefined,
|
|
replyToMessageId,
|
|
});
|
|
}
|
|
|
|
// Upload and send media if URL or local path provided
|
|
if (mediaUrl) {
|
|
try {
|
|
const result = await sendMediaFeishu({
|
|
cfg,
|
|
to,
|
|
mediaUrl,
|
|
accountId: accountId ?? undefined,
|
|
mediaLocalRoots,
|
|
replyToMessageId,
|
|
});
|
|
return { channel: "feishu", ...result };
|
|
} catch (err) {
|
|
// Log the error for debugging
|
|
console.error(`[feishu] sendMediaFeishu failed:`, err);
|
|
// Fallback to URL link if upload fails
|
|
const fallbackText = `📎 ${mediaUrl}`;
|
|
const result = await sendOutboundText({
|
|
cfg,
|
|
to,
|
|
text: fallbackText,
|
|
accountId: accountId ?? undefined,
|
|
replyToMessageId,
|
|
});
|
|
return { channel: "feishu", ...result };
|
|
}
|
|
}
|
|
|
|
// No media URL, just return text result
|
|
const result = await sendOutboundText({
|
|
cfg,
|
|
to,
|
|
text: text ?? "",
|
|
accountId: accountId ?? undefined,
|
|
replyToMessageId,
|
|
});
|
|
return { channel: "feishu", ...result };
|
|
},
|
|
};
|