rl-rockcli 0.0.7 → 0.0.8

package/index.js

@@ -22,8 +22,8 @@ const { hideBin } = require('yargs/helpers');
 
 // ⚠️ 关键：只引用 Core 命令，不引用 Internal
 // 这确保打包时不会包含内网代码
-const logCommand = require('./commands/log');  // 已支持 ROCKCLI_MODE 过滤
-const sandboxCommand = require('./commands/sandbox');  // 已支持 ROCKCLI_MODE 过滤
+const logCommand = require('../commands/log');  // 已支持 ROCKCLI_MODE 过滤
+const sandboxCommand = require('../commands/sandbox');  // 已支持 ROCKCLI_MODE 过滤
 
 // ASCII Art Logo
 const LOGO = `
@@ -47,12 +47,22 @@ function run() {
         .strict()
         .alias('h', 'help')
         .alias('v', 'version')
-        .version(require('./package.json').version)
+        .version(require('../opensource/package.json').version)
         .help()
-        .wrap(null);
+        .epilogue(`
+环境变量：
+  ROCKCLI_API_KEY     - API 密钥（用于认证）
+  ROCKCLI_BASE_URL    - 沙箱服务地址（默认: http://127.0.0.1:8080）
+  ROCKCLI_LOG_LEVEL   - 日志级别（debug/info/warn/error）
+
+文档: https://github.com/rock-cli/rockcli
+    `);
+
+    if (typeof cli.terminalWidth === 'function') {
+        cli.wrap(cli.terminalWidth());
+    }
 
     cli.parse();
 }
 
 run();
-

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rl-rockcli",
-    "version": "0.0.7",
+    "version": "0.0.8",
     "description": "Open-source ROCK CLI - Sandbox and Log management tool",
     "bin": {
         "rockcli": "./index.js"
@@ -46,4 +46,4 @@
         "registry": "https://registry.npmjs.org",
         "access": "public"
     }
-}
+}

package/commands/log/core/constants.js

@@ -1,237 +0,0 @@
-// 日志显示字段配置
-const DISPLAY_FIELDS = [
-    'timestamp',
-    'time',
-    'time_iso8601',
-    'ms',
-    'level',
-    'sandbox_id',
-    'trace_id',
-    'sent_http_request_id',
-    'request_id',
-    'callId',
-    'logger',
-    'thread',
-    'field',
-    'method',
-    'class',
-    'request_method',
-    'url',
-    'request_uri',
-    'host',
-    'status',
-    'status_code',
-    'process_time',
-    'request_time_usec',
-    'request_length',
-    'body_bytes_sent',
-    'upstream_response_tim',
-    'message',
-    'request',
-    "headers",
-    "http_Authorization",
-    "http_x_cluster",
-    "http_user_id",
-    "http_x_experiment_id",
-    "http_user_agent",
-    'request_body',
-    'response',
-    'filename',
-    'lineno',
-    'site',
-    'exc_info',
-    'exception',
-    'command_id',
-    'event',
-    'content',
-];
-
-// 字段颜色映射（ANSI 颜色代码）
-// 1. 内置字段（@ 开头）：灰色 - 系统元数据，通常不需要关注
-// 2. 一般情况不需要关注的字段：灰色 - 辅助信息，低价值
-// 3. 普通字段：青色 - 常规字段，有一定价值
-// 4. 重点字段：粗体青色 - 核心标识，最重要的字段
-const FIELD_COLOR_MAP = {
-    // 1. 内置字段（@ 开头）- 灰色
-    '@timestamp': '\x1b[0;90m',
-    '@source': '\x1b[0;90m',
-    '@app_group': '\x1b[0;90m',
-    '@hostname': '\x1b[0;90m',
-    '@filename': '\x1b[0;90m',
-    '@packId': '\x1b[0;90m',
-    '@logGroupOrder': '\x1b[0;90m',
-    '@topic': '\x1b[0;90m',
-    '@app_stage': '\x1b[0;90m',
-    '@site': '\x1b[0;90m',
-
-    // 2. 一般情况不需要关注的字段 - 灰色
-    'ms': '\x1b[0;90m',
-    'logger': '\x1b[0;90m',
-    'lineno': '\x1b[0;90m',
-    'site': '\x1b[0;90m',
-    'command_id': '\x1b[0;90m',
-    'sent_http_request_id': '\x1b[0;90m',
-
-    // 3. 普通字段 - 青色
-    'method': '\x1b[0;36m',
-    'request_method': '\x1b[0;36m',
-    'field': '\x1b[0;36m',
-    'url': '\x1b[0;36m',
-    'request_uri': '\x1b[0;36m',
-    'status_code': '\x1b[0;36m',
-    'process_time': '\x1b[0;36m',
-    'request': '\x1b[0;36m',
-    'request_body': '\x1b[0;36m',
-    'response': '\x1b[0;36m',
-    'filename': '\x1b[0;36m',
-    'event': '\x1b[0;36m',
-    'content': '\x1b[0;36m',
-    'sandbox_id': '\x1b[0;36m',
-    'trace_id': '\x1b[0;36m',
-
-    // 4. 重点字段 - 粗体青色
-    'timestamp': '\x1b[1;36m',
-    'time': '\x1b[1;36m',
-    'time_iso8601': '\x1b[1;36m',
-    'level': '\x1b[1;36m',
-    'message': '\x1b[1;36m',
-    'exc_info': '\x1b[1;31m',     // 异常信息 - 红色粗体
-    'exception': '\x1b[1;31m',    // 异常 - 红色粗体
-    'error': '\x1b[1;31m',        // 错误 - 红色粗体
-};
-
-// 默认字段颜色
-const DEFAULT_FIELD_COLOR = '\x1b[0;90m';
-
-// 字段黑名单（格式化模式下不显示）
-const BLACKLIST_FIELDS = [
-    'sent_http_X_App_Id',
-    'scheme',
-    'remote_user',
-    'http_x_opensearch_rem',
-    'http_x_opensearch_sec',
-    'sent_http_Application',
-    'http_Content_Md5',
-    'http_date',
-    'sent_http_X_App_Name',
-    'http_Authorization',
-    'http_x_opensearch_non',
-    'sent_http_X_Aliyun_Us',
-    'sent_http_X_AppGroup_',
-    'upstream_response_tim',
-];
-
-// 需要截断的字段
-const TRUNCATE_FIELDS = ['message', 'content', 'event'];
-
-// Group by field mapping
-const GROUP_BY_FIELDS = {
-    'file': '@filename',
-    'ip': '@source',
-    'app': '@app_group',
-    'hostname': '@hostname',
-    'cluster': '_cluster',
-};
-
-// Group by field display labels
-const GROUP_BY_LABELS = {
-    '@filename': 'File',
-    '@source': 'IP',
-    '@app_group': 'App',
-    '@hostname': 'Machine',
-    '_cluster': 'Cluster',
-};
-
-// ANSI 颜色代码
-const ANSI_COLORS = {
-    RESET: '\x1b[0m',
-    BOLD: '\x1b[1m',
-    CYAN: '\x1b[36m',
-    YELLOW: '\x1b[33m',
-    GREEN: '\x1b[32m',
-    MAGENTA: '\x1b[35m',
-    BLUE: '\x1b[34m',
-    RED: '\x1b[31m',
-    GRAY: '\x1b[90m',
-};
-
-// 查询时间范围（分钟）
-const TIME_RANGES = [15, 60, 180, 720, 1800, 43200];
-
-// 分页大小
-const PAGE_SIZE = 1000;
-
-// 日志文件名
-// 注意：内网专有日志路径已移到 config/internal_log_config.json
-const LOG_FILES = {
-    // 保留空对象，由具体命令从配置文件加载
-};
-
-
-// 字段补全列表（用于 -f 参数的自动补全）
-const FIELD_COMPLETION_LIST = [
-    // 系统内置字段（@ 开头）
-    '@filename',
-    '@source',
-    '@app_group',
-    '@hostname',
-    '@timestamp',
-    '@packId',
-    '@logGroupOrder',
-    '@topic',
-    '@app_stage',
-    '@site',
-
-    // 常规字段
-    'status',
-    'status_code',
-    'level',
-    'message',
-    'method',
-    'request_method',
-    'url',
-    'request_uri',
-    'host',
-    'sandbox_id',
-    'trace_id',
-    'thread',
-    'logger',
-    'field',
-    'process_time',
-    'request_time_usec',
-    'request_length',
-    'body_bytes_sent',
-    'request',
-    'headers',
-    'http_Authorization',
-    'http_x_cluster',
-    'http_user_id',
-    'http_x_experiment_id',
-    'http_user_agent',
-    'request_body',
-    'response',
-    'filename',
-    'lineno',
-    'site',
-    'exc_info',
-    'exception',
-    'command_id',
-    'event',
-    'content',
-    'error',
-];
-
-module.exports = {
-    DISPLAY_FIELDS,
-    FIELD_COLOR_MAP,
-    DEFAULT_FIELD_COLOR,
-    BLACKLIST_FIELDS,
-    TRUNCATE_FIELDS,
-    GROUP_BY_FIELDS,
-    GROUP_BY_LABELS,
-    ANSI_COLORS,
-    TIME_RANGES,
-    PAGE_SIZE,
-    LOG_FILES,
-    FIELD_COMPLETION_LIST,
-};

package/commands/log/core/display.js

@@ -1,370 +0,0 @@
-const { DISPLAY_FIELDS, FIELD_COLOR_MAP, DEFAULT_FIELD_COLOR, TRUNCATE_FIELDS, ANSI_COLORS, GROUP_BY_FIELDS } = require('./constants');
-const { isBlacklisted } = require('./utils');
-
-// 分组字段显示名称
-const GROUP_BY_LABELS = {
-    '@filename': 'File',
-    '@source': 'IP',
-    '@app_group': 'App',
-    '@hostname': 'Machine',
-    '_cluster': 'Cluster',
-};
-
-function highlightKeyword(text, keyword) {
-    if (!keyword || !text) return text;
-
-    const HIGHLIGHT_BG = '\x1b[43m';
-    const HIGHLIGHT_FG = '\x1b[30m';
-    const RESET = '\x1b[0m\x1b[49m';
-
-    const keywords = Array.isArray(keyword) ? keyword : [keyword];
-
-    let result = text;
-    keywords.forEach(kw => {
-        if (kw && typeof kw === 'string') {
-            const escapedKeyword = kw.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-            const regex = new RegExp(`(${escapedKeyword})`, 'gi');
-            result = result.replace(regex, `${HIGHLIGHT_BG}${HIGHLIGHT_FG}$1${RESET}`);
-        }
-    });
-
-    return result;
-}
-
-function highlightFieldName(fieldName, keyword, originalColor) {
-    if (!keyword || !fieldName) return originalColor + fieldName + '\x1b[0m';
-
-    const HIGHLIGHT_BG = '\x1b[43m';
-    const HIGHLIGHT_FG = '\x1b[30m';
-    const RESET = '\x1b[0m\x1b[49m';
-
-    const keywords = Array.isArray(keyword) ? keyword : [keyword];
-
-    const shouldHighlight = keywords.some(kw => kw && typeof kw === 'string' && fieldName === kw);
-
-    if (shouldHighlight) {
-        return `${HIGHLIGHT_BG}${HIGHLIGHT_FG}${fieldName}${RESET}`;
-    }
-
-    return originalColor + fieldName + '\x1b[0m';
-}
-
-function truncateValue(value, fieldName, truncate) {
-    if (truncate === 0) {
-        return value;
-    }
-
-    if (TRUNCATE_FIELDS.includes(fieldName)) {
-        const strValue = String(value);
-        if (strValue.length > truncate) {
-            return strValue.substring(0, truncate) + '...[truncated]';
-        }
-    }
-    return value;
-}
-
-function applyHighlightAndTruncate(value, fieldName, truncate, keyword, highlight) {
-    let strValue = typeof value === 'object' ? JSON.stringify(value) : String(value);
-
-    strValue = truncateValue(strValue, fieldName, truncate);
-
-    if (keyword && highlight) {
-        strValue = highlightKeyword(strValue, keyword);
-    }
-
-    return strValue;
-}
-
-function getFieldColor(fieldName, isTTY) {
-    if (!isTTY) return '';
-    return FIELD_COLOR_MAP[fieldName] || DEFAULT_FIELD_COLOR;
-}
-
-function formatLogEntry(log, raw, logFormat, columns, truncate, keyword, highlight) {
-    const isTTY = process.stdout.isTTY;
-    const RESET = ANSI_COLORS.RESET;
-
-    let columnFilter = null;
-    if (columns) {
-        columnFilter = columns.split(',').map(c => c.trim());
-    }
-
-    if (logFormat === 'json') {
-        const output = {};
-        Object.keys(log).forEach(key => {
-            if (key.startsWith('@')) return;
-            if (columnFilter && !columnFilter.includes(key)) return;
-            if (log[key] === null || log[key] === undefined) return;
-            output[key] = log[key];
-        });
-        console.log(JSON.stringify(output));
-        return;
-    }
-
-    if (logFormat === 'columns') {
-        const fieldsToDisplay = columnFilter || Object.keys(log).filter(k => !k.startsWith('@'));
-        fieldsToDisplay.forEach(key => {
-            if (log[key] === null || log[key] === undefined) return;
-            const color = getFieldColor(key, isTTY);
-            const value = applyHighlightAndTruncate(log[key], key, truncate, keyword, highlight);
-            const highlightedKey = highlightFieldName(key, keyword && highlight ? keyword : [], color);
-            console.log(`${highlightedKey}: ${value}`);
-        });
-        console.log('');
-        return;
-    }
-
-    let formattedFields = [];
-
-    if (raw) {
-        const atFields = Object.keys(log).filter(fieldName =>
-            fieldName.startsWith('@') &&
-            (!columnFilter || columnFilter.includes(fieldName)) &&
-            log[fieldName] !== null &&
-            log[fieldName] !== undefined
-        ).sort();
-
-        const displayFields = DISPLAY_FIELDS.filter(fieldName =>
-            !fieldName.startsWith('@') &&
-            log.hasOwnProperty(fieldName) &&
-            log[fieldName] !== null &&
-            log[fieldName] !== undefined &&
-            (!columnFilter || columnFilter.includes(fieldName))
-        );
-
-        const otherFields = Object.keys(log).filter(fieldName =>
-            !fieldName.startsWith('@') &&
-            !DISPLAY_FIELDS.includes(fieldName) &&
-            (!columnFilter || columnFilter.includes(fieldName)) &&
-            log[fieldName] !== null &&
-            log[fieldName] !== undefined
-        ).sort();
-
-        atFields.forEach(fieldName => {
-            const color = getFieldColor(fieldName, isTTY);
-            const value = applyHighlightAndTruncate(log[fieldName], fieldName, truncate, keyword, highlight);
-            const highlightedKey = highlightFieldName(fieldName, keyword && highlight ? keyword : [], color);
-
-            let formattedValue = value;
-            if (typeof value === 'string' && (value.includes(' ') || value.includes('"') || value.includes("'") || value.includes('=') || value.includes('\n') || value.includes('\r'))) {
-                formattedValue = `"${value.replace(/"/g, '\\\"').replace(/\n/g, '\\n').replace(/\r/g, '\\r')}"`;
-            }
-
-            formattedFields.push(`${highlightedKey}=${formattedValue}${RESET}`);
-        });
-
-        displayFields.forEach(fieldName => {
-            const color = getFieldColor(fieldName, isTTY);
-            const value = applyHighlightAndTruncate(log[fieldName], fieldName, truncate, keyword, highlight);
-            const highlightedKey = highlightFieldName(fieldName, keyword && highlight ? keyword : [], color);
-
-            let formattedValue = value;
-            if (typeof value === 'string' && (value.includes(' ') || value.includes('"') || value.includes("'") || value.includes('=') || value.includes('\n') || value.includes('\r'))) {
-                formattedValue = `"${value.replace(/"/g, '\\\"').replace(/\n/g, '\\n').replace(/\r/g, '\\r')}"`;
-            }
-
-            formattedFields.push(`${highlightedKey}=${formattedValue}${RESET}`);
-        });
-
-        otherFields.forEach(fieldName => {
-            const color = getFieldColor(fieldName, isTTY);
-            const value = applyHighlightAndTruncate(log[fieldName], fieldName, truncate, keyword, highlight);
-            const highlightedKey = highlightFieldName(fieldName, keyword && highlight ? keyword : [], color);
-
-            let formattedValue = value;
-            if (typeof value === 'string' && (value.includes(' ') || value.includes('"') || value.includes("'") || value.includes('=') || value.includes('\n') || value.includes('\r'))) {
-                formattedValue = `"${value.replace(/"/g, '\\\"').replace(/\n/g, '\\n').replace(/\r/g, '\\r')}"`;
-            }
-
-            formattedFields.push(`${highlightedKey}=${formattedValue}${RESET}`);
-        });
-    } else {
-        const fieldsToDisplay = columnFilter || DISPLAY_FIELDS;
-
-        fieldsToDisplay.forEach(fieldName => {
-            if (!log.hasOwnProperty(fieldName)) return;
-            if (!raw && isBlacklisted(fieldName)) return;
-            if (log[fieldName] === null || log[fieldName] === undefined) return;
-
-            const color = getFieldColor(fieldName, isTTY);
-            const value = applyHighlightAndTruncate(log[fieldName], fieldName, truncate, keyword, highlight);
-            const highlightedKey = highlightFieldName(fieldName, keyword && highlight ? keyword : [], color);
-
-            let formattedValue = value;
-            if (typeof value === 'string' && (value.includes(' ') || value.includes('"') || value.includes("'") || value.includes('=') || value.includes('\n') || value.includes('\r'))) {
-                formattedValue = `"${value.replace(/"/g, '\\\"').replace(/\n/g, '\\n').replace(/\r/g, '\\r')}"`;
-            }
-
-            formattedFields.push(`${highlightedKey}=${formattedValue}${RESET}`);
-        });
-    }
-
-    if (formattedFields.length > 0) {
-        console.log(formattedFields.join(' '));
-    }
-}
-
-function displayLogsWithContext(logs, raw, logFormat, multilines, columns, truncate, keyword, highlight, showContextSeparators, groupByFields = null) {
-    if (!logs || logs.length === 0) {
-        return;
-    }
-
-    if (!showContextSeparators) {
-        displayLogs(logs, raw, logFormat, multilines, columns, truncate, keyword, highlight, groupByFields);
-        return;
-    }
-
-    const isTTY = process.stdout.isTTY;
-    const CONTEXT_SEPARATOR = isTTY ? '\x1b[90m--\x1b[0m' : '--';
-
-    const { areLogsConsecutive } = require('./utils');
-    let previousLog = null;
-    const logsToDisplay = [];
-
-    logs.forEach((log) => {
-        if (previousLog !== null && !areLogsConsecutive(previousLog, log)) {
-            logsToDisplay.push({ _isSeparator: true });
-        }
-        logsToDisplay.push(log);
-        previousLog = log;
-    });
-
-    logsToDisplay.forEach((item) => {
-        if (item._isSeparator) {
-            console.log(CONTEXT_SEPARATOR);
-        } else {
-            formatLogEntry(item, raw, logFormat, columns, truncate, keyword, highlight);
-        }
-    });
-}
-
-function displayLogs(logs, raw, logFormat, multilines, columns, truncate, keyword, highlight, groupByFields = null) {
-    if (!logs || logs.length === 0) {
-        return;
-    }
-
-    const isTTY = process.stdout.isTTY;
-    const RESET = ANSI_COLORS.RESET;
-
-    let columnFilter = null;
-    if (columns) {
-        columnFilter = columns.split(',').map(c => c.trim());
-    }
-
-    const resolvedGroupByFields = groupByFields
-        ? groupByFields.map(field => GROUP_BY_FIELDS[field] || field)
-        : [];
-
-    let sortedLogs = logs;
-    if (resolvedGroupByFields.length > 0) {
-        sortedLogs = [...logs].sort((a, b) => {
-            for (const field of resolvedGroupByFields) {
-                const valA = a[field] || 'unknown';
-                const valB = b[field] || 'unknown';
-                if (valA !== valB) {
-                    return String(valA).localeCompare(String(valB));
-                }
-            }
-            const timeA = parseInt(a['@timestamp']) || 0;
-            const timeB = parseInt(b['@timestamp']) || 0;
-            return timeA - timeB;
-        });
-    }
-
-    let previousGroupValues = resolvedGroupByFields.map(() => null);
-
-    sortedLogs.forEach((log, index) => {
-        const currentGroupValues = resolvedGroupByFields.map(field => log[field] || 'unknown');
-
-        if (resolvedGroupByFields.length > 0) {
-            const isFirstLog = index === 0;
-            const hasChanged = !isFirstLog && currentGroupValues.some((value, i) => value !== previousGroupValues[i]);
-
-            if (hasChanged || isFirstLog) {
-                if (!isFirstLog) {
-                    console.log('');
-                    if (isTTY) {
-                        console.log('\x1b[90m' + '─'.repeat(80) + '\x1b[0m');
-                    } else {
-                        console.log('─'.repeat(80));
-                    }
-                }
-
-                resolvedGroupByFields.forEach((field, i) => {
-                    if (isFirstLog || currentGroupValues[i] !== previousGroupValues[i]) {
-                        const label = GROUP_BY_LABELS[field] || field;
-                        const value = currentGroupValues[i];
-                        if (isTTY) {
-                            console.log('\x1b[36;1m' + `📦 ${label}: ${value}` + '\x1b[0m');
-                        } else {
-                            console.log(`${label}: ${value}`);
-                        }
-                    }
-                });
-            }
-        }
-
-        if (multilines && logFormat !== 'columns') {
-            let fieldsToDisplay;
-
-            if (raw) {
-                if (columnFilter) {
-                    fieldsToDisplay = columnFilter;
-                } else {
-                    const atFields = Object.keys(log).filter(fieldName =>
-                        fieldName.startsWith('@') &&
-                        log[fieldName] !== null &&
-                        log[fieldName] !== undefined
-                    ).sort();
-
-                    const displayFields = DISPLAY_FIELDS.filter(fieldName =>
-                        !fieldName.startsWith('@') &&
-                        log.hasOwnProperty(fieldName) &&
-                        log[fieldName] !== null &&
-                        log[fieldName] !== undefined
-                    );
-
-                    const otherFields = Object.keys(log).filter(fieldName =>
-                        !fieldName.startsWith('@') &&
-                        !DISPLAY_FIELDS.includes(fieldName) &&
-                        log[fieldName] !== null &&
-                        log[fieldName] !== undefined
-                    ).sort();
-
-                    fieldsToDisplay = [...atFields, ...displayFields, ...otherFields];
-                }
-            } else {
-                fieldsToDisplay = columnFilter || Object.keys(log).filter(k => !k.startsWith('@'));
-            }
-
-            fieldsToDisplay.forEach(fieldName => {
-                if (!log.hasOwnProperty(fieldName)) return;
-                if (!raw && isBlacklisted(fieldName)) return;
-                if (log[fieldName] === null || log[fieldName] === undefined) return;
-
-                const color = getFieldColor(fieldName, isTTY);
-                const value = applyHighlightAndTruncate(log[fieldName], fieldName, truncate, keyword, highlight);
-                const highlightedKey = highlightFieldName(fieldName, keyword && highlight ? keyword : [], color);
-
-                console.log(`${highlightedKey}=${value}${RESET}`);
-            });
-
-            console.log('\x1b[90m' + '='.repeat(80) + '\x1b[0m');
-        } else {
-            formatLogEntry(log, raw, logFormat, columns, truncate, keyword, highlight);
-        }
-
-        previousGroupValues = currentGroupValues;
-    });
-}
-
-module.exports = {
-    highlightKeyword,
-    highlightFieldName,
-    truncateValue,
-    applyHighlightAndTruncate,
-    getFieldColor,
-    formatLogEntry,
-    displayLogsWithContext,
-    displayLogs,
-};