omp-wechat 1.6.0 → 1.8.0

package/dist/index.js

@@ -1188,6 +1188,11 @@ var logger = {
 var STATE_DIR = join3(homedir2(), ".omp-wechat");
 var CREDENTIALS_FILE = join3(STATE_DIR, "credentials.json");
 var SYNC_BUF_FILE = join3(STATE_DIR, "sync_buf.txt");
+var CHANNEL_VERSION = "2.2.0";
+var BOT_AGENT = "OMP-Wechat/1.7.0";
+function baseInfo() {
+  return { channel_version: CHANNEL_VERSION, bot_agent: BOT_AGENT };
+}
 function loadCredentials() {
   try {
     return JSON.parse(readFileSync(CREDENTIALS_FILE, "utf8"));
@@ -1241,7 +1246,15 @@ async function apiFetch(creds, endpoint, body, timeoutMs = 15000) {
     const text = await res.text();
     if (!res.ok)
       throw new Error(`${endpoint} ${res.status}: ${text}`);
-    return JSON.parse(text);
+    const data = JSON.parse(text);
+    const ret = typeof data.ret === "number" ? data.ret : undefined;
+    const errcode = typeof data.errcode === "number" ? data.errcode : undefined;
+    if (ret !== undefined && ret !== 0 || errcode !== undefined && errcode !== 0) {
+      const code = errcode ?? ret ?? 0;
+      const errmsg = typeof data.errmsg === "string" ? data.errmsg : "";
+      throw new Error(`${endpoint} error ret=${ret} errcode=${errcode}${errmsg ? `: ${errmsg}` : ""} (code ${code})`);
+    }
+    return data;
   } catch (err) {
     clearTimeout(timer);
     throw err;
@@ -1251,7 +1264,7 @@ async function getUpdates(creds, buf) {
   try {
     const resp = await apiFetch(creds, "ilink/bot/getupdates", {
       get_updates_buf: buf,
-      base_info: { channel_version: "0.1.0" }
+      base_info: baseInfo()
     }, 35000);
     return resp;
   } catch (err) {
@@ -1272,7 +1285,7 @@ async function sendMessage(creds, to, text, contextToken, clientId) {
       item_list: [{ type: 1, text_item: { text } }],
       context_token: contextToken
     },
-    base_info: { channel_version: "0.1.0" }
+    base_info: baseInfo()
   }, 15000);
 }
 var typingTicketCache = new Map;
@@ -1284,7 +1297,7 @@ async function ensureTypingTicket(creds, userId) {
   try {
     const resp = await apiFetch(creds, "ilink/bot/getconfig", {
       ilink_user_id: userId,
-      base_info: { channel_version: "2.0.1" }
+      base_info: baseInfo()
     }, 15000);
     const data = resp;
     if (data.typing_ticket) {
@@ -1306,10 +1319,9 @@ async function sendTyping(creds, userId, command) {
   try {
     await apiFetch(creds, "ilink/bot/sendtyping", {
       ilink_user_id: userId,
-      to_user_id: userId,
       typing_ticket: ticket,
-      command,
-      base_info: { channel_version: "2.0.1" }
+      status: command,
+      base_info: baseInfo()
     }, 1e4);
   } catch (err) {
     logger.debug(`sendTyping failed for ${userId}: ${err}`);
@@ -1873,7 +1885,7 @@ async function uploadAndSendFile(creds, to, contextToken, filePath, maxSizeBytes
       filesize: ciphertext.length,
       no_need_thumb: true,
       aeskey: aesKey.toString("hex"),
-      base_info: { channel_version: "0.1.0" }
+      base_info: baseInfo()
     }, 15000);
     const uploadFullUrl = uploadParams.upload_full_url?.trim();
     if (!uploadFullUrl && !uploadParams.upload_param) {
@@ -1920,7 +1932,7 @@ async function uploadAndSendFile(creds, to, contextToken, filePath, maxSizeBytes
     }
     const media = {
       encrypt_query_param: encryptQueryParam,
-      aes_key: aesKey.toString("base64"),
+      aes_key: Buffer.from(aesKey.toString("hex"), "utf8").toString("base64"),
       encrypt_type: 1
     };
     const item = mediaType === 1 /* IMAGE */ ? {
@@ -1931,7 +1943,6 @@ async function uploadAndSendFile(creds, to, contextToken, filePath, maxSizeBytes
       file_item: {
         media,
         file_name: fileName,
-        md5: rawMd5,
         len: String(data.length)
       }
     };
@@ -1948,7 +1959,7 @@ async function uploadAndSendFile(creds, to, contextToken, filePath, maxSizeBytes
             item_list: [item],
             context_token: contextToken
           },
-          base_info: { channel_version: "0.1.0" }
+          base_info: baseInfo()
         }, 15000);
         logger.info(`Sent ${mediaType === 1 /* IMAGE */ ? "image" : "file"} to ${to}: ${fileName} (${data.length} bytes)`);
         return { status: "sent", mediaType, bytes: data.length };
@@ -2006,13 +2017,20 @@ import { homedir as homedir6 } from "os";
 import { existsSync as existsSync2, mkdirSync as mkdirSync5, readdirSync as readdirSync2, statSync as statSync3, rmSync } from "fs";
 var STATE_DIR4 = join7(homedir6(), ".omp-wechat");
 var SESSIONS_DIR = join7(STATE_DIR4, "sessions");
+var DEFAULT_OUTBOX_BASE = join7(STATE_DIR4, "outbox");
 var STALE_THRESHOLD_MS = 30 * 24 * 60 * 60 * 1000;
 function sanitizeChatId(chatId) {
   return chatId.replace(/[^a-zA-Z0-9_@.-]/g, "_").slice(0, 200);
 }
+function sanitizeOutboxChatId(chatId) {
+  return chatId.replace(/[^a-zA-Z0-9_-]/g, "_");
+}
 function sessionDirFor(chatId) {
   return join7(SESSIONS_DIR, sanitizeChatId(chatId));
 }
+function outboxDirFor(chatId, outboxBase) {
+  return join7(outboxBase ?? DEFAULT_OUTBOX_BASE, sanitizeOutboxChatId(chatId));
+}
 function ensureSessionsDir() {
   mkdirSync5(SESSIONS_DIR, { recursive: true, mode: 448 });
 }
@@ -2028,6 +2046,54 @@ function removeSessionDir(chatId) {
     return false;
   }
 }
+function removeOutboxDir(chatId, outboxBase) {
+  const dir = outboxDirFor(chatId, outboxBase);
+  if (!existsSync2(dir))
+    return false;
+  try {
+    rmSync(dir, { recursive: true, force: true });
+    logger.info(`Removed outbox dir: ${dir}`);
+    return true;
+  } catch (err) {
+    logger.warn(`Failed to remove outbox dir ${dir}: ${err}`);
+    return false;
+  }
+}
+function cleanupStaleOutboxes(outboxBase) {
+  const base = outboxBase ?? DEFAULT_OUTBOX_BASE;
+  if (!existsSync2(base))
+    return 0;
+  const now = Date.now();
+  let removed = 0;
+  for (const entry of readdirSync2(base, { withFileTypes: true })) {
+    if (!entry.isDirectory())
+      continue;
+    const dir = join7(base, entry.name);
+    let newestMtime = 0;
+    try {
+      for (const file of readdirSync2(dir)) {
+        const mtime = statSync3(join7(dir, file)).mtimeMs;
+        if (mtime > newestMtime)
+          newestMtime = mtime;
+      }
+    } catch {
+      continue;
+    }
+    if (newestMtime === 0 || now - newestMtime > STALE_THRESHOLD_MS) {
+      try {
+        rmSync(dir, { recursive: true, force: true });
+        removed++;
+        logger.info(`Cleaned up stale outbox dir: ${entry.name}`);
+      } catch (err) {
+        logger.warn(`Failed to cleanup outbox dir ${entry.name}: ${err}`);
+      }
+    }
+  }
+  if (removed > 0) {
+    logger.info(`Outbox cleanup: removed ${removed} stale outbox(es)`);
+  }
+  return removed;
+}
 function cleanupStaleSessions() {
   if (!existsSync2(SESSIONS_DIR))
     return 0;
@@ -2081,15 +2147,7 @@ function clearAllSessions() {
 
 // src/engine/session.ts
 import { mkdirSync as mkdirSync6, readdirSync as readdirSync3, statSync as statSync4 } from "fs";
-import { homedir as homedir7 } from "os";
 import { join as join8 } from "path";
-var DEFAULT_OUTBOX_BASE = join8(homedir7(), ".omp-wechat", "outbox");
-function sanitizeChatId2(chatId) {
-  return chatId.replace(/[^a-zA-Z0-9_-]/g, "_");
-}
-function outboxDirFor(chatId, config) {
-  return join8(config.outboxDir ?? DEFAULT_OUTBOX_BASE, sanitizeChatId2(chatId));
-}
 function outboxInstructions(outboxDir) {
   return `## File delivery to WeChat
 
@@ -2137,7 +2195,7 @@ class ChatSession {
   }
   static async create(chatId, contextToken, config, onReply, onFiles) {
     logger.info(`Creating session: ${chatId}`);
-    const outboxDir = outboxDirFor(chatId, config);
+    const outboxDir = outboxDirFor(chatId, config.outboxDir);
     const sendFilesEnabled = config.sendFiles !== false;
     if (sendFilesEnabled) {
       try {
@@ -2270,13 +2328,14 @@ class SessionPool {
   get(chatId) {
     return this.pool.get(chatId);
   }
-  async resetSession(chatId) {
+  async resetSession(chatId, config) {
     const entry = this.pool.get(chatId);
     if (entry) {
       await entry.dispose();
       this.pool.delete(chatId);
     }
     removeSessionDir(chatId);
+    removeOutboxDir(chatId, config.outboxDir);
   }
   getContextToken(chatId) {
     return this.pool.get(chatId)?.getContextToken() ?? "";
@@ -2479,7 +2538,7 @@ class ModelCommand {
 // src/command/new-session-command.ts
 class NewSessionInvocation {
   async execute(ctx) {
-    await ctx.pool.resetSession(ctx.chatId);
+    await ctx.pool.resetSession(ctx.chatId, ctx.config);
     return "Session reset. Your next message starts a fresh conversation.";
   }
 }
@@ -2583,7 +2642,11 @@ class WeChatBridge {
       this.releaseLock();
     });
     cleanupStaleSessions();
-    this.cleanupTimer = setInterval(() => cleanupStaleSessions(), 6 * 60 * 60 * 1000);
+    cleanupStaleOutboxes(config.outboxDir);
+    this.cleanupTimer = setInterval(() => {
+      cleanupStaleSessions();
+      cleanupStaleOutboxes(config.outboxDir);
+    }, 6 * 60 * 60 * 1000);
     return this.state;
   }
   async stop() {
@@ -2835,7 +2898,7 @@ ${truncated}
 }
 
 // src/service.ts
-import { platform, homedir as homedir8 } from "os";
+import { platform, homedir as homedir7 } from "os";
 import { join as join9, basename as basename4 } from "path";
 import { existsSync as existsSync3, mkdirSync as mkdirSync7, writeFileSync as writeFileSync4, rmSync as rmSync3 } from "fs";
 var PLIST_LABEL = "com.omp-wechat";
@@ -2851,14 +2914,14 @@ function detectPlatform() {
   return "other";
 }
 function getLogDir() {
-  return join9(homedir8(), ".omp", "logs");
+  return join9(homedir7(), ".omp", "logs");
 }
 function resolveHostBinary() {
   const exe = process.execPath || "omp";
   return basename4(exe);
 }
 function plistPath() {
-  return join9(homedir8(), "Library", "LaunchAgents", `${PLIST_LABEL}.plist`);
+  return join9(homedir7(), "Library", "LaunchAgents", `${PLIST_LABEL}.plist`);
 }
 function generatePlist() {
   const omp = resolveHostBinary();
@@ -2894,14 +2957,14 @@ function generatePlist() {
     <key>PATH</key>
     <string>/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin</string>
     <key>HOME</key>
-    <string>${homedir8()}</string>
+    <string>${homedir7()}</string>
   </dict>
 </dict>
 </plist>
 `;
 }
 function installLaunchd() {
-  const dir = join9(homedir8(), "Library", "LaunchAgents");
+  const dir = join9(homedir7(), "Library", "LaunchAgents");
   mkdirSync7(dir, { recursive: true });
   mkdirSync7(getLogDir(), { recursive: true });
   const plist = plistPath();
@@ -2943,7 +3006,7 @@ ExecStart=/bin/sh -c 'while true; do echo "{\\"id\\":\\"ka\\",\\"type\\":\\"get_
 Restart=always
 RestartSec=10
 
-Environment=HOME=${homedir8()}
+Environment=HOME=${homedir7()}
 Environment=PATH=/usr/local/bin:/usr/bin:/bin
 
 StandardOutput=null
@@ -2952,7 +3015,7 @@ StandardError=append:${logDir}/rpc.log
 NoNewPrivileges=true
 ProtectSystem=strict
 ProtectHome=read-only
-ReadWritePaths=${logDir} ${join9(homedir8(), ".omp-wechat")} ${join9(homedir8(), ".omp")}
+ReadWritePaths=${logDir} ${join9(homedir7(), ".omp-wechat")} ${join9(homedir7(), ".omp")}
 PrivateTmp=true
 
 [Install]
@@ -2993,7 +3056,7 @@ function uninstallSystemd() {
 }
 var WIN_TASK_NAME = "OMP-Wechat";
 function winScriptPath() {
-  return join9(homedir8(), ".omp-wechat", "omp-wechat-rpc.ps1");
+  return join9(homedir7(), ".omp-wechat", "omp-wechat-rpc.ps1");
 }
 function generateWinScript() {
   const omp = process.execPath || "omp";
@@ -3036,7 +3099,7 @@ while ($true) {
 `;
 }
 function installWinTask() {
-  mkdirSync7(join9(homedir8(), ".omp-wechat"), { recursive: true });
+  mkdirSync7(join9(homedir7(), ".omp-wechat"), { recursive: true });
   mkdirSync7(getLogDir(), { recursive: true });
   writeFileSync4(winScriptPath(), generateWinScript());
   Bun.spawnSync(["schtasks", "/end", "/tn", WIN_TASK_NAME], { stderr: "ignore" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omp-wechat",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "description": "OMP/Pi extension: bridge WeChat messages to OMP's AI engine via the iLink Bot API",
   "type": "module",
   "main": "dist/index.js",