@dcrays/dcgchat-test 0.2.29 → 0.2.31

package/index.ts

@@ -15,6 +15,7 @@ const plugin = {
     monitoringToolMessage(api)
     setOpenClawConfig(api.config)
     api.registerChannel({ plugin: dcgchatPlugin })
+    setWorkspaceDir(api.config?.agents?.defaults?.workspace)
     api.registerTool((ctx) => {
       const workspaceDir = ctx.workspaceDir
       setWorkspaceDir(workspaceDir)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat-test",
-  "version": "0.2.29",
+  "version": "0.2.31",
   "type": "module",
   "description": "OpenClaw channel plugin for 书灵墨宝 (WebSocket)",
   "main": "index.ts",

package/src/bot.ts

@@ -3,11 +3,18 @@ import path from 'node:path'
 import type { ReplyPayload } from 'openclaw/plugin-sdk'
 import { createReplyPrefixContext } from 'openclaw/plugin-sdk'
 import type { InboundMessage } from './types.js'
-import { clearSentMediaKeys, getDcgchatRuntime, getOpenClawConfig, getWorkspaceDir, setMsgStatus } from './utils/global.js'
+import {
+  clearSentMediaKeys,
+  getDcgchatRuntime,
+  getOpenClawConfig,
+  getWorkspaceDir,
+  getWsConnection,
+  setMsgStatus
+} from './utils/global.js'
 import { resolveAccount, sendDcgchatMedia } from './channel.js'
 import { generateSignUrl } from './request/api.js'
 import { extractMobookFiles } from './utils/searchFile.js'
-import { createMsgContext, sendChunk, sendFinal, sendText as sendTextMsg, sendError } from './transport.js'
+import { createMsgContext, sendChunk, sendFinal, sendText as sendTextMsg, sendError, sendText } from './transport.js'
 import { dcgLogger } from './utils/log.js'
 import { channelInfo, systemCommand, interruptCommand, ENV } from './utils/constant.js'
 
@@ -229,8 +236,6 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       humanDelay: core.channel.reply.resolveHumanDelayConfig(config, route.agentId),
       onReplyStart: async () => {},
       deliver: async (payload: ReplyPayload, info) => {
-        dcgLogger(`[deliver]: kind=${info.kind}, text=${payload.text?.length ?? 0} chars, ${payload.text?.slice(0, 100)}`)
-        // Media from the outbound pipeline (post-streaming)
         const mediaList = resolveReplyMediaList(payload)
         for (const mediaUrl of mediaList) {
           const key = getMediaKey(mediaUrl)
@@ -238,7 +243,6 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
           sentMediaKeys.add(key)
           await sendDcgchatMedia({ msgCtx, mediaUrl, text: '' })
         }
-        sendFinal(msgCtx)
       },
       onError: (err: unknown, info: { kind: string }) => {
         dcgLogger(`${info.kind} reply failed: ${String(err)}`, 'error')
@@ -332,8 +336,8 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         }
         await sendDcgchatMedia({ msgCtx, mediaUrl: resolved, text: '' })
       }
-      sendFinal(msgCtx)
     }
+    sendFinal(msgCtx)
     clearSentMediaKeys(msg.content.message_id)
     setMsgStatus('finished')
 

package/src/channel.ts

@@ -14,8 +14,6 @@ export type DcgchatMediaSendOptions = {
 
 export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<void> {
   const { msgCtx } = opts
-  console.log('🚀 ~ sendDcgchatMedia ~ msgCtx:', msgCtx)
-
   if (!isWsOpen()) {
     dcgLogger(`outbound media skipped -> ws not open: ${opts.mediaUrl ?? ''}`)
     return
@@ -158,8 +156,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
       const msgCtx = createOutboundMsgContext(ctx.cfg, ctx.accountId)
       if (isWsOpen()) {
         wsSendRaw(msgCtx, { response: ctx.text })
-        sendFinal(msgCtx)
-        dcgLogger(`channel sendText to ${msgCtx.userId}`)
+        dcgLogger(`channel sendText to ${msgCtx.userId} ${ctx.text?.slice(0, 50)}`)
       }
       return {
         channel: "dcgchat-test",

package/src/skill.ts

@@ -66,7 +66,6 @@ export async function installSkill(params: ISkillParams, msgContent: Record<stri
             entry.autodrain()
             return
           }
-
           try {
             const flags = entry.props?.flags ?? 0
             const isUtf8 = (flags & 0x800) !== 0
@@ -82,9 +81,7 @@ export async function installSkill(params: ISkillParams, msgContent: Record<stri
             if (!rootDir && pathParts.length > 1) {
               rootDir = pathParts[0]
             }
-
             let newPath = entryPath
-
             // 移除顶层文件夹
             if (rootDir && entryPath.startsWith(rootDir + '/')) {
               newPath = entryPath.slice(rootDir.length + 1)
@@ -139,10 +136,7 @@ export async function installSkill(params: ISkillParams, msgContent: Record<stri
   }
 }
 
-export function uninstallSkill(
-  params: Omit<ISkillParams, 'path'>,
-  msgContent: Record<string, any>
-) {
+export function uninstallSkill(params: Omit<ISkillParams, 'path'>, msgContent: Record<string, any>) {
   const { code } = params
 
   const workspacePath = getWorkspaceDir()

package/src/tool.ts

@@ -1,7 +1,7 @@
 import type { OpenClawPluginApi } from 'openclaw/plugin-sdk'
 import { getMsgParams, getMsgStatus, getWsConnection } from './utils/global.js'
 import { dcgLogger } from './utils/log.js'
-import { isWsOpen } from './transport.js'
+import { isWsOpen, sendFinal, sendText } from './transport.js'
 
 let toolCallId = ''
 let toolName = ''
@@ -97,27 +97,20 @@ export function monitoringToolMessage(api: OpenClawPluginApi) {
         } else if (item.event) {
           if (item.event === 'llm_output') {
             if (event.lastAssistant?.errorMessage === '429-账户额度耗尽') {
-              const ws = getWsConnection()
               const params = getMsgParams()
-              if (isWsOpen()) {
-                ws?.send(
-                  JSON.stringify({
-                    messageType: 'openclaw_bot_cost',
-                    _userId: params?.userId,
-                    source: 'client',
-                    content: {
-                      bot_token: params?.token,
-                      domain_id: params?.domainId,
-                      app_id: params?.appId,
-                      bot_id: params?.botId,
-                      agent_id: params?.agentId,
-                      response: '您的余额不足，请充值后继续使用',
-                      session_id: params?.sessionId,
-                      message_id: params?.messageId || Date.now().toString()
-                    }
-                  })
-                )
+              const message = '您的积分已消耗完，您可以通过充值积分来继续使用'
+              const ctx = {
+                userId: params.userId,
+                botToken: params.token,
+                domainId: params.domainId,
+                appId: params.appId,
+                botId: params.botId,
+                agentId: params.agentId,
+                sessionId: params.sessionId,
+                messageId: params.messageId
               }
+              sendText(ctx, message, { message_tags: { insufficient_balance: 1 }, is_finish: -1 })
+              sendFinal(ctx)
               return
             }
           }

package/src/transport.ts

@@ -99,8 +99,8 @@ export function sendFinal(ctx: DcgchatMsgContext): boolean {
   return wsSend(ctx, { response: '', state: 'final' })
 }
 
-export function sendText(ctx: DcgchatMsgContext, text: string): boolean {
-  return wsSend(ctx, { response: text })
+export function sendText(ctx: DcgchatMsgContext, text: string, event?: Record<string, unknown>): boolean {
+  return wsSend(ctx, { response: text, ...event })
 }
 
 export function sendError(ctx: DcgchatMsgContext, errorMsg: string): boolean {

package/src/utils/global.ts

@@ -22,16 +22,21 @@ export function getOpenClawConfig(): OpenClawConfig | null {
   return config
 }
 
-import type { ChannelLogSink, OpenClawConfig, PluginRuntime } from 'openclaw/plugin-sdk'
+import type { OpenClawConfig, PluginRuntime } from 'openclaw/plugin-sdk'
 import { dcgLogger } from './log.js'
 import { IMsgParams } from '../types.js'
+import { channelInfo, ENV } from './constant.js'
 
 const path = require('path')
 const fs = require('fs')
 const os = require('os')
 
 function getWorkspacePath() {
-  const workspacePath = path.join(os.homedir(), '.openclaw', 'workspace')
+  const workspacePath = path.join(
+    os.homedir(),
+    config?.channels?.["dcgchat-test"]?.appId == 110 ? '.mobook' : '.openclaw',
+    'workspace'
+  )
   if (fs.existsSync(workspacePath)) {
     return workspacePath
   }