@qihoo/tuitui-openclaw-channel 1.0.19 → 1.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qihoo/tuitui-openclaw-channel",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "maintainers": [
     {
       "name": "huzunjie",

package/src/accounts.ts

@@ -19,10 +19,10 @@ export const getDefaultAccountConfig = (acct?: any) => ({
 });
 
 export const resolveAccount = (cfg: any, accountId?: string | null) => {
-  accountId = accountId || DEFAULT_ACCOUNT_ID;
+  const accId = accountId || DEFAULT_ACCOUNT_ID;
   let currAccount = cfg?.channels?.[CHANNEL_ID] || {};
-  if (accountId && accountId !== DEFAULT_ACCOUNT_ID) {
-    currAccount = currAccount.accounts?.[accountId];
+  if (accId !== DEFAULT_ACCOUNT_ID) {
+    currAccount = currAccount.accounts?.[accId];
   }
-  return { accountId, ...getDefaultAccountConfig(currAccount) };
+  return { accountId: accId, ...getDefaultAccountConfig(currAccount) };
 };

package/src/channel.ts

@@ -6,6 +6,7 @@
 import { DEFAULT_ACCOUNT_ID } from 'openclaw/plugin-sdk/account-id';
 import { setAccountEnabledInConfigSection, deleteAccountFromConfigSection } from 'openclaw/plugin-sdk/core';
 import { CHANNEL_ID, CHANNEL_NAME } from "./const";
+import { handleInboundMessage } from './inbound';
 import {
   checkAccount,
   sendTextMsg,
@@ -256,6 +257,14 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
           apiRuntime,
           onConnected: () => _setStatus({ running: true, connected: true }),
           onDisconnected: () => _setStatus({ running: false, connected: false }),
+          onInbounMessage: (json: any) => {
+            _setStatus({ running: true, connected: true, lastInboundAt: Date.now() });
+            if (apiRuntime) {
+              handleInboundMessage({ json, account, apiRuntime, log });
+            } else {
+              log?.error?.(`[${CHANNEL_ID}] AccountId: ${accountId}, WebSocket.onInbounMessage TuiTuiRuntime error`);
+            }
+          },
         });
 
         // 保持账户运行状态，直至触发“abortSignal”信号为止。

package/src/env.ts

@@ -0,0 +1,15 @@
+const DEFAULT_ONLINE = true;
+
+export const getTuituiHost = (online: boolean = DEFAULT_ONLINE): string => {
+    return online ? "im.live.360.cn" : "im.qihoo.net";
+};
+
+export const getTuituiWebsocketHost = (online: boolean = DEFAULT_ONLINE): string => {
+    return `wss://${getTuituiHost(online)}:8282/robot`;
+};
+
+export const getTuituiApiHost = (online: boolean = DEFAULT_ONLINE): string => {
+    return `https://${getTuituiHost(online)}:8282/robot`;
+};
+
+export const TUITUI_SSRF_POLICY = { allowedHostnames: ['im.live.360.cn', 'im.qihoo.net'] } as const;

package/src/outbound.ts

@@ -2,6 +2,7 @@ import { readFileSync, existsSync, statSync } from 'node:fs';
 import { basename } from 'node:path';
 import { fetchWithSsrFGuard } from 'openclaw/plugin-sdk/tlon';
 import { CHANNEL_ID } from "./const";
+import { TUITUI_SSRF_POLICY, getTuituiApiHost } from "./env"
 
 import type { 
   TuiTuiMessageData,
@@ -17,8 +18,6 @@ import type {
   TuiTuiTeamsTarget
 } from './types';
 
-/* 一些常量配置 */
-export const TUITUI_SSRF_POLICY = { allowedHostnames: ['im.live.360.cn'] } as const;
 
 // ChatType定义与SessionKey定义一致，不可随意修改
 // https://docs.openclaw.ai/channels/channel-routing#session-key-shapes-examples
@@ -33,8 +32,8 @@ export function guessChatType(chatId: string): ChatType {
   return CHAT_TYPE_DIRECT;
 }
 
-export function addParams2Url(urlStr: string, params: any) {
-  const url = new URL(urlStr);
+export function addTuituiParams2Url(urlStr: string, params: any) {
+  const url = new URL(getTuituiApiHost() + urlStr);
   for (let k in params) url.searchParams.set(k, params[k]);
   return url.toString();
 }
@@ -82,7 +81,7 @@ function _fetchJson(url: string, json: any, auditCtx: string): Promise<any> {
 export async function postTuituiMsg(account: any, json: any, auditCtx: string): Promise<any> {
   const { appId: appid, appSecret: secret } = account;
   const { response, release } = await _fetchJson(
-    addParams2Url('https://im.live.360.cn:8282/robot/message/custom/send', { appid, secret }),
+    addTuituiParams2Url('/message/custom/send', { appid, secret }),
     json,
     auditCtx,
   );
@@ -132,7 +131,7 @@ interface tuituiUploadResult {
  * @param type - Media type: 'image' or "file" (auto-detected if not specified)
  * @returns The media_id from TuiTui
  */
-export async function uploadFileToTuiTui(fileSrc: string, account: any, type: 'image' | 'file'): Promise<tuituiUploadResult | undefined> {
+export async function uploadFileToTuiTui(fileSrc: string, account: any, type: 'image' | 'file'): Promise<tuituiUploadResult> {
   checkAccount(account, 'uploadFileToTuiTui');
 
   const { appId: appid, appSecret: secret } = account;
@@ -219,23 +218,23 @@ export async function uploadFileToTuiTui(fileSrc: string, account: any, type: 'i
   body.append('media', new Blob([fileBuffer], { type: contentType }), filename);
 
   const { response, release } = await _fetch({
-    url: addParams2Url('https://im.live.360.cn:8282/robot/media/upload', { appid, secret, type }),
+    url: addTuituiParams2Url('/media/upload', { appid, secret, type }),
     init: { method: "POST", body },
     auditCtx: "tuitui.media.upload",
   });
   try {
     if (!response.ok) {
-      throw new Error(`[${CHANNEL_ID}] Failed to upload media to TuiTui: ${response.status}`);
+      throw new Error(`[${CHANNEL_ID}] Failed to upload file to TuiTui: HTTP ${response.status}`);
     }
 
     const result: TuiTuiMediaUploadResponse = await response.json();
     if (result.errcode !== 0 || !result.media_id) {
-      throw new Error(`[${CHANNEL_ID}] media upload failed: ${result.errmsg || "Unknown error"}`);
+      throw new Error(`[${CHANNEL_ID}] file upload failed: ${result.errmsg || "Unknown error"}`);
     }
 
     return {fid: result.media_id, filename};
   } catch(err) {
-    console.error(`[${CHANNEL_ID}] uploadFileToTuiTui error:`, err, `filename: ${filename}, fileSrc: ${fileSrc}`);
+    throw err;
   } finally {
     await release();
   }
@@ -264,7 +263,7 @@ export async function tuituiEmojiReaction(
   const toTarget = (payload.togroups || payload.tousers || payload.toteams)[0];
   const _logTxt =`[${CHANNEL_ID}] emoji_reaction "${emoji}"`;
   console.log(`${_logTxt} request`, toTarget);
-  const sendUrl = addParams2Url('https://im.live.360.cn:8282/robot/message/custom/modify', { appid, secret });
+  const sendUrl = addTuituiParams2Url('/message/custom/modify', { appid, secret });
   const { response, release } = await _fetchJson(sendUrl, payload, 'tuitui.emoji_reaction');
 
   try {
@@ -428,11 +427,6 @@ export async function sendMediaMsg(
   const mediaType = isImage ? 'image' : 'file';
 
   const uploadResult = await uploadFileToTuiTui(mediaUrl, account, mediaType);
-  if (!uploadResult || !uploadResult?.fid) {
-    console.error(`[${CHANNEL_ID}] uploadFileToTuiTui failed ${auditCtx}, {mediaUrl: ${mediaUrl}, mediaType: ${mediaType}}`);
-    return;
-  }
-
   const {fid, filename} = uploadResult;
 
   const targets = getTargets(chatId, chatType);
@@ -536,9 +530,9 @@ export async function getChatRecord(
 
   let baseurl = "";
   if (chatType == CHAT_TYPE_DIRECT) {
-    baseurl = "https://im.live.360.cn:8282/robot/message/single/sync";
+    baseurl = "/message/single/sync";
   } else if (chatType == CHAT_TYPE_GROUP){
-    baseurl = "https://im.live.360.cn:8282/robot/message/group/sync";
+    baseurl = "/message/group/sync";
   } else {
     console.log(`[${CHANNEL_ID}] getChatRecord: chatType "${chatType}" is not supported`);
     return undefined;
@@ -561,7 +555,7 @@ export async function getChatRecord(
 
   const { appId: appid, appSecret: secret } = account;
 
-  const url = addParams2Url(baseurl, { appid, secret });
+  const url = addTuituiParams2Url(baseurl, { appid, secret });
 
   console.log(`[${CHANNEL_ID}] getChatRecord request `, body);
 

package/src/websocket.ts

@@ -1,11 +1,11 @@
 import WebSocket from 'ws';
 import { CHANNEL_ID } from "./const";
-import { handleInboundMessage } from './inbound';
+import { getTuituiWebsocketHost } from "./env"
 
 const wsReadyStates = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED'] as const;
 let wsNum = 0;
 
-export default function createWebSocket({ account, log, abortSignal, onConnected, onDisconnected, apiRuntime }: any): () => void {
+export default function createWebSocket({ account, log, abortSignal, onConnected, onDisconnected, onInbounMessage }: any): () => void {
   const { accountId, appId, appSecret } = account;
   let ws: any = null;
   const _closeWS = () => ws && ws.readyState !== WebSocket.CLOSED && ws.close();
@@ -20,7 +20,7 @@ export default function createWebSocket({ account, log, abortSignal, onConnected
   const _clearTimeoutTimer = () => _timeoutId && clearTimeout(_timeoutId);
 
   const wsEvtIds = new Set<string>();
-  const wsUrl = `wss://im.live.360.cn:8282/robot/callback/ws?auth=${appId}.${appSecret}`;
+  const wsUrl = getTuituiWebsocketHost() + `/callback/ws?auth=${appId}.${appSecret}`;
   const _startWS = () => {
     _closeWS(); // 启动新链接前先关闭旧链接，防止产生空指针链接
 
@@ -81,11 +81,7 @@ export default function createWebSocket({ account, log, abortSignal, onConnected
       if (!json?.header || !wsEvent || !json?.body?.data) {
         return log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, WebSocket[${wsId}] invalid message`);
       }
-      if (!apiRuntime) {
-        return log?.error?.(`[${CHANNEL_ID}] AccountId: ${accountId}, WebSocket[${wsId}] TuiTuiRuntime error`);
-      }
-
-      handleInboundMessage({ json, account, apiRuntime, log });
+      onInbounMessage(json);
     });
     
     const onErrOrClose = (errStr: string) => {