@dcrays/dcgchat-test 0.2.26 → 0.2.28

package/src/request/request.ts

@@ -0,0 +1,198 @@
+import axios from 'axios'
+// @ts-ignore
+import md5 from 'md5'
+import type { IResponse } from '../types.js'
+import { getUserTokenCache } from './userInfo.js'
+import { getMsgParams } from '../utils/global.js'
+import { ENV } from '../utils/constant.js'
+import { dcgLogger } from '../utils/log.js'
+
+export const apiUrlMap = {
+  production: 'https://api-gateway.shuwenda.com',
+  test: 'https://api-gateway.shuwenda.icu',
+  develop: 'https://shenyu-dev.shuwenda.icu'
+}
+
+export const appKey = {
+  production: '2A1C74D315CB4A01BF3DA8983695AFE2',
+  test: '7374A073CCBD4C8CA84FAD33896F0B69',
+  develop: '7374A073CCBD4C8CA84FAD33896F0B69'
+}
+
+export const signKey = {
+  production: '34E9023008EA445AAE6CC075CC954F46',
+  test: 'FE93D3322CB94E978CE95BD4AA2A37D7',
+  develop: 'FE93D3322CB94E978CE95BD4AA2A37D7'
+}
+
+export const version = '1.0.0'
+
+/**
+ * 根据 axios 请求配置生成等价 curl，便于复制给后端排查
+ */
+function toCurl(config: {
+  baseURL?: string
+  url?: string
+  method?: string
+  headers?: Record<string, string | number | undefined>
+  data?: unknown
+}): string {
+  const base = config.baseURL ?? ''
+  const path = config.url ?? ''
+  const url = path.startsWith('http')
+    ? path
+    : `${base.replace(/\/$/, '')}/${path.replace(/^\//, '')}`
+  const method = (config.method ?? 'GET').toUpperCase()
+  const headers = config.headers ?? {}
+  const parts = ['curl', '-X', method, `'${url}'`]
+  for (const [k, v] of Object.entries(headers)) {
+    if (v !== undefined && v !== '') {
+      parts.push('-H', `'${k}: ${v}'`)
+    }
+  }
+  if (method !== 'GET' && config.data !== undefined) {
+    const body = typeof config.data === 'string' ? config.data : JSON.stringify(config.data)
+    parts.push('-d', `'${body.replace(/'/g, "'\\''")}'`)
+  }
+  return parts.join(' ')
+}
+
+/**
+ * 生成签名
+ * @param {Object} body 请求体
+ * @param {number} timestamp 时间戳
+ * @param {string} path 请求地址
+ * @param {'production' | 'test' | 'develop'} ENV 请求环境
+ * @param {string} version 版本号
+ * @returns {string} 大写 MD5 签名
+ */
+export function getSignature(
+  body: Record<string, unknown>,
+  timestamp: number,
+  path: string,
+  ENV: 'production' | 'test' | 'develop',
+  version: string = '1.0.0'
+) {
+  // 1. 构造 map
+  const map = { timestamp, path, version, ...body }
+  // 2. 按 key 进行自然排序
+  const sortedKeys = Object.keys(map).sort()
+  // 3. 拼接 key + value
+  const signStr =
+    sortedKeys
+      .map((key) => {
+        const val = map[key as keyof typeof map]
+        return val === undefined
+          ? ''
+          : `${key}${typeof val === 'object' ? JSON.stringify(val) : val}`
+      })
+      .join('') + signKey[ENV]
+  // 4. MD5 加密并转大写
+  return md5(signStr).toUpperCase()
+}
+
+function buildHeaders(data: Record<string, unknown>, url: string, userToken?: string) {
+  const timestamp = Date.now()
+
+  const headers: Record<string, string | number> = {
+    'Content-Type': 'application/json',
+    appKey: appKey[ENV],
+    sign: getSignature(data, timestamp, url, ENV, version),
+    timestamp,
+    version
+  }
+
+  // 如果提供了 userToken，添加到 headers
+  if (userToken) {
+    headers.authorization = userToken
+  }
+
+  return headers
+}
+
+const axiosInstance = axios.create({
+  baseURL: apiUrlMap[ENV],
+  timeout: 10000
+})
+
+// 请求拦截器：自动注入 userToken
+axiosInstance.interceptors.request.use(
+  (config) => {
+    // 如果请求配置中已经有 authorization，优先使用
+    if (config.headers?.authorization) {
+      return config
+    }
+
+    // 从请求上下文中获取 botToken（需要在调用时设置）
+    const botToken = (config as any).__botToken as string | undefined
+    if (botToken) {
+      const cachedToken = getUserTokenCache(botToken)
+      if (cachedToken) {
+        config.headers = config.headers || {}
+        config.headers.authorization = cachedToken
+        dcgLogger(
+          `[request] auto-injected userToken from cache for botToken=${botToken.slice(0, 10)}...`
+        )
+      }
+    }
+
+    return config
+  },
+  (error) => {
+    return Promise.reject(error)
+  }
+)
+
+// 响应拦截器：打印 curl 便于调试
+axiosInstance.interceptors.response.use(
+  (response) => {
+    return response.data
+  },
+  (error) => {
+    const config = error.config ?? {}
+    const curl = toCurl(config)
+    dcgLogger(`[request] curl for backend (failed request): ${curl}`)
+    return Promise.reject(error)
+  }
+)
+
+/**
+ * POST 请求（支持可选的 userToken 和 botToken）
+ * @param url 请求路径
+ * @param data 请求体
+ * @param options 可选配置
+ * @param options.userToken 直接提供的 userToken（优先级最高）
+ * @param options.botToken 用于从缓存获取 userToken 的 botToken
+ */
+export function post<T = Record<string, unknown>, R = unknown>(
+  url: string,
+  data: T,
+  options?: {
+    userToken?: string
+    botToken?: string
+  }
+): Promise<IResponse<R>> {
+  const params = getMsgParams() || {}
+  const config: any = {
+    method: 'POST',
+    url,
+    data: {
+      ...data,
+      _appId: params.appId
+    },
+    headers: buildHeaders(
+      {
+        ...data,
+        _appId: params.appId
+      } as Record<string, unknown>,
+      url,
+      options?.userToken
+    )
+  }
+
+  // 将 botToken 附加到配置中，供请求拦截器使用
+  if (options?.botToken) {
+    config.__botToken = options.botToken
+  }
+  return axiosInstance.request(config)
+}

package/src/{userInfo.ts → request/userInfo.ts}

@@ -3,16 +3,18 @@
  * 负责维护 botToken -> userToken 的映射关系，支持自动过期
  */
 
+import { dcgLogger } from '../utils/log.js'
+
 // userToken 缓存配置
-const TOKEN_CACHE_DURATION = 60 * 60 * 1000; // 1小时
+const TOKEN_CACHE_DURATION = 60 * 60 * 1000 // 1小时
 
 type TokenCacheEntry = {
-  token: string;
-  expiresAt: number;
-};
+  token: string
+  expiresAt: number
+}
 
 // 内存缓存：botToken -> { token, expiresAt }
-const tokenCache = new Map<string, TokenCacheEntry>();
+const tokenCache = new Map<string, TokenCacheEntry>()
 
 /**
  * 设置 userToken 缓存
@@ -20,11 +22,11 @@ const tokenCache = new Map<string, TokenCacheEntry>();
  * @param userToken 用户 token
  */
 export function setUserTokenCache(botToken: string, userToken: string): void {
-  const expiresAt = Date.now() + TOKEN_CACHE_DURATION;
-  tokenCache.set(botToken, { token: userToken, expiresAt });
-  console.log(
-    `[token-cache] cached userToken for botToken=${botToken.slice(0, 10)}..., expires at ${new Date(expiresAt).toISOString()}`,
-  );
+  const expiresAt = Date.now() + TOKEN_CACHE_DURATION
+  tokenCache.set(botToken, { token: userToken, expiresAt })
+  dcgLogger(
+    `[token-cache] cached userToken for botToken=${botToken.slice(0, 10)}..., expires at ${new Date(expiresAt).toISOString()}`
+  )
 }
 
 /**
@@ -33,23 +35,23 @@ export function setUserTokenCache(botToken: string, userToken: string): void {
  * @returns userToken 或 null（未找到或已过期）
  */
 export function getUserTokenCache(botToken: string): string | null {
-  const entry = tokenCache.get(botToken);
+  const entry = tokenCache.get(botToken)
   if (!entry) {
-    console.log(`[token-cache] no cache found for botToken=${botToken.slice(0, 10)}...`);
-    return null;
+    dcgLogger(`[token-cache] no cache found for botToken=${botToken.slice(0, 10)}...`)
+    return null
   }
 
   // 检查是否过期
   if (Date.now() >= entry.expiresAt) {
-    console.log(`[token-cache] cache expired for botToken=${botToken.slice(0, 10)}..., removing`);
-    tokenCache.delete(botToken);
-    return null;
+    dcgLogger(`[token-cache] cache expired for botToken=${botToken.slice(0, 10)}..., removing`)
+    tokenCache.delete(botToken)
+    return null
   }
 
-  console.log(
-    `[token-cache] cache hit for botToken=${botToken.slice(0, 10)}..., valid until ${new Date(entry.expiresAt).toISOString()}`,
-  );
-  return entry.token;
+  dcgLogger(
+    `[token-cache] cache hit for botToken=${botToken.slice(0, 10)}..., valid until ${new Date(entry.expiresAt).toISOString()}`
+  )
+  return entry.token
 }
 
 /**
@@ -57,41 +59,41 @@ export function getUserTokenCache(botToken: string): string | null {
  * @param botToken 机器人 token
  */
 export function clearUserTokenCache(botToken: string): void {
-  tokenCache.delete(botToken);
-  console.log(`[token-cache] cleared cache for botToken=${botToken.slice(0, 10)}...`);
+  tokenCache.delete(botToken)
+  dcgLogger(`[token-cache] cleared cache for botToken=${botToken.slice(0, 10)}...`)
 }
 
 /**
  * 清除所有缓存
  */
 export function clearAllUserTokenCache(): void {
-  tokenCache.clear();
-  console.log(`[token-cache] cleared all token cache`);
+  tokenCache.clear()
+  dcgLogger(`[token-cache] cleared all token cache`)
 }
 
 /**
  * 获取缓存统计信息（用于调试）
  */
 export function getTokenCacheStats(): {
-  total: number;
-  valid: number;
-  expired: number;
+  total: number
+  valid: number
+  expired: number
 } {
-  const now = Date.now();
-  let valid = 0;
-  let expired = 0;
+  const now = Date.now()
+  let valid = 0
+  let expired = 0
 
   for (const entry of tokenCache.values()) {
     if (now < entry.expiresAt) {
-      valid++;
+      valid++
     } else {
-      expired++;
+      expired++
     }
   }
 
   return {
     total: tokenCache.size,
     valid,
-    expired,
-  };
+    expired
+  }
 }

package/src/skill.ts

@@ -1,239 +1,161 @@
-/**  skill utils */
-import axios from 'axios';
+import axios from 'axios'
 /** @ts-ignore */
-import unzipper from 'unzipper';
-import { pipeline } from "stream/promises";
-import fs from 'fs';
-import path from 'path';
-import type { ClawdbotConfig, RuntimeEnv } from "openclaw/plugin-sdk";
-import { logDcgchat } from './log.js';
-import { getDcgchatRuntime, getWorkspaceDir } from './runtime.js';
-import { getWsConnection } from './connection.js';
-import { resolveAccount } from './channel.js';
-import { getMsgParams } from './tool.js';
+import unzipper from 'unzipper'
+import { pipeline } from 'stream/promises'
+import fs from 'fs'
+import path from 'path'
+import { getWorkspaceDir } from './utils/global.js'
+import { getWsConnection } from './utils/global.js'
+import { dcgLogger } from './utils/log.js'
+import { isWsOpen } from './transport.js'
 
 type ISkillParams = {
-  path: string;
-  code: string;
-}
-
-type SkillContext = {
-  cfg: ClawdbotConfig;
-  accountId: string;
-  runtime?: RuntimeEnv;
+  path: string
+  code: string
 }
 
 function sendEvent(msgContent: Record<string, any>) {
   const ws = getWsConnection()
-  if (ws?.readyState === WebSocket.OPEN) {
-    ws.send(JSON.stringify({
-      messageType: "openclaw_bot_event",
-      source: "client",
-      content: msgContent
-    }));
-    logDcgchat.info(`技能安装: ${JSON.stringify(msgContent)}`);
-
+  if (isWsOpen()) {
+    ws?.send(
+      JSON.stringify({
+        messageType: 'openclaw_bot_event',
+        source: 'client',
+        content: msgContent
+      })
+    )
+    dcgLogger(`技能安装: ${JSON.stringify(msgContent)}`)
   }
 }
 
-// async function sendNewSessionCommand(ctx: SkillContext) {
-//   try {
-//     const core = getDcgchatRuntime();
-//     const log = ctx.runtime?.log ?? console.log;
-//     const params = getMsgParams();
-//     const account = resolveAccount(ctx.cfg, ctx.accountId);
-//     const userId = String(params.userId);
-
-//     const route = core.channel.routing.resolveAgentRoute({
-//       cfg: ctx.cfg,
-//       channel: "dcgchat",
-//       accountId: account.accountId,
-//       peer: { kind: "direct", id: userId },
-//     });
-
-//     const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(ctx.cfg);
-//     const bodyFormatted = core.channel.reply.formatAgentEnvelope({
-//       channel: "书灵墨宝",
-//       from: userId,
-//       timestamp: new Date(),
-//       envelope: envelopeOptions,
-//       body: "/new",
-//     });
-
-//     const ctxPayload = core.channel.reply.finalizeInboundContext({
-//       Body: bodyFormatted,
-//       RawBody: "/new",
-//       CommandBody: "/new",
-//       From: userId,
-//       To: userId,
-//       SessionKey: route.sessionKey,
-//       AccountId: params.sessionId,
-//       ChatType: "direct",
-//       SenderName: userId,
-//       SenderId: userId,
-//       Provider: "dcgchat" as const,
-//       Surface: "dcgchat" as const,
-//       MessageSid: Date.now().toString(),
-//       Timestamp: Date.now(),
-//       WasMentioned: true,
-//       CommandAuthorized: true,
-//       OriginatingChannel: "dcgchat" as const,
-//       OriginatingTo: `user:${userId}`,
-//     });
-
-//     const noopDispatcher = {
-//       sendToolResult: () => false,
-//       sendBlockReply: () => false,
-//       sendFinalReply: () => false,
-//       waitForIdle: async () => {},
-//       getQueuedCounts: () => ({ tool: 0, block: 0, final: 0 }),
-//       markComplete: () => {},
-//     };
-
-//     await core.channel.reply.withReplyDispatcher({
-//       dispatcher: noopDispatcher,
-//       run: () =>
-//         core.channel.reply.dispatchReplyFromConfig({
-//           ctx: ctxPayload,
-//           cfg: ctx.cfg,
-//           dispatcher: noopDispatcher,
-//         }),
-//     });
-
-//     log(`dcgchat: /new command dispatched silently after skill install`);
-//   } catch (err) {
-//     logDcgchat.error(`sendNewSessionCommand failed: ${err}`);
-//   }
-// }
-
-export async function installSkill(params: ISkillParams, msgContent: Record<string, any>, ctx?: SkillContext) {
-  const { path: cdnUrl, code } = params;
-  const workspacePath = getWorkspaceDir();
-  
-  const skillDir = path.join(workspacePath, 'skills', code);
-  
+export async function installSkill(params: ISkillParams, msgContent: Record<string, any>) {
+  const { path: cdnUrl, code } = params
+  const workspacePath = getWorkspaceDir()
+
+  const skillDir = path.join(workspacePath, 'skills', code)
+
   // 确保 skills 目录存在
-  const skillsDir = path.join(workspacePath, 'skills');
+  const skillsDir = path.join(workspacePath, 'skills')
   if (!fs.existsSync(skillsDir)) {
-    fs.mkdirSync(skillsDir, { recursive: true });
+    fs.mkdirSync(skillsDir, { recursive: true })
   }
   // 如果目标目录已存在，先删除
   if (fs.existsSync(skillDir)) {
-    fs.rmSync(skillDir, { recursive: true, force: true });
+    fs.rmSync(skillDir, { recursive: true, force: true })
   }
-  
+
   try {
     // 下载 zip 文件
     const response = await axios({
       method: 'get',
       url: cdnUrl,
       responseType: 'stream'
-    });
+    })
     // 创建目标目录
-    fs.mkdirSync(skillDir, { recursive: true });
+    fs.mkdirSync(skillDir, { recursive: true })
     // 解压文件到目标目录，跳过顶层文件夹
     await new Promise((resolve, reject) => {
-  const tasks: Promise<void>[] = [];
-  let rootDir: string | null = null;
-  let hasError = false;
-  
-  response.data
-    .pipe(unzipper.Parse())
-    .on("entry", (entry: any) => {
-      if (hasError) {
-        entry.autodrain();
-        return;
-      }
-      
-      try {
-        const flags = entry.props?.flags ?? 0;
-        const isUtf8 = (flags & 0x800) !== 0;
-        let entryPath: string;
-        if (!isUtf8 && entry.props?.pathBuffer) {
-          entryPath = new TextDecoder('gbk').decode(entry.props.pathBuffer);
-        } else {
-          entryPath = entry.path;
-        }
-        const pathParts = entryPath.split("/");
-        
-        // 检测根目录
-        if (!rootDir && pathParts.length > 1) {
-          rootDir = pathParts[0];
-        }
-
-        let newPath = entryPath;
-
-        // 移除顶层文件夹
-        if (rootDir && entryPath.startsWith(rootDir + "/")) {
-          newPath = entryPath.slice(rootDir.length + 1);
-        }
-
-        if (!newPath) {
-          entry.autodrain();
-          return;
-        }
-        
-        const targetPath = path.join(skillDir, newPath);
-
-        if (entry.type === "Directory") {
-          fs.mkdirSync(targetPath, { recursive: true });
-          entry.autodrain();
-        } else {
-          const parentDir = path.dirname(targetPath);
-          fs.mkdirSync(parentDir, { recursive: true });
-          const writeStream = fs.createWriteStream(targetPath);
-          const task = pipeline(entry, writeStream).catch((err) => {
-            hasError = true;
-            throw new Error(`解压文件失败 ${entryPath}: ${err.message}`);
-          });
-          tasks.push(task);
-        }
-      } catch (err) {
-        hasError = true;
-        entry.autodrain();
-        reject(new Error(`处理entry失败: ${err}`));
-      }
+      const tasks: Promise<void>[] = []
+      let rootDir: string | null = null
+      let hasError = false
+
+      response.data
+        .pipe(unzipper.Parse())
+        .on('entry', (entry: any) => {
+          if (hasError) {
+            entry.autodrain()
+            return
+          }
+
+          try {
+            const flags = entry.props?.flags ?? 0
+            const isUtf8 = (flags & 0x800) !== 0
+            let entryPath: string
+            if (!isUtf8 && entry.props?.pathBuffer) {
+              entryPath = new TextDecoder('gbk').decode(entry.props.pathBuffer)
+            } else {
+              entryPath = entry.path
+            }
+            const pathParts = entryPath.split('/')
+
+            // 检测根目录
+            if (!rootDir && pathParts.length > 1) {
+              rootDir = pathParts[0]
+            }
+
+            let newPath = entryPath
+
+            // 移除顶层文件夹
+            if (rootDir && entryPath.startsWith(rootDir + '/')) {
+              newPath = entryPath.slice(rootDir.length + 1)
+            }
+
+            if (!newPath) {
+              entry.autodrain()
+              return
+            }
+
+            const targetPath = path.join(skillDir, newPath)
+
+            if (entry.type === 'Directory') {
+              fs.mkdirSync(targetPath, { recursive: true })
+              entry.autodrain()
+            } else {
+              const parentDir = path.dirname(targetPath)
+              fs.mkdirSync(parentDir, { recursive: true })
+              const writeStream = fs.createWriteStream(targetPath)
+              const task = pipeline(entry, writeStream).catch((err) => {
+                hasError = true
+                throw new Error(`解压文件失败 ${entryPath}: ${err.message}`)
+              })
+              tasks.push(task)
+            }
+          } catch (err) {
+            hasError = true
+            entry.autodrain()
+            reject(new Error(`处理entry失败: ${err}`))
+          }
+        })
+        .on('close', async () => {
+          try {
+            await Promise.all(tasks)
+            resolve(null)
+          } catch (err) {
+            reject(err)
+          }
+        })
+        .on('error', (err: { message: any }) => {
+          hasError = true
+          reject(new Error(`解压流错误: ${err.message}`))
+        })
     })
-    .on("close", async () => {
-      try {
-        await Promise.all(tasks);
-        resolve(null);
-      } catch (err) {
-        reject(err);
-      }
-    })
-    .on("error", (err: { message: any; }) => {
-      hasError = true;
-      reject(new Error(`解压流错误: ${err.message}`));
-    });
-  });
-  sendEvent({ ...msgContent, status: 'ok' })
-  // if (ctx) {
-  //   await sendNewSessionCommand(ctx);
-  // }
+    sendEvent({ ...msgContent, status: 'ok' })
   } catch (error) {
     // 如果安装失败，清理目录
     if (fs.existsSync(skillDir)) {
-      fs.rmSync(skillDir, { recursive: true, force: true });
+      fs.rmSync(skillDir, { recursive: true, force: true })
     }
     sendEvent({ ...msgContent, status: 'fail' })
   }
 }
 
-export function uninstallSkill(params: Omit<ISkillParams, 'path'>, msgContent: Record<string, any>) {
-  const { code } = params;
-  
-  const workspacePath = getWorkspaceDir();
+export function uninstallSkill(
+  params: Omit<ISkillParams, 'path'>,
+  msgContent: Record<string, any>
+) {
+  const { code } = params
+
+  const workspacePath = getWorkspaceDir()
   if (!workspacePath) {
     sendEvent({ ...msgContent, status: 'ok' })
   }
-  
-  const skillDir = path.join(workspacePath, 'skills', code);
-  
+
+  const skillDir = path.join(workspacePath, 'skills', code)
+
   if (fs.existsSync(skillDir)) {
-    fs.rmSync(skillDir, { recursive: true, force: true });
+    fs.rmSync(skillDir, { recursive: true, force: true })
     sendEvent({ ...msgContent, status: 'ok' })
   } else {
     sendEvent({ ...msgContent, status: 'ok' })
   }
-}
+}