@wu529778790/open-im 1.10.9-beta.16 → 1.10.9-beta.18

package/dist/clawbot/client.js

@@ -4,6 +4,7 @@
  * Receives messages via long-polling ilink/bot/getupdates
  * and dispatches them to the event handler.
  */
+import { randomUUID } from 'node:crypto';
 import { createLogger } from '../logger.js';
 import { jitteredDelay } from '../shared/reconnect.js';
 import { CLAWBOT_POLL_INTERVAL_MS } from '../constants.js';
@@ -137,15 +138,40 @@ function updateState(state) {
 }
 async function fetchApi(path, signal) {
     const url = `${apiUrl}${path}`;
-    const res = await fetch(url, {
-        headers: {
-            Authorization: `Bearer ${apiToken}`,
-            AuthorizationType: 'ilink_bot_token',
-            'iLink-App-Id': 'bot',
-        },
-        signal,
-    });
-    return res.json();
+    const headers = {
+        'Content-Type': 'application/json',
+        'AuthorizationType': 'ilink_bot_token',
+        'iLink-App-Id': 'bot',
+        'iLink-App-ClientVersion': '131588',
+        'X-WECHAT-UIN': randomUUID(),
+    };
+    // Add bot_token to URL for authenticated endpoints
+    const sep = path.includes('?') ? '&' : '?';
+    const authedUrl = apiToken ? `${url}${sep}bot_token=${encodeURIComponent(apiToken)}` : url;
+    const res = await fetch(authedUrl, { headers, signal });
+    const text = await res.text();
+    try {
+        const raw = JSON.parse(text);
+        // iLink API uses {"ret": 0} for success, {"ret": -1} for error
+        if ('ret' in raw) {
+            const ok = raw.ret === 0 || raw.ret === '0';
+            const result = raw.result ?? raw.data ?? raw;
+            if (!ok) {
+                log.warn(`ClawBot API ${path.split('?')[0]} response: ${text.substring(0, 500)}`);
+            }
+            return { ok, error: ok ? undefined : String(raw.retmsg ?? raw.errmsg ?? raw.msg ?? `ret=${raw.ret}`), result };
+        }
+        // Fallback: {"ok": true/false} format
+        const json = raw;
+        if (!json.ok) {
+            log.warn(`ClawBot API ${path.split('?')[0]} response: ${text.substring(0, 500)}`);
+        }
+        return json;
+    }
+    catch {
+        log.warn(`ClawBot API non-JSON response (${res.status}): ${text.substring(0, 300)}`);
+        return { ok: false, error: `HTTP ${res.status}: non-JSON response` };
+    }
 }
 function sleep(ms, signal) {
     return new Promise((resolve) => {

package/dist/clawbot/message-sender.js

@@ -1,6 +1,7 @@
 /**
  * ClawBot Message Sender - Send messages via iLink API
  */
+import { randomUUID } from 'node:crypto';
 import { createLogger } from '../logger.js';
 import { splitLongContent, toReplyPlainText } from '../shared/utils.js';
 import { MAX_CLAWBOT_MESSAGE_LENGTH } from '../constants.js';
@@ -18,19 +19,22 @@ async function postMessage(chatId, text) {
         return false;
     }
     try {
-        const res = await fetch(`${apiUrl}/ilink/bot/sendmessage`, {
+        const url = `${apiUrl}/ilink/bot/sendmessage?bot_token=${encodeURIComponent(apiToken)}`;
+        const res = await fetch(url, {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
-                Authorization: `Bearer ${apiToken}`,
-                AuthorizationType: 'ilink_bot_token',
+                'AuthorizationType': 'ilink_bot_token',
                 'iLink-App-Id': 'bot',
+                'iLink-App-ClientVersion': '131588',
+                'X-WECHAT-UIN': randomUUID(),
             },
             body: JSON.stringify({ chat_id: chatId, text }),
         });
         const data = await res.json();
-        if (!data.ok) {
-            log.error(`ClawBot sendmessage failed: ${data.error ?? 'unknown'}`);
+        const ok = data.ok === true || data.ret === 0 || data.ret === '0';
+        if (!ok) {
+            log.error(`ClawBot sendmessage failed: ${JSON.stringify(data).substring(0, 300)}`);
             return false;
         }
         return true;

package/dist/config-web.js

@@ -625,12 +625,20 @@ async function probeClawBot(config) {
     const apiToken = clean(String(config.apiToken ?? ""));
     if (!apiToken)
         throw new Error("ClawBot API token is required.");
-    const response = await fetch(`${apiUrl}/ilink/bot/getupdates?timeout=1`, {
-        headers: { Authorization: `Bearer ${apiToken}` },
+    const { randomUUID } = await import('node:crypto');
+    const response = await fetch(`${apiUrl}/ilink/bot/getupdates?timeout=1&bot_token=${encodeURIComponent(apiToken)}`, {
+        headers: {
+            'Content-Type': 'application/json',
+            'AuthorizationType': 'ilink_bot_token',
+            'iLink-App-Id': 'bot',
+            'iLink-App-ClientVersion': '131588',
+            'X-WECHAT-UIN': randomUUID(),
+        },
         signal: AbortSignal.timeout(TEST_TIMEOUT_MS),
     });
     const body = await readJsonResponse(response);
-    if (!response.ok || body.ok !== true) {
+    const ok = body.ok === true || body.ret === 0 || body.ret === '0';
+    if (!response.ok || !ok) {
         throw new Error(String(body.error ?? body.description ?? `HTTP ${response.status}`));
     }
     return "ClawBot API reachable.";

package/dist/setup.js

@@ -607,6 +607,8 @@ export async function runInteractiveSetup() {
                 });
                 if (result.connected && result.botToken) {
                     cbApiToken = result.botToken;
+                    if (result.baseUrl)
+                        cbApiUrl = result.baseUrl;
                     console.log("\n✅ 登录成功！");
                     if (result.userId) {
                         console.log(`   用户 ID: ${result.userId}`);

package/package.json

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