@qihoo/tuitui-openclaw-channel 1.0.32 → 1.0.33

package/package.json

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

package/src/filespace.ts

@@ -1,5 +1,5 @@
 import { CHANNEL_ID } from "./const";
-import { tuituiRobotApi, downloadUrl, tuituiRobotUpload} from "./robot_api"
+import { tuituiRobotApi, tuituiRobotUpload} from "./robot_api"
 import {CHAT_TYPE_CHANNEL, parseSessionKey} from "./chat_base"
 import {getChannelInfoByChannelId} from "./robot_helper"
 

package/src/robot_api.ts

@@ -1,6 +1,5 @@
 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"
 
@@ -34,8 +33,8 @@ export async function tuituiRobotApi(account: any, api: string, payload: any, lo
     fetch_fun = _fetchForm;
   }
 
-  const { response, release } = await fetch_fun(url, payload);
   try {
+    const response = await fetch_fun(url, payload);
     const bodyText = await response.text();
 
     if (!response.ok) {
@@ -52,41 +51,26 @@ export async function tuituiRobotApi(account: any, api: string, payload: any, lo
     console.error(`[${CHANNEL_ID}] ${api} error:`, err);
     throw err;
   } finally {
-    await release();
     if (log) {
-      const endTime = Date.now(); // 记录结束时间
-      const duration = endTime - startTime; // 计算耗时
+      const endTime = Date.now();
+      const duration = endTime - startTime;
       console.log(`[${CHANNEL_ID}] ${api} response took ${duration}ms`);
     }
   }
 }
 
-function _fetch(opts: any): Promise<any> {
-  return fetchWithSsrFGuard({
-    policy: TUITUI_SSRF_POLICY,
-    ...opts,
-  })
-}
-function _fetchJson(url: string, json: any, auditCtx: string = "tuitui.api.call"): Promise<any> {
-  return _fetch({
-    url,
-    init: {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(json),
-    },
-    auditCtx
+function _fetchJson(url: string, json: any): Promise<Response> {
+  return fetch(url, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(json),
   });
 }
 
-function _fetchForm(url: string, form: any, auditCtx: string = "tuitui.api.call"): Promise<any> {
-  return _fetch({
-    url,
-    init: {
-      method: 'POST',
-      body: form,
-    },
-    auditCtx
+function _fetchForm(url: string, form: any): Promise<Response> {
+  return fetch(url, {
+    method: 'POST',
+    body: form,
   });
 }
 
@@ -96,10 +80,26 @@ function _fetchForm(url: string, form: any, auditCtx: string = "tuitui.api.call"
  * @returns Object with buffer, filename and content type
  */
 export async function downloadUrl(url: string): Promise<{ buffer: ArrayBuffer; filename: string; contentType: string }> {
-  const { response, release } = await _fetch({
+  console.log(`[${CHANNEL_ID}] downloadUrl prepair`);
+
+  let fetchWithSsrFGuard: any;
+  try {
+    fetchWithSsrFGuard = (await import('openclaw/plugin-sdk/ssrf-runtime')).fetchWithSsrFGuard;
+  } catch {
+    try {
+      fetchWithSsrFGuard = (await import('openclaw/plugin-sdk/tlon')).fetchWithSsrFGuard;
+    } catch {
+      throw new Error(`[${CHANNEL_ID}] fetchWithSsrFGuard() API import failed`);
+    }
+  }
+
+  console.log(`[${CHANNEL_ID}] downloadUrl start ${url}`);
+
+  const { response, release } = await fetchWithSsrFGuard({
+    policy: TUITUI_SSRF_POLICY,
     url,
     init: { method: 'GET' },
-    auditCtx: "tuitui.download"
+    auditContext: "tuitui.download",
   });
 
   try {
@@ -127,6 +127,8 @@ export async function downloadUrl(url: string): Promise<{ buffer: ArrayBuffer; f
       if (match) filename = decodeURIComponent(match[1]);
     }
 
+    console.log(`[${CHANNEL_ID}] downloadUrl ok`);
+
     return { buffer, filename, contentType };
   } finally {
     await release();