@cuebot/skill 1.0.5 → 1.0.6

package/src/utils/envAdapter.js

@@ -0,0 +1,233 @@
+/**
+ * 环境适配层
+ * 自动检测运行环境，选择最佳适配器
+ */
+
+import { execSync } from 'child_process';
+import { createLogger } from '../core/logger.js';
+
+const logger = createLogger('EnvAdapter');
+
+let cachedEnv = null;
+
+/**
+ * 检测运行环境
+ * @returns {'openclaw' | 'standalone'}
+ */
+export function detectEnv() {
+  if (cachedEnv) return cachedEnv;
+  
+  try {
+    // 尝试执行 openclaw 命令
+    execSync('openclaw --version', { stdio: 'ignore' });
+    cachedEnv = 'openclaw';
+    logger.info('Detected environment: OpenClaw Gateway');
+  } catch (e) {
+    cachedEnv = 'standalone';
+    logger.info('Detected environment: Standalone');
+  }
+  
+  return cachedEnv;
+}
+
+/**
+ * 是否在 OpenClaw 环境中
+ * @returns {boolean}
+ */
+export function isOpenClaw() {
+  return detectEnv() === 'openclaw';
+}
+
+/**
+ * 是否在独立环境中
+ * @returns {boolean}
+ */
+export function isStandalone() {
+  return detectEnv() === 'standalone';
+}
+
+/**
+ * 获取通知适配器
+ * @returns {Object}
+ */
+export function getNotifier() {
+  const env = detectEnv();
+  
+  if (env === 'openclaw') {
+    return {
+      name: 'OpenClaw',
+      send: openclawNotify,
+      sendToUser: openclawSendToUser
+    };
+  }
+  
+  return {
+    name: 'Standalone',
+    send: standaloneNotify,
+    sendToUser: standaloneNotify
+  };
+}
+
+/**
+ * OpenClaw 通知 - 通过 Hook
+ * @param {Object} options
+ */
+async function openclawNotify(options) {
+  const { title, message, chatId } = options;
+  
+  // 使用 openclaw message 命令发送
+  try {
+    const cmd = chatId 
+      ? `openclaw message send --to "${chatId}" --message "${title}\n\n${message}"`
+      : `openclaw message broadcast --message "${title}\n\n${message}"`;
+    
+    execSync(cmd, { stdio: 'ignore' });
+    logger.info(`Notification sent via OpenClaw: ${title}`);
+    return true;
+  } catch (error) {
+    logger.error('OpenClaw notification failed:', error.message);
+    return false;
+  }
+}
+
+/**
+ * OpenClaw 发送消息给用户
+ */
+async function openclawSendToUser(chatId, message) {
+  try {
+    const cmd = `openclaw message send --to "${chatId}" --message "${message}"`;
+    execSync(cmd, { stdio: 'ignore' });
+    return true;
+  } catch (error) {
+    logger.error('Send to user failed:', error.message);
+    return false;
+  }
+}
+
+/**
+ * 独立环境通知 - Webhook 或 CLI
+ */
+async function standaloneNotify(options) {
+  const { title, message, webhookUrl } = options;
+  
+  // 优先使用 Webhook
+  if (webhookUrl) {
+    try {
+      await fetch(webhookUrl, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ title, message })
+      });
+      return true;
+    } catch (error) {
+      logger.error('Webhook notification failed:', error.message);
+    }
+  }
+  
+  // 降级到 stdout
+  console.log(`[NOTIFY] ${title}: ${message}`);
+  return true;
+}
+
+/**
+ * 获取调度适配器
+ * @returns {Object}
+ */
+export function getScheduler() {
+  const env = detectEnv();
+  
+  if (env === 'openclaw') {
+    return {
+      name: 'OpenClaw Cron',
+      register: registerOpenClawCron,
+      unregister: unregisterOpenClawCron,
+      list: listOpenClawCron
+    };
+  }
+  
+  return {
+    name: 'Node Cron',
+    register: registerNodeCron,
+    unregister: unregisterNodeCron,
+    list: () => []
+  };
+}
+
+// ============ OpenClaw Cron 实现 ============
+
+/**
+ * 注册 OpenClaw Cron 任务
+ */
+async function registerOpenClawCron(options) {
+  const { name, message, cron, chatId } = options;
+  
+  try {
+    // 先检查是否存在
+    const tasks = listOpenClawCron();
+    if (tasks.some(t => t.name === name)) {
+      logger.info(`Cron task already exists: ${name}`);
+      return true;
+    }
+    
+    const cmd = [
+      'openclaw cron add',
+      `--name "${name}"`,
+      `--message "${message}"`,
+      `--cron "${cron}"`,
+      '--channel ${process.env.OPENCLAW_CHANNEL || \'feishu\'}',
+      `--to "${chatId}"`,
+      '--announce'
+    ].join(' ');
+    
+    execSync(cmd, { stdio: 'inherit' });
+    logger.info(`Registered cron task: ${name}`);
+    return true;
+  } catch (error) {
+    logger.error('Failed to register cron task:', error.message);
+    return false;
+  }
+}
+
+/**
+ * 注销 OpenClaw Cron 任务
+ */
+async function unregisterOpenClawCron(name) {
+  try {
+    execSync(`openclaw cron rm "${name}"`, { stdio: 'ignore' });
+    logger.info(`Unregistered cron task: ${name}`);
+    return true;
+  } catch (error) {
+    logger.warn('Failed to unregister cron task:', error.message);
+    return false;
+  }
+}
+
+/**
+ * 列出 OpenClaw Cron 任务
+ */
+function listOpenClawCron() {
+  try {
+    const output = execSync('openclaw cron list --json', { encoding: 'utf-8' });
+    return JSON.parse(output || '[]');
+  } catch (e) {
+    return [];
+  }
+}
+
+// ============ Node Cron 占位实现 ============
+
+/**
+ * Node Cron 注册（需要外部实现）
+ */
+async function registerNodeCron(options) {
+  logger.warn('Node Cron registration not implemented in envAdapter');
+  return false;
+}
+
+/**
+ * Node Cron 注销
+ */
+async function unregisterNodeCron(name) {
+  logger.warn('Node Cron unregistration not implemented in envAdapter');
+  return false;
+}

package/src/utils/envUtils.js

@@ -1,17 +1,23 @@
 /**
- * 环境变量工具 - 安全版本 v1.0.4
- * 仅使用 ~/.cuecue 目录，不写入共享配置文件
+ * 环境变量工具 - 安全版本 v1.0.6
+ * 用户工作区存储：/root/.openclaw/workspaces/{channel}-{user_id}/.cuecue
  */
 
 import fs from 'fs-extra';
 import path from 'path';
-import { homedir } from 'os';
 import { createLogger } from '../core/logger.js';
 
 const logger = createLogger('EnvUtils');
 
-// ✅ 安全修复：仅使用技能自己的目录
-const CUECUE_DIR = path.join(homedir(), '.cuecue');
+// ✅ 通用化：支持任意 channel
+function getUserWorkspaceDir(chatId) {
+  const workspaceBase = process.env.OPENCLAW_WORKSPACE || '/root/.openclaw/workspaces';
+  const channel = process.env.OPENCLAW_CHANNEL || 'feishu';
+  return path.join(workspaceBase, `${channel}-${chatId}`, '.cuecue');
+}
+
+const chatId = process.env.CHAT_ID || process.env.FEISHU_CHAT_ID || 'default';
+const CUECUE_DIR = getUserWorkspaceDir(chatId);
 const SECURE_ENV_FILE = path.join(CUECUE_DIR, '.env.secure');
 
 /**
@@ -65,7 +71,7 @@ export async function saveEnvFile(env) {
   // ✅ 安全修复：确保目录存在并设置权限
   await ensureSecureDir(CUECUE_DIR, 0o700);
   
-  const lines = ['# Cue v1.0.4 - Secure Environment Variables', '# DO NOT SHARE THIS FILE'];
+  const lines = ['# Cue v1.0.6 - Secure Environment Variables', '# DO NOT SHARE THIS FILE'];
   for (const [key, value] of env) {
     lines.push(`export ${key}="${value}"`);
   }
@@ -81,6 +87,26 @@ export async function saveEnvFile(env) {
   }
 }
 
+/**
+ * 从用户配置文件获取 API Key
+ * @param {string} userId - 用户 ID
+ * @returns {Promise<string|null>}
+ */
+async function getUserApiKey(userId) {
+  if (!userId) return null;
+  
+  const userConfigPath = path.join(CUECUE_DIR, 'config.json');
+  try {
+    if (await fs.pathExists(userConfigPath)) {
+      const config = await fs.readJson(userConfigPath);
+      return config.api_key || config.apiKey || null;
+    }
+  } catch (error) {
+    // 忽略错误
+  }
+  return null;
+}
+
 /**
  * 获取 API Key
  * 优先从环境变量读取，其次从安全文件读取
@@ -88,12 +114,32 @@ export async function saveEnvFile(env) {
  * @returns {Promise<string|null>}
  */
 export async function getApiKey(keyName) {
-  // 1. 首先检查 process.env (由 OpenClaw 注入)
-  if (process.env[keyName]) {
-    return process.env[keyName];
+  // 1. 首先检查用户自己的 Key (隔离存储)
+  const currentChatId = process.env.CHAT_ID || process.env.FEISHU_CHAT_ID;
+  if (currentChatId && currentChatId.startsWith('ou_')) {
+    const userApiKey = await getUserApiKey(currentChatId);
+    if (userApiKey) {
+      return userApiKey;
+    }
+  }
+  
+  // 2. 尝试通过 OpenClaw Secrets 获取系统 Key
+  // 如果在 OpenClaw 环境中，Secrets 会被注入到 process.env
+  // 但以脱敏形式，不会暴露原始值
+  try {
+    const { execSync } = await import('child_process');
+    const result = execSync(`openclaw secrets get ${keyName}`, {
+      encoding: 'utf-8',
+      timeout: 5000
+    }).trim();
+    if (result && result !== 'not found') {
+      return result;
+    }
+  } catch (e) {
+    // Secrets 未配置，忽略
   }
   
-  // 2. 然后检查技能自己的安全文件
+  // 3. 最后检查用户配置文件
   const env = await loadEnvFile();
   return env.get(keyName) || null;
 }
@@ -108,7 +154,7 @@ export async function setApiKey(keyName, value) {
   // 更新当前进程环境变量
   process.env[keyName] = value;
   
-  // ✅ 安全修复：仅保存到 ~/.cuecue/.env.secure
+  // ✅ 安全修复：仅保存到用户工作区
   const env = await loadEnvFile();
   env.set(keyName, value);
   await saveEnvFile(env);

package/src/utils/fileUtils.js

@@ -5,9 +5,16 @@
 
 import fs from 'fs-extra';
 import path from 'path';
-import { homedir } from 'os';
 
-const CUECUE_DIR = path.join(homedir(), '.cuecue');
+// ✅ 通用化：支持任意 channel
+function getUserWorkspaceDir(chatId) {
+  // OpenClaw 用户工作区: /root/.openclaw/workspaces/{channel}-{user_id}/
+  const workspaceBase = process.env.OPENCLAW_WORKSPACE || '/root/.openclaw/workspaces';
+  const channel = process.env.OPENCLAW_CHANNEL || 'feishu';
+  return path.join(workspaceBase, `${channel}-${chatId}`, '.cuecue');
+}
+
+const CUECUE_DIR = getUserWorkspaceDir(process.env.CHAT_ID || 'default');
 
 /**
  * 确保目录存在
@@ -49,7 +56,7 @@ export async function writeJson(filePath, data) {
  * @returns {string} 用户目录路径
  */
 export function getUserDir(chatId) {
-  return path.join(CUECUE_DIR, 'users', chatId);
+  return path.join(CUECUE_DIR);
 }
 
 /**