@dcrays/dcgchat-test 0.6.12 → 0.7.0

package/src/request/oss.ts

@@ -1,200 +0,0 @@
-import { extname } from 'node:path'
-import { fileURLToPath } from 'node:url'
-// @ts-ignore
-import OSS from 'ali-oss'
-import { getStsToken, getUserToken } from './api.js'
-import { dcgLogger } from '../utils/log.js'
-
-/** 分片大小：OSS 要求每片 ≥100 KB（最后一片可更小） */
-const MULTIPART_PART_SIZE = 1024 * 1024
-
-/** ali-oss 默认 timeout 为 60s，大文件单 PUT 或慢网易触发 ResponseTimeoutError */
-const OSS_HTTP_TIMEOUT_MS = 15 * 60 * 1000
-
-/** 归一化入参，避免 file://、包装对象、TypedArray 等导致 SDK 识别失败 */
-function coerceOssFileInput(input: File | string | Buffer): File | string | Buffer {
-  if (typeof input === 'string') {
-    const t = input.trim()
-    if (t.startsWith('file:')) {
-      try {
-        return fileURLToPath(t)
-      } catch {
-        return input
-      }
-    }
-    return input
-  }
-  if (Buffer.isBuffer(input)) {
-    return input
-  }
-  if (input && typeof input === 'object') {
-    if (ArrayBuffer.isView(input) && !(input instanceof DataView) && !Buffer.isBuffer(input)) {
-      const v = input as ArrayBufferView
-      return Buffer.from(v.buffer, v.byteOffset, v.byteLength)
-    }
-    const o = input as unknown as Record<string, unknown>
-    const p = o.path ?? o.filePath
-    if (typeof p === 'string' && p.trim()) return p.trim()
-  }
-  return input
-}
-
-/** 常见可在浏览器内联预览的类型（避免一律 application/octet-stream 触发下载） */
-const PREVIEW_EXT_MIME: Record<string, string> = {
-  '.jpg': 'image/jpeg',
-  '.jpeg': 'image/jpeg',
-  '.png': 'image/png',
-  '.gif': 'image/gif',
-  '.webp': 'image/webp',
-  '.bmp': 'image/bmp',
-  '.svg': 'image/svg+xml',
-  '.ico': 'image/x-icon',
-  '.avif': 'image/avif',
-  '.heic': 'image/heic',
-  '.heif': 'image/heif',
-  '.pdf': 'application/pdf',
-  '.mp4': 'video/mp4',
-  '.webm': 'video/webm',
-  '.mov': 'video/quicktime',
-  '.mp3': 'audio/mpeg',
-  '.wav': 'audio/wav',
-  '.ogg': 'audio/ogg',
-  '.opus': 'audio/opus',
-  '.m4a': 'audio/mp4',
-  '.aac': 'audio/aac',
-  '.flac': 'audio/flac',
-  '.txt': 'text/plain; charset=utf-8',
-  '.log': 'text/plain; charset=utf-8',
-  '.csv': 'text/csv; charset=utf-8',
-  '.html': 'text/html; charset=utf-8',
-  '.htm': 'text/html; charset=utf-8',
-  '.css': 'text/css; charset=utf-8',
-  '.js': 'text/javascript; charset=utf-8',
-  '.mjs': 'text/javascript; charset=utf-8',
-  '.json': 'application/json; charset=utf-8',
-  '.xml': 'application/xml; charset=utf-8',
-  '.md': 'text/markdown; charset=utf-8',
-  '.xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-  '.docx': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-  '.pptx': 'application/vnd.openxmlformats-officedocument.presentationml.presentation'
-}
-
-function mimeFromPathOrName(pathOrName: string): string | undefined {
-  const base = pathOrName.split(/[/\\]/).pop() ?? pathOrName
-  const ext = extname(base).toLowerCase()
-  return ext ? PREVIEW_EXT_MIME[ext] : undefined
-}
-
-/** 解析上传 Content-Type，并配合 Content-Disposition: inline 便于直链预览 */
-function resolveMime(input: File | string | Buffer, fileNameHint?: string): string {
-  if (typeof input === 'string') {
-    return mimeFromPathOrName(input) ?? 'application/octet-stream'
-  }
-  if (Buffer.isBuffer(input)) {
-    if (fileNameHint) {
-      const fromName = mimeFromPathOrName(fileNameHint)
-      if (fromName) return fromName
-    }
-    return 'application/octet-stream'
-  }
-  const declared = input.type?.trim()
-  if (declared && declared !== 'application/octet-stream') {
-    return declared
-  }
-  const name = typeof input.name === 'string' && input.name ? input.name : ''
-  if (name) {
-    const fromName = mimeFromPathOrName(name)
-    if (fromName) return fromName
-  }
-  return declared || 'application/octet-stream'
-}
-
-/**
- * 将 File/路径/Buffer 转为 ali-oss 接受的类型。
- * 本地路径保持为字符串：put 内部用 contentLength + ReadStream，大文件也稳定。
- */
-async function toUploadContent(input: File | string | Buffer): Promise<{ content: Buffer | string; fileName: string }> {
-  if (Buffer.isBuffer(input)) {
-    return { content: input, fileName: 'file' }
-  }
-  if (typeof input === 'string') {
-    return {
-      content: input,
-      fileName: input.split(/[/\\]/).pop() ?? 'file'
-    }
-  }
-  const buf = Buffer.from(await input.arrayBuffer())
-  const n = (input as { name?: string }).name
-  return { content: buf, fileName: typeof n === 'string' && n ? n : 'file' }
-}
-
-export type OssUploadOptions = {
-  /** 分片上传进度，p 为 0～1（仅大 Buffer 分片时触发） */
-  onProgress?: (p: number) => void
-  /** HTTP 超时（毫秒），覆盖默认 15 分钟；可传 `30 * 60 * 1000` 等 */
-  timeoutMs?: number
-}
-
-export const ossUpload = async (
-  rawFile: File | string | Buffer,
-  botToken: string,
-  isPrivate: 0 | 1 = 1,
-  uploadOptions?: OssUploadOptions
-) => {
-  await getUserToken(botToken)
-
-  const file = coerceOssFileInput(rawFile)
-  const { content, fileName } = await toUploadContent(file)
-  const data = await getStsToken(fileName, botToken, isPrivate)
-  const mime = resolveMime(file, fileName)
-  const onProgress = uploadOptions?.onProgress
-
-  const options: OSS.Options = {
-    // 从STS服务获取的临时访问密钥（AccessKey ID和AccessKey Secret）。
-    accessKeyId: data.tempAccessKeyId,
-    accessKeySecret: data.tempAccessKeySecret,
-    // 从STS服务获取的安全令牌（SecurityToken）。
-    stsToken: data.tempSecurityToken,
-    // 填写Bucket名称。
-    bucket: data.bucket,
-    endpoint: data.endPoint,
-    region: data.region,
-    secure: true,
-    cname: true,
-    authorizationV4: true,
-    timeout: uploadOptions?.timeoutMs ?? OSS_HTTP_TIMEOUT_MS
-  }
-
-  const client = new OSS(options)
-
-  const name = `${data.uploadDir}${data.ossFileKey}`
-
-  try {
-    let objectResult: OSS.PutObjectResult | OSS.CompleteMultipartUploadResult
-
-    const multipartUploadOptions: OSS.MultipartUploadOptions = {
-      progress: (p: number) => {
-        onProgress?.(p)
-      },
-      parallel: 4,
-      partSize: MULTIPART_PART_SIZE,
-      mime,
-      /** 直链打开时优先内联展示，而非附件下载 */
-      headers: {
-        'Content-Disposition': 'inline'
-      }
-    }
-    objectResult = await client.multipartUpload(name, content, multipartUploadOptions)
-
-    if (objectResult?.res?.status !== 200) {
-      dcgLogger(`OSS 上传失败, ${objectResult?.res?.status}`, 'error')
-      return ''
-    }
-    const requestUrls = objectResult?.res?.requestUrls || []
-    const url = requestUrls[0] || ''
-    dcgLogger(`OSS 上传成功, ${isPrivate === 1 ? objectResult.name || url : url}`)
-    return isPrivate === 1 ? objectResult.name || url : url
-  } catch (error) {
-    dcgLogger(`OSS 上传失败: ${error}`, 'error')
-  }
-}

package/src/request/request.ts

@@ -1,191 +0,0 @@
-import axios from 'axios'
-// @ts-ignore
-import md5 from 'md5'
-import type { IResponse } from '../types.js'
-import { getUserTokenCache } from './userInfo.js'
-import { getEffectiveMsgParams } from '../utils/params.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: 60000
-})
-
-// 请求拦截器：自动注入 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
-      }
-    }
-
-    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}`, 'error')
-    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 = getEffectiveMsgParams() || { appId: 100 }
-  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/request/userInfo.ts

@@ -1,44 +0,0 @@
-/**
- * userToken 缓存管理模块
- * 负责维护 botToken -> userToken 的映射关系，支持自动过期
- */
-
-// userToken 缓存配置
-const TOKEN_CACHE_DURATION = 60 * 60 * 1000 // 1小时
-
-type TokenCacheEntry = {
-  token: string
-  expiresAt: number
-}
-
-// 内存缓存：botToken -> { token, expiresAt }
-const tokenCache = new Map<string, TokenCacheEntry>()
-
-/**
- * 设置 userToken 缓存
- * @param botToken 机器人 token
- * @param userToken 用户 token
- */
-export function setUserTokenCache(botToken: string, userToken: string): void {
-  const expiresAt = Date.now() + TOKEN_CACHE_DURATION
-  tokenCache.set(botToken, { token: userToken, expiresAt })
-}
-
-/**
- * 获取 userToken 缓存（自动检查过期）
- * @param botToken 机器人 token
- * @returns userToken 或 null（未找到或已过期）
- */
-export function getUserTokenCache(botToken: string): string | null {
-  const entry = tokenCache.get(botToken)
-  if (!entry) {
-    return null
-  }
-
-  // 检查是否过期
-  if (Date.now() >= entry.expiresAt) {
-    tokenCache.delete(botToken)
-    return null
-  }
-  return entry.token
-}

package/src/session.ts

@@ -1,28 +0,0 @@
-import { sendGatewayRpc } from './gateway/socket.js'
-import { getSessionKey } from './utils/global.js'
-import { dcgLogger } from './utils/log.js'
-import { cleanupTerminatedSession } from './utils/sessionTermination.js'
-
-interface TSession {
-  agent_id: string
-  session_id: string
-  agent_clone_code?: string
-  account_id: string
-}
-
-export const onRemoveSession = async ({ agent_id, session_id, agent_clone_code, account_id }: TSession) => {
-  const sessionKey = getSessionKey({ agent_id, session_id, agent_clone_code }, account_id)
-  if (!session_id) {
-    dcgLogger('onRemoveSession: empty session_id', 'error')
-    return
-  }
-  
-  try {
-    await sendGatewayRpc({ method: 'sessions.delete', params: { key: sessionKey, deleteTranscript: true } })
-  } catch (e) {
-    const error = e instanceof Error ? e : new Error(String(e))
-    dcgLogger(`onRemoveSession: ${error.message}`, 'error')
-  } finally {
-    cleanupTerminatedSession(sessionKey)
-  }
-}

package/src/skill.ts

@@ -1,114 +0,0 @@
-import axios from 'axios'
-import fsPromise from 'fs/promises'
-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'
-import { sendGatewayRpc } from './gateway/socket.js'
-import { extractZipBufferToDirectory } from './utils/zipExtract.js'
-import { retryWithBackoff } from './utils/constant.js'
-
-type ISkillParams = {
-  path: string
-  code: string
-}
-
-interface SkillEventMessage {
-  event_type?: string
-  operation_type?: string
-  skill_url?: string
-  skill_code?: string
-  skill_id?: string
-  bot_token?: string
-  websocket_trace_id?: string
-  status?: string
-  [key: string]: unknown
-}
-
-function sendEvent(msgContent: SkillEventMessage) {
-  const ws = getWsConnection()
-  if (isWsOpen()) {
-    const msg =     JSON.stringify({
-      messageType: 'openclaw_bot_event',
-      source: 'client',
-      content: msgContent
-    });
-    ws?.send(msg);
-    dcgLogger(`[Send]技能安装: ${msg}`)
-  }
-}
-
-const SKILL_CODE_REGEXP = /^[A-Za-z][A-Za-z0-9_-]*$/;
-
-function normalizeCode(code: string) {
-  const trimmedCode = code?.trim() || ''
-  if (!trimmedCode) {
-    dcgLogger('skill code is empty', 'error')
-    return ''
-  }
-
-  if (!SKILL_CODE_REGEXP.test(trimmedCode)) {
-    dcgLogger(`invalid skill code: ${trimmedCode}`, 'error')
-    return ''
-  }
-
-  return trimmedCode
-}
-
-export async function installSkill(params: ISkillParams, msgContent: SkillEventMessage) {
-  const { path: cdnUrl } = params
-
-  const code = normalizeCode(params.code)
-  if (!code) {
-    sendEvent({ ...msgContent, status: 'fail' })
-    return
-  }
-
-  const workspacePath = getWorkspaceDir()
-
-  // 确保 skills 目录存在
-  const skillsDir = path.join(workspacePath, 'skills')
-  await fsPromise.mkdir(skillsDir, { recursive: true });
-
-  // 如果目标目录已存在，先删除
-  const skillDir = path.join(skillsDir, code)
-  await fsPromise.rm(skillDir, { recursive: true, force: true }).catch((e) =>
-    dcgLogger(`skill cleanup before install failed: ${String(e)}`)
-  );
-
-  try {
-    const response = await retryWithBackoff(() => axios({
-      method: 'get',
-      url: cdnUrl,
-      responseType: 'arraybuffer'
-    }), 3)
-    await fsPromise.mkdir(skillDir, { recursive: true })
-    // 与 extractZipBufferToDirectory 一致：仅当全体条目共用一个顶层目录时剥掉该层；根上多文件/多文件夹并列则不剥
-    await extractZipBufferToDirectory(Buffer.from(response.data), skillDir)
-    sendEvent({ ...msgContent, status: 'ok' })
-    sendGatewayRpc({ method: 'skills.status', params: {} })
-  } catch (error) {
-    // 如果安装失败，清理目录
-    await fsPromise.rm(skillDir, { recursive: true, force: true }).catch((e) =>
-      dcgLogger(`skill cleanup after install failure failed: ${String(e)}`)
-    )
-
-    sendEvent({ ...msgContent, status: 'fail' })
-  }
-}
-
-export async function uninstallSkill(params: Omit<ISkillParams, 'path'>, msgContent: SkillEventMessage) {
-  const code = normalizeCode(params.code)
-  if (!code) {
-    sendEvent({ ...msgContent, status: 'fail' })
-    return
-  }
-
-  const workspacePath = getWorkspaceDir()
-  if (workspacePath) {
-    const skillDir = path.join(workspacePath, 'skills', code)
-    await fsPromise.rm(skillDir, { recursive: true, force: true }).catch((e) => dcgLogger(`skill cleanup failed: ${String(e)}`))
-  }
-  sendEvent({ ...msgContent, status: 'ok' })
-}