@wu529778790/open-im 1.9.3-beta.3 → 1.9.3-beta.4

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

@@ -16,6 +16,28 @@ const log = createLogger('ClaudeSDK');
 const activeSessions = new Map();
 // 存储正在进行的流式迭代器，用于中断
 const activeStreams = new Set();
+// 空闲会话清理：跟踪最后使用时间，定期清除超时会话
+const sessionLastUsed = new Map();
+const SESSION_IDLE_TTL_MS = 30 * 60 * 1000; // 30 分钟未使用则清理
+const CLEANUP_INTERVAL_MS = 5 * 60 * 1000; // 每 5 分钟检查一次
+const cleanupInterval = setInterval(() => {
+    const now = Date.now();
+    for (const [id, lastUsed] of sessionLastUsed) {
+        if (now - lastUsed > SESSION_IDLE_TTL_MS) {
+            const session = activeSessions.get(id);
+            if (session) {
+                try {
+                    session.close();
+                }
+                catch { /* ignore */ }
+                activeSessions.delete(id);
+            }
+            sessionLastUsed.delete(id);
+            log.info(`Cleaned up idle session (unused ${Math.round((now - lastUsed) / 60000)}min): ${id}`);
+        }
+    }
+}, CLEANUP_INTERVAL_MS);
+cleanupInterval.unref(); // 不阻止进程退出
 // Mutex to serialize process.chdir() calls across concurrent users
 let chdirMutex = Promise.resolve();
 function withChdirMutex(fn) {
@@ -60,7 +82,9 @@ async function getOrCreateSession(sessionId, workDir, model, permissionMode) {
     };
     const baseUrl = process.env.ANTHROPIC_BASE_URL ?? '(default)';
     log.info(`[V2] getOrCreateSession model param=${String(model ?? '')} resolved=${resolvedModel} baseUrl=${baseUrl} workDir=${workDir}`);
-    // Use mutex to serialize process.chdir() calls across concurrent users
+    // NOTE: process.chdir() 是进程级全局副作用，在并发服务器中不理想。
+    // 但 SDK 的 createSession/resumeSession 不接受 cwd 参数，且这些调用是同步的，
+    // 所以 mutex + try/finally 已是最优方案。如果 SDK 未来支持 cwd 选项，应移除 chdir。
     return withChdirMutex(() => {
         let session;
         const originalCwd = process.cwd();
@@ -73,6 +97,7 @@ async function getOrCreateSession(sessionId, workDir, model, permissionMode) {
                 const existing = activeSessions.get(sessionId);
                 if (existing) {
                     log.info(`Reusing existing in-memory session: ${sessionId}`);
+                    sessionLastUsed.set(sessionId, Date.now());
                     return { session: existing, sessionId };
                 }
                 // 内存中没有，尝试通过 resume 恢复（会启动新 CLI 进程）
@@ -80,6 +105,7 @@ async function getOrCreateSession(sessionId, workDir, model, permissionMode) {
                     log.info(`Attempting to resume session: ${sessionId}`);
                     session = unstable_v2_resumeSession(sessionId, sessionOptions);
                     activeSessions.set(sessionId, session);
+                    sessionLastUsed.set(sessionId, Date.now());
                     log.info(`Successfully resumed session: ${sessionId}`);
                     return { session, sessionId };
                 }
@@ -94,6 +120,7 @@ async function getOrCreateSession(sessionId, workDir, model, permissionMode) {
             // 暂时返回 undefined，稍后在 init 消息中获取
             const tempId = `pending-${Date.now()}`;
             activeSessions.set(tempId, session);
+            sessionLastUsed.set(tempId, Date.now());
             log.info(`Created new session (tempId: ${tempId})`);
             return { session, sessionId: tempId };
         }
@@ -110,6 +137,7 @@ export class ClaudeSDKAdapter {
      * 清理所有活跃的 SDK 会话和流
      */
     static destroy() {
+        clearInterval(cleanupInterval);
         for (const stream of activeStreams) {
             try {
                 if (stream && typeof stream.return === 'function') {
@@ -130,6 +158,7 @@ export class ClaudeSDKAdapter {
             }
         }
         activeSessions.clear();
+        sessionLastUsed.clear();
     }
     run(prompt, sessionId, workDir, callbacks, options) {
         log.info(`[V2] run() entry model=${String(options?.model ?? '')} baseUrl=${process.env.ANTHROPIC_BASE_URL ?? '(default)'}`);
@@ -185,6 +214,9 @@ export class ClaudeSDKAdapter {
                                     activeSessions.delete(idToClean);
                                 }
                                 activeSessions.set(newSessionId, session);
+                                sessionLastUsed.set(newSessionId, Date.now());
+                                if (idToClean)
+                                    sessionLastUsed.delete(idToClean);
                                 actualSessionId = newSessionId;
                                 log.info(`[V2] Got actual sessionId: ${newSessionId}`);
                                 callbacks.onSessionId?.(newSessionId);
@@ -313,8 +345,15 @@ export class ClaudeSDKAdapter {
                 callbacks.onError(msg);
             }
         };
-        // 启动会话（不等待）
-        runSession();
+        // 启动会话（不等待），catch 兜底防止 unhandledRejection 导致用户请求挂起
+        runSession().catch((err) => {
+            if (!runSettled) {
+                runSettled = true;
+                const msg = err instanceof Error ? err.message : String(err);
+                log.error(`Unhandled runSession error: ${msg}`);
+                callbacks.onError(msg);
+            }
+        });
         return {
             abort: () => {
                 log.info('Aborting session run');

package/dist/config-web.js

@@ -180,6 +180,15 @@ function clean(value) {
     const trimmed = value.trim();
     return trimmed ? trimmed : undefined;
 }
+function isMasked(value) {
+    return typeof value === "string" && value.includes("****");
+}
+/** 如果前端传回的是掩码值（包含 ****），保留 existing 中的真实密钥，避免覆盖 */
+function resolveSecret(incoming, existing) {
+    if (isMasked(incoming))
+        return existing;
+    return clean(incoming);
+}
 const MAX_REQUEST_BODY_BYTES = 1 * 1024 * 1024; // 1 MB
 function readJson(request) {
     return new Promise((resolve, reject) => {
@@ -558,8 +567,10 @@ export async function testPlatformConfig(platform, config) {
 function toFileConfig(payload, existing) {
     // Save Claude environment variables to ~/.claude/settings.json
     const claudeEnv = {};
-    if (payload.ai.claudeAuthToken)
-        claudeEnv.ANTHROPIC_AUTH_TOKEN = payload.ai.claudeAuthToken;
+    const existingClaudeEnv = loadClaudeSettingsEnv();
+    const resolvedAuthToken = resolveSecret(payload.ai.claudeAuthToken, existingClaudeEnv.ANTHROPIC_AUTH_TOKEN);
+    if (resolvedAuthToken)
+        claudeEnv.ANTHROPIC_AUTH_TOKEN = resolvedAuthToken;
     if (payload.ai.claudeBaseUrl)
         claudeEnv.ANTHROPIC_BASE_URL = payload.ai.claudeBaseUrl;
     if (payload.ai.claudeModel)
@@ -600,7 +611,7 @@ function toFileConfig(payload, existing) {
                 ...existing.platforms?.telegram,
                 enabled: payload.platforms.telegram.enabled,
                 aiCommand: clean(payload.platforms.telegram.aiCommand),
-                botToken: clean(payload.platforms.telegram.botToken),
+                botToken: resolveSecret(payload.platforms.telegram.botToken, existing.platforms?.telegram?.botToken),
                 proxy: clean(payload.platforms.telegram.proxy),
                 allowedUserIds: splitCsv(payload.platforms.telegram.allowedUserIds),
             },
@@ -609,7 +620,7 @@ function toFileConfig(payload, existing) {
                 enabled: payload.platforms.feishu.enabled,
                 aiCommand: clean(payload.platforms.feishu.aiCommand),
                 appId: clean(payload.platforms.feishu.appId),
-                appSecret: clean(payload.platforms.feishu.appSecret),
+                appSecret: resolveSecret(payload.platforms.feishu.appSecret, existing.platforms?.feishu?.appSecret),
                 allowedUserIds: splitCsv(payload.platforms.feishu.allowedUserIds),
             },
             qq: {
@@ -617,7 +628,7 @@ function toFileConfig(payload, existing) {
                 enabled: payload.platforms.qq.enabled,
                 aiCommand: clean(payload.platforms.qq.aiCommand),
                 appId: clean(payload.platforms.qq.appId),
-                secret: clean(payload.platforms.qq.secret),
+                secret: resolveSecret(payload.platforms.qq.secret, existing.platforms?.qq?.secret),
                 allowedUserIds: splitCsv(payload.platforms.qq.allowedUserIds),
             },
             wework: {
@@ -625,7 +636,7 @@ function toFileConfig(payload, existing) {
                 enabled: payload.platforms.wework.enabled,
                 aiCommand: clean(payload.platforms.wework.aiCommand),
                 corpId: clean(payload.platforms.wework.corpId),
-                secret: clean(payload.platforms.wework.secret),
+                secret: resolveSecret(payload.platforms.wework.secret, existing.platforms?.wework?.secret),
                 allowedUserIds: splitCsv(payload.platforms.wework.allowedUserIds),
             },
             dingtalk: {
@@ -633,7 +644,7 @@ function toFileConfig(payload, existing) {
                 enabled: payload.platforms.dingtalk.enabled,
                 aiCommand: clean(payload.platforms.dingtalk.aiCommand),
                 clientId: clean(payload.platforms.dingtalk.clientId),
-                clientSecret: clean(payload.platforms.dingtalk.clientSecret),
+                clientSecret: resolveSecret(payload.platforms.dingtalk.clientSecret, existing.platforms?.dingtalk?.clientSecret),
                 cardTemplateId: clean(payload.platforms.dingtalk.cardTemplateId),
                 allowedUserIds: splitCsv(payload.platforms.dingtalk.allowedUserIds),
             },
@@ -641,8 +652,8 @@ function toFileConfig(payload, existing) {
                 ...existing.platforms?.workbuddy,
                 enabled: payload.platforms.workbuddy.enabled,
                 aiCommand: clean(payload.platforms.workbuddy.aiCommand),
-                accessToken: clean(payload.platforms.workbuddy.accessToken),
-                refreshToken: clean(payload.platforms.workbuddy.refreshToken),
+                accessToken: resolveSecret(payload.platforms.workbuddy.accessToken, existing.platforms?.workbuddy?.accessToken),
+                refreshToken: resolveSecret(payload.platforms.workbuddy.refreshToken, existing.platforms?.workbuddy?.refreshToken),
                 userId: clean(payload.platforms.workbuddy.userId),
                 baseUrl: clean(payload.platforms.workbuddy.baseUrl),
                 allowedUserIds: splitCsv(payload.platforms.workbuddy.allowedUserIds),

package/dist/index.js

@@ -294,7 +294,7 @@ export async function main() {
     process.on("SIGTERM", () => shutdown().catch(() => process.exit(1)));
     // Global error handlers to prevent unhandled crashes
     process.on("unhandledRejection", (reason) => {
-        log.error("Unhandled Promise rejection:", reason);
+        log.error("Unhandled Promise rejection (this indicates a bug — the affected request may hang without a response):", reason);
     });
     process.on("uncaughtException", (err) => {
         const msg = err?.message ?? String(err);

package/dist/session/session-manager.js

@@ -250,33 +250,46 @@ export class SessionManager {
     }
     load(previousDefaultWorkDir) {
         try {
-            if (existsSync(SESSIONS_FILE)) {
-                const data = JSON.parse(readFileSync(SESSIONS_FILE, 'utf-8'));
-                for (const [k, v] of Object.entries(data)) {
-                    if (v && typeof v.workDir === 'string') {
-                        // 如果该会话目录等于旧默认目录，则迁移到新的默认目录（认为用户没有手动 /cd 过）
-                        if (previousDefaultWorkDir && v.workDir === previousDefaultWorkDir) {
-                            v.workDir = this.defaultWorkDir;
-                        }
-                        if (!v.activeConvId)
-                            v.activeConvId = randomBytes(4).toString('hex');
-                        if (!v.sessionIds)
-                            v.sessionIds = {};
-                        if ('sessionId' in v) {
-                            log.warn(`Legacy shared sessionId found for user ${k}; clearing it to avoid cross-tool resume conflicts`);
-                        }
-                        delete v.sessionId;
-                        if (v.threads) {
-                            for (const thread of Object.values(v.threads)) {
-                                if (!thread.sessionIds)
-                                    thread.sessionIds = {};
-                                if ('sessionId' in thread) {
-                                    log.warn(`Legacy thread sessionId found for user ${k}; clearing it during session migration`);
-                                }
-                                delete thread.sessionId;
+            if (!existsSync(SESSIONS_FILE))
+                return;
+            const raw = JSON.parse(readFileSync(SESSIONS_FILE, 'utf-8'));
+            // v2 格式: { sessions: {...}, convSessionMap: {...} }
+            // v1 格式: 直接是 Record<string, UserSession>
+            const isV2 = raw && typeof raw === 'object' && raw.sessions && typeof raw.sessions === 'object' && !raw.workDir;
+            const sessionData = isV2 ? raw.sessions : raw;
+            const convMapData = isV2 ? raw.convSessionMap : undefined;
+            for (const [k, v] of Object.entries(sessionData)) {
+                if (v && typeof v.workDir === 'string') {
+                    // 如果该会话目录等于旧默认目录，则迁移到新的默认目录（认为用户没有手动 /cd 过）
+                    if (previousDefaultWorkDir && v.workDir === previousDefaultWorkDir) {
+                        v.workDir = this.defaultWorkDir;
+                    }
+                    if (!v.activeConvId)
+                        v.activeConvId = randomBytes(4).toString('hex');
+                    if (!v.sessionIds)
+                        v.sessionIds = {};
+                    if ('sessionId' in v) {
+                        log.warn(`Legacy shared sessionId found for user ${k}; clearing it to avoid cross-tool resume conflicts`);
+                    }
+                    delete v.sessionId;
+                    if (v.threads) {
+                        for (const thread of Object.values(v.threads)) {
+                            if (!thread.sessionIds)
+                                thread.sessionIds = {};
+                            if ('sessionId' in thread) {
+                                log.warn(`Legacy thread sessionId found for user ${k}; clearing it during session migration`);
                             }
+                            delete thread.sessionId;
                         }
-                        this.sessions.set(k, v);
+                    }
+                    this.sessions.set(k, v);
+                }
+            }
+            // 恢复 convSessionMap
+            if (convMapData && typeof convMapData === 'object') {
+                for (const [k, v] of Object.entries(convMapData)) {
+                    if (typeof v === 'string') {
+                        this.convSessionMap.set(k, v);
                     }
                 }
             }
@@ -312,10 +325,13 @@ export class SessionManager {
             const dir = dirname(SESSIONS_FILE);
             if (!existsSync(dir))
                 mkdirSync(dir, { recursive: true });
-            const obj = {};
+            const sessions = {};
             for (const [k, v] of this.sessions)
-                obj[k] = v;
-            writeFileSync(SESSIONS_FILE, JSON.stringify(obj, null, 2), 'utf-8');
+                sessions[k] = v;
+            const convSessionMapObj = {};
+            for (const [k, v] of this.convSessionMap)
+                convSessionMapObj[k] = v;
+            writeFileSync(SESSIONS_FILE, JSON.stringify({ sessions, convSessionMap: convSessionMapObj }, null, 2), 'utf-8');
         }
         catch (err) {
             log.error('Failed to save sessions:', err);

package/package.json

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