@meet-im/meet 1.1.2 → 2.0.0

package/README.md

@@ -1 +1 @@
-# @meet-im/meet-channel
+# @meet-im/meet

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meet-im/meet",
-  "version": "1.1.2",
+  "version": "2.0.0",
   "type": "module",
   "description": "OpenClaw Meet channel plugin",
   "scripts": {
@@ -61,13 +61,13 @@
   "devDependencies": {
     "@types/node": "^22.0.0",
     "@vitest/coverage-v8": "^2.1.8",
-    "openclaw": "2026.3.8",
+    "openclaw": "2026.3.23",
     "tsx": "^4.21.0",
     "typescript": "^5.7.0",
     "vitest": "^2.1.8"
   },
   "peerDependencies": {
-    "openclaw": ">=2026.3.8"
+    "openclaw": ">=2026.3.23"
   },
   "publishConfig": {
     "access": "public"

package/src/accounts.ts

@@ -1,9 +1,9 @@
 import {
   DEFAULT_ACCOUNT_ID,
   normalizeAccountId,
-  createAccountListHelpers,
-  type ClawdbotConfig,
-} from "openclaw/plugin-sdk"
+} from "openclaw/plugin-sdk/account-id"
+import { createAccountListHelpers } from "openclaw/plugin-sdk/account-helpers"
+import type { ClawdbotConfig } from "openclaw/plugin-sdk"
 import type { MeetConfig, MeetAccountConfig, ResolvedMeetAccount } from "./types.js"
 
 const { listAccountIds: listNestedAccountIds, resolveDefaultAccountId: resolveNestedDefaultAccountId } = createAccountListHelpers("meet")
@@ -105,7 +105,7 @@ function mergeMeetAccountConfig(
   const { accounts: _ignored, ...base } = meetCfg ?? {}
   const account = resolveAccountConfig(cfg, accountId) ?? {}
   
-  const baseGroups = base.groups ?? {}
+  const baseGroups = (base as MeetConfig).groups ?? {}
   const accountGroups = (account as MeetConfig).groups ?? {}
   const mergedGroups = { ...baseGroups, ...accountGroups }
   

package/src/bot.ts

@@ -1,10 +1,11 @@
-import type { ClawdbotConfig, RuntimeEnv, ReplyPayload, HistoryEntry } from "openclaw/plugin-sdk"
+import type { ClawdbotConfig, RuntimeEnv } from "openclaw/plugin-sdk"
+import type { HistoryEntry } from "openclaw/plugin-sdk/reply-history"
 import {
   buildPendingHistoryContextFromMap,
   clearHistoryEntriesIfEnabled,
   recordPendingHistoryEntryIfEnabled,
-  DEFAULT_ACCOUNT_ID,
-} from "openclaw/plugin-sdk"
+} from "openclaw/plugin-sdk/reply-history"
+import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id"
 import type { MeetBot, MsgContent } from "@meet-im/meet-bot-jssdk"
 import type { ResolvedMeetAccount, MeetMessageContext } from "./types.js"
 import { msgContentToContext, extractQuoteMessageMedia } from "./sdk-bridge.js"

package/src/channel.ts

@@ -1,13 +1,13 @@
 import type {
   ChannelPlugin,
   ClawdbotConfig,
-  GroupToolPolicyConfig,
 } from "openclaw/plugin-sdk";
+import type { GroupToolPolicyConfig } from "openclaw/plugin-sdk/channel-policy";
 import {
   DEFAULT_ACCOUNT_ID,
   normalizeAccountId,
-  PAIRING_APPROVED_MESSAGE,
-} from "openclaw/plugin-sdk";
+} from "openclaw/plugin-sdk/account-id";
+import { PAIRING_APPROVED_MESSAGE } from "openclaw/plugin-sdk/channel-status";
 import type { ResolvedMeetAccount, MeetConfig } from "./types.js";
 import {
   resolveMeetAccount,
@@ -69,9 +69,9 @@ export const meetPlugin: ChannelPlugin<ResolvedMeetAccount> = {
   },
   groups: {
     resolveToolPolicy: ({
-      cfg,
-      accountId,
-      groupId,
+      cfg: _cfg,
+      accountId: _accountId,
+      groupId: _groupId,
     }): GroupToolPolicyConfig | undefined => {
       // 群组访问控制在 bot.ts 中处理，这里只返回工具策略配置
       // 不使用 { deny: ["*"] } 拒绝所有工具，否则会导致 tools: []
@@ -378,7 +378,7 @@ export const meetPlugin: ChannelPlugin<ResolvedMeetAccount> = {
   gateway: {
     startAccount: async (ctx) => {
       const { monitorMeetProvider } = await import("./monitor.js");
-      const account = resolveMeetAccount({
+      resolveMeetAccount({
         cfg: ctx.cfg,
         accountId: ctx.accountId,
       });

package/src/monitor.ts

@@ -1,5 +1,6 @@
-import type { ClawdbotConfig, RuntimeEnv, HistoryEntry } from "openclaw/plugin-sdk"
-import { KeyedAsyncQueue } from "openclaw/plugin-sdk"
+import type { ClawdbotConfig, RuntimeEnv } from "openclaw/plugin-sdk"
+import type { HistoryEntry } from "openclaw/plugin-sdk/reply-history"
+import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue"
 import type { ResolvedMeetAccount } from "./types.js"
 import type { MsgContent } from "@meet-im/meet-bot-jssdk"
 import type { QuoteMsgMap } from "./sdk-bridge.js"
@@ -22,7 +23,6 @@ export async function monitorMeetProvider(opts: MonitorMeetOpts = {}): Promise<v
   }
 
   const log = opts.runtime?.log ?? console.log
-  const error = opts.runtime?.error ?? console.error
 
   if (opts.accountId) {
     const account = resolveMeetAccount({ cfg, accountId: opts.accountId })
@@ -99,9 +99,7 @@ async function monitorSingleAccount(params: {
 
     abortSignal?.addEventListener("abort", handleAbort, { once: true })
 
-    // TODO: SDK 更新后移除类型断言
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    bot.on("message", ((data: { message: MsgContent; quoteMsgMap: QuoteMsgMap }) => {
+    bot.on("message", (data: { message: MsgContent; quoteMsgMap: QuoteMsgMap }) => {
       const { message: msg, quoteMsgMap } = data
       let queueKey: string
       try {
@@ -149,7 +147,7 @@ async function monitorSingleAccount(params: {
           },
         },
       )
-    }) as any)
+    })
 
     bot.on("error", (err) => {
       error(`[${accountId}]: polling error: ${String(err)}`)

package/src/outbound.ts

@@ -1,4 +1,4 @@
-import type { ChannelOutboundAdapter } from "openclaw/plugin-sdk";
+import type { ChannelOutboundAdapter } from "openclaw/plugin-sdk/channel-send-result";
 import { getMeetRuntime } from "./runtime.js";
 import { sendMessageMeet, sendMediaMeet } from "./send.js";
 
@@ -11,8 +11,13 @@ export const meetOutbound: ChannelOutboundAdapter = {
   chunkerMode: "text",
   textChunkLimit: 4000,
   sendText: async ({ cfg, to, text, accountId }) => {
-    const result = await sendMessageMeet({ cfg, to, text, accountId });
-    return { channel: "meet", ...result };
+    const result = await sendMessageMeet({ 
+      cfg, 
+      to, 
+      text: text ?? "", 
+      accountId: accountId ?? undefined,
+    });
+    return { channel: "meet", messageId: result.messageId, chatId: result.chatId };
   },
   sendMedia: async ({
     cfg,
@@ -22,14 +27,17 @@ export const meetOutbound: ChannelOutboundAdapter = {
     mediaLocalRoots,
     accountId,
   }) => {
+    if (!mediaUrl) {
+      throw new Error("mediaUrl is required for sendMedia");
+    }
     const result = await sendMediaMeet({
       cfg,
       to,
-      text: text || undefined,
+      text: text ?? undefined,
       mediaUrl,
-      mediaLocalRoots,
-      accountId,
+      mediaLocalRoots: mediaLocalRoots ?? undefined,
+      accountId: accountId ?? undefined,
     });
-    return { channel: "meet", ...result };
+    return { channel: "meet", messageId: result.messageId, chatId: result.chatId };
   },
 };

package/src/reply-dispatcher.ts

@@ -1,14 +1,9 @@
 import type { MeetBot } from "@meet-im/meet-bot-jssdk"
 import type { ClawdbotConfig, RuntimeEnv, ReplyPayload } from "openclaw/plugin-sdk"
-import { createReplyPrefixContext } from "openclaw/plugin-sdk"
+import { createReplyPrefixContext } from "openclaw/plugin-sdk/channel-runtime"
 import { getMeetRuntime } from "./runtime.js"
 import { sendMessageMeet } from "./send.js"
 
-/**
- * 匹配完整的 mention 格式: <@userId>
- */
-const COMPLETE_MENTION_REGEX = /<@(-?\d+)>/g
-
 /**
  * 匹配末尾不完整的 mention 开始: <@ 或 <@xxx (没有闭合的 >)
  */
@@ -100,7 +95,7 @@ export async function createMeetReplyDispatcher(
     humanDelay: core.channel.reply.resolveHumanDelayConfig(cfg, agentId),
     onReplyStart: async () => {
     },
-    deliver: async (payload: ReplyPayload, info) => {
+    deliver: async (payload: ReplyPayload, _info) => {
       const text = payload.text ?? ""
       if (!text.trim()) {
         return

package/src/sdk-bridge.ts

@@ -1,4 +1,4 @@
-import type { MsgContent, SessionInfo, SessionType, AttachmentInfo } from "@meet-im/meet-bot-jssdk"
+import type { MsgContent, SessionInfo, SessionType } from "@meet-im/meet-bot-jssdk"
 import type { MeetMessageContext, MeetReplyContext, MeetMediaAttachment } from "./types.js"
 
 // TODO: 从 SDK 导入，等待 SDK 发布

package/src/send.ts

@@ -1,5 +1,5 @@
 import type { ClawdbotConfig, RuntimeEnv } from "openclaw/plugin-sdk";
-import type { ResolvedMeetAccount, MeetMediaInfo } from "./types.js";
+import type { MeetMediaInfo } from "./types.js";
 import type { UploadProgress as SdkUploadProgress } from "@meet-im/meet-bot-jssdk";
 import { resolveMeetAccount } from "./accounts.js";
 import { getMeetClient } from "./client.js";
@@ -52,6 +52,57 @@ export function inferContentTypeFromFileName(fileName: string): string | undefin
   return mimeMap[ext];
 }
 
+/**
+ * 根据 MIME 类型获取文件扩展名
+ */
+function getExtensionFromContentType(contentType: string): string | undefined {
+  const mimeToExt: Record<string, string> = {
+    "image/jpeg": ".jpg",
+    "image/png": ".png",
+    "image/gif": ".gif",
+    "image/webp": ".webp",
+    "image/avif": ".avif",
+    "image/heic": ".heic",
+    "image/heif": ".heif",
+    "image/bmp": ".bmp",
+    "image/x-icon": ".ico",
+    "image/svg+xml": ".svg",
+    "image/tiff": ".tiff",
+    "video/mp4": ".mp4",
+    "video/webm": ".webm",
+    "video/quicktime": ".mov",
+    "video/x-msvideo": ".avi",
+    "video/x-matroska": ".mkv",
+    "audio/mpeg": ".mp3",
+    "audio/wav": ".wav",
+    "audio/ogg": ".ogg",
+    "audio/flac": ".flac",
+    "audio/mp4": ".m4a",
+    "application/pdf": ".pdf",
+    "application/json": ".json",
+    "application/xml": ".xml",
+  };
+  return mimeToExt[contentType];
+}
+
+/**
+ * 确保文件名有正确的扩展名
+ * 如果文件名没有扩展名，根据 contentType 添加
+ */
+function ensureFileNameExtension(fileName: string, contentType: string): string {
+  // 检查是否已有扩展名
+  const hasExtension = /\.[a-zA-Z0-9]+$/.test(fileName);
+  if (hasExtension) {
+    return fileName;
+  }
+  // 根据 contentType 添加扩展名
+  const ext = getExtensionFromContentType(contentType);
+  if (ext) {
+    return fileName + ext;
+  }
+  return fileName;
+}
+
 /**
  * 获取最终的 contentType
  * 如果原始 contentType 缺失或为通用二进制流，则根据文件名推断
@@ -207,8 +258,10 @@ export async function sendMediaMeet(
   }
 
   const sessionInfo = parseTargetToSessionInfo(to, Number(botUserId));
-  const fileName = media.fileName || "file";
-  const contentType = resolveContentType(fileName, media.contentType);
+  const rawFileName = media.fileName || "file";
+  const contentType = resolveContentType(rawFileName, media.contentType);
+  // 确保文件名有正确的扩展名
+  const fileName = ensureFileNameExtension(rawFileName, contentType);
 
   log(
     `sending media to=${to} fileName=${fileName} size=${media.buffer.length} contentType=${contentType}`,
@@ -279,7 +332,7 @@ export async function getMessageMeet(opts: {
   messageId: string;
   accountId?: string;
 }): Promise<{ content: string } | null> {
-  const { cfg, messageId, accountId } = opts;
+  const { cfg, accountId } = opts;
   const account = resolveMeetAccount({ cfg, accountId });
   if (!account.configured) {
     return null;