@wu529778790/open-im 1.8.1-beta.12 → 1.8.1-beta.14

package/dist/adapters/claude-sdk-adapter.js

@@ -37,39 +37,51 @@ function isResult(msg) {
  * @param permissionMode 权限模式
  * @returns SDKSession 对象和实际的 sessionId
  */
-async function getOrCreateSession(sessionId, _workDir, // 保留参数以备将来使用
-model, permissionMode) {
+async function getOrCreateSession(sessionId, workDir, model, permissionMode) {
     const resolvedModel = model?.trim() || 'claude-opus-4-5';
     const sessionOptions = {
         model: resolvedModel,
         permissionMode,
-        // 可以添加其他选项，如 hooks, allowedTools 等
     };
     const baseUrl = process.env.ANTHROPIC_BASE_URL ?? '(default)';
-    log.info(`[V2] getOrCreateSession model param=${String(model ?? '')} resolved=${resolvedModel} baseUrl=${baseUrl}`);
+    log.info(`[V2] getOrCreateSession model param=${String(model ?? '')} resolved=${resolvedModel} baseUrl=${baseUrl} workDir=${workDir}`);
     let session;
-    if (sessionId) {
-        // 尝试恢复已有会话
-        try {
-            log.info(`Attempting to resume session: ${sessionId}`);
-            session = unstable_v2_resumeSession(sessionId, sessionOptions);
-            activeSessions.set(sessionId, session);
-            log.info(`Successfully resumed session: ${sessionId}`);
-            return { session, sessionId };
+    // SDK V2 的 SDKSessionOptions 没有 cwd 字段，
+    // 需要通过 process.chdir() 临时切换工作目录。
+    // 因为 createSession/resumeSession 是同步调用，且 JS 单线程，所以是安全的。
+    const originalCwd = process.cwd();
+    try {
+        if (workDir && workDir !== originalCwd) {
+            process.chdir(workDir);
         }
-        catch (err) {
-            log.warn(`Failed to resume session ${sessionId}, creating new one: ${err}`);
-            // 恢复失败，创建新会话
+        if (sessionId) {
+            // 尝试恢复已有会话
+            try {
+                log.info(`Attempting to resume session: ${sessionId}`);
+                session = unstable_v2_resumeSession(sessionId, sessionOptions);
+                activeSessions.set(sessionId, session);
+                log.info(`Successfully resumed session: ${sessionId}`);
+                return { session, sessionId };
+            }
+            catch (err) {
+                log.warn(`Failed to resume session ${sessionId}, creating new one: ${err}`);
+                // 恢复失败，创建新会话
+            }
+        }
+        // 创建新会话
+        session = unstable_v2_createSession(sessionOptions);
+        // 新会话的 sessionId 需要从第一个消息中获取
+        // 暂时返回 undefined，稍后在 init 消息中获取
+        const tempId = `pending-${Date.now()}`;
+        activeSessions.set(tempId, session);
+        log.info(`Created new session (tempId: ${tempId})`);
+        return { session, sessionId: tempId };
+    }
+    finally {
+        if (workDir && workDir !== originalCwd) {
+            process.chdir(originalCwd);
         }
     }
-    // 创建新会话
-    session = unstable_v2_createSession(sessionOptions);
-    // 新会话的 sessionId 需要从第一个消息中获取
-    // 暂时返回 undefined，稍后在 init 消息中获取
-    const tempId = `pending-${Date.now()}`;
-    activeSessions.set(tempId, session);
-    log.info(`Created new session (tempId: ${tempId})`);
-    return { session, sessionId: tempId };
 }
 export class ClaudeSDKAdapter {
     toolId = 'claude-sdk';
@@ -103,6 +115,7 @@ export class ClaudeSDKAdapter {
         const abortController = new AbortController();
         let streamClosed = false;
         let actualSessionId;
+        let pendingTempId; // 记录临时 ID，用于 abort 时清理
         let runSettled = false;
         let timeoutId = null;
         const timeoutMs = options?.timeoutMs ?? 600_000;
@@ -139,7 +152,10 @@ export class ClaudeSDKAdapter {
                 log.info(`[V2] Session: ${sessionId ?? 'new'}, prompt="${prompt.slice(0, 50)}..."`);
                 log.info(`[V2] model param=${String(options?.model ?? '')} baseUrl=${process.env.ANTHROPIC_BASE_URL ?? '(default)'}`);
                 // 获取或创建会话
-                const { session } = await getOrCreateSession(sessionId, workDir, options?.model, permissionMode);
+                const { session, sessionId: returnedId } = await getOrCreateSession(sessionId, workDir, options?.model, permissionMode);
+                if (returnedId.startsWith('pending-')) {
+                    pendingTempId = returnedId;
+                }
                 // 发送用户消息
                 await session.send(prompt);
                 // 获取响应流
@@ -263,10 +279,11 @@ export class ClaudeSDKAdapter {
                 if (abortController.signal.aborted) {
                     log.info('Session run aborted');
                     clearRunTimeout();
-                    // 清理 pending tempId
-                    if (actualSessionId?.startsWith('pending-')) {
-                        activeSessions.delete(actualSessionId);
-                        log.info(`Cleaned up pending session: ${actualSessionId}`);
+                    // 清理 pending tempId（abort 可能在 init 消息之前发生）
+                    const idToClean = actualSessionId ?? pendingTempId;
+                    if (idToClean?.startsWith('pending-')) {
+                        activeSessions.delete(idToClean);
+                        log.info(`Cleaned up pending session: ${idToClean}`);
                     }
                     return;
                 }
@@ -279,9 +296,10 @@ export class ClaudeSDKAdapter {
                     log.error(`Error stack: ${errorObj.stack}`);
                 }
                 // 清理 pending tempId（session 在获取真实 ID 前就失败了）
-                if (actualSessionId?.startsWith('pending-')) {
-                    activeSessions.delete(actualSessionId);
-                    log.info(`Cleaned up pending session after error: ${actualSessionId}`);
+                const errIdToClean = actualSessionId ?? pendingTempId;
+                if (errIdToClean?.startsWith('pending-')) {
+                    activeSessions.delete(errIdToClean);
+                    log.info(`Cleaned up pending session after error: ${errIdToClean}`);
                 }
                 callbacks.onError(msg);
             }

package/dist/dingtalk/client.js

@@ -7,7 +7,9 @@ const TEXT_MSG_KEY = 'sampleText';
 const DINGTALK_STREAM_HOST = 'wss-open-connection.dingtalk.com';
 let client = null;
 let messageHandler = null;
+// sessionWebhook 有过期时间（约 2 小时），需要记录时间戳
 const sessionWebhookByChat = new Map();
+const WEBHOOK_TTL_MS = 90 * 60 * 1000; // 90 分钟后视为过期
 const unionIdByUserId = new Map();
 let dingtalkWarnFilterInstalled = false;
 export function shouldSuppressDingTalkSocketWarn(args) {
@@ -44,13 +46,19 @@ function getClient() {
 export function registerSessionWebhook(chatId, sessionWebhook) {
     if (!chatId || !sessionWebhook)
         return;
-    sessionWebhookByChat.set(chatId, sessionWebhook);
+    sessionWebhookByChat.set(chatId, { webhook: sessionWebhook, registeredAt: Date.now() });
 }
 async function sendByWebhook(chatId, body) {
-    const sessionWebhook = sessionWebhookByChat.get(chatId);
-    if (!sessionWebhook) {
+    const entry = sessionWebhookByChat.get(chatId);
+    if (!entry) {
         throw new Error(`DingTalk sessionWebhook unavailable for chat ${chatId}`);
     }
+    // 检查 webhook 是否过期
+    if (Date.now() - entry.registeredAt > WEBHOOK_TTL_MS) {
+        sessionWebhookByChat.delete(chatId);
+        throw new Error(`DingTalk sessionWebhook expired for chat ${chatId}`);
+    }
+    const sessionWebhook = entry.webhook;
     const accessToken = await getClient().getAccessToken();
     const res = await fetch(sessionWebhook, {
         method: 'POST',

package/dist/qq/client.js

@@ -17,6 +17,7 @@ let stopped = false;
 let seq = null;
 let sessionId = null;
 let reconnectAttempt = 0;
+let connecting = false; // 防止并发 connectWebSocket
 let currentConfig = null;
 let currentHandler = null;
 let tokenState = null;
@@ -147,99 +148,116 @@ function startHeartbeat(intervalMs) {
     }, intervalMs);
 }
 async function connectWebSocket(config, handler) {
-    const gatewayUrl = await getGatewayUrl(config);
-    const token = await fetchAccessToken(config);
-    await new Promise((resolve, reject) => {
-        const socket = new WebSocket(gatewayUrl);
-        ws = socket;
-        let settled = false;
-        const settle = (fn) => {
-            if (settled)
-                return;
-            settled = true;
-            fn();
-        };
-        socket.on("open", () => {
-            log.info("QQ gateway connected");
-            reconnectAttempt = 0;
-        });
-        socket.on("message", async (raw) => {
-            try {
-                const payload = JSON.parse(raw.toString());
-                if (typeof payload.s === "number")
-                    seq = payload.s;
-                if (payload.op === 10) {
-                    const heartbeatInterval = Number(payload.d?.heartbeat_interval ?? 30000);
-                    startHeartbeat(heartbeatInterval);
-                    socket.send(JSON.stringify({
-                        op: sessionId ? 6 : 2,
-                        d: sessionId
-                            ? {
-                                token: `QQBot ${token}`,
-                                session_id: sessionId,
-                                seq,
-                            }
-                            : {
-                                token: `QQBot ${token}`,
-                                intents: INTENTS.GROUP_AND_C2C |
-                                    INTENTS.DIRECT_MESSAGE |
-                                    INTENTS.PUBLIC_GUILD_MESSAGES,
-                                properties: {
-                                    os: process.platform,
-                                    browser: "open-im",
-                                    device: "open-im",
-                                },
-                            },
-                    }));
-                    return;
-                }
-                if (payload.op === 0 && payload.t === "READY") {
-                    sessionId = String(payload.d?.session_id ?? "");
-                    settle(resolve);
+    // 防止并发连接
+    if (connecting) {
+        log.warn("QQ gateway connection already in progress");
+        return;
+    }
+    connecting = true;
+    try {
+        const gatewayUrl = await getGatewayUrl(config);
+        const token = await fetchAccessToken(config);
+        await new Promise((resolve, reject) => {
+            const socket = new WebSocket(gatewayUrl);
+            ws = socket;
+            let settled = false;
+            let readyTimeoutId = setTimeout(() => {
+                readyTimeoutId = null;
+                settle(() => reject(new Error("QQ gateway ready timeout")));
+            }, 15000);
+            const settle = (fn) => {
+                if (settled)
                     return;
+                settled = true;
+                if (readyTimeoutId) {
+                    clearTimeout(readyTimeoutId);
+                    readyTimeoutId = null;
                 }
-                if (payload.op === 0 && payload.t === "RESUMED") {
-                    settle(resolve);
-                    return;
+                fn();
+            };
+            socket.on("open", () => {
+                log.info("QQ gateway connected");
+                reconnectAttempt = 0;
+            });
+            socket.on("message", async (raw) => {
+                try {
+                    const payload = JSON.parse(raw.toString());
+                    if (typeof payload.s === "number")
+                        seq = payload.s;
+                    if (payload.op === 10) {
+                        const heartbeatInterval = Number(payload.d?.heartbeat_interval ?? 30000);
+                        startHeartbeat(heartbeatInterval);
+                        socket.send(JSON.stringify({
+                            op: sessionId ? 6 : 2,
+                            d: sessionId
+                                ? {
+                                    token: `QQBot ${token}`,
+                                    session_id: sessionId,
+                                    seq,
+                                }
+                                : {
+                                    token: `QQBot ${token}`,
+                                    intents: INTENTS.GROUP_AND_C2C |
+                                        INTENTS.DIRECT_MESSAGE |
+                                        INTENTS.PUBLIC_GUILD_MESSAGES,
+                                    properties: {
+                                        os: process.platform,
+                                        browser: "open-im",
+                                        device: "open-im",
+                                    },
+                                },
+                        }));
+                        return;
+                    }
+                    if (payload.op === 0 && payload.t === "READY") {
+                        sessionId = String(payload.d?.session_id ?? "");
+                        settle(resolve);
+                        return;
+                    }
+                    if (payload.op === 0 && payload.t === "RESUMED") {
+                        settle(resolve);
+                        return;
+                    }
+                    const event = normalizeInboundEvent(payload);
+                    if (event && (event.content || (event.attachments?.length ?? 0) > 0)) {
+                        await handler(event);
+                    }
                 }
-                const event = normalizeInboundEvent(payload);
-                if (event && (event.content || (event.attachments?.length ?? 0) > 0)) {
-                    await handler(event);
+                catch (error) {
+                    log.error("Failed to handle QQ gateway payload:", error);
                 }
-            }
-            catch (error) {
-                log.error("Failed to handle QQ gateway payload:", error);
-            }
-        });
-        socket.on("error", (error) => {
-            log.error("QQ gateway error:", error);
-            settle(() => reject(error));
-        });
-        socket.on("close", (code, reason) => {
-            clearTimers();
-            ws = null;
-            log.info(`QQ gateway closed: ${code} ${reason.toString()}`);
-            if (stopped)
-                return;
-            if (code === 4004 || code === 4006 || code === 4007 || code === 4009) {
-                tokenState = null;
-                sessionId = null;
-                seq = null;
-            }
-            const delay = RECONNECT_DELAYS_MS[Math.min(reconnectAttempt, RECONNECT_DELAYS_MS.length - 1)];
-            reconnectAttempt += 1;
-            reconnectTimer = setTimeout(() => {
-                if (currentConfig && currentHandler) {
-                    connectWebSocket(currentConfig, currentHandler).catch((err) => {
-                        log.error("QQ reconnect failed:", err);
-                    });
+            });
+            socket.on("error", (error) => {
+                log.error("QQ gateway error:", error);
+                settle(() => reject(error));
+            });
+            socket.on("close", (code, reason) => {
+                settle(() => { }); // 清理 ready timeout
+                clearTimers();
+                ws = null;
+                log.info(`QQ gateway closed: ${code} ${reason.toString()}`);
+                if (stopped)
+                    return;
+                if (code === 4004 || code === 4006 || code === 4007 || code === 4009) {
+                    tokenState = null;
+                    sessionId = null;
+                    seq = null;
                 }
-            }, delay);
+                const delay = RECONNECT_DELAYS_MS[Math.min(reconnectAttempt, RECONNECT_DELAYS_MS.length - 1)];
+                reconnectAttempt += 1;
+                reconnectTimer = setTimeout(() => {
+                    if (currentConfig && currentHandler) {
+                        connectWebSocket(currentConfig, currentHandler).catch((err) => {
+                            log.error("QQ reconnect failed:", err);
+                        });
+                    }
+                }, delay);
+            });
         });
-        setTimeout(() => {
-            settle(() => reject(new Error("QQ gateway ready timeout")));
-        }, 15000);
-    });
+    }
+    finally {
+        connecting = false;
+    }
 }
 export function getQQBot() {
     if (!client || !currentConfig) {

package/dist/wechat/client.js

@@ -19,6 +19,7 @@ let currentToken = null;
 let tokenStoragePath = null;
 let lastServerResponseTime = 0; // 上次收到服务端消息的时间
 let wsConfigRef = null; // 保存配置供心跳重连使用
+let isStopping = false; // 防止 stop 后重连定时器继续触发
 // Event handlers
 let messageHandler = null;
 let stateChangeHandler = null;
@@ -73,6 +74,7 @@ export async function initWeChat(config, eventHandler, onStateChange) {
     }
     messageHandler = eventHandler;
     stateChangeHandler = onStateChange ?? null;
+    isStopping = false;
     // Set up token storage path
     const baseDir = config.logDir ?? join(process.env.HOME ?? '', '.open-im');
     tokenStoragePath = join(baseDir, 'data');
@@ -242,6 +244,8 @@ function stopHeartbeat() {
  * 超过 maxAttempts 后自动重置计数器继续重试，避免永久断连
  */
 function scheduleReconnect(config) {
+    if (isStopping)
+        return;
     const maxAttempts = config.maxReconnectAttempts ?? 10;
     if (reconnectTimer) {
         return;
@@ -312,6 +316,7 @@ function saveToken() {
  * Stop WeChat client
  */
 export function stopWeChat() {
+    isStopping = true;
     stopHeartbeat();
     if (reconnectTimer) {
         clearTimeout(reconnectTimer);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "1.8.1-beta.12",
+  "version": "1.8.1-beta.14",
   "description": "Multi-platform IM bridge for AI CLI tools (Claude, Codex, CodeBuddy)",
   "type": "module",
   "main": "dist/index.js",