lightclawbot 1.1.2 → 1.2.0-beta.1

package/dist/src/config.js

@@ -6,24 +6,27 @@
  *
  * 配置示例 (~/.openclaw/openclaw.json):
  * ```json
-"channels": {
-    "lightclawbot": {
-      "apiKeys": ["key-1", "key-2"],
-      "enabled": true
-    }
-}
+ * "channels": {
+ *     "lightclawbot": {
+ *       "enabled": true,
+ *       "accounts": {
+ *         "100013456706": { "apiKey": "key-1" },
+ *         "100013456707": { "apiKey": "key-2" }
+ *       }
+ *     }
+ * }
  * ```
+ *
+ * @format
  */
-export const CHANNEL_KEY = "lightclawbot";
-export const DEFAULT_ACCOUNT_ID = "default";
-// 环境变量 key
-const ENV_API_KEY = "LIGHTCLAW_API_KEY";
-const ENV_API_BASE_URL = "LIGHTCLAW_API_BASE_URL";
+export const CHANNEL_KEY = 'lightclawbot';
+export const DEFAULT_ACCOUNT_ID = 'default';
+export const DEFAULT_AGENT_ID = 'main';
 // ============================================================
 // 域名 & URL 配置
 // ============================================================
 /** 核心服务域名 */
-export const DOMAIN = "lightai.cloud.tencent.com";
+export const DOMAIN = 'lightai.cloud.tencent.com';
 /** WebSocket 连接地址 */
 export const WS_URL = `wss://${DOMAIN}`;
 /** HTTP API 基础地址 */
@@ -31,11 +34,11 @@ export const API_BASE_URL = `https://${DOMAIN}`;
 /** 文件存储相关配置 */
 export const COS_BASE_URL = `https://${DOMAIN}`;
 // ============================================================
-// Socket.IO 配置
+// WebSocket 配置
 // ============================================================
-/** Socket.IO 连接路径 */
-export const SOCKET_PATH = "/claw-socket";
-/** Socket.IO 重连策略 */
+/** WebSocket 连接路径 */
+export const SOCKET_PATH = '/ws/agent';
+/** WebSocket 重连策略 */
 export const SOCKET_RECONNECTION_DELAY = 1000;
 export const SOCKET_RECONNECTION_DELAY_MAX = 30000;
 export const SOCKET_RECONNECTION_ATTEMPTS = Infinity;
@@ -43,27 +46,13 @@ export const SOCKET_RECONNECTION_ATTEMPTS = Infinity;
 // HTTP Header 配置
 // ============================================================
 /** 产品标识 header 值，用于 x-product header */
-export const X_PRODUCT = "channel";
-/** 构建通用认证 headers */
-export function buildAuthHeaders(apiKey) {
-    return {
-        authorization: `Bearer ${apiKey}`,
-        "x-product": X_PRODUCT,
-    };
-}
-/** WS 多 key 认证 headers（authorizations 为 JSON 数组字符串，不带 Bearer） */
-export function buildMultiAuthHeaders(apiKeys) {
-    return {
-        authorizations: apiKeys.map(key => `Bearer ${key}`),
-        "x-product": X_PRODUCT,
-    };
-}
+export const X_PRODUCT = 'channel';
 // ============================================================
 // 全局 uin → apiKey 映射管理
 // ============================================================
 /** 全局 uin→apiKey 映射（gateway 启动时构建，工具执行时读取） */
 let globalApiKeyMap = new Map();
-let globalDefaultApiKey = "";
+let globalDefaultApiKey = '';
 /** sessionKey → apiKey 直接映射（inbound 处理时写入，tool 执行时读取） */
 const sessionKeyToApiKey = new Map();
 /** 设置 apiKeyMap（gateway 启动时调用） */
@@ -127,11 +116,11 @@ export function extractUinFromSessionKey(sessionKey) {
         return undefined;
     const lower = sessionKey.toLowerCase();
     // 新格式：查找 ":direct:<peerId>" 片段
-    const directIdx = lower.indexOf(":direct:");
+    const directIdx = lower.indexOf(':direct:');
     if (directIdx >= 0) {
-        const afterDirect = sessionKey.slice(directIdx + ":direct:".length);
+        const afterDirect = sessionKey.slice(directIdx + ':direct:'.length);
         // peerId 可能后面还跟着 ":thread:xxx" 等后缀，取第一段
-        const peerId = afterDirect.split(":")[0];
+        const peerId = afterDirect.split(':')[0];
         return peerId || undefined;
     }
     // 旧格式兼容：lightclawbot:dm:<peerId>
@@ -145,38 +134,25 @@ export function extractUinFromSessionKey(sessionKey) {
 // API 路径配置
 // ============================================================
 /** 获取当前用户信息（用于提取 botId） */
-export const API_PATH_USER_CURRENT = "/user/current";
+export const API_PATH_USER_CURRENT = '/cgi/ticket';
 /** 文件上传接口 */
-export const API_PATH_UPLOAD = "/drive/save";
+export const API_PATH_UPLOAD = '/drive/save';
 /** 文件下载接口 */
-export const API_PATH_DOWNLOAD = "/drive/preview";
+export const API_PATH_DOWNLOAD = '/drive/preview';
 // ============================================================
-// Socket.IO 事件名
+// WebSocket 事件名
 // ============================================================
-export const EVENT_MESSAGE_PRIVATE = "message:private";
-export const EVENT_HISTORY_REQUEST = "message:history:request";
-export const EVENT_HISTORY_RESPONSE = "message:history:response";
-export const EVENT_SESSIONS_REQUEST = "sessions:request";
-export const EVENT_SESSIONS_RESPONSE = "sessions:response";
+export const EVENT_MESSAGE_PRIVATE = 'message:private';
+export const EVENT_HISTORY_REQUEST = 'message:history:request';
+export const EVENT_HISTORY_RESPONSE = 'message:history:response';
 // ============================================================
 // 超时 & 限制配置
 // ============================================================
-/** AI 回复超时时间（ms） */
-export const REPLY_TIMEOUT = 120_000;
 /** 文件上传超时时间（ms） */
 export const UPLOAD_TIMEOUT = 120_000;
 /** 媒体文件最大字节数（100MB） */
 export const MEDIA_MAX_BYTES = 100 * 1024 * 1024;
 // ============================================================
-// 消息队列配置
-// ============================================================
-/** 消息队列最大容量 */
-export const MESSAGE_QUEUE_SIZE = 1000;
-/** 队列警告阈值 */
-export const MESSAGE_QUEUE_WARN_THRESHOLD = 800;
-/** 队列轮询间隔（ms） */
-export const QUEUE_POLL_INTERVAL = 200;
-// ============================================================
 // 去重 & 节流配置
 // ============================================================
 /** 消息去重 TTL（ms） */
@@ -211,74 +187,6 @@ export const EMIT_RETRY_BASE_DELAY = 2_000;
 export const EMIT_RETRY_MAX_DELAY = 15_000;
 /** 最大待确认消息数，超出时丢弃最早的 */
 export const EMIT_PENDING_MAX = 500;
-/** 获取 channel 配置段 */
-function getChannelSection(cfg) {
-    return (cfg.channels?.[CHANNEL_KEY] ?? {});
-}
-/** 列出所有账户 ID */
-export function listAccountIds(cfg) {
-    const section = getChannelSection(cfg);
-    if (!section)
-        return [];
-    const ids = [];
-    // 默认账户：顶层有 apiKeys 即视为存在
-    const keys = section.apiKeys;
-    if (Array.isArray(keys) && keys.length > 0) {
-        ids.push(DEFAULT_ACCOUNT_ID);
-    }
-    // 命名账户
-    const accounts = section.accounts;
-    if (accounts && typeof accounts === "object") {
-        ids.push(...Object.keys(accounts));
-    }
-    return ids;
-}
-/** 解析单个账户 */
-export function resolveAccount(cfg, accountId) {
-    const section = getChannelSection(cfg);
-    const id = accountId?.trim() || DEFAULT_ACCOUNT_ID;
-    // 获取原始配置
-    let raw;
-    if (id === DEFAULT_ACCOUNT_ID) {
-        raw = section;
-    }
-    else {
-        const accounts = section.accounts;
-        raw = accounts?.[id] ?? {};
-    }
-    // 解析 apiKeys（配置中只有 apiKeys，不会有 apiKey）
-    const allApiKeys = Array.isArray(raw.apiKeys) ? raw.apiKeys.filter(Boolean) : [];
-    // 主 key = apiKeys[0]，环境变量作为兜底
-    const apiKey = allApiKeys[0] || process.env[ENV_API_KEY] || "";
-    const apiBaseUrl = raw.apiBaseUrl || process.env[ENV_API_BASE_URL] || "";
-    // 如果环境变量提供了 key 且 allApiKeys 为空，补入
-    if (!allApiKeys.length && apiKey) {
-        allApiKeys.push(apiKey);
-    }
-    let secretSource = "none";
-    if (allApiKeys.length > 0) {
-        secretSource = "config";
-    }
-    else if (process.env[ENV_API_KEY]) {
-        secretSource = "env";
-    }
-    return {
-        accountId: id,
-        apiKey,
-        allApiKeys,
-        apiBaseUrl,
-        enabled: raw.enabled ?? true,
-        name: raw.name,
-        dmPolicy: raw.dmPolicy ?? "open",
-        allowFrom: raw.allowFrom ?? ["*"],
-        systemPrompt: raw.systemPrompt,
-        secretSource,
-    };
-}
-/** 获取默认账户 ID */
-export function defaultAccountId(_cfg) {
-    return DEFAULT_ACCOUNT_ID;
-}
 /** 应用账户配置（setup 命令使用） */
 export function applyAccountConfig(cfg, accountId, updates) {
     const nextCfg = { ...cfg };
@@ -296,4 +204,3 @@ export function applyAccountConfig(cfg, accountId, updates) {
     nextCfg.channels = nextChannels;
     return nextCfg;
 }
-//# sourceMappingURL=config.js.map

package/dist/src/dedup.js

@@ -61,4 +61,3 @@ export function generateMsgId() {
     const seq = (msgCounter++).toString(36);
     return `${ts}-${rand}-${seq}`;
 }
-//# sourceMappingURL=dedup.js.map

package/dist/src/download-tool.js

@@ -141,4 +141,3 @@ export function registerDownloadTool(api) {
         };
     }, { name: DOWNLOAD_TOOL_NAME });
 }
-//# sourceMappingURL=download-tool.js.map

package/dist/src/file-storage.js

@@ -10,7 +10,8 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { guessMimeByExt } from "./media.js";
-import { COS_BASE_URL, API_PATH_UPLOAD, API_PATH_DOWNLOAD, UPLOAD_TIMEOUT, buildAuthHeaders, } from "./config.js";
+import { COS_BASE_URL, API_PATH_UPLOAD, API_PATH_DOWNLOAD, UPLOAD_TIMEOUT, } from "./config.js";
+import { buildAuthHeaders } from './utils/index.js';
 // ============================================================
 // 核心方法
 // ============================================================
@@ -156,4 +157,3 @@ export async function uploadAndGetPublicUrl(localPath, config = {}) {
     const result = await uploadFileToCos(localPath, config);
     return result.url || '';
 }
-//# sourceMappingURL=file-storage.js.map