@cvtoolman/huawei-lts-cli 2.0.0 → 2.1.1

package/dist/cli/index.js

@@ -65,25 +65,25 @@ program
     .name('lts-cli')
     .description('Huawei Cloud LTS (Log Tank Service) CLI — query logs from the terminal')
     .version(readVersion())
-    .addHelpText('after', `
-Examples:
-  $ lts-cli init                     Setup credentials interactively
-  $ lts-cli init --from-url <url>    Import region/groupId/streamId from a console URL
-  $ lts-cli config --list            Show current configuration
-  $ lts-cli groups                   List log groups
-  $ lts-cli streams                  List log streams in a group
-  $ lts-cli fields                   Show the index config of a log stream
-  $ lts-cli query --last 2h -q 'level:error' --all
-  $ lts-cli trace <requestId>        Fetch the full request chain
-
-Environment variables:
-  LTS_AK           Access Key
-  LTS_SK           Secret Key
-  LTS_PROJECT_ID   Project ID
-  LTS_REGION       Region
-  LTS_ENDPOINT     Service endpoint
-  LTS_GROUP_ID     Default log group ID
-  LTS_STREAM_ID    Default log stream ID
+    .addHelpText('after', `
+Examples:
+  $ lts-cli init                     Setup credentials interactively
+  $ lts-cli init --from-url <url>    Import region/groupId/streamId from a console URL
+  $ lts-cli config --list            Show current configuration
+  $ lts-cli groups                   List log groups
+  $ lts-cli streams                  List log streams in a group
+  $ lts-cli fields                   Show the index config of a log stream
+  $ lts-cli query --last 2h -q 'level:error' --all
+  $ lts-cli trace <requestId>        Fetch the full request chain
+
+Environment variables:
+  LTS_AK           Access Key
+  LTS_SK           Secret Key
+  LTS_PROJECT_ID   Project ID
+  LTS_REGION       Region
+  LTS_ENDPOINT     Service endpoint
+  LTS_GROUP_ID     Default log group ID
+  LTS_STREAM_ID    Default log stream ID
 `);
 program.addCommand((0, init_1.createInitCommand)());
 program.addCommand((0, query_1.createQueryCommand)());
@@ -99,6 +99,7 @@ program.addCommand((0, config_1.createConfigCommand)());
  */
 const QUERY_OPTS = '-g --group-id -s --stream-id --start-time --end-time --st --et --last -q --query --app --content --request-id -l --limit -r --reverse -f --format --all';
 const TRACE_OPTS = '-g --group-id -s --stream-id --field --last --start-time --end-time --st --et -l --limit -f --format';
+const CONTEXT_OPTS = '-g --group-id -s --stream-id --line-num --time --before --after -f --format';
 const VALUE_OPTS = '-g --group-id -s --stream-id -f --format';
 // Shell completion support
 const completionCmd = new commander_1.Command('completion')
@@ -107,179 +108,200 @@ const completionCmd = new commander_1.Command('completion')
     .action((shell) => {
     switch (shell) {
         case 'bash':
-            console.log(`# lts-cli bash completion — add to ~/.bashrc or ~/.bash_profile
-_lts_cli_completion() {
-  local words cword
-  _get_comp_words_by_ref -n : words cword
-  local cur="\${words[cword]}"
-
-  if (( cword == 1 )); then
-    COMPREPLY=( $(compgen -W "query trace context groups streams fields config init completion" -- "\$cur") )
-    return
-  fi
-
-  local cmd="\${words[1]}"
-  case "\$cmd" in
-    query)
-      case "\$prev" in
-        -g|--group-id|-s|--stream-id|-q|--query|--app|--content|--request-id|-l|--limit|-f|--format)
-          COMPREPLY=()
-          return
-          ;;
-        *)
-          COMPREPLY=( $(compgen -W "${QUERY_OPTS}" -- "\$cur") )
-          return
-          ;;
-      esac
-      ;;
-    trace)
-      case "\$prev" in
-        -g|--group-id|-s|--stream-id|--field|--last|-l|--limit|-f|--format)
-          COMPREPLY=()
-          return
-          ;;
-        *)
-          COMPREPLY=( $(compgen -W "${TRACE_OPTS}" -- "\$cur") )
-          return
-          ;;
-      esac
-      ;;
-    fields)
-      COMPREPLY=( $(compgen -W "${VALUE_OPTS}" -- "\$cur") )
-      return
-      ;;
-    config)
-      COMPREPLY=( $(compgen -W "--set --get --list --unset" -- "\$cur") )
-      return
-      ;;
-    completion)
-      COMPREPLY=( $(compgen -W "bash zsh powershell" -- "\$cur") )
-      return
-      ;;
-    *)
-      COMPREPLY=()
-      return
-      ;;
-  esac
-}
+            console.log(`# lts-cli bash completion — add to ~/.bashrc or ~/.bash_profile
+_lts_cli_completion() {
+  local words cword
+  _get_comp_words_by_ref -n : words cword
+  local cur="\${words[cword]}"
+  local prev="\${words[cword-1]}"
+
+  if (( cword == 1 )); then
+    COMPREPLY=( $(compgen -W "query trace context groups streams fields config init completion" -- "\$cur") )
+    return
+  fi
+
+  local cmd="\${words[1]}"
+  case "\$cmd" in
+    query)
+      case "\$prev" in
+        -g|--group-id|-s|--stream-id|-q|--query|--app|--content|--request-id|--start-time|--end-time|--st|--et|--last|-l|--limit|-f|--format)
+          COMPREPLY=()
+          return
+          ;;
+        *)
+          COMPREPLY=( $(compgen -W "${QUERY_OPTS}" -- "\$cur") )
+          return
+          ;;
+      esac
+      ;;
+    trace)
+      case "\$prev" in
+        -g|--group-id|-s|--stream-id|--field|--start-time|--end-time|--st|--et|--last|-l|--limit|-f|--format)
+          COMPREPLY=()
+          return
+          ;;
+        *)
+          COMPREPLY=( $(compgen -W "${TRACE_OPTS}" -- "\$cur") )
+          return
+          ;;
+      esac
+      ;;
+    context)
+      case "\$prev" in
+        -g|--group-id|-s|--stream-id|--line-num|--time|--before|--after|-f|--format)
+          COMPREPLY=()
+          return
+          ;;
+        *)
+          COMPREPLY=( $(compgen -W "${CONTEXT_OPTS}" -- "\$cur") )
+          return
+          ;;
+      esac
+      ;;
+    groups)
+      COMPREPLY=( $(compgen -W "-f --format" -- "\$cur") )
+      return
+      ;;
+    streams)
+      COMPREPLY=( $(compgen -W "${VALUE_OPTS}" -- "\$cur") )
+      return
+      ;;
+    fields)
+      COMPREPLY=( $(compgen -W "${VALUE_OPTS}" -- "\$cur") )
+      return
+      ;;
+    config)
+      COMPREPLY=( $(compgen -W "--set --get --list --unset" -- "\$cur") )
+      return
+      ;;
+    completion)
+      COMPREPLY=( $(compgen -W "bash zsh powershell" -- "\$cur") )
+      return
+      ;;
+    *)
+      COMPREPLY=()
+      return
+      ;;
+  esac
+}
 complete -F _lts_cli_completion lts-cli`);
             break;
         case 'zsh':
-            console.log(`# lts-cli zsh completion — add to ~/.zshrc
-#compdef lts-cli
-_lts_cli() {
-  local -a commands
-  commands=(
-    'query:Query LTS logs'
-    'trace:Trace a request by ID'
-    'context:View logs before/after a log entry'
-    'groups:List log groups'
-    'streams:List log streams'
-    'fields:Show the index config of a log stream'
-    'config:Manage configuration'
-    'init:Interactive setup wizard'
-    'completion:Generate shell completion script'
-  )
-
-  local context state state_descr line
-  typeset -A opt_args
-
-  _arguments -C \\
-    '1: :->command' \\
-    '*:: :->args'
-
-  case "\$state" in
-    command)
-      _describe 'command' commands
-      ;;
-    args)
-      case "\$line[1]" in
-        query)
-          _arguments \\
-            '-g[Log group ID]:group ID:' \\
-            '-s[Log stream ID]:stream ID:' \\
-            '--start-time[Start time (ISO 8601)]:time:' \\
-            '--end-time[End time (ISO 8601)]:time:' \\
-            '--st[Alias for --start-time]:time:' \\
-            '--et[Alias for --end-time]:time:' \\
-            '--last[Relative range: 30m, 2h, 1d, 7d]:duration:' \\
-            '-q[Query expression]:query:' \\
-            '--app[Filter by appName]:appName:' \\
-            '--content[Filter by content]:keyword:' \\
-            '--request-id[Filter by REQUEST_ID]:id:' \\
-            '-l[Page size]:number:' \\
-            '-r[Reverse order]' \\
-            '-f[Output format]:format:(json table pretty)' \\
-            '--all[Follow the cursor to the end]'
-          ;;
-        trace)
-          _arguments \\
-            '-g[Log group ID]:group ID:' \\
-            '-s[Log stream ID]:stream ID:' \\
-            '--field[Field to match]:field:' \\
-            '--last[Relative range: 30m, 2h, 1d, 7d]:duration:' \\
-            '--start-time[Start time (ISO 8601)]:time:' \\
-            '--end-time[End time (ISO 8601)]:time:' \\
-            '--st[Alias for --start-time]:time:' \\
-            '--et[Alias for --end-time]:time:' \\
-            '-l[Max logs]:number:' \\
-            '-f[Output format]:format:(json table pretty)'
-          ;;
-        fields|groups|streams)
-          _arguments \\
-            '-g[Log group ID]:group ID:' \\
-            '-s[Log stream ID]:stream ID:' \\
-            '-f[Output format]:format:(json table pretty)'
-          ;;
-        config)
-          _arguments \\
-            '--set[Set config value]:key=value:' \\
-            '--get[Get config value]:key:' \\
-            '--list[List all config]' \\
-            '--unset[Remove config value]:key:'
-          ;;
-        completion)
-          _values 'shell' bash zsh powershell
-          ;;
-      esac
-      ;;
-  esac
-}
+            console.log(`# lts-cli zsh completion — add to ~/.zshrc
+#compdef lts-cli
+_lts_cli() {
+  local -a commands
+  commands=(
+    'query:Query LTS logs'
+    'trace:Trace a request by ID'
+    'context:View logs before/after a log entry'
+    'groups:List log groups'
+    'streams:List log streams'
+    'fields:Show the index config of a log stream'
+    'config:Manage configuration'
+    'init:Interactive setup wizard'
+    'completion:Generate shell completion script'
+  )
+
+  local context state state_descr line
+  typeset -A opt_args
+
+  _arguments -C \\
+    '1: :->command' \\
+    '*:: :->args'
+
+  case "\$state" in
+    command)
+      _describe 'command' commands
+      ;;
+    args)
+      case "\$line[1]" in
+        query)
+          _arguments \\
+            '-g[Log group ID]:group ID:' \\
+            '-s[Log stream ID]:stream ID:' \\
+            '--start-time[Start time (ISO 8601)]:time:' \\
+            '--end-time[End time (ISO 8601)]:time:' \\
+            '--st[Alias for --start-time]:time:' \\
+            '--et[Alias for --end-time]:time:' \\
+            '--last[Relative range: 30m, 2h, 1d, 7d]:duration:' \\
+            '-q[Query expression]:query:' \\
+            '--app[Filter by appName]:appName:' \\
+            '--content[Filter by content]:keyword:' \\
+            '--request-id[Filter by REQUEST_ID]:id:' \\
+            '-l[Page size]:number:' \\
+            '-r[Reverse order]' \\
+            '-f[Output format]:format:(json table pretty)' \\
+            '--all[Follow the cursor to the end]'
+          ;;
+        trace)
+          _arguments \\
+            '-g[Log group ID]:group ID:' \\
+            '-s[Log stream ID]:stream ID:' \\
+            '--field[Field to match]:field:' \\
+            '--last[Relative range: 30m, 2h, 1d, 7d]:duration:' \\
+            '--start-time[Start time (ISO 8601)]:time:' \\
+            '--end-time[End time (ISO 8601)]:time:' \\
+            '--st[Alias for --start-time]:time:' \\
+            '--et[Alias for --end-time]:time:' \\
+            '-l[Max logs]:number:' \\
+            '-f[Output format]:format:(json table pretty)'
+          ;;
+        fields|groups|streams)
+          _arguments \\
+            '-g[Log group ID]:group ID:' \\
+            '-s[Log stream ID]:stream ID:' \\
+            '-f[Output format]:format:(json table pretty)'
+          ;;
+        config)
+          _arguments \\
+            '--set[Set config value]:key=value:' \\
+            '--get[Get config value]:key:' \\
+            '--list[List all config]' \\
+            '--unset[Remove config value]:key:'
+          ;;
+        completion)
+          _values 'shell' bash zsh powershell
+          ;;
+      esac
+      ;;
+  esac
+}
 compdef _lts_cli lts-cli`);
             break;
         case 'powershell':
-            console.log(`# lts-cli PowerShell completion — add to $PROFILE
-Register-ArgumentCompleter -CommandName lts-cli -ScriptBlock {
-  param(\$wordToComplete, \$commandAst, \$cursorPosition)
-
-  \$commands = @('query', 'trace', 'context', 'groups', 'streams', 'fields', 'config', 'init', 'completion')
-
-  \$args = \$commandAst.ToString() -split '\\s+'
-  if (\$args.Count -le 1) {
-    return \$commands | Where-Object { \$_ -like "\$wordToComplete*" }
-  }
-
-  switch (\$args[1]) {
-    'query' {
-      \$opts = @('-g', '-s', '--start-time', '--end-time', '--st', '--et', '--last', '-q', '--app', '--content', '--request-id', '-l', '-r', '-f', '--all')
-      return \$opts | Where-Object { \$_ -like "\$wordToComplete*" }
-    }
-    'trace' {
-      \$opts = @('-g', '-s', '--field', '--last', '--start-time', '--end-time', '--st', '--et', '-l', '-f')
-      return \$opts | Where-Object { \$_ -like "\$wordToComplete*" }
-    }
-    'fields' {
-      \$opts = @('-g', '-s', '-f')
-      return \$opts | Where-Object { \$_ -like "\$wordToComplete*" }
-    }
-    'config' {
-      \$opts = @('--set', '--get', '--list', '--unset')
-      return \$opts | Where-Object { \$_ -like "\$wordToComplete*" }
-    }
-    'completion' {
-      return @('bash', 'zsh', 'powershell') | Where-Object { \$_ -like "\$wordToComplete*" }
-    }
-  }
+            console.log(`# lts-cli PowerShell completion — add to $PROFILE
+Register-ArgumentCompleter -CommandName lts-cli -ScriptBlock {
+  param(\$wordToComplete, \$commandAst, \$cursorPosition)
+
+  \$commands = @('query', 'trace', 'context', 'groups', 'streams', 'fields', 'config', 'init', 'completion')
+
+  \$args = \$commandAst.ToString() -split '\\s+'
+  if (\$args.Count -le 1) {
+    return \$commands | Where-Object { \$_ -like "\$wordToComplete*" }
+  }
+
+  switch (\$args[1]) {
+    'query' {
+      \$opts = @('-g', '-s', '--start-time', '--end-time', '--st', '--et', '--last', '-q', '--app', '--content', '--request-id', '-l', '-r', '-f', '--all')
+      return \$opts | Where-Object { \$_ -like "\$wordToComplete*" }
+    }
+    'trace' {
+      \$opts = @('-g', '-s', '--field', '--last', '--start-time', '--end-time', '--st', '--et', '-l', '-f')
+      return \$opts | Where-Object { \$_ -like "\$wordToComplete*" }
+    }
+    'fields' {
+      \$opts = @('-g', '-s', '-f')
+      return \$opts | Where-Object { \$_ -like "\$wordToComplete*" }
+    }
+    'config' {
+      \$opts = @('--set', '--get', '--list', '--unset')
+      return \$opts | Where-Object { \$_ -like "\$wordToComplete*" }
+    }
+    'completion' {
+      return @('bash', 'zsh', 'powershell') | Where-Object { \$_ -like "\$wordToComplete*" }
+    }
+  }
 }`);
             break;
         default:

package/dist/lts/client.js

@@ -1,8 +1,43 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LTSClient = void 0;
 exports.resolveTimeRange = resolveTimeRange;
 exports.parseQueryExpression = parseQueryExpression;
+exports.anchorTimeFromLineNum = anchorTimeFromLineNum;
+const path = __importStar(require("path"));
 const LtsClient_1 = require("@huaweicloud/huaweicloud-sdk-lts/v2/LtsClient");
 const ClientBuilder_1 = require("@huaweicloud/huaweicloud-sdk-core/ClientBuilder");
 const BasicCredentials_1 = require("@huaweicloud/huaweicloud-sdk-core/auth/BasicCredentials");
@@ -15,6 +50,32 @@ const ListLogGroupsRequest_1 = require("@huaweicloud/huaweicloud-sdk-lts/v2/mode
 const ListLogStreamsRequest_1 = require("@huaweicloud/huaweicloud-sdk-lts/v2/model/ListLogStreamsRequest");
 const ListLogStreamIndexRequest_1 = require("@huaweicloud/huaweicloud-sdk-lts/v2/model/ListLogStreamIndexRequest");
 const pagination_1 = require("./pagination");
+/**
+ * 华为云 SDK 把 log4js 的 console appender 指向 stdout，任何 API 错误都会把整个
+ * axios 错误对象（含 Authorization 头）倒进 stdout——`-f json` 的输出因此变成
+ * 不可解析的混合体。这里把 SDK 日志改道 stderr 并默认关闭：CLI 自己会打印
+ * 一行可读的错误，6KB 的 axios dump 只会淹没它。要排查 SDK 层问题时设
+ * LTS_CLI_DEBUG=1。
+ *
+ * 解析到的必须是 SDK 自己那个 log4js 实例，否则 configure 改的是另一份模块状态。
+ * 拿不到就保持原状：日志难看，但不影响结果本身。
+ */
+function configureSdkLogger() {
+    try {
+        const corePkg = require.resolve('@huaweicloud/huaweicloud-sdk-core/package.json');
+        const log4js = require(require.resolve('log4js', { paths: [path.dirname(corePkg)] }));
+        log4js.configure({
+            appenders: { sdkStderr: { type: 'stderr' } },
+            categories: {
+                default: { appenders: ['sdkStderr'], level: process.env.LTS_CLI_DEBUG ? 'all' : 'off' },
+            },
+        });
+    }
+    catch {
+        /* 无法改道时不做任何事 */
+    }
+}
+configureSdkLogger();
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -71,6 +132,14 @@ function parseQueryExpression(expr) {
     }
     return { keywords: trimmed, isAnalysisQuery: false };
 }
+/**
+ * line_num 是 19 位纳秒时间戳，前 13 位就是毫秒（实测与日志时间严格对齐）。
+ * `context` 接口要求传毫秒时间戳，而 LTS 的日志记录本身不带时间字段，只能从
+ * line_num 推。格式不符时返回 undefined，让调用方要求显式 --time。
+ */
+function anchorTimeFromLineNum(lineNum) {
+    return /^\d{19}$/.test(lineNum) ? lineNum.slice(0, 13) : undefined;
+}
 /** 服务端默认在命中词上包裹 <HighLightTag>，输出前剥离 */
 function stripHighlightTags(value) {
     return value.replace(/<\/?HighLightTag>/g, '');
@@ -118,7 +187,7 @@ class LTSClient {
         // 游标翻页：首屏不带游标，后续页把上一页末条的 line_num 当作续读起点
         if (params.lineNum) {
             queryParams.withLineNum(params.lineNum);
-            queryParams.withSearchType(params.searchType ?? (0, pagination_1.cursorDirection)(params.reverse));
+            queryParams.withSearchType(params.searchType ?? pagination_1.CONTINUE_SEARCH_TYPE);
         }
         const request = new ListLogsRequest_1.ListLogsRequest(params.groupId, params.streamId, 'application/json')
             .withBody(queryParams);