add mpls func

.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
 

.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？

.github/dependabot.yml

@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+ - package-ecosystem: "gomod"
+ directory: "/" # Location of package manifests
+ schedule:
+ interval: "weekly"
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "weekly"

.github/workflows/build.yml

@@ -1,38 +1,151 @@
+name: Build & Release
+
 on:
+ workflow_dispatch:
  push:
+ branches:
+ - main
+ tags:
+ - "v*"
+ paths:
+ - "**/*.go"
+ - "go.mod"
+ - "go.sum"
+ - ".github/workflows/*.yml"
  pull_request:
-
-name: Test & Build Release
+ types: [opened, synchronize, reopened]
+ paths:
+ - "**/*.go"
+ - "go.mod"
+ - "go.sum"
+ - ".github/workflows/*.yml"
 jobs:
- Test:
+ build:
  runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ # Include amd64 on all platforms.
+ goos: [windows, freebsd, openbsd, linux, dragonfly, darwin]
+ goarch: [amd64, 386]
+ exclude:
+ # Exclude i386 on darwin and dragonfly.
+ - goarch: 386
+ goos: dragonfly
+ - goarch: 386
+ goos: darwin
+ include:
+ # BEIGIN MacOS ARM64
+ - goos: darwin
+ goarch: arm64
+ # END macOS ARM64
+ # BEGIN Linux ARM 5 6 7
+ - goos: linux
+ goarch: arm
+ goarm: 7
+ - goos: linux
+ goarch: arm
+ goarm: 6
+ - goos: linux
+ goarch: arm
+ goarm: 5
+ # END Linux ARM 5 6 7
+ # BEGIN Android ARM 8
+ - goos: android
+ goarch: arm64
+ # END Android ARM 8
+ # Windows ARM
+ - goos: windows
+ goarch: arm64
+ - goos: windows
+ goarch: arm
+ goarm: 7
+ # BEGIN Other architectures
+ # BEGIN riscv64 & ARM64
+ - goos: linux
+ goarch: arm64
+ - goos: linux
+ goarch: riscv64
+ # END riscv64 & ARM64
+ # BEGIN MIPS
+ - goos: linux
+ goarch: mips64
+ - goos: linux
+ goarch: mips64le
+ - goos: linux
+ goarch: mipsle
+ - goos: linux
+ goarch: mips
+ # END MIPS
+ # BEGIN PPC
+ - goos: linux
+ goarch: ppc64
+ - goos: linux
+ goarch: ppc64le
+ # END PPC
+ # BEGIN FreeBSD ARM
+ - goos: freebsd
+ goarch: arm64
+ - goos: freebsd
+ goarch: arm
+ goarm: 7
+ # END FreeBSD ARM
+ # BEGIN S390X
+ - goos: linux
+ goarch: s390x
+ # END S390X
+ # END Other architectures
+ # BEGIN OPENBSD ARM
+ - goos: openbsd
+ goarch: arm64
+ - goos: openbsd
+ goarch: arm
+ goarm: 7
+ env:
+ GOOS: ${{ matrix.goos }}
+ GOARCH: ${{ matrix.goarch }}
+ GOARM: ${{ matrix.goarm }}
+ CGO_ENABLED: 0
  steps:
- - uses: actions/checkout@v3
-
- - uses: actions/setup-go@v2
+ - name: Checkout codebase
+ uses: actions/checkout@v4
+ - name: Show workflow information
+ run: |
+ if [ ! -z $GOARM ]; then
+ export GOARM=v$GOARM
+ fi
+ export _NAME="nexttrace_${GOOS}_${GOARCH}${GOARM}"
+ if [ "$GOOS" == "windows" ]; then
+ export _NAME="$_NAME.exe"
+ fi
+ echo "GOOS: $GOOS, GOARCH: $GOARCH, GOARM: $GOARM, 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
+ echo "COMMIT_SHA1=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+ - name: Set up Go
+ uses: actions/setup-go@v4
  with:
- go-version: "1.18"
-
- - name: Test
- run: sudo go test -v -coverprofile='coverage.out' -covermode=count ./...
-
- Build:
- needs: test
- if: startsWith(github.ref, 'refs/tags/v')
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v3
-
- - uses: actions/setup-go@v2
+ 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/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
  with:
- go-version: "1.18"
-
- - run: bash .cross_compile.sh
-
+ name: ${{ env.ASSET_NAME }}
+ path: |
+ dist/${{ env.ASSET_NAME }}
  - name: Release
+ if: startsWith(github.ref, 'refs/tags/v')
  uses: softprops/action-gh-release@v1
  with: # 将下述可执行文件 release 上去
- draft: false # Release草稿
+ draft: true # Release草稿
  files: |
  dist/*
  env:
@@ -42,6 +155,7 @@ jobs:
  needs: build
  # The type of runner that the job will run on
  runs-on: ubuntu-latest
+ if: startsWith(github.ref, 'refs/tags/v')
 
  # Steps represent a sequence of tasks that will be executed as part of the job
  steps:

.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/sjlleo/homebrew-nexttrace.git
+ git clone https://github.com/xgadget-lab/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/sjlleo/homebrew-nexttrace.git
+ git remote set-url origin https://${{ secrets.gt_token }}@github.com/xgadget-lab/homebrew-nexttrace.git
  git push
  # env:
  # SSH_AUTH_SOCK: /tmp/ssh_agent.sock

.github/workflows/test.yml

@@ -0,0 +1,43 @@
+name: Test
+
+on:
+ push:
+ branches:
+ - main
+ paths:
+ - "**/*.go"
+ - "go.mod"
+ - "go.sum"
+ - ".github/workflows/*.yml"
+ pull_request:
+ types: [opened, synchronize, reopened]
+ paths:
+ - "**/*.go"
+ - "go.mod"
+ - "go.sum"
+ - ".github/workflows/*.yml"
+ workflow_dispatch:
+
+jobs:
+ test:
+ permissions:
+ contents: read
+ runs-on: ${{ matrix.os }}
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [windows-latest, ubuntu-latest, macos-latest]
+ steps:
+ - name: Set up Go
+ uses: actions/setup-go@v4
+ with:
+ go-version: '1.21'
+ check-latest: true
+ - name: Checkout codebase
+ 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 ./...

README.md

@@ -151,6 +151,10 @@ 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).
@@ -271,7 +275,7 @@ NextTrace `LeoMoeAPI` now utilizes the Proof of Work (POW) mechanism to prevent
 - [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/xgadget-lab/nexttrace/blob/main/ipgeo/)
+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
 
@@ -341,6 +345,7 @@ Arguments:
  -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

README_zh_CN.md

@@ -60,6 +60,10 @@ Document Language: [English](README.md) | 简体中文
 
 关于 **V1增强版本** 请转至 [nxtrace/Ntrace-V1](https://github.com/nxtrace/Ntrace-V1)。
 
+## How To Use
+
+Document Language: [English](README.md) | 简体中文
+
 ### 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)，在了解您自己的对数据精准度需求以后再进行抉择。
@@ -162,6 +166,10 @@ 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) 查看
@@ -339,6 +347,7 @@ Arguments:
  -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