@dcrays/dcgchat-test 0.6.12 → 0.7.0

package/src/utils/mediaAttached.ts

@@ -1,244 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path'
-import { buildAgentMediaPayload } from 'openclaw/plugin-sdk/agent-media-payload'
-import { getDcgchatRuntime } from './global.js'
-import { dcgLogger } from './log.js'
-import { generateSignUrl } from '../request/api.js'
-
-export type DcgchatInboundMediaInfo = {
-  path: string
-  fileName: string
-  contentType: string
-  placeholder: string
-}
-
-export type DcgchatInboundFileRef = { name: string; url: string }
-
-export const DCGCHAT_INBOUND_MEDIA_MAX_BYTES = 500 * 1024 * 1024
-
-const INBOUND_FILE_URL_KEYS = ['url', 'fileUrl', 'file_url', 'link', 'href', 'path', 'ossKey', 'oss_key', 'key'] as const
-const INBOUND_FILE_NAME_KEYS = ['name', 'fileName', 'file_name', 'title', 'originalName', 'original_filename'] as const
-const INBOUND_FILE_ARRAY_KEYS = [
-  'files',
-  'file_list',
-  'fileList',
-  'attachments',
-  'media_files',
-  'mediaFiles',
-  'resources',
-  'uploads'
-] as const
-
-function firstNonEmptyString(o: Record<string, unknown>, keys: readonly string[]): string | undefined {
-  for (const k of keys) {
-    const v = o[k]
-    if (typeof v === 'string' && v.trim()) return v.trim()
-  }
-  return undefined
-}
-
-function fallbackFileNameFromUrl(url: string): string {
-  try {
-    return path.basename(new URL(url).pathname) || 'file'
-  } catch {
-    const base = url.split(/[\\/]/).pop() ?? url
-    return path.basename(base.split('?')[0] || base) || 'file'
-  }
-}
-
-function coerceInboundFileItem(item: unknown): DcgchatInboundFileRef | null {
-  if (item == null) return null
-  if (typeof item === 'string') {
-    const t = item.trim()
-    if (!t) return null
-    return { url: t, name: fallbackFileNameFromUrl(t) }
-  }
-  if (typeof item !== 'object') return null
-  const o = item as Record<string, unknown>
-  const url = firstNonEmptyString(o, INBOUND_FILE_URL_KEYS)
-  if (!url) return null
-  const name = firstNonEmptyString(o, INBOUND_FILE_NAME_KEYS) ?? ''
-  return { url, name: name || fallbackFileNameFromUrl(url) }
-}
-
-function asInboundFileArray(raw: unknown): unknown[] {
-  if (Array.isArray(raw)) return raw
-  if (typeof raw === 'string') {
-    const t = raw.trim()
-    if (!t) return []
-    try {
-      const p = JSON.parse(t) as unknown
-      return Array.isArray(p) ? p : []
-    } catch {
-      return []
-    }
-  }
-  return []
-}
-
-/** 合并服务端可能使用的多种附件字段与对象形状，避免仅认 `files`+`url` 时视频未入队 */
-export function normalizeInboundFileList(content: Record<string, unknown>): DcgchatInboundFileRef[] {
-  const seen = new Set<string>()
-  const out: DcgchatInboundFileRef[] = []
-  for (const key of INBOUND_FILE_ARRAY_KEYS) {
-    for (const item of asInboundFileArray(content[key])) {
-      const f = coerceInboundFileItem(item)
-      if (f && !seen.has(f.url)) {
-        seen.add(f.url)
-        out.push(f)
-      }
-    }
-  }
-  for (const key of ['file', 'attachment', 'media'] as const) {
-    const f = coerceInboundFileItem(content[key])
-    if (f && !seen.has(f.url)) {
-      seen.add(f.url)
-      out.push(f)
-    }
-  }
-  return out
-}
-
-/** 供模型侧识别媒体槽位类型 */
-export function inferPlaceholderFromContentType(contentType: string): string {
-  const ct = (contentType || '').toLowerCase()
-  if (ct.startsWith('image/')) return '<media:image>'
-  if (ct.startsWith('video/')) return '<media:video>'
-  if (ct.startsWith('audio/')) return '<media:audio>'
-  if (
-    ct === 'application/pdf' ||
-    ct.includes('word') ||
-    ct.includes('document') ||
-    ct.includes('msword') ||
-    ct.includes('officedocument') ||
-    ct.includes('spreadsheet') ||
-    ct.includes('presentation')
-  ) {
-    return '<media:document>'
-  }
-  return '<media:document>'
-}
-
-/**
- * 使用 SDK 与飞书通道一致的 Media* 布局，并保留 dcgchat 原有的文件名字段供工具/模板使用。
- */
-export function buildDcgchatInboundMediaPayload(mediaList: DcgchatInboundMediaInfo[]): Record<string, unknown> {
-  if (mediaList.length === 0) return {}
-  const base = buildAgentMediaPayload(mediaList.map((m) => ({ path: m.path, contentType: m.contentType || null })))
-  const mediaFileNames = mediaList.map((m) => m.fileName).filter(Boolean)
-  if (mediaFileNames.length === 0) return { ...base }
-  return {
-    ...base,
-    MediaFileName: mediaFileNames[0],
-    MediaFileNames: mediaFileNames
-  }
-}
-
-/** BodyForAgent：含附件说明与槽位行；与 RawBody/CommandBody（纯用户侧文本）分离 */
-export function buildAgentInboundBodySuffix(userText: string, mediaList: DcgchatInboundMediaInfo[]): string {
-  if (mediaList.length === 0) return userText
-  const brief = mediaList.map((m, i) => `${i + 1}) ${m.fileName} [${m.contentType || 'unknown'}]`).join('; ')
-  const slots = mediaList.map((m) => m.placeholder).join('\n')
-  return `${userText}\n\n[系统: 用户已随本消息上传 ${mediaList.length} 个附件: ${brief}。请勿要求用户再次上传；下列槽位与 MediaPaths/MediaTypes 顺序一致。]\n${slots}`
-}
-
-const DEFAULT_INBOUND_FETCH_TIMEOUT_MS = 180_000
-const DEFAULT_INBOUND_DOWNLOAD_CONCURRENCY = 3
-
-async function fetchWithTimeout(url: string, timeoutMs: number): Promise<Response> {
-  const ctrl = new AbortController()
-  const t = setTimeout(() => ctrl.abort(new Error(`fetch timeout ${timeoutMs}ms`)), timeoutMs)
-  try {
-    return await fetch(url, { signal: ctrl.signal })
-  } finally {
-    clearTimeout(t)
-  }
-}
-
-function resolveFilepath(savedFilePath: string, filename: string) {
-  if (path.extname(savedFilePath)) return savedFilePath
-
-  const ext = path.extname(filename)
-  if (!ext) return savedFilePath
-
-  const newPath = `${savedFilePath}${ext}`
-  try {
-    fs.renameSync(savedFilePath, newPath);
-    return newPath
-  } catch (err) {
-    dcgLogger(`media: failed to append extension to ${savedFilePath}: ${String(err)}`, 'error')
-    return savedFilePath
-  }
-}
-
-async function resolveOneInboundFile(
-  file: DcgchatInboundFileRef,
-  botToken: string,
-  maxBytes: number,
-  fetchTimeoutMs: number
-): Promise<DcgchatInboundMediaInfo | null> {
-  const core = getDcgchatRuntime()
-  try {
-    let data = ''
-    if (/^https?:\/\//i.test(file.url)) {
-      data = file.url
-    } else {
-      data = await generateSignUrl(file.url, botToken)
-    }
-    const response = await fetchWithTimeout(data, fetchTimeoutMs)
-    if (!response.ok) {
-      dcgLogger?.(`media: ${file.url} fetch failed with HTTP ${response.status}`, 'error')
-      return null
-    }
-    const buffer = Buffer.from(await response.arrayBuffer())
-
-    let contentType = response.headers.get('content-type') || ''
-    if (!contentType) {
-      contentType = (await core.media.detectMime({ buffer })) || ''
-    }
-    const fileName = file.name || fallbackFileNameFromUrl(file.url)
-    const saved = await core.channel.media.saveMediaBuffer(buffer, contentType, 'inbound', maxBytes, fileName)
-    const effectiveType = saved.contentType || contentType
-
-    const finalPath = resolveFilepath(saved.path, fileName)
-
-    return {
-      path: finalPath,
-      fileName,
-      contentType: effectiveType,
-      placeholder: inferPlaceholderFromContentType(effectiveType)
-    }
-  } catch (err) {
-    dcgLogger(`media: ${file.url} FAILED to process: ${String(err)}`, 'error')
-    return null
-  }
-}
-
-export async function resolveMediaFromUrls(
-  files: DcgchatInboundFileRef[],
-  botToken: string,
-  opts?: { maxBytes?: number; fetchTimeoutMs?: number; concurrency?: number }
-): Promise<DcgchatInboundMediaInfo[]> {
-  const maxBytes = opts?.maxBytes ?? DCGCHAT_INBOUND_MEDIA_MAX_BYTES
-  const fetchTimeoutMs = opts?.fetchTimeoutMs ?? DEFAULT_INBOUND_FETCH_TIMEOUT_MS
-  const conc = Math.max(1, opts?.concurrency ?? DEFAULT_INBOUND_DOWNLOAD_CONCURRENCY)
-  const concurrency = files.length === 0 ? 1 : Math.min(conc, files.length)
-
-  dcgLogger(`media: inbound files count=${files.length}, concurrency=${concurrency}, fetchTimeoutMs=${fetchTimeoutMs}`)
-  const results: (DcgchatInboundMediaInfo | null)[] = new Array(files.length).fill(null)
-  let nextIndex = 0
-
-  async function worker() {
-    while (true) {
-      const i = nextIndex++
-      if (i >= files.length) break
-      results[i] = await resolveOneInboundFile(files[i], botToken, maxBytes, fetchTimeoutMs)
-    }
-  }
-
-  await Promise.all(Array.from({ length: concurrency }, () => worker()))
-
-  const out = results.filter((x): x is DcgchatInboundMediaInfo => x != null)
-  dcgLogger(`media: resolve complete, ${out.length}/${files.length} file(s) succeeded`)
-  return out
-}

package/src/utils/mediaEmitter.ts

@@ -1,54 +0,0 @@
-import type { ReplyPayload } from 'openclaw/plugin-sdk'
-import { mediaPathDedupeKey } from './global.js'
-import { normalizeOutboundMediaPaths, sendDcgchatMedia } from '../channel/index.js'
-
-export interface MediaEmitter {
-  emitFromPayload(payload: Partial<ReplyPayload>): Promise<boolean>
-  readonly sentKeys: ReadonlySet<string>
-}
-
-export interface CreateMediaEmitterOptions {
-  sessionKey: string
-  onEmit?: () => void
-}
-
-function resolveReplyMediaList(payload: Partial<ReplyPayload>): string[] {
-  if ('mediaUrls' in payload && Array.isArray(payload.mediaUrls) && payload.mediaUrls.length > 0) {
-    return normalizeOutboundMediaPaths(payload.mediaUrls)
-  }
-  const single = 'mediaUrl' in payload ? payload.mediaUrl : null
-  return normalizeOutboundMediaPaths(single ?? null)
-}
-
-export function createMediaEmitter(options: CreateMediaEmitterOptions): MediaEmitter {
-  const { sessionKey, onEmit } = options
-  const sentKeys = new Set<string>()
-
-  const emit = async (mediaUrls: string[]): Promise<boolean> => {
-    if (mediaUrls.length === 0) return false
-    await sendDcgchatMedia({ sessionKey, mediaUrls, text: '' })
-    onEmit?.()
-    return true
-  }
-
-  const emitFromPayload = async (payload: Partial<ReplyPayload>): Promise<boolean> => {
-    const list = resolveReplyMediaList(payload)
-    const urls: string[] = []
-    for (const url of list) {
-      const key = mediaPathDedupeKey(url)
-      if (sentKeys.has(key)) continue
-      sentKeys.add(key)
-      urls.push(url)
-    }
-    if (urls.length === 0) return false
-    await emit(urls)
-    return true
-  }
-
-  return {
-    emitFromPayload,
-    get sentKeys(): ReadonlySet<string> {
-      return new Set(sentKeys)
-    }
-  }
-}

package/src/utils/outboundAssistantText.ts

@@ -1,117 +0,0 @@
-import type { IMsgParams } from '../types.js'
-import { sendChunk } from '../transport.js'
-import { agentErrorPayloadText } from './agentErrors.js'
-import { takeStreamChunkIdxAndAdvance } from './inboundTurnState.js'
-import { isReviserExpert } from './global.js'
-
-type OutboundTextState = {
-  inboundGen: number
-  lastStreamSnapshot: string
-  /** 仅 onPartialReply 成功下发过正文时为 true，用于 deliver 兜底判断 */
-  hasStreamedAssistantText: boolean
-  hasEmittedAssistantText: boolean
-}
-
-const stateBySessionKey = new Map<string, OutboundTextState>()
-
-/** 每轮入站 dispatch 开始前初始化，与 inboundGen 绑定供调试对齐 */
-export function resetOutboundTextState(sessionKey: string, inboundGen: number): void {
-  const k = sessionKey.trim()
-  if (!k) return
-  stateBySessionKey.set(k, {
-    inboundGen,
-    lastStreamSnapshot: '',
-    hasStreamedAssistantText: false,
-    hasEmittedAssistantText: false
-  })
-}
-
-export function clearOutboundTextState(sessionKey: string): void {
-  const k = sessionKey.trim()
-  if (!k) return
-  stateBySessionKey.delete(k)
-}
-
-function getState(sessionKey: string): OutboundTextState | undefined {
-  const k = sessionKey.trim()
-  if (!k) return undefined
-  return stateBySessionKey.get(k)
-}
-
-/** 子 agent 等路径可能未走 bot reset；懒初始化保证 dcgchat_message 仍可出站且参与快照去重 */
-function ensureState(sessionKey: string): OutboundTextState | undefined {
-  const k = sessionKey.trim()
-  if (!k) return undefined
-  let state = stateBySessionKey.get(k)
-  if (!state) {
-    state = {
-      inboundGen: 0,
-      lastStreamSnapshot: '',
-      hasStreamedAssistantText: false,
-      hasEmittedAssistantText: false
-    }
-    stateBySessionKey.set(k, state)
-  }
-  return state
-}
-
-export function outboundHasStreamedAssistantText(sessionKey: string): boolean {
-  return getState(sessionKey)?.hasStreamedAssistantText ?? false
-}
-
-export function outboundHasEmittedAssistantText(sessionKey: string): boolean {
-  return getState(sessionKey)?.hasEmittedAssistantText ?? false
-}
-
-/** 仅重置快照（用于 `replace` 流式片段），保留 generation 与已下发标记 */
-export function resetOutboundTextSnapshot(sessionKey: string): void {
-  const k = sessionKey.trim()
-  if (!k) return
-  const state = ensureState(k)
-  if (state) {
-    state.lastStreamSnapshot = ''
-  }
-}
-
-/**
- * 统一助手正文出站：bot 流式/deliver 与 dcgchat_message 共用快照增量，避免双发或漏发。
- * @param markStreamed 为 true 时表示来自 onPartialReply，会置 hasStreamedAssistantText
- * @param isError 仅对 OpenClaw 明确标记的错误载荷做用户可见翻译，避免普通正文中的错误短语被误判
- */
-export function emitOutboundAssistantText(
-  sessionKey: string,
-  raw: string | undefined,
-  outboundCtx: IMsgParams,
-  options?: { markStreamed?: boolean; isError?: boolean; emitDelta?: (delta: string) => boolean | void }
-): boolean {
-  if (!raw || isReviserExpert(sessionKey)) return false
-  const state = ensureState(sessionKey)
-  if (!state) return false
-
-  const t = raw
-  let delta = ''
-  if (t.startsWith(state.lastStreamSnapshot)) {
-    delta = t.slice(state.lastStreamSnapshot.length)
-    state.lastStreamSnapshot = t
-  } else if (state.lastStreamSnapshot.startsWith(t)) {
-    // 快照缩短（模型修订等）：不重复下发
-  } else {
-    delta = t
-    state.lastStreamSnapshot = t
-  }
-
-  if (!delta.trim()) return false
-
-  delta = agentErrorPayloadText(delta, options?.isError === true)
-
-  const emitted =
-    options?.emitDelta != null
-      ? options.emitDelta(delta) !== false
-      : sendChunk(delta, outboundCtx, takeStreamChunkIdxAndAdvance(sessionKey))
-  if (!emitted) return false
-  state.hasEmittedAssistantText = true
-  if (options?.markStreamed) {
-    state.hasStreamedAssistantText = true
-  }
-  return true
-}

package/src/utils/params.ts

@@ -1,104 +0,0 @@
-import { CHANNEL_ID } from './constant.js'
-import { getOpenClawConfig } from './global.js'
-import type { DcgchatConfig, IMsgParams } from '../types.js'
-
-/**
- * map key 是 session_key，value 为该会话下已 merge 后的消息参数。
- */
-const paramsMessageMap = new Map<string, IMsgParams>()
-
-/** 从 OpenClaw 配置读取当前 channel 的基础参数（唯一来源，供 transport / resolve 等复用） */
-export function getParamsDefaults(): IMsgParams {
-  const ch = (getOpenClawConfig()?.channels?.[CHANNEL_ID] as DcgchatConfig | undefined) ?? {}
-  return {
-    userId: Number(ch.userId ?? 0),
-    botToken: ch.botToken ?? '',
-    sessionId: '',
-    messageId: '',
-    domainId: String(ch.domainId ?? '1000'),
-    appId: String(ch.appId ?? '100'),
-    botId: '',
-    agentId: '',
-    sessionKey: ''
-  }
-}
-
-export function resolveParamsMessage(params: Partial<IMsgParams>): IMsgParams {
-  const defaults = getParamsDefaults()
-  return {
-    userId: Number(params.userId ?? defaults.userId),
-    botToken: params.botToken ?? defaults.botToken,
-    sessionId: params.sessionId ?? defaults.sessionId,
-    messageId: params.messageId ?? defaults.messageId,
-    domainId: String(params.domainId ?? defaults.domainId),
-    appId: String(params.appId ?? defaults.appId),
-    botId: params.botId ?? defaults.botId,
-    agentId: params.agentId ?? defaults.agentId,
-    sessionKey: params.sessionKey ?? defaults.sessionKey
-  }
-}
-
-/**
- * 统一取值入口：显式 sessionKey，或回落到当前会话；再与配置缺省 merge，保证字段完整。
- */
-export function getEffectiveMsgParams(sessionKey?: string): IMsgParams {
-  const stored = sessionKey ? paramsMessageMap.get(sessionKey) : undefined
-  return stored ? resolveParamsMessage(stored) : getParamsDefaults()
-}
-
-/**
- * Agent `dcgchat_message` / 出站 `target` 应为 `dcgSessionKey`（如 `agent:main:mobook:direct:...`）。
- * `setParamsMessage` 的 key 与此一致；查不到 map 时回落到配置缺省（无会话级 messageId/sessionId）。
- */
-export function getOutboundMsgParams(preferredKey: string): IMsgParams {
-  const k = preferredKey?.trim()
-  if (k && paramsMessageMap.has(k)) {
-    return getEffectiveMsgParams(k)
-  }
-  return getEffectiveMsgParams()
-}
-
-export function setParamsMessage(sessionKey: string, params: Partial<IMsgParams>) {
-  if (!sessionKey) return
-  const previous = paramsMessageMap.get(sessionKey)
-  const base = previous ? resolveParamsMessage(previous) : getParamsDefaults()
-  paramsMessageMap.set(sessionKey, resolveParamsMessage({ ...base, ...params, sessionKey }))
-}
-
-export function getParamsMessage(sessionKey: string): IMsgParams | undefined {
-  return paramsMessageMap.get(sessionKey)
-}
-
-export function clearParamsMessage(sessionKey: string): void {
-  const k = sessionKey?.trim()
-  if (!k) return
-  paramsMessageMap.delete(k)
-}
-
-/** 用于网关重启时持久化/恢复的参数模块状态快照 */
-export type ParamsStateSnapshot = {
-  paramsMessageMap: Array<[string, Partial<IMsgParams>]>
-}
-
-function snapshotMsgParams(params: IMsgParams): Partial<IMsgParams> {
-  const { botToken: _botToken, ...rest } = params
-  return rest
-}
-
-export function snapshotParamsState(sessionKeys?: ReadonlySet<string>): ParamsStateSnapshot {
-  return {
-    paramsMessageMap: [...paramsMessageMap.entries()]
-      .filter(([k]) => !sessionKeys || sessionKeys.has(k))
-      .map(([k, v]) => [k, snapshotMsgParams(v)])
-  }
-}
-
-export function restoreParamsState(snap: ParamsStateSnapshot | null | undefined): void {
-  if (!snap) return
-  paramsMessageMap.clear()
-  for (const [k, v] of snap.paramsMessageMap ?? []) {
-    if (typeof k === 'string' && k && v && typeof v === 'object') {
-      paramsMessageMap.set(k, resolveParamsMessage(v))
-    }
-  }
-}

package/src/utils/passTxt.ts

@@ -1,4 +0,0 @@
-export function isInsufficientBalanceAssistantText(text: string | undefined): boolean {
-  const t = text?.trim() ?? ''
-  return t === '1003-额度不足请充值' || /1003[-–]?额度不足请充值/.test(t)
-}

package/src/utils/resolveRegisterConfig.ts

@@ -1,33 +0,0 @@
-import type { OpenClawConfig } from 'openclaw/plugin-sdk'
-import type { OpenClawPluginApi } from 'openclaw/plugin-sdk'
-import { CHANNEL_ID } from './constant.js'
-
-function isEmptyObject(value: unknown): boolean {
-  return value !== null && typeof value === 'object' && Object.keys(value as object).length === 0
-}
-
-export function openclawConfigLooksUsable(cfg: OpenClawConfig | undefined | null): cfg is OpenClawConfig {
-  if (!cfg || typeof cfg !== 'object' || isEmptyObject(cfg)) return false
-  const ch = cfg.channels
-  if (!ch || typeof ch !== 'object' || Object.keys(ch).length === 0) return false
-  return ch[CHANNEL_ID as keyof typeof ch] != null
-}
-
-/**
- * `registerFull` 里 OpenClaw 传入的 `api.config` 在部分加载路径下会是 `{}` 或缺本通道段落，
- * 应改用 `api.runtime.config.loadConfig()` 读盘上完整配置，避免 `getOpenClawConfig()` 不可靠。
- *
- * （`setRuntime` 在 `registerFull` 之前已执行，故此处可安全使用 `api.runtime`。）
- */
-export function resolveOpenClawConfigAtRegister(api: OpenClawPluginApi): OpenClawConfig {
-  const snap = api.config as OpenClawConfig | undefined
-  if (openclawConfigLooksUsable(snap)) {
-    return snap
-  }
-  try {
-    const full = api.runtime.config.loadConfig() as OpenClawConfig
-    return structuredClone(full)
-  } catch {
-    return (snap ?? {}) as OpenClawConfig
-  }
-}