omp-wechat 1.7.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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omp-wechat",
-  "version": "1.7.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",