@wu529778790/open-im 0.3.12 → 1.0.0

package/dist/index.js

@@ -1,49 +1,40 @@
-import { loadConfig, needsSetup } from './config.js';
-import { runInteractiveSetup } from './setup.js';
+import { createServer } from "node:http";
+import { writeFileSync, existsSync, mkdirSync, unlinkSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { loadConfig, needsSetup } from "./config.js";
+import { runInteractiveSetup } from "./setup.js";
 // 导出供 cli.ts 使用
 export { needsSetup, runInteractiveSetup };
-import { initTelegram, stopTelegram } from './telegram/client.js';
-import { setupTelegramHandlers } from './telegram/event-handler.js';
-import { sendTextReply } from './telegram/message-sender.js';
-import { initAdapters } from './adapters/registry.js';
-import { SessionManager } from './session/session-manager.js';
-import { loadActiveChats, getActiveChatId, flushActiveChats } from './shared/active-chats.js';
-import { initLogger, createLogger, closeLogger } from './logger.js';
-import { createRequire } from 'node:module';
-import { join } from 'node:path';
-import { homedir } from 'node:os';
-import { rm } from 'node:fs/promises';
-import { existsSync } from 'node:fs';
+import { initTelegram, stopTelegram } from "./telegram/client.js";
+import { setupTelegramHandlers } from "./telegram/event-handler.js";
+import { sendTextReply as sendTelegramTextReply } from "./telegram/message-sender.js";
+import { initFeishu, stopFeishu } from "./feishu/client.js";
+import { setupFeishuHandlers } from "./feishu/event-handler.js";
+import { sendTextReply as sendFeishuTextReply } from "./feishu/message-sender.js";
+import { initAdapters } from "./adapters/registry.js";
+import { SessionManager } from "./session/session-manager.js";
+import { loadActiveChats, getActiveChatId, flushActiveChats, } from "./shared/active-chats.js";
+import { initLogger, createLogger, closeLogger } from "./logger.js";
+import { APP_HOME, SHUTDOWN_PORT } from "./constants.js";
+import { createRequire } from "node:module";
 const require = createRequire(import.meta.url);
-const { version: APP_VERSION } = require('../package.json');
-const log = createLogger('Main');
-// 停止标记文件路径
-const STOP_FILE = join(homedir(), '.open-im', 'stop.flag');
-// 检查是否收到停止信号
-function checkStopSignal() {
-    return existsSync(STOP_FILE);
-}
-// 清理停止标记文件
-async function clearStopSignal() {
-    try {
-        if (existsSync(STOP_FILE)) {
-            await rm(STOP_FILE);
-        }
-    }
-    catch {
-        // 忽略错误
-    }
-}
+const { version: APP_VERSION } = require("../package.json");
+const log = createLogger("Main");
 async function sendLifecycleNotification(platform, message) {
-    const chatId = getActiveChatId('telegram');
-    if (!chatId)
-        return;
-    try {
-        await sendTextReply(chatId, message);
+    const telegramChatId = getActiveChatId("telegram");
+    const feishuChatId = getActiveChatId("feishu");
+    const sendPromises = [];
+    if (platform === "telegram" && telegramChatId) {
+        sendPromises.push(sendTelegramTextReply(telegramChatId, message).catch((err) => {
+            log.debug("Failed to send Telegram notification:", err);
+        }));
     }
-    catch (err) {
-        log.debug('Failed to send lifecycle notification:', err);
+    if (platform === "feishu" && feishuChatId) {
+        sendPromises.push(sendFeishuTextReply(feishuChatId, message).catch((err) => {
+            log.debug("Failed to send Feishu notification:", err);
+        }));
     }
+    await Promise.all(sendPromises);
 }
 export async function main() {
     if (needsSetup()) {
@@ -55,66 +46,91 @@ export async function main() {
     initLogger(config.logDir, config.logLevel);
     loadActiveChats();
     initAdapters(config);
-    log.info('Starting open-im bridge...');
+    log.info("Starting open-im bridge...");
     log.info(`AI 工具: ${config.aiCommand}`);
     log.info(`工作目录: ${config.claudeWorkDir}`);
+    log.info(`启用平台: ${config.enabledPlatforms.join(", ")}`);
     const sessionManager = new SessionManager(config.claudeWorkDir, config.allowedBaseDirs);
     let telegramHandle = null;
-    if (config.enabledPlatforms.includes('telegram')) {
+    let feishuHandle = null;
+    if (config.enabledPlatforms.includes("telegram")) {
         await initTelegram(config, (bot) => {
             telegramHandle = setupTelegramHandlers(bot, config, sessionManager);
         });
     }
-    log.info('Service is running. Press Ctrl+C to stop.');
+    if (config.enabledPlatforms.includes("feishu")) {
+        feishuHandle = setupFeishuHandlers(config, sessionManager);
+        await initFeishu(config, feishuHandle.handleEvent);
+    }
+    log.info("Service is running. Press Ctrl+C to stop.");
     const startupMsg = [
         `🟢 open-im v${APP_VERSION} 服务已启动`,
-        '',
+        "",
         `AI 工具: ${config.aiCommand}`,
         `工作目录: ${config.claudeWorkDir}`,
-    ].join('\n');
-    await sendLifecycleNotification('telegram', startupMsg).catch(() => { });
+        `启用平台: ${config.enabledPlatforms.join(", ")}`,
+    ].join("\n");
+    // Send notification to all enabled platforms
+    for (const platform of config.enabledPlatforms) {
+        await sendLifecycleNotification(platform, startupMsg).catch(() => { });
+    }
     const startedAt = Date.now();
     // 防止重复发送关闭通知
     let shutdownNotificationSent = false;
     const shutdown = async () => {
-        log.info('Shutting down...');
+        log.info("Shutting down...");
         const uptimeSec = Math.floor((Date.now() - startedAt) / 1000);
         const m = Math.floor(uptimeSec / 60);
-        // 只发送一次通知
-        if (!shutdownNotificationSent) {
-            shutdownNotificationSent = true;
-            try {
-                await sendLifecycleNotification('telegram', `🔴 open-im 服务正在关闭...\n运行时长: ${m}分钟`);
-                // 等待消息发送完成
-                await new Promise(resolve => setTimeout(resolve, 500));
-            }
-            catch (err) {
-                log.debug('Failed to send shutdown notification:', err);
-            }
+        const shutdownMsg = `🔴 open-im 服务正在关闭...\n运行时长: ${m}分钟`;
+        // Send notification to all enabled platforms
+        for (const platform of config.enabledPlatforms) {
+            await sendLifecycleNotification(platform, shutdownMsg).catch(() => { });
+        }
+        shutdownServer?.close();
+        const portFile = join(APP_HOME, "open-im.port");
+        try {
+            if (existsSync(portFile))
+                unlinkSync(portFile);
+        }
+        catch {
+            /* ignore */
         }
-        // 清理停止标记文件
-        await clearStopSignal();
         telegramHandle?.stop();
         stopTelegram();
+        feishuHandle?.stop();
+        stopFeishu();
         sessionManager.destroy();
         flushActiveChats();
         closeLogger();
         process.exit(0);
     };
-    process.on('SIGINT', () => shutdown().catch(() => process.exit(1)));
-    process.on('SIGTERM', () => shutdown().catch(() => process.exit(1)));
-    // 定期检查停止标记文件（用于 Windows 等无法发送信号的场景）
-    const stopCheckInterval = setInterval(() => {
-        if (checkStopSignal()) {
-            clearInterval(stopCheckInterval);
+    process.on("SIGINT", () => shutdown().catch(() => process.exit(1)));
+    process.on("SIGTERM", () => shutdown().catch(() => process.exit(1)));
+    // 优雅关闭 HTTP 服务：stop 命令通过此端口触发 shutdown（Windows 下 SIGTERM 不可靠）
+    const shutdownServer = createServer((req, res) => {
+        if (req.url === "/shutdown" || req.url === "/") {
+            res.writeHead(200, { "Content-Type": "text/plain" });
+            res.end("ok");
             shutdown().catch(() => process.exit(1));
         }
-    }, 1000);
+        else {
+            res.writeHead(404);
+            res.end();
+        }
+    });
+    shutdownServer.listen(SHUTDOWN_PORT, "127.0.0.1", () => {
+        const portFile = join(APP_HOME, "open-im.port");
+        const dir = dirname(portFile);
+        if (!existsSync(dir))
+            mkdirSync(dir, { recursive: true });
+        writeFileSync(portFile, String(SHUTDOWN_PORT), "utf-8");
+    });
 }
-const isEntry = process.argv[1]?.replace(/\\/g, '/').endsWith('/index.js') || process.argv[1]?.replace(/\\/g, '/').endsWith('/index.ts');
+const isEntry = process.argv[1]?.replace(/\\/g, "/").endsWith("/index.js") ||
+    process.argv[1]?.replace(/\\/g, "/").endsWith("/index.ts");
 if (isEntry) {
     main().catch((err) => {
-        console.error('Fatal error:', err);
+        console.error("Fatal error:", err);
         closeLogger();
         process.exit(1);
     });

package/dist/setup.d.ts

@@ -1,5 +1,6 @@
 /**
  * 首次运行时的交互式配置引导
  * 使用 prompts 库，兼容 tsx watch、IDE 终端等环境
+ * Telegram Token 使用 readline 避免 Windows 终端 prompts 重绘问题
  */
 export declare function runInteractiveSetup(): Promise<boolean>;

package/dist/setup.js

@@ -1,104 +1,202 @@
 /**
  * 首次运行时的交互式配置引导
  * 使用 prompts 库，兼容 tsx watch、IDE 终端等环境
+ * Telegram Token 使用 readline 避免 Windows 终端 prompts 重绘问题
  */
-import prompts from 'prompts';
-import { mkdirSync, writeFileSync, existsSync } from 'node:fs';
-import { join, dirname } from 'node:path';
-import { APP_HOME } from './constants.js';
+import prompts from "prompts";
+import { createInterface } from "node:readline";
+import { mkdirSync, writeFileSync, existsSync } from "node:fs";
+import { join, dirname } from "node:path";
+import { APP_HOME } from "./constants.js";
+function question(prompt) {
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    return new Promise((resolve) => {
+        rl.question(prompt, (answer) => {
+            rl.close();
+            resolve(answer.trim());
+        });
+    });
+}
 function printManualInstructions(configPath) {
-    console.log('\n━━━ open-im 首次配置 ━━━\n');
-    console.log('当前环境不支持交互输入，请手动创建配置文件：');
-    console.log('');
-    console.log('  1. 创建目录:', dirname(configPath));
-    console.log('  2. 创建文件:', configPath);
-    console.log('  3. 填入以下内容（替换为你的 Token 和用户 ID）：');
-    console.log('');
+    console.log("\n━━━ open-im 首次配置 ━━━\n");
+    console.log("当前环境不支持交互输入，请手动创建配置文件：");
+    console.log("");
+    console.log("  1. 创建目录:", dirname(configPath));
+    console.log("  2. 创建文件:", configPath);
+    console.log("  3. 填入以下内容（替换为你的 Token/App ID 和用户 ID）：");
+    console.log("");
     console.log(`{
-  "telegramBotToken": "你的Bot Token",
-  "allowedUserIds": ["你的Telegram用户ID"],
-  "claudeWorkDir": "${process.cwd().replace(/\\/g, '/')}",
+  "platforms": {
+    "telegram": {
+      "enabled": true,
+      "botToken": "你的 Telegram Bot Token（可选）",
+      "allowedUserIds": ["允许访问的 Telegram 用户 ID（可选）"]
+    },
+    "feishu": {
+      "enabled": false,
+      "appId": "你的飞书 App ID（可选）",
+      "appSecret": "你的飞书 App Secret（可选）",
+      "allowedUserIds": ["允许访问的飞书用户 ID（可选）"]
+    }
+  },
+  "claudeWorkDir": "${process.cwd().replace(/\\/g, "/")}",
   "claudeSkipPermissions": true,
   "aiCommand": "claude"
 }`);
-    console.log('');
-    console.log('或设置环境变量: TELEGRAM_BOT_TOKEN=xxx 后再运行');
-    console.log('');
+    console.log("");
+    console.log("提示：至少需要配置 Telegram 或 Feishu 其中一个平台");
+    console.log("或设置环境变量: TELEGRAM_BOT_TOKEN=xxx 或 FEISHU_APP_ID=xxx 后再运行");
+    console.log("");
 }
 export async function runInteractiveSetup() {
-    const configPath = join(APP_HOME, 'config.json');
-    const forceManual = process.argv.includes('--manual') || process.argv.includes('-m');
+    const configPath = join(APP_HOME, "config.json");
+    const forceManual = process.argv.includes("--manual") || process.argv.includes("-m");
     if (forceManual || !process.stdin.isTTY) {
         printManualInstructions(configPath);
         return false;
     }
-    console.log('\n━━━ open-im 首次配置 ━━━\n');
-    console.log('配置将保存到:', configPath);
-    console.log('');
+    console.log("\n━━━ open-im 首次配置 ━━━\n");
+    console.log("配置将保存到:", configPath);
+    console.log("");
     const onCancel = () => {
-        console.log('\n已取消配置。');
+        console.log("\n已取消配置。");
         process.exit(0);
     };
-    const response = await prompts([
-        {
-            type: 'text',
-            name: 'telegramBotToken',
-            message: 'Telegram Bot Token（必填，从 @BotFather 获取）',
-            validate: (v) => (v.trim() ? true : 'Token 不能为空'),
-        },
+    // 第一步：选择平台
+    const platformResp = await prompts({
+        type: "select",
+        name: "platform",
+        message: "选择要配置的平台（↑↓ 选择）",
+        choices: [
+            { title: "Telegram - 需要 Bot Token", value: "telegram" },
+            {
+                title: "飞书 (Feishu/Lark) - 需要 App ID 和 App Secret",
+                value: "feishu",
+            },
+            { title: "两者都配置", value: "both" },
+        ],
+        initial: 0,
+    }, { onCancel });
+    if (!platformResp.platform) {
+        return false;
+    }
+    const platform = platformResp.platform;
+    const config = { platforms: {} };
+    // 收集平台配置（Telegram 用 readline 避免 Windows 下 prompts 重绘/重复行问题）
+    if (platform === "telegram" || platform === "both") {
+        const token = await question("Telegram Bot Token（从 @BotFather 获取）: ");
+        if (token) {
+            config.telegramBotToken = token;
+        }
+        else if (platform === "telegram") {
+            console.log("Token 不能为空");
+            return false;
+        }
+    }
+    if (platform === "feishu" || platform === "both") {
+        const feishuResp = await prompts([
+            {
+                type: "text",
+                name: "appId",
+                message: "飞书 App ID（从飞书开放平台获取）",
+                validate: (v) => (v.trim() ? true : "App ID 不能为空"),
+            },
+            {
+                type: "text",
+                name: "appSecret",
+                message: "飞书 App Secret（从飞书开放平台获取）",
+                validate: (v) => (v.trim() ? true : "App Secret 不能为空"),
+            },
+        ], { onCancel });
+        if (feishuResp.appId && feishuResp.appSecret) {
+            config.platforms.feishu = {
+                ...config.platforms.feishu,
+                enabled: true,
+                appId: feishuResp.appId.trim(),
+                appSecret: feishuResp.appSecret.trim(),
+            };
+        }
+        else if (platform === "feishu") {
+            return false;
+        }
+    }
+    // 通用配置
+    const commonResp = await prompts([
         {
-            type: 'text',
-            name: 'allowedUserIds',
-            message: '白名单用户 ID（可选，逗号分隔，留空=所有人可访问）',
-            initial: '',
+            type: "text",
+            name: "telegramAllowedUserIds",
+            message: "Telegram 白名单用户 ID（可选，逗号分隔，留空=所有人可访问）",
+            initial: "",
         },
         {
-            type: 'text',
-            name: 'proxy',
-            message: '代理地址（可选，用于访问 Telegram，如: http://127.0.0.1:7890 或 socks5://127.0.0.1:1080）',
-            initial: '',
+            type: "text",
+            name: "feishuAllowedUserIds",
+            message: "飞书白名单用户 ID（可选，逗号分隔，留空=所有人可访问）",
+            initial: "",
         },
         {
-            type: 'select',
-            name: 'aiCommand',
-            message: 'AI 工具（↑↓ 选择）',
+            type: "select",
+            name: "aiCommand",
+            message: "AI 工具（↑↓ 选择）",
             choices: [
-                { title: 'claude-code', value: 'claude' },
-                { title: 'codex', value: 'codex' },
-                { title: 'cursor', value: 'cursor' },
+                { title: "claude-code", value: "claude" },
+                { title: "codex", value: "codex" },
+                { title: "cursor", value: "cursor" },
             ],
             initial: 0,
         },
         {
-            type: 'text',
-            name: 'workDir',
-            message: '工作目录',
+            type: "text",
+            name: "workDir",
+            message: "工作目录",
             initial: process.cwd(),
         },
     ], { onCancel });
-    if (!response.telegramBotToken) {
-        console.log('\n未输入 Token，取消配置。');
-        return false;
+    const parseIds = (value) => value
+        ? value
+            .split(",")
+            .map((s) => s.trim())
+            .filter(Boolean)
+        : [];
+    // 分平台白名单
+    const telegramIds = parseIds(commonResp.telegramAllowedUserIds);
+    const feishuIds = parseIds(commonResp.feishuAllowedUserIds);
+    if (platform === "telegram" || platform === "both") {
+        config.platforms.telegram = {
+            ...config.platforms.telegram,
+            enabled: true,
+            botToken: config.telegramBotToken ?? undefined,
+            allowedUserIds: telegramIds,
+        };
     }
-    const config = {
-        telegramBotToken: response.telegramBotToken.trim(),
-        allowedUserIds: response.allowedUserIds
-            ? response.allowedUserIds
-                .split(',')
-                .map((s) => s.trim())
-                .filter(Boolean)
-            : [],
-        proxy: response.proxy ? response.proxy.trim() : undefined,
-        claudeWorkDir: (response.workDir || process.cwd()).trim(),
-        claudeSkipPermissions: true,
-        aiCommand: response.aiCommand ?? 'claude',
-    };
+    else {
+        config.platforms.telegram = {
+            enabled: false,
+            allowedUserIds: telegramIds,
+        };
+    }
+    if (platform === "feishu" || platform === "both") {
+        config.platforms.feishu = {
+            ...config.platforms.feishu,
+            enabled: true,
+            allowedUserIds: feishuIds,
+        };
+    }
+    else {
+        config.platforms.feishu = {
+            enabled: false,
+            allowedUserIds: feishuIds,
+        };
+    }
+    config.claudeWorkDir = (commonResp.workDir || process.cwd()).trim();
+    config.claudeSkipPermissions = true;
+    config.aiCommand = commonResp.aiCommand ?? "claude";
     const dir = dirname(configPath);
     if (!existsSync(dir)) {
         mkdirSync(dir, { recursive: true });
     }
-    writeFileSync(configPath, JSON.stringify(config, null, 2), 'utf-8');
-    console.log('\n✅ 配置已保存到', configPath);
-    console.log('');
+    writeFileSync(configPath, JSON.stringify(config, null, 2), "utf-8");
+    console.log("\n✅ 配置已保存到", configPath);
+    console.log("");
     return true;
 }

package/dist/telegram/client.d.ts

@@ -1,5 +1,5 @@
-import { Telegraf } from 'telegraf';
-import type { Config } from '../config.js';
+import { Telegraf } from "telegraf";
+import type { Config } from "../config.js";
 export declare function getBot(): Telegraf;
 export declare function getBotUsername(): string | undefined;
 export declare function initTelegram(config: Config, setupHandlers: (bot: Telegraf) => void): Promise<void>;

package/dist/telegram/client.js

@@ -1,42 +1,31 @@
-import { Telegraf } from 'telegraf';
-import { createLogger } from '../logger.js';
-import { HttpsProxyAgent } from 'https-proxy-agent';
-const log = createLogger('Telegram');
+import { Telegraf } from "telegraf";
+import { createLogger } from "../logger.js";
+const log = createLogger("Telegram");
 let bot;
 let botUsername;
 export function getBot() {
     if (!bot)
-        throw new Error('Telegram bot not initialized');
+        throw new Error("Telegram bot not initialized");
     return bot;
 }
 export function getBotUsername() {
     return botUsername;
 }
 export async function initTelegram(config, setupHandlers) {
-    const telegrafOptions = {};
-    // 配置代理
-    if (config.proxy) {
-        try {
-            const agent = new HttpsProxyAgent(config.proxy);
-            telegrafOptions.telegram = {
-                agent,
-            };
-            log.info(`Using proxy: ${config.proxy}`);
-        }
-        catch (err) {
-            log.warn(`Failed to create proxy agent: ${err}. Continuing without proxy.`);
-        }
+    const token = config.telegramBotToken ?? "";
+    if (!token) {
+        throw new Error("Telegram bot token is required");
     }
-    bot = new Telegraf(config.telegramBotToken, telegrafOptions);
+    bot = new Telegraf(token);
     setupHandlers(bot);
     const me = (await bot.telegram.getMe());
     botUsername = me.username;
     bot.launch().catch((err) => {
-        log.error('Telegram polling error:', err);
+        log.error("Telegram polling error:", err);
         process.exit(1);
     });
-    log.info('Telegram bot launched');
+    log.info("Telegram bot launched");
 }
 export function stopTelegram() {
-    bot?.stop('SIGTERM');
+    bot?.stop("SIGTERM");
 }

package/dist/telegram/event-handler.d.ts

@@ -1,6 +1,6 @@
-import type { Telegraf } from 'telegraf';
-import type { Config } from '../config.js';
-import type { SessionManager } from '../session/session-manager.js';
+import type { Telegraf } from "telegraf";
+import type { Config } from "../config.js";
+import type { SessionManager } from "../session/session-manager.js";
 export interface TelegramEventHandlerHandle {
     stop: () => void;
     getRunningTaskCount: () => number;