@ynhcj/xiaoyi-channel 0.0.140-next → 0.0.141-next

package/dist/src/cspl/config.js

@@ -2,8 +2,9 @@
  * 版权所有 (c) 华为技术有限公司 2026-2026
  */
 import fs from 'fs';
-import path from 'path';
-import { CONFIG_FILE_NAME, ENV_FILE_PATH, REQUIRED_ENV_VARS } from './constants.js';
+import { ENV_FILE_PATH, REQUIRED_ENV_VARS } from './constants.js';
+import { logger } from '../utils/logger.js';
+import defaultConfig from './configs.json' with { type: 'json' };
 let cachedConfig = null;
 function readEnvFile() {
     if (!fs.existsSync(ENV_FILE_PATH)) {
@@ -40,45 +41,25 @@ export function getConfig(api) {
     if (cachedConfig) {
         return cachedConfig;
     }
-    const configPath = path.join(__dirname, CONFIG_FILE_NAME);
-    if (!fs.existsSync(configPath)) {
-        throw new Error(`Config file not found: ${CONFIG_FILE_NAME}`);
-    }
-    let configData;
-    try {
-        configData = fs.readFileSync(configPath, 'utf-8');
-    }
-    catch (error) {
-        throw new Error(`Failed to read config file: ${CONFIG_FILE_NAME}.`);
-    }
-    let parsedConfig;
-    try {
-        parsedConfig = JSON.parse(configData);
-    }
-    catch (error) {
-        throw new Error(`Failed to parse config file: ${CONFIG_FILE_NAME}.`);
-    }
-    if (!parsedConfig || typeof parsedConfig !== 'object') {
-        throw new Error(`Invalid config structure: ${CONFIG_FILE_NAME}. Expected an object.`);
-    }
-    const config = parsedConfig;
+    // Use imported JSON (bundled at compile time, no runtime file read needed)
+    const config = { ...defaultConfig };
     if (!config.api || typeof config.api !== 'object') {
-        throw new Error(`Invalid config: missing or invalid 'api' section in ${CONFIG_FILE_NAME}`);
+        throw new Error(`Invalid config: missing or invalid 'api' section`);
     }
     if (!config.api.timeout || typeof config.api.timeout !== 'number') {
-        throw new Error(`Invalid config: missing or invalid 'api.timeout' in ${CONFIG_FILE_NAME}`);
+        throw new Error(`Invalid config: missing or invalid 'api.timeout'`);
     }
     if (!config.skillId || typeof config.skillId !== 'string') {
-        throw new Error(`Invalid config: missing or invalid 'skillId' in ${CONFIG_FILE_NAME}`);
+        throw new Error(`Invalid config: missing or invalid 'skillId'`);
     }
     if (!config.requestFrom || typeof config.requestFrom !== 'string') {
-        throw new Error(`Invalid config: missing or invalid 'requestFrom' in ${CONFIG_FILE_NAME}`);
+        throw new Error(`Invalid config: missing or invalid 'requestFrom'`);
     }
     if (!config.textSource || typeof config.textSource !== 'string') {
-        throw new Error(`Invalid config: missing or invalid 'textSource' in ${CONFIG_FILE_NAME}`);
+        throw new Error(`Invalid config: missing or invalid 'textSource'`);
     }
     if (!config.action || typeof config.action !== 'string') {
-        throw new Error(`Invalid config: missing or invalid 'action' in ${CONFIG_FILE_NAME}`);
+        throw new Error(`Invalid config: missing or invalid 'action'`);
     }
     let env;
     try {
@@ -104,6 +85,6 @@ export function getConfig(api) {
     config.uid = personalUid.trim();
     config.api.url = serviceUrl.trim();
     cachedConfig = config;
-    api.logger.info(`[SENTINEL HOOK] Config file loaded successfully: ${CONFIG_FILE_NAME}`);
+    logger.log(`[SENTINEL HOOK] Config loaded successfully`);
     return cachedConfig;
 }

package/dist/src/cspl/configs.json

@@ -0,0 +1,10 @@
+{
+    "api": {
+        "timeout": 5000
+    },
+    "headers": {},
+    "skillId": "skill-scope",
+    "requestFrom": "openclaw",
+    "textSource": "question",
+    "action": "TOOL_OUTPUT_SCAN"
+}

package/dist/src/cspl/sentinel_hook.js

@@ -5,13 +5,14 @@ import crypto from 'crypto';
 import { callApi } from './call_api.js';
 import { processText, extractResultText, validateAndTruncateText, parseSecurityResult, handleExecToolInput, handleMessageToolInput, handleOtherToolInput } from './utils.js';
 import { ALLOWED_TOOLS, MAX_TEXT_LENGTH, MAX_TOTAL_LENGTH, MIN_TEXT_LENGTH } from './constants.js';
+import { logger } from '../utils/logger.js';
 // 主入口模块
 export default function register(api) {
     api.on("before_tool_call", async (event, ctx) => {
-        api.logger.info(`[SENTINEL HOOK] before_tool_call_event toolName: ${event.toolName}`);
+        logger.log(`[SENTINEL HOOK] before_tool_call_event toolName: ${event.toolName}`);
         // 生成sessionID
         const sessionId = (event.runId?.replace(/-/g, '') || crypto.randomBytes(16).toString('hex'));
-        api.logger.info(`[SENTINEL HOOK] Generated Session ID: ${sessionId}`);
+        logger.log(`[SENTINEL HOOK] Generated Session ID: ${sessionId}`);
         // 处理 TOOL_INPUT 数据采集、发送数据
         try {
             if (event.toolName === 'exec') {
@@ -25,7 +26,7 @@ export default function register(api) {
             }
         }
         catch (error) {
-            api.logger.error(`[SENTINEL HOOK] Extracted TOOL_INPUT data processing exception: ${error}`);
+            logger.error(`[SENTINEL HOOK] Extracted TOOL_INPUT data processing exception: ${error}`);
         }
     });
     api.on("after_tool_call", async (event, ctx) => {
@@ -34,19 +35,19 @@ export default function register(api) {
             return;
         }
         try {
-            api.logger.info(`[SENTINEL HOOK] after_tool_call_event toolName: ${event.toolName}`);
+            logger.log(`[SENTINEL HOOK] after_tool_call_event toolName: ${event.toolName}`);
             // 生成sessionID
             const sessionId = (event.runId?.replace(/-/g, '') || crypto.randomBytes(16).toString('hex'));
-            api.logger.info(`[SENTINEL HOOK] Generated Session ID: ${sessionId}`);
+            logger.log(`[SENTINEL HOOK] Generated Session ID: ${sessionId}`);
             // 处理TOOL_OUTPUT数据采集（保持现有逻辑）
             const resultText = extractResultText(event, event.toolName);
             const resultTextLength = resultText.length;
             if (resultTextLength > MAX_TOTAL_LENGTH) {
-                api.logger.warn(`[SENTINEL HOOK] Text exceeds ${MAX_TOTAL_LENGTH} character limit. Actual length: ${resultTextLength}`);
+                logger.warn(`[SENTINEL HOOK] Text exceeds ${MAX_TOTAL_LENGTH} character limit. Actual length: ${resultTextLength}`);
                 return;
             }
             if (resultTextLength <= MIN_TEXT_LENGTH) {
-                api.logger.info("[SENTINEL HOOK] No valid information at collection point");
+                logger.log("[SENTINEL HOOK] No valid information at collection point");
                 return;
             }
             // 处理和验证文本
@@ -59,17 +60,17 @@ export default function register(api) {
                 const { text: filterText, truncated } = validateAndTruncateText(originText, MAX_TEXT_LENGTH - diff_length);
                 if (truncated) {
                     questionText.output[0].content = `${filterText}`;
-                    api.logger.warn(`[SENTINEL HOOK] postText exceeds ${MAX_TEXT_LENGTH}.`);
+                    logger.warn(`[SENTINEL HOOK] postText exceeds ${MAX_TEXT_LENGTH}.`);
                 }
             }
             const postText = JSON.stringify(questionText);
-            api.logger.info(`[SENTINEL HOOK] Content extracted successfully. Length: ${postText.length}`);
+            logger.log(`[SENTINEL HOOK] Content extracted successfully. Length: ${postText.length}`);
             try {
                 const response = await callApi(postText, api, sessionId);
                 const result = parseSecurityResult(response);
-                api.logger.info(`[SENTINEL HOOK] TOOL_OUTPUT response: status=${result.status}.`);
+                logger.log(`[SENTINEL HOOK] TOOL_OUTPUT response: status=${result.status}.`);
                 if (result.status === 'REJECT') {
-                    api.logger.warn('[SENTINEL HOOK] Interrupt handler');
+                    logger.warn('[SENTINEL HOOK] Interrupt handler');
                 }
             }
             catch (error) {
@@ -77,7 +78,7 @@ export default function register(api) {
             }
         }
         catch (error) {
-            api.logger.error(`[SENTINEL HOOK] Extracted TOOL_OUTPUT data processing exception: ${error}`);
+            logger.error(`[SENTINEL HOOK] Extracted TOOL_OUTPUT data processing exception: ${error}`);
         }
     });
 }

package/dist/src/cspl/utils.js

@@ -8,6 +8,7 @@ import path from 'path';
 import { Buffer } from 'buffer';
 import { callApi } from './call_api.js';
 import { uploadFileToObsMain } from './upload_file.js';
+import { logger } from '../utils/logger.js';
 // 文本过滤函数：仅保留中文、英文、数字、标点符号
 export function filterText(text) {
     if (!text)
@@ -50,7 +51,7 @@ export function processText(resultText, api) {
     // 检查是否超过4096字符限制，进行截断
     const { text: finalText, truncated } = validateAndTruncateText(questionText, MAX_TEXT_LENGTH);
     if (truncated) {
-        api.logger.warn(`[SENTINEL HOOK] filterText exceeds ${MAX_TEXT_LENGTH}. Original length: ${questionText.length}`);
+        logger.warn(`[SENTINEL HOOK] filterText exceeds ${MAX_TEXT_LENGTH}. Original length: ${questionText.length}`);
     }
     return finalText;
 }
@@ -193,12 +194,12 @@ export function adjustContentLength(data, api, fields) {
         if (currentFieldValue && typeof currentFieldValue === 'string' && currentFieldValue.length > overSize) {
             // 从字段头部开始截断
             adjusted[fieldName] = currentFieldValue.substring(0, currentFieldValue.length - overSize);
-            api.logger.warn(`[SENTINEL HOOK] Field "${fieldName}" truncated by ${overSize} characters to fit ${MAX_TEXT_LENGTH} limit`);
+            logger.warn(`[SENTINEL HOOK] Field "${fieldName}" truncated by ${overSize} characters to fit ${MAX_TEXT_LENGTH} limit`);
         }
         else {
             // 字段太短，清空字段
             adjusted[fieldName] = '';
-            api.logger.warn(`[SENTINEL HOOK] Field "${fieldName}" cleared as it cannot fit within size limit`);
+            logger.warn(`[SENTINEL HOOK] Field "${fieldName}" cleared as it cannot fit within size limit`);
         }
         // 检查是否满足要求
         bodyStr = JSON.stringify(adjusted);
@@ -216,21 +217,20 @@ export function adjustContentLength(data, api, fields) {
 async function sendToolInputRequest(postText, api, sessionId) {
     const response = await callApi(postText, api, sessionId);
     const result = parseSecurityResult(response);
-    api.logger.info(`[SENTINEL HOOK] TOOL_INPUT response: status=${result.status}`);
+    logger.log(`[SENTINEL HOOK] TOOL_INPUT response: status=${result.status}`);
 }
 // 处理exec工具的TOOL_INPUT数据采集
 export async function handleExecToolInput(event, api, sessionId) {
     const command = extractInputParams(event, 'exec');
     if (!command) {
-        api.logger.info('[SENTINEL HOOK] No command found for exec tool');
+        logger.log('[SENTINEL HOOK] No command found for exec tool');
         return null;
     }
-    //api.logger.info(`[SENTINEL HOOK] Processing exec tool input, command length: ${command.length}`);
     // 解析命令提取文件路径
     const filePaths = extractFilePathsFromCommand(command);
     if (filePaths.length > 0) {
         // 场景1：执行代码文件
-        api.logger.info(`[SENTINEL HOOK] Found ${filePaths.length} file(s) in command`);
+        logger.log(`[SENTINEL HOOK] Found ${filePaths.length} file(s) in command`);
         const nonExistingFiles = [];
         for (const filePath of filePaths) {
             if (!fs.existsSync(filePath)) {
@@ -245,29 +245,29 @@ export async function handleExecToolInput(event, api, sessionId) {
                 source: command, content: fileContent };
             const adjustedData = adjustContentLength(toolInputData, api, ['content', 'source']);
             const postText = JSON.stringify(adjustedData);
-            api.logger.info(`[SENTINEL HOOK] Sending TOOL_INPUT for file: ${path.basename(filePath)}, body length: ${postText.length}`);
+            logger.log(`[SENTINEL HOOK] Sending TOOL_INPUT for file: ${path.basename(filePath)}, body length: ${postText.length}`);
             try {
                 await sendToolInputRequest(postText, api, sessionId);
             }
             catch (e) {
-                api.logger.error(`[SENTINEL HOOK] Sending TOOL_INPUT Failed: ${e}`);
+                logger.error(`[SENTINEL HOOK] Sending TOOL_INPUT Failed: ${e}`);
             }
         }
         // 输出不存在的文件列表
         if (nonExistingFiles.length > 0) {
             const fileNames = nonExistingFiles.map(f => path.basename(f)).join(', ');
-            api.logger.info(`[SENTINEL HOOK] Non-existing files: ${fileNames}`);
+            logger.log(`[SENTINEL HOOK] Non-existing files: ${fileNames}`);
         }
     }
     else {
         // 场景2：直接执行代码（heredoc场景）
-        api.logger.info('[SENTINEL HOOK] No code files found in command, treating as direct code execution');
+        logger.log('[SENTINEL HOOK] No code files found in command, treating as direct code execution');
         const commandHash = calculateContentHash(command);
         const commandSizeKB = Math.ceil(Buffer.byteLength(command, 'utf8') / 1024);
         const toolInputData = { ...TOOL_INPUT_DEFAULT, tool: 'exec', hash: commandHash, size: commandSizeKB, source: command };
         const adjustedData = adjustContentLength(toolInputData, api, ['source']);
         const postText = JSON.stringify(adjustedData);
-        api.logger.info(`[SENTINEL HOOK] Sending TOOL_INPUT for direct code execution, body length: ${postText.length}`);
+        logger.log(`[SENTINEL HOOK] Sending TOOL_INPUT for direct code execution, body length: ${postText.length}`);
         await sendToolInputRequest(postText, api, sessionId);
     }
 }
@@ -275,26 +275,26 @@ export async function handleExecToolInput(event, api, sessionId) {
 export async function handleMessageToolInput(event, api, sessionId) {
     const message = extractInputParams(event, 'message');
     if (!message) {
-        api.logger.info('[SENTINEL HOOK] No message found for message tool');
+        logger.log('[SENTINEL HOOK] No message found for message tool');
         return null;
     }
-    api.logger.info(`[SENTINEL HOOK] Processing message tool input, message length: ${message.length}`);
+    logger.log(`[SENTINEL HOOK] Processing message tool input, message length: ${message.length}`);
     const messageHash = calculateContentHash(message);
     const messageSizeKB = Math.ceil(Buffer.byteLength(message, 'utf8') / 1024);
     const toolInputData = { ...TOOL_INPUT_DEFAULT, tool: 'message', hash: messageHash, size: messageSizeKB, content: message };
     const adjustedData = adjustContentLength(toolInputData, api, ['content']);
     const postText = JSON.stringify(adjustedData);
-    api.logger.info(`[SENTINEL HOOK] Sending TOOL_INPUT for message, body length: ${postText.length}`);
+    logger.log(`[SENTINEL HOOK] Sending TOOL_INPUT for message, body length: ${postText.length}`);
     await sendToolInputRequest(postText, api, sessionId);
 }
 // 处理其他工具（非 exec 和非 message）的 TOOL_INPUT 数据采集
 export async function handleOtherToolInput(event, api, sessionId) {
     const params = event.params;
     if (!params) {
-        api.logger.info('[SENTINEL HOOK] No params found for tool');
+        logger.log('[SENTINEL HOOK] No params found for tool');
         return;
     }
-    api.logger.info(`[SENTINEL HOOK] Processing other tool input, toolName: ${event.toolName}`);
+    logger.log(`[SENTINEL HOOK] Processing other tool input, toolName: ${event.toolName}`);
     // 将 params 序列化为 JSON 字符串
     const paramsJson = JSON.stringify(params);
     const paramsHash = calculateContentHash(paramsJson);
@@ -304,6 +304,6 @@ export async function handleOtherToolInput(event, api, sessionId) {
     // 对 source 字段进行长度截断处理
     const adjustedData = adjustContentLength(toolInputData, api, ['content']);
     const postText = JSON.stringify(adjustedData);
-    api.logger.info(`[SENTINEL HOOK] Sending TOOL_INPUT for ${event.toolName}, body length: ${postText.length}`);
+    logger.log(`[SENTINEL HOOK] Sending TOOL_INPUT for ${event.toolName}, body length: ${postText.length}`);
     await sendToolInputRequest(postText, api, sessionId);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ynhcj/xiaoyi-channel",
-  "version": "0.0.140-next",
+  "version": "0.0.141-next",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",