@xmoxmo/bncr 0.4.1 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmoxmo/bncr",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "private": false,
   "type": "module",
   "license": "MIT",

package/src/bootstrap/runtime-discovery.ts

@@ -153,6 +153,10 @@ function ensurePluginNodeModulesLink(pluginDir: string, targetRoot: string) {
 }
 
 export function resolveBncrRuntimeSourceDir(pluginDir: string) {
+  const pluginRoot = resolveBncrPluginRoot(pluginDir);
+  const rootSource = path.join(pluginRoot, 'src');
+  if (fs.existsSync(path.join(rootSource, 'channel.ts'))) return rootSource;
+
   const direct = path.join(pluginDir, 'src');
   if (fs.existsSync(path.join(direct, 'channel.ts'))) return direct;
 

package/src/bootstrap/runtime-loader.ts

@@ -15,9 +15,30 @@ export type LoadedRuntime = {
   createBncrChannelPlugin: ChannelModule['createBncrChannelPlugin'];
 };
 
-export const pluginFile = fileURLToPath(new URL('../../index.ts', import.meta.url));
+export function resolvePluginEntryFileFromModule(moduleUrl: string) {
+  const currentFile = fileURLToPath(moduleUrl);
+  const pluginRoot = resolveBncrPluginRoot(currentFile);
+  const currentDir = path.dirname(currentFile);
+  const distEntry = path.join(pluginRoot, 'dist', 'index.js');
+  if (currentFile === distEntry && fs.existsSync(distEntry)) return distEntry;
+
+  const sourceEntry = path.join(pluginRoot, 'index.ts');
+  if (fs.existsSync(sourceEntry)) return sourceEntry;
+
+  if (fs.existsSync(distEntry)) return distEntry;
+
+  if (path.basename(currentDir) === 'dist') return distEntry;
+
+  return sourceEntry;
+}
+
+function resolvePluginEntryFile() {
+  return resolvePluginEntryFileFromModule(import.meta.url);
+}
+
+export const pluginFile = resolvePluginEntryFile();
 export const pluginDir = path.dirname(pluginFile);
-export const pluginRequire = createRequire(new URL('../../index.ts', import.meta.url));
+export const pluginRequire = createRequire(pluginFile);
 export const pluginRoot = resolveBncrPluginRoot(pluginFile);
 
 const runtimeSourceDir = resolveBncrRuntimeSourceDir(pluginDir);

package/src/messaging/outbound/build-send-action.ts

@@ -12,6 +12,7 @@ type MinimalBncrSendInput = {
   media?: string;
   filePath?: string;
   mediaUrl?: string;
+  mediaUrls?: string[];
   asVoice?: boolean;
   audioAsVoice?: boolean;
   params?: Record<string, unknown>;
@@ -73,13 +74,19 @@ export function buildBncrMessageAction(input: MinimalBncrSendInput): BuiltBncrMe
     input.filePath,
     input.mediaUrl,
   );
+  const rawMediaUrls = Array.isArray(paramsObj.mediaUrls)
+    ? paramsObj.mediaUrls
+    : Array.isArray(input.mediaUrls)
+      ? input.mediaUrls
+      : undefined;
+  const mediaUrls = rawMediaUrls?.map((value) => asString(value || '').trim()).filter(Boolean);
 
   const message = pickFirstString(paramsObj.message, input.message) ?? '';
   const explicitCaption = pickFirstString(paramsObj.caption, input.caption) ?? '';
   const asVoice = pickFirstBoolean(paramsObj.asVoice, input.asVoice);
   const audioAsVoice = pickFirstBoolean(paramsObj.audioAsVoice, input.audioAsVoice);
 
-  if ((asVoice === true || audioAsVoice === true) && !mediaPath) {
+  if ((asVoice === true || audioAsVoice === true) && !mediaPath && !mediaUrls?.length) {
     throw new Error('bncr voice send requires media path');
   }
 
@@ -93,11 +100,20 @@ export function buildBncrMessageAction(input: MinimalBncrSendInput): BuiltBncrMe
     const finalCaption = explicitCaption || message;
     if (finalCaption) normalizedParams.caption = finalCaption;
     delete normalizedParams.message;
+    if (mediaUrls?.length) normalizedParams.mediaUrls = mediaUrls;
   } else {
-    const finalMessage = message || explicitCaption;
-    if (!finalMessage.trim()) throw new Error('bncr send requires message or media');
-    normalizedParams.message = finalMessage;
-    delete normalizedParams.caption;
+    if (mediaUrls?.length) {
+      normalizedParams.mediaUrls = mediaUrls;
+      const finalCaption = explicitCaption || message;
+      if (finalCaption) normalizedParams.caption = finalCaption;
+      delete normalizedParams.message;
+      delete normalizedParams.path;
+    } else {
+      const finalMessage = message || explicitCaption;
+      if (!finalMessage.trim()) throw new Error('bncr send requires message or media');
+      normalizedParams.message = finalMessage;
+      delete normalizedParams.caption;
+    }
   }
 
   if (asVoice === true) normalizedParams.asVoice = true;

package/src/messaging/outbound/send-params.ts

@@ -7,6 +7,7 @@ export type NormalizedBncrSendParams = {
   message: string;
   caption: string;
   mediaUrl?: string;
+  mediaUrls?: string[];
   asVoice: boolean;
   audioAsVoice: boolean;
   type?: string;
@@ -33,16 +34,32 @@ export function normalizeBncrSendParams(input: {
     readOpenClawStringParam(paramsObj, 'path', { trim: false }) ??
     readOpenClawStringParam(paramsObj, 'filePath', { trim: false }) ??
     readOpenClawStringParam(paramsObj, 'mediaUrl', { trim: false });
+  const rawMediaUrls = paramsObj.mediaUrls;
+  const mediaUrls = Array.isArray(rawMediaUrls)
+    ? Array.from(
+        new Set(rawMediaUrls.map((v) => (typeof v === 'string' ? v.trim() : '')).filter(Boolean)),
+      )
+    : undefined;
+  // 如果 mediaUrl 已经在 mediaUrls 中，去重避免重复发送
+  const dedupedMediaUrls = mediaUrls?.length
+    ? mediaUrl && mediaUrls.includes(mediaUrl)
+      ? mediaUrls
+      : mediaUrl
+        ? [mediaUrl, ...mediaUrls]
+        : mediaUrls
+    : undefined;
   const asVoice = readOpenClawBooleanParam(paramsObj, 'asVoice') ?? false;
   const audioAsVoice = readOpenClawBooleanParam(paramsObj, 'audioAsVoice') ?? false;
   const type = readOpenClawStringParam(paramsObj, 'type') || undefined;
 
-  if (asVoice && !mediaUrl) throw new Error('send voice requires media path');
+  const hasMedia = Boolean(mediaUrl || dedupedMediaUrls?.length);
 
-  const normalizedMessage = mediaUrl ? '' : message || caption || '';
-  const normalizedCaption = mediaUrl ? caption || message || '' : '';
+  if (asVoice && !hasMedia) throw new Error('send voice requires media path');
 
-  if (!normalizedMessage.trim() && !normalizedCaption.trim() && !mediaUrl) {
+  const normalizedMessage = hasMedia ? '' : message || caption || '';
+  const normalizedCaption = hasMedia ? caption || message || '' : '';
+
+  if (!normalizedMessage.trim() && !normalizedCaption.trim() && !hasMedia) {
     throw new Error('send requires message or media');
   }
 
@@ -51,7 +68,8 @@ export function normalizeBncrSendParams(input: {
     accountId: resolvedAccountId,
     message: normalizedMessage,
     caption: normalizedCaption,
-    mediaUrl: mediaUrl || undefined,
+    mediaUrl: dedupedMediaUrls?.length ? undefined : mediaUrl || undefined,
+    mediaUrls: dedupedMediaUrls,
     asVoice,
     audioAsVoice,
     ...(type ? { type } : {}),

package/src/plugin/channel-plugin-surface-group.ts

@@ -140,37 +140,39 @@ export function createBncrChannelPluginSurfaceGroup(runtime: {
       const normalized = normalizeBncrSendParams({ params, accountId: accountId || '' });
 
       const toolActionBridge = runtime.getToolActionBridge();
-      const result = normalized.mediaUrl
-        ? await sendBncrMedia({
-            channelId: runtime.channelId,
-            accountId: normalized.accountId,
-            to: normalized.to,
-            text: normalized.caption,
-            mediaUrl: normalized.mediaUrl,
-            asVoice: normalized.asVoice,
-            audioAsVoice: normalized.audioAsVoice,
-            type: normalized.type,
-            mediaLocalRoots,
-            resolveVerifiedTarget: (to, accountId) =>
-              toolActionBridge.resolveVerifiedTarget(to, accountId),
-            rememberSessionRoute: (sessionKey, accountId, route) =>
-              toolActionBridge.rememberSessionRoute(sessionKey, accountId, route),
-            enqueueFromReply: (args) => toolActionBridge.enqueueFromReply(args),
-            createMessageId: () => randomUUID(),
-          })
-        : await sendBncrText({
-            channelId: runtime.channelId,
-            accountId: normalized.accountId,
-            to: normalized.to,
-            text: normalized.message,
-            mediaLocalRoots,
-            resolveVerifiedTarget: (to, accountId) =>
-              toolActionBridge.resolveVerifiedTarget(to, accountId),
-            rememberSessionRoute: (sessionKey, accountId, route) =>
-              toolActionBridge.rememberSessionRoute(sessionKey, accountId, route),
-            enqueueFromReply: (args) => toolActionBridge.enqueueFromReply(args),
-            createMessageId: () => randomUUID(),
-          });
+      const result =
+        normalized.mediaUrl || normalized.mediaUrls?.length
+          ? await sendBncrMedia({
+              channelId: runtime.channelId,
+              accountId: normalized.accountId,
+              to: normalized.to,
+              text: normalized.caption,
+              mediaUrl: normalized.mediaUrl,
+              mediaUrls: normalized.mediaUrls,
+              asVoice: normalized.asVoice,
+              audioAsVoice: normalized.audioAsVoice,
+              type: normalized.type,
+              mediaLocalRoots,
+              resolveVerifiedTarget: (to, accountId) =>
+                toolActionBridge.resolveVerifiedTarget(to, accountId),
+              rememberSessionRoute: (sessionKey, accountId, route) =>
+                toolActionBridge.rememberSessionRoute(sessionKey, accountId, route),
+              enqueueFromReply: (args) => toolActionBridge.enqueueFromReply(args),
+              createMessageId: () => randomUUID(),
+            })
+          : await sendBncrText({
+              channelId: runtime.channelId,
+              accountId: normalized.accountId,
+              to: normalized.to,
+              text: normalized.message,
+              mediaLocalRoots,
+              resolveVerifiedTarget: (to, accountId) =>
+                toolActionBridge.resolveVerifiedTarget(to, accountId),
+              rememberSessionRoute: (sessionKey, accountId, route) =>
+                toolActionBridge.rememberSessionRoute(sessionKey, accountId, route),
+              enqueueFromReply: (args) => toolActionBridge.enqueueFromReply(args),
+              createMessageId: () => randomUUID(),
+            });
 
       return runtime.openClawJsonResult({ ok: true, ...result });
     },