修改默认行为，当指定v4/v6时自动选择第一个IP方便脚本使用

ipv6 trace 正序输出
chore: 更新依赖
2025-08-12 06:26:39 +00:00 · 2023-11-03 01:21:53 +08:00 · 2023-11-03 00:47:42 +08:00 · 2023-10-31 04:03:50 +08:00 · 2023-10-31 04:03:32 +08:00 · 2023-10-27 21:16:42 +08:00
59 changed files with 2277 additions and 692 deletions
--- a/.cross_compile.sh
+++ b/.cross_compile.sh
@@ -26,15 +26,15 @@ for pl in ${PLATFORMS}; do
    echo "build => ${TARGET}"
    if [ "${DEBUG_MODE}" == "debug" ]; then
        go build -trimpath -gcflags "all=-N -l" -o ${TARGET} \
-            -ldflags    "-X 'github.com/xgadget-lab/nexttrace/printer.version=${BUILD_VERSION}' \
-                        -X 'github.com/xgadget-lab/nexttrace/printer.buildDate=${BUILD_DATE}' \
-                        -X 'github.com/xgadget-lab/nexttrace/printer.commitID=${COMMIT_SHA1}'\
+            -ldflags    "-X 'github.com/nxtrace/NTrace-core/config.Version=${BUILD_VERSION}' \
+                        -X 'github.com/nxtrace/NTrace-core/config.BuildDate=${BUILD_DATE}' \
+                        -X 'github.com/nxtrace/NTrace-core/config.CommitID=${COMMIT_SHA1}'\
                        -w -s"
    else
        go build -trimpath -o ${TARGET} \
-            -ldflags    "-X 'github.com/xgadget-lab/nexttrace/printer.version=${BUILD_VERSION}' \
-                        -X 'github.com/xgadget-lab/nexttrace/printer.buildDate=${BUILD_DATE}' \
-                        -X 'github.com/xgadget-lab/nexttrace/printer.commitID=${COMMIT_SHA1}'\
+            -ldflags    "-X 'github.com/nxtrace/NTrace-core/config.Version=${BUILD_VERSION}' \
+                        -X 'github.com/nxtrace/NTrace-core/config.BuildDate=${BUILD_DATE}' \
+                        -X 'github.com/nxtrace/NTrace-core/config.CommitID=${COMMIT_SHA1}'\
                        -w -s"
    fi
 done
@@ -46,15 +46,15 @@ done
    echo "build => ${TARGET}"
    if [ "${DEBUG_MODE}" == "debug" ]; then
        go build -trimpath -gcflags "all=-N -l" -o ${TARGET} \
-            -ldflags    "-X 'github.com/xgadget-lab/nexttrace/printer.version=${BUILD_VERSION}' \
-                        -X 'github.com/xgadget-lab/nexttrace/printer.buildDate=${BUILD_DATE}' \
-                        -X 'github.com/xgadget-lab/nexttrace/printer.commitID=${COMMIT_SHA1}'\
+            -ldflags    "-X 'github.com/nxtrace/NTrace-core/config.Version=${BUILD_VERSION}' \
+                        -X 'github.com/nxtrace/NTrace-core/config.BuildDate=${BUILD_DATE}' \
+                        -X 'github.com/nxtrace/NTrace-core/config.CommitID=${COMMIT_SHA1}'\
                        -w -s"
    else
        go build -trimpath -o ${TARGET} \
-            -ldflags    "-X 'github.com/xgadget-lab/nexttrace/printer.version=${BUILD_VERSION}' \
-                        -X 'github.com/xgadget-lab/nexttrace/printer.buildDate=${BUILD_DATE}' \
-                        -X 'github.com/xgadget-lab/nexttrace/printer.commitID=${COMMIT_SHA1}'\
+            -ldflags    "-X 'github.com/nxtrace/NTrace-core/config.Version=${BUILD_VERSION}' \
+                        -X 'github.com/nxtrace/NTrace-core/config.BuildDate=${BUILD_DATE}' \
+                        -X 'github.com/nxtrace/NTrace-core/config.CommitID=${COMMIT_SHA1}'\
                        -w -s"
    fi

--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -15,7 +15,7 @@ copyright: [v2fly](https://github.com/v2fly)

 <!--
 除非特殊情况，请完整填写所有问题。不按模板发的 issue 将直接被关闭。
-如果你遇到的问题不是 nexttrace 的 bug，比如你不清楚如何配置，请在 https://github.com/xgadget-lab/nexttrace/discussions 进行讨论。
+如果你遇到的问题不是 nexttrace 的 bug，比如你不清楚如何配置，请在 https://github.com/nxtrace/NTrace-core/discussions 进行讨论。
 -->

 ## 你正在使用哪个版本的 nexttrace？
@@ -38,3 +38,7 @@ copyright: [v2fly](https://github.com/v2fly)


 ## 请附上出错时软件输出的错误信息
+
+## 是否查询过本仓库wiki有没有类似错误
+
+<!-- wiki: https://github.com/sjlleo/nexttrace/wiki -->
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ jobs:
          # BEIGIN MacOS ARM64
          - goos: darwin
            goarch: arm64
-          # END MacOS ARM64
+          # END macOS ARM64
          # BEGIN Linux ARM 5 6 7
          - goos: linux
            goarch: arm
@@ -75,6 +75,12 @@ jobs:
            goarch: mipsle
          - goos: linux
            goarch: mips
+          - goos: linux
+            goarch: mipsle
+            gomips: softfloat
+          - goos: linux
+            goarch: mips
+            gomips: softfloat
          # END MIPS
          # BEGIN PPC
          - goos: linux
@@ -104,10 +110,11 @@ jobs:
      GOOS: ${{ matrix.goos }}
      GOARCH: ${{ matrix.goarch }}
      GOARM: ${{ matrix.goarm }}
+      GOMIPS: ${{ matrix.gomips }}
      CGO_ENABLED: 0
    steps:
      - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Show workflow information
        run: |
          if [ ! -z $GOARM ]; then
@@ -117,7 +124,10 @@ jobs:
          if [ "$GOOS" == "windows" ]; then
            export _NAME="$_NAME.exe"
          fi
-          echo "GOOS: $GOOS, GOARCH: $GOARCH, GOARM: $GOARM, RELEASE_NAME: $_NAME"
+          if [ "$GOMIPS" == "softfloat" ]; then
+            export _NAME="${_NAME}_softfolat"
+          fi
+          echo "GOOS: $GOOS, GOARCH: $GOARCH, GOARM: $GOARM, GOMIPS: $GOMIPS, RELEASE_NAME: $_NAME"
          echo "ASSET_NAME=$_NAME" >> $GITHUB_ENV
          echo "BUILD_VERSION=$(git describe --tags --always)" >> $GITHUB_ENV
          echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
@@ -125,15 +135,15 @@ jobs:
      - name: Set up Go
        uses: actions/setup-go@v4
        with:
-          go-version: '1.20'
+          go-version: '1.21'
      - name: Get project dependencies
        run: go mod download
      - name: Build
        run: |
          go build -trimpath -o dist/${ASSET_NAME} \
-            -ldflags "-X 'github.com/xgadget-lab/nexttrace/printer.version=${BUILD_VERSION}' \
-                      -X 'github.com/xgadget-lab/nexttrace/printer.buildDate=${BUILD_DATE}' \
-                      -X 'github.com/xgadget-lab/nexttrace/printer.commitID=${COMMIT_SHA1}'\
+            -ldflags "-X 'github.com/nxtrace/NTrace-core/config.Version=${BUILD_VERSION}' \
+                      -X 'github.com/nxtrace/NTrace-core/config.BuildDate=${BUILD_DATE}' \
+                      -X 'github.com/nxtrace/NTrace-core/config.CommitID=${COMMIT_SHA1}'\
                      -w -s"
      - name: Upload files to Artifacts
        uses: actions/upload-artifact@v3
@@ -145,7 +155,7 @@ jobs:
        if: startsWith(github.ref, 'refs/tags/v')
        uses: softprops/action-gh-release@v1
        with: # 将下述可执行文件 release 上去
-          draft: false # Release草稿
+          draft: true # Release草稿
          files: |
            dist/*
        env:
@@ -166,7 +176,7 @@ jobs:
          git config --global user.name "${{ secrets.git_name }}"
      - name: Clone repo
        run: |
-          git clone https://github.com/xgadget-lab/homebrew-nexttrace.git
+          git clone https://github.com/nxtrace/homebrew-nexttrace.git
      - name: Exec scipt
        run: |
          cd homebrew-nexttrace
@@ -183,7 +193,7 @@ jobs:
        run: |
          cd homebrew-nexttrace
          git commit -am 'Publish a new version with Formula' || true
-          git remote set-url origin https://${{ secrets.gt_token }}@github.com/xgadget-lab/homebrew-nexttrace.git
+          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
--- a/.github/workflows/publishNewFormula.yml
+++ b/.github/workflows/publishNewFormula.yml
@@ -21,7 +21,7 @@ jobs:
          git config --global user.name "${{ secrets.git_name }}"
      - name: Clone repo
        run: |
-          git clone https://github.com/xgadget-lab/homebrew-nexttrace.git
+          git clone https://github.com/nxtrace/homebrew-nexttrace.git
      - name: Exec scipt
        run: |
          cd homebrew-nexttrace
@@ -38,7 +38,7 @@ jobs:
        run: |
          cd homebrew-nexttrace
          git commit -am 'Publish a new version with Formula' || true
-          git remote set-url origin https://${{ secrets.gt_token }}@github.com/xgadget-lab/homebrew-nexttrace.git
+          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
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -31,13 +31,13 @@ jobs:
      - name: Set up Go
        uses: actions/setup-go@v4
        with:
-          go-version: '1.20'
+          go-version: '1.21'
          check-latest: true
      - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Test with unix
        if: ${{ matrix.os != 'windows-latest' }}
        run: sudo go test -v -coverprofile='coverage.out' -covermode=count ./...
      - name: Test with windows
        if: ${{ matrix.os == 'windows-latest' }}
-        run: go test -v -coverprofile='coverage.out' -covermode=count ./...
+        run: go test -v -coverprofile='coverage.out' -covermode=count ./...
--- a/README.md
+++ b/README.md
@@ -4,35 +4,126 @@

 </div>

-## NextTrace
+<h1 align="center">
+  <br>NextTrace<br>
+</h1>

-An open source visual routing tool that pursues light weight, developed using Golang.
+<h4 align="center">An open source visual routing tool that pursues light weight, developed using Golang.</h4>

-NextTrace is part of the [OwO Network](https://github.com/OwO-Network) project. The project is a joint initiative of Leo and Vincent. 
+<p align="center">
+  <a href="https://github.com/nxtrace/Ntrace-V1/actions">
+    <img src="https://img.shields.io/github/actions/workflow/status/nxtrace/Ntrace-V1/build.yml?branch=main&style=flat-square" alt="Github Actions">
+  </a>
+  <a href="https://goreportcard.com/report/github.com/nxtrace/Ntrace-V1">
+    <img src="https://goreportcard.com/badge/github.com/nxtrace/Ntrace-V1?style=flat-square">
+  </a>
+  <a href="https://github.com/nxtrace/Ntrace-V1/releases">
+    <img src="https://img.shields.io/github/release/nxtrace/Ntrace-V1/all.svg?style=flat-square">
+  </a>
+  <a href="https://telegram.dog/sjprojects">
+    <img src="https://img.shields.io/endpoint?color=neon&style=flat-square&url=https%3A%2F%2Ftg.sumanjay.workers.dev%2Fnexttrace">
+  </a>
+</p>

-If you like this project, [Donate us](https://afdian.net/a/sjlleo/plan) to help us to provide long-lasting API cost expenses.
+## IAAS Sponsor
+
+<div style="text-align: center;">
+    <a href="https://dmit.io">
+        <img src="https://www.dmit.io/templates/dmit_theme_2020/dmit/assets/images/dmit_logo_with_text_blue.svg" width="170.7" height="62.9">
+    </a>
+    &nbsp;&nbsp;&nbsp;&nbsp;
+    <a href="https://misaka.io" >
+        <img src="https://www.jsdelivr.com/assets/8997e39e1f9d776502ab4d7cdff9d1608aa67aaf/img/globalping/sponsors/misaka.svg" width="170.7" height="62.9">
+    </a>
+    &nbsp;&nbsp;&nbsp;&nbsp;
+    <a href="https://skywolf.cloud" >
+        <img src="https://hk.skywolf.cloud/assets/img/skywolf.svg" width="170.7" height="62.9">
+    </a>
+</div>
+
+We are extremely grateful to [DMIT](https://dmit.io) and [Misaka](https://misaka.io) and [Skywolf](https://skywolf.cloud) for providing the network infrastructure that powers this project.

 ## How To Use

 Document Language: English | [简体中文](README_zh_CN.md)

-### Automated Installation
+⚠️ Please note: We welcome PR submissions from the community, but please submit your PRs to the [NTrace-V1](https://github.com/nxtrace/NTrace-V1) repository instead of [NTrace-core](https://github.com/nxtrace/NTrace-core) repository.<br>
+Regarding the NTrace-V1 and NTrace-core repositories:<br>
+Both will largely remain consistent with each other. All development work is done within the NTrace-V1 repository. The NTrace-V1 repository releases new versions first. After running stably for an undetermined period, we will synchronize that version to NTrace-core. This means that the NTrace-V1 repository serves as a "beta" or "testing" version.<br>
+Please note, there are exceptions to this synchronization. If a version of NTrace-V1 encounters a serious bug, NTrace-core will skip that flawed version and synchronize directly to the next version that resolves the issue.

-```bash
-# Linux one-click install script
-bash -c "$(curl -Ls https://raw.githubusercontent.com/sjlleo/nexttrace/main/nt_install.sh)"
+### Automated Install

-# macOS brew install command
-brew tap xgadget-lab/nexttrace && brew install nexttrace
+* Linux
+    * One-click installation script

-# GHProxy Mirror (For China Mainland User)
-bash -c "$(curl -Ls https://ghproxy.com/https://raw.githubusercontent.com/sjlleo/nexttrace/main/nt_install.sh)"
-```
+      ```shell
+      bash -c "$(curl http://nexttrace-io-leomoe-api-a0.shop/nt_install_v1.sh)"
+      ```
+    * Arch Linux AUR installation command
+        * Directly download bin package (only supports amd64)

-Windows users please go to [Release Page](https://github.com/sjlleo/nexttrace/releases/latest) directly and download exe file.
+             ```shell
+             yay -S nexttrace-bin
+             ```
+        * The AUR builds are maintained by ouuan
+    * Linuxbrew's installation command
+
+        Same as the macOS Homebrew's installation method (homebrew-core version only supports amd64)
+    * Deepin installation command
+
+      ```shell
+      apt install nexttrace
+      ```
+    * Termux installation command
+
+      ```shell
+      pkg install nexttrace-enhanced
+      ```
+
+* macOS
+    * macOS Homebrew's installation command
+        * Homebrew-core version
+
+             ```shell
+             brew install nexttrace
+             ```
+        * This repository's ACTIONS automatically built version (updates faster)
+
+             ```shell
+             brew tap nxtrace/nexttrace && brew install nxtrace/nexttrace/nexttrace
+             ```
+        * The homebrew-core build is maintained by chenrui333, please note that this version's updates may lag behind the repository Action automatically version
+
+* Windows
+    * Windows Scoop installation command
+        * Scoop-extras version
+
+             ```powershell
+             scoop bucket add extras && scoop install extras/nexttrace
+             ```
+
+        * Scoop-extra is maintained by soenggam
+
+    Please note, the repositories for all of the above installation methods are maintained by open source enthusiasts. Availability and timely updates are not guaranteed. If you encounter problems, please contact the repository maintainer to solve them, or use the binary packages provided by the official build of this project.
+
+### Manual Install
+* Download the precompiled executable
+
+    For users not covered by the above methods, please go directly to [Release](https://github.com/nxtrace/Ntrace-V1/releases/latest) to download the compiled binary executable.
+
+    * `Release` provides compiled binary executables for many systems and different architectures. If none are available, you can compile it yourself.
+    * Some essential dependencies of this project are not fully implemented on `Windows` by `Golang`, so currently, `NextTrace` is in an experimental support phase on the `Windows` platform.
+
+* Install from source
+
+    After installing Go >= 1.20 yourself, you can use the following command to install
+
+    ```shell
+    go install github.com/nxtrace/Ntrace-V1@latest
+    ```
+    After installation, the executable is in the `$GOPATH/bin` directory. If you have not set `GOPATH`, it is in the `$HOME/go/bin` directory.

- `Release` provides compiled executables for many systems and architectures, if not, you can compile it yourself.
- Some of the necessary dependencies of this project are not fully implemented in `Golang` on `Windows`, so currently `NextTrace` is experimental on `Windows` platform.

 ### Get Started

@@ -44,15 +135,27 @@ nexttrace 1.0.0.1
 # URL
 nexttrace http://example.com:8080/index.html?q=1

-# Form printing (output all hops at one time, wait 20-40 seconds)
+# Form printing
 nexttrace --table 1.0.0.1

+# An Output Easy to Parse
+nexttrace --raw 1.0.0.1
+nexttrace --json 1.0.0.1
+
+# IPv4/IPv6 Resolve Only, and automatically select the first IP when there are multiple IPs
+nexttrace --ipv4 g.co
+nexttrace --ipv6 g.co
+
 # IPv6 ICMP Trace
 nexttrace 2606:4700:4700::1111

 # Disable Path Visualization With the -M parameter
 nexttrace koreacentral.blob.core.windows.net
 # MapTrace URL: https://api.leo.moe/tracemap/html/c14e439e-3250-5310-8965-42a1e3545266.html
+
+# Disable MPLS display using the --disable-mpls / -e parameter or the NEXTTRACE_DISABLEMPLS environment variable
+nexttrace --disable-mpls example.com
+export NEXTTRACE_DISABLEMPLS=1
 ```

 PS: The routing visualization drawing module was written by [@tsosunchia](https://github.com/tsosunchia), and the specific code can be viewed at [tsosunchia/traceMap](https://github.com/tsosunchia/traceMap).
@@ -69,6 +172,17 @@ nexttrace --fast-trace

 # You can also use TCP SYN for testing
 nexttrace --fast-trace --tcp
+
+# You can also quickly test through a customized IP/DOMAIN list file
+nexttrace --file /path/to/your/iplist.txt
+# CUSTOMIZED IP DOMAIN LIST FILE FORMAT
+## One IP/DOMAIN per line + space + description information (optional)
+## forExample:
+## 106.37.67.1 BEIJING-TELECOM
+## 240e:928:101:31a::1 BEIJING-TELECOM
+## bj.10086.cn BEIJING-MOBILE
+## 2409:8080:0:1::1
+## 223.5.5.5
 ```

 `NextTrace` already supports route tracing for specified Network Devices
@@ -112,6 +226,9 @@ nexttrace --first 5 --max-hops 10 www.decix.net
 # Turn off the IP reverse parsing function
 nexttrace --no-rdns www.bbix.net

+# Set the payload size to 1024 bytes
+nexttrace --psize 1024 example.com
+
 # Feature: print Route-Path diagram
 # Route-Path diagram example:
 # AS6453 Tata Communication「Singapore『Singapore』」
@@ -165,27 +282,36 @@ NextTrace BackEnd is now open-source.

 https://github.com/sjlleo/nexttrace-backend

-All NextTrace IP geolocation `API DEMO` can refer to [here](https://github.com/xgadget-lab/nexttrace/blob/main/ipgeo/)
+NextTrace `LeoMoeAPI` now utilizes the Proof of Work (POW) mechanism to prevent abuse, where NextTrace introduces the powclient library as a client-side component. Both the POW CLIENT and SERVER are open source, and everyone is welcome to use them. (Please direct any POW module-related questions to the corresponding repositories)
+
+- [GitHub - tsosunchia/powclient: Proof of Work CLIENT for NextTrace](https://github.com/tsosunchia/powclient)
+- [GitHub - tsosunchia/powserver: Proof of Work SERVER for NextTrace](https://github.com/tsosunchia/powserver)
+
+All NextTrace IP geolocation `API DEMO` can refer to [here](https://github.com/nxtrace/NTrace-core/blob/main/ipgeo/)

 ### For full usage list, please refer to the usage menu

 ```shell
-Usage: nexttrace [-h|--help] [-T|--tcp] [-U|--udp] [-F|--fast-trace] [-p|--port
-                 <integer>] [-q|--queries <integer>] [--parallel-requests
-                 <integer>] [-m|--max-hops <integer>] [-d|--data-provider
-                 (Ip2region|ip2region|IP.SB|ip.sb|IPInfo|ipinfo|IPInsight|ipinsight|IPAPI.com|ip-api.com|IPInfoLocal|ipinfolocal|chunzhen)]
+Usage: nexttrace [-h|--help] [-4|--ipv4] [-6|--ipv6] [-T|--tcp] [-U|--udp]
+                 [-F|--fast-trace] [-p|--port <integer>] [-q|--queries
+                 <integer>] [--parallel-requests <integer>] [-m|--max-hops
+                 <integer>] [-d|--data-provider
+                 (Ip2region|ip2region|IP.SB|ip.sb|IPInfo|ipinfo|IPInsight|ipinsight|IPAPI.com|ip-api.com|IPInfoLocal|ipinfolocal|chunzhen|LeoMoeAPI|leomoeapi|disable-geoip)]
                 [-n|--no-rdns] [-a|--always-rdns] [-P|--route-path]
-                 [-r|--report] [--dn42] [-o|--output] [-t|--table]
-                 [-c|--classic] [-f|--first <integer>] [-M|--map]
+                 [-r|--report] [--dn42] [-o|--output] [-t|--table] [--raw]
+                 [-j|--json] [-c|--classic] [-f|--first <integer>] [-M|--map]
                 [-v|--version] [-s|--source "<value>"] [-D|--dev "<value>"]
                 [-R|--route] [-z|--send-time <integer>] [-i|--ttl-time
-                 <integer>] [_positionalArg_nexttrace_25 "<value>"]
-                 [--dot-server (dnssb|aliyun|dnspod|google|cloudflare)]
-                 [-g|--language (en|cn)]
+                 <integer>] [--timeout <integer>] [--psize <integer>]
+                 [_positionalArg_nexttrace_31 "<value>"] [--dot-server
+                 (dnssb|aliyun|dnspod|google|cloudflare)] [-g|--language
+                 (en|cn)]

 Arguments:

  -h  --help                         Print help information
+  -4  --ipv4                         Use IPv4 only
+  -6  --ipv6                         Use IPv6 only
  -T  --tcp                          Use TCP SYN for tracerouting (default port
                                     is 80)
  -U  --udp                          Use UDP SYN for tracerouting (default port
@@ -208,7 +334,11 @@ Arguments:
                                     reached). Default: 30
  -d  --data-provider                Choose IP Geograph Data Provider [IP.SB,
                                     IPInfo, IPInsight, IP-API.com, Ip2region,
-                                     IPInfoLocal, CHUNZHEN]. Default: LeoMoeAPI
+                                     IPInfoLocal, CHUNZHEN, disable-geoip].
+                                     Default: LeoMoeAPI
+      --pow-provider                 Choose PoW Provider [api.leo.moe, sakura]
+                                     For China mainland users, please use
+                                     sakura. Default: api.leo.moe
  -n  --no-rdns                      Do not resolve IP addresses to their
                                     domain names
  -a  --always-rdns                  Always resolve IP addresses to their
@@ -220,28 +350,38 @@ Arguments:
  -o  --output                       Write trace result to file
                                     (RealTimePrinter ONLY)
  -t  --table                        Output trace results as table
+      --raw                          An Output Easy to Parse
+  -j  --json                         Output trace results as JSON
  -c  --classic                      Classic Output trace results like
                                     BestTrace
  -f  --first                        Start from the first_ttl hop (instead from
                                     1). Default: 1
  -M  --map                          Disable Print Trace Map
+  -e  --disable-mpls                 Disable MPLS
  -v  --version                      Print version info and exit
  -s  --source                       Use source src_addr for outgoing packets
  -D  --dev                          Use the following Network Devices as the
                                     source address in outgoing packets
  -R  --route                        Show Routing Table [Provided By BGP.Tools]
-  -z  --send-time                    Set the time interval for sending every
-                                     packet. Useful when some routers use
-                                     rate-limit for ICMP messages. Default: 100
-  -i  --ttl-time                     Set the time interval for sending packets
-                                     groups by TTL. Useful when some routers
-                                     use rate-limit for ICMP messages. Default:
-                                     500
-      --_positionalArg_nexttrace_25  IP Address or domain name
+  -z  --send-time                    Set how many [milliseconds] between
+                                     sending each packet.. Useful when some
+                                     routers use rate-limit for ICMP messages.
+                                     Default: 100
+  -i  --ttl-time                     Set how many [milliseconds] between
+                                     sending packets groups by TTL. Useful when
+                                     some routers use rate-limit for ICMP
+                                     messages. Default: 500
+      --timeout                      The number of [milliseconds] to keep probe
+                                     sockets open before giving up on the
+                                     connection.. Default: 1000
+      --psize                        Set the packet size (payload size).
+                                     Default: 52
+      --_positionalArg_nexttrace_31  IP Address or domain name
      --dot-server                   Use DoT Server for DNS Parse [dnssb,
                                     aliyun, dnspod, google, cloudflare]
  -g  --language                     Choose the language for displaying [en,
                                     cn]. Default: cn
+      --file                         Read IP Address or domain name from file
 ```

 ## Project screenshot
@@ -250,13 +390,19 @@ Arguments:

 ![image](https://user-images.githubusercontent.com/59512455/218501311-1ceb9b79-79e6-4eb6-988a-9d38f626cdb8.png)

-## NextTrace Enhanced
+## OpenTrace

-`NextTrace Enhanced` is an enhanced version for enthusiasts, `Enhanced` provides trace route calls in the form of Web API and a simple Looking Glass webpage with built-in visualization.
+`OpenTrace` is the cross-platform `GUI` version of `NextTrace` developed by @Archeb, bringing a familiar but more powerful user experience.

-Please Notice that `NextTrace Enhanced` is currently not supported in English.
+This software is still in the early stages of development and may have many flaws and errors. We value your feedback.

-https://github.com/OwO-Network/nexttrace-enhanced
+[https://github.com/Archeb/opentrace](https://github.com/Archeb/opentrace)
+
+## NEXTTRACE WEB API
+
+`NextTraceWebApi` is a web-based server implementation of `NextTrace` in the `MTR` style, offering various deployment options including `Docker`.
+
+[https://github.com/nxtrace/nexttracewebapi](https://github.com/nxtrace/nexttracewebapi)

 ## LeoMoeAPI Credit

@@ -266,7 +412,7 @@ The LeoMoeAPI data is subject to copyright restrictions from multiple data sourc

 1. We would like to credit samleong123 for providing nodes in Malaysia, TOHUNET Looking Glass for global nodes, and Ping.sx from Misaka, where more than 80% of reliable calibration data comes from ping/mtr reports.

-2. At the same time, we would like to credit isyekong for their contribution on rDNS-based calibration ideas and data. LeoMoeAPI is accelerating the development of rDNS resolution function, and has already achieved automated geolocation resolution for some backbone networks, but there are some misjudgments. We hope that NextTrace will become a One-Man ISP-friendly traceroute tool in the future, and we are working on improving the calibration of these ASN micro-backbones as much as possible.
+2. At the same time, we would like to credit isyekong for their contribution to rDNS-based calibration ideas and data. LeoMoeAPI is accelerating the development of rDNS resolution function, and has already achieved automated geolocation resolution for some backbone networks, but there are some misjudgments. We hope that NextTrace will become a One-Man ISP-friendly traceroute tool in the future, and we are working on improving the calibration of these ASN micro-backbones as much as possible.

 3. In terms of development, I would like to credit missuo and zhshch for their help with Go cross-compilation, design concepts and TCP/UDP Traceroute refactoring, and tsosunchia for their support on TraceMap.

@@ -283,7 +429,9 @@ We hope you can give us as much feedback as possible on IP geolocation errors (s

 ## Credits

-BGP.TOOLS provided some data support for this project and we would like to express our sincere gratitude.
+[sjlleo](https://github.com/sjlleo) The perpetual leader, founder, and core contributors of the NextTrace Project
+
+[BGP.TOOLS](https://bgp.tools) provided some data support for this project. And we would like to express our sincere gratitude.

 [Vincent Young](https://github.com/missuo) (i@yyt.moe)

@@ -293,12 +441,19 @@ BGP.TOOLS provided some data support for this project and we would like to expre

 [waiting4new](https://github.com/waiting4new)

-[FFEE_CO](https://github.com/fkx4-p) 
+[FFEE_CO](https://github.com/fkx4-p)

 ### Others

 Although other third-party APIs are integrated in this project, please refer to the official website of the third-party APIs for specific TOS and AUP. If you encounter IP data errors, please contact them directly to correct them.

+For feedback related to corrections about IP information, we currently have two channels available:
+>- [IP 错误报告汇总帖](https://github.com/nxtrace/NTrace-core/issues/41) in the GITHUB ISSUES section of this project (Recommended)
+>- This project's dedicated correction email: `correction@moeqing.com` (Please note that this email is only for correcting IP-related information. For other feedback, please submit an ISSUE)
+
+How to obtain the freshly baked binary executable of the latest commit?
+> Please go to the most recent [Build & Release](https://github.com/nxtrace/Ntrace-V1/actions/workflows/build.yml) workflow in GitHub Actions.
+
 ## Star History

-[![Star History Chart](https://api.star-history.com/svg?repos=sjlleo/nexttrace&type=Date)](https://star-history.com/#sjlleo/nexttrace&Date)
+[![Star History Chart](https://api.star-history.com/svg?repos=nxtrace/NTrace-core&type=Date)](https://star-history.com/#nxtrace/NTrace-core&Date)
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -12,42 +12,129 @@
 <h4 align="center">一款追求轻量化的开源可视化路由跟踪工具。</h4>

 <p align="center">
-  <a href="https://github.com/sjlleo/nexttrace/actions">
-    <img src="https://img.shields.io/github/actions/workflow/status/sjlleo/nexttrace/build.yml?branch=main&style=flat-square" alt="Github Actions">
+  <a href="https://github.com/nxtrace/Ntrace-V1/actions">
+    <img src="https://img.shields.io/github/actions/workflow/status/nxtrace/Ntrace-V1/build.yml?branch=main&style=flat-square" alt="Github Actions">
  </a>
-  <a href="https://goreportcard.com/report/github.com/sjlleo/nexttrace">
-    <img src="https://goreportcard.com/badge/github.com/sjlleo/nexttrace?style=flat-square">
+  <a href="https://goreportcard.com/report/github.com/nxtrace/Ntrace-V1">
+    <img src="https://goreportcard.com/badge/github.com/nxtrace/Ntrace-V1?style=flat-square">
  </a>
-  <a href="https://github.com/sjlleo/nexttrace/releases">
-    <img src="https://img.shields.io/github/release/sjlleo/nexttrace/all.svg?style=flat-square">
+  <a href="https://github.com/nxtrace/Ntrace-V1/releases">
+    <img src="https://img.shields.io/github/release/nxtrace/Ntrace-V1/all.svg?style=flat-square">
+  </a>
+  <a href="https://telegram.dog/sjprojects">
+    <img src="https://img.shields.io/endpoint?color=neon&style=flat-square&url=https%3A%2F%2Ftg.sumanjay.workers.dev%2Fnexttrace">
  </a>
 </p>

-如果您喜欢这个项目，可以通过[爱发电支持](https://afdian.net/a/sjlleo/plan)我们项目的持续发展，您的捐助将用于服务器和 API 开支，非常感谢！
+## IAAS Sponsor
+
+<div style="text-align: center;">
+    <a href="https://dmit.io">
+        <img src="https://www.dmit.io/templates/dmit_theme_2020/dmit/assets/images/dmit_logo_with_text_blue.svg" width="170.7" height="62.9">
+    </a>
+    &nbsp;&nbsp;&nbsp;&nbsp;
+    <a href="https://misaka.io" >
+        <img src="https://www.jsdelivr.com/assets/8997e39e1f9d776502ab4d7cdff9d1608aa67aaf/img/globalping/sponsors/misaka.svg" width="170.7" height="62.9">
+    </a>
+    &nbsp;&nbsp;&nbsp;&nbsp;
+    <a href="https://skywolf.cloud" >
+        <img src="https://hk.skywolf.cloud/assets/img/skywolf.svg" width="170.7" height="62.9">
+    </a>
+</div>
+
+
+
+我们非常感谢 [DMIT](https://dmit.io) 和 [Misaka](https://misaka.io) 和 [Skywolf](https://skywolf.cloud) 提供了支持本项目所需的网络基础设施。

 ## How To Use

+Document Language: [English](README.md) | 简体中文
+
+⚠️ 请注意：我们欢迎来自社区的PR提交，但是请将您的PR提交至 [NTrace-V1](https://github.com/nxtrace/NTrace-V1) 仓库，而不是 [NTrace-core](https://github.com/nxtrace/NTrace-core) 仓库。<br>
+关于NTrace-V1和NTrace-core两个仓库的说明：<br>
+二者将大体上保持一致。所有的开发工作均在NTrace-V1仓库中进行。NTrace-V1仓库首先发布新版本，在稳定运行一段时间后（时长不定），我们会把版本同步至NTrace-core。这意味着NTrace-V1仓库充当了一个“测试版”的角色。<br>
+请注意，版本同步也存在例外。如果NTrace-V1的某个版本出现了严重的bug，NTrace-core会跳过这一有缺陷的版本，直接同步到下一个修复了该问题的版本。
+
 ### Before Using

-使用 NextTrace 之前，我们建议您先阅读 [#IP 数据以及精准度说明](https://github.com/sjlleo/nexttrace/blob/main/README_zh_CN.md#ip-%E6%95%B0%E6%8D%AE%E4%BB%A5%E5%8F%8A%E7%B2%BE%E5%87%86%E5%BA%A6%E8%AF%B4%E6%98%8E)，在了解您自己的对数据精准度需求以后再进行抉择。
+使用 NextTrace 之前，我们建议您先阅读 [#IP 数据以及精准度说明](https://github.com/nxtrace/NTrace-core/blob/main/README_zh_CN.md#ip-%E6%95%B0%E6%8D%AE%E4%BB%A5%E5%8F%8A%E7%B2%BE%E5%87%86%E5%BA%A6%E8%AF%B4%E6%98%8E)，在了解您自己的对数据精准度需求以后再进行抉择。
+
+[NextTrace 的Telegram频道](https://t.me/nexttrace)由项目成员负责，会传递一部分通知，也会发布一些成员自己分享的小工具。项目成员的意见可作为未来项目发展的可能方向，随着开发进度变化可能会有所改动，不代表未来一定会实装，正式定稿公告会发布于 Issue 中。

 ### Automated Install

-```bash
-# Linux 一键安装脚本
-bash -c "$(curl -Ls https://raw.githubusercontent.com/sjlleo/nexttrace/main/nt_install.sh)"
+* Linux 
+  * 一键安装脚本

-# macOS brew 安装命令
-brew tap xgadget-lab/nexttrace && brew install nexttrace
+    ```shell
+    bash -c "$(curl http://nexttrace-io-leomoe-api-a0.shop/nt_install_v1.sh)"
+    ```
+    
+  * Arch Linux AUR 安装命令
+     * 直接下载bin包(仅支持amd64)

-# GHPROXY 镜像（国内使用）
-bash -c "$(curl -Ls https://ghproxy.com/https://raw.githubusercontent.com/sjlleo/nexttrace/main/nt_install.sh)"
-```
+          ```shell
+          yay -S nexttrace-bin`
+          ```
+     * AUR 的构建分别由 ouuan 维护
+  * Linuxbrew 安装命令

-Windows 用户请直接前往 [Release](https://github.com/sjlleo/nexttrace/releases/latest) 下载编译后的二进制 exe 文件。
+     同macOS Homebrew安装方法(homebrew-core版仅支持amd64)
+  * Deepin 安装命令
+
+     ```shell
+     apt install nexttrace
+     ```
+  * Termux 安装命令
+    
+     ```shell
+     pkg install nexttrace-enhanced
+     ```
+      
+     
+* macOS
+  * macOS Homebrew 安装命令
+     * homebrew-core版
+
+          ```shell
+          brew install nexttrace
+          ```
+     * 本仓库ACTIONS自动构建版(更新更快)
+
+          ```shell
+          brew tap nxtrace/nexttrace && brew install nxtrace/nexttrace/nexttrace
+          ```
+     * homebrew-core 构建由 chenrui333 维护，请注意该版本更新可能会落后仓库Action自动构建版本
+
+* Windows
+  * Windows Scoop 安装命令
+     * scoop-extras版
+
+          ```powershell
+          scoop bucket add extras && scoop install extras/nexttrace
+          ```
+
+     * scoop-extra 由 soenggam 维护
+
+  请注意，以上多种安装方式的仓库均由开源爱好者自行维护，不保证可用性和及时更新，如遇到问题请联系仓库维护者解决，或使用本项目官方编译提供的二进制包。
+
+### Manual Install
+* 下载预编译的可执行程序
+    
+    对于以上方法没有涵盖的用户，请直接前往 [Release](https://github.com/nxtrace/Ntrace-V1/releases/latest) 下载编译后的二进制可执行文件。
+
+    * `Release`里面为很多系统以及不同架构提供了编译好的二进制可执行文件，如果没有可以自行编译。
+    * 一些本项目的必要依赖在`Windows`上`Golang`底层实现不完全，所以目前`NextTrace`在`Windows`平台出于实验性支持阶段。
+
+* 从源码安装
+
+    您可在自行安装Go >= 1.20后，使用以下命令安装
+
+    ```shell
+    go install github.com/nxtrace/Ntrace-V1@latest
+    ```
+    安装后可执行文件在`$GOPATH/bin`目录下，如果您没有设置`GOPATH`，则在`$HOME/go/bin`目录下。

- `Release`里面为很多系统以及不同架构提供了编译好的二进制可执行文件，如果没有可以自行编译。
- 一些本项目的必要依赖在`Windows`上`Golang`底层实现不完全，所以目前`NextTrace`在`Windows`平台出于实验性支持阶段。

 ### Get Started

@@ -62,12 +149,24 @@ nexttrace http://example.com:8080/index.html?q=1
 # 表格打印，使用 --table / -t 参数，将实时显示结果
 nexttrace --table 1.0.0.1

+# 一个方便供机器读取转化的模式
+nexttrace --raw 1.0.0.1
+nexttrace --json 1.0.0.1
+
+# 只进行IPv4/IPv6解析，且当多个IP时自动选择第一个IP
+nexttrace --ipv4 g.co
+nexttrace --ipv6 g.co
+
 # IPv6 ICMP Trace
 nexttrace 2606:4700:4700::1111

 # 禁用路径可视化 使用 --map / -M 参数
 nexttrace koreacentral.blob.core.windows.net
 # MapTrace URL: https://api.leo.moe/tracemap/html/c14e439e-3250-5310-8965-42a1e3545266.html
+
+# 禁用MPLS显示 使用 --disable-mpls / -e 参数 或 NEXTTRACE_DISABLEMPLS 环境变量
+nexttrace --disable-mpls example.com
+export NEXTTRACE_DISABLEMPLS=1
 ```

 PS: 路由可视化的绘制模块由 [@tsosunchia](https://github.com/tsosunchia) 同学编写，具体代码可在 [tsosunchia/traceMap](https://github.com/tsosunchia/traceMap) 查看
@@ -84,6 +183,17 @@ nexttrace --fast-trace

 # 也可以使用 TCP SYN 而非 ICMP 进行测试
 nexttrace --fast-trace --tcp
+
+# 也可以通过自定义的IP/DOMAIN列表文件进行快速测试
+nexttrace --file /path/to/your/iplist.txt
+# 自定义的IP/DOMAIN列表文件格式
+## 一行一个IP/DOMAIN + 空格 + 描述信息（可选）
+## 例如：
+## 106.37.67.1 北京电信
+## 240e:928:101:31a::1 北京电信
+## bj.10086.cn 北京移动
+## 2409:8080:0:1::1
+## 223.5.5.5
 ```

 `NextTrace` 已支持指定网卡进行路由跟踪
@@ -130,6 +240,9 @@ nexttrace --first 5 --max-hops 10 www.decix.net
 # 关闭IP反向解析功能
 nexttrace --no-rdns www.bbix.net

+# 设置载荷大小为1024字节
+nexttrace --psize 1024 example.com
+
 # 特色功能：打印Route-Path图
 # Route-Path图示例：
 # AS6453 塔塔通信「Singapore『Singapore』」
@@ -177,22 +290,26 @@ nexttrace -T -q 2 --parallel-requests 1 -t -R 2001:4860:4860::8888
 ### 全部用法详见 Usage 菜单

 ```shell
-Usage: nexttrace [-h|--help] [-T|--tcp] [-U|--udp] [-F|--fast-trace] [-p|--port
-                 <integer>] [-q|--queries <integer>] [--parallel-requests
-                 <integer>] [-m|--max-hops <integer>] [-d|--data-provider
-                 (Ip2region|ip2region|IP.SB|ip.sb|IPInfo|ipinfo|IPInsight|ipinsight|IPAPI.com|ip-api.com|IPInfoLocal|ipinfolocal|chunzhen)]
+Usage: nexttrace [-h|--help] [-4|--ipv4] [-6|--ipv6] [-T|--tcp] [-U|--udp]
+                 [-F|--fast-trace] [-p|--port <integer>] [-q|--queries
+                 <integer>] [--parallel-requests <integer>] [-m|--max-hops
+                 <integer>] [-d|--data-provider
+                 (Ip2region|ip2region|IP.SB|ip.sb|IPInfo|ipinfo|IPInsight|ipinsight|IPAPI.com|ip-api.com|IPInfoLocal|ipinfolocal|chunzhen|LeoMoeAPI|leomoeapi|disable-geoip)]
                 [-n|--no-rdns] [-a|--always-rdns] [-P|--route-path]
-                 [-r|--report] [--dn42] [-o|--output] [-t|--table]
-                 [-c|--classic] [-f|--first <integer>] [-M|--map]
+                 [-r|--report] [--dn42] [-o|--output] [-t|--table] [--raw]
+                 [-j|--json] [-c|--classic] [-f|--first <integer>] [-M|--map]
                 [-v|--version] [-s|--source "<value>"] [-D|--dev "<value>"]
                 [-R|--route] [-z|--send-time <integer>] [-i|--ttl-time
-                 <integer>] [_positionalArg_nexttrace_25 "<value>"]
-                 [--dot-server (dnssb|aliyun|dnspod|google|cloudflare)]
-                 [-g|--language (en|cn)]
+                 <integer>] [--timeout <integer>] [--psize <integer>]
+                 [_positionalArg_nexttrace_31 "<value>"] [--dot-server
+                 (dnssb|aliyun|dnspod|google|cloudflare)] [-g|--language
+                 (en|cn)]

 Arguments:

  -h  --help                         Print help information
+  -4  --ipv4                         Use IPv4 only
+  -6  --ipv6                         Use IPv6 only
  -T  --tcp                          Use TCP SYN for tracerouting (default port
                                     is 80)
  -U  --udp                          Use UDP SYN for tracerouting (default port
@@ -215,7 +332,11 @@ Arguments:
                                     reached). Default: 30
  -d  --data-provider                Choose IP Geograph Data Provider [IP.SB,
                                     IPInfo, IPInsight, IP-API.com, Ip2region,
-                                     IPInfoLocal, CHUNZHEN]. Default: LeoMoeAPI
+                                     IPInfoLocal, CHUNZHEN, disable-geoip].
+                                     Default: LeoMoeAPI
+      --pow-provider                 Choose PoW Provider [api.leo.moe, sakura]
+                                     For China mainland users, please use
+                                     sakura. Default: api.leo.moe
  -n  --no-rdns                      Do not resolve IP addresses to their
                                     domain names
  -a  --always-rdns                  Always resolve IP addresses to their
@@ -227,28 +348,38 @@ Arguments:
  -o  --output                       Write trace result to file
                                     (RealTimePrinter ONLY)
  -t  --table                        Output trace results as table
+      --raw                          An Output Easy to Parse
+  -j  --json                         Output trace results as JSON
  -c  --classic                      Classic Output trace results like
                                     BestTrace
  -f  --first                        Start from the first_ttl hop (instead from
                                     1). Default: 1
  -M  --map                          Disable Print Trace Map
+  -e  --disable-mpls                 Disable MPLS
  -v  --version                      Print version info and exit
  -s  --source                       Use source src_addr for outgoing packets
  -D  --dev                          Use the following Network Devices as the
                                     source address in outgoing packets
  -R  --route                        Show Routing Table [Provided By BGP.Tools]
-  -z  --send-time                    Set the time interval for sending every
-                                     packet. Useful when some routers use
-                                     rate-limit for ICMP messages. Default: 100
-  -i  --ttl-time                     Set the time interval for sending packets
-                                     groups by TTL. Useful when some routers
-                                     use rate-limit for ICMP messages. Default:
-                                     500
-      --_positionalArg_nexttrace_25  IP Address or domain name
+  -z  --send-time                    Set how many [milliseconds] between
+                                     sending each packet.. Useful when some
+                                     routers use rate-limit for ICMP messages.
+                                     Default: 100
+  -i  --ttl-time                     Set how many [milliseconds] between
+                                     sending packets groups by TTL. Useful when
+                                     some routers use rate-limit for ICMP
+                                     messages. Default: 500
+      --timeout                      The number of [milliseconds] to keep probe
+                                     sockets open before giving up on the
+                                     connection.. Default: 1000
+      --psize                        Set the packet size (payload size).
+                                     Default: 52
+      --_positionalArg_nexttrace_31  IP Address or domain name
      --dot-server                   Use DoT Server for DNS Parse [dnssb,
                                     aliyun, dnspod, google, cloudflare]
  -g  --language                     Choose the language for displaying [en,
                                     cn]. Default: cn
+      --file                         Read IP Address or domain name from file
 ```

 ## 项目截图
@@ -259,7 +390,7 @@ Arguments:

 ## 第三方 IP 数据库 API 开发接口

-NextTrace 所有的的 IP 地理位置 `API DEMO` 可以参考[这里](https://github.com/sjlleo/nexttrace/blob/main/ipgeo/)
+NextTrace 所有的的 IP 地理位置 `API DEMO` 可以参考[这里](https://github.com/nxtrace/NTrace-core/blob/main/ipgeo/)

 你可以在这里添加你自己的 API 接口，为了 NextTrace 能够正确显示你接口中的内容，请参考 `leo.go` 中所需要的信息

@@ -267,13 +398,38 @@ NextTrace 所有的的 IP 地理位置 `API DEMO` 可以参考[这里](https://g

 [GitHub - sjlleo/nexttrace-backend: NextTrace BackEnd](https://github.com/sjlleo/nexttrace-backend)

-## NextTrace Enhanced
+NextTrace `LeoMoeAPI`现已使用Proof of Work(POW)机制来防止滥用，其中NextTrace作为客户端引入了powclient库，POW CLIENT/SERVER均已开源，欢迎大家使用。(POW模块相关问题请发到对应的仓库)
+- [GitHub - tsosunchia/powclient: Proof of Work CLIENT for NextTrace](https://github.com/tsosunchia/powclient)
+- [GitHub - tsosunchia/powserver: Proof of Work SERVER for NextTrace](https://github.com/tsosunchia/powserver)

-https://github.com/OwO-Network/nexttrace-enhanced
+对于中国大陆用户，可以使用 [Nya Labs](https://natfrp.com) 提供的位于大陆的POW服务器优化访问速度
+```shell
+#使用方法任选其一
+#1. 在环境变量中设置
+export NEXTTRACE_POWPROVIDER=sakura
+#2. 在命令行中设置
+nexttrace --pow-provider sakura
+```
+
+## OpenTrace
+
+`OpenTrace`是 @Archeb 开发的`NextTrace`的跨平台`GUI`版本，带来您熟悉但更强大的用户体验。
+
+该软件仍然处于早期开发阶段，可能存在许多缺陷和错误，需要您宝贵的使用反馈。
+
+[https://github.com/Archeb/opentrace](https://github.com/Archeb/opentrace)
+
+## NEXTTRACE WEB API
+
+`NextTraceWebApi`是一个`MTR`风格的`NextTrace`网页版服务端实现，提供了包括`Docker`在内多种部署方式。
+
+[https://github.com/nxtrace/nexttracewebapi](https://github.com/nxtrace/nexttracewebapi)

 ## Credits

-BGP.TOOLS 提供了本项目的一些数据支持，在此表示由衷地感谢。
+[sjlleo](https://github.com/sjlleo) NextTrace 项目永远的领导者、创始人及核心贡献者
+
+[BGP.TOOLS](https://bgp.tools) 提供了本项目的一些数据支持，在此表示由衷地感谢。

 [Vincent Young](https://github.com/missuo) (i@yyt.moe)

@@ -289,8 +445,15 @@ BGP.TOOLS 提供了本项目的一些数据支持，在此表示由衷地感谢

 其他第三方 API 尽管集成在本项目内，但是具体的 TOS 以及 AUP，请详见第三方 API 官网。如遇到 IP 数据错误，也请直接联系他们纠错。

+如何获取最新commit的新鲜出炉的二进制可执行文件？
+>请前往GitHub Actions中最新一次 [Build & Release](https://github.com/nxtrace/Ntrace-V1/actions/workflows/build.yml) workflow.
+
 ## IP 数据以及精准度说明

+对于IP相关信息的纠错反馈，我们目前开放了两个渠道：
+>- 本项目的GITHUB ISSUES区中的[IP 错误报告汇总帖](https://github.com/nxtrace/NTrace-core/issues/41)
+>- 本项目的纠错专用邮箱: `correction@moeqing.com` （请注意此邮箱仅供IP相关信息纠错专用，其他反馈请发送ISSUE）
+
 NextTrace 有多个数据源可以选择，目前默认使用的 LeoMoeAPI 为我们项目维护的数据源。

 该项目由 OwO Network 的 [Missuo](https://github.com/missuo) && [Leo](https://github.com/sjlleo) 发起，由 [Zhshch](https://github.com/zhshch2002/) 完成最早期架构的编写和指导，后由 Leo 完成了大部分开发工作，现主要交由 [tsosunchia](https://github.com/tsosunchia) 以及 MoeQing Network 完成后续的二开和维护工作。
@@ -346,3 +509,9 @@ LAX,US,California,Los Anegles
 ```

 需要注意的是，NextTrace 支持自动匹配 CSV 中的城市名，如果您的 PTR 记录中有 `losangeles`，您可以只添加上面一条记录就可以正常识别并读取。
+
+rkflow in GitHub Actions.
+
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=nxtrace/NTrace-core&type=Date)](https://star-history.com/#nxtrace/NTrace-core&Date)
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -12,22 +12,24 @@ import (
 	"time"

 	"github.com/akamensky/argparse"
+	"github.com/nxtrace/NTrace-core/config"
+	fastTrace "github.com/nxtrace/NTrace-core/fast_trace"
+	"github.com/nxtrace/NTrace-core/ipgeo"
+	"github.com/nxtrace/NTrace-core/printer"
+	"github.com/nxtrace/NTrace-core/reporter"
+	"github.com/nxtrace/NTrace-core/trace"
+	"github.com/nxtrace/NTrace-core/tracelog"
+	"github.com/nxtrace/NTrace-core/tracemap"
+	"github.com/nxtrace/NTrace-core/util"
+	"github.com/nxtrace/NTrace-core/wshandle"
 	"github.com/syndtr/gocapability/capability"
-	"github.com/xgadget-lab/nexttrace/config"
-	fastTrace "github.com/xgadget-lab/nexttrace/fast_trace"
-	"github.com/xgadget-lab/nexttrace/ipgeo"
-	"github.com/xgadget-lab/nexttrace/printer"
-	"github.com/xgadget-lab/nexttrace/reporter"
-	"github.com/xgadget-lab/nexttrace/trace"
-	"github.com/xgadget-lab/nexttrace/tracelog"
-	"github.com/xgadget-lab/nexttrace/tracemap"
-	"github.com/xgadget-lab/nexttrace/util"
-	"github.com/xgadget-lab/nexttrace/wshandle"
 )

 func Excute() {
 	parser := argparse.NewParser("nexttrace", "An open source visual route tracking CLI tool")
 	// Create string flag
+	ipv4Only := parser.Flag("4", "ipv4", &argparse.Options{Help: "Use IPv4 only"})
+	ipv6Only := parser.Flag("6", "ipv6", &argparse.Options{Help: "Use IPv6 only"})
 	tcp := parser.Flag("T", "tcp", &argparse.Options{Help: "Use TCP SYN for tracerouting (default port is 80)"})
 	udp := parser.Flag("U", "udp", &argparse.Options{Help: "Use UDP SYN for tracerouting (default port is 53)"})
 	fast_trace := parser.Flag("F", "fast-trace", &argparse.Options{Help: "One-Key Fast Trace to China ISPs"})
@@ -37,8 +39,10 @@ func Excute() {
 	numMeasurements := parser.Int("q", "queries", &argparse.Options{Default: 3, Help: "Set the number of probes per each hop"})
 	parallelRequests := parser.Int("", "parallel-requests", &argparse.Options{Default: 18, Help: "Set ParallelRequests number. It should be 1 when there is a multi-routing"})
 	maxHops := parser.Int("m", "max-hops", &argparse.Options{Default: 30, Help: "Set the max number of hops (max TTL to be reached)"})
-	dataOrigin := parser.Selector("d", "data-provider", []string{"Ip2region", "ip2region", "IP.SB", "ip.sb", "IPInfo", "ipinfo", "IPInsight", "ipinsight", "IPAPI.com", "ip-api.com", "IPInfoLocal", "ipinfolocal", "chunzhen"}, &argparse.Options{Default: "LeoMoeAPI",
-		Help: "Choose IP Geograph Data Provider [IP.SB, IPInfo, IPInsight, IP-API.com, Ip2region, IPInfoLocal, CHUNZHEN]"})
+	dataOrigin := parser.Selector("d", "data-provider", []string{"Ip2region", "ip2region", "IP.SB", "ip.sb", "IPInfo", "ipinfo", "IPInsight", "ipinsight", "IPAPI.com", "ip-api.com", "IPInfoLocal", "ipinfolocal", "chunzhen", "LeoMoeAPI", "leomoeapi", "disable-geoip"}, &argparse.Options{Default: "LeoMoeAPI",
+		Help: "Choose IP Geograph Data Provider [IP.SB, IPInfo, IPInsight, IP-API.com, Ip2region, IPInfoLocal, CHUNZHEN, disable-geoip]"})
+	powProvider := parser.Selector("", "pow-provider", []string{"api.leo.moe", "sakura"}, &argparse.Options{Default: "api.leo.moe",
+		Help: "Choose PoW Provider [api.leo.moe, sakura] For China mainland users, please use sakura"})
 	noRdns := parser.Flag("n", "no-rdns", &argparse.Options{Help: "Do not resolve IP addresses to their domain names"})
 	alwaysRdns := parser.Flag("a", "always-rdns", &argparse.Options{Help: "Always resolve IP addresses to their domain names"})
 	routePath := parser.Flag("P", "route-path", &argparse.Options{Help: "Print traceroute hop path by ASN and location"})
@@ -46,20 +50,26 @@ func Excute() {
 	dn42 := parser.Flag("", "dn42", &argparse.Options{Help: "DN42 Mode"})
 	output := parser.Flag("o", "output", &argparse.Options{Help: "Write trace result to file (RealTimePrinter ONLY)"})
 	tablePrint := parser.Flag("t", "table", &argparse.Options{Help: "Output trace results as table"})
-	classicPrint := parser.Flag("c", "classic", &argparse.Options{Help: "An Output Easy to Parse"})
+	rawPrint := parser.Flag("", "raw", &argparse.Options{Help: "An Output Easy to Parse"})
+	jsonPrint := parser.Flag("j", "json", &argparse.Options{Help: "Output trace results as JSON"})
+	classicPrint := parser.Flag("c", "classic", &argparse.Options{Help: "Classic Output trace results like BestTrace"})
 	beginHop := parser.Int("f", "first", &argparse.Options{Default: 1, Help: "Start from the first_ttl hop (instead from 1)"})
-	maptrace := parser.Flag("M", "map", &argparse.Options{Help: "Disable Print Trace Map"})
+	disableMaptrace := parser.Flag("M", "map", &argparse.Options{Help: "Disable Print Trace Map"})
+	disableMPLS := parser.Flag("e", "disable-mpls", &argparse.Options{Help: "Disable MPLS"})
 	ver := parser.Flag("v", "version", &argparse.Options{Help: "Print version info and exit"})
-	src_addr := parser.String("s", "source", &argparse.Options{Help: "Use source src_addr for outgoing packets"})
-	src_dev := parser.String("D", "dev", &argparse.Options{Help: "Use the following Network Devices as the source address in outgoing packets"})
+	srcAddr := parser.String("s", "source", &argparse.Options{Help: "Use source src_addr for outgoing packets"})
+	srcDev := parser.String("D", "dev", &argparse.Options{Help: "Use the following Network Devices as the source address in outgoing packets"})
 	router := parser.Flag("R", "route", &argparse.Options{Help: "Show Routing Table [Provided By BGP.Tools]"})
-	packet_interval := parser.Int("z", "send-time", &argparse.Options{Default: 100, Help: "Set the time interval for sending every packet. Useful when some routers use rate-limit for ICMP messages"})
-	ttl_interval := parser.Int("i", "ttl-time", &argparse.Options{Default: 500, Help: "Set the time interval for sending packets groups by TTL. Useful when some routers use rate-limit for ICMP messages"})
+	packetInterval := parser.Int("z", "send-time", &argparse.Options{Default: 100, Help: "Set how many [milliseconds] between sending each packet.. Useful when some routers use rate-limit for ICMP messages"})
+	ttlInterval := parser.Int("i", "ttl-time", &argparse.Options{Default: 500, Help: "Set how many [milliseconds] between sending packets groups by TTL. Useful when some routers use rate-limit for ICMP messages"})
+	timeout := parser.Int("", "timeout", &argparse.Options{Default: 1000, Help: "The number of [milliseconds] to keep probe sockets open before giving up on the connection."})
+	packetSize := parser.Int("", "psize", &argparse.Options{Default: 52, Help: "Set the packet size (payload size)"})
 	str := parser.StringPositional(&argparse.Options{Help: "IP Address or domain name"})
 	dot := parser.Selector("", "dot-server", []string{"dnssb", "aliyun", "dnspod", "google", "cloudflare"}, &argparse.Options{
 		Help: "Use DoT Server for DNS Parse [dnssb, aliyun, dnspod, google, cloudflare]"})
 	lang := parser.Selector("g", "language", []string{"en", "cn"}, &argparse.Options{Default: "cn",
 		Help: "Choose the language for displaying [en, cn]"})
+	file := parser.String("", "file", &argparse.Options{Help: "Read IP Address or domain name from file"})

 	err := parser.Parse(os.Args)
 	if err != nil {
@@ -68,7 +78,9 @@ func Excute() {
 		fmt.Print(parser.Usage(err))
 		return
 	}
-	printer.Version()
+	if !*jsonPrint {
+		printer.Version()
+	}
 	if *ver {
 		printer.CopyRight()
 		os.Exit(0)
@@ -80,8 +92,21 @@ func Excute() {
 		*port = 80
 	}

-	if *fast_trace {
-		fastTrace.FastTest(*tcp, *output)
+	if *fast_trace || *file != "" {
+		var paramsFastTrace = fastTrace.ParamsFastTrace{
+			SrcDev:         *srcDev,
+			SrcAddr:        *srcAddr,
+			BeginHop:       *beginHop,
+			MaxHops:        *maxHops,
+			RDns:           !*noRdns,
+			AlwaysWaitRDNS: *alwaysRdns,
+			Lang:           *lang,
+			PktSize:        *packetSize,
+			Timeout:        time.Duration(*timeout) * time.Millisecond,
+			File:           *file,
+		}
+
+		fastTrace.FastTest(*tcp, *output, paramsFastTrace)
 		if *output {
 			fmt.Println("您的追踪日志已经存放在 /tmp/trace.log 中")
 		}
@@ -89,6 +114,7 @@ func Excute() {
 		os.Exit(0)
 	}

+	// DOMAIN处理开始
 	if domain == "" {
 		fmt.Print(parser.Usage(err))
 		return
@@ -105,6 +131,7 @@ func Excute() {
 			domain = strings.Split(domain, ":")[0]
 		}
 	}
+	// DOMAIN处理结束

 	capabilities_check()
 	// return
@@ -115,33 +142,27 @@ func Excute() {
 		fmt.Println("NextTrace 基于 Windows 的路由跟踪还在早期开发阶段，目前还存在诸多问题，TCP/UDP SYN 包请求可能不能正常运行")
 	}

-	if *udp {
-		ip = util.DomainLookUp(domain, true, *dot)
-	} else {
-		ip = util.DomainLookUp(domain, false, *dot)
-	}
-
-	if *src_dev != "" {
-		dev, _ := net.InterfaceByName(*src_dev)
-
-		if addrs, err := dev.Addrs(); err == nil {
-			for _, addr := range addrs {
-				if (addr.(*net.IPNet).IP.To4() == nil) == (ip.To4() == nil) {
-					*src_addr = addr.(*net.IPNet).IP.String()
-				}
-			}
-		}
-	}
-
 	if *dn42 {
 		// 初始化配置
 		config.InitConfig()
 		*dataOrigin = "DN42"
-		*maptrace = true
+		*disableMaptrace = true
 	}

+	/**
+	 * 此处若使用goroutine同时运行ws的建立与nslookup，
+	 * 会导致第一跳的IP信息无法获取，原因不明。
+	 */
+	//var wg sync.WaitGroup
+	//wg.Add(2)
+	//
+	//go func() {
+	//	defer wg.Done()
 	if strings.ToUpper(*dataOrigin) == "LEOMOEAPI" {
 		val, ok := os.LookupEnv("NEXTTRACE_DATAPROVIDER")
+		if strings.ToUpper(*powProvider) != "API.LEO.MOE" {
+			util.PowProviderParam = *powProvider
+		}
 		if ok {
 			*dataOrigin = val
 		} else {
@@ -153,10 +174,58 @@ func Excute() {
 			}()
 		}
 	}
+	//}()
+	//
+	//go func() {
+	//	defer wg.Done()
+	err = nil
+	if *udp {
+		if *ipv6Only {
+			fmt.Println("[Info] IPv6 UDP Traceroute is not supported right now.")
+			os.Exit(0)
+		}
+		ip, err = util.DomainLookUp(domain, "4", *dot, *jsonPrint)
+	} else {
+		if *ipv6Only {
+			ip, err = util.DomainLookUp(domain, "6", *dot, *jsonPrint)
+		} else if *ipv4Only {
+			ip, err = util.DomainLookUp(domain, "4", *dot, *jsonPrint)
+		} else {
+			ip, err = util.DomainLookUp(domain, "all", *dot, *jsonPrint)
+		}
+	}
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+	//}()
+	//
+	//wg.Wait()

-	printer.PrintTraceRouteNav(ip, domain, *dataOrigin)
+	if *srcDev != "" {
+		dev, _ := net.InterfaceByName(*srcDev)
+		if addrs, err := dev.Addrs(); err == nil {
+			for _, addr := range addrs {
+				if (addr.(*net.IPNet).IP.To4() == nil) == (ip.To4() == nil) {
+					*srcAddr = addr.(*net.IPNet).IP.String()
+					// 检查是否是内网IP
+					if !(net.ParseIP(*srcAddr).IsPrivate() ||
+						net.ParseIP(*srcAddr).IsLoopback() ||
+						net.ParseIP(*srcAddr).IsLinkLocalUnicast() ||
+						net.ParseIP(*srcAddr).IsLinkLocalMulticast()) {
+						// 若不是则跳出
+						break
+					}
+				}
+			}
+		}
+	}

-	var m trace.Method = ""
+	if !*jsonPrint {
+		printer.PrintTraceRouteNav(ip, domain, *dataOrigin, *maxHops, *packetSize)
+	}
+
+	var m trace.Method

 	switch {
 	case *tcp:
@@ -173,24 +242,27 @@ func Excute() {

 	var conf = trace.Config{
 		DN42:             *dn42,
-		SrcAddr:          *src_addr,
+		SrcAddr:          *srcAddr,
 		BeginHop:         *beginHop,
 		DestIP:           ip,
 		DestPort:         *port,
 		MaxHops:          *maxHops,
-		PacketInterval:   *packet_interval,
-		TTLInterval:      *ttl_interval,
+		PacketInterval:   *packetInterval,
+		TTLInterval:      *ttlInterval,
 		NumMeasurements:  *numMeasurements,
 		ParallelRequests: *parallelRequests,
 		Lang:             *lang,
 		RDns:             !*noRdns,
 		AlwaysWaitRDNS:   *alwaysRdns,
 		IPGeoSource:      ipgeo.GetSource(*dataOrigin),
-		Timeout:          1 * time.Second,
+		Timeout:          time.Duration(*timeout) * time.Millisecond,
+		PktSize:          *packetSize,
 	}

 	if !*tablePrint {
 		if *classicPrint {
+			conf.RealtimePrinter = printer.ClassicPrinter
+		} else if *rawPrint {
 			conf.RealtimePrinter = printer.EasyPrinter
 		} else {
 			if *output {
@@ -208,6 +280,24 @@ func Excute() {
 		}
 	}

+	if *jsonPrint {
+		conf.RealtimePrinter = nil
+		conf.AsyncPrinter = nil
+	}
+
+	if util.Uninterrupted != "" && *rawPrint {
+		for {
+			_, err := trace.Traceroute(m, conf)
+			if err != nil {
+				fmt.Println(err)
+			}
+		}
+	}
+
+	if *disableMPLS {
+		util.DisableMPLS = "1"
+	}
+
 	res, err := trace.Traceroute(m, conf)

 	if err != nil {
@@ -223,9 +313,29 @@ func Excute() {
 		r.Print()
 	}

-	if !*maptrace {
-		r, _ := json.Marshal(res)
-		tracemap.GetMapUrl(string(r))
+	r, err := json.Marshal(res)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	if !*disableMaptrace &&
+		(util.StringInSlice(strings.ToUpper(*dataOrigin), []string{"LEOMOEAPI", "IPINFO", "IPINFO", "IP-API.COM", "IPAPI.COM"})) {
+		url, err := tracemap.GetMapUrl(string(r))
+		if err != nil {
+			log.Fatalln(err)
+		}
+		res.TraceMapUrl = url
+		if !*jsonPrint {
+			tracemap.PrintMapUrl(url)
+		}
+	}
+	r, err = json.Marshal(res)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	if *jsonPrint {
+		fmt.Println(string(r))
 	}
 }

--- a/config/basic.go
+++ b/config/basic.go
@@ -0,0 +1,5 @@
+package config
+
+var Version = "v0.0.0.alpha"
+var BuildDate = ""
+var CommitID = ""
--- a/fast_trace/basic.go
+++ b/fast_trace/basic.go
@@ -49,36 +49,36 @@ var Beijing = BackBoneCollection{
 	Location: "北京",
 	CT163: ISPCollection{
 		ISPName: CT163,
-		IP:      "106.37.67.1",
-		IPv6:    "240e:40:e002:1:a:3ee3:c00:0",
+		IP:      "ipv4.pek-4134.nexttrace-io-fasttrace-endpoint.win.",
+		IPv6:    "ipv6.pek-4134.nexttrace-io-fasttrace-endpoint.win.",
 	},

 	CU169: ISPCollection{
 		ISPName: CU169,
-		IP:      "123.125.96.156",
-		IPv6:    "2408:8000:1010:2::10",
+		IP:      "ipv4.pek-4837.nexttrace-io-fasttrace-endpoint.win.",
+		IPv6:    "ipv6.pek-4837.nexttrace-io-fasttrace-endpoint.win.",
 	},

 	CU9929: ISPCollection{
 		ISPName: CU9929,
-		IP:      "221.220.51.1",
+		IP:      "ipv4.pek-9929.nexttrace-io-fasttrace-endpoint.win.",
 	},

 	CM: ISPCollection{
 		ISPName: CM,
-		IP:      "211.136.25.153",
-		IPv6:    "2409:8000:3800:8::3",
+		IP:      "ipv4.pek-9808.nexttrace-io-fasttrace-endpoint.win.",
+		IPv6:    "ipv6.pek-9808.nexttrace-io-fasttrace-endpoint.win.",
 	},

 	CMIN2: ISPCollection{
 		ISPName: CMIN2,
-		IP:      "223.70.155.55",
+		IP:      "ipv4.pek-58807.nexttrace-io-fasttrace-endpoint.win.",
 	},

 	EDU: ISPCollection{
 		ISPName: EDU,
-		IP:      "101.6.15.130",
-		IPv6:    "2001:da8:215:4078:250:56ff:fe97:654d",
+		IP:      "ipv4.pek-4538.nexttrace-io-fasttrace-endpoint.win.",
+		IPv6:    "ipv6.pek-4538.nexttrace-io-fasttrace-endpoint.win.",
 	},
 }

@@ -86,42 +86,42 @@ var Shanghai = BackBoneCollection{
 	Location: "上海",
 	CT163: ISPCollection{
 		ISPName: CT163,
-		IP:      "202.101.21.178",
-		IPv6:    "240e:18:2:153::89",
+		IP:      "ipv4.sha-4134.nexttrace-io-fasttrace-endpoint.win.",
+		IPv6:    "ipv6.sha-4134.nexttrace-io-fasttrace-endpoint.win.",
 	},

 	CTCN2: ISPCollection{
 		ISPName: CTCN2,
-		IP:      "58.32.4.1",
+		IP:      "ipv4.sha-4809.nexttrace-io-fasttrace-endpoint.win.",
 	},

 	CU169: ISPCollection{
 		ISPName: CU169,
-		IP:      "139.226.206.150",
-		IPv6:    "2408:8000:9000:0:4000::437",
+		IP:      "ipv4.sha-4837.nexttrace-io-fasttrace-endpoint.win.",
+		IPv6:    "ipv6.sha-4837.nexttrace-io-fasttrace-endpoint.win.",
 	},

 	CU9929: ISPCollection{
 		ISPName: CU9929,
-		IP:      "210.13.86.1",
-		IPv6:    "2408:8120:2::d6",
+		IP:      "ipv4.sha-9929.nexttrace-io-fasttrace-endpoint.win.",
+		IPv6:    "ipv6.sha-9929.nexttrace-io-fasttrace-endpoint.win.",
 	},

 	CM: ISPCollection{
 		ISPName: CM,
-		IP:      "120.204.34.85",
-		IPv6:    "2409:801e:f0:1::4e1",
+		IP:      "ipv4.sha-9808.nexttrace-io-fasttrace-endpoint.win.",
+		IPv6:    "ipv6.sha-9808.nexttrace-io-fasttrace-endpoint.win.",
 	},

 	CMIN2: ISPCollection{
 		ISPName: CMIN2,
-		IP:      "183.194.134.1",
+		IP:      "ipv4.sha-58807.nexttrace-io-fasttrace-endpoint.win.",
 	},

 	EDU: ISPCollection{
 		ISPName: EDU,
-		IP:      "202.120.58.155",
-		IPv6:    "2001:da8:8000:1:202:120:2:100",
+		IP:      "ipv4.sha-4538.nexttrace-io-fasttrace-endpoint.win.",
+		IPv6:    "ipv6.sha-4538.nexttrace-io-fasttrace-endpoint.win.",
 	},
 }

@@ -129,20 +129,20 @@ var Guangzhou = BackBoneCollection{
 	Location: "广州",
 	CT163: ISPCollection{
 		ISPName: CT163,
-		IP:      "14.116.225.60",
-		IPv6:    "240e:f9:8010::3:110:1",
+		IP:      "ipv4.can-4134.nexttrace-io-fasttrace-endpoint.win.",
+		IPv6:    "ipv6.can-4134.nexttrace-io-fasttrace-endpoint.win.",
 	},

 	CU169: ISPCollection{
 		ISPName: CU169,
-		IP:      "157.18.0.22",
-		IPv6:    "2408:8001:3161:4::1",
+		IP:      "ipv4.can-4837.nexttrace-io-fasttrace-endpoint.win.",
+		IPv6:    "ipv6.can-4837.nexttrace-io-fasttrace-endpoint.win.",
 	},

 	CM: ISPCollection{
 		ISPName: CM,
-		IP:      "120.198.26.254",
-		IPv6:    "2409:8055:3008:1116::150",
+		IP:      "ipv4.can-9808.nexttrace-io-fasttrace-endpoint.win.",
+		IPv6:    "ipv6.can-9808.nexttrace-io-fasttrace-endpoint.win.",
 	},
 }

@@ -150,24 +150,23 @@ var Hangzhou = BackBoneCollection{
 	Location: "杭州",
 	CT163: ISPCollection{
 		ISPName: CT163,
-		IP:      "61.164.23.196",
-		IPv6:    "240e:f3:c000:201::10",
+		IP:      "ipv4.hgh-4134.nexttrace-io-fasttrace-endpoint.win.",
+		IPv6:    "ipv6.hgh-4134.nexttrace-io-fasttrace-endpoint.win.",
 	},
 	CU169: ISPCollection{
 		ISPName: CU169,
-		IP:      "60.12.244.1",
-		IPv6:    "",
+		IP:      "ipv4.hgh-4837.nexttrace-io-fasttrace-endpoint.win.",
 	},
 	CM: ISPCollection{
 		ISPName: CM,
-		IP:      "112.17.224.98",
-		IPv6:    "2409:8028:840:2::11",
+		IP:      "ipv4.hgh-9808.nexttrace-io-fasttrace-endpoint.win.",
+		IPv6:    "ipv6.hgh-9808.nexttrace-io-fasttrace-endpoint.win.",
 	},
 	// 浙江大学 教育网
 	EDU: ISPCollection{
 		ISPName: EDU,
-		IP:      "210.32.2.1",
-		IPv6:    "2001:da8:e000:1::1",
+		IP:      "ipv4.hgh-4538.nexttrace-io-fasttrace-endpoint.win.",
+		IPv6:    "ipv6.hgh-4538.nexttrace-io-fasttrace-endpoint.win.",
 	},
 }

@@ -176,12 +175,12 @@ var Hefei = BackBoneCollection{
 	// 中国科学技术大学 教育网
 	EDU: ISPCollection{
 		ISPName: EDU,
-		IP:      "202.38.64.1",
-		IPv6:    "2001:da8:d805:ffff:2::1",
+		IP:      "ipv4.hfe-4538.nexttrace-io-fasttrace-endpoint.win.",
+		IPv6:    "ipv6.hfe-4538.nexttrace-io-fasttrace-endpoint.win.",
 	},
 	// 中国科学技术大学 科技网
 	CST: ISPCollection{
 		ISPName: "中国科学技术大学 科技网 AS7497",
-		IP:      "210.72.22.2",
+		IP:      "ipv4.hfe-7497.nexttrace-io-fasttrace-endpoint.win.",
 	},
 }
--- a/fast_trace/fast_trace
+++ b/fast_trace/fast_trace
@@ -2,51 +2,60 @@ package fastTrace

 import (
 	"fmt"
+	"github.com/nxtrace/NTrace-core/ipgeo"
+	"github.com/nxtrace/NTrace-core/printer"
+	"github.com/nxtrace/NTrace-core/trace"
+	"github.com/nxtrace/NTrace-core/tracelog"
+	"github.com/nxtrace/NTrace-core/util"
+	"github.com/nxtrace/NTrace-core/wshandle"
 	"log"
-	"net"
 	"os"
 	"os/signal"
-	"time"
-
-	"github.com/xgadget-lab/nexttrace/ipgeo"
-	"github.com/xgadget-lab/nexttrace/printer"
-	"github.com/xgadget-lab/nexttrace/trace"
-	"github.com/xgadget-lab/nexttrace/tracelog"
-	"github.com/xgadget-lab/nexttrace/wshandle"
 )

-func (f *FastTracer) tracert_v6(location string, ispCollection ISPCollection) {
-	fp, err := os.OpenFile("/tmp/trace.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, os.ModePerm)
-	if err != nil {
-		return
-	}
-	defer func(fp *os.File) {
-		err := fp.Close()
-		if err != nil {
-			log.Fatal(err)
-		}
-	}(fp)
+//var pFastTracer ParamsFastTrace

-	log.SetOutput(fp)
-	log.SetFlags(0)
+func (f *FastTracer) tracert_v6(location string, ispCollection ISPCollection) {
 	fmt.Printf("%s『%s %s 』%s\n", printer.YELLOW_PREFIX, location, ispCollection.ISPName, printer.RESET_PREFIX)
-	log.Printf("『%s %s 』\n", location, ispCollection.ISPName)
-	fmt.Printf("traceroute to %s, 30 hops max, 32 byte packets\n", ispCollection.IPv6)
-	log.Printf("traceroute to %s, 30 hops max, 32 byte packets\n", ispCollection.IPv6)
-	ip := net.ParseIP(ispCollection.IPv6)
+	fmt.Printf("traceroute to %s, %d hops max, %d byte packets\n", ispCollection.IPv6, f.ParamsFastTrace.MaxHops, f.ParamsFastTrace.PktSize)
+
+	ip, err := util.DomainLookUp(ispCollection.IPv6, "6", "", true)
+	if err != nil {
+		log.Fatal(err)
+	}
 	var conf = trace.Config{
-		BeginHop:         1,
+		BeginHop:         f.ParamsFastTrace.BeginHop,
 		DestIP:           ip,
 		DestPort:         80,
-		MaxHops:          30,
+		MaxHops:          f.ParamsFastTrace.MaxHops,
 		NumMeasurements:  3,
 		ParallelRequests: 18,
-		RDns:             true,
+		RDns:             f.ParamsFastTrace.RDns,
+		AlwaysWaitRDNS:   f.ParamsFastTrace.AlwaysWaitRDNS,
+		PacketInterval:   100,
+		TTLInterval:      500,
 		IPGeoSource:      ipgeo.GetSource("LeoMoeAPI"),
-		Timeout:          1 * time.Second,
+		Timeout:          f.ParamsFastTrace.Timeout,
+		SrcAddr:          f.ParamsFastTrace.SrcAddr,
+		PktSize:          f.ParamsFastTrace.PktSize,
+		Lang:             f.ParamsFastTrace.Lang,
 	}

 	if oe {
+		fp, err := os.OpenFile("/tmp/trace.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, os.ModePerm)
+		if err != nil {
+			return
+		}
+		defer func(fp *os.File) {
+			err := fp.Close()
+			if err != nil {
+				log.Fatal(err)
+			}
+		}(fp)
+		log.SetOutput(fp)
+		log.SetFlags(0)
+		log.Printf("『%s %s 』\n", location, ispCollection.ISPName)
+		log.Printf("traceroute to %s, %d hops max, %d byte packets\n", ispCollection.IPv6, f.ParamsFastTrace.MaxHops, f.ParamsFastTrace.PktSize)
 		conf.RealtimePrinter = tracelog.RealtimePrinter
 	} else {
 		conf.RealtimePrinter = printer.RealtimePrinter
@@ -58,7 +67,7 @@ func (f *FastTracer) tracert_v6(location string, ispCollection ISPCollection) {
 		log.Fatal(err)
 	}

-	println()
+	fmt.Println()
 }

 func (f *FastTracer) testAll_v6() {
@@ -98,19 +107,28 @@ func (f *FastTracer) testEDU_v6() {
 	f.tracert_v6(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.EDU)
 }

-func FastTestv6(tm bool, outEnable bool) {
+func (f *FastTracer) testFast_v6() {
+	f.tracert_v6(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CT163)
+	f.tracert_v6(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CU169)
+	f.tracert_v6(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CM)
+	f.tracert_v6(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.EDU)
+}
+
+func FastTestv6(tm bool, outEnable bool, paramsFastTrace ParamsFastTrace) {
 	var c string

 	oe = outEnable

-	fmt.Println("您想测试哪些ISP的路由？\n1. 国内四网\n2. 电信\n3. 联通\n4. 移动\n5. 教育网")
+	fmt.Println("您想测试哪些ISP的路由？\n1. 国内四网\n2. 电信\n3. 联通\n4. 移动\n5. 教育网\n6. 全部")
 	fmt.Print("请选择选项：")
 	_, err := fmt.Scanln(&c)
 	if err != nil {
 		c = "1"
 	}

-	ft := FastTracer{}
+	ft := FastTracer{
+		ParamsFastTrace: paramsFastTrace,
+	}

 	// 建立 WebSocket 连接
 	w := wshandle.New()
@@ -129,7 +147,7 @@ func FastTestv6(tm bool, outEnable bool) {

 	switch c {
 	case "1":
-		ft.testAll_v6()
+		ft.testFast_v6()
 	case "2":
 		ft.testCT_v6()
 	case "3":
@@ -138,7 +156,9 @@ func FastTestv6(tm bool, outEnable bool) {
 		ft.testCM_v6()
 	case "5":
 		ft.testEDU_v6()
-	default:
+	case "6":
 		ft.testAll_v6()
+	default:
+		ft.testFast_v6()
 	}
 }
--- a/fast_trace/fast_trace.go
+++ b/fast_trace/fast_trace.go
@@ -1,60 +1,90 @@
 package fastTrace

 import (
+	"bufio"
 	"fmt"
+	"github.com/nxtrace/NTrace-core/ipgeo"
+	"github.com/nxtrace/NTrace-core/printer"
+	"github.com/nxtrace/NTrace-core/trace"
+	"github.com/nxtrace/NTrace-core/tracelog"
+	"github.com/nxtrace/NTrace-core/util"
+	"github.com/nxtrace/NTrace-core/wshandle"
 	"log"
 	"net"
 	"os"
 	"os/signal"
+	"strings"
 	"time"
-
-	"github.com/xgadget-lab/nexttrace/ipgeo"
-	"github.com/xgadget-lab/nexttrace/printer"
-	"github.com/xgadget-lab/nexttrace/trace"
-	"github.com/xgadget-lab/nexttrace/tracelog"
-	"github.com/xgadget-lab/nexttrace/wshandle"
 )

 type FastTracer struct {
 	TracerouteMethod trace.Method
+	ParamsFastTrace  ParamsFastTrace
+}
+
+type ParamsFastTrace struct {
+	SrcDev         string
+	SrcAddr        string
+	BeginHop       int
+	MaxHops        int
+	RDns           bool
+	AlwaysWaitRDNS bool
+	Lang           string
+	PktSize        int
+	Timeout        time.Duration
+	File           string
+}
+
+type IpListElement struct {
+	Ip       string
+	Desc     string
+	Version4 bool // true for IPv4, false for IPv6
 }

 var oe = false

 func (f *FastTracer) tracert(location string, ispCollection ISPCollection) {
-	fp, err := os.OpenFile("/tmp/trace.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, os.ModePerm)
-	if err != nil {
-		return
-	}
-	defer func(fp *os.File) {
-		err := fp.Close()
-		if err != nil {
-			log.Fatal(err)
-		}
-	}(fp)
-
-	log.SetOutput(fp)
-	log.SetFlags(0)
 	fmt.Printf("%s『%s %s 』%s\n", printer.YELLOW_PREFIX, location, ispCollection.ISPName, printer.RESET_PREFIX)
-	log.Printf("『%s %s 』\n", location, ispCollection.ISPName)
-	fmt.Printf("traceroute to %s, 30 hops max, 32 byte packets\n", ispCollection.IP)
-	log.Printf("traceroute to %s, 30 hops max, 32 byte packets\n", ispCollection.IP)
-	ip := net.ParseIP(ispCollection.IP)
+	fmt.Printf("traceroute to %s, %d hops max, %d byte packets\n", ispCollection.IP, f.ParamsFastTrace.MaxHops, f.ParamsFastTrace.PktSize)
+
+	ip, err := util.DomainLookUp(ispCollection.IP, "4", "", true)
+	if err != nil {
+		log.Fatal(err)
+	}
 	var conf = trace.Config{
-		BeginHop:         1,
+		BeginHop:         f.ParamsFastTrace.BeginHop,
 		DestIP:           ip,
 		DestPort:         80,
-		MaxHops:          30,
+		MaxHops:          f.ParamsFastTrace.MaxHops,
 		NumMeasurements:  3,
 		ParallelRequests: 18,
-		RDns:             true,
+		RDns:             f.ParamsFastTrace.RDns,
+		AlwaysWaitRDNS:   f.ParamsFastTrace.AlwaysWaitRDNS,
 		PacketInterval:   100,
 		TTLInterval:      500,
 		IPGeoSource:      ipgeo.GetSource("LeoMoeAPI"),
-		Timeout:          1 * time.Second,
+		Timeout:          f.ParamsFastTrace.Timeout,
+		SrcAddr:          f.ParamsFastTrace.SrcAddr,
+		PktSize:          f.ParamsFastTrace.PktSize,
+		Lang:             f.ParamsFastTrace.Lang,
 	}

 	if oe {
+		fp, err := os.OpenFile("/tmp/trace.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, os.ModePerm)
+		if err != nil {
+			return
+		}
+		defer func(fp *os.File) {
+			err := fp.Close()
+			if err != nil {
+				log.Fatal(err)
+			}
+		}(fp)
+
+		log.SetOutput(fp)
+		log.SetFlags(0)
+		log.Printf("『%s %s 』\n", location, ispCollection.ISPName)
+		log.Printf("traceroute to %s, %d hops max, %d byte packets\n", ispCollection.IP, f.ParamsFastTrace.MaxHops, f.ParamsFastTrace.PktSize)
 		conf.RealtimePrinter = tracelog.RealtimePrinter
 	} else {
 		conf.RealtimePrinter = printer.RealtimePrinter
@@ -65,7 +95,274 @@ func (f *FastTracer) tracert(location string, ispCollection ISPCollection) {
 	if err != nil {
 		log.Fatal(err)
 	}
-	println()
+	fmt.Println()
+}
+
+func FastTest(tm bool, outEnable bool, paramsFastTrace ParamsFastTrace) {
+	// tm means tcp mode
+	var c string
+	oe = outEnable
+
+	if paramsFastTrace.File != "" {
+		testFile(paramsFastTrace, tm)
+		return
+	}
+
+	fmt.Println("Hi，欢迎使用 Fast Trace 功能，请注意 Fast Trace 功能只适合新手使用\n因为国内网络复杂，我们设置的测试目标有限，建议普通用户自测以获得更加精准的路由情况")
+	fmt.Println("请您选择要测试的 IP 类型\n1. IPv4\n2. IPv6")
+	fmt.Print("请选择选项：")
+	_, err := fmt.Scanln(&c)
+	if err != nil {
+		c = "1"
+	}
+	if c == "2" {
+		if paramsFastTrace.SrcDev != "" {
+			dev, _ := net.InterfaceByName(paramsFastTrace.SrcDev)
+			if addrs, err := dev.Addrs(); err == nil {
+				for _, addr := range addrs {
+					if (addr.(*net.IPNet).IP.To4() == nil) == true {
+						paramsFastTrace.SrcAddr = addr.(*net.IPNet).IP.String()
+						// 检查是否是内网IP
+						if !(net.ParseIP(paramsFastTrace.SrcAddr).IsPrivate() ||
+							net.ParseIP(paramsFastTrace.SrcAddr).IsLoopback() ||
+							net.ParseIP(paramsFastTrace.SrcAddr).IsLinkLocalUnicast() ||
+							net.ParseIP(paramsFastTrace.SrcAddr).IsLinkLocalMulticast()) {
+							// 若不是则跳出
+							break
+						}
+					}
+				}
+			}
+		}
+		FastTestv6(tm, outEnable, paramsFastTrace)
+		return
+	}
+	if paramsFastTrace.SrcDev != "" {
+		dev, _ := net.InterfaceByName(paramsFastTrace.SrcDev)
+		if addrs, err := dev.Addrs(); err == nil {
+			for _, addr := range addrs {
+				if (addr.(*net.IPNet).IP.To4() == nil) == false {
+					paramsFastTrace.SrcAddr = addr.(*net.IPNet).IP.String()
+					// 检查是否是内网IP
+					if !(net.ParseIP(paramsFastTrace.SrcAddr).IsPrivate() ||
+						net.ParseIP(paramsFastTrace.SrcAddr).IsLoopback() ||
+						net.ParseIP(paramsFastTrace.SrcAddr).IsLinkLocalUnicast() ||
+						net.ParseIP(paramsFastTrace.SrcAddr).IsLinkLocalMulticast()) {
+						// 若不是则跳出
+						break
+					}
+				}
+			}
+		}
+	}
+
+	fmt.Println("您想测试哪些ISP的路由？\n1. 国内四网\n2. 电信\n3. 联通\n4. 移动\n5. 教育网\n6. 全部")
+	fmt.Print("请选择选项：")
+	_, err = fmt.Scanln(&c)
+	if err != nil {
+		c = "1"
+	}
+
+	ft := FastTracer{
+		ParamsFastTrace: paramsFastTrace,
+	}
+
+	// 建立 WebSocket 连接
+	w := wshandle.New()
+	w.Interrupt = make(chan os.Signal, 1)
+	signal.Notify(w.Interrupt, os.Interrupt)
+	defer func() {
+		w.Conn.Close()
+	}()
+
+	if !tm {
+		ft.TracerouteMethod = trace.ICMPTrace
+		fmt.Println("您将默认使用ICMP协议进行路由跟踪，如果您想使用TCP SYN进行路由跟踪，可以加入 -T 参数")
+	} else {
+		ft.TracerouteMethod = trace.TCPTrace
+	}
+
+	switch c {
+	case "1":
+		ft.testFast()
+	case "2":
+		ft.testCT()
+	case "3":
+		ft.testCU()
+	case "4":
+		ft.testCM()
+	case "5":
+		ft.testEDU()
+	case "6":
+		ft.testAll()
+	default:
+		ft.testFast()
+	}
+}
+
+func testFile(paramsFastTrace ParamsFastTrace, tm bool) {
+	// 建立 WebSocket 连接
+	w := wshandle.New()
+	w.Interrupt = make(chan os.Signal, 1)
+	signal.Notify(w.Interrupt, os.Interrupt)
+	defer func() {
+		w.Conn.Close()
+	}()
+
+	var tracerouteMethod trace.Method
+	if !tm {
+		tracerouteMethod = trace.ICMPTrace
+		fmt.Println("您将默认使用ICMP协议进行路由跟踪，如果您想使用TCP SYN进行路由跟踪，可以加入 -T 参数")
+	} else {
+		tracerouteMethod = trace.TCPTrace
+	}
+
+	filePath := paramsFastTrace.File
+	file, err := os.Open(filePath)
+	if err != nil {
+		fmt.Println("Error opening file:", err)
+		return
+	}
+	defer func(file *os.File) {
+		err := file.Close()
+		if err != nil {
+			log.Fatal(err)
+		}
+	}(file)
+	var ipList []IpListElement
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		line := scanner.Text()
+		parts := strings.SplitN(line, " ", 2)
+
+		var ip, desc string
+		if len(parts) == 2 {
+			ip = parts[0]
+			desc = parts[1]
+		} else if len(parts) == 1 {
+			ip = parts[0]
+			desc = ip // Set the description to the IP if no description is provided
+		} else {
+			fmt.Printf("Ignoring invalid line: %s\n", line)
+			continue
+		}
+
+		parsedIP := net.ParseIP(ip)
+		if parsedIP == nil {
+			netIp, err := util.DomainLookUp(ip, "all", "", true)
+			if err != nil {
+				fmt.Printf("Ignoring invalid IP: %s\n", ip)
+				continue
+			}
+			if len(parts) == 1 {
+				desc = ip
+			}
+			ip = netIp.String()
+		}
+
+		ipElem := IpListElement{
+			Ip:       ip,
+			Desc:     desc,
+			Version4: strings.Contains(ip, "."),
+		}
+
+		ipList = append(ipList, ipElem)
+	}
+
+	if err := scanner.Err(); err != nil {
+		fmt.Println("Error reading file:", err)
+	}
+
+	for _, ip := range ipList {
+		fmt.Printf("%s『%s』%s\n", printer.YELLOW_PREFIX, ip.Desc, printer.RESET_PREFIX)
+		fmt.Printf("traceroute to %s, %d hops max, %d byte packets\n", ip.Ip, paramsFastTrace.MaxHops, paramsFastTrace.PktSize)
+		var srcAddr string
+		if ip.Version4 {
+			if paramsFastTrace.SrcDev != "" {
+				dev, _ := net.InterfaceByName(paramsFastTrace.SrcDev)
+				if addrs, err := dev.Addrs(); err == nil {
+					for _, addr := range addrs {
+						if (addr.(*net.IPNet).IP.To4() == nil) == false {
+							srcAddr = addr.(*net.IPNet).IP.String()
+							// 检查是否是内网IP
+							if !(net.ParseIP(srcAddr).IsPrivate() ||
+								net.ParseIP(srcAddr).IsLoopback() ||
+								net.ParseIP(srcAddr).IsLinkLocalUnicast() ||
+								net.ParseIP(srcAddr).IsLinkLocalMulticast()) {
+								// 若不是则跳出
+								break
+							}
+						}
+					}
+				}
+			}
+		} else {
+			if paramsFastTrace.SrcDev != "" {
+				dev, _ := net.InterfaceByName(paramsFastTrace.SrcDev)
+				if addrs, err := dev.Addrs(); err == nil {
+					for _, addr := range addrs {
+						if (addr.(*net.IPNet).IP.To4() == nil) == true {
+							srcAddr = addr.(*net.IPNet).IP.String()
+							// 检查是否是内网IP
+							if !(net.ParseIP(srcAddr).IsPrivate() ||
+								net.ParseIP(srcAddr).IsLoopback() ||
+								net.ParseIP(srcAddr).IsLinkLocalUnicast() ||
+								net.ParseIP(srcAddr).IsLinkLocalMulticast()) {
+								// 若不是则跳出
+								break
+							}
+						}
+					}
+				}
+			}
+		}
+
+		var conf = trace.Config{
+			BeginHop:         paramsFastTrace.BeginHop,
+			DestIP:           net.ParseIP(ip.Ip),
+			DestPort:         80,
+			MaxHops:          paramsFastTrace.MaxHops,
+			NumMeasurements:  3,
+			ParallelRequests: 18,
+			RDns:             paramsFastTrace.RDns,
+			AlwaysWaitRDNS:   paramsFastTrace.AlwaysWaitRDNS,
+			PacketInterval:   100,
+			TTLInterval:      500,
+			IPGeoSource:      ipgeo.GetSource("LeoMoeAPI"),
+			Timeout:          paramsFastTrace.Timeout,
+			SrcAddr:          srcAddr,
+			PktSize:          paramsFastTrace.PktSize,
+			Lang:             paramsFastTrace.Lang,
+		}
+
+		if oe {
+			fp, err := os.OpenFile("/tmp/trace.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, os.ModePerm)
+			if err != nil {
+				return
+			}
+			defer func(fp *os.File) {
+				err := fp.Close()
+				if err != nil {
+					log.Fatal(err)
+				}
+			}(fp)
+
+			log.SetOutput(fp)
+			log.SetFlags(0)
+			log.Printf("『%s』\n", ip.Desc)
+			log.Printf("traceroute to %s, %d hops max, %d byte packets\n", ip.Ip, paramsFastTrace.MaxHops, paramsFastTrace.PktSize)
+			conf.RealtimePrinter = tracelog.RealtimePrinter
+		} else {
+			conf.RealtimePrinter = printer.RealtimePrinter
+		}
+
+		_, err := trace.Traceroute(tracerouteMethod, conf)
+		if err != nil {
+			log.Fatalln(err)
+		}
+		fmt.Println()
+	}
+
 }

 func (f *FastTracer) testAll() {
@@ -112,58 +409,9 @@ func (f *FastTracer) testEDU() {
 	f.tracert(TestIPsCollection.Hefei.Location, TestIPsCollection.Hefei.CST)
 }

-func FastTest(tm bool, outEnable bool) {
-	var c string
-
-	oe = outEnable
-	fmt.Println("Hi，欢迎使用 Fast Trace 功能，请注意 Fast Trace 功能只适合新手使用\n因为国内网络复杂，我们设置的测试目标有限，建议普通用户自测以获得更加精准的路由情况")
-	fmt.Println("请您选择要测试的 IP 类型\n1. IPv4\n2. IPv6")
-	fmt.Print("请选择选项：")
-	_, err := fmt.Scanln(&c)
-	if err != nil {
-		c = "1"
-	}
-	if c == "2" {
-		FastTestv6(tm, outEnable)
-		return
-	}
-
-	fmt.Println("您想测试哪些ISP的路由？\n1. 国内四网\n2. 电信\n3. 联通\n4. 移动\n5. 教育网")
-	fmt.Print("请选择选项：")
-	_, err = fmt.Scanln(&c)
-	if err != nil {
-		c = "1"
-	}
-
-	ft := FastTracer{}
-
-	// 建立 WebSocket 连接
-	w := wshandle.New()
-	w.Interrupt = make(chan os.Signal, 1)
-	signal.Notify(w.Interrupt, os.Interrupt)
-	defer func() {
-		w.Conn.Close()
-	}()
-
-	if !tm {
-		ft.TracerouteMethod = trace.ICMPTrace
-		fmt.Println("您将默认使用ICMP协议进行路由跟踪，如果您想使用TCP SYN进行路由跟踪，可以加入 -T 参数")
-	} else {
-		ft.TracerouteMethod = trace.TCPTrace
-	}
-
-	switch c {
-	case "1":
-		ft.testAll()
-	case "2":
-		ft.testCT()
-	case "3":
-		ft.testCU()
-	case "4":
-		ft.testCM()
-	case "5":
-		ft.testEDU()
-	default:
-		ft.testAll()
-	}
+func (f *FastTracer) testFast() {
+	f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CT163)
+	f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CU169)
+	f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CM)
+	f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.EDU)
 }
--- a/fast_trace/fast_trace_test.go
+++ b/fast_trace/fast_trace_test.go
@@ -1,27 +1,31 @@
 package fastTrace

 import (
-	"fmt"
-	"os"
-	"os/signal"
 	"testing"
-
-	"github.com/xgadget-lab/nexttrace/trace"
-	"github.com/xgadget-lab/nexttrace/wshandle"
 )

 func TestTrace(t *testing.T) {
-	ft := FastTracer{}
-	// 建立 WebSocket 连接
-	w := wshandle.New()
-	w.Interrupt = make(chan os.Signal, 1)
-	signal.Notify(w.Interrupt, os.Interrupt)
-	defer func() {
-		w.Conn.Close()
-	}()
-	fmt.Println("TCP v4")
-	ft.TracerouteMethod = trace.TCPTrace
-	ft.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.EDU)
+	//pFastTrace := ParamsFastTrace{
+	//	SrcDev:         "",
+	//	SrcAddr:        "",
+	//	BeginHop:       1,
+	//	MaxHops:        30,
+	//	RDns:           false,
+	//	AlwaysWaitRDNS: false,
+	//	Lang:           "",
+	//	PktSize:        52,
+	//}
+	//ft := FastTracer{ParamsFastTrace: pFastTrace}
+	//// 建立 WebSocket 连接
+	//w := wshandle.New()
+	//w.Interrupt = make(chan os.Signal, 1)
+	//signal.Notify(w.Interrupt, os.Interrupt)
+	//defer func() {
+	//	w.Conn.Close()
+	//}()
+	//fmt.Println("TCP v4")
+	//ft.TracerouteMethod = trace.TCPTrace
+	//ft.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.EDU)
 	//fmt.Println("TCP v6")
 	//ft.tracert_v6(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.EDU)
 	//fmt.Println("ICMP v4")
--- a/go.mod
+++ b/go.mod
@@ -1,42 +1,50 @@
-module github.com/xgadget-lab/nexttrace
+module github.com/nxtrace/NTrace-core

-go 1.20
+go 1.21

 require (
 	github.com/akamensky/argparse v1.4.0
 	github.com/google/gopacket v1.1.19
-	github.com/oschwald/maxminddb-golang v1.10.0
-	github.com/spf13/viper v1.15.0
+	github.com/oschwald/maxminddb-golang v1.12.0
+	github.com/spf13/viper v1.17.0
+	github.com/stretchr/testify v1.8.4
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
-	golang.org/x/net v0.10.0
-	golang.org/x/sync v0.2.0
+	github.com/tsosunchia/powclient v0.1.4
+	golang.org/x/net v0.17.0
+	golang.org/x/sync v0.4.0
 )

 require (
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
-	github.com/spf13/afero v1.9.3 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/sagikazarmark/locafero v0.3.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/spf13/afero v1.10.0 // indirect
+	github.com/spf13/cast v1.5.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/subosito/gotenv v1.4.2 // indirect
-	golang.org/x/text v0.9.0 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
+	golang.org/x/text v0.13.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 )

 require (
 	github.com/fatih/color v1.15.0
 	github.com/gorilla/websocket v1.5.0
-	github.com/lionsoul2014/ip2region v2.11.1+incompatible
+	github.com/lionsoul2014/ip2region v2.11.2+incompatible
 	github.com/rodaine/table v1.1.0
-	github.com/tidwall/gjson v1.14.4
+	github.com/tidwall/gjson v1.17.0
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
-	golang.org/x/sys v0.8.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -49,8 +49,9 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -59,9 +60,10 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
 github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
-github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
+github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -136,69 +138,78 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/lionsoul2014/ip2region v2.11.1+incompatible h1:FEqj5PvIP6YwnGt3RYndGQaiftEIJJGpw4BCB76nvfM=
-github.com/lionsoul2014/ip2region v2.11.1+incompatible/go.mod h1:+ZBN7PBoh5gG6/y0ZQ85vJDBe21WnfbRrQQwTfliJJI=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/lionsoul2014/ip2region v2.11.2+incompatible h1:+VRsGcrHz8ewXI/2UzTptJlACsxD/p4xCxuql4u2nKU=
+github.com/lionsoul2014/ip2region v2.11.2+incompatible/go.mod h1:+ZBN7PBoh5gG6/y0ZQ85vJDBe21WnfbRrQQwTfliJJI=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
-github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/oschwald/maxminddb-golang v1.10.0 h1:Xp1u0ZhqkSuopaKmk1WwHtjF0H9Hd9181uj2MQ5Vndg=
-github.com/oschwald/maxminddb-golang v1.10.0/go.mod h1:Y2ELenReaLAZ0b400URyGwvYxHV1dLIxBuyOsyYjHK0=
-github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU=
-github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
+github.com/oschwald/maxminddb-golang v1.12.0 h1:9FnTOD0YOhP7DGxGsq4glzpGy5+w7pq50AS6wALUMYs=
+github.com/oschwald/maxminddb-golang v1.12.0/go.mod h1:q0Nob5lTCqyQ8WT6FYgS1L7PXKVVbgiymefNwIjPzgY=
+github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
+github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rodaine/table v1.1.0 h1:/fUlCSdjamMY8VifdQRIu3VWZXYLY7QHFkVorS8NTr4=
 github.com/rodaine/table v1.1.0/go.mod h1:Qu3q5wi1jTQD6B6HsP6szie/S4w1QUQ8pq22pz9iL8g=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
-github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk=
-github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
-github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
-github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
-github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
-github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/sagikazarmark/locafero v0.3.0 h1:zT7VEGWC2DTflmccN/5T1etyKvxSxpHsjb9cJvm4SvQ=
+github.com/sagikazarmark/locafero v0.3.0/go.mod h1:w+v7UsPNFwzF1cHuOajOOzoq4U7v/ig1mpRjqV+Bu1U=
+github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
+github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
+github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
+github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
+github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY=
+github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
+github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
+github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU=
-github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA=
+github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI=
+github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
-github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
+github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI=
 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
-github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=
-github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM=
+github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
 github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tsosunchia/powclient v0.1.4 h1:iAXUOiGPLJJTnzVSD0PY+4kBWm+SEMQZzd5ntEk1t0c=
+github.com/tsosunchia/powclient v0.1.4/go.mod h1:Pm4MP3QqN74SfNskPpFIEyT+NQrcABGoXkkeRwjlMEE=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -209,13 +220,15 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -226,6 +239,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -280,8 +295,9 @@ golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -301,8 +317,8 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
-golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
+golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -335,12 +351,13 @@ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -348,8 +365,10 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -493,8 +512,9 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
--- a/ipgeo/chunzhen.go
+++ b/ipgeo/chunzhen.go
@@ -2,7 +2,7 @@ package ipgeo

 import (
 	"encoding/json"
-	"github.com/xgadget-lab/nexttrace/util"
+	"github.com/nxtrace/NTrace-core/util"
 	"io"
 	"log"
 	"net/http"
@@ -10,11 +10,11 @@ import (
 	"time"
 )

-func Chunzhen(ip string) (*IPGeoData, error) {
+func Chunzhen(ip string, timeout time.Duration, _ string, _ bool) (*IPGeoData, error) {
 	url := util.GetenvDefault("NEXTTRACE_CHUNZHENURL", "http://127.0.0.1:2060") + "?ip=" + ip
 	client := &http.Client{
 		// 2 秒超时
-		Timeout: 2 * time.Second,
+		Timeout: timeout,
 	}
 	req, _ := http.NewRequest("GET", url, nil)
 	content, err := client.Do(req)
--- a/ipgeo/dn42.go
+++ b/ipgeo/dn42.go
@@ -2,8 +2,9 @@ package ipgeo

 import (
 	"strings"
+	"time"

-	"github.com/xgadget-lab/nexttrace/dn42"
+	"github.com/nxtrace/NTrace-core/dn42"
 )

 func LtdCodeToCountryOrAreaName(Code string) string {
@@ -18,7 +19,7 @@ func LtdCodeToCountryOrAreaName(Code string) string {
 	return Code
 }

-func DN42(ip string) (*IPGeoData, error) {
+func DN42(ip string, _ time.Duration, _ string, _ bool) (*IPGeoData, error) {
 	data := &IPGeoData{}
 	// 先解析传入过来的数据
 	ipTmp := strings.Split(ip, ",")
--- a/ipgeo/ip2region.go
+++ b/ipgeo/ip2region.go
@@ -6,6 +6,7 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"time"

 	"github.com/lionsoul2014/ip2region/v1.0/binding/golang/ip2region"
 )
@@ -22,21 +23,31 @@ func downloadDataBase() error {
 	if err != nil {
 		return err
 	}
-	defer resp.Body.Close()
+	defer func(Body io.ReadCloser) {
+		err := Body.Close()
+		if err != nil {
+			panic(err)
+		}
+	}(resp.Body)

 	// Create the file
 	out, err := os.Create(ipDataBasePath)
 	if err != nil {
 		return err
 	}
-	defer out.Close()
+	defer func(out *os.File) {
+		err := out.Close()
+		if err != nil {
+			panic(err)
+		}
+	}(out)

 	// Write the body to file
 	_, err = io.Copy(out, resp.Body)
 	return err
 }

-func IP2Region(ip string) (*IPGeoData, error) {
+func IP2Region(ip string, _ time.Duration, _ string, _ bool) (*IPGeoData, error) {
 	if _, err := os.Stat(ipDataBasePath); os.IsNotExist(err) {
 		if err = downloadDataBase(); err != nil {
 			panic("Download Failed!")
--- a/ipgeo/ipapicom.go
+++ b/ipgeo/ipapicom.go
@@ -2,20 +2,22 @@ package ipgeo

 import (
 	"errors"
+	"github.com/nxtrace/NTrace-core/util"
 	"io"
 	"log"
 	"net/http"
 	"regexp"
+	"strconv"
 	"time"

 	"github.com/tidwall/gjson"
 )

-func IPApiCom(ip string) (*IPGeoData, error) {
-	url := "http://ip-api.com/json/" + ip + "?fields=status,message,country,regionName,city,isp,as"
+func IPApiCom(ip string, timeout time.Duration, _ string, _ bool) (*IPGeoData, error) {
+	url := "http://ip-api.com/json/" + ip + "?fields=status,message,country,regionName,city,isp,district,as,lat,lon"
 	client := &http.Client{
 		// 2 秒超时
-		Timeout: 2 * time.Second,
+		Timeout: timeout,
 	}
 	req, _ := http.NewRequest("GET", url, nil)
 	req.Header.Set("User-Agent", "Mozilla/5.0 (X11; Linux x86_64; rv:100.0) Gecko/20100101 Firefox/100.0")
@@ -32,12 +34,27 @@ func IPApiCom(ip string) (*IPGeoData, error) {
 	}

 	re := regexp.MustCompile("[0-9]+")
+	var country = res.Get("country").String()
+	var prov = res.Get("region").String()
+	var city = res.Get("city").String()
+	var district = res.Get("district").String()
+	if util.StringInSlice(country, []string{"Hong Kong", "Taiwan", "Macao"}) {
+		district = prov + " " + city + " " + district
+		city = country
+		prov = ""
+		country = "China"
+	}
+	lat, _ := strconv.ParseFloat(res.Get("lat").String(), 32)
+	lng, _ := strconv.ParseFloat(res.Get("lon").String(), 32)

 	return &IPGeoData{
 		Asnumber: re.FindString(res.Get("as").String()),
-		Country:  res.Get("country").String(),
-		City:     res.Get("city").String(),
-		Prov:     res.Get("regionName").String(),
+		Country:  country,
+		City:     city,
+		Prov:     prov,
+		District: district,
 		Owner:    res.Get("isp").String(),
+		Lat:      lat,
+		Lng:      lng,
 	}, nil
 }
--- a/ipgeo/ipfilter.go
+++ b/ipgeo/ipfilter.go
@@ -20,16 +20,40 @@ func Filter(ip string) (*IPGeoData, bool) {
 	whois := ""
 	isFiltered := false
 	switch {
-	//rfc1918
-	case net.ParseIP(ip).IsPrivate():
+	case cidrRangeContains("0.0.0.0/8", ip):
 		asn = ""
-		whois = "RFC1918"
+		whois = "RFC1122"
 		isFiltered = true
 	//IANA Reserved Address Space
 	case cidrRangeContains("100.64.0.0/10", ip):
 		asn = ""
 		whois = "RFC6598"
 		isFiltered = true
+	//127.0.0.0/8
+	case cidrRangeContains("127.0.0.0/8", ip):
+		asn = ""
+		whois = "RFC1122"
+		isFiltered = true
+	//169.254.0.0/16
+	case cidrRangeContains("169.254.0.0/16", ip):
+		asn = ""
+		whois = "RFC3927"
+		isFiltered = true
+	//192.0.0.0/24
+	case cidrRangeContains("192.0.0.0/24", ip):
+		asn = ""
+		whois = "RFC6890"
+		isFiltered = true
+	//192.0.2.0/24
+	case cidrRangeContains("192.0.2.0/24", ip):
+		asn = ""
+		whois = "RFC5737"
+		isFiltered = true
+	//192.88.99.0/24
+	case cidrRangeContains("192.88.99.0/24", ip):
+		asn = ""
+		whois = "RFC3068"
+		isFiltered = true
 	case cidrRangeContains("198.18.0.0/15", ip):
 		asn = ""
 		whois = "RFC2544"
@@ -40,10 +64,68 @@ func Filter(ip string) (*IPGeoData, bool) {
 		asn = ""
 		whois = "RFC5737"
 		isFiltered = true
+	//224.0.0.0/4
+	case cidrRangeContains("224.0.0.0/4", ip):
+		asn = ""
+		whois = "RFC5771"
+		isFiltered = true
+	//255.255.255.255/32
+	case cidrRangeContains("255.255.255.255/32", ip):
+		asn = ""
+		whois = "RFC0919"
+		isFiltered = true
 	case cidrRangeContains("240.0.0.0/4", ip):
 		asn = ""
 		whois = "RFC1112"
 		isFiltered = true
+	case cidrRangeContains("fe80::/10", ip):
+		asn = ""
+		whois = "RFC4291"
+		isFiltered = true
+	case cidrRangeContains("ff00::/8", ip):
+		asn = ""
+		whois = "RFC4291"
+		isFiltered = true
+	case cidrRangeContains("fec0::/10", ip):
+		asn = ""
+		whois = "RFC3879"
+		isFiltered = true
+	case cidrRangeContains("fe00::/9", ip):
+		asn = ""
+		whois = "RFC4291"
+		isFiltered = true
+	case cidrRangeContains("64:ff9b::/96", ip):
+		asn = ""
+		whois = "RFC6052"
+		isFiltered = true
+	case cidrRangeContains("0::/96", ip):
+		asn = ""
+		whois = "RFC4291"
+		isFiltered = true
+	case cidrRangeContains("64:ff9b:1::/48", ip):
+		asn = ""
+		whois = "RFC6052"
+		isFiltered = true
+	case cidrRangeContains("2001:db8::/32", ip):
+		asn = ""
+		whois = "RFC3849"
+		isFiltered = true
+	case cidrRangeContains("2002::/16", ip):
+		asn = ""
+		whois = "RFC3056"
+		isFiltered = true
+	case net.ParseIP(ip).IsPrivate():
+		//rfc4193
+		if cidrRangeContains("fc00::/7", ip) {
+			asn = ""
+			whois = "RFC4193"
+			isFiltered = true
+			//rfc1918
+		} else {
+			asn = ""
+			whois = "RFC1918"
+			isFiltered = true
+		}
 	//Defense Information System Network
 	case cidrRangeContains("6.0.0.0/8", ip):
 		fallthrough
@@ -75,6 +157,12 @@ func Filter(ip string) (*IPGeoData, bool) {
 		isFiltered = true
 	default:
 	}
+	// 判断是否为v6 且不在2000::/3
+	if net.ParseIP(ip).To4() == nil && !cidrRangeContains("2000::/3", ip) && !isFiltered {
+		asn = ""
+		whois = "INVALID"
+		isFiltered = true
+	}
 	if !isFiltered {
 		return nil, false
 	} else {
--- a/ipgeo/ipgeo.go
+++ b/ipgeo/ipgeo.go
@@ -2,6 +2,7 @@ package ipgeo

 import (
 	"strings"
+	"time"
 )

 type IPGeoData struct {
@@ -25,7 +26,7 @@ type IPGeoData struct {
 	Source    string              `json:"source"`
 }

-type Source = func(ip string) (*IPGeoData, error)
+type Source = func(ip string, timeout time.Duration, lang string, maptrace bool) (*IPGeoData, error)

 func GetSource(s string) Source {
 	switch strings.ToUpper(s) {
@@ -49,7 +50,13 @@ func GetSource(s string) Source {
 		return IPInfoLocal
 	case "CHUNZHEN":
 		return Chunzhen
+	case "DISABLE-GEOIP":
+		return disableGeoIP
 	default:
 		return LeoIP
 	}
 }
+
+func disableGeoIP(string, time.Duration, string, bool) (*IPGeoData, error) {
+	return &IPGeoData{}, nil
+}
--- a/ipgeo/ipgeo_test.go
+++ b/ipgeo/ipgeo_test.go
@@ -37,6 +37,13 @@ func TestXxx(t *testing.T) {
 	log.Println(process_id, ttl_r)
 }

+func TestFilter(t *testing.T) {
+	res, err := Filter("fd11::1")
+	//打印whois信息
+	fmt.Println(res.Whois)
+	print(err)
+}
+
 func reverseID(id string) (int64, int64, error) {
 	ttl, _ := strconv.ParseInt(id[9:15], 2, 32)
 	//process ID
--- a/ipgeo/ipinfo.go
+++ b/ipgeo/ipinfo.go
@@ -1,15 +1,24 @@
 package ipgeo

 import (
+	"github.com/nxtrace/NTrace-core/util"
 	"io"
 	"net/http"
+	"strconv"
 	"strings"
+	"time"

 	"github.com/tidwall/gjson"
 )

-func IPInfo(ip string) (*IPGeoData, error) {
-	resp, err := http.Get("https://ipinfo.io/" + ip + "?token=" + token.ipinfo)
+func IPInfo(ip string, timeout time.Duration, _ string, _ bool) (*IPGeoData, error) {
+	url := "http://ipinfo.io/" + ip + "?token=" + token.ipinfo
+	client := &http.Client{
+		// 2 秒超时
+		Timeout: timeout,
+	}
+	resp, err := client.Get(url)
+	//resp, err := http.Get("https://ipinfo.io/" + ip + "?token=" + token.ipinfo)
 	if err != nil {
 		return nil, err
 	}
@@ -21,11 +30,6 @@ func IPInfo(ip string) (*IPGeoData, error) {

 	res := gjson.ParseBytes(body)

-	var country string
-	country = res.Get("country").String()
-	if res.Get("country").String() == "HK" || res.Get("country").String() == "TW" {
-		country = "CN"
-	}
 	// ISO-3166 转换
 	var countryMap = map[string]string{
 		"AF": "Afghanistan",
@@ -278,7 +282,26 @@ func IPInfo(ip string) (*IPGeoData, error) {
 		"ZM": "Zambia",
 		"ZW": "Zimbabwe",
 	}
+	var country = res.Get("country").String()
+	var prov = res.Get("region").String()
+	var city = res.Get("city").String()
+	var district = ""
+	if util.StringInSlice(country, []string{"TW", "MO", "HK"}) {
+		district = prov + " " + city
+		city = countryMap[country]
+		prov = ""
+		country = "CN"
+	}
 	country = countryMap[country]
+
+	var anycast = false
+	if res.Get("anycast").String() == "true" {
+		country = "ANYCAST"
+		prov = "ANYCAST"
+		city = ""
+		anycast = true
+	}
+
 	i := strings.Index(res.Get("org").String(), " ")
 	var owner string
 	if i == -1 {
@@ -287,11 +310,30 @@ func IPInfo(ip string) (*IPGeoData, error) {
 		owner = res.Get("org").String()[i:]
 	}

+	var asnumber = ""
+	// 有时候不返回asn或其本身没有asn
+	if strings.HasPrefix(res.Get("org").String(), "AS") {
+		asnumber = strings.Fields(strings.TrimPrefix(res.Get("org").String(), "AS"))[0]
+	}
+
+	//"loc": "34.0522,-118.2437",
+	var lat, lng float64
+	if res.Get("loc").String() != "" {
+		lat, _ = strconv.ParseFloat(strings.Split(res.Get("loc").String(), ",")[0], 32)
+		lng, _ = strconv.ParseFloat(strings.Split(res.Get("loc").String(), ",")[1], 32)
+	}
+	if anycast {
+		lat, lng = 0, 0
+	}
+
 	return &IPGeoData{
-		Asnumber: strings.Fields(strings.TrimPrefix(res.Get("org").String(), "AS"))[0],
+		Asnumber: asnumber,
 		Country:  country,
-		City:     res.Get("city").String(),
-		Prov:     res.Get("region").String(),
+		City:     city,
+		Prov:     prov,
+		District: district,
 		Owner:    owner,
+		Lat:      lat,
+		Lng:      lng,
 	}, nil
 }
--- a/ipgeo/ipinfoLocal.go
+++ b/ipgeo/ipinfoLocal.go
@@ -6,13 +6,14 @@ import (
 	"net"
 	"os"
 	"strings"
+	"time"
 )

 const (
 	ipinfoDataBasePath = "./ipinfoLocal.mmdb"
 )

-func IPInfoLocal(ip string) (*IPGeoData, error) {
+func IPInfoLocal(ip string, _ time.Duration, _ string, _ bool) (*IPGeoData, error) {
 	if _, err := os.Stat(ipinfoDataBasePath); os.IsNotExist(err) {
 		panic("Cannot find ipinfoLocal.mmdb")
 	}
--- a/ipgeo/ipinsight.go
+++ b/ipgeo/ipinsight.go
@@ -3,12 +3,17 @@ package ipgeo
 import (
 	"io"
 	"net/http"
+	"time"

 	"github.com/tidwall/gjson"
 )

-func IPInSight(ip string) (*IPGeoData, error) {
-	resp, err := http.Get("https://api.ipinsight.io/ip/" + ip + "?token=" + token.ipinsight)
+func IPInSight(ip string, timeout time.Duration, _ string, _ bool) (*IPGeoData, error) {
+	client := &http.Client{
+		// 2 秒超时
+		Timeout: timeout,
+	}
+	resp, err := client.Get("https://api.ipinsight.io/ip/" + ip + "?token=" + token.ipinsight)
 	if err != nil {
 		return nil, err
 	}
--- a/ipgeo/ipsb.go
+++ b/ipgeo/ipsb.go
@@ -10,11 +10,11 @@ import (
 	"github.com/tidwall/gjson"
 )

-func IPSB(ip string) (*IPGeoData, error) {
+func IPSB(ip string, timeout time.Duration, _ string, _ bool) (*IPGeoData, error) {
 	url := "https://api.ip.sb/geoip/" + ip
 	client := &http.Client{
 		// 2 秒超时
-		Timeout: 2 * time.Second,
+		Timeout: timeout,
 	}
 	req, _ := http.NewRequest("GET", url, nil)
 	// 设置 UA，ip.sb 默认禁止 go-client User-Agent 的 api 请求
--- a/ipgeo/leo.go
+++ b/ipgeo/leo.go
@@ -7,8 +7,8 @@ import (
 	"sync"
 	"time"

+	"github.com/nxtrace/NTrace-core/wshandle"
 	"github.com/tidwall/gjson"
-	"github.com/xgadget-lab/nexttrace/wshandle"
 )

 /***
@@ -55,7 +55,10 @@ func receiveParse() {
 		}

 		m := make(map[string][]string)
-		json.Unmarshal([]byte(res.Get("router").String()), &m)
+		err := json.Unmarshal([]byte(res.Get("router").String()), &m)
+		if err != nil {
+			// 此处是正常的，因为有些IP没有路由信息
+		}

 		lat, _ := strconv.ParseFloat(res.Get("lat").String(), 32)
 		lng, _ := strconv.ParseFloat(res.Get("lng").String(), 32)
@@ -80,15 +83,20 @@ func receiveParse() {
 	}
 }

-func LeoIP(ip string) (*IPGeoData, error) {
-	// 初始化通道 - 向池子里添加IP的Channel，返回IP数据是通过字典中对应键为IP的Channel来获取的
+func LeoIP(ip string, timeout time.Duration, lang string, maptrace bool) (*IPGeoData, error) {
+	// TODO: 根据lang的值请求中文/英文API
+	// TODO: 根据maptrace的值决定是否请求经纬度信息
+	if timeout < 5*time.Second {
+		timeout = 5 * time.Second
+	}
+
+	// 缓存中没有找到IP信息，需要请求API获取
 	IPPools.poolMux.Lock()
-	defer IPPools.poolMux.Unlock()
 	// 如果之前已经被别的协程初始化过了就不用初始化了
 	if IPPools.pool[ip] == nil {
 		IPPools.pool[ip] = make(chan IPGeoData)
 	}
-
+	IPPools.poolMux.Unlock()
 	// 发送请求
 	sendIPRequest(ip)
 	// 同步开启监听
@@ -99,10 +107,8 @@ func LeoIP(ip string) (*IPGeoData, error) {
 	case res := <-IPPools.pool[ip]:
 		return &res, nil
 	// 5秒后依旧没有接收到返回的IP数据，不再等待，超时异常处理
-	case <-time.After(5 * time.Second):
-		// default:
+	case <-time.After(timeout):
 		// 这里不可以返回一个 nil，否则在访问对象内部的键值的时候会报空指针的 Fatal Error
 		return &IPGeoData{}, errors.New("TimeOut")
 	}
-
 }
--- a/ipgeo/tokens.go
+++ b/ipgeo/tokens.go
@@ -1,6 +1,6 @@
 package ipgeo

-import "github.com/xgadget-lab/nexttrace/util"
+import "github.com/nxtrace/NTrace-core/util"

 type tokenData struct {
 	ipinsight string
--- a/main.go
+++ b/main.go
@@ -1,7 +1,7 @@
 package main

 import (
-	"github.com/xgadget-lab/nexttrace/cmd"
+	"github.com/nxtrace/NTrace-core/cmd"
 )

 func main() {
--- a/nt_install.sh
+++ b/nt_install.sh
@@ -93,12 +93,7 @@ checkWgetPackage() {
 downloadBinrayFile() {
    echo -e "${Info} 获取最新版的 NextTrace 发行版文件信息"
    # 简单说明一下，Github提供了一个API，可以获取最新发行版本的二进制文件下载地址（对应的是browser_download_url），根据刚刚测得的osDistribution、archParam，获取对应的下载地址
-    latestURL=$(curl -s https://api.github.com/repos/sjlleo/nexttrace/releases/latest | grep -i "browser_download_url.*${osDistribution}.*${archParam}" | awk -F '"' '{print $4}')
-    
-    if [ "$countryCode" == "CN" ]; then
-        echo -e "${Info} 检测到国内环境，正在使用镜像下载"
-        latestURL="https://ghproxy.com/"$latestURL
-    fi
+    latestURL=$(curl -sL http://nexttrace-io-leomoe-api-a0.shop/latest_v1.json | grep -i "browser_download_url.*${osDistribution}.*${archParam}" | awk -F '"' '{print $4}')
    
    echo -e "${Info} 正在下载 NextTrace 二进制文件..."
    wget -O ${Temp_path} ${latestURL} &> /dev/null
@@ -130,8 +125,6 @@ checkSystemDistribution
 checkSystemArch
 checkWgetPackage

-# Download Procedure
-getLocation
 downloadBinrayFile

 # Run Procedure
--- a/pow/pow.go
+++ b/pow/pow.go
@@ -0,0 +1,45 @@
+package pow
+
+import (
+	"fmt"
+	"github.com/nxtrace/NTrace-core/util"
+	"github.com/tsosunchia/powclient"
+	"net/url"
+	"os"
+)
+
+const (
+	baseURL = "/v3/challenge"
+)
+
+func GetToken(fastIp string, host string, port string) (string, error) {
+	getTokenParams := powclient.NewGetTokenParams()
+	u := url.URL{Scheme: "https", Host: fastIp + ":" + port, Path: baseURL}
+	getTokenParams.BaseUrl = u.String()
+	getTokenParams.SNI = host
+	getTokenParams.Host = host
+	getTokenParams.UserAgent = util.UserAgent
+	proxyUrl := util.GetProxy()
+	if proxyUrl != nil {
+		getTokenParams.Proxy = proxyUrl
+	}
+	var (
+		token string
+		err   error
+	)
+	// 尝试三次RetToken，如果都失败了，异常退出
+	for i := 0; i < 3; i++ {
+		token, err = powclient.RetToken(getTokenParams)
+		if err != nil {
+			continue
+		}
+		//fmt.Println("GetToken success", token, getTokenParams.UserAgent)
+		return token, nil
+	}
+	if err != nil {
+		fmt.Println(err)
+	}
+	fmt.Println("RetToken failed 3 times, please try again after a while, exit")
+	os.Exit(1)
+	return "", err
+}
--- a/pow/pow_test.go
+++ b/pow/pow_test.go
@@ -0,0 +1,19 @@
+package pow
+
+import (
+	"fmt"
+	"github.com/stretchr/testify/assert"
+	"testing"
+	"time"
+)
+
+func TestGetToken(t *testing.T) {
+	// 计时开始
+	start := time.Now()
+	token, err := GetToken("api.leo.moe", "api.leo.moe", "443")
+	// 计时结束
+	end := time.Now()
+	fmt.Println("耗时：", end.Sub(start))
+	fmt.Println("token:", token)
+	assert.NoError(t, err, "GetToken() returned an error")
+}
--- a/printer/basic.go
+++ b/printer/basic.go
@@ -2,14 +2,16 @@ package printer

 import (
 	"fmt"
+	"github.com/nxtrace/NTrace-core/config"
+	"github.com/nxtrace/NTrace-core/trace"
 	"net"

 	"github.com/fatih/color"
 )

-var version = "v0.0.0.alpha"
-var buildDate = ""
-var commitID = ""
+var version = config.Version
+var buildDate = config.BuildDate
+var commitID = config.CommitID

 func Version() {
 	fmt.Fprintf(color.Output, "%s %s %s %s\n",
@@ -21,52 +23,111 @@ func Version() {
 }

 func CopyRight() {
-	fmt.Fprintf(color.Output, "\n%s\n%s\n%s %s\n\n%s\n%s %s\n%s %s\n%s %s\n\n%s\n%s\n%s %s\n\n",
+	sponsor()
+	fmt.Fprintf(color.Output, "\n%s\n%s %s\n%s %s, %s, %s, %s\n%s %s\n\n",
 		color.New(color.FgCyan, color.Bold).Sprintf("%s", "NextTrace CopyRight"),
-		color.New(color.FgGreen, color.Bold).Sprintf("%s", "NextTrace Project Creator"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Leo"),
-		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "i@leo.moe"),
-		color.New(color.FgGreen, color.Bold).Sprintf("%s", "NextTrace Project Maintainer"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Tso"),
-		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "tsosunchia@gmail.com"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Vincent"),
-		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "i@vincent.moe"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Leo"),
-		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "i@leo.moe"),
-		color.New(color.FgCyan, color.Bold).Sprintf("%s", "Special Acknowledgement List"),
-		color.New(color.FgGreen, color.Bold).Sprintf("%s", "NextTrace Major Contributor"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "zhshch"),
-		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "zhshch@athorx.com"),
+		//color.New(color.FgGreen, color.Bold).Sprintf("%s", "Contact Us"),
+		//color.New(color.FgWhite, color.Bold).Sprintf("%s", "Feedback Email:"),
+		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "nt@moeqing.com"),
+		//color.New(color.FgWhite, color.Bold).Sprintf("%s", "HomePage:"),
+		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "github.com/nxtrace"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Creator:"),
+		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "Leo"),
+		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "i@leo.moe"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Core-Developer:"),
+		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "Leo"),
+		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "i@leo.moe"),
+		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "Vincent"),
+		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "i@vincent.moe"),
+		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "zhshch"),
+		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "zhshch@athorx.com"),
+		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "Tso"),
+		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "tsosunchia@gmail.com"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Maintainer:"),
+		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "Tso"),
+		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "tsosunchia@gmail.com"),
 	)

-	MoeQingOrgCopyRight()
-	PluginCopyRight()
+	moeQingOrgCopyRight()
+	//PluginCopyRight()
 }

-func MoeQingOrgCopyRight() {
-	fmt.Fprintf(color.Output, "%s\n%s %s\n%s %s\n\n",
-		color.New(color.FgHiYellow, color.Bold).Sprintf("%s", "MoeQing Network"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "YekongTAT"),
-		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "yekongtat@gmail.com"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Haima"),
-		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "haima@peers.cloud"),
+func moeQingOrgCopyRight() {
+	fmt.Fprintf(color.Output, "%s\n%s %s, %s\n\n",
+		color.New(color.FgCyan, color.Bold).Sprintf("%s", "NextTrace Project NOC"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "MoeQing.io:"),
+		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "YekongTAT"),
+		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "yekongtat@gmail.com"),
+		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "Haima"),
+		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "haima@peers.cloud"),
 	)
 }

-func PluginCopyRight() {
-	fmt.Fprintf(color.Output, "%s\n%s %s\n\n",
-		color.New(color.FgGreen, color.Bold).Sprintf("%s", "NextTrace Map Plugin Author"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Tso"),
-		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "tsosunchia@gmail.com"),
+func sponsor() {
+	italic := "\x1b[3m%s\x1b[0m"
+	formatted := fmt.Sprintf(italic, "(Listed in no particular order)")
+
+	fmt.Fprintf(color.Output, "%s\n%s\n%s\n%s\n%s\n",
+		color.New(color.FgCyan, color.Bold).Sprintf("%s", "NextTrace Sponsored by"),
+		color.New(color.FgHiYellow, color.Bold).Sprintf("%s", "· DMIT.io"),
+		color.New(color.FgHiYellow, color.Bold).Sprintf("%s", "· Misaka.io"),
+		color.New(color.FgHiYellow, color.Bold).Sprintf("%s", "· Skywolf.cloud"),
+		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", formatted),
 	)
 }

-func PrintTraceRouteNav(ip net.IP, domain string, dataOrigin string) {
+//func PluginCopyRight() {
+//	fmt.Fprintf(color.Output, "%s\n%s %s\n\n",
+//		color.New(color.FgGreen, color.Bold).Sprintf("%s", "NextTrace Map Plugin Author"),
+//		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Tso"),
+//		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "tsosunchia@gmail.com"),
+//	)
+//}
+
+func PrintTraceRouteNav(ip net.IP, domain string, dataOrigin string, maxHops int, packetSize int) {
 	fmt.Println("IP Geo Data Provider: " + dataOrigin)

 	if ip.String() == domain {
-		fmt.Printf("traceroute to %s, 30 hops max, 32 byte packets\n", ip.String())
+		fmt.Printf("traceroute to %s, %d hops max, %d bytes packets\n", ip.String(), maxHops, packetSize)
 	} else {
-		fmt.Printf("traceroute to %s (%s), 30 hops max, 32 byte packets\n", ip.String(), domain)
+		fmt.Printf("traceroute to %s (%s), %d hops max, %d bytes packets\n", ip.String(), domain, maxHops, packetSize)
 	}
 }
+
+func applyLangSetting(h *trace.Hop) {
+	if len(h.Geo.Country) <= 1 {
+		//打印h.geo
+		if h.Geo.Whois != "" {
+			h.Geo.Country = h.Geo.Whois
+		} else {
+			if h.Geo.Source != "LeoMoeAPI" {
+				h.Geo.Country = "网络故障"
+				h.Geo.CountryEn = "Network Error"
+			} else {
+				h.Geo.Country = "未知"
+				h.Geo.CountryEn = "Unknown"
+			}
+		}
+	}
+
+	if h.Lang == "en" {
+		if h.Geo.Country == "Anycast" {
+
+		} else if h.Geo.Prov == "骨干网" {
+			h.Geo.Prov = "BackBone"
+		} else if h.Geo.ProvEn == "" {
+			h.Geo.Country = h.Geo.CountryEn
+		} else {
+			if h.Geo.CityEn == "" {
+				h.Geo.Country = h.Geo.ProvEn
+				h.Geo.Prov = h.Geo.CountryEn
+				h.Geo.City = ""
+			} else {
+				h.Geo.Country = h.Geo.CityEn
+				h.Geo.Prov = h.Geo.ProvEn
+				h.Geo.City = h.Geo.CountryEn
+			}
+		}
+	}
+
+}
--- a/printer/classic_printer.go
+++ b/printer/classic_printer.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"

-	"github.com/xgadget-lab/nexttrace/trace"
+	"github.com/nxtrace/NTrace-core/trace"
 )

 type HopInfo int
--- a/printer/easy.go
+++ b/printer/easy.go
@@ -3,7 +3,7 @@ package printer
 import (
 	"fmt"

-	"github.com/xgadget-lab/nexttrace/trace"
+	"github.com/nxtrace/NTrace-core/trace"
 )

 func EasyPrinter(res *trace.Result, ttl int) {
@@ -12,6 +12,21 @@ func EasyPrinter(res *trace.Result, ttl int) {
 			fmt.Printf("%d|*||||||\n", ttl+1)
 			continue
 		}
-		fmt.Printf("%d|%s|%s|%s|%s|%s|%s|%s|%s|%.4f|%.4f\n", ttl+1, res.Hops[ttl][i].Address.String(), res.Hops[ttl][i].Hostname, res.Hops[ttl][i].Geo.Asnumber, res.Hops[ttl][i].Geo.Country, res.Hops[ttl][i].Geo.Prov, res.Hops[ttl][i].Geo.City, res.Hops[ttl][i].Geo.District, res.Hops[ttl][i].Geo.Owner, res.Hops[ttl][i].Geo.Lat, res.Hops[ttl][i].Geo.Lng)
+		applyLangSetting(&res.Hops[ttl][i]) // 应用语言设置
+		fmt.Printf(
+			"%d|%s|%s|%.2f|%s|%s|%s|%s|%s|%s|%.4f|%.4f\n",
+			ttl+1,
+			res.Hops[ttl][i].Address.String(),
+			res.Hops[ttl][i].Hostname,
+			float64(res.Hops[ttl][i].RTT.Microseconds())/1000,
+			res.Hops[ttl][i].Geo.Asnumber,
+			res.Hops[ttl][i].Geo.Country,
+			res.Hops[ttl][i].Geo.Prov,
+			res.Hops[ttl][i].Geo.City,
+			res.Hops[ttl][i].Geo.District,
+			res.Hops[ttl][i].Geo.Owner,
+			res.Hops[ttl][i].Geo.Lat,
+			res.Hops[ttl][i].Geo.Lng,
+		)
 	}
 }
--- a/printer/printer.go
+++ b/printer/printer.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"

-	"github.com/xgadget-lab/nexttrace/trace"
+	"github.com/nxtrace/NTrace-core/trace"

-	"github.com/xgadget-lab/nexttrace/ipgeo"
+	"github.com/nxtrace/NTrace-core/ipgeo"
 )

 // var dataOrigin string
@@ -20,6 +20,8 @@ import (
 // 	}
 // }

+//此文件目前仅供classic_printer使用
+
 const (
 	RED_PREFIX    = "\033[1;31m"
 	GREEN_PREFIX  = "\033[1;32m"
@@ -33,6 +35,7 @@ func HopPrinter(h trace.Hop, info HopInfo) {
 	if h.Address == nil {
 		fmt.Println("\t*")
 	} else {
+		applyLangSetting(&h) // 应用语言设置
 		txt := "\t"

 		if h.Hostname == "" {
@@ -44,6 +47,9 @@ func HopPrinter(h trace.Hop, info HopInfo) {
 		if h.Geo != nil {
 			txt += " " + formatIpGeoData(h.Address.String(), h.Geo)
 		}
+		for _, v := range h.MPLS {
+			txt += " " + v
+		}
 		switch info {
 		case IXP:
 			fmt.Print(CYAN_PREFIX)
--- a/printer/realtime_printer.go
+++ b/printer/realtime_printer.go
@@ -7,7 +7,7 @@ import (
 	"strings"

 	"github.com/fatih/color"
-	"github.com/xgadget-lab/nexttrace/trace"
+	"github.com/nxtrace/NTrace-core/trace"
 )

 func RealtimePrinter(res *trace.Result, ttl int) {
@@ -62,7 +62,12 @@ func RealtimePrinter(res *trace.Result, ttl int) {

 		i, _ := strconv.Atoi(v[0])
 		if res.Hops[ttl][i].Geo.Asnumber != "" {
-			// CMIN2, CUII, CN2, CUG 改为壕金色高亮
+			/*** CMIN2, CUG, CN2, CUII, CTG 改为壕金色高亮
+			/* 小孩子不懂事加着玩的
+			/* 此处的高亮不代表任何线路质量
+			/* 仅代表走了这部分的ASN
+			/* 如果使用这些ASN的IP同样会被高亮
+			***/
 			switch {
 			case res.Hops[ttl][i].Geo.Asnumber == "58807":
 				fallthrough
@@ -93,7 +98,13 @@ func RealtimePrinter(res *trace.Result, ttl int) {
 			}

 			if whoisFormat[0] != "" {
-				whoisFormat[0] = "[" + whoisFormat[0] + "]"
+				//如果以RFC或DOD开头那么为空
+				if !(strings.HasPrefix(whoisFormat[0], "RFC") ||
+					strings.HasPrefix(whoisFormat[0], "DOD")) {
+					whoisFormat[0] = "[" + whoisFormat[0] + "]"
+				} else {
+					whoisFormat[0] = ""
+				}
 			}

 			// CMIN2, CUII, CN2, CUG 改为壕金色高亮
@@ -121,30 +132,7 @@ func RealtimePrinter(res *trace.Result, ttl int) {
 			}
 		}

-		if len(res.Hops[ttl][i].Geo.Country) <= 1 {
-			res.Hops[ttl][i].Geo.Country = "局域网"
-			res.Hops[ttl][i].Geo.CountryEn = "LAN Address"
-		}
-
-		if res.Hops[ttl][i].Lang == "en" {
-			if res.Hops[ttl][i].Geo.Country == "Anycast" {
-
-			} else if res.Hops[ttl][i].Geo.Prov == "骨干网" {
-				res.Hops[ttl][i].Geo.Prov = "BackBone"
-			} else if res.Hops[ttl][i].Geo.ProvEn == "" {
-				res.Hops[ttl][i].Geo.Country = res.Hops[ttl][i].Geo.CountryEn
-			} else {
-				if res.Hops[ttl][i].Geo.CityEn == "" {
-					res.Hops[ttl][i].Geo.Country = res.Hops[ttl][i].Geo.ProvEn
-					res.Hops[ttl][i].Geo.Prov = res.Hops[ttl][i].Geo.CountryEn
-					res.Hops[ttl][i].Geo.City = ""
-				} else {
-					res.Hops[ttl][i].Geo.Country = res.Hops[ttl][i].Geo.CityEn
-					res.Hops[ttl][i].Geo.Prov = res.Hops[ttl][i].Geo.ProvEn
-					res.Hops[ttl][i].Geo.City = res.Hops[ttl][i].Geo.CountryEn
-				}
-			}
-		}
+		applyLangSetting(&res.Hops[ttl][i]) // 应用语言设置

 		if net.ParseIP(ip).To4() != nil {

@@ -178,6 +166,11 @@ func RealtimePrinter(res *trace.Result, ttl int) {
 				)
 			}
 		}
+		for _, v := range res.Hops[ttl][i].MPLS {
+			fmt.Fprintf(color.Output, "%s",
+				color.New(color.FgHiBlack, color.Bold).Sprintf("\n    %s", v),
+			)
+		}
 		fmt.Println()
 		blockDisplay = true
 	}
--- a/printer/realtime_printer_router.go
+++ b/printer/realtime_printer_router.go
@@ -7,7 +7,7 @@ import (
 	"strings"

 	"github.com/fatih/color"
-	"github.com/xgadget-lab/nexttrace/trace"
+	"github.com/nxtrace/NTrace-core/trace"
 )

 func RealtimePrinterWithRouter(res *trace.Result, ttl int) {
--- a/printer/tableprinter.go
+++ b/printer/tableprinter.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"

-	"github.com/xgadget-lab/nexttrace/ipgeo"
+	"github.com/nxtrace/NTrace-core/ipgeo"

-	"github.com/xgadget-lab/nexttrace/trace"
+	"github.com/nxtrace/NTrace-core/trace"

 	"github.com/fatih/color"
 	"github.com/rodaine/table"
--- a/reporter/reporter.go
+++ b/reporter/reporter.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"sync"

-	"github.com/xgadget-lab/nexttrace/ipgeo"
-	"github.com/xgadget-lab/nexttrace/trace"
+	"github.com/nxtrace/NTrace-core/ipgeo"
+	"github.com/nxtrace/NTrace-core/trace"
 )

 type Reporter interface {
--- a/reporter/reporter_test.go
+++ b/reporter/reporter_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"

-	"github.com/xgadget-lab/nexttrace/ipgeo"
-	"github.com/xgadget-lab/nexttrace/trace"
+	"github.com/nxtrace/NTrace-core/ipgeo"
+	"github.com/nxtrace/NTrace-core/trace"
 )

 var testResult = &trace.Result{
--- a/trace/icmp_ipv4.go
+++ b/trace/icmp_ipv4.go
@@ -1,6 +1,7 @@
 package trace

 import (
+	"bytes"
 	"encoding/binary"
 	"errors"
 	"fmt"
@@ -26,8 +27,11 @@ type ICMPTracer struct {
 	icmpListen            net.PacketConn
 	final                 int
 	finalLock             sync.Mutex
+	fetchLock             sync.Mutex
 }

+var psize = 52
+
 func (t *ICMPTracer) PrintFunc() {
 	defer t.wg.Done()
 	var ttl = t.Config.BeginHop - 1
@@ -35,6 +39,7 @@ func (t *ICMPTracer) PrintFunc() {
 		if t.AsyncPrinter != nil {
 			t.AsyncPrinter(&t.res)
 		}
+		// 接收的时候检查一下是不是 3 跳都齐了
 		if len(t.res.Hops)-1 > ttl {
 			if len(t.res.Hops[ttl]) == t.NumMeasurements {
 				if t.RealtimePrinter != nil {
@@ -116,6 +121,7 @@ func (t *ICMPTracer) Execute() (*Result, error) {

 func (t *ICMPTracer) listenICMP() {
 	lc := NewPacketListener(t.icmpListen, t.ctx)
+	psize = t.Config.PktSize
 	go lc.Start()
 	for {
 		select {
@@ -159,6 +165,9 @@ func (t *ICMPTracer) listenICMP() {
 							t.handleICMPMessage(msg, 0, rm.Body.(*icmp.TimeExceeded).Data, int(ttl))
 						case ipv4.ICMPTypeEchoReply:
 							t.handleICMPMessage(msg, 1, rm.Body.(*icmp.Echo).Data, int(ttl))
+						//unreachable
+						case ipv4.ICMPTypeDestinationUnreachable:
+							t.handleICMPMessage(msg, 2, rm.Body.(*icmp.DstUnreach).Data, int(ttl))
 						default:
 							// log.Println("received icmp message of unknown type", rm.Type)
 						}
@@ -171,12 +180,21 @@ func (t *ICMPTracer) listenICMP() {
 }

 func (t *ICMPTracer) handleICMPMessage(msg ReceivedMessage, icmpType int8, data []byte, ttl int) {
+	if icmpType == 2 {
+		if t.DestIP.String() != msg.Peer.String() {
+			return
+		}
+	}
+
 	t.inflightRequestRWLock.RLock()
 	defer t.inflightRequestRWLock.RUnlock()
+
+	mpls := extractMPLS(msg, data)
 	if _, ok := t.inflightRequest[ttl]; ok {
 		t.inflightRequest[ttl] <- Hop{
 			Success: true,
 			Address: msg.Peer,
+			MPLS:    mpls,
 		}
 	}
 }
@@ -199,7 +217,7 @@ func gernerateID(ttl_int int) int {
 		id += "0"
 	}

-	res, _ := strconv.ParseInt(id, 2, 64)
+	res, _ := strconv.ParseInt(id, 2, 32)
 	return int(res)
 }

@@ -252,8 +270,9 @@ func (t *ICMPTracer) send(ttl int) error {
 	icmpHeader := icmp.Message{
 		Type: ipv4.ICMPTypeEcho, Code: 0,
 		Body: &icmp.Echo{
-			ID:   id,
-			Data: []byte("HELLO-R-U-THERE"),
+			ID: id,
+			//Data: []byte("HELLO-R-U-THERE"),
+			Data: append(bytes.Repeat([]byte{1}, t.Config.PktSize-4), 0x00, 0x00, 0x4f, 0xff),
 			Seq:  ttl,
 		},
 	}
@@ -298,6 +317,8 @@ func (t *ICMPTracer) send(ttl int) error {
 		h.TTL = ttl
 		h.RTT = rtt

+		t.fetchLock.Lock()
+		defer t.fetchLock.Unlock()
 		h.fetchIPData(t.Config)

 		t.res.add(h)
--- a/trace/icmp_ipv6.go
+++ b/trace/icmp_ipv6.go
@@ -1,6 +1,7 @@
 package trace

 import (
+	"bytes"
 	"encoding/binary"
 	"log"
 	"net"
@@ -25,10 +26,11 @@ type ICMPTracerv6 struct {
 	icmpListen            net.PacketConn
 	final                 int
 	finalLock             sync.Mutex
+	fetchLock             sync.Mutex
 }

 func (t *ICMPTracerv6) PrintFunc() {
-	// defer t.wg.Done()
+	defer t.wg.Done()
 	var ttl = t.Config.BeginHop - 1
 	for {
 		if t.AsyncPrinter != nil {
@@ -42,12 +44,12 @@ func (t *ICMPTracerv6) PrintFunc() {
 					t.RealtimePrinter(&t.res, ttl)
 				}
 				ttl++
-				if ttl == t.final {
+
+				if ttl == t.final-1 || ttl >= t.MaxHops-1 {
 					return
 				}
 			}
 		}
-
 		<-time.After(200 * time.Millisecond)
 	}
 }
@@ -76,6 +78,7 @@ func (t *ICMPTracerv6) Execute() (*Result, error) {
 	t.final = -1

 	go t.listenICMP()
+	t.wg.Add(1)
 	go t.PrintFunc()
 	for ttl := t.BeginHop; ttl <= t.MaxHops; ttl++ {
 		t.inflightRequestRWLock.Lock()
@@ -135,6 +138,7 @@ func (t *ICMPTracerv6) Execute() (*Result, error) {

 func (t *ICMPTracerv6) listenICMP() {
 	lc := NewPacketListener(t.icmpListen, t.ctx)
+	psize = t.Config.PktSize
 	go lc.Start()
 	for {
 		select {
@@ -186,6 +190,8 @@ func (t *ICMPTracerv6) listenICMP() {
 							t.handleICMPMessage(msg, 0, rm.Body.(*icmp.TimeExceeded).Data, int(ttl))
 						case ipv6.ICMPTypeEchoReply:
 							t.handleICMPMessage(msg, 1, rm.Body.(*icmp.Echo).Data, int(ttl))
+						case ipv6.ICMPTypeDestinationUnreachable:
+							t.handleICMPMessage(msg, 2, rm.Body.(*icmp.DstUnreach).Data, int(ttl))
 						default:
 							// log.Println("received icmp message of unknown type", rm.Type)
 						}
@@ -229,12 +235,20 @@ func (t *ICMPTracerv6) listenICMP() {
 }

 func (t *ICMPTracerv6) handleICMPMessage(msg ReceivedMessage, icmpType int8, data []byte, ttl int) {
+	if icmpType == 2 {
+		if t.DestIP.String() != msg.Peer.String() {
+			return
+		}
+	}
 	t.inflightRequestRWLock.RLock()
 	defer t.inflightRequestRWLock.RUnlock()
+
+	mpls := extractMPLS(msg, data)
 	if _, ok := t.inflightRequest[ttl]; ok {
 		t.inflightRequest[ttl] <- Hop{
 			Success: true,
 			Address: msg.Peer,
+			MPLS:    mpls,
 		}
 	}
 }
@@ -249,8 +263,9 @@ func (t *ICMPTracerv6) send(ttl int) error {
 	icmpHeader := icmp.Message{
 		Type: ipv6.ICMPTypeEchoRequest, Code: 0,
 		Body: &icmp.Echo{
-			ID:   id,
-			Data: []byte("HELLO-R-U-THERE"),
+			ID: id,
+			//Data: []byte("HELLO-R-U-THERE"),
+			Data: append(bytes.Repeat([]byte{1}, t.Config.PktSize-4), 0x00, 0x00, 0x4f, 0xff),
 			Seq:  ttl,
 		},
 	}
@@ -298,6 +313,8 @@ func (t *ICMPTracerv6) send(ttl int) error {
 		h.TTL = ttl
 		h.RTT = rtt

+		t.fetchLock.Lock()
+		defer t.fetchLock.Unlock()
 		h.fetchIPData(t.Config)

 		t.res.add(h)
--- a/trace/internal/icmp_darwin.go
+++ b/trace/internal/icmp_darwin.go
@@ -0,0 +1,50 @@
+//go:build darwin
+
+package internal
+
+import (
+	"context"
+	"errors"
+	"net"
+	"os"
+	"syscall"
+	"unsafe"
+)
+
+//go:linkname internetSocket net.internetSocket
+func internetSocket(ctx context.Context, net string, laddr, raddr interface{}, sotype, proto int, mode string, ctrlCtxFn func(context.Context, string, string, syscall.RawConn) error) (fd unsafe.Pointer, err error)
+
+//go:linkname newIPConn net.newIPConn
+func newIPConn(fd unsafe.Pointer) *net.IPConn
+
+var (
+	errUnknownNetwork = errors.New("unknown network type")
+
+	networkMap = map[string]string{
+		"ip4:icmp": "udp4",
+		"ip4:1":    "udp4",
+		"ip6:icmp": "udp6",
+		"ip6:58":   "udp6",
+	}
+)
+
+// ListenICMP 会造成指定出口IP功能不可使用
+func ListenICMP(network string, laddr string) (net.PacketConn, error) {
+	if os.Getuid() == 0 { // root
+		return net.ListenPacket(network, laddr)
+	} else {
+		if nw, ok := networkMap[network]; ok {
+			proto := syscall.IPPROTO_ICMP
+			if nw == "udp6" {
+				proto = syscall.IPPROTO_ICMPV6
+			}
+			isock, err := internetSocket(context.Background(), nw, nil, nil, syscall.SOCK_DGRAM, proto, "listen", nil)
+			if err != nil {
+				panic(err)
+			}
+			return newIPConn(isock), nil
+		} else {
+			return nil, errUnknownNetwork
+		}
+	}
+}
--- a/trace/internal/icmp_general.go
+++ b/trace/internal/icmp_general.go
@@ -0,0 +1,9 @@
+//go:build !darwin
+
+package internal
+
+import "net"
+
+func ListenICMP(network string, laddr string) (net.PacketConn, error) {
+	return net.ListenPacket(network, laddr)
+}
--- a/trace/tcp_ipv4.go
+++ b/trace/tcp_ipv4.go
@@ -10,7 +10,7 @@ import (

 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	"github.com/xgadget-lab/nexttrace/util"
+	"github.com/nxtrace/NTrace-core/util"
 	"golang.org/x/net/context"
 	"golang.org/x/net/icmp"
 	"golang.org/x/net/ipv4"
@@ -31,7 +31,8 @@ type TCPTracer struct {
 	final     int
 	finalLock sync.Mutex

-	sem *semaphore.Weighted
+	sem       *semaphore.Weighted
+	fetchLock sync.Mutex
 }

 func (t *TCPTracer) Execute() (*Result, error) {
@@ -79,7 +80,7 @@ func (t *TCPTracer) Execute() (*Result, error) {
 		for i := 0; i < t.NumMeasurements; i++ {
 			t.wg.Add(1)
 			go t.send(ttl)
-
+			<-time.After(time.Millisecond * time.Duration(t.Config.PacketInterval))
 		}
 		if t.RealtimePrinter != nil {
 			// 对于实时模式，应该按照TTL进行并发请求
@@ -87,7 +88,7 @@ func (t *TCPTracer) Execute() (*Result, error) {
 			t.RealtimePrinter(&t.res, ttl-1)
 		}

-		time.Sleep(1 * time.Millisecond)
+		<-time.After(time.Millisecond * time.Duration(t.Config.TTLInterval))
 	}
 	go func() {
 		if t.AsyncPrinter != nil {
@@ -233,6 +234,11 @@ func (t *TCPTracer) send(ttl int) error {
 		ComputeChecksums: true,
 		FixLengths:       true,
 	}
+
+	desiredPayloadSize := t.Config.PktSize
+	payload := make([]byte, desiredPayloadSize)
+	copy(buf.Bytes(), payload)
+
 	if err := gopacket.SerializeLayers(buf, opts, tcpHeader); err != nil {
 		return err
 	}
@@ -251,7 +257,7 @@ func (t *TCPTracer) send(ttl int) error {
 	t.inflightRequest[int(sequenceNumber)] = hopCh
 	t.inflightRequestLock.Unlock()
 	/*
-		// 这里属于 2个Sender，N个Reciever的情况，在哪里关闭Channel都容易导致Panic
+		// 这里属于 2个Sender，N个Receiver的情况，在哪里关闭Channel都容易导致Panic
 		defer func() {
 			t.inflightRequestLock.Lock()
 			close(hopCh)
@@ -285,6 +291,8 @@ func (t *TCPTracer) send(ttl int) error {
 		h.TTL = ttl
 		h.RTT = rtt

+		t.fetchLock.Lock()
+		defer t.fetchLock.Unlock()
 		h.fetchIPData(t.Config)

 		t.res.add(h)
--- a/trace/tcp_ipv6.go
+++ b/trace/tcp_ipv6.go
@@ -10,7 +10,7 @@ import (

 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	"github.com/xgadget-lab/nexttrace/util"
+	"github.com/nxtrace/NTrace-core/util"
 	"golang.org/x/net/context"
 	"golang.org/x/net/icmp"
 	"golang.org/x/net/ipv6"
@@ -31,7 +31,8 @@ type TCPTracerv6 struct {
 	final     int
 	finalLock sync.Mutex

-	sem *semaphore.Weighted
+	sem       *semaphore.Weighted
+	fetchLock sync.Mutex
 }

 func (t *TCPTracerv6) Execute() (*Result, error) {
@@ -63,7 +64,7 @@ func (t *TCPTracerv6) Execute() (*Result, error) {

 	t.sem = semaphore.NewWeighted(int64(t.ParallelRequests))

-	for ttl := 1; ttl <= t.MaxHops; ttl++ {
+	for ttl := t.BeginHop; ttl <= t.MaxHops; ttl++ {
 		// 如果到达最终跳，则退出
 		if t.final != -1 && ttl > t.final {
 			break
@@ -71,14 +72,14 @@ func (t *TCPTracerv6) Execute() (*Result, error) {
 		for i := 0; i < t.NumMeasurements; i++ {
 			t.wg.Add(1)
 			go t.send(ttl)
+			<-time.After(time.Millisecond * time.Duration(t.Config.PacketInterval))
 		}
 		if t.RealtimePrinter != nil {
 			// 对于实时模式，应该按照TTL进行并发请求
 			t.wg.Wait()
 			t.RealtimePrinter(&t.res, ttl-1)
 		}
-		time.Sleep(1 * time.Millisecond)
-
+		<-time.After(time.Millisecond * time.Duration(t.Config.TTLInterval))
 	}

 	go func() {
@@ -223,6 +224,11 @@ func (t *TCPTracerv6) send(ttl int) error {
 		ComputeChecksums: true,
 		FixLengths:       true,
 	}
+
+	desiredPayloadSize := t.Config.PktSize
+	payload := make([]byte, desiredPayloadSize)
+	copy(buf.Bytes(), payload)
+
 	if err := gopacket.SerializeLayers(buf, opts, tcpHeader); err != nil {
 		return err
 	}
@@ -268,6 +274,8 @@ func (t *TCPTracerv6) send(ttl int) error {
 		h.TTL = ttl
 		h.RTT = rtt

+		t.fetchLock.Lock()
+		defer t.fetchLock.Unlock()
 		h.fetchIPData(t.Config)

 		t.res.add(h)
--- a/trace/temp_printer.go
+++ b/trace/temp_printer.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"

-	"github.com/xgadget-lab/nexttrace/ipgeo"
+	"github.com/nxtrace/NTrace-core/ipgeo"
 )

 func HopPrinter(h Hop) {
--- a/trace/trace.go
+++ b/trace/trace.go
@@ -2,17 +2,22 @@ package trace

 import (
 	"errors"
+	"fmt"
 	"net"
+	"strconv"
+	"strings"
 	"sync"
 	"time"

-	"github.com/xgadget-lab/nexttrace/ipgeo"
+	"github.com/nxtrace/NTrace-core/ipgeo"
+	"github.com/nxtrace/NTrace-core/util"
 )

 var (
 	ErrInvalidMethod      = errors.New("invalid method")
 	ErrTracerouteExecuted = errors.New("traceroute already executed")
 	ErrHopLimitTimeout    = errors.New("hop timeout")
+	geoCache              = sync.Map{}
 )

 type Config struct {
@@ -34,6 +39,8 @@ type Config struct {
 	DN42             bool
 	RealtimePrinter  func(res *Result, ttl int)
 	AsyncPrinter     func(res *Result)
+	PktSize          int
+	Maptrace         bool
 }

 type Method string
@@ -89,8 +96,9 @@ func Traceroute(method Method, config Config) (*Result, error) {
 }

 type Result struct {
-	Hops [][]Hop
-	lock sync.Mutex
+	Hops        [][]Hop
+	lock        sync.Mutex
+	TraceMapUrl string
 }

 func (s *Result) add(hop Hop) {
@@ -119,19 +127,21 @@ type Hop struct {
 	Error    error
 	Geo      *ipgeo.IPGeoData
 	Lang     string
+	MPLS     []string
 }

 func (h *Hop) fetchIPData(c Config) (err error) {
+
 	// DN42
 	if c.DN42 {
 		var ip string
 		// 首先查找 PTR 记录
-		r, err := net.LookupAddr(h.Address.String())
+		r, err := util.LookupAddr(h.Address.String())
 		if err == nil && len(r) > 0 {
 			h.Hostname = r[0][:len(r[0])-1]
 			ip = h.Address.String() + "," + h.Hostname
 		}
-		h.Geo, err = c.IPGeoSource(ip)
+		h.Geo, _ = c.IPGeoSource(ip, c.Timeout, c.Lang, c.Maptrace)
 		return nil
 	}

@@ -145,7 +155,7 @@ func (h *Hop) fetchIPData(c Config) (err error) {
 	if c.RDns && h.Hostname == "" {
 		// Create a rDNS Query go-routine
 		go func() {
-			r, err := net.LookupAddr(h.Address.String())
+			r, err := util.LookupAddr(h.Address.String())
 			if err != nil {
 				// No PTR Record
 				rDNSChan <- nil
@@ -164,7 +174,21 @@ func (h *Hop) fetchIPData(c Config) (err error) {
 			h.Lang = c.Lang
 			h.Geo, res = ipgeo.Filter(h.Address.String())
 			if !res {
-				h.Geo, err = c.IPGeoSource(h.Address.String())
+				timeout := c.Timeout
+				if c.Timeout < 2*time.Second {
+					timeout = 2 * time.Second
+				}
+				//h.Geo, err = c.IPGeoSource(h.Address.String(), timeout, c.Lang, c.Maptrace)
+				if cacheVal, ok := geoCache.Load(h.Address.String()); ok {
+					// 如果缓存中已有结果，直接使用
+					h.Geo = cacheVal.(*ipgeo.IPGeoData)
+				} else {
+					// 如果缓存中无结果，进行查询并将结果存入缓存
+					h.Geo, err = c.IPGeoSource(h.Address.String(), timeout, c.Lang, c.Maptrace)
+					if err == nil {
+						geoCache.Store(h.Address.String(), h.Geo)
+					}
+				}
 			}
 		}
 		// Fetch Done
@@ -197,11 +221,116 @@ func (h *Hop) fetchIPData(c Config) (err error) {
 		selectClose = true
 	}

-	// When Select Close, fetchDoneChan Reciever will also be closed
+	// When Select Close, fetchDoneChan Received will also be closed
 	if selectClose {
-		// New a reciever to prevent channel congestion
+		// New a receiver to prevent channel congestion
 		<-fetchDoneChan
 	}

 	return
 }
+
+func extractMPLS(msg ReceivedMessage, data []byte) []string {
+	if util.DisableMPLS != "" {
+		return nil
+	}
+
+	if psize != 52 {
+		return nil
+	}
+
+	extensionOffset := 20 + 8 + psize
+
+	if len(data) <= extensionOffset {
+		return nil
+	}
+
+	extensionBody := data[extensionOffset:]
+	if len(extensionBody) < 8 || len(extensionBody)%8 != 0 {
+		return nil
+	}
+
+	tmp := fmt.Sprintf("%x", msg.Msg[:*msg.N])
+
+	index := strings.Index(tmp, strings.Repeat("01", psize-4)+"00004fff")
+	if index == -1 {
+		return nil
+	}
+	tmp = tmp[index+psize*2:]
+	//由于限制长度了
+	index1 := strings.Index(tmp, "00002000")
+	l := len(tmp[index1+4:])/8 - 2
+	//fmt.Printf("l:%d\n", l)
+
+	if l < 1 {
+		return nil
+	}
+	//去掉扩展头和MPLS头
+	tmp = tmp[index1+4+8*2:]
+	//fmt.Print(tmp)
+
+	var retStrList []string
+	for i := 0; i < l; i++ {
+		label, err := strconv.ParseInt(tmp[i*8+0:i*8+5], 16, 32)
+		if err != nil {
+			return nil
+		}
+
+		strSlice := fmt.Sprintf("%s", []byte(tmp[i*8+5:i*8+6]))
+		//fmt.Printf("\nstrSlice: %s\n", strSlice)
+
+		num, err := strconv.ParseUint(strSlice, 16, 64)
+		if err != nil {
+			return nil
+		}
+		binaryStr := fmt.Sprintf("%04s", strconv.FormatUint(num, 2))
+
+		//fmt.Printf("\nbinaryStr: %s\n", binaryStr)
+		tc, err := strconv.ParseInt(binaryStr[:3], 2, 32)
+		if err != nil {
+			return nil
+		}
+		s := binaryStr[3:]
+
+		ttlMpls, err := strconv.ParseInt(tmp[i*8+6:i*8+8], 16, 32)
+		if err != nil {
+			return nil
+		}
+
+		//if i > 0 {
+		//	retStr += "\n    "
+		//}
+
+		retStrList = append(retStrList, fmt.Sprintf("[MPLS: Lbl %d, TC %d, S %s, TTL %d]", label, tc, s, ttlMpls))
+	}
+
+	//label, err := strconv.ParseInt(tmp[len(tmp)-8:len(tmp)-3], 16, 32)
+	//if err != nil {
+	//	return ""
+	//}
+	//
+	//strSlice := fmt.Sprintf("%s", []byte(tmp[len(tmp)-3:len(tmp)-2]))
+	////fmt.Printf("\nstrSlice: %s\n", strSlice)
+	//
+	//num, err := strconv.ParseUint(strSlice, 16, 64)
+	//if err != nil {
+	//	return ""
+	//}
+	//binaryStr := fmt.Sprintf("%04s", strconv.FormatUint(num, 2))
+	//
+	////fmt.Printf("\nbinaryStr: %s\n", binaryStr)
+	//tc, err := strconv.ParseInt(binaryStr[:3], 2, 32)
+	//if err != nil {
+	//	return ""
+	//}
+	//s := binaryStr[3:]
+	//
+	//ttlMpls, err := strconv.ParseInt(tmp[len(tmp)-2:], 16, 32)
+	//if err != nil {
+	//	return ""
+	//}
+	//
+	//retStr := fmt.Sprintf("Lbl %d, TC %d, S %s, TTL %d", label, tc, s, ttlMpls)
+
+	return retStrList
+}
--- a/trace/udp.go
+++ b/trace/udp.go
@@ -8,7 +8,7 @@ import (

 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	"github.com/xgadget-lab/nexttrace/util"
+	"github.com/nxtrace/NTrace-core/util"
 	"golang.org/x/net/context"
 	"golang.org/x/net/icmp"
 	"golang.org/x/net/ipv4"
@@ -28,7 +28,8 @@ type UDPTracer struct {
 	final     int
 	finalLock sync.Mutex

-	sem *semaphore.Weighted
+	sem       *semaphore.Weighted
+	fetchLock sync.Mutex
 }

 func (t *UDPTracer) Execute() (*Result, error) {
@@ -60,14 +61,14 @@ func (t *UDPTracer) Execute() (*Result, error) {
 		for i := 0; i < t.NumMeasurements; i++ {
 			t.wg.Add(1)
 			go t.send(ttl)
-
+			<-time.After(time.Millisecond * time.Duration(t.Config.PacketInterval))
 		}
 		if t.RealtimePrinter != nil {
 			// 对于实时模式，应该按照TTL进行并发请求
 			t.wg.Wait()
 			t.RealtimePrinter(&t.res, ttl-1)
 		}
-		time.Sleep(1 * time.Millisecond)
+		<-time.After(time.Millisecond * time.Duration(t.Config.TTLInterval))
 	}
 	go func() {
 		if t.AsyncPrinter != nil {
@@ -188,7 +189,12 @@ func (t *UDPTracer) send(ttl int) error {
 			ComputeChecksums: true,
 			FixLengths:       true,
 		}
-		if err := gopacket.SerializeLayers(buf, opts, udpHeader, gopacket.Payload("HAJSFJHKAJSHFKJHAJKFHKASHKFHHKAFKHFAHSJK")); err != nil {
+
+		desiredPayloadSize := t.Config.PktSize
+		payload := make([]byte, desiredPayloadSize)
+		copy(buf.Bytes(), payload)
+
+		if err := gopacket.SerializeLayers(buf, opts, udpHeader); err != nil {
 			return err
 		}

@@ -256,6 +262,8 @@ func (t *UDPTracer) send(ttl int) error {
 		h.TTL = ttl
 		h.RTT = rtt

+		t.fetchLock.Lock()
+		defer t.fetchLock.Unlock()
 		h.fetchIPData(t.Config)

 		t.res.add(h)
--- a/tracelog/log.go
+++ b/tracelog/log.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"

-	"github.com/xgadget-lab/nexttrace/trace"
+	"github.com/nxtrace/NTrace-core/trace"
 )

 func RealtimePrinter(res *trace.Result, ttl int) {
--- a/tracemap/tracemap.go
+++ b/tracemap/tracemap.go
@@ -1,20 +1,78 @@
 package tracemap

 import (
+	"crypto/tls"
+	"errors"
 	"fmt"
-	"io"
-	"net/http"
-	"strings"
-
 	"github.com/fatih/color"
+	"github.com/nxtrace/NTrace-core/util"
+	"io"
+	"net"
+	"net/http"
+	"net/url"
+	"strings"
+	"time"
 )

-func GetMapUrl(r string) {
-	url := "https://api.leo.moe/tracemap/api"
-	resp, _ := http.Post(url, "application/json", strings.NewReader(r))
-	body, _ := io.ReadAll(resp.Body)
-	fmt.Fprintf(color.Output, "%s %s\n",
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "MapTrace URL:"),
-		color.New(color.FgBlue, color.Bold).Sprintf("%s", string(body)),
-	)
+func GetMapUrl(r string) (string, error) {
+	host, port := util.GetHostAndPort()
+	fastIp := "api.leo.moe"
+	// 如果 host 是一个 IP 使用默认域名
+	if valid := net.ParseIP(host); valid != nil {
+		fastIp = host
+		if len(strings.Split(fastIp, ":")) > 1 {
+			fastIp = "[" + fastIp + "]"
+		}
+		host = "api.leo.moe"
+	} else {
+		// 默认配置完成，开始寻找最优 IP
+		fastIp = util.GetFastIP(host, port, false)
+	}
+	u := url.URL{Scheme: "https", Host: fastIp + ":" + port, Path: "/tracemap/api"}
+	tracemapUrl := u.String()
+
+	client := &http.Client{
+		Timeout: 5 * time.Second,
+		Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{
+				ServerName: host,
+			},
+		},
+	}
+	proxyUrl := util.GetProxy()
+	if proxyUrl != nil {
+		client.Transport.(*http.Transport).Proxy = http.ProxyURL(proxyUrl)
+	}
+	req, err := http.NewRequest("POST", tracemapUrl, strings.NewReader(r))
+	if err != nil {
+		return "", errors.New("an issue occurred while connecting to the tracemap API")
+	}
+	req.Header.Add("User-Agent", util.UserAgent)
+	req.Host = host
+	req.Header.Add("Content-Type", "application/json")
+	resp, err := client.Do(req)
+	if err != nil {
+		return "", errors.New("an issue occurred while connecting to the tracemap API")
+	}
+	defer func(Body io.ReadCloser) {
+		err := Body.Close()
+		if err != nil {
+			return
+		}
+	}(resp.Body)
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return "", errors.New("an issue occurred while connecting to the tracemap API")
+	}
+	return string(body), nil
+}
+
+func PrintMapUrl(r string) {
+	_, err := fmt.Fprintf(color.Output, "%s %s\n",
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "MapTrace URL:"),
+		color.New(color.FgBlue, color.Bold).Sprintf("%s", r),
+	)
+	if err != nil {
+		return
+	}
 }
--- a/util/dns_test.go
+++ b/util/dns_test.go
@@ -8,6 +8,13 @@ import (

 func TestDNS(t *testing.T) {
 	resolver := DNSSB()
-	ips, _ := resolver.LookupHost(context.Background(), "www.google.com")
+	ips, _ := resolver.LookupHost(context.Background(), "www.bing.com")
+	fmt.Println(ips)
+}
+
+func TestDomainLookUp(t *testing.T) {
+	ips, _ := DomainLookUp("pek-4134.nexttrace-io-fasttrace-endpoint.win.", "all", "", false)
+	fmt.Println(ips)
+	ips, _ = DomainLookUp("pek-4134.nexttrace-io-fasttrace-endpoint.win.", "4", "", false)
 	fmt.Println(ips)
 }
--- a/util/latency.go
+++ b/util/latency.go
@@ -0,0 +1,121 @@
+package util
+
+import (
+	"crypto/tls"
+	"fmt"
+	"io"
+	"log"
+	"net"
+	"net/http"
+	"strings"
+	"time"
+
+	"github.com/fatih/color"
+)
+
+type ResponseInfo struct {
+	IP      string
+	Latency string
+	Content string
+}
+
+var (
+	results = make(chan ResponseInfo)
+	timeout = 5 * time.Second
+)
+var FastIpCache = ""
+
+func GetFastIP(domain string, port string, enableOutput bool) string {
+	proxyUrl := GetProxy()
+	if proxyUrl != nil {
+		return "api.leo.moe"
+	}
+	if FastIpCache != "" {
+		return FastIpCache
+	}
+
+	ips, err := net.LookupIP(domain)
+	if err != nil {
+		log.Fatal("DNS resolution failed, please check your system DNS Settings")
+	}
+
+	if len(ips) == 0 {
+		// 添加默认IP 45.88.195.154
+		ips = append(ips, net.ParseIP("45.88.195.154"))
+	}
+
+	for _, ip := range ips {
+		go checkLatency(domain, ip.String(), port)
+	}
+
+	var result ResponseInfo
+
+	select {
+	case result = <-results:
+	//等待5s没有结果 视为连不上API了
+	case <-time.After(timeout):
+		log.Println("IP connection has been timeout, please check your network")
+
+	}
+
+	//if len(ips) > 0 {
+	if enableOutput {
+		_, _ = fmt.Fprintf(color.Output, "%s preferred API IP - %s - %s - %s",
+			color.New(color.FgWhite, color.Bold).Sprintf("[NextTrace API]"),
+			color.New(color.FgGreen, color.Bold).Sprintf("%s", result.IP),
+			color.New(color.FgCyan, color.Bold).Sprintf("%sms", result.Latency),
+			color.New(color.FgGreen, color.Bold).Sprintf("%s", result.Content),
+		)
+	}
+	//}
+	FastIpCache = result.IP
+	return result.IP
+}
+
+func checkLatency(domain string, ip string, port string) {
+	start := time.Now()
+	if !strings.Contains(ip, ".") {
+		ip = "[" + ip + "]"
+	}
+
+	// 自定义DialContext以使用指定的IP连接
+	transport := &http.Transport{
+		//DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
+		//	return net.DialTimeout(network, addr, 1*time.Second)
+		//},
+		TLSClientConfig: &tls.Config{
+			ServerName: domain,
+		},
+		TLSHandshakeTimeout: timeout,
+	}
+
+	client := &http.Client{
+		Transport: transport,
+		Timeout:   timeout,
+	}
+
+	//此处虽然是 https://domain/ 但是实际上会使用指定的IP连接
+	req, err := http.NewRequest("GET", "https://"+ip+":"+port+"/", nil)
+	if err != nil {
+		// !!! 此处不要给results返回任何值
+		//results <- ResponseInfo{IP: ip, Latency: "error", Content: ""}
+		return
+	}
+	req.Host = domain
+	resp, err := client.Do(req)
+	if err != nil {
+		//results <- ResponseInfo{IP: ip, Latency: "error", Content: ""}
+		return
+	}
+	defer resp.Body.Close()
+
+	bodyBytes, err := io.ReadAll(resp.Body)
+	if err != nil {
+		//results <- ResponseInfo{IP: ip, Latency: "error", Content: ""}
+		return
+	}
+	bodyString := string(bodyBytes)
+
+	latency := fmt.Sprintf("%.2f", float64(time.Since(start))/float64(time.Millisecond))
+	results <- ResponseInfo{IP: ip, Latency: latency, Content: bodyString}
+}
--- a/util/latency_test.go
+++ b/util/latency_test.go
@@ -0,0 +1,6 @@
+package util
+
+//github action test 不支持v6 这里会报错
+//func TestGetFastIP(t *testing.T) {
+//	GetFastIP("api.leo.moe", "443", true)
+//}
--- a/util/util.go
+++ b/util/util.go
@@ -2,14 +2,45 @@ package util

 import (
 	"context"
+	"errors"
 	"fmt"
+	"github.com/nxtrace/NTrace-core/config"
 	"log"
 	"net"
+	"net/url"
 	"os"
+	"runtime"
+	"strings"
+	"sync"

 	"github.com/fatih/color"
 )

+var Uninterrupted = GetenvDefault("NEXTTRACE_UNINTERRUPTED", "")
+var EnvToken = GetenvDefault("NEXTTRACE_TOKEN", "")
+var UserAgent = fmt.Sprintf("NextTrace %s/%s/%s", config.Version, runtime.GOOS, runtime.GOARCH)
+var RdnsCache sync.Map
+var PowProviderParam = ""
+var DisableMPLS = GetenvDefault("NEXTTRACE_DISABLEMPLS", "")
+
+func LookupAddr(addr string) ([]string, error) {
+	// 如果在缓存中找到，直接返回
+	if hostname, ok := RdnsCache.Load(addr); ok {
+		//fmt.Println("hit RdnsCache for", addr, hostname)
+		return []string{hostname.(string)}, nil
+	}
+	// 如果缓存中未找到，进行 DNS 查询
+	names, err := net.LookupAddr(addr)
+	if err != nil {
+		return nil, err
+	}
+	// 将查询结果存入缓存
+	if len(names) > 0 {
+		RdnsCache.Store(addr, names[0])
+	}
+	return names, nil
+}
+
 // LocalIPPort get the local ip and port based on our destination ip
 func LocalIPPort(dstip net.IP) (net.IP, int) {
 	serverAddr, err := net.ResolveUDPAddr("udp", dstip.String()+":12345")
@@ -45,7 +76,8 @@ func LocalIPPortv6(dstip net.IP) (net.IP, int) {
 	return nil, -1
 }

-func DomainLookUp(host string, ipv4Only bool, dotServer string) net.IP {
+func DomainLookUp(host string, ipVersion string, dotServer string, disableOutput bool) (net.IP, error) {
+	// ipVersion: 4, 6, all
 	var (
 		r   *net.Resolver
 		ips []net.IP
@@ -65,26 +97,40 @@ func DomainLookUp(host string, ipv4Only bool, dotServer string) net.IP {
 	default:
 		r = newUDPResolver()
 	}
-	ips_str, err := r.LookupHost(context.Background(), host)
-	for _, v := range ips_str {
+	ipsStr, err := r.LookupHost(context.Background(), host)
+	for _, v := range ipsStr {
 		ips = append(ips, net.ParseIP(v))
 	}
 	if err != nil {
-		fmt.Println("Domain " + host + " Lookup Fail.")
-		os.Exit(1)
+		return nil, errors.New("DNS lookup failed")
 	}

-	var ipv6Flag = false
+	//var ipv6Flag = false
+	//TODO: 此处代码暂无意义
+	//if ipv6Flag {
+	//	fmt.Println("[Info] IPv6 UDP Traceroute is not supported right now.")
+	//	if len(ips) == 0 {
+	//		os.Exit(0)
+	//	}
+	//}

-	if ipv6Flag {
-		fmt.Println("[Info] IPv6 UDP Traceroute is not supported right now.")
-		if len(ips) == 0 {
-			os.Exit(0)
+	// Filter by IPv4/IPv6
+	if ipVersion != "all" {
+		var filteredIPs []net.IP
+		for _, ip := range ips {
+			if ipVersion == "4" && ip.To4() != nil {
+				filteredIPs = []net.IP{ip}
+				break
+			} else if ipVersion == "6" && strings.Contains(ip.String(), ":") {
+				filteredIPs = []net.IP{ip}
+				break
+			}
 		}
+		ips = filteredIPs
 	}

-	if len(ips) == 1 {
-		return ips[0]
+	if (len(ips) == 1) || (disableOutput) {
+		return ips[0], nil
 	} else {
 		fmt.Println("Please Choose the IP You Want To TraceRoute")
 		for i, ip := range ips {
@@ -103,14 +149,80 @@ func DomainLookUp(host string, ipv4Only bool, dotServer string) net.IP {
 			fmt.Println("Your Option is invalid")
 			os.Exit(3)
 		}
-		return ips[index]
+		return ips[index], nil
 	}
 }

 func GetenvDefault(key, defVal string) string {
 	val, ok := os.LookupEnv(key)
 	if ok {
+		_, ok := os.LookupEnv("NEXTTRACE_DEBUG")
+		if ok {
+			fmt.Println("ENV", key, "detected as", val)
+		}
 		return val
 	}
 	return defVal
 }
+
+func GetHostAndPort() (host string, port string) {
+	var hostP = GetenvDefault("NEXTTRACE_HOSTPORT", "api.leo.moe")
+	// 解析域名
+	hostArr := strings.Split(hostP, ":")
+	// 判断是否有指定端口
+	if len(hostArr) > 1 {
+		// 判断是否为 IPv6
+		if strings.HasPrefix(hostP, "[") {
+			tmp := strings.Split(hostP, "]")
+			host = tmp[0]
+			host = host[1:]
+			if port = tmp[1]; port != "" {
+				port = port[1:]
+			}
+		} else {
+			host, port = hostArr[0], hostArr[1]
+		}
+	} else {
+		host = hostP
+	}
+	if port == "" {
+		// 默认端口
+		port = "443"
+	}
+	return
+}
+
+func GetProxy() *url.URL {
+	proxyURLStr := GetenvDefault("NEXTTRACE_PROXY", "")
+	if proxyURLStr == "" {
+		return nil
+	}
+	proxyURL, err := url.Parse(proxyURLStr)
+	if err != nil {
+		log.Println("Failed to parse proxy URL:", err)
+		return nil
+	}
+	return proxyURL
+}
+
+func GetPowProvider() string {
+	var powProvider = ""
+	if PowProviderParam == "" {
+		powProvider = GetenvDefault("NEXTTRACE_POWPROVIDER", "api.leo.moe")
+	} else {
+		powProvider = PowProviderParam
+	}
+	if powProvider == "sakura" {
+		return "pow.nexttrace.owo.13a.com"
+	}
+	return ""
+}
+
+func StringInSlice(val string, list []string) bool {
+	for _, v := range list {
+		if v == val {
+			return true
+		}
+	}
+	return false
+}
--- a/wshandle/client.go
+++ b/wshandle/client.go
@@ -2,6 +2,8 @@ package wshandle

 import (
 	"crypto/tls"
+	"github.com/nxtrace/NTrace-core/pow"
+	"github.com/nxtrace/NTrace-core/util"
 	"log"
 	"net"
 	"net/http"
@@ -13,7 +15,6 @@ import (
 	"time"

 	"github.com/gorilla/websocket"
-	"github.com/xgadget-lab/nexttrace/util"
 )

 type WsConn struct {
@@ -29,8 +30,10 @@ type WsConn struct {
 }

 var wsconn *WsConn
-var hostP = util.GetenvDefault("NEXTTRACE_HOSTPORT", "api.leo.moe")
-var host, port, fast_ip string
+var host, port, fastIp string
+var envToken = util.EnvToken
+var cacheToken string
+var cacheTokenFailedTimes int

 func (c *WsConn) keepAlive() {
 	go func() {
@@ -116,15 +119,44 @@ func (c *WsConn) messageSendHandler() {
 }

 func (c *WsConn) recreateWsConn() {
-	u := url.URL{Scheme: "wss", Host: fast_ip + ":" + port, Path: "/v2/ipGeoWs"}
+	// 尝试重新连线
+	u := url.URL{Scheme: "wss", Host: fastIp + ":" + port, Path: "/v3/ipGeoWs"}
 	// log.Printf("connecting to %s", u.String())
+	jwtToken, ua := envToken, []string{"Privileged Client"}
+	err := error(nil)
+	if envToken == "" {
+		// 无环境变量 token
+		if cacheToken == "" {
+			// 无cacheToken, 重新获取 token
+			if util.GetPowProvider() == "" {
+				jwtToken, err = pow.GetToken(fastIp, host, port)
+			} else {
+				jwtToken, err = pow.GetToken(util.GetPowProvider(), util.GetPowProvider(), port)
+			}
+			if err != nil {
+				log.Println(err)
+				os.Exit(1)
+			}
+		} else {
+			// 使用 cacheToken
+			jwtToken = cacheToken
+		}
+		ua = []string{util.UserAgent}
+	}
+	cacheToken = jwtToken
 	requestHeader := http.Header{
-		"Host": []string{host},
+		"Host":          []string{host},
+		"User-Agent":    ua,
+		"Authorization": []string{"Bearer " + jwtToken},
 	}
 	dialer := websocket.DefaultDialer
 	dialer.TLSClientConfig = &tls.Config{
 		ServerName: host,
 	}
+	proxyUrl := util.GetProxy()
+	if proxyUrl != nil {
+		dialer.Proxy = http.ProxyURL(proxyUrl)
+	}
 	ws, _, err := websocket.DefaultDialer.Dial(u.String(), requestHeader)
 	c.Conn = ws
 	if err != nil {
@@ -132,6 +164,11 @@ func (c *WsConn) recreateWsConn() {
 		// <-time.After(time.Second * 1)
 		c.Connected = false
 		c.Connecting = false
+		if cacheTokenFailedTimes > 3 {
+			cacheToken = ""
+		}
+		cacheTokenFailedTimes += 1
+		//fmt.Println("重连失败", cacheTokenFailedTimes, "次")
 		return
 	} else {
 		c.Connected = true
@@ -143,47 +180,52 @@ func (c *WsConn) recreateWsConn() {
 }

 func createWsConn() *WsConn {
+	proxyUrl := util.GetProxy()
+	//fmt.Println("正在连接 WS")
 	// 设置终端中断通道
 	interrupt := make(chan os.Signal, 1)
 	signal.Notify(interrupt, os.Interrupt)
-	// 解析域名
-	hostArr := strings.Split(hostP, ":")
-	// 判断是否有指定端口
-	if len(hostArr) > 1 {
-		// 判断是否为 IPv6
-		if strings.HasPrefix(hostP, "[") {
-			tmp := strings.Split(hostP, "]")
-			host = tmp[0]
-			host = host[1:]
-			if port = tmp[1]; port != "" {
-				port = port[1:]
-			}
-		} else {
-			host, port = hostArr[0], hostArr[1]
-		}
-	} else {
-		host = hostP
-	}
-	if port == "" {
-		// 默认端口
-		port = "443"
-	}
-	// 默认配置完成，开始寻找最优 IP
-	fast_ip = GetFastIP(host, port)
-
+	host, port = util.GetHostAndPort()
 	// 如果 host 是一个 IP 使用默认域名
 	if valid := net.ParseIP(host); valid != nil {
+		fastIp = host
+		if len(strings.Split(fastIp, ":")) > 1 {
+			fastIp = "[" + fastIp + "]"
+		}
 		host = "api.leo.moe"
+	} else {
+		// 默认配置完成，开始寻找最优 IP
+		fastIp = util.GetFastIP(host, port, true)
 	}
-	// 判断是否是一个 IP
+	jwtToken, ua := envToken, []string{"Privileged Client"}
+	err := error(nil)
+	if envToken == "" {
+		if util.GetPowProvider() == "" {
+			jwtToken, err = pow.GetToken(fastIp, host, port)
+		} else {
+			jwtToken, err = pow.GetToken(util.GetPowProvider(), util.GetPowProvider(), port)
+		}
+		if err != nil {
+			log.Println(err)
+			os.Exit(1)
+		}
+		ua = []string{util.UserAgent}
+	}
+	cacheToken = jwtToken
+	cacheTokenFailedTimes = 0
 	requestHeader := http.Header{
-		"Host": []string{host},
+		"Host":          []string{host},
+		"User-Agent":    ua,
+		"Authorization": []string{"Bearer " + jwtToken},
 	}
 	dialer := websocket.DefaultDialer
 	dialer.TLSClientConfig = &tls.Config{
 		ServerName: host,
 	}
-	u := url.URL{Scheme: "wss", Host: fast_ip + ":" + port, Path: "/v2/ipGeoWs"}
+	if proxyUrl != nil {
+		dialer.Proxy = http.ProxyURL(proxyUrl)
+	}
+	u := url.URL{Scheme: "wss", Host: fastIp + ":" + port, Path: "/v3/ipGeoWs"}
 	// log.Printf("connecting to %s", u.String())

 	c, _, err := websocket.DefaultDialer.Dial(u.String(), requestHeader)
--- a/wshandle/latency.go
+++ b/wshandle/latency.go
@@ -1,71 +0,0 @@
-package wshandle
-
-import (
-	"fmt"
-	"log"
-	"net"
-	"strings"
-	"time"
-
-	"github.com/fatih/color"
-)
-
-var (
-	result  string
-	results = make(chan string)
-)
-
-func GetFastIP(domain string, port string) string {
-
-	ips, err := net.LookupIP(domain)
-	if err != nil {
-		log.Fatal("DNS resolution failed, please check your system DNS Settings")
-		return ""
-	}
-
-	for _, ip := range ips {
-		go checkLatency(ip.String(), port)
-	}
-
-	select {
-	case result = <-results:
-	case <-time.After(1 * time.Second):
-
-	}
-	if result == "" {
-		log.Fatal("IP connection has been timeout, please check your network")
-	}
-	res := strings.Split(result, "-")
-
-	if len(ips) > 1 {
-		_, _ = fmt.Fprintf(color.Output, "%s prefered API IP - %s - %s\n",
-			color.New(color.FgWhite, color.Bold).Sprintf("[NextTrace API]"),
-			color.New(color.FgGreen, color.Bold).Sprintf("%s", res[0]),
-			color.New(color.FgCyan, color.Bold).Sprintf("%sms", res[1]),
-		)
-	}
-
-	return res[0]
-}
-
-func checkLatency(ip string, port string) {
-	start := time.Now()
-	if !strings.Contains(ip, ".") {
-		ip = "[" + ip + "]"
-	}
-	conn, err := net.DialTimeout("tcp", ip+":"+port, time.Second*1)
-	if err != nil {
-		return
-	}
-	defer func(conn net.Conn) {
-		err := conn.Close()
-		if err != nil {
-			return
-		}
-	}(conn)
-	if result == "" {
-		result = fmt.Sprintf("%s-%.2f", ip, float64(time.Since(start))/float64(time.Millisecond))
-		results <- result
-		return
-	}
-}
--- a/wshandle/latency_test.go
+++ b/wshandle/latency_test.go
@@ -1,9 +0,0 @@
-package wshandle
-
-import (
-	"testing"
-)
-
-func TestGetFastIP(t *testing.T) {
-	GetFastIP("api.leo.moe", "443")
-}
Author	SHA1	Message	Date
tsosunchia	b2870a823f	修改默认行为，当指定v4/v6时自动选择第一个IP方便脚本使用	2023-11-03 01:21:53 +08:00
tsosunchia	f82af5f9c5	ipv6 trace 正序输出	2023-11-03 00:47:42 +08:00
tsosunchia	9eda2d2a30	chore: 更新依赖	2023-10-31 04:03:50 +08:00
tsosunchia	1a4a15eb74	修复使用NEXTTRACE_HOSTPORT环境变量时不支持IPv6反代地址的问题	2023-10-31 04:03:32 +08:00
tsosunchia	f5556fea5d	Merge pull request #184 from nxtrace/main chore: sync	2023-10-27 21:16:42 +08:00
tsosunchia	d760e75810	fix bug: 当接收到由自身发出的DestinationUnreachable包时视为有效信息，此增强由 @XQZR 提出。	2023-10-20 00:46:58 +08:00
tsosunchia	99409089b2	update credit	2023-10-14 22:32:12 +08:00
tsosunchia	2040497d89	Merge pull request #182 from nxtrace/main chore: 同步至v1.2.3	2023-10-14 15:18:22 +08:00
tsosunchia	29ce61b24b	更新readme	2023-10-14 09:21:05 +08:00
tsosunchia	701abc3447	增加file参数支持文件读取列表进行路由测试	2023-10-14 09:08:29 +08:00
tsosunchia	f08778c862	修正部分typo	2023-10-13 18:34:14 +08:00
tsosunchia	8697325193	Merge pull request #17 from 1-1-2/softfloat add mips softfloat & mipsle softfloat	2023-10-13 18:03:21 +08:00
1-1-2	32b0f15e78	add mips softfloat & mipsle softfloat	2023-10-13 16:46:20 +08:00
tsosunchia	90e349eeed	Merge pull request #181 from nxtrace/main 更新readme	2023-10-13 10:49:48 +08:00
tsosunchia	f275edba3a	更新readme	2023-10-13 10:49:20 +08:00
tsosunchia	2974002c02	Merge pull request #178 from nxtrace/main chore: 同步V1版本	2023-10-12 19:52:57 +08:00
tsosunchia	9b2fc9b570	Merge pull request #16 from nxtrace/dependabot/go_modules/golang.org/x/net-0.17.0 chore(deps): bump golang.org/x/net from 0.16.0 to 0.17.0	2023-10-12 17:48:58 +08:00
tsosunchia	960ab9687c	修复无v6网络下的连接问题	2023-10-12 17:47:31 +08:00
dependabot[bot]	07623ce4fd	chore(deps): bump golang.org/x/net from 0.16.0 to 0.17.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.16.0 to 0.17.0. - [Commits](https://github.com/golang/net/compare/v0.16.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2023-10-11 23:17:18 +00:00
tsosunchia	3164acfccf	Merge pull request #173 from nxtrace/main fix bug: ipv6局域网地址错误显示为INVALID	2023-10-11 10:57:51 +08:00
tsosunchia	8b30ef39dd	fix bug: ipv6局域网地址错误显示为INVALID	2023-10-11 10:22:14 +08:00
tsosunchia	239b1c2f8d	Merge pull request #172 from nxtrace/main update readme	2023-10-09 08:16:24 +08:00
tsosunchia	ed3c158e87	更新下载方式	2023-10-09 08:14:04 +08:00
tsosunchia	02348f08c0	skywolf image update	2023-10-09 08:14:04 +08:00
tsosunchia	9c7402accb	Merge pull request #171 from nxtrace/main 仓库用途变更	2023-10-08 17:21:44 +08:00
tsosunchia	a6848f8f23	仓库用途变更要提交的变更：修改： .github/workflows/build.yml 修改： .github/workflows/publishNewFormula.yml 修改： README.md 修改： README_zh_CN.md 修改： fast_trace/fast_trace_test.go 修改： go.mod 修改： go.sum 修改： pow/pow.go 修改： printer/basic.go 修改： util/latency.go 修改： util/latency_test.go 修改： util/util.go 修改： wshandle/client.go	2023-10-08 17:15:29 +08:00
tsosunchia	29b7c668a4	rename nt_install_v1.sh	2023-10-08 17:13:57 +08:00
tsosunchia	86eacc006e	更新readme	2023-10-08 17:11:35 +08:00
tsosunchia	81d6df8b82	更新readme	2023-10-08 17:07:24 +08:00
tsosunchia	dbe42d669c	更新依赖，优化显示	2023-10-08 16:33:25 +08:00
tsosunchia	a7089e8d54	更换homebrew地址	2023-10-06 21:35:17 +08:00
tsosunchia	bcda750a66	更新homebrew仓库地址地址	2023-10-06 21:30:35 +08:00
tsosunchia	1580c6111f	add mpls func	2023-10-06 21:03:38 +08:00
tsosunchia	a3ef1b2574	update credit	2023-10-06 20:55:44 +08:00
tsosunchia	ba27ff967b	chore: resolve incorrect conversion between integer types https://github.com/nxtrace/NTrace-V1/security/code-scanning/1 要提交的变更：修改： trace/icmp_ipv4.go	2023-10-06 20:30:25 +08:00
tsosunchia	b326d7bed6	更新readme	2023-10-06 06:19:24 +08:00
tsosunchia	b733ef2d82	增加对多MPLS情景的支持，支持通过ENV或参数禁用MPLS功能要提交的变更：修改： cmd/cmd.go 修改： printer/basic.go 修改： printer/printer.go 修改： printer/realtime_printer.go 修改： trace/icmp_ipv4.go 修改： trace/icmp_ipv6.go 修改： trace/trace.go 修改： util/util.go	2023-10-06 06:02:09 +08:00
tsosunchia	2113264336	ipv6 mpls support	2023-10-05 07:25:05 +08:00
tsosunchia	ba7d6ea87b	重构mpls icmpv4 代码	2023-10-05 06:47:28 +08:00
tsosunchia	db1e9e2b0c	v4 mpls实装显示	2023-10-05 06:42:04 +08:00
tsosunchia	13aaa54067	可显示MPLS LABEL	2023-10-05 05:12:01 +08:00
tsosunchia	db9b3fed9a	已经可以检测到MPLS	2023-10-05 04:30:09 +08:00
tsosunchia	7b145f4e64	增加ip2region下载db错误处理	2023-10-05 00:55:44 +08:00
tsosunchia	d444ff3c62	fix bug:IPv4被错误识别为LAN地址	2023-10-05 00:45:06 +08:00
tsosunchia	f1ceaf7f86	rename mod	2023-10-05 00:18:18 +08:00
tsosunchia	d6536f7c69	chore:更新依赖	2023-10-04 23:58:44 +08:00
tsosunchia	ae2e6b3631	修改fasttrace默认行为	2023-10-04 23:42:35 +08:00
tsosunchia	f63ef9552e	修正过滤器	2023-10-03 01:57:11 +08:00
tsosunchia	ce1bae2125	Merge pull request #13 from nxtrace/dependabot/go_modules/github.com/tidwall/gjson-1.17.0 chore(deps): bump github.com/tidwall/gjson from 1.16.0 to 1.17.0	2023-09-25 22:34:52 +08:00
dependabot[bot]	9d3878efbe	chore(deps): bump github.com/tidwall/gjson from 1.16.0 to 1.17.0 Bumps [github.com/tidwall/gjson](https://github.com/tidwall/gjson) from 1.16.0 to 1.17.0. - [Commits](https://github.com/tidwall/gjson/compare/v1.16.0...v1.17.0) --- updated-dependencies: - dependency-name: github.com/tidwall/gjson dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-09-25 14:32:39 +00:00
tsosunchia	c940b9f19f	更新go及依赖	2023-09-13 00:03:35 +08:00
tsosunchia	2d6ae4ff4c	Merge pull request #10 from nxtrace/dependabot/go_modules/golang.org/x/net-0.15.0 chore(deps): bump golang.org/x/net from 0.14.0 to 0.15.0	2023-09-11 23:23:51 +08:00
dependabot[bot]	7977383fec	chore(deps): bump golang.org/x/net from 0.14.0 to 0.15.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.14.0 to 0.15.0. - [Commits](https://github.com/golang/net/compare/v0.14.0...v0.15.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-09-11 14:26:49 +00:00
tsosunchia	ae16731bbe	update readme	2023-09-09 17:21:50 +08:00
tsosunchia	e0ea009b2c	update readme	2023-09-09 16:55:59 +08:00
sjlleo	c532dfd05c	improve: plugin hook for TTLComplete	2023-09-07 22:20:55 +08:00
tsosunchia	b967ee411d	tracemap支持IP-API.COM做为API,修正第三方API部分地区显示问题	2023-09-07 16:35:51 +08:00
tsosunchia	46ce56f3a7	使用ipinfo api时支持显示tracemap，正确识别ANYCAST坐标	2023-09-07 13:27:19 +08:00
sjlleo	bb522ed859	refactor && feat: add plugin system && cobra	2023-09-05 22:18:28 +08:00
tsosunchia	cdfe926c37	更改pow失败时的错误提示	2023-09-05 22:01:45 +08:00
tsosunchia	aa7cea4cf8	dod也纳入考虑	2023-09-05 21:50:23 +08:00
tsosunchia	549dc549dd	网络故障时，不再显示为局域网 @XQZR 你要的我修好了🤗(希望)	2023-09-05 21:16:07 +08:00
tsosunchia	76fa8f2019	Merge pull request #9 from nxtrace/dependabot/github_actions/actions/checkout-4 chore(deps): bump actions/checkout from 3 to 4	2023-09-04 22:57:17 +08:00
dependabot[bot]	9e17f4a24f	chore(deps): bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2023-09-04 14:48:59 +00:00
tsosunchia	b06487e293	Update README_zh_CN.md	2023-09-04 22:10:55 +08:00
tsosunchia	a0ab83c8ed	增加指定第三方POW服务器的参数及环境变量	2023-09-02 19:45:07 +08:00
sjlleo	9e5cd736c8	doc: supplement NextTrace v1/v2 Branch content	2023-09-02 19:27:51 +08:00
tsosunchia	b11d2334c2	Update README_zh_CN.md	2023-09-01 10:45:46 +08:00
tsosunchia	84a03e8a10	Update README.md	2023-09-01 10:45:26 +08:00
tsosunchia	761d506613	Update README	2023-09-01 08:32:21 +08:00
tsosunchia	c3ab3e6c1c	fix:当接口多IP时，指定接口路由导致不能正常运行的问题	2023-08-31 20:02:54 +08:00
tsosunchia	96671d263c	修复了macos下ipv6不能指定dev的问题	2023-08-31 13:19:21 +08:00
tsosunchia	9228cdf307	Update README_zh_CN.md	2023-08-31 09:01:16 +08:00
tsosunchia	12565941ab	Update README.md	2023-08-31 09:00:17 +08:00
sjlleo	e33548d2ce	Update README	2023-08-31 00:12:39 +08:00
tsosunchia	5d766de52f	Update readme	2023-08-31 00:11:49 +08:00
tsosunchia	ce46abd232	更新golang1.21	2023-08-30 20:47:32 +08:00
tsosunchia	6179f1b8f0	Update README	2023-08-30 20:47:32 +08:00
tsosunchia	3c12d99168	更新所有依赖	2023-08-16 23:11:52 +08:00
tsosunchia	f3f99ac0aa	fix bugs:--source and --dev doesn't work on macOS https://github.com/nxtrace/Ntrace-core/issues/147	2023-08-16 22:44:18 +08:00
tsosunchia	cb7bc7450f	Update basic.go	2023-08-15 17:26:13 +08:00
tsosunchia	74f46f5d24	fix bugs:proxy settings https://github.com/nxtrace/Ntrace-V1/pull/2#issuecomment-1610979252	2023-06-28 23:41:58 +08:00
tsosunchia	2bc386355c	fix bugs:proxy settings https://github.com/nxtrace/Ntrace-V1/pull/2#issuecomment-1610979252	2023-06-28 23:06:48 +08:00
tsosunchia	1266f62aba	Update README	2023-06-26 14:52:44 +08:00
Leo	8e837072c6	doc: README_zh_CN	2023-06-26 14:52:41 +08:00
sjlleo	cf0639111d	fix: install fail	2023-06-26 14:52:37 +08:00
sjlleo	56cd0022f7	remove: channel link is illegal and has been removed.	2023-06-26 14:52:33 +08:00
tsosunchia	1407c499b9	Update README	2023-06-26 14:52:27 +08:00
sjlleo	f25662d481	doc: future change	2023-06-26 14:52:22 +08:00
tsosunchia	4f94f01e87	Merge pull request #128 from fakeboboliu/fix1 improve: rootless trace on macOS	2023-06-26 14:52:12 +08:00
Leo	1460ad67c0	refactor: nexttrace core	2023-06-26 14:52:05 +08:00
Leo	d6dcfc8dc5	feat: try add UDP IPv6 Support	2023-06-26 14:51:59 +08:00
Leo	190b3ab94e	chore: add begin hop / srcaddr listen	2023-06-26 14:51:54 +08:00
Leo	87fa850d2d	chore: sync to the latest repository name	2023-06-26 14:51:48 +08:00
Leo	c71a26d018	fix: name change caused installation failure	2023-06-26 14:51:36 +08:00
Leo	79c39b655a	clean mod && delete useless files	2023-06-26 14:51:19 +08:00
tsosunchia	580612ce08	refactor: preparatory work	2023-06-26 14:49:05 +08:00
tsosunchia	141653a3e9	增加版本说明	2023-06-17 20:38:36 +08:00
tsosunchia	f59d7ff2f5	chore:更改相关url	2023-06-17 20:11:10 +08:00
tsosunchia	87f153cdf1	Update README.md	2023-06-17 03:23:14 +08:00
tsosunchia	ebe2a0f8e9	update readme	2023-06-15 12:42:28 +08:00
tsosunchia	ca2a7a8dc8	Update build/test action & readme update readme Update test.yml	2023-06-15 11:43:17 +08:00
tsosunchia	b68b768a65	Merge pull request #138 from tsosunchia/main 支持通过设置SOCKS5/HTTP代理访问我们的API	2023-06-14 23:03:24 +08:00
tsosunchia	efbede8ca1	Update build.yml actions运作发版时，先存储为draft	2023-06-14 22:16:38 +08:00
tsosunchia	b1edef305f	Merge pull request #2 from tsosunchia/proxyenv 增加支持SOCKS5/HTTP代理,通过环境变量NEXTTRACE_PROXY配置.	2023-06-07 03:21:12 +08:00
tsosunchia	54242cfa8b	增加支持SOCKS5/HTTP代理,通过环境变量NEXTTRACE_PROXY配置. 如export NEXTTRACE_PROXY=socks5://127.0.0.1:10808	2023-06-07 03:15:29 +08:00
tsosunchia	2d4de9e4c1	Update .cross_compile.sh	2023-06-04 20:34:17 +08:00
tsosunchia	d75a384d70	Update nt_install.sh	2023-06-04 13:12:40 +08:00
tsosunchia	f6fbf3803f	UPDATE README	2023-06-04 12:38:24 +08:00
tsosunchia	2c86f86204	fix bugs:ipv6下fasttrace异常退出的问题	2023-06-04 05:27:21 +08:00
tsosunchia	dcce91614f	fix bugs:ft下maxhops、pktsize不正常显示、tracemap在配置环境变量时不能正常使用、trace时无法显示第一跳	2023-06-04 04:12:57 +08:00
tsosunchia	85df0121fd	UPDATE README	2023-06-03 20:45:47 +08:00
tsosunchia	4a749285be	将DNS解析与WS握手同步进行	2023-06-03 20:19:01 +08:00
tsosunchia	a92cfc7783	删除无意义文件	2023-06-03 19:52:25 +08:00
tsosunchia	268971e85b	Merge pull request #128 from fakeboboliu/fix1 improve: rootless trace on macOS	2023-06-03 17:26:52 +08:00
bobo liu	2bac716bd7	improve: rootless trace on macOS	2023-06-03 16:50:21 +08:00
tsosunchia	eb64f68663	修补timeout参数	2023-06-03 06:57:44 +08:00
tsosunchia	e9ca9cf388	fixbug:tcp ipv6 trace时遵从BeginHop	2023-06-03 05:47:38 +08:00
tsosunchia	364be22383	tcp,udp模式也适用ttl-time,send-time了	2023-06-03 05:25:14 +08:00
tsosunchia	2f6a2573ae	fetchipdata加mutex,以后同时仅进行一次的查询	2023-06-03 04:28:10 +08:00
tsosunchia	a25157867c	fixbug: fasttrace指定网卡异常退出	2023-06-03 03:33:36 +08:00
tsosunchia	7c37598804	将GeoIPInformatinDataCache推广到所有数据源	2023-06-02 18:13:27 +08:00
tsosunchia	8d30c59c17	fasttrace增加支持SrcDev,SrcAddr,BeginHop,MaxHops,RDns,AlwaysWaitRDNS,Lang,PktSize	2023-06-02 17:32:07 +08:00
tsosunchia	e8e5c1438e	Merge remote-tracking branch 'refs/remotes/origin/main'	2023-06-02 14:20:48 +08:00
tsosunchia	cb0c988eda	Update bug_report.md	2023-06-02 14:20:21 +08:00
tsosunchia	b1cabbc6d4	pow_test增加计时	2023-06-02 13:57:04 +08:00
tsosunchia	2493f471dc	对pow_token也进行了缓存	2023-06-02 04:37:40 +08:00
tsosunchia	8578109243	对rdns也进行了缓存	2023-06-02 02:12:35 +08:00
tsosunchia	089250fee1	提供不间断运行环境变量	2023-06-02 01:41:11 +08:00
tsosunchia	0e87592537	增加IP查询缓存机制	2023-06-02 01:04:32 +08:00
tsosunchia	14552cd853	推介OpenTrace	2023-06-01 18:43:43 +08:00
tsosunchia	44b70cf7e7	fix typo	2023-06-01 18:24:55 +08:00
tsosunchia	3f8b043821	format readme	2023-06-01 18:12:13 +08:00
tsosunchia	fa8eb050af	更新依赖	2023-06-01 17:29:35 +08:00
tsosunchia	50582f0fd0	重构UA存放位置	2023-06-01 16:18:28 +08:00
tsosunchia	64371fb41a	GetTracemap也适用优选IP	2023-06-01 15:40:04 +08:00
tsosunchia	6476c3aff3	pow模块解耦合完成	2023-06-01 14:46:52 +08:00
tsosunchia	4d7831fd29	pow使用的ip也是优选IP	2023-06-01 14:08:32 +08:00
tsosunchia	d602941722	对pow模块解耦合	2023-06-01 12:30:36 +08:00
tsosunchia	2d548fcca0	增加一个设置POWtoken的环境变量	2023-06-01 00:46:45 +08:00
tsosunchia	8a79a5dd1c	调整POW超时时间为5s	2023-05-31 22:30:31 +08:00
tsosunchia	390efdd75d	Merge remote-tracking branch 'origin/main'	2023-05-31 22:20:49 +08:00
tsosunchia	d0d1511c29	增加POW机制	2023-05-31 22:20:08 +08:00
Leo	7013fb6a41	doc: maintainer	2023-05-31 20:46:10 +08:00
tsosunchia	0513ab2a1b	更新README	2023-05-31 03:19:23 +08:00
tsosunchia	11489d7027	Merge remote-tracking branch 'origin/main' # Conflicts: # README.md	2023-05-31 03:12:11 +08:00
tsosunchia	97880049f7	更新README安装指引	2023-05-31 03:10:00 +08:00
tsosunchia	781c6ccaee	Merge pull request #124 from chenrui333/docs/add-homebrew-installation-note docs: update to use homebrew-core formula	2023-05-31 03:09:34 +08:00
Rui Chen	9e84a3da65	docs: update to use homebrew-core formula Signed-off-by: Rui Chen <rui@chenrui.dev>	2023-05-30 12:47:50 -04:00
tsosunchia	4e5cd2d053	fix bug:重构版本信息的位置解决包引用环路问题	2023-05-30 14:55:47 +08:00
tsosunchia	288aee254f	变更:获取GEOIP信息适用于timeout参数	2023-05-30 14:38:42 +08:00
tsosunchia	2d235baa53	变更:获取GEOIP信息适用于timeout参数	2023-05-30 14:37:51 +08:00
sjlleo	d23f90dd19	Merge pull request #123 from sjlleo/newargs 增加timeout和psize参数	2023-05-30 12:21:38 +08:00
tsosunchia	fdc6145087	添加一个psize参数	2023-05-30 03:37:00 +08:00
tsosunchia	1d6ce5de88	添加一个timeout参数	2023-05-30 02:24:43 +08:00
tsosunchia	86b817291d	Merge pull request #122 from sjlleo/resovle_v4_v6_only 增加指定解析IPv4/IPv6的功能	2023-05-29 21:58:28 +08:00
tsosunchia	b38fc18bb4	增加指定解析IPv4/IPv6的功能	2023-05-29 20:53:07 +08:00
tsosunchia	23d20de7c8	fix bug:fasttrace也进行nslookup	2023-05-29 19:51:16 +08:00
tsosunchia	bf4ec99323	fasttraceIP改为由dns获取	2023-05-29 18:34:15 +08:00
tsosunchia	4bfe85df1b	更改为仅在使用LEOMOEAPI时尝试获取tracemap	2023-05-28 16:26:22 +08:00
tsosunchia	e48b30c47a	增加json输出模式，修正使用ipinfo API查询的IP无ASN时的异常 PS: json输出模式主要目的是方便开发者调用NEXTTRACE	2023-05-28 13:58:27 +08:00
tsosunchia	f2fbce0358	增加不输出GEOIP信息的方法 PS: 为外部程序调用预留	2023-05-26 11:13:59 +08:00
tsosunchia	98bd95d046	update readme	2023-05-25 20:54:22 +08:00
tsosunchia	b622a40022	fix bug:raw和classic模式增加语言个性化输出注意：classic模式将会被废弃，请不要在此模式基础上开发	2023-05-25 20:40:12 +08:00
tsosunchia	6bc74e14cb	增加关于IP信息纠错的联系方式	2023-05-25 18:24:05 +08:00
tsosunchia	8233c7c303	更新新模式说明	2023-05-24 22:50:11 +08:00
tsosunchia	3084effd78	修改输出提示，显示为当前真实的maxhops设置之前无论maxhops设置为多少，都输出为 30 hops max	2023-05-24 16:34:30 +08:00
tsosunchia	ac1ee5e08c	增加tracemap的异常处理防止与tracemap连接出现问题时报错	2023-05-24 16:08:59 +08:00
tsosunchia	723f5c4c5e	raw模式使用新参数--raw classic模式参数保持v1.1.3版本的设置	2023-05-23 22:22:14 +08:00
Leo	308ae73728	chore: add latency	2023-05-23 21:41:16 +08:00