Merge pull request #368 from nxtrace/main

Update dependencies and add MTR probe history feature

Author: tsosunchia

.github/workflows/build.yml

@@ -348,29 +348,3 @@ jobs:
           files: dist_release/*
           token: ${{ secrets.GT_TOKEN }}
           fail_on_unmatched_files: true
-
-  publish-new-formula:
-    runs-on: ubuntu-latest
-    needs: [ release ]
-    if: startsWith(github.ref, 'refs/tags/v')
-    steps:
-      - name: config git
-        run: |
-          git config --global user.email "${{ secrets.GIT_MAIL }}"
-          git config --global user.name "${{ secrets.GIT_NAME }}"
-      - name: Clone repo
-        run: git clone https://github.com/nxtrace/homebrew-nexttrace.git
-      - name: Exec script
-        run: |
-          set -Eeuo pipefail
-          cd homebrew-nexttrace
-          bash genFormula.sh
-      - name: Git Push
-        run: |
-          set -Eeuo pipefail
-          cd homebrew-nexttrace
-          git add -A
-          git commit -m 'Publish a new version with Formula' || true
-          git remote set-url origin https://${{ secrets.GT_TOKEN }}@github.com/nxtrace/homebrew-nexttrace.git
-          git push
-      - run: echo "🍏 This job's status is ${{ job.status }}."

.github/workflows/publishNewFormula.yml

@@ -1,52 +1,51 @@
 name: Publish New Formula
 
+permissions:
+  contents: read
+
+defaults:
+  run:
+    shell: bash
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-# Controls when the action will run. Workflow runs when manually triggered using the UI
-# or API.
 on:
   workflow_dispatch:
+  schedule:
+    # Sunday 20:00 UTC = Monday 04:00 Asia/Shanghai
+    - cron: "0 20 * * 0"
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "greet"
   publish-new-formula:
-    # The type of runner that the job will run on
     runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Runs a single command using the runners shell
-      - name: config git
+      - name: Configure git
         run: |
           git config --global user.email "${{ secrets.GIT_MAIL }}"
           git config --global user.name "${{ secrets.GIT_NAME }}"
-      - name: Clone repo
-        run: |
-          git clone https://github.com/nxtrace/homebrew-nexttrace.git
-      - name: Exec script
+
+      - name: Clone Homebrew tap
+        run: git clone https://github.com/nxtrace/homebrew-nexttrace.git
+
+      - name: Generate formulae from NTrace-core latest release
         run: |
           set -Eeuo pipefail
           cd homebrew-nexttrace
-          bash genFormula.sh
-      # - name: setup SSH keys and known_hosts
-      #   run: |
-      #     mkdir -p ~/.ssh
-      #     ssh-keyscan github.com >> ~/.ssh/known_hosts
-      #     ssh-agent -a $SSH_AUTH_SOCK > /dev/null
-      #     ssh-add - <<< "${{ secrets.ID_RSA }}"
-      #   env:
-      #     SSH_AUTH_SOCK: /tmp/ssh_agent.sock
-      - name: Git Push
+          RELEASE_REPO=nxtrace/NTrace-core bash genFormula.sh
+
+      - name: Commit and push if changed
         run: |
           set -Eeuo pipefail
           cd homebrew-nexttrace
-          git add -A
-          git commit -m 'Publish a new version with Formula' || true
+          git add Formula README.md genFormula.sh
+          if git diff --cached --quiet; then
+            echo "No Homebrew formula update needed."
+            exit 0
+          fi
+          git commit -m 'Publish a new version with Formula'
           git remote set-url origin https://${{ secrets.GT_TOKEN }}@github.com/nxtrace/homebrew-nexttrace.git
           git push
-        # env:
-        #   SSH_AUTH_SOCK: /tmp/ssh_agent.sock
-      - run: echo "🍏 This job's status is ${{ job.status }}."
+
+      - run: echo "This job's status is ${{ job.status }}."

README.md

@@ -109,7 +109,7 @@ Please note, there are exceptions to this synchronization. If a version of NTrac
 
   - Linuxbrew's installation command
 
-    Same as the macOS Homebrew's installation method (homebrew-core version only supports amd64)
+    Same as the macOS Homebrew installation method. The homebrew-core formula provides the Full flavor (`nexttrace`); the `nxtrace/nexttrace` tap provides all three flavors.
 
   - deepin installation command
     ```shell
@@ -137,9 +137,12 @@ Please note, there are exceptions to this synchronization. If a version of NTrac
       ```shell
       brew install nexttrace
       ```
-    - This repository's ACTIONS automatically built version (updates faster)
+    - `nxtrace/nexttrace` tap version (periodically synced from the latest NTrace-core release)
       ```shell
-      brew tap nxtrace/nexttrace && brew install nxtrace/nexttrace/nexttrace
+      brew tap nxtrace/nexttrace
+      brew install nxtrace/nexttrace/nexttrace
+      brew install nxtrace/nexttrace/nexttrace-tiny
+      brew install nxtrace/nexttrace/ntr
       ```
     - The homebrew-core build is maintained by chenrui333, please note that this version's updates may lag behind the repository Action automatically version
 
@@ -191,7 +194,7 @@ Starting from this release, NextTrace is published in **three flavors** under th
 | Default mode          |     traceroute     |    traceroute    |   MTR TUI    |
 | Binary name           |    `nexttrace`     | `nexttrace-tiny` |    `ntr`     |
 
-> **Note:** `APT (nexttrace-debs)` provides all three flavors: **Full** (`nexttrace`), **Tiny** (`nexttrace-tiny`), and **NTR** (`ntr`). Other package managers (Homebrew, AUR, Scoop, etc.) currently install the **Full** (`nexttrace`) version only.
+> **Note:** `APT (nexttrace-debs)` and the `Homebrew tap (nxtrace/nexttrace)` provide all three flavors: **Full** (`nexttrace`), **Tiny** (`nexttrace-tiny`), and **NTR** (`ntr`). `homebrew-core`, AUR, Scoop, and other package managers currently install the **Full** (`nexttrace`) version only.
 
 ### Feature Matrix
 
@@ -553,11 +556,17 @@ When running in a terminal (TTY), MTR mode uses an **interactive full-screen TUI
   - default: PTR (or IP fallback) ↔ IP only
   - with `--show-ips`: PTR (IP) ↔ IP only
 - **`e`** — toggle MPLS label display on/off
+- **`d` / `D`** — toggle the optional history display; the default TUI remains the classic metric table
+- **`g` / `G`** — in history display only, cycle History chart mode: heatmap → bars → sparkline
 - The TUI header displays **source → destination**, with `--source`/`--dev` information when specified.
 - When using LeoMoeAPI, the preferred API IP address is shown in the header.
 - Uses the **alternate screen buffer**, so your previous terminal history is preserved on exit.
 - When stdin is not a TTY (e.g. piped), it falls back to a simple table refresh.
 
+History display keeps a rolling 3-minute, timestamp-based probe history while the classic table is shown, then renders `Host`, `Last`, `Avg`, `Loss`, and `History` when toggled with `d`. The History column uses a fixed 100ms latency scale. Unicode blocks/sparklines are used by default; with `--no-color`, plain ASCII is used and timeouts are shown as `x`.
+
+Acknowledgement: the optional MTR history display is inspired by [TraceBar](https://github.com/tracebar-app/tracebar), a macOS continuous traceroute monitor licensed under the [MIT License](https://github.com/tracebar-app/tracebar/blob/main/LICENSE).
+
 The **report mode** (`-r`/`--report`) produces a one-shot summary after all probes complete, suitable for scripting:
 
 ```text

README_zh_CN.md

@@ -107,7 +107,7 @@ Document Language: [English](README.md) | 简体中文
 
   - Linuxbrew 安装命令
 
-    同macOS Homebrew安装方法(homebrew-core版仅支持amd64)
+    同 macOS Homebrew 安装方法；homebrew-core formula 提供 Full flavor（`nexttrace`），`nxtrace/nexttrace` tap 提供三种 flavor。
 
   - deepin 安装命令
 
@@ -137,9 +137,12 @@ Document Language: [English](README.md) | 简体中文
       ```shell
       brew install nexttrace
       ```
-    - 本仓库ACTIONS自动构建版(更新更快)
+    - `nxtrace/nexttrace` tap 版（按 NTrace-core 最新 release 定期同步）
       ```shell
-      brew tap nxtrace/nexttrace && brew install nxtrace/nexttrace/nexttrace
+      brew tap nxtrace/nexttrace
+      brew install nxtrace/nexttrace/nexttrace
+      brew install nxtrace/nexttrace/nexttrace-tiny
+      brew install nxtrace/nexttrace/ntr
       ```
     - homebrew-core 构建由 chenrui333 维护，请注意该版本更新可能会落后仓库Action自动构建版本
 
@@ -192,7 +195,7 @@ Document Language: [English](README.md) | 简体中文
 | 默认运行模式            |      traceroute       |    traceroute    |  MTR TUI   |
 | 二进制名                |      `nexttrace`      | `nexttrace-tiny` |   `ntr`    |
 
-> **注意：** `APT (nexttrace-debs)` 目前提供 **Full**（`nexttrace`）、**Tiny**（`nexttrace-tiny`）和 **NTR**（`ntr`）三种包；其它包管理器（Homebrew、AUR、Scoop 等）目前仍仅提供 **完整版**（`nexttrace`）。
+> **注意：** `APT (nexttrace-debs)` 与 `Homebrew tap (nxtrace/nexttrace)` 目前提供 **Full**（`nexttrace`）、**Tiny**（`nexttrace-tiny`）和 **NTR**（`ntr`）三种包；`homebrew-core`、AUR、Scoop 等其它包管理器目前仍仅提供 **完整版**（`nexttrace`）。
 
 ### 功能对比
 
@@ -545,11 +548,17 @@ nexttrace -t --tcp --max-hops 20 --first 3 --no-rdns 8.8.8.8
   - 默认：PTR（无 PTR 时回退 IP）↔ 仅 IP
   - 启用 `--show-ips`：PTR (IP) ↔ 仅 IP
 - **`e`** — 切换 MPLS 标签显示开/关
+- **`d` / `D`** — 切换可选历史显示；默认 TUI 仍是经典指标表
+- **`g` / `G`** — 仅在历史显示中循环切换 History 图表：heatmap → bars → sparkline
 - TUI 标题栏显示**源 → 目标**路由信息，指定 `--source`/`--dev` 时会展示对应信息。
 - 使用 LeoMoeAPI 时，标题栏会显示首选 API IP 地址。
 - 使用**备用屏幕缓冲区**，退出后恢复之前的终端历史记录。
 - 当 stdin 非 TTY（如管道输入）时，降级为简单表格刷新模式。
 
+历史显示会在经典表格显示期间同步收集最近 3 分钟、按探测时间戳归窗的历史样本，按 `d` 后显示 `Host`、`Last`、`Avg`、`Loss`、`History`。History 列使用固定 100ms 延迟刻度。默认使用 Unicode block/sparkline；启用 `--no-color` 时使用 ASCII，超时样本显示为 `x`。
+
+致谢：可选 MTR 历史显示参考了 [TraceBar](https://github.com/tracebar-app/tracebar) 的连续 traceroute 历史可视化体验；TraceBar 使用 [MIT License](https://github.com/tracebar-app/tracebar/blob/main/LICENSE)。
+
 **报告模式**（`-r`/`--report`）在所有探测完成后一次性输出统计，适合脚本使用：
 
 ```text

cmd/mtr_mode.go

@@ -86,13 +86,16 @@ func runMTRTUI(method trace.Method, conf trace.Config, hopIntervalMs int, maxPer
 	roundConf := normalizeMTRTraceConfig(conf)
 
 	opts := buildMTRInteractiveOptions(ui, hopIntervalMs, maxPerHop)
+	history := attachMTRHistoryIfTTY(ui, &opts)
 
 	// TTY 模式下使用 TUI 渲染器 + 暂停支持，非 TTY 使用简单表格
 	var onSnapshot trace.MTROnSnapshot
 	if ui.IsTTY() {
 		opts.IsPaused = ui.IsPaused
 		onSnapshot = printer.MTRTUIPrinter(target, domain, target, config.Version, startTime,
-			srcHost, srcIP, lang, func() string { return buildAPIInfo(dataOrigin) }, showIPs, ui.IsPaused, ui.CurrentDisplayMode, ui.CurrentNameMode, ui.IsMPLSDisabled)
+			srcHost, srcIP, lang, func() string { return buildAPIInfo(dataOrigin) }, showIPs, ui.IsPaused,
+			ui.CurrentDisplayMode, ui.CurrentNameMode, ui.IsMPLSDisabled,
+			ui.IsHistoryMode, ui.CurrentHistoryChartMode, history.Snapshot)
 	} else {
 		onSnapshot = func(iteration int, stats []trace.MTRHopStat) {
 			printer.MTRTablePrinter(stats, iteration, ui.CurrentDisplayMode(), ui.CurrentNameMode(), lang, showIPs)
@@ -119,6 +122,25 @@ func buildMTRInteractiveOptions(ui *mtrUI, hopIntervalMs int, maxPerHop int) tra
 	return opts
 }
 
+func attachMTRHistoryIfTTY(ui *mtrUI, opts *trace.MTROptions) *printer.MTRHistoryStore {
+	if ui == nil || opts == nil || !ui.IsTTY() {
+		return nil
+	}
+	history := printer.NewMTRHistoryStore(printer.MTRHistoryWindow)
+	opts.OnProbe = history.AddProbeEvent
+	if opts.IsResetRequested != nil {
+		resetRequested := opts.IsResetRequested
+		opts.IsResetRequested = func() bool {
+			if !resetRequested() {
+				return false
+			}
+			history.Reset()
+			return true
+		}
+	}
+	return history
+}
+
 // runMTRReport 执行 MTR 非全屏报告模式（对齐 mtr -rzw 风格）。
 // 探测完 maxPerHop 后一次性输出最终统计到 stdout，不进入 alternate screen。
 func runMTRReport(method trace.Method, conf trace.Config, hopIntervalMs int, maxPerHop int, domain string, dataOrigin string, wide bool, showIPs bool) {

cmd/mtr_mode_test.go

@@ -354,6 +354,41 @@ func TestBuildMTRInteractiveOptions_AsyncMetadataFollowsTTY(t *testing.T) {
 	}
 }
 
+func TestAttachMTRHistoryIfTTY(t *testing.T) {
+	nonTTYUI := &mtrUI{isTTY: false}
+	nonTTYOpts := buildMTRInteractiveOptions(nonTTYUI, 1000, 0)
+	if history := attachMTRHistoryIfTTY(nonTTYUI, &nonTTYOpts); history != nil {
+		t.Fatal("non-TTY MTR should not allocate history store")
+	}
+	if nonTTYOpts.OnProbe != nil {
+		t.Fatal("non-TTY MTR should not attach OnProbe history collection")
+	}
+
+	ttyUI := &mtrUI{isTTY: true}
+	ttyOpts := buildMTRInteractiveOptions(ttyUI, 1000, 0)
+	history := attachMTRHistoryIfTTY(ttyUI, &ttyOpts)
+	if history == nil {
+		t.Fatal("TTY MTR should allocate history store")
+	}
+	if ttyOpts.OnProbe == nil {
+		t.Fatal("TTY MTR should attach OnProbe history collection")
+	}
+
+	now := time.Now()
+	ttyOpts.OnProbe(trace.MTRProbeEvent{TTL: 1, Success: true, RTT: 10 * time.Millisecond, Timestamp: now})
+	if snap := history.Snapshot(now); len(snap) != 1 || len(snap[0].Samples) != 1 {
+		t.Fatalf("history did not collect TTY probe event: %+v", snap)
+	}
+
+	atomic.StoreInt32(&ttyUI.restartReq, 1)
+	if ttyOpts.IsResetRequested == nil || !ttyOpts.IsResetRequested() {
+		t.Fatal("wrapped reset callback should consume reset request")
+	}
+	if snap := history.Snapshot(now); len(snap) != 0 {
+		t.Fatalf("history should be cleared on reset, got %+v", snap)
+	}
+}
+
 func TestDefaultConstants_NormalVsMTR(t *testing.T) {
 	if defaultPacketIntervalMs != 50 {
 		t.Fatalf("defaultPacketIntervalMs = %d, want 50", defaultPacketIntervalMs)
@@ -725,6 +760,19 @@ func TestParseMTRKey_NameToggle(t *testing.T) {
 	}
 }
 
+func TestParseMTRKey_HistoryControls(t *testing.T) {
+	for _, b := range []byte{'d', 'D'} {
+		if got := ParseMTRKey(b); got != "history_toggle" {
+			t.Errorf("ParseMTRKey(%q) = %q, want %q", b, got, "history_toggle")
+		}
+	}
+	for _, b := range []byte{'g', 'G'} {
+		if got := ParseMTRKey(b); got != "history_chart" {
+			t.Errorf("ParseMTRKey(%q) = %q, want %q", b, got, "history_chart")
+		}
+	}
+}
+
 func TestMTRUI_NameModeToggle(t *testing.T) {
 	_, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -769,6 +817,37 @@ func TestMTRUI_NameModeNotResetByRestart(t *testing.T) {
 	}
 }
 
+func TestMTRUI_HistoryModeAndChartCycle(t *testing.T) {
+	_, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	ui := newMTRUI(cancel, 0)
+
+	if ui.IsHistoryMode() {
+		t.Fatal("history mode should default to classic/off")
+	}
+	ui.CycleHistoryChartMode()
+	if got := ui.CurrentHistoryChartMode(); got != 0 {
+		t.Fatalf("chart mode should not change outside history mode, got %d", got)
+	}
+
+	ui.ToggleHistoryMode()
+	if !ui.IsHistoryMode() {
+		t.Fatal("history mode should be enabled after toggle")
+	}
+	ui.CycleHistoryChartMode()
+	if got := ui.CurrentHistoryChartMode(); got != 1 {
+		t.Fatalf("chart mode after first cycle = %d, want 1", got)
+	}
+	ui.CycleHistoryChartMode()
+	if got := ui.CurrentHistoryChartMode(); got != 2 {
+		t.Fatalf("chart mode after second cycle = %d, want 2", got)
+	}
+	ui.CycleHistoryChartMode()
+	if got := ui.CurrentHistoryChartMode(); got != 0 {
+		t.Fatalf("chart mode after wrap = %d, want 0", got)
+	}
+}
+
 // ---------------------------------------------------------------------------
 // mtrInputParser 测试
 // ---------------------------------------------------------------------------
@@ -851,13 +930,16 @@ func TestMTRInputParser_RecognizesNormalKeysAfterEscapeNoise(t *testing.T) {
 	}
 
 	// 现在喂入正常快捷键序列
-	keys := []byte{'p', ' ', 'r', 'y', 'n', 'q'}
+	keys := []byte{'p', ' ', 'r', 'y', 'n', 'e', 'd', 'g', 'q'}
 	expected := []mtrInputAction{
 		mtrActionPause,
 		mtrActionResume,
 		mtrActionRestart,
 		mtrActionDisplayMode,
 		mtrActionNameToggle,
+		mtrActionMPLSToggle,
+		mtrActionHistoryToggle,
+		mtrActionHistoryChart,
 		mtrActionQuit,
 	}
 	actions := feedAll(&p, keys)