update readme

improve: rootless trace on macOS

.github/ISSUE_TEMPLATE/bug_report.md

@@ -38,3 +38,7 @@ copyright: [v2fly](https://github.com/v2fly)
 
 
 ## 请附上出错时软件输出的错误信息
+
+## 是否查询过本仓库wiki有没有类似错误
+
+<!-- wiki: https://github.com/sjlleo/nexttrace/wiki -->

README.md

@@ -4,31 +4,125 @@
 
 </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>
+
+<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>
+
+## 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://github.com/nxtrace/Ntrace-core/assets/59512455/19b659f4-31f5-4816-9821-bf2a73c60336" 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.
+
+## Announcement
+
+LeoMoeAPI v1 will end service support on September 1, 2024. Versions **v1.1.7** and below that rely on its service will become unusable. Please download from the [Ntrace-V1 repository](https://github.com/nxtrace/Ntrace-V1/releases) NextTrace.
+
+Because NextTrace V1 and V2 are branches with differing development philosophies, each is currently managed by an internal Owner focusing on different aspects. These branches cater to developers with varying needs. Now, the [V1](https://github.com/nxtrace/Ntrace-V1/) and [V2](https://github.com/sjlleo/MoeTrace) branch has established its own separate repository. For a considerably long period in the future, we plan to maintain the development and upkeep of both branches simultaneously.
 
 ## How To Use
 
 Document Language: English | [简体中文](README_zh_CN.md)
 
-### Automated Installation
+Currently, **V2 version** is a completely redesigned project and is recruiting beta testers for this revamped version. If you are interested, please check out [sjlleo/MoeTrace](https://github.com/sjlleo/MoeTrace).
 
-```bash
-# Linux one-click install script
-bash <(curl -Ls https://raw.githubusercontent.com/sjlleo/nexttrace/main/nt_install.sh)
+For the **enhanced version of V1**, please visit [nxtrace/Ntrace-V1](https://github.com/nxtrace/Ntrace-V1).
+### 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
+        * Build from source
 
-Windows users please go to [Release Page](https://github.com/sjlleo/nexttrace/releases/latest) directly and download exe file.
+             ```shell
+             yay -S nexttrace
+             ```
+        * Directly download bin package (only supports amd64)
+
+             ```shell
+             yay -S nexttrace-bin
+             ```
+        * The two types of AUR builds are maintained by huyz and ouuan, respectively
+    * Linuxbrew's installation command
+
+        Same as the macOS Homebrew's installation method (homebrew-core version only supports amd64)
+
+* 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 xgadget-lab/nexttrace && brew install xgadget-lab/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
 
@@ -40,9 +134,17 @@ 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
+nexttrace --ipv4 g.co
+nexttrace --ipv6 g.co
+
 # IPv6 ICMP Trace
 nexttrace 2606:4700:4700::1111
 
@@ -108,6 +210,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』」
@@ -120,15 +225,25 @@ nexttrace --no-rdns www.bbix.net
 nexttrace --route-path www.time.com.my
 ```
 
-`NextTrace` supports users to select their own IP API (currently supports: `LeoMoeAPI`, `IP.SB`, `IPInfo`, `IPInsight`, `IPAPI.com`)
+`NextTrace` supports users to select their own IP API (currently supports: `LeoMoeAPI`, `IP.SB`, `IPInfo`, `IPInsight`, `IPAPI.com`, `Ip2region`, `IPInfoLocal`, `CHUNZHEN`)
 
 ```bash
-# You can specify the IP database by yourself [IP.SB here], if not specified, LeoMoeAPI will be used
-nexttrace --data-provider IP.SB
-## Note that the ipinfo API needs users to purchase services from ipinfo. If necessary, you can clone this project, add the token provided by ipinfo and compile it yourself
+# You can specify the IP database by yourself [IP-API.com here], if not specified, LeoMoeAPI will be used
+nexttrace --data-provider ip-api.com
+## Note There are frequency limits for free queries of the ipinfo and IPInsight APIs. You can purchase services from these providers to remove the limits
+##      If necessary, you can clone this project, add the token provided by ipinfo or IPInsight and compile it yourself
+## Note For the offline database IPInfoLocal, please download it manually and rename it to ipinfoLocal.mmdb. (You can download it from here: https://ipinfo.io/signup?ref=free-database-downloads)
+##      For the offline database Ip2region, you can download it manually and rename it to ip2region.db, or let NextTrace download it automatically
 ## Fill the token to: ipgeo/tokens.go
 ## Please be aware: Due to the serious abuse of IP.SB, you will often be not able to query IP data from this source
-## IPAPI.com has a stricter restiction on API calls, if you can't query IP data from this source, please try again in a few minutes.
+## IP-API.com has a stricter restiction on API calls, if you can't query IP data from this source, please try again in a few minutes
+
+# The Pure-FTPd IP database defaults to using http://127.0.0.1:2060 as the query interface. To customize it, please use environment variables
+export NEXTTRACE_CHUNZHENURL=http://127.0.0.1:2060
+## You can use https://github.com/freshcn/qqwry to build your own Pure-FTPd IP database service
+
+# You can also specify the default IP database by setting an environment variable
+export NEXTTRACE_DATAPROVIDER=ipinfo
 ```
 
 `NextTrace` supports mixed parameters and shortened parameters
@@ -151,27 +266,36 @@ NextTrace BackEnd is now open-source.
 
 https://github.com/sjlleo/nexttrace-backend
 
+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/xgadget-lab/nexttrace/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
-                 (IP.SB|IPInfo|IPInsight|IPAPI.com)] [-n|--no-rdns]
-                 [-a|--always-rdns] [-P|--route-path] [-r|--report]
-                 [-o|--output] [-t|--table] [-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>] [-g|--language (en|cn)] [IP Address
-                 or Domain]
-
-                 An open source visual route tracking CLI tool
+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] [--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>] [--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
@@ -192,9 +316,13 @@ Arguments:
                                      18
   -m  --max-hops                     Set the max number of hops (max TTL to be
                                      reached). Default: 30
-  -d  --data-provider                Choose IP Geograph Data Provider
-                                     [LeoMoeAPI,IP.SB, IPInfo, IPInsight,
-                                     IPAPI.com]. Default: LeoMoeAPI
+  -d  --data-provider                Choose IP Geograph Data Provider [IP.SB,
+                                     IPInfo, IPInsight, IP-API.com, Ip2region,
+                                     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
@@ -202,26 +330,38 @@ Arguments:
   -P  --route-path                   Print traceroute hop path by ASN and
                                      location
   -r  --report                       output using report mode
+      --dn42                         DN42 Mode
   -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 Function
+  -M  --map                          Disable Print Trace Map
   -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
+  -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
 ```
@@ -232,13 +372,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
 
@@ -248,7 +394,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.
 
@@ -265,7 +411,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)
 
@@ -275,12 +423,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/sjlleo/nexttrace/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)

README_zh_CN.md

@@ -12,41 +12,128 @@
 <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>
 
+## 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://github.com/nxtrace/Ntrace-core/assets/59512455/19b659f4-31f5-4816-9821-bf2a73c60336" width="170.7" height="62.9">
+    </a>
+</div>
+
+
+
+我们非常感谢 [DMIT](https://dmit.io) 和 [Misaka](https://misaka.io) 和 [Skywolf](https://skywolf.cloud) 提供了支持本项目所需的网络基础设施。
+
+## Announcement
+
+LeoMoeAPI v1 将于2024 年 9 月 1 日结束服务支持，届时依赖其提供服务的 **v1.1.7** 以下的版本将无法使用。请至 [Ntrace-V1 仓库下载](https://github.com/nxtrace/Ntrace-V1/releases) NextTrace。
+
+由于 NextTrace V1 与 V2 分支是两个开发方向理念不完全相同的分支，目前由内部分别有一名 Owner 负责，各有其侧重点，面向不同需求的开发者，现 [V1](https://github.com/nxtrace/Ntrace-V1/) 和 [V2](https://github.com/sjlleo/MoeTrace) 分支分别已建立独立仓库，在未来相当长的一段时间里，我们会同时维护两个分支的开发与维护。
 
 ## How To Use
 
+Document Language: [English](README.md) | 简体中文
+
+目前 **V2版本** 为全新的重构项目，其正在招募内测该重构版本的用户，若有意请查看 [sjlleo/MoeTrace](https://github.com/sjlleo/MoeTrace)。
+
+关于 **V1增强版本** 请转至 [nxtrace/Ntrace-V1](https://github.com/nxtrace/Ntrace-V1)。
+
 ### 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 的Telegram频道](https://t.me/nexttrace)由项目成员负责，会传递一部分通知，也会发布一些成员自己分享的小工具。项目成员的意见可作为未来项目发展的可能方向，随着开发进度变化可能会有所改动，不代表未来一定会实装，正式定稿公告会发布于 Issue 中。
+
 ### Automated Install
 
-```bash
-# Linux 一键安装脚本
-bash <(curl -Ls https://raw.githubusercontent.com/sjlleo/nexttrace/main/nt_install.sh)
+* Linux 
+  * 一键安装脚本
 
-# GHPROXY 镜像（国内使用）
-bash <(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 安装命令
+     * 由源码构建
 
-# macOS brew 安装命令
-brew tap xgadget-lab/nexttrace && brew install nexttrace
-```
+          ```shell
+          yay -S nexttrace
+          ```
+     * 直接下载bin包(仅支持amd64)
 
-Windows 用户请直接前往 [Release](https://github.com/sjlleo/nexttrace/releases/latest) 下载编译后的二进制 exe 文件。
+          ```shell
+          yay -S nexttrace-bin`
+          ```
+     * AUR 的2种构建分别由 huyz 和 ouuan 维护
+  * Linuxbrew 安装命令
+
+     同macOS Homebrew安装方法(homebrew-core版仅支持amd64)
+     
+* macOS
+  * macOS Homebrew 安装命令
+     * homebrew-core版
+
+          ```shell
+          brew install nexttrace
+          ```
+     * 本仓库ACTIONS自动构建版(更新更快)
+
+          ```shell
+          brew tap xgadget-lab/nexttrace && brew install xgadget-lab/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
 
@@ -61,6 +148,14 @@ 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解析
+nexttrace --ipv4 g.co
+nexttrace --ipv6 g.co
+
 # IPv6 ICMP Trace
 nexttrace 2606:4700:4700::1111
 
@@ -129,6 +224,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』」
@@ -141,45 +239,61 @@ nexttrace --no-rdns www.bbix.net
 nexttrace --route-path www.time.com.my
 ```
 
-`NextTrace`支持用户自主选择 IP 数据库（目前支持：`LeoMoeAPI`, `IP.SB`, `IPInfo`, `IPInsight`, `IPAPI.com`）
+`NextTrace`支持用户自主选择 IP 数据库（目前支持：`LeoMoeAPI`, `IP.SB`, `IPInfo`, `IPInsight`, `IPAPI.com`, `Ip2region`, `IPInfoLocal`, `CHUNZHEN`)
 
 ```bash
-# 可以自行指定IP数据库[此处为IP.SB]，不指定则默认为LeoMoeAPI
-nexttrace --data-provider IP.SB
-## 特别的：其中 ipinfo API 需要从 ipinfo 自行购买服务，如有需要可以 clone 本项目添加其提供的 token 自行编译
+# 可以自行指定IP数据库[此处为IP-API.com]，不指定则默认为LeoMoeAPI
+nexttrace --data-provider ip-api.com
+## 特别的: 其中 ipinfo 和 IPInsight API 对于免费版查询有频率限制，可从这些服务商自行购买服务以解除限制，如有需要可以 clone 本项目添加其提供的 token 自行编译
 ##        TOKEN填写路径：ipgeo/tokens.go
-
+## 特别的: 对于离线库 IPInfoLocal，请自行下载并命名为 ipinfoLocal.mmdb (可以从这里下载：https://ipinfo.io/signup?ref=free-database-downloads)
+##        对于离线库 Ip2region 可NextTrace自动下载，也可自行下载并命名为 ip2region.db
 ## 另外：由于IP.SB被滥用比较严重，会经常出现无法查询的问题，请知悉。
-##      IPAPI.com限制调用较为严格，如有查询不到的情况，请几分钟后再试。
+##      IP-API.com限制调用较为严格，如有查询不到的情况，请几分钟后再试。
+
+# 纯真IP数据库默认使用 http://127.0.0.1:2060 作为查询接口，如需自定义请使用环境变量
+export NEXTTRACE_CHUNZHENURL=http://127.0.0.1:2060
+## 可使用 https://github.com/freshcn/qqwry 自行搭建纯真IP数据库服务
+
+# 也可以通过设置环境变量来指定默认IP数据库
+export NEXTTRACE_DATAPROVIDER=ipinfo
 ```
 
 `NextTrace`支持使用混合参数和简略参数
 
 ```bash
 Example:
-nexttrace --data-provider IPAPI.com --max-hops 20 --tcp --port 443 --queries 5 --no-rdns 1.1.1.1
+nexttrace --data-provider ip-api.com --max-hops 20 --tcp --port 443 --queries 5 --no-rdns 1.1.1.1
 nexttrace -tcp --queries 2 --parallel-requests 1 --table --route-path 2001:4860:4860::8888
 
 Equivalent to:
-nexttrace -d IPAPI.com -m 20 -T -p 443 -q 5 -n 1.1.1.1
+nexttrace -d ip-api.com -m 20 -T -p 443 -q 5 -n 1.1.1.1
 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
-                 (IP.SB|IPInfo|IPInsight|IPAPI.com)] [-n|--no-rdns]
-                 [-r|--route-path] [-o|--output] [-t|--table] [-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>]
-                 [IP Address or Domain name]
+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] [--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>] [--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
@@ -200,33 +314,52 @@ Arguments:
                                      18
   -m  --max-hops                     Set the max number of hops (max TTL to be
                                      reached). Default: 30
-  -d  --data-provider                Choose IP Geograph Data Provider
-                                     [LeoMoeAPI,IP.SB, IPInfo, IPInsight,
-                                     IPAPI.com]. Default: LeoMoeAPI
-  -n  --no-rdns                       Do not resolve IP addresses to their
+  -d  --data-provider                Choose IP Geograph Data Provider [IP.SB,
+                                     IPInfo, IPInsight, IP-API.com, Ip2region,
+                                     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
-  -r  --route-path                   Print traceroute hop path by ASN and
+  -a  --always-rdns                  Always resolve IP addresses to their
+                                     domain names
+  -P  --route-path                   Print traceroute hop path by ASN and
                                      location
+  -r  --report                       output using report mode
+      --dn42                         DN42 Mode
   -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 Function
+  -M  --map                          Disable Print Trace Map
   -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: 0
-  -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
+  -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
 ```
@@ -247,13 +380,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)
 
@@ -269,10 +427,21 @@ 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/sjlleo/nexttrace/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 完成后续的二开和维护工作。
+
+LeoMoeAPI 是 [Leo](https://github.com/sjlleo) 的作品，归属于 Leo Network，由 [Leo](https://github.com/sjlleo) 完成整套后端 API 编写，该接口未经允许不可用于任何第三方用途。
+
 LeoMoeAPI 早期数据主要来自 IPInsight、IPInfo，随着项目发展，越来越多的志愿者参与进了这个项目。目前 LeoMoeAPI 有近一半的数据是社区提供的，而另外一半主要来自于包含 IPInfo、IPData、BigDataCloud、IPGeoLocation 在内的多个第三方数据。
 
 LeoMoeAPI 的骨干网数据有近 70% 是社区自发反馈又或者是项目组成员校准的，这给本项目的路由跟踪基础功能带来了一定的保证，但是全球骨干网的体量庞大，我们并无能力如 IPIP 等商业公司拥有海量监测节点，这使得 LeoMoeAPI 的数据精准度无法和形如 BestTrace（IPIP）相提并论。

cmd/cmd.go

@@ -1,279 +0,0 @@
-package cmd
-
-import (
-	"encoding/json"
-	"fmt"
-	"log"
-	"net"
-	"os"
-	"os/signal"
-	"runtime"
-	"strings"
-	"time"
-
-	"github.com/akamensky/argparse"
-	"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
-	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"})
-	port := parser.Int("p", "port", &argparse.Options{Help: "Set the destination port to use. It is either initial udp port value for \"default\"" +
-		"method (incremented by each probe, default is 33434), or initial seq for \"icmp\" (incremented as well, default from 1), or some constant" +
-		"destination port for other methods (with default of 80 for \"tcp\", 53 for \"udp\", etc.)"})
-	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{"IP.SB", "IPInfo", "IPInsight", "IPAPI.com"}, &argparse.Options{Default: "LeoMoeAPI",
-		Help: "Choose IP Geograph Data Provider [LeoMoeAPI,IP.SB, IPInfo, IPInsight, IPAPI.com]"})
-	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"})
-	report := parser.Flag("r", "report", &argparse.Options{Help: "output using report mode"})
-	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: "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"})
-	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"})
-	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"})
-	str := parser.StringPositional(&argparse.Options{Help: "IP Address or domain name"})
-	dot := parser.Selector("", "dot-server", []string{"dnssb", "aliyun", "dnspod", "google", "cloudflare"}, &argparse.Options{Default: "dnssb",
-		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]"})
-
-	err := parser.Parse(os.Args)
-	if err != nil {
-		// In case of error print error and print usage
-		// This can also be done by passing -h or --help flags
-		fmt.Print(parser.Usage(err))
-		return
-	}
-	printer.Version()
-	if *ver {
-		printer.CopyRight()
-		os.Exit(0)
-	}
-
-	domain := *str
-
-	if *port == 0 {
-		*port = 80
-	}
-
-	if *fast_trace {
-		fastTrace.FastTest(*tcp, *output)
-		if *output {
-			fmt.Println("您的追踪日志已经存放在 /tmp/trace.log 中")
-		}
-
-		os.Exit(0)
-	}
-
-	if domain == "" {
-		fmt.Print(parser.Usage(err))
-		return
-	}
-
-	if strings.Contains(domain, "/") {
-		domain = strings.Split(domain, "/")[2]
-	}
-
-	if strings.Contains(domain, "]") {
-		domain = strings.Split(strings.Split(domain, "]")[0], "[")[1]
-	} else if strings.Contains(domain, ":") {
-		if strings.Count(domain, ":") == 1 {
-			domain = strings.Split(domain, ":")[0]
-		}
-	}
-
-	capabilities_check()
-	// return
-
-	var ip net.IP
-
-	if runtime.GOOS == "windows" && (*tcp || *udp) {
-		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
-	}
-
-	if strings.ToUpper(*dataOrigin) == "LEOMOEAPI" {
-		w := wshandle.New()
-		w.Interrupt = make(chan os.Signal, 1)
-		signal.Notify(w.Interrupt, os.Interrupt)
-		defer func() {
-			w.Conn.Close()
-		}()
-	}
-
-	printer.PrintTraceRouteNav(ip, domain, *dataOrigin)
-
-	var m trace.Method = ""
-
-	switch {
-	case *tcp:
-		m = trace.TCPTrace
-	case *udp:
-		m = trace.UDPTrace
-	default:
-		m = trace.ICMPTrace
-	}
-
-	if !*tcp && *port == 80 {
-		*port = 53
-	}
-
-	var conf = trace.Config{
-		DN42:             *dn42,
-		SrcAddr:          *src_addr,
-		BeginHop:         *beginHop,
-		DestIP:           ip,
-		DestPort:         *port,
-		MaxHops:          *maxHops,
-		PacketInterval:   *packet_interval,
-		TTLInterval:      *ttl_interval,
-		NumMeasurements:  *numMeasurements,
-		ParallelRequests: *parallelRequests,
-		Lang:             *lang,
-		RDns:             !*noRdns,
-		AlwaysWaitRDNS:   *alwaysRdns,
-		IPGeoSource:      ipgeo.GetSource(*dataOrigin),
-		Timeout:          1 * time.Second,
-	}
-
-	if !*tablePrint {
-		if *classicPrint {
-			conf.RealtimePrinter = printer.ClassicPrinter
-		} else {
-			if *output {
-				conf.RealtimePrinter = tracelog.RealtimePrinter
-			} else if *router {
-				conf.RealtimePrinter = printer.RealtimePrinterWithRouter
-				fmt.Println("路由表数据源由 BGP.Tools 提供，在此特表感谢")
-			} else {
-				conf.RealtimePrinter = printer.RealtimePrinter
-			}
-		}
-	} else {
-		if !*report {
-			conf.AsyncPrinter = printer.TracerouteTablePrinter
-		}
-	}
-
-	res, err := trace.Traceroute(m, conf)
-
-	if err != nil {
-		log.Fatalln(err)
-	}
-
-	if *tablePrint {
-		printer.TracerouteTablePrinter(res)
-	}
-
-	if *routePath {
-		r := reporter.New(res, ip.String())
-		r.Print()
-	}
-
-	if !*maptrace {
-		r, _ := json.Marshal(res)
-		tracemap.GetMapUrl(string(r))
-	}
-}
-
-func capabilities_check() {
-
-	// Windows 判断放在前面，防止遇到一些奇奇怪怪的问题
-	if runtime.GOOS == "windows" {
-		// Running on Windows, skip checking capabilities
-		return
-	}
-
-	uid := os.Getuid()
-	if uid == 0 {
-		// Running as root, skip checking capabilities
-		return
-	}
-
-	/***
-	* 检查当前进程是否有两个关键的权限
-	==== 看不到我 ====
-	* 没办法啦
-	* 自己之前承诺的坑补全篇
-	* 被迫填坑系列 qwq
-	==== 看不到我 ====
-	***/
-
-	// NewPid 已经被废弃了，这里改用 NewPid2 方法
-	caps, err := capability.NewPid2(0)
-	if err != nil {
-		// 判断是否为macOS
-		if runtime.GOOS == "darwin" {
-			// macOS下报错有问题
-		} else {
-			fmt.Println(err)
-		}
-		return
-	}
-
-	// load 获取全部的 caps 信息
-	err = caps.Load()
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	// 判断一下权限有木有
-	if caps.Get(capability.EFFECTIVE, capability.CAP_NET_RAW) && caps.Get(capability.EFFECTIVE, capability.CAP_NET_ADMIN) {
-		// 有权限啦
-		return
-	} else {
-		// 没权限啦
-		fmt.Println("您正在以普通用户权限运行 NextTrace，但 NextTrace 未被赋予监听网络套接字的ICMP消息包、修改IP头信息（TTL）等路由跟踪所需的权限")
-		fmt.Println("请使用管理员用户执行 `sudo setcap cap_net_raw,cap_net_admin+eip ${your_nexttrace_path}/nexttrace` 命令，赋予相关权限后再运行~")
-		fmt.Println("什么？为什么 ping 普通用户执行不要 root 权限？因为这些工具在管理员安装时就已经被赋予了一些必要的权限，具体请使用 `getcap /usr/bin/ping` 查看")
-	}
-}

cmd/cmd_test.go

@@ -1,7 +0,0 @@
-package cmd
-
-import "testing"
-
-func TestCMD(t *testing.T) {
-	Excute()
-}

cmd/root.go

@@ -0,0 +1,45 @@
+package cmd
+
+import (
+	"log"
+
+	"github.com/sjlleo/nexttrace-core/core"
+	"github.com/sjlleo/nexttrace-core/plgn"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+)
+
+var rootCmd = &cobra.Command{Use: "NextTrace"}
+
+var cmdPrint = &cobra.Command{
+	Use:   "trace",
+	Short: "Traceroute",
+	Run: func(cmd *cobra.Command, args []string) {
+		debugLevel := viper.GetInt("debug-level")
+		enabledPlugins := viper.GetString("plugins")
+
+		plgn.RegisterPlugin("debug", plgn.NewDebugPlugin)
+		plugins := plgn.CreatePlugins(enabledPlugins, debugLevel)
+		core.Traceroute(plugins)
+	},
+}
+
+// Execute parse subcommand and run
+func Execute() {
+	if err := rootCmd.Execute(); err != nil {
+		log.Fatal(err.Error())
+	}
+}
+
+func init() {
+	rootCmd.AddCommand(cmdPrint)
+	rootCmd.PersistentFlags().Int("debug-level", 1, "Set debug level (1=info, 2=warn, 3=err)")
+	rootCmd.PersistentFlags().String("plugins", "default", "Comma-separated list of enabled plugins")
+
+	viper.SetDefault("debug-level", 1)
+	viper.SetDefault("plugins", "default")
+
+	viper.BindPFlag("debug-level", rootCmd.PersistentFlags().Lookup("debug-level"))
+	viper.BindPFlag("plugins", rootCmd.PersistentFlags().Lookup("plugins"))
+
+}

config/viper.go

@@ -1,34 +0,0 @@
-package config
-
-import (
-	"fmt"
-
-	"github.com/spf13/viper"
-)
-
-func InitConfig() {
-
-	// 配置文件名， 不加扩展
-	viper.SetConfigName("nt_config") // name of config file (without extension)
-	// 设置文件的扩展名
-	viper.SetConfigType("yaml") // REQUIRED if the config file does not have the extension in the name
-	// 查找配置文件所在路径
-	viper.AddConfigPath("/etc/bin/nexttrace/")
-	viper.AddConfigPath("/usr/local/bin/nexttrace/")
-	// 在当前路径进行查找
-	viper.AddConfigPath(".")
-	// viper.AddConfigPath("./config/")
-
-	// 配置默认值
-	viper.SetDefault("ptrPath", "./ptr.csv")
-	viper.SetDefault("geoFeedPath", "./geofeed.csv")
-
-	// 开始查找并读取配置文件
-	err := viper.ReadInConfig() // Find and read the config file
-	if err != nil {             // Handle errors reading the config file
-		fmt.Println("未能找到配置文件，我们将在您的运行目录为您创建 nt_config.yaml 默认配置")
-		viper.SafeWriteConfigAs("./nt_config.yaml")
-	}
-
-	viper.ReadInConfig()
-}

core/icmp_ipv4.go

@@ -1,4 +1,4 @@
-package trace
+package core
 
 import (
 	"encoding/binary"
@@ -11,6 +11,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/sjlleo/nexttrace-core/core/internal"
 	"golang.org/x/net/context"
 	"golang.org/x/net/icmp"
 	"golang.org/x/net/ipv4"
@@ -26,33 +27,21 @@ type ICMPTracer struct {
 	icmpListen            net.PacketConn
 	final                 int
 	finalLock             sync.Mutex
+	foundIPs              map[string]bool
 }
 
-func (t *ICMPTracer) PrintFunc() {
-	defer t.wg.Done()
-	var ttl = t.Config.BeginHop - 1
-	for {
-		if t.AsyncPrinter != nil {
-			t.AsyncPrinter(&t.res)
-		}
-		if len(t.res.Hops)-1 > ttl {
-			if len(t.res.Hops[ttl]) == t.NumMeasurements {
-				if t.RealtimePrinter != nil {
-					t.RealtimePrinter(&t.res, ttl)
-				}
-				ttl++
+func (t *ICMPTracer) GetConfig() *Config {
+	return &t.Config
+}
 
-				if ttl == t.final-1 || ttl >= t.MaxHops-1 {
-					return
-				}
-			}
-		}
-		<-time.After(200 * time.Millisecond)
-	}
+func (t *ICMPTracer) SetConfig(c Config) {
+	t.Config = c
 }
 
 func (t *ICMPTracer) Execute() (*Result, error) {
+
 	t.inflightRequestRWLock.Lock()
+	t.foundIPs = make(map[string]bool)
 	t.inflightRequest = make(map[int]chan Hop)
 	t.inflightRequestRWLock.Unlock()
 
@@ -62,7 +51,7 @@ func (t *ICMPTracer) Execute() (*Result, error) {
 
 	var err error
 
-	t.icmpListen, err = net.ListenPacket("ip4:1", t.SrcAddr)
+	t.icmpListen, err = internal.ListenICMP("ip4:1", t.SrcAddr)
 	if err != nil {
 		return &t.res, err
 	}
@@ -74,9 +63,10 @@ func (t *ICMPTracer) Execute() (*Result, error) {
 	t.final = -1
 
 	go t.listenICMP()
-	t.wg.Add(1)
-	go t.PrintFunc()
 	for ttl := t.BeginHop; ttl <= t.MaxHops; ttl++ {
+		for _, plugin := range t.Plugins {
+			plugin.OnTTLChange(ttl)
+		}
 		t.inflightRequestRWLock.Lock()
 		t.inflightRequest[ttl] = make(chan Hop, t.NumMeasurements)
 		t.inflightRequestRWLock.Unlock()
@@ -86,30 +76,23 @@ func (t *ICMPTracer) 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))
+			<-time.After(t.Config.PacketInterval)
 		}
-		<-time.After(time.Millisecond * time.Duration(t.Config.TTLInterval))
+		<-time.After(t.Config.TTLInterval)
 	}
 
 	t.wg.Wait()
 	t.res.reduce(t.final)
 	if t.final != -1 {
-		if t.RealtimePrinter != nil {
-			t.RealtimePrinter(&t.res, t.final-1)
-		}
 	} else {
 		for i := 0; i < t.NumMeasurements; i++ {
 			t.res.add(Hop{
-				Success: false,
 				Address: nil,
 				TTL:     30,
 				RTT:     0,
 				Error:   ErrHopLimitTimeout,
 			})
 		}
-		if t.RealtimePrinter != nil {
-			t.RealtimePrinter(&t.res, t.MaxHops-1)
-		}
 	}
 	return &t.res, nil
 }
@@ -175,7 +158,6 @@ func (t *ICMPTracer) handleICMPMessage(msg ReceivedMessage, icmpType int8, data
 	defer t.inflightRequestRWLock.RUnlock()
 	if _, ok := t.inflightRequest[ttl]; ok {
 		t.inflightRequest[ttl] <- Hop{
-			Success: true,
 			Address: msg.Peer,
 		}
 	}
@@ -222,17 +204,11 @@ func reverseID(id string) (int64, int64, error) {
 	}
 
 	if parity%2 == 1 {
-		if id[len(id)-1] == '0' {
-			// fmt.Println("Parity check passed.")
-		} else {
-			// fmt.Println("Parity check failed.")
+		if id[len(id)-1] != '0' {
 			return 0, 0, errors.New("err")
 		}
 	} else {
-		if id[len(id)-1] == '1' {
-			// fmt.Println("Parity check passed.")
-		} else {
-			// fmt.Println("Parity check failed.")
+		if id[len(id)-1] != '1' {
 			return 0, 0, errors.New("err")
 		}
 	}
@@ -277,6 +253,16 @@ func (t *ICMPTracer) send(ttl int) error {
 		return nil
 	case h := <-t.inflightRequest[ttl]:
 		rtt := time.Since(start)
+		ipStr := h.Address.String()
+		if !t.foundIPs[ipStr] {
+			t.inflightRequestRWLock.Lock()
+			t.foundIPs[ipStr] = true
+			t.inflightRequestRWLock.Unlock()
+			// Trigger 所有插件的 OnIPFound 方法
+			for _, plugin := range t.Plugins {
+				plugin.OnNewIPFound(h.Address)
+			}
+		}
 		if t.final != -1 && ttl > t.final {
 			return nil
 		}
@@ -298,8 +284,6 @@ func (t *ICMPTracer) send(ttl int) error {
 		h.TTL = ttl
 		h.RTT = rtt
 
-		h.fetchIPData(t.Config)
-
 		t.res.add(h)
 	case <-time.After(t.Timeout):
 		if t.final != -1 && ttl > t.final {
@@ -307,7 +291,6 @@ func (t *ICMPTracer) send(ttl int) error {
 		}
 
 		t.res.add(Hop{
-			Success: false,
 			Address: nil,
 			TTL:     ttl,
 			RTT:     0,
@@ -316,5 +299,8 @@ func (t *ICMPTracer) send(ttl int) error {
 
 	}
 
+	for _, plugin := range t.Plugins {
+		plugin.OnTTLCompleted(len(t.res.Hops), t.res.Hops[len(t.res.Hops)-1])
+	}
 	return nil
 }

core/icmp_ipv6.go

@@ -1,4 +1,4 @@
-package trace
+package core
 
 import (
 	"encoding/binary"
@@ -9,6 +9,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/sjlleo/nexttrace-core/core/internal"
 	"golang.org/x/net/context"
 	"golang.org/x/net/icmp"
 	"golang.org/x/net/ipv6"
@@ -25,31 +26,15 @@ type ICMPTracerv6 struct {
 	icmpListen            net.PacketConn
 	final                 int
 	finalLock             sync.Mutex
+	foundIPs              map[string]bool
 }
 
-func (t *ICMPTracerv6) PrintFunc() {
-	// defer t.wg.Done()
-	var ttl = t.Config.BeginHop - 1
-	for {
-		if t.AsyncPrinter != nil {
-			t.AsyncPrinter(&t.res)
-		}
+func (t *ICMPTracerv6) GetConfig() *Config {
+	return &t.Config
+}
 
-		// 接收的时候检查一下是不是 3 跳都齐了
-		if len(t.res.Hops)-1 > ttl {
-			if len(t.res.Hops[ttl]) == t.NumMeasurements {
-				if t.RealtimePrinter != nil {
-					t.RealtimePrinter(&t.res, ttl)
-				}
-				ttl++
-				if ttl == t.final {
-					return
-				}
-			}
-		}
-
-		<-time.After(200 * time.Millisecond)
-	}
+func (t *ICMPTracerv6) SetConfig(c Config) {
+	t.Config = c
 }
 
 func (t *ICMPTracerv6) Execute() (*Result, error) {
@@ -63,7 +48,7 @@ func (t *ICMPTracerv6) Execute() (*Result, error) {
 
 	var err error
 
-	t.icmpListen, err = net.ListenPacket("ip6:58", t.SrcAddr)
+	t.icmpListen, err = internal.ListenICMP("ip6:58", t.SrcAddr)
 	if err != nil {
 		return &t.res, err
 	}
@@ -76,9 +61,12 @@ func (t *ICMPTracerv6) Execute() (*Result, error) {
 	t.final = -1
 
 	go t.listenICMP()
-	go t.PrintFunc()
 	for ttl := t.BeginHop; ttl <= t.MaxHops; ttl++ {
+		for _, plugin := range t.Plugins {
+			plugin.OnTTLChange(ttl)
+		}
 		t.inflightRequestRWLock.Lock()
+		t.foundIPs = make(map[string]bool)
 		t.inflightRequest[ttl] = make(chan Hop, t.NumMeasurements)
 		t.inflightRequestRWLock.Unlock()
 		if t.final != -1 && ttl > t.final {
@@ -87,47 +75,23 @@ func (t *ICMPTracerv6) 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))
+			<-time.After(t.Config.PacketInterval)
 		}
-		<-time.After(time.Millisecond * time.Duration(t.Config.TTLInterval))
+		<-time.After(t.Config.TTLInterval)
 	}
-	// for ttl := t.BeginHop; ttl <= t.MaxHops; ttl++ {
-	// 	if t.final != -1 && ttl > t.final {
-	// 		break
-	// 	}
-	// 	for i := 0; i < t.NumMeasurements; i++ {
-	// 		t.wg.Add(1)
-	// 		go t.send(ttl)
-	// 	}
-	// 	// 一组TTL全部退出（收到应答或者超时终止）以后，再进行下一个TTL的包发送
-	// 	t.wg.Wait()
-	// 	if t.RealtimePrinter != nil {
-	// 		t.RealtimePrinter(&t.res, ttl-1)
-	// 	}
 
-	// 	if t.AsyncPrinter != nil {
-	// 		t.AsyncPrinter(&t.res)
-	// 	}
-	// }
 	t.wg.Wait()
 	t.res.reduce(t.final)
-	if t.final != -1 {
-		if t.RealtimePrinter != nil {
-			t.RealtimePrinter(&t.res, t.final-1)
-		}
-	} else {
+	if t.final == -1 {
+
 		for i := 0; i < t.NumMeasurements; i++ {
 			t.res.add(Hop{
-				Success: false,
 				Address: nil,
 				TTL:     30,
 				RTT:     0,
 				Error:   ErrHopLimitTimeout,
 			})
 		}
-		if t.RealtimePrinter != nil {
-			t.RealtimePrinter(&t.res, t.MaxHops-1)
-		}
 	}
 
 	return &t.res, nil
@@ -233,7 +197,6 @@ func (t *ICMPTracerv6) handleICMPMessage(msg ReceivedMessage, icmpType int8, dat
 	defer t.inflightRequestRWLock.RUnlock()
 	if _, ok := t.inflightRequest[ttl]; ok {
 		t.inflightRequest[ttl] <- Hop{
-			Success: true,
 			Address: msg.Peer,
 		}
 	}
@@ -298,8 +261,6 @@ func (t *ICMPTracerv6) send(ttl int) error {
 		h.TTL = ttl
 		h.RTT = rtt
 
-		h.fetchIPData(t.Config)
-
 		t.res.add(h)
 
 	case <-time.After(t.Timeout):
@@ -308,7 +269,6 @@ func (t *ICMPTracerv6) send(ttl int) error {
 		}
 
 		t.res.add(Hop{
-			Success: false,
 			Address: nil,
 			TTL:     ttl,
 			RTT:     0,

core/internal/icmp_darwin.go

@@ -0,0 +1,49 @@
+//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",
+	}
+)
+
+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
+		}
+	}
+}

core/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)
+}

core/packet_listener.go

@@ -1,9 +1,10 @@
-package trace
+package core
 
 import (
-	"golang.org/x/net/context"
 	"net"
 	"time"
+
+	"golang.org/x/net/context"
 )
 
 type ReceivedMessage struct {

core/tcp_ipv4.go

@@ -1,4 +1,4 @@
-package trace
+package core
 
 import (
 	"log"
@@ -10,7 +10,7 @@ import (
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	"github.com/xgadget-lab/nexttrace/util"
+	"github.com/sjlleo/nexttrace-core/util"
 	"golang.org/x/net/context"
 	"golang.org/x/net/icmp"
 	"golang.org/x/net/ipv4"
@@ -34,6 +34,14 @@ type TCPTracer struct {
 	sem *semaphore.Weighted
 }
 
+func (t *TCPTracer) GetConfig() *Config {
+	return &t.Config
+}
+
+func (t *TCPTracer) SetConfig(c Config) {
+	t.Config = c
+}
+
 func (t *TCPTracer) Execute() (*Result, error) {
 	if len(t.res.Hops) > 0 {
 		return &t.res, ErrTracerouteExecuted
@@ -79,30 +87,11 @@ func (t *TCPTracer) Execute() (*Result, error) {
 		for i := 0; i < t.NumMeasurements; i++ {
 			t.wg.Add(1)
 			go t.send(ttl)
-
+			<-time.After(t.Config.PacketInterval)
 		}
-		if t.RealtimePrinter != nil {
-			// 对于实时模式，应该按照TTL进行并发请求
-			t.wg.Wait()
-			t.RealtimePrinter(&t.res, ttl-1)
-		}
-
-		time.Sleep(1 * time.Millisecond)
+		<-time.After(t.Config.TTLInterval)
 	}
-	go func() {
-		if t.AsyncPrinter != nil {
-			for {
-				t.AsyncPrinter(&t.res)
-				time.Sleep(200 * time.Millisecond)
-			}
-		}
 
-	}()
-
-	// 如果是表格模式，则一次性并发请求
-	if t.RealtimePrinter == nil {
-		t.wg.Wait()
-	}
 	t.res.reduce(t.final)
 
 	return &t.res, nil
@@ -168,7 +157,6 @@ func (t *TCPTracer) listenTCP() {
 				if ch, ok := t.inflightRequest[int(tcp.Ack-1)]; ok {
 					// 最后一跳
 					ch <- Hop{
-						Success: true,
 						Address: msg.Peer,
 					}
 				}
@@ -191,7 +179,6 @@ func (t *TCPTracer) handleICMPMessage(msg ReceivedMessage, data []byte) {
 		return
 	}
 	ch <- Hop{
-		Success: true,
 		Address: msg.Peer,
 	}
 
@@ -250,15 +237,7 @@ func (t *TCPTracer) send(ttl int) error {
 	hopCh := make(chan Hop)
 	t.inflightRequest[int(sequenceNumber)] = hopCh
 	t.inflightRequestLock.Unlock()
-	/*
-		// 这里属于 2个Sender，N个Reciever的情况，在哪里关闭Channel都容易导致Panic
-		defer func() {
-			t.inflightRequestLock.Lock()
-			close(hopCh)
-			delete(t.inflightRequest, srcPort)
-			t.inflightRequestLock.Unlock()
-		}()
-	*/
+
 	select {
 	case <-t.ctx.Done():
 		return nil
@@ -285,8 +264,6 @@ func (t *TCPTracer) send(ttl int) error {
 		h.TTL = ttl
 		h.RTT = rtt
 
-		h.fetchIPData(t.Config)
-
 		t.res.add(h)
 
 	case <-time.After(t.Timeout):
@@ -295,7 +272,6 @@ func (t *TCPTracer) send(ttl int) error {
 		}
 
 		t.res.add(Hop{
-			Success: false,
 			Address: nil,
 			TTL:     ttl,
 			RTT:     0,

core/tcp_ipv6.go

@@ -1,4 +1,4 @@
-package trace
+package core
 
 import (
 	"encoding/binary"
@@ -10,7 +10,7 @@ import (
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	"github.com/xgadget-lab/nexttrace/util"
+	"github.com/sjlleo/nexttrace-core/util"
 	"golang.org/x/net/context"
 	"golang.org/x/net/icmp"
 	"golang.org/x/net/ipv6"
@@ -34,19 +34,26 @@ type TCPTracerv6 struct {
 	sem *semaphore.Weighted
 }
 
+func (t *TCPTracerv6) GetConfig() *Config {
+	return &t.Config
+}
+
+func (t *TCPTracerv6) SetConfig(c Config) {
+	t.Config = c
+}
+
 func (t *TCPTracerv6) Execute() (*Result, error) {
 	if len(t.res.Hops) > 0 {
 		return &t.res, ErrTracerouteExecuted
 	}
 
 	t.SrcIP, _ = util.LocalIPPortv6(t.DestIP)
-	// log.Println(util.LocalIPPortv6(t.DestIP))
 	var err error
 	t.tcp, err = net.ListenPacket("ip6:tcp", t.SrcIP.String())
 	if err != nil {
 		return nil, err
 	}
-	t.icmp, err = icmp.ListenPacket("ip6:58", "::")
+	t.icmp, err = icmp.ListenPacket("ip6:58", t.SrcAddr)
 	if err != nil {
 		return &t.res, err
 	}
@@ -63,7 +70,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,29 +78,11 @@ func (t *TCPTracerv6) Execute() (*Result, error) {
 		for i := 0; i < t.NumMeasurements; i++ {
 			t.wg.Add(1)
 			go t.send(ttl)
+			<-time.After(t.Config.PacketInterval)
 		}
-		if t.RealtimePrinter != nil {
-			// 对于实时模式，应该按照TTL进行并发请求
-			t.wg.Wait()
-			t.RealtimePrinter(&t.res, ttl-1)
-		}
-		time.Sleep(1 * time.Millisecond)
-
+		<-time.After(t.Config.TTLInterval)
 	}
 
-	go func() {
-		if t.AsyncPrinter != nil {
-			for {
-				t.AsyncPrinter(&t.res)
-				time.Sleep(200 * time.Millisecond)
-			}
-		}
-
-	}()
-
-	if t.RealtimePrinter == nil {
-		t.wg.Wait()
-	}
 	t.res.reduce(t.final)
 
 	return &t.res, nil
@@ -160,7 +149,6 @@ func (t *TCPTracerv6) listenTCP() {
 				if ch, ok := t.inflightRequest[int(tcp.Ack-1)]; ok {
 					// 最后一跳
 					ch <- Hop{
-						Success: true,
 						Address: msg.Peer,
 					}
 				}
@@ -180,7 +168,6 @@ func (t *TCPTracerv6) handleICMPMessage(msg ReceivedMessage) {
 	}
 	// log.Println("发送数据", sequenceNumber)
 	ch <- Hop{
-		Success: true,
 		Address: msg.Peer,
 	}
 	// log.Println("发送成功")
@@ -268,8 +255,6 @@ func (t *TCPTracerv6) send(ttl int) error {
 		h.TTL = ttl
 		h.RTT = rtt
 
-		h.fetchIPData(t.Config)
-
 		t.res.add(h)
 
 	case <-time.After(t.Timeout):
@@ -278,7 +263,6 @@ func (t *TCPTracerv6) send(ttl int) error {
 		}
 
 		t.res.add(Hop{
-			Success: false,
 			Address: nil,
 			TTL:     ttl,
 			RTT:     0,

core/trace.go

@@ -0,0 +1,182 @@
+package core
+
+import (
+	"errors"
+	"fmt"
+	"log"
+	"net"
+	"sync"
+	"time"
+)
+
+var (
+	ErrInvalidMethod      = errors.New("invalid method")
+	ErrTracerouteExecuted = errors.New("traceroute already executed")
+	ErrHopLimitTimeout    = errors.New("hop timeout")
+)
+
+type Method string
+
+type TraceInstance struct {
+	Tracer
+	ErrorStr string
+}
+
+type Plugin interface {
+	OnDNSResolve(domain string) (net.IP, error)
+	OnNewIPFound(ip net.Addr) error
+	OnTTLChange(ttl int) error
+	OnTTLCompleted(ttl int, hop []Hop) error
+}
+
+type Config struct {
+	TraceMethod      Method
+	SrcAddr          string
+	BeginHop         int
+	MaxHops          int
+	NumMeasurements  int
+	ParallelRequests int
+	Timeout          time.Duration
+	DestIP           net.IP
+	DestPort         int
+	Quic             bool
+	PacketInterval   time.Duration
+	TTLInterval      time.Duration
+	Plugins          []Plugin
+}
+
+const (
+	ICMPTrace Method = "icmp"
+	UDPTrace  Method = "udp"
+	TCPTrace  Method = "tcp"
+)
+
+type Tracer interface {
+	Execute() (*Result, error)
+	GetConfig() *Config
+	SetConfig(Config)
+}
+
+type Result struct {
+	Hops [][]Hop
+	lock sync.Mutex
+}
+
+type Hop struct {
+	Address  net.Addr
+	Hostname string
+	TTL      int
+	RTT      time.Duration
+	Error    error
+}
+
+func Traceroute(p []Plugin) {
+	var test_config = Config{
+		DestIP:           net.IPv4(1, 1, 1, 1),
+		DestPort:         443,
+		ParallelRequests: 30,
+		NumMeasurements:  3,
+		BeginHop:         1,
+		MaxHops:          30,
+		TTLInterval:      1 * time.Millisecond,
+		Timeout:          2 * time.Second,
+		TraceMethod:      ICMPTrace,
+		Plugins:          p,
+	}
+	traceInstance, err := NewTracer(test_config)
+	if err != nil {
+		log.Println(err)
+		return
+	}
+
+	res, err := traceInstance.Traceroute()
+	if err != nil {
+		log.Println(err)
+	}
+	log.Println(res)
+}
+
+func NewTracer(config Config) (*TraceInstance, error) {
+	t := TraceInstance{}
+	switch config.TraceMethod {
+	case ICMPTrace:
+		if config.DestIP.To4() != nil {
+			t.Tracer = &ICMPTracer{Config: config}
+		} else {
+			t.Tracer = &ICMPTracerv6{Config: config}
+		}
+
+	case UDPTrace:
+		if config.DestIP.To4() != nil {
+			t.Tracer = &UDPTracer{Config: config}
+		} else {
+			t.Tracer = &UDPTracerv6{Config: config}
+		}
+	case TCPTrace:
+		if config.DestIP.To4() != nil {
+			t.Tracer = &TCPTracer{Config: config}
+		} else {
+			t.Tracer = &TCPTracerv6{Config: config}
+		}
+	default:
+		return &TraceInstance{}, ErrInvalidMethod
+	}
+	return &t, t.CheckConfig()
+}
+
+func (t *TraceInstance) CheckConfig() (err error) {
+	c := t.GetConfig()
+
+	configValidConditions := map[string]bool{
+		"DestIP is null":            c.DestIP == nil,
+		"BeginHop is empty":         c.BeginHop == 0,
+		"MaxHops is empty":          c.MaxHops == 0,
+		"NumMeasurements is empty":  c.NumMeasurements == 0,
+		"ParallelRequests is empty": c.ParallelRequests == 0,
+		"Trace Timeout is empty":    c.Timeout == 0,
+		"You must specific at least one of TTLInterval and PacketInterval":           c.TTLInterval|c.PacketInterval == 0,
+		"You choose " + string(c.TraceMethod) + " trace. DestPort must be specified": (c.TraceMethod == TCPTrace || c.TraceMethod == UDPTrace) && c.DestPort == 0,
+	}
+
+	var (
+		inValidFlag bool
+	)
+
+	for condition, notValid := range configValidConditions {
+		if notValid {
+			inValidFlag = true
+			t.ErrorStr += fmt.Sprintf("Invalid config: %s\n", condition)
+		}
+	}
+
+	if inValidFlag {
+		return fmt.Errorf(t.ErrorStr)
+	}
+
+	return nil
+
+}
+
+func (t *TraceInstance) Traceroute() (*Result, error) {
+	if t.ErrorStr != "" {
+		log.Fatal(t.ErrorStr)
+	}
+	return t.Tracer.Execute()
+}
+
+func (s *Result) add(hop Hop) {
+	s.lock.Lock()
+	defer s.lock.Unlock()
+	k := hop.TTL - 1
+	for len(s.Hops) < hop.TTL {
+		s.Hops = append(s.Hops, make([]Hop, 0))
+	}
+	s.Hops[k] = append(s.Hops[k], hop)
+
+}
+
+func (s *Result) reduce(final int) {
+	if final > 0 && final < len(s.Hops) {
+		s.Hops = s.Hops[:final]
+	}
+}

core/udp_ipv4.go

@@ -1,4 +1,4 @@
-package trace
+package core
 
 import (
 	"log"
@@ -8,7 +8,7 @@ import (
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	"github.com/xgadget-lab/nexttrace/util"
+	"github.com/sjlleo/nexttrace-core/util"
 	"golang.org/x/net/context"
 	"golang.org/x/net/icmp"
 	"golang.org/x/net/ipv4"
@@ -31,6 +31,14 @@ type UDPTracer struct {
 	sem *semaphore.Weighted
 }
 
+func (t *UDPTracer) GetConfig() *Config {
+	return &t.Config
+}
+
+func (t *UDPTracer) SetConfig(c Config) {
+	t.Config = c
+}
+
 func (t *UDPTracer) Execute() (*Result, error) {
 	if len(t.res.Hops) > 0 {
 		return &t.res, ErrTracerouteExecuted
@@ -60,26 +68,9 @@ 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)
-	}
-	go func() {
-		if t.AsyncPrinter != nil {
-			for {
-				t.AsyncPrinter(&t.res)
-				time.Sleep(200 * time.Millisecond)
-			}
-		}
-	}()
-	// 如果是表格模式，则一次性并发请求
-	if t.AsyncPrinter != nil {
-		t.wg.Wait()
+		<-time.After(time.Millisecond * time.Duration(t.Config.TTLInterval))
 	}
 	t.res.reduce(t.final)
 
@@ -128,7 +119,6 @@ func (t *UDPTracer) handleICMPMessage(msg ReceivedMessage, data []byte) {
 		return
 	}
 	ch <- Hop{
-		Success: true,
 		Address: msg.Peer,
 	}
 }
@@ -225,7 +215,6 @@ func (t *UDPTracer) send(ttl int) error {
 			return
 		}
 		hopCh <- Hop{
-			Success: true,
 			Address: peer,
 		}
 	}()
@@ -256,8 +245,6 @@ func (t *UDPTracer) send(ttl int) error {
 		h.TTL = ttl
 		h.RTT = rtt
 
-		h.fetchIPData(t.Config)
-
 		t.res.add(h)
 
 	case <-time.After(t.Timeout):
@@ -266,7 +253,6 @@ func (t *UDPTracer) send(ttl int) error {
 		}
 
 		t.res.add(Hop{
-			Success: false,
 			Address: nil,
 			TTL:     ttl,
 			RTT:     0,

core/udp_ipv6.go

@@ -0,0 +1,264 @@
+package core
+
+import (
+	"log"
+	"net"
+	"sync"
+	"time"
+
+	"github.com/google/gopacket"
+	"github.com/google/gopacket/layers"
+	"github.com/sjlleo/nexttrace-core/util"
+	"golang.org/x/net/context"
+	"golang.org/x/net/icmp"
+	"golang.org/x/net/ipv4"
+	"golang.org/x/sync/semaphore"
+)
+
+type UDPTracerv6 struct {
+	Config
+	wg                  sync.WaitGroup
+	res                 Result
+	ctx                 context.Context
+	inflightRequest     map[int]chan Hop
+	inflightRequestLock sync.Mutex
+
+	icmp net.PacketConn
+
+	final     int
+	finalLock sync.Mutex
+
+	sem *semaphore.Weighted
+}
+
+func (t *UDPTracerv6) GetConfig() *Config {
+	return &t.Config
+}
+
+func (t *UDPTracerv6) SetConfig(c Config) {
+	t.Config = c
+}
+
+func (t *UDPTracerv6) Execute() (*Result, error) {
+	if len(t.res.Hops) > 0 {
+		return &t.res, ErrTracerouteExecuted
+	}
+
+	var err error
+	t.icmp, err = icmp.ListenPacket("ip6:58", t.SrcAddr)
+	if err != nil {
+		return &t.res, err
+	}
+	defer t.icmp.Close()
+
+	var cancel context.CancelFunc
+	t.ctx, cancel = context.WithCancel(context.Background())
+	defer cancel()
+	t.inflightRequest = make(map[int]chan Hop)
+	t.final = -1
+
+	go t.listenICMPv6()
+
+	t.sem = semaphore.NewWeighted(int64(t.ParallelRequests))
+	for ttl := 1; ttl <= t.MaxHops; ttl++ {
+		// 如果到达最终跳，则退出
+		if t.final != -1 && ttl > t.final {
+			break
+		}
+		for i := 0; i < t.NumMeasurements; i++ {
+			t.wg.Add(1)
+			go t.send(ttl)
+			<-time.After(time.Millisecond * time.Duration(t.Config.PacketInterval))
+		}
+		<-time.After(time.Millisecond * time.Duration(t.Config.TTLInterval))
+	}
+	t.res.reduce(t.final)
+
+	return &t.res, nil
+}
+
+func (t *UDPTracerv6) listenICMPv6() {
+	lc := NewPacketListener(t.icmp, t.ctx)
+	go lc.Start()
+	for {
+		select {
+		case <-t.ctx.Done():
+			return
+		case msg := <-lc.Messages:
+			if msg.N == nil {
+				continue
+			}
+			rm, err := icmp.ParseMessage(58, msg.Msg[:*msg.N])
+			if err != nil {
+				log.Println(err)
+				continue
+			}
+			switch rm.Type {
+			case ipv4.ICMPTypeTimeExceeded:
+				t.handleICMPMessage(msg, rm.Body.(*icmp.TimeExceeded).Data)
+			case ipv4.ICMPTypeDestinationUnreachable:
+				t.handleICMPMessage(msg, rm.Body.(*icmp.DstUnreach).Data)
+			default:
+				// log.Println("received icmp message of unknown type", rm.Type)
+			}
+		}
+	}
+
+}
+
+func (t *UDPTracerv6) handleICMPMessage(msg ReceivedMessage, data []byte) {
+	header, err := util.GetICMPResponsePayload(data)
+	if err != nil {
+		return
+	}
+	srcPort := util.GetUDPSrcPort(header)
+	t.inflightRequestLock.Lock()
+	defer t.inflightRequestLock.Unlock()
+	ch, ok := t.inflightRequest[int(srcPort)]
+	if !ok {
+		return
+	}
+	ch <- Hop{
+		Address: msg.Peer,
+	}
+}
+
+func (t *UDPTracerv6) getUDPConn(try int) (net.IP, int, net.PacketConn) {
+	srcIP, _ := util.LocalIPPort(t.DestIP)
+
+	var ipString string
+	if srcIP == nil {
+		ipString = ""
+	} else {
+		ipString = srcIP.String()
+	}
+
+	udpConn, err := net.ListenPacket("udp", "["+ipString+"]:0")
+	if err != nil {
+		if try > 3 {
+			log.Fatal(err)
+		}
+		return t.getUDPConn(try + 1)
+	}
+	return srcIP, udpConn.LocalAddr().(*net.UDPAddr).Port, udpConn
+}
+
+func (t *UDPTracerv6) send(ttl int) error {
+	err := t.sem.Acquire(context.Background(), 1)
+	if err != nil {
+		return err
+	}
+	defer t.sem.Release(1)
+
+	defer t.wg.Done()
+	if t.final != -1 && ttl > t.final {
+		return nil
+	}
+
+	srcIP, srcPort, udpConn := t.getUDPConn(0)
+
+	var payload []byte
+	if t.Quic {
+		payload = GenerateQuicPayloadWithRandomIds()
+	} else {
+		ipHeader := &layers.IPv4{
+			SrcIP:    srcIP,
+			DstIP:    t.DestIP,
+			Protocol: layers.IPProtocolTCP,
+			TTL:      uint8(ttl),
+		}
+
+		udpHeader := &layers.UDP{
+			SrcPort: layers.UDPPort(srcPort),
+			DstPort: layers.UDPPort(t.DestPort),
+		}
+		_ = udpHeader.SetNetworkLayerForChecksum(ipHeader)
+		buf := gopacket.NewSerializeBuffer()
+		opts := gopacket.SerializeOptions{
+			ComputeChecksums: true,
+			FixLengths:       true,
+		}
+		if err := gopacket.SerializeLayers(buf, opts, udpHeader, gopacket.Payload("HAJSFJHKAJSHFKJHAJKFHKASHKFHHKAFKHFAHSJK")); err != nil {
+			return err
+		}
+
+		payload = buf.Bytes()
+	}
+
+	err = ipv4.NewPacketConn(udpConn).SetTTL(ttl)
+	if err != nil {
+		return err
+	}
+
+	start := time.Now()
+	if _, err := udpConn.WriteTo(payload, &net.UDPAddr{IP: t.DestIP, Port: t.DestPort}); err != nil {
+		return err
+	}
+
+	// 在对inflightRequest进行写操作的时候应该加锁保护，以免多个goroutine协程试图同时写入造成panic
+	t.inflightRequestLock.Lock()
+	hopCh := make(chan Hop)
+	t.inflightRequest[srcPort] = hopCh
+	t.inflightRequestLock.Unlock()
+	defer func() {
+		t.inflightRequestLock.Lock()
+		close(hopCh)
+		delete(t.inflightRequest, srcPort)
+		t.inflightRequestLock.Unlock()
+	}()
+
+	go func() {
+		reply := make([]byte, 1500)
+		_, peer, err := udpConn.ReadFrom(reply)
+		if err != nil {
+			// probably because we closed the connection
+			return
+		}
+		hopCh <- Hop{
+			Address: peer,
+		}
+	}()
+
+	select {
+	case <-t.ctx.Done():
+		return nil
+	case h := <-hopCh:
+		rtt := time.Since(start)
+		if t.final != -1 && ttl > t.final {
+			return nil
+		}
+
+		if addr, ok := h.Address.(*net.IPAddr); ok && addr.IP.Equal(t.DestIP) {
+			t.finalLock.Lock()
+			if t.final == -1 || ttl < t.final {
+				t.final = ttl
+			}
+			t.finalLock.Unlock()
+		} else if addr, ok := h.Address.(*net.UDPAddr); ok && addr.IP.Equal(t.DestIP) {
+			t.finalLock.Lock()
+			if t.final == -1 || ttl < t.final {
+				t.final = ttl
+			}
+			t.finalLock.Unlock()
+		}
+
+		h.TTL = ttl
+		h.RTT = rtt
+
+		t.res.add(h)
+
+	case <-time.After(t.Timeout):
+		if t.final != -1 && ttl > t.final {
+			return nil
+		}
+
+		t.res.add(Hop{
+			Address: nil,
+			TTL:     ttl,
+			RTT:     0,
+			Error:   ErrHopLimitTimeout,
+		})
+	}
+
+	return nil
+}

dn42/dn42.go

@@ -1,7 +0,0 @@
-package dn42
-
-/***
-	[DN42 Package]
-		谨献给 DN42 所有的小伙伴们，祝你们终有一天能有自己的公网 ASN ~
-		By Leo
-***/

dn42/geofeed.go

@@ -1,101 +0,0 @@
-package dn42
-
-import (
-	"encoding/csv"
-	"net"
-	"os"
-	"sort"
-
-	"github.com/spf13/viper"
-)
-
-type GeoFeedRow struct {
-	IPNet   *net.IPNet
-	CIDR    string
-	LtdCode string
-	ISO3166 string
-	City    string
-	ASN     string
-	IPWhois string
-}
-
-func GetGeoFeed(ip string) (GeoFeedRow, bool) {
-	rows, err := ReadGeoFeed()
-	if err != nil {
-		// 处理错误
-		panic(err)
-	}
-
-	row, find := FindGeoFeedRow(ip, rows)
-	return row, find
-
-}
-
-func ReadGeoFeed() ([]GeoFeedRow, error) {
-	path := viper.Get("geoFeedPath").(string)
-	f, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	r := csv.NewReader(f)
-	rows, err := r.ReadAll()
-	if err != nil {
-		return nil, err
-	}
-
-	// 将 CSV 中的每一行转换为 GeoFeedRow 类型，并保存到 rowsSlice 中
-	var rowsSlice []GeoFeedRow
-	for _, row := range rows {
-		cidr := row[0] // 假设第一列是 CIDR 字段
-		_, ipnet, err := net.ParseCIDR(cidr)
-		if err != nil {
-			// 如果解析 CIDR 失败，跳过这一行
-			continue
-		}
-		if len(row) == 4 {
-			rowsSlice = append(rowsSlice, GeoFeedRow{
-				IPNet:   ipnet,
-				CIDR:    cidr,
-				LtdCode: row[1],
-				ISO3166: row[2],
-				City:    row[3],
-			})
-		} else {
-			rowsSlice = append(rowsSlice, GeoFeedRow{
-				IPNet:   ipnet,
-				CIDR:    cidr,
-				LtdCode: row[1],
-				ISO3166: row[2],
-				City:    row[3],
-				ASN:     row[4],
-				IPWhois: row[5],
-			})
-		}
-
-	}
-	// 根据 CIDR 范围从小到大排序，方便后面查找
-	sort.Slice(rowsSlice, func(i, j int) bool {
-		return rowsSlice[i].IPNet.Mask.String() > rowsSlice[j].IPNet.Mask.String()
-	})
-
-	return rowsSlice, nil
-}
-
-func FindGeoFeedRow(ipStr string, rows []GeoFeedRow) (GeoFeedRow, bool) {
-	ip := net.ParseIP(ipStr)
-	if ip == nil {
-		// 如果传入的 IP 无效，直接返回
-		return GeoFeedRow{}, false
-	}
-
-	// 遍历每个 CIDR 范围，找到第一个包含传入的 IP 的 CIDR
-	for _, row := range rows {
-		if row.IPNet.Contains(ip) {
-			return row, true
-		}
-	}
-
-	return GeoFeedRow{}, false
-}

dn42/geofeed_test.go

@@ -1,17 +0,0 @@
-package dn42
-
-// func TestGeoFeed(t *testing.T) {
-// 	rows, err := ReadGeoFeed()
-// 	if err != nil {
-// 		// 处理错误
-// 	}
-
-// 	row, found := FindGeoFeedRow("2001:0418:1403:8080::6fff", rows)
-// 	if found {
-// 		// 处理符合条件的 row
-// 		log.Println(row)
-// 	} else {
-// 		// 处理未找到的情况
-// 	}
-
-// }

dn42/ptr.go

@@ -1,83 +0,0 @@
-package dn42
-
-import (
-	"encoding/csv"
-	"errors"
-	"fmt"
-	"os"
-	"regexp"
-	"strings"
-
-	"github.com/spf13/viper"
-)
-
-type PtrRow struct {
-	IATACode string
-	LtdCode  string
-	Region   string
-	City     string
-}
-
-func matchesPattern(prefix string, s string) bool {
-	pattern := fmt.Sprintf(`^(.*[-.\d]|^)%s[-.\d].*$`, prefix)
-
-	r, err := regexp.Compile(pattern)
-	if err != nil {
-		fmt.Println("Invalid regular expression:", err)
-		return false
-	}
-
-	return r.MatchString(s)
-}
-
-func FindPtrRecord(ptr string) (PtrRow, error) {
-	path := viper.Get("ptrPath").(string)
-	f, err := os.Open(path)
-	if err != nil {
-		return PtrRow{}, err
-	}
-	defer f.Close()
-
-	r := csv.NewReader(f)
-	rows, err := r.ReadAll()
-	if err != nil {
-		return PtrRow{}, err
-	}
-	// 转小写
-	ptr = strings.ToLower(ptr)
-	// 先查城市名
-	for _, row := range rows {
-		city := row[3]
-		if city == "" {
-			continue
-		}
-		city = strings.ReplaceAll(city, " ", "")
-		city = strings.ToLower(city)
-
-		if matchesPattern(city, ptr) {
-			return PtrRow{
-				LtdCode: row[1],
-				Region:  row[2],
-				City:    row[3],
-			}, nil
-		}
-	}
-	// 查 IATA Code
-	for _, row := range rows {
-		iata := row[0]
-		if iata == "" {
-			continue
-		}
-		iata = strings.ToLower(iata)
-		if matchesPattern(iata, ptr) {
-			return PtrRow{
-				IATACode: iata,
-				LtdCode:  row[1],
-				Region:   row[2],
-				City:     row[3],
-			}, nil
-		}
-	}
-
-	return PtrRow{}, errors.New("ptr not found")
-}

dn42/ptr_test.go

@@ -1,50 +0,0 @@
-package dn42
-
-import (
-	"testing"
-)
-
-func TestPTR(t *testing.T) {
-
-	// example_mis := []string{
-	// 	"sloutravel.com",
-	// 	"memeslou.org",
-	// 	"followsloucity.net",
-	// 	"slouslou.slou",
-	// 	"slouslou8.slou",
-	// }
-
-	// examples := []string{
-
-	// 	"1ge.slou.as1299.net",
-	// 	"1ge.slou2.as1299.net",
-	// 	"1ge-slou.as1299.net",
-	// 	"slou-1.as1299.net",
-	// 	"slou.as1299.com",
-	// 	"1ge-snge-6.as1299.net",
-	// 	"c-1.sin.sg.atlas.moeqing.com",
-	// 	"core.hkg1.hk.atlas.moeqing.com",
-	// 	"core.losangles.us.atlas.moeqing.com",
-	// }
-
-	// fmt.Println("容易误匹配的 PTR")
-
-	// for _, s := range example_mis {
-	// 	if r, err := FindPtrRecord("ptr.csv"); err == nil {
-	// 		fmt.Println(s, r)
-	// 	} else {
-	// 		fmt.Println(s, err)
-	// 	}
-
-	// }
-	// fmt.Println("\n应该正常匹配的 PTR")
-	// for _, s := range examples {
-	// 	if r, err := FindPtrRecord("ptr.csv"); err == nil {
-	// 		fmt.Println(s, r)
-	// 	} else {
-	// 		fmt.Println(s, err)
-	// 	}
-
-	// }
-
-}

example/traceroute_test.go

@@ -0,0 +1,39 @@
+package example
+
+import (
+	"log"
+	"net"
+	"testing"
+	"time"
+
+	"github.com/sjlleo/nexttrace-core/core"
+)
+
+func traceroute() {
+	var test_config = core.Config{
+		DestIP:           net.IPv4(1, 1, 1, 1),
+		DestPort:         443,
+		ParallelRequests: 30,
+		NumMeasurements:  1,
+		BeginHop:         1,
+		MaxHops:          30,
+		TTLInterval:      1 * time.Millisecond,
+		Timeout:          2 * time.Second,
+		TraceMethod:      core.ICMPTrace,
+	}
+	traceInstance, err := core.NewTracer(test_config)
+	if err != nil {
+		log.Println(err)
+		return
+	}
+
+	res, err := traceInstance.Traceroute()
+	if err != nil {
+		log.Println(err)
+	}
+	log.Println(res)
+}
+
+func TestTraceToCloudflareDNS(t *testing.T) {
+	traceroute()
+}

fast_trace/basic.go

@@ -1,187 +0,0 @@
-package fastTrace
-
-type AllLocationCollection struct {
-	Beijing   BackBoneCollection
-	Shanghai  BackBoneCollection
-	Guangzhou BackBoneCollection
-	Hangzhou  BackBoneCollection
-	Hefei     BackBoneCollection
-	Changsha  BackBoneCollection
-}
-
-type BackBoneCollection struct {
-	Location string
-	CT163    ISPCollection
-	CTCN2    ISPCollection
-	CU169    ISPCollection
-	CU9929   ISPCollection
-	CM       ISPCollection
-	CMIN2    ISPCollection
-	EDU      ISPCollection
-	CST      ISPCollection
-}
-
-type ISPCollection struct {
-	ISPName string
-	IP      string
-	IPv6    string
-}
-
-const (
-	CT163  string = "电信 163 AS4134"
-	CTCN2  string = "电信 CN2 AS4809"
-	CU169  string = "联通 169 AS4837"
-	CU9929 string = "联通 A网 AS9929"
-	CM     string = "移动 骨干网 AS9808"
-	CMIN2  string = "移动 CMIN2 AS58807"
-	EDU    string = "教育网 CERNET AS4538"
-)
-
-var TestIPsCollection = AllLocationCollection{
-	Beijing:   Beijing,
-	Shanghai:  Shanghai,
-	Guangzhou: Guangzhou,
-	Hangzhou:  Hangzhou,
-	Hefei:     Hefei,
-}
-
-var Beijing = BackBoneCollection{
-	Location: "北京",
-	CT163: ISPCollection{
-		ISPName: CT163,
-		IP:      "106.37.67.1",
-		IPv6:    "240e:40:e002:1:a:3ee3:c00:0",
-	},
-
-	CU169: ISPCollection{
-		ISPName: CU169,
-		IP:      "123.125.96.156",
-		IPv6:    "2408:8000:1010:2::10",
-	},
-
-	CU9929: ISPCollection{
-		ISPName: CU9929,
-		IP:      "218.105.131.125",
-	},
-
-	CM: ISPCollection{
-		ISPName: CM,
-		IP:      "211.136.25.153",
-		IPv6:    "2409:8000:3800:8::3",
-	},
-
-	CMIN2: ISPCollection{
-		ISPName: CMIN2,
-		IP:      "223.70.155.55",
-	},
-
-	EDU: ISPCollection{
-		ISPName: EDU,
-		IP:      "101.6.15.130",
-		IPv6:    "2001:da8::666",
-	},
-}
-
-var Shanghai = BackBoneCollection{
-	Location: "上海",
-	CT163: ISPCollection{
-		ISPName: CT163,
-		IP:      "202.101.21.178",
-		IPv6:    "240e:18:2:153::89",
-	},
-
-	CTCN2: ISPCollection{
-		ISPName: CTCN2,
-		IP:      "58.32.4.1",
-	},
-
-	CU169: ISPCollection{
-		ISPName: CU169,
-		IP:      "139.226.206.150",
-		IPv6:    "2408:8000:9000:0:4000::437",
-	},
-
-	CU9929: ISPCollection{
-		ISPName: CU9929,
-		IP:      "210.13.86.1",
-		IPv6:    "2408:8120:2::d6",
-	},
-
-	CM: ISPCollection{
-		ISPName: CM,
-		IP:      "120.204.34.85",
-		IPv6:    "2409:801e:f0:1::4e1",
-	},
-
-	CMIN2: ISPCollection{
-		ISPName: CMIN2,
-		IP:      "183.194.134.1",
-	},
-
-	EDU: ISPCollection{
-		ISPName: EDU,
-		IP:      "202.120.58.155",
-		IPv6:    "2001:da8:8000:1:202:120:2:100",
-	},
-}
-
-var Guangzhou = BackBoneCollection{
-	Location: "广州",
-	CT163: ISPCollection{
-		ISPName: CT163,
-		IP:      "14.116.225.60",
-		IPv6:    "240e:f9:8010::3:110:1",
-	},
-
-	CU169: ISPCollection{
-		ISPName: CU169,
-		IP:      "157.18.0.22",
-		IPv6:    "2408:8001:3161:4::1",
-	},
-
-	CM: ISPCollection{
-		ISPName: CM,
-		IP:      "120.198.26.254",
-		IPv6:    "2409:8055:3008:1116::150",
-	},
-}
-
-var Hangzhou = BackBoneCollection{
-	Location: "杭州",
-	CT163: ISPCollection{
-		ISPName: CT163,
-		IP:      "61.164.23.196",
-		IPv6:    "240e:f3:c000:201::10",
-	},
-	CU169: ISPCollection{
-		ISPName: CU169,
-		IP:      "60.12.244.1",
-		IPv6:    "",
-	},
-	CM: ISPCollection{
-		ISPName: CM,
-		IP:      "112.17.224.98",
-		IPv6:    "2409:8028:840:2::11",
-	},
-	// 浙江大学 教育网
-	EDU: ISPCollection{
-		ISPName: EDU,
-		IP:      "210.32.2.1",
-		IPv6:    "2001:da8:e000:1::1",
-	},
-}
-
-var Hefei = BackBoneCollection{
-	Location: "合肥",
-	// 中国科学技术大学 教育网
-	EDU: ISPCollection{
-		ISPName: EDU,
-		IP:      "202.38.64.1",
-		IPv6:    "2001:da8:d805:ffff:2::1",
-	},
-	// 中国科学技术大学 科技网
-	CST: ISPCollection{
-		ISPName: "中国科学技术大学 科技网 AS7497",
-		IP:      "210.72.22.2",
-	},
-}

fast_trace/fast_trace ipv6.go

@@ -1,136 +0,0 @@
-package fastTrace
-
-import (
-	"fmt"
-	"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 fp.Close()
-
-	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.IPv6)
-	log.Printf("traceroute to %s, 30 hops max, 32 byte packets\n", ispCollection.IPv6)
-	ip := net.ParseIP(ispCollection.IPv6)
-	var conf = trace.Config{
-		BeginHop:         1,
-		DestIP:           ip,
-		DestPort:         80,
-		MaxHops:          30,
-		NumMeasurements:  3,
-		ParallelRequests: 18,
-		RDns:             true,
-		IPGeoSource:      ipgeo.GetSource("LeoMoeAPI"),
-		Timeout:          1 * time.Second,
-	}
-
-	if oe {
-		conf.RealtimePrinter = tracelog.RealtimePrinter
-	} else {
-		conf.RealtimePrinter = printer.RealtimePrinter
-	}
-
-	_, err = trace.Traceroute(f.TracerouteMethod, conf)
-
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	println()
-}
-
-func (f *FastTracer) testAll_v6() {
-	f.testCT_v6()
-	println()
-	f.testCU_v6()
-	println()
-	f.testCM_v6()
-	println()
-	f.testEDU_v6()
-}
-
-func (f *FastTracer) testCT_v6() {
-	f.tracert_v6(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CT163)
-	f.tracert_v6(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CT163)
-	f.tracert_v6(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CT163)
-	f.tracert_v6(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CT163)
-}
-
-func (f *FastTracer) testCU_v6() {
-	f.tracert_v6(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CU169)
-	f.tracert_v6(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CU169)
-	f.tracert_v6(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CU9929)
-	f.tracert_v6(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CU169)
-}
-
-func (f *FastTracer) testCM_v6() {
-	f.tracert_v6(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CM)
-	f.tracert_v6(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CM)
-	f.tracert_v6(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CM)
-	f.tracert_v6(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CM)
-}
-
-func (f *FastTracer) testEDU_v6() {
-	f.tracert_v6(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.EDU)
-	f.tracert_v6(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.EDU)
-	f.tracert_v6(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.EDU)
-}
-
-func FastTestv6(tm bool, outEnable bool) {
-	var c string
-
-	oe = outEnable
-
-	fmt.Println("您想测试哪些ISP的路由？\n1. 国内四网\n2. 电信\n3. 联通\n4. 移动\n5. 教育网")
-	fmt.Print("请选择选项：")
-	fmt.Scanln(&c)
-
-	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_v6()
-	case "2":
-		ft.testCT_v6()
-	case "3":
-		ft.testCU_v6()
-	case "4":
-		ft.testCM_v6()
-	case "5":
-		ft.testEDU_v6()
-	default:
-		ft.testAll_v6()
-	}
-}

fast_trace/fast_trace.go

@@ -1,158 +0,0 @@
-package fastTrace
-
-import (
-	"fmt"
-	"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"
-)
-
-type FastTracer struct {
-	TracerouteMethod trace.Method
-}
-
-var oe bool = 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 fp.Close()
-
-	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)
-	var conf = trace.Config{
-		BeginHop:         1,
-		DestIP:           ip,
-		DestPort:         80,
-		MaxHops:          30,
-		NumMeasurements:  3,
-		ParallelRequests: 18,
-		RDns:             true,
-		PacketInterval:   100,
-		TTLInterval:      500,
-		IPGeoSource:      ipgeo.GetSource("LeoMoeAPI"),
-		Timeout:          1 * time.Second,
-	}
-
-	if oe {
-		conf.RealtimePrinter = tracelog.RealtimePrinter
-	} else {
-		conf.RealtimePrinter = printer.RealtimePrinter
-	}
-
-	_, err = trace.Traceroute(f.TracerouteMethod, conf)
-
-	if err != nil {
-		log.Fatal(err)
-	}
-	println()
-}
-
-func (f *FastTracer) testAll() {
-	f.testCT()
-	println()
-	f.testCU()
-	println()
-	f.testCM()
-	println()
-	f.testEDU()
-}
-
-func (f *FastTracer) testCT() {
-	f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CT163)
-	f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CT163)
-	f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CTCN2)
-	f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CT163)
-	f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CT163)
-}
-
-func (f *FastTracer) testCU() {
-	f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CU169)
-	f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CU9929)
-	f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CU169)
-	f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CU9929)
-	f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CU169)
-	f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CU169)
-}
-
-func (f *FastTracer) testCM() {
-	f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CM)
-	f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CMIN2)
-	f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CM)
-	f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CMIN2)
-	f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CM)
-	f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CM)
-}
-
-func (f *FastTracer) testEDU() {
-	f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.EDU)
-	f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.EDU)
-	f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.EDU)
-	// 科技网暂时算在EDU里面，等拿到了足够多的数据再分离出去，单独用于测试
-	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("请选择选项：")
-	fmt.Scanln(&c)
-	if c == "2" {
-		FastTestv6(tm, outEnable)
-		return
-	}
-
-	fmt.Println("您想测试哪些ISP的路由？\n1. 国内四网\n2. 电信\n3. 联通\n4. 移动\n5. 教育网")
-	fmt.Print("请选择选项：")
-	fmt.Scanln(&c)
-
-	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()
-	}
-}

fast_trace/fast_trace_test.go

@@ -1,25 +0,0 @@
-package fastTrace
-
-import (
-	"os"
-	"os/signal"
-	"testing"
-
-	"github.com/xgadget-lab/nexttrace/trace"
-	"github.com/xgadget-lab/nexttrace/wshandle"
-)
-
-// ICMP Use Too Many Time to Wait So we don't test it.
-func TestTCPTrace(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()
-	}()
-	ft.TracerouteMethod = trace.TCPTrace
-	ft.testCM()
-	ft.testEDU()
-}

go.mod

@@ -1,41 +1,35 @@
-module github.com/xgadget-lab/nexttrace
+module github.com/sjlleo/nexttrace-core
 
 go 1.20
 
 require (
-	github.com/akamensky/argparse v1.4.0
 	github.com/google/gopacket v1.1.19
-	github.com/spf13/viper v1.15.0
-	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
-	golang.org/x/net v0.7.0
+	golang.org/x/net v0.10.0
 	golang.org/x/sync v0.1.0
 )
 
 require (
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.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/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/pelletier/go-toml/v2 v2.1.0 // indirect
+	github.com/spf13/afero v1.9.5 // indirect
+	github.com/spf13/cast v1.5.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/subosito/gotenv v1.4.2 // indirect
-	golang.org/x/text v0.7.0 // indirect
+	github.com/spf13/viper v1.16.0 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 require (
 	github.com/fatih/color v1.14.1
-	github.com/gorilla/websocket v1.5.0
-	github.com/lionsoul2014/ip2region v2.11.1+incompatible
-	github.com/rodaine/table v1.1.0
-	github.com/tidwall/gjson v1.14.4
-	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.1 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	github.com/spf13/cobra v1.7.0
+	golang.org/x/sys v0.12.0 // indirect
 )

go.sum

@@ -38,8 +38,6 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/akamensky/argparse v1.4.0 h1:YGzvsTqCvbEZhL8zZu2AiA5nq805NZh75JNj4ajn1xc=
-github.com/akamensky/argparse v1.4.0/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
@@ -48,8 +46,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 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/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 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/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=
@@ -59,7 +57,6 @@ 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.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
 github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
-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/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
@@ -101,8 +98,6 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
 github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
@@ -123,25 +118,21 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
-github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
-github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 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/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/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=
@@ -149,54 +140,40 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk
 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-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/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/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/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/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
+github.com/spf13/afero v1.9.5/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/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
+github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 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.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc=
+github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg=
 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/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/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/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/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=
@@ -213,7 +190,7 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
 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=
@@ -278,8 +255,11 @@ 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.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 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=
@@ -333,12 +313,15 @@ 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.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
+golang.org/x/sys v0.12.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=
@@ -346,8 +329,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.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+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=
@@ -491,7 +476,6 @@ 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/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=

ipgeo/dn42.go

@@ -1,62 +0,0 @@
-package ipgeo
-
-import (
-	"strings"
-
-	"github.com/xgadget-lab/nexttrace/dn42"
-)
-
-func LtdCodeToCountryOrAreaName(Code string) string {
-	countryName := []string{"United States", "Afghanistan", "Åland Islands", "Albania", "Algeria", "American Samoa", "Andorra", "Angola", "Anguilla", "Antarctica", "Antigua and Barbuda", "Argentina", "Armenia", "Aruba", "Australia", "Austria", "Azerbaijan", "Bahamas", "Bahrain", " Bangladesh", "Barbados", "Belarus", "Belgium", "Belize", "Benin", "Bermuda", "Bhutan", "Bolivia", "Bosnia and Herzegovina", "Botswana", "Bouvet Island", "Brazil", "British Indian Ocean Territory", "Brunei", "Bulgaria", "Burkina Faso", "Burundi", "Cambodia", "Cameroon", "Canada ", "Cape Verde", "Cayman Islands", "Central Africa", "Chad", "Chile", "China", "Christmas Island", "Cocos (Keeling) Islands", "Colombia", "Comoros", "Congo (Brazzaville)", "DRC", "Cook Islands", "Costa Rica", "Cote d'Ivoire", "Croatia", "Cuba", "Cyprus", "Czech Republic", " Denmark", "Djibouti", "Dominica", "Dominica", "Ecuador", "Egypt", "El Salvador", "Equatorial Guinea", "Eritrea", "Estonia", "Ethiopia", "Falkland Islands (Malvinas)", "Faroe Islands", "Fiji", "Finland", "France", "French Guiana", "French Polynesia", " French Southern Territories", "Gabon", "Gambia", "Georgia", "Germany", "Ghana", "Gibraltar", "Greece", "Greenland", "Grenada", "Guadeloupe", "Guam", "Guatemala", "Guernsey", "Guinea", "Guinea-Bissau", "Guyana", "Haiti", "Heard and McDonald Islands", "Vatican", "Honduras", "Hong Kong", "Hungary", "Iceland", "India", "Indonesia", "Iran", "Iraq", "Ireland", "British Isles of Man", "Israel", "Italy", "Jamaica", "Japan", "Jersey", "Jordan", "Kazakhstan", "Kenya", "Kiribati", "North Korea", "South Korea", " Kuwait", "Kyrgyzstan", "Laos", "Latvia", "Lebanon", "Lesotho", "Liberia", "Libya", "Liechtenstein", "Lithuania", "Luxembourg", "Macao", "FYROM", "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", " Marshall Islands", "Martinique", "Mauritania", "Mauritius", "Mayotte", "Mexico", "Micronesia (Federated States of)", "Moldova", "Monaco", "Mongolia", "Montenegro", "Montserrat", "Morocco", "Mozambique", "Myanmar", "Namibia", "Nauru", "Nepal", "Netherlands", "Netherlands Antilles", "New Caledonia", "New Zealand", "Nicaragua", "Niger", "Nigeria", "Niue", "Norfolk Island", "Northern Mariana", "Norway", "Oman", "Pakistan", "Palau", "Palestine", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines", "Pitcairn", "Poland", "Portugal", "Puerto Rico", "Qatar", "Reunion", "Romania", "Russian Federation", "Rwanda", "St. Helena", "St. Kitts and Nevis", "St. Lucia", "St. Pierre and Miquelon", "St. Vincent and the Grenadines", "Samoa", "San Marino", "Sao Tome and Principe", "Saudi Arabia", "Senegal", "Serbia", "Seychelles", "Sierra Leone", "Singapore", "Slovakia", "Slovenia", "Solomon Islands", "Somalia", "South Africa", "South Georgia and South Sandwich Islands", "Spain", "Sri Lanka", "Sudan", "Suriname", "Svalbard and Jan Mayen Islands", "Swaziland", "Sweden ", "Switzerland", "Syria", "Taiwan", "Tajikistan", "Tanzania", "Thailand", "Timor-Leste", "Togo", "Tokelau", "Tonga", "Trinidad and Tobago", "Tunisia", "Turkey", "Turkmenistan", "Turks and Caicos Islands", "Tuvalu", "Uganda", "Ukraine", "United Arab Emirates", " United Kingdom", "U.S. Minor Outlying Islands", "Uruguay", "Uzbekistan", "Vanuatu", "Venezuela", "Vietnam", "British Virgin Islands", "U.S. Virgin Islands", "Wallis and Futuna", "Western Sahara", "Yemen", "Zambia", "Zimbabwe"}
-	countryCode := []string{"us", "af", "ax", "al", "dz", "as", "ad", "ao", "ai", "aq", "ag", "ar", "am", "aw", "au", "at", "az", "bs", "bh", "bd", "bb", "by", "be", "bz", "bj", "bm", "bt", "bo", "ba", "bw", "bv", "br", "io", "bn", "bg", "bf", "bi", "kh", "cm", "ca", "cv", "ky", "cf", "td", "cl", "cn", "cx", "cc", "co", "km", "cg", "cd", "ck", "cr", "ci", "hr", "cu", "cy", "cz", "dk", "dj", "dm", "do", "ec", "eg", "sv", "gq", "er", "ee", "et", "fk", "fo", "fj", "fi", "fr", "gf", "pf", "tf", "ga", "gm", "ge", "de", "gh", "gi", "gr", "gl", "gd", "gp", "gu", "gt", "gg", "gn", "gw", "gy", "ht", "hm", "va", "hn", "hk", "hu", "is", "in", "id", "ir", "iq", "ie", "im", "il", "it", "jm", "jp", "je", "jo", "kz", "ke", "ki", "kp", "kr", "kw", "kg", "la", "lv", "lb", "ls", "lr", "ly", "li", "lt", "lu", "mo", "mk", "mg", "mw", "my", "mv", "ml", "mt", "mh", "mq", "mr", "mu", "yt", "mx", "fm", "md", "mc", "mn", "me", "ms", "ma", "mz", "mm", "na", "nr", "np", "nl", "an", "nc", "nz", "ni", "ne", "ng", "nu", "nf", "mp", "no", "om", "pk", "pw", "ps", "pa", "pg", "py", "pe", "ph", "pn", "pl", "pt", "pr", "qa", "re", "ro", "ru", "rw", "sh", "kn", "lc", "pm", "vc", "ws", "sm", "st", "sa", "sn", "rs", "sc", "sl", "sg", "sk", "si", "sb", "so", "za", "gs", "es", "lk", "sd", "sr", "sj", "sz", "se", "ch", "sy", "tw", "tj", "tz", "th", "tl", "tg", "tk", "to", "tt", "tn", "tr", "tm", "tc", "tv", "ug", "ua", "ae", "gb", "um", "uy", "uz", "vu", "ve", "vn", "vg", "vi", "wf", "eh", "ye", "zm", "zw"}
-	Code = strings.ToLower(Code)
-	for i, v := range countryCode {
-		if strings.Contains(Code, v) {
-			return countryName[i]
-		}
-	}
-	return Code
-}
-
-func DN42(ip string) (*IPGeoData, error) {
-	data := &IPGeoData{}
-	// 先解析传入过来的数据
-	ipTmp := strings.Split(ip, ",")
-	if len(ipTmp) > 1 {
-		ip = ipTmp[0]
-	}
-	// 先查找 GeoFeed
-	if geo, find := dn42.GetGeoFeed(ip); find {
-		data.Country = geo.LtdCode
-		data.City = geo.City
-		data.Asnumber = geo.ASN
-		data.Whois = geo.IPWhois
-	}
-	// 如果没找到，查找 PTR
-	if len(ipTmp) > 1 {
-		// 存在 PTR 记录
-		if res, err := dn42.FindPtrRecord(ipTmp[1]); err == nil && res.LtdCode != "" {
-			data.Country = res.LtdCode
-			data.Prov = res.Region
-			data.City = res.City
-		}
-	}
-
-	data.Country = LtdCodeToCountryOrAreaName(data.Country)
-
-	switch data.Country {
-	case "Hong Kong":
-		data.Country = "China"
-		data.Prov = "Hong Kong"
-	case "Taiwan":
-		data.Country = "China"
-		data.Prov = "Taiwan"
-	case "Macao":
-		data.Country = "China"
-		data.Prov = "Macao"
-	case "":
-		data.Country = "Unknown"
-	}
-
-	return data, nil
-}

ipgeo/dn42_test.go

@@ -1,5 +0,0 @@
-package ipgeo
-
-// func TestDN42(t *testing.T) {
-// 	DN42("")
-// }

ipgeo/ip2region.go

@@ -1,77 +0,0 @@
-package ipgeo
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-
-	"github.com/lionsoul2014/ip2region/v1.0/binding/golang/ip2region"
-)
-
-const (
-	ipDataBasePath = "./ip2region.db"
-	defaultDownURL = "1"
-	originURL      = "https://ghproxy.com/?q=https://github.com/bqf9979/ip2region/blob/master/data/ip2region.db?raw=true"
-)
-
-func downloadDataBase() error {
-	fmt.Println("Downloading DataBase...")
-	resp, err := http.Get(originURL)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-
-	// Create the file
-	out, err := os.Create(ipDataBasePath)
-	if err != nil {
-		return err
-	}
-	defer out.Close()
-
-	// Write the body to file
-	_, err = io.Copy(out, resp.Body)
-	return err
-}
-
-func IP2Region(ip string) (*IPGeoData, error) {
-	if _, err := os.Stat(ipDataBasePath); os.IsNotExist(err) {
-		if err = downloadDataBase(); err != nil {
-			panic("Download Failed!")
-		}
-	}
-	region, err := ip2region.New(ipDataBasePath)
-	if err != nil {
-		panic("Cannot find ip2region.db")
-	}
-	defer region.Close()
-	info, searchErr := region.MemorySearch(ip)
-	if searchErr != nil {
-		return &IPGeoData{}, errors.New("no results")
-	}
-
-	if info.Country == "0" {
-		info.Country = ""
-	}
-
-	if info.Province == "0" {
-		info.Province = ""
-	}
-
-	if info.City == "0" {
-		info.City = ""
-	}
-
-	if info.ISP == "0" {
-		info.ISP = ""
-	}
-
-	return &IPGeoData{
-		Owner:   info.ISP,
-		Country: info.Country,
-		Prov:    info.Province,
-		City:    info.City,
-	}, nil
-}

ipgeo/ipapicom.go

@@ -1,43 +0,0 @@
-package ipgeo
-
-import (
-	"errors"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"regexp"
-	"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"
-	client := &http.Client{
-		// 2 秒超时
-		Timeout: 2 * time.Second,
-	}
-	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")
-	content, err := client.Do(req)
-	if err != nil {
-		log.Println("ip-api.com 请求超时(2s)，请切换其他API使用")
-		return nil, err
-	}
-	body, _ := ioutil.ReadAll(content.Body)
-	res := gjson.ParseBytes(body)
-
-	if res.Get("status").String() != "success" {
-		return &IPGeoData{}, errors.New("超过API阈值")
-	}
-
-	re := regexp.MustCompile("[0-9]+")
-
-	return &IPGeoData{
-		Asnumber: re.FindString(res.Get("as").String()),
-		Country:  res.Get("country").String(),
-		City:     res.Get("city").String(),
-		Prov:     res.Get("regionName").String(),
-		Owner:    res.Get("isp").String(),
-	}, nil
-}

ipgeo/ipfilter.go

@@ -1,86 +0,0 @@
-package ipgeo
-
-import (
-	"net"
-)
-
-func cidrRangeContains(cidrRange string, checkIP string) bool {
-	_, ipNet, err := net.ParseCIDR(cidrRange)
-	if err != nil {
-		return false
-	}
-	secondIP := net.ParseIP(checkIP)
-	return ipNet.Contains(secondIP)
-}
-
-// 被选到的返回 geodata, true  否则返回 nil, false
-func Filter(ip string) (*IPGeoData, bool) {
-	//geodata := &IPGeoData{}
-	asn := ""
-	whois := ""
-	isFiltered := false
-	switch {
-	//rfc1918
-	case net.ParseIP(ip).IsPrivate():
-		asn = ""
-		whois = "RFC1918"
-		isFiltered = true
-	//IANA Reserved Address Space
-	case cidrRangeContains("100.64.0.0/10", ip):
-		asn = ""
-		whois = "RFC6598"
-		isFiltered = true
-	case cidrRangeContains("198.18.0.0/15", ip):
-		asn = ""
-		whois = "RFC2544"
-		isFiltered = true
-	case cidrRangeContains("198.51.100.0/24", ip):
-		fallthrough
-	case cidrRangeContains("203.0.113.0/24", ip):
-		asn = ""
-		whois = "RFC5737"
-		isFiltered = true
-	case cidrRangeContains("240.0.0.0/4", ip):
-		asn = ""
-		whois = "RFC1112"
-		isFiltered = true
-	//Defense Information System Network
-	case cidrRangeContains("6.0.0.0/8", ip):
-		fallthrough
-	case cidrRangeContains("7.0.0.0/8", ip):
-		fallthrough
-	case cidrRangeContains("11.0.0.0/8", ip):
-		fallthrough
-	case cidrRangeContains("21.0.0.0/8", ip):
-		fallthrough
-	case cidrRangeContains("22.0.0.0/8", ip):
-		fallthrough
-	case cidrRangeContains("26.0.0.0/8", ip):
-		fallthrough
-	case cidrRangeContains("28.0.0.0/8", ip):
-		fallthrough
-	case cidrRangeContains("29.0.0.0/8", ip):
-		fallthrough
-	case cidrRangeContains("30.0.0.0/8", ip):
-		fallthrough
-	case cidrRangeContains("33.0.0.0/8", ip):
-		fallthrough
-	case cidrRangeContains("55.0.0.0/8", ip):
-		fallthrough
-	case cidrRangeContains("214.0.0.0/8", ip):
-		fallthrough
-	case cidrRangeContains("215.0.0.0/8", ip):
-		asn = ""
-		whois = "DOD"
-		isFiltered = true
-	default:
-	}
-	if !isFiltered {
-		return nil, false
-	} else {
-		return &IPGeoData{
-			Asnumber: asn,
-			Whois:    whois,
-		}, true
-	}
-}

ipgeo/ipgeo.go

@@ -1,49 +0,0 @@
-package ipgeo
-
-import (
-	"strings"
-)
-
-type IPGeoData struct {
-	IP        string              `json:"ip"`
-	Asnumber  string              `json:"asnumber"`
-	Country   string              `json:"country"`
-	CountryEn string              `json:"country_en"`
-	Prov      string              `json:"prov"`
-	ProvEn    string              `json:"prov_en"`
-	City      string              `json:"city"`
-	CityEn    string              `json:"city_en"`
-	District  string              `json:"district"`
-	Owner     string              `json:"owner"`
-	Isp       string              `json:"isp"`
-	Domain    string              `json:"domain"`
-	Whois     string              `json:"whois"`
-	Lat       float64             `json:"lat"`
-	Lng       float64             `json:"lng"`
-	Prefix    string              `json:"prefix"`
-	Router    map[string][]string `json:"router"`
-	Source    string              `json:"source"`
-}
-
-type Source = func(ip string) (*IPGeoData, error)
-
-func GetSource(s string) Source {
-	switch strings.ToUpper(s) {
-	case "DN42":
-		return DN42
-	case "LEOMOEAPI":
-		return LeoIP
-	case "IP.SB":
-		return IPSB
-	case "IPINSIGHT":
-		return IPInSight
-	case "IPAPI.COM":
-		return IPApiCom
-	case "IPINFO":
-		return IPInfo
-	case "IP2REGION":
-		return IP2Region
-	default:
-		return LeoIP
-	}
-}

ipgeo/ipgeo_test.go

@@ -1,113 +0,0 @@
-package ipgeo
-
-import (
-	"errors"
-	"fmt"
-	"log"
-	"os"
-	"strconv"
-	"testing"
-)
-
-// import (
-// 	"testing"
-
-// 	"github.com/stretchr/testify/assert"
-// )
-
-func TestXxx(t *testing.T) {
-	const ID_FIXED_HEADER = "10"
-	var processID = fmt.Sprintf("%07b", os.Getpid()&0x7f) //取进程ID的前7位
-	var ttl = fmt.Sprintf("%06b", 95)                     //取TTL的后6位
-	fmt.Println(os.Getpid()&0x7f, 95)
-
-	var parity int
-	id := ID_FIXED_HEADER + processID + ttl
-	for _, c := range id {
-		if c == '1' {
-			parity++
-		}
-	}
-	if parity%2 == 0 {
-		id += "1"
-	} else {
-		id += "0"
-	}
-	process_id, ttl_r, _ := reverseID(id)
-	log.Println(process_id, ttl_r)
-}
-
-func reverseID(id string) (int64, int64, error) {
-	ttl, _ := strconv.ParseInt(id[9:15], 2, 32)
-	//process ID
-	processID, _ := strconv.ParseInt(id[2:9], 2, 32)
-
-	parity := 0
-	for i := 0; i < len(id)-1; i++ {
-		if id[i] == '1' {
-			parity++
-		}
-	}
-
-	if parity%2 == 1 {
-		if id[len(id)-1] == '0' {
-			fmt.Println("Parity check passed.")
-		} else {
-			fmt.Println("Parity check failed.")
-			return 0, 0, errors.New("err")
-		}
-	} else {
-		if id[len(id)-1] == '1' {
-			fmt.Println("Parity check passed.")
-		} else {
-			fmt.Println("Parity check failed.")
-			return 0, 0, errors.New("err")
-		}
-	}
-	return processID, ttl, nil
-}
-
-// func TestLeoIP(t *testing.T) {
-// 	// res, err := LeoIP("1.1.1.1")
-// 	// assert.Nil(t, err)
-// 	// assert.NotNil(t, res)
-// 	// assert.NotEmpty(t, res.Asnumber)
-// 	// assert.NotEmpty(t, res.Isp)
-// }
-
-// func TestIPSB(t *testing.T) {
-// 	// Not available
-// 	//res, err := IPSB("1.1.1.1")
-// 	//assert.Nil(t, err)
-// 	//assert.NotNil(t, res)
-// 	//assert.NotEmpty(t, res.Asnumber)
-// 	//assert.NotEmpty(t, res.Isp)
-// }
-
-// func TestIPInfo(t *testing.T) {
-// 	res, err := IPInfo("1.1.1.1")
-// 	assert.Nil(t, err)
-// 	assert.NotNil(t, res)
-// 	// assert.NotEmpty(t, res.Country)
-// 	assert.NotEmpty(t, res.City)
-// 	assert.NotEmpty(t, res.Prov)
-// }
-
-// func TestIPInSight(t *testing.T) {
-// 	// res, err := IPInSight("1.1.1.1")
-// 	// assert.Nil(t, err)
-// 	// assert.NotNil(t, res)
-// 	// assert.NotEmpty(t, res.Country)
-// 	// assert.NotEmpty(t, res.Prov)
-// 	// 这个库有时候不提供城市信息，返回值为""
-// 	//assert.NotEmpty(t, res.City)
-// }
-
-// func TestIPApiCom(t *testing.T) {
-// 	res, err := IPApiCom("1.1.1.1")
-// 	assert.Nil(t, err)
-// 	assert.NotNil(t, res)
-// 	assert.NotEmpty(t, res.Country)
-// 	assert.NotEmpty(t, res.City)
-// 	assert.NotEmpty(t, res.Prov)
-// }

ipgeo/ipinfo.go

@@ -1,36 +0,0 @@
-package ipgeo
-
-import (
-	"io/ioutil"
-	"net/http"
-
-	"github.com/tidwall/gjson"
-)
-
-func IPInfo(ip string) (*IPGeoData, error) {
-	resp, err := http.Get("https://ipinfo.io/" + ip + "?token=" + token.ipinfo)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	res := gjson.ParseBytes(body)
-
-	var country string
-
-	if res.Get("country").String() == "HK" || res.Get("country").String() == "TW" {
-		country = "CN"
-	}
-
-	return &IPGeoData{
-		Asnumber: res.Get("asn").Get("asn").String(),
-		Country:  country,
-		City:     res.Get("city").String(),
-		Prov:     res.Get("region").String(),
-		Owner:    res.Get("asn").Get("domain").String(),
-	}, nil
-}

ipgeo/ipinsight.go

@@ -1,27 +0,0 @@
-package ipgeo
-
-import (
-	"io/ioutil"
-	"net/http"
-
-	"github.com/tidwall/gjson"
-)
-
-func IPInSight(ip string) (*IPGeoData, error) {
-	resp, err := http.Get("https://ipinsight.io/query?ip=" + ip)
-	if err != nil {
-		return nil, err
-	}
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	res := gjson.ParseBytes(body)
-
-	return &IPGeoData{
-		Country: res.Get("country_name").String(),
-		City:    res.Get("city_name").String(),
-		Prov:    res.Get("region_name").String(),
-	}, nil
-}

ipgeo/ipsb.go

@@ -1,42 +0,0 @@
-package ipgeo
-
-import (
-	"io/ioutil"
-	"log"
-	"net/http"
-	"os"
-	"time"
-
-	"github.com/tidwall/gjson"
-)
-
-func IPSB(ip string) (*IPGeoData, error) {
-	url := "https://api.ip.sb/geoip/" + ip
-	client := &http.Client{
-		// 2 秒超时
-		Timeout: 2 * time.Second,
-	}
-	req, _ := http.NewRequest("GET", url, nil)
-	// 设置 UA，ip.sb 默认禁止 go-client User-Agent 的 api 请求
-	req.Header.Set("User-Agent", "Mozilla/5.0 (X11; Linux x86_64; rv:100.0) Gecko/20100101 Firefox/100.0")
-	content, err := client.Do(req)
-	if err != nil {
-		log.Println("api.ip.sb 请求超时(2s)，请切换其他API使用")
-		return nil, err
-	}
-	body, _ := ioutil.ReadAll(content.Body)
-	res := gjson.ParseBytes(body)
-
-	if res.Get("country").String() == "" {
-		// 什么都拿不到，证明被Cloudflare风控了
-		os.Exit(1)
-	}
-
-	return &IPGeoData{
-		Asnumber: res.Get("asn").String(),
-		Country:  res.Get("country").String(),
-		City:     res.Get("city").String(),
-		Prov:     res.Get("region").String(),
-		Owner:    res.Get("isp").String(),
-	}, nil
-}

ipgeo/leo.go

@@ -1,108 +0,0 @@
-package ipgeo
-
-import (
-	"encoding/json"
-	"errors"
-	"strconv"
-	"sync"
-	"time"
-
-	"github.com/tidwall/gjson"
-	"github.com/xgadget-lab/nexttrace/wshandle"
-)
-
-/***
- * 原理介绍 By Leo
- * WebSocket 一共开启了一个发送和一个接收协程，在 New 了一个连接的实例对象后，不给予关闭，持续化连接
- * 当有新的IP请求时，一直在等待IP数据的发送协程接收到从 leo.go 的 sendIPRequest 函数发来的IP数据，向服务端发送数据
- * 由于实际使用时有大量并发，但是 ws 在同一时刻每次有且只能处理一次发送一条数据，所以必须给 ws 连接上互斥锁，保证每次只有一个协程访问
- * 运作模型可以理解为一个 Node 一直在等待数据，当获得一个新的任务后，转交给下一个协程，不再关注这个 Node 的下一步处理过程，并且回到空闲状态继续等待新的任务
-***/
-
-// IP 查询池 map - ip - ip channel
-type IPPool struct {
-	pool    map[string]chan IPGeoData
-	poolMux sync.Mutex
-}
-
-var IPPools = IPPool{
-	pool: make(map[string]chan IPGeoData),
-}
-
-func sendIPRequest(ip string) {
-	wsConn := wshandle.GetWsConn()
-	wsConn.MsgSendCh <- ip
-}
-
-func receiveParse() {
-	// 获得连接实例
-	wsConn := wshandle.GetWsConn()
-	// 防止多协程抢夺一个ws连接，导致死锁，当一个协程获得ws的控制权后上锁
-	wsConn.ConnMux.Lock()
-	// 函数退出时解锁，给其他协程使用
-	defer wsConn.ConnMux.Unlock()
-	for {
-		// 接收到了一条IP信息
-		data := <-wsConn.MsgReceiveCh
-
-		// json解析 -> data
-		res := gjson.Parse(data)
-		// 根据返回的IP信息，发送给对应等待回复的IP通道上
-		var domain string = res.Get("domain").String()
-
-		if res.Get("domain").String() == "" {
-			domain = res.Get("owner").String()
-		}
-
-		m := make(map[string][]string)
-		json.Unmarshal([]byte(res.Get("router").String()), &m)
-
-		lat, _ := strconv.ParseFloat(res.Get("lat").String(), 32)
-		lng, _ := strconv.ParseFloat(res.Get("lng").String(), 32)
-
-		IPPools.pool[gjson.Parse(data).Get("ip").String()] <- IPGeoData{
-			Asnumber:  res.Get("asnumber").String(),
-			Country:   res.Get("country").String(),
-			CountryEn: res.Get("country_en").String(),
-			Prov:      res.Get("prov").String(),
-			ProvEn:    res.Get("prov_en").String(),
-			City:      res.Get("city").String(),
-			CityEn:    res.Get("city_en").String(),
-			District:  res.Get("district").String(),
-			Owner:     domain,
-			Lat:       lat,
-			Lng:       lng,
-			Isp:       res.Get("isp").String(),
-			Whois:     res.Get("whois").String(),
-			Prefix:    res.Get("prefix").String(),
-			Router:    m,
-		}
-	}
-}
-
-func LeoIP(ip string) (*IPGeoData, error) {
-	// 初始化通道 - 向池子里添加IP的Channel，返回IP数据是通过字典中对应键为IP的Channel来获取的
-	IPPools.poolMux.Lock()
-	defer IPPools.poolMux.Unlock()
-	// 如果之前已经被别的协程初始化过了就不用初始化了
-	if IPPools.pool[ip] == nil {
-		IPPools.pool[ip] = make(chan IPGeoData)
-	}
-
-	// 发送请求
-	sendIPRequest(ip)
-	// 同步开启监听
-	go receiveParse()
-
-	// 拥塞，等待数据返回
-	select {
-	case res := <-IPPools.pool[ip]:
-		return &res, nil
-	// 5秒后依旧没有接收到返回的IP数据，不再等待，超时异常处理
-	case <-time.After(5 * time.Second):
-		// default:
-		// 这里不可以返回一个 nil，否则在访问对象内部的键值的时候会报空指针的 Fatal Error
-		return &IPGeoData{}, errors.New("TimeOut")
-	}
-
-}

ipgeo/tokens.go

@@ -1,13 +0,0 @@
-package ipgeo
-
-type tokenData struct {
-	ipinsight string
-	ipinfo    string
-	ipleo     string
-}
-
-var token = tokenData{
-	ipinsight: "",
-	ipinfo:    "",
-	ipleo:     "NextTraceDemo",
-}

main.go

@@ -1,9 +1,7 @@
 package main
 
-import (
-	"github.com/xgadget-lab/nexttrace/cmd"
-)
+import "github.com/sjlleo/nexttrace-core/cmd"
 
 func main() {
-	cmd.Excute()
+	cmd.Execute()
 }

nt_config.yaml

@@ -1,2 +0,0 @@
-geofeedpath: ./geofeed.csv
-ptrpath: ./ptr.csv

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 -s http://nexttrace-io-leomoe-api-a0.shop/latest.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

plgn/debug.go

@@ -0,0 +1,42 @@
+package plgn
+
+import (
+	"fmt"
+	"net"
+
+	"github.com/sjlleo/nexttrace-core/core"
+)
+
+type DebugPlugin struct {
+	DefaultPlugin
+	DebugLevel int
+}
+
+func NewDebugPlugin(params interface{}) core.Plugin {
+	debugLevel, ok := params.(int)
+	if !ok {
+		return nil
+	}
+	return &DebugPlugin{DebugLevel: debugLevel}
+}
+
+func (d *DebugPlugin) OnTTLChange(ttl int) error {
+	if d.DebugLevel <= 2 {
+		fmt.Println("Debug Level 2: TTL changed to", ttl)
+	}
+	return nil
+}
+
+func (d *DebugPlugin) OnNewIPFound(ip net.Addr) error {
+	if d.DebugLevel <= 2 {
+		fmt.Println("Debug Level 2: New IP Found: ", ip)
+	}
+	return nil
+}
+
+func (d *DebugPlugin) OnTTLCompleted(ttl int, hop []core.Hop) error {
+	if d.DebugLevel <= 2 {
+		fmt.Println("Debug Level 2: ttl=", ttl, "Hop:", hop)
+	}
+	return nil
+}

plgn/default.go

@@ -0,0 +1,26 @@
+package plgn
+
+import (
+	"net"
+
+	"github.com/sjlleo/nexttrace-core/core"
+)
+
+type DefaultPlugin struct {
+}
+
+func (d *DefaultPlugin) OnDNSResolve(domain string) (net.IP, error) {
+	return nil, nil
+}
+
+func (d *DefaultPlugin) OnNewIPFound(ip net.Addr) error {
+	return nil
+}
+
+func (d *DefaultPlugin) OnTTLChange(ttl int) error {
+	return nil
+}
+
+func (d *DefaultPlugin) OnTTLCompleted(ttl int, hop []core.Hop) error {
+	return nil
+}

plgn/plugin.go

@@ -0,0 +1,46 @@
+package plgn
+
+import (
+	"log"
+	"reflect"
+	"strings"
+
+	"github.com/sjlleo/nexttrace-core/core"
+)
+
+var pluginRegistry = make(map[string]func(interface{}) core.Plugin)
+
+func RegisterPlugin(name string, constructor func(interface{}) core.Plugin) {
+	pluginRegistry[name] = constructor
+}
+
+func CreatePlugins(enabledPlugins string, params interface{}) []core.Plugin {
+	var plugins []core.Plugin
+	for _, name := range strings.Split(enabledPlugins, ",") {
+		if constructor, exists := pluginRegistry[name]; exists {
+			plugins = append(plugins, constructor(params))
+		}
+	}
+	return plugins
+}
+
+func ExecuteHook(plugin core.Plugin, hookName string, args ...interface{}) {
+	v := reflect.ValueOf(plugin)
+	method := v.MethodByName(hookName)
+
+	if !method.IsValid() {
+		log.Printf("Method %s not found", hookName)
+		return
+	}
+
+	in := make([]reflect.Value, len(args))
+	for i, arg := range args {
+		in[i] = reflect.ValueOf(arg)
+	}
+
+	ret := method.Call(in)
+	if len(ret) > 0 && !ret[0].IsNil() {
+		err := ret[0].Interface().(error)
+		log.Printf("Error in %s: %v", hookName, err)
+	}
+}

printer/basic.go

@@ -1,72 +0,0 @@
-package printer
-
-import (
-	"fmt"
-	"net"
-
-	"github.com/fatih/color"
-)
-
-var version = "v0.0.0.alpha"
-var buildDate = ""
-var commitID = ""
-
-func Version() {
-	fmt.Fprintf(color.Output, "%s %s %s %s\n",
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "NextTrace"),
-		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", version),
-		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", buildDate),
-		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", commitID),
-	)
-}
-
-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",
-		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"),
-	)
-
-	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 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) {
-	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())
-	} else {
-		fmt.Printf("traceroute to %s (%s), 30 hops max, 32 byte packets\n", ip.String(), domain)
-	}
-}

printer/classic_printer.go

@@ -1,104 +0,0 @@
-package printer
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/xgadget-lab/nexttrace/trace"
-)
-
-type HopInfo int
-
-const (
-	General HopInfo = 0
-	IXP     HopInfo = 1
-	Peer    HopInfo = 2
-	PoP     HopInfo = 3
-	Aboard  HopInfo = 4
-)
-
-func findLatestAvailableHop(res *trace.Result, ttl int, probesIndex int) int {
-	for ttl > 0 {
-		// 查找上一个跃点是不是有效结果
-		ttl--
-		// 判断此TTL跃点是否有效并判断地理位置结构体是否已经初始化
-		if len(res.Hops[ttl]) != 0 && res.Hops[ttl][probesIndex].Success && res.Hops[ttl][probesIndex].Geo != nil {
-			// TTL虽有效，但地理位置API没有能够正确返回数据，依旧不能视为有效数据
-			if res.Hops[ttl][probesIndex].Geo.Country == "" {
-				// 跳过继续寻找上一个有效跃点
-				continue
-			}
-			return ttl
-		}
-	}
-	// 没找到
-	return -1
-}
-
-func unifyName(name string) string {
-	if name == "China" || name == "CN" {
-		return "中国"
-	} else if name == "Hong kong" || name == "香港" || name == "Central and Western" {
-		return "中国香港"
-	} else if name == "Taiwan" || name == "台湾" {
-		return "中国台湾"
-	} else {
-		return name
-	}
-}
-
-func chinaISPPeer(hostname string) bool {
-	var keyWords = []string{"china", "ct", "cu", "cm", "cnc", "4134", "4837", "4809", "9929"}
-	for _, k := range keyWords {
-		if strings.Contains(strings.ToLower(hostname), k) {
-			return true
-		}
-	}
-	return false
-}
-
-func chinaMainland(h trace.Hop) bool {
-	if unifyName(h.Geo.Country) == "中国" && unifyName(h.Geo.Prov) != "中国香港" && unifyName(h.Geo.Prov) != "中国台湾" {
-		return true
-	} else {
-		return false
-	}
-}
-
-func makeHopsType(res *trace.Result, ttl int) map[int]HopInfo {
-	// 创建一个字典，存放所有当前TTL的跃点类型集合
-	hopProbesMap := make(map[int]HopInfo)
-	for i := range res.Hops[ttl] {
-		// 判断是否res.Hops[ttl][i]是一个有效的跃点并且地理位置信息已经初始化
-		if res.Hops[ttl][i].Success && res.Hops[ttl][i].Geo != nil {
-			if availableTTL := findLatestAvailableHop(res, ttl, i); availableTTL != -1 {
-				switch {
-				case strings.Contains(res.Hops[ttl][i].Geo.District, "IXP") || strings.Contains(strings.ToLower(res.Hops[ttl][i].Hostname), "ix"):
-					hopProbesMap[i] = IXP
-				case strings.Contains(res.Hops[ttl][i].Geo.District, "Peer") || chinaISPPeer(res.Hops[ttl][i].Hostname):
-					hopProbesMap[i] = Peer
-				case strings.Contains(res.Hops[ttl][i].Geo.District, "PoP"):
-					hopProbesMap[i] = PoP
-				// 2个有效跃点必须都为有效数据，如果当前跳没有地理位置信息或者为局域网，不能视为有效节点
-				case res.Hops[availableTTL][i].Geo.Country != "LAN Address" && res.Hops[ttl][i].Geo.Country != "LAN Address" && res.Hops[ttl][i].Geo.Country != "" &&
-					// 一个跃点在中国大陆，另外一个跃点在其他地区，则可以推断出数据包跨境
-					chinaMainland(res.Hops[availableTTL][i]) != chinaMainland(res.Hops[ttl][i]):
-					// TODO: 将先后2跳跃点信息汇报给API，以完善相关数据
-					hopProbesMap[i] = Aboard
-				}
-			} else {
-				hopProbesMap[i] = General
-			}
-		}
-	}
-
-	return hopProbesMap
-}
-
-func ClassicPrinter(res *trace.Result, ttl int) {
-	fmt.Print(ttl + 1)
-	hopsTypeMap := makeHopsType(res, ttl)
-	for i := range res.Hops[ttl] {
-		HopPrinter(res.Hops[ttl][i], hopsTypeMap[i])
-	}
-}

printer/printer.go

@@ -1,110 +0,0 @@
-package printer
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/xgadget-lab/nexttrace/trace"
-
-	"github.com/xgadget-lab/nexttrace/ipgeo"
-)
-
-// var dataOrigin string
-
-// func TraceroutePrinter(res *trace.Result) {
-// 	for i, hop := range res.Hops {
-// 		fmt.Print(i + 1)
-// 		for _, h := range hop {
-// 			HopPrinter(h)
-// 		}
-// 	}
-// }
-
-const (
-	RED_PREFIX    = "\033[1;31m"
-	GREEN_PREFIX  = "\033[1;32m"
-	YELLOW_PREFIX = "\033[1;33m"
-	BLUE_PREFIX   = "\033[1;34m"
-	CYAN_PREFIX   = "\033[1;36m"
-	RESET_PREFIX  = "\033[0m"
-)
-
-func HopPrinter(h trace.Hop, info HopInfo) {
-	if h.Address == nil {
-		fmt.Println("\t*")
-	} else {
-		txt := "\t"
-
-		if h.Hostname == "" {
-			txt += fmt.Sprint(h.Address, " ", fmt.Sprintf("%.2f", h.RTT.Seconds()*1000), "ms")
-		} else {
-			txt += fmt.Sprint(h.Hostname, " (", h.Address, ") ", fmt.Sprintf("%.2f", h.RTT.Seconds()*1000), "ms")
-		}
-
-		if h.Geo != nil {
-			txt += " " + formatIpGeoData(h.Address.String(), h.Geo)
-		}
-		switch info {
-		case IXP:
-			fmt.Print(CYAN_PREFIX)
-		case PoP:
-			fmt.Print(CYAN_PREFIX)
-		case Peer:
-			fmt.Print(YELLOW_PREFIX)
-		case Aboard:
-			fmt.Print(GREEN_PREFIX)
-		}
-
-		fmt.Println(txt)
-
-		if info != General {
-			fmt.Print(RESET_PREFIX)
-		}
-	}
-}
-
-func formatIpGeoData(ip string, data *ipgeo.IPGeoData) string {
-	var res = make([]string, 0, 10)
-
-	if data.Asnumber == "" {
-		res = append(res, "*")
-	} else {
-		res = append(res, "AS"+data.Asnumber)
-	}
-
-	// TODO: 判断阿里云和腾讯云内网，数据不足，有待进一步完善
-	// TODO: 移动IDC判断到Hop.fetchIPData函数，减少API调用
-	//if strings.HasPrefix(ip, "9.") {
-	//	res = append(res, "LAN Address")
-	//} else if strings.HasPrefix(ip, "11.") {
-	//	res = append(res, "LAN Address")
-	//} else if data.Country == "" {
-	//	res = append(res, "LAN Address")
-	if false {
-	} else {
-		// 有些IP的归属信息为空，这个时候将ISP的信息填入
-		if data.Owner == "" {
-			data.Owner = data.Isp
-		}
-		if data.Prov == "" && data.City == "" {
-			// anyCast或是骨干网数据不应该有国家信息
-			data.Owner = data.Owner + ", " + data.Owner
-		} else {
-			// 非骨干网正常填入IP的国家信息数据
-			res = append(res, data.Country)
-		}
-
-		if data.Prov != "" {
-			res = append(res, data.Prov)
-		}
-		if data.City != "" {
-			res = append(res, data.City)
-		}
-
-		if data.Owner != "" {
-			res = append(res, data.Owner)
-		}
-	}
-
-	return strings.Join(res, ", ")
-}

printer/printer_test.go

@@ -1,94 +0,0 @@
-package printer
-
-// func TestPrintTraceRouteNav(t *testing.T) {
-// 	PrintTraceRouteNav(util.DomainLookUp("1.1.1.1", false), "1.1.1.1", "dataOrigin")
-// }
-
-// var testGeo = &ipgeo.IPGeoData{
-// 	Asnumber: "TestAsnumber",
-// 	Country:  "TestCountry",
-// 	Prov:     "TestProv",
-// 	City:     "TestCity",
-// 	District: "TestDistrict",
-// 	Owner:    "TestOwner",
-// 	Isp:      "TestIsp",
-// }
-
-// var testResult = &trace.Result{
-// 	Hops: [][]trace.Hop{
-// 		{
-// 			{
-// 				Success:  true,
-// 				Address:  &net.IPAddr{IP: net.ParseIP("192.168.3.1")},
-// 				Hostname: "test",
-// 				TTL:      0,
-// 				RTT:      10 * time.Millisecond,
-// 				Error:    nil,
-// 				Geo:      testGeo,
-// 			},
-// 			{
-// 				Success:  true,
-// 				Address:  &net.IPAddr{IP: net.ParseIP("192.168.3.1")},
-// 				Hostname: "test",
-// 				TTL:      0,
-// 				RTT:      10 * time.Millisecond,
-// 				Error:    nil,
-// 				Geo:      testGeo,
-// 			},
-// 		},
-// 		{
-// 			{
-// 				Success:  false,
-// 				Address:  nil,
-// 				Hostname: "",
-// 				TTL:      0,
-// 				RTT:      0,
-// 				Error:    errors.New("test error"),
-// 				Geo:      nil,
-// 			},
-// 			{
-// 				Success:  true,
-// 				Address:  &net.IPAddr{IP: net.ParseIP("192.168.3.1")},
-// 				Hostname: "test",
-// 				TTL:      0,
-// 				RTT:      10 * time.Millisecond,
-// 				Error:    nil,
-// 				Geo:      nil,
-// 			},
-// 		},
-// 		{
-// 			{
-// 				Success:  true,
-// 				Address:  &net.IPAddr{IP: net.ParseIP("192.168.3.1")},
-// 				Hostname: "test",
-// 				TTL:      0,
-// 				RTT:      0,
-// 				Error:    nil,
-// 				Geo:      &ipgeo.IPGeoData{},
-// 			},
-// 			{
-// 				Success:  true,
-// 				Address:  &net.IPAddr{IP: net.ParseIP("192.168.3.1")},
-// 				Hostname: "",
-// 				TTL:      0,
-// 				RTT:      10 * time.Millisecond,
-// 				Error:    nil,
-// 				Geo:      testGeo,
-// 			},
-// 		},
-// 	},
-// }
-
-// // func TestTraceroutePrinter(t *testing.T) {
-// // 	TraceroutePrinter(testResult)
-// // }
-
-// func TestTracerouteTablePrinter(t *testing.T) {
-// 	TracerouteTablePrinter(testResult)
-// }
-
-// func TestRealtimePrinter(t *testing.T) {
-// 	RealtimePrinter(testResult, 0)
-// 	// RealtimePrinter(testResult, 1)
-// 	// RealtimePrinter(testResult, 2)
-// }

printer/realtime_printer.go

@@ -1,184 +0,0 @@
-package printer
-
-import (
-	"fmt"
-	"net"
-	"strconv"
-	"strings"
-
-	"github.com/fatih/color"
-	"github.com/xgadget-lab/nexttrace/trace"
-)
-
-func RealtimePrinter(res *trace.Result, ttl int) {
-	fmt.Printf("%s  ", color.New(color.FgHiYellow, color.Bold).Sprintf("%-2d", ttl+1))
-
-	// 去重
-	var latestIP string
-	tmpMap := make(map[string][]string)
-	for i, v := range res.Hops[ttl] {
-		if v.Address == nil && latestIP != "" {
-			tmpMap[latestIP] = append(tmpMap[latestIP], fmt.Sprintf("%s ms", "*"))
-			continue
-		} else if v.Address == nil {
-			continue
-		}
-
-		if _, exist := tmpMap[v.Address.String()]; !exist {
-			tmpMap[v.Address.String()] = append(tmpMap[v.Address.String()], strconv.Itoa(i))
-			// 首次进入
-			if latestIP == "" {
-				for j := 0; j < i; j++ {
-					tmpMap[v.Address.String()] = append(tmpMap[v.Address.String()], fmt.Sprintf("%s ms", "*"))
-				}
-			}
-			latestIP = v.Address.String()
-		}
-
-		tmpMap[v.Address.String()] = append(tmpMap[v.Address.String()], fmt.Sprintf("%.2f ms", v.RTT.Seconds()*1000))
-	}
-
-	if latestIP == "" {
-		fmt.Fprintf(color.Output, "%s\n",
-			color.New(color.FgWhite, color.Bold).Sprintf("*"),
-		)
-		return
-	}
-
-	var blockDisplay = false
-	for ip, v := range tmpMap {
-		if blockDisplay {
-			fmt.Printf("%4s", "")
-		}
-		if net.ParseIP(ip).To4() == nil {
-			fmt.Fprintf(color.Output, "%s",
-				color.New(color.FgWhite, color.Bold).Sprintf("%-25s", ip),
-			)
-		} else {
-			fmt.Fprintf(color.Output, "%s",
-				color.New(color.FgWhite, color.Bold).Sprintf("%-15s", ip),
-			)
-		}
-
-		i, _ := strconv.Atoi(v[0])
-		if res.Hops[ttl][i].Geo.Asnumber != "" {
-			// CMIN2, CUII, CN2, CUG 改为壕金色高亮
-			switch {
-			case res.Hops[ttl][i].Geo.Asnumber == "58807":
-				fallthrough
-			case res.Hops[ttl][i].Geo.Asnumber == "10099":
-				fallthrough
-			case res.Hops[ttl][i].Geo.Asnumber == "4809":
-				fallthrough
-			case res.Hops[ttl][i].Geo.Asnumber == "9929":
-				fallthrough
-			case res.Hops[ttl][i].Geo.Asnumber == "23764":
-				fallthrough
-			case res.Hops[ttl][i].Geo.Whois == "CMIN2-NET":
-				fallthrough
-			case strings.HasPrefix(res.Hops[ttl][i].Address.String(), "59.43."):
-				fmt.Fprintf(color.Output, " %s", color.New(color.FgHiYellow, color.Bold).Sprintf("AS%-6s", res.Hops[ttl][i].Geo.Asnumber))
-			default:
-				fmt.Fprintf(color.Output, " %s", color.New(color.FgHiGreen, color.Bold).Sprintf("AS%-6s", res.Hops[ttl][i].Geo.Asnumber))
-			}
-
-		} else {
-			fmt.Printf(" %-8s", "*")
-		}
-
-		if net.ParseIP(ip).To4() != nil {
-			whoisFormat := strings.Split(res.Hops[ttl][i].Geo.Whois, "-")
-			if len(whoisFormat) > 1 {
-				whoisFormat[0] = strings.Join(whoisFormat[:2], "-")
-			}
-
-			if whoisFormat[0] != "" {
-				whoisFormat[0] = "[" + whoisFormat[0] + "]"
-			}
-
-			// CMIN2, CUII, CN2, CUG 改为壕金色高亮
-			switch {
-			case res.Hops[ttl][i].Geo.Asnumber == "58807":
-				fallthrough
-			case res.Hops[ttl][i].Geo.Asnumber == "10099":
-				fallthrough
-			case res.Hops[ttl][i].Geo.Asnumber == "4809":
-				fallthrough
-			case res.Hops[ttl][i].Geo.Asnumber == "9929":
-				fallthrough
-			case res.Hops[ttl][i].Geo.Asnumber == "23764":
-				fallthrough
-			case whoisFormat[0] == "[CNC-BACKBONE]":
-				fallthrough
-			case whoisFormat[0] == "[CUG-BACKBONE]":
-				fallthrough
-			case whoisFormat[0] == "[CMIN2-NET]":
-				fallthrough
-			case strings.HasPrefix(res.Hops[ttl][i].Address.String(), "59.43."):
-				fmt.Fprintf(color.Output, " %s", color.New(color.FgHiYellow, color.Bold).Sprintf("%-16s", whoisFormat[0]))
-			default:
-				fmt.Fprintf(color.Output, " %s", color.New(color.FgHiGreen, color.Bold).Sprintf("%-16s", whoisFormat[0]))
-			}
-		}
-
-		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
-				}
-			}
-		}
-
-		if net.ParseIP(ip).To4() != nil {
-
-			fmt.Fprintf(color.Output, " %s %s %s %s %s\n    %s   ",
-				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.Country),
-				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.Prov),
-				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.City),
-				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.District),
-				fmt.Sprintf("%-6s", res.Hops[ttl][i].Geo.Owner),
-				color.New(color.FgHiBlack, color.Bold).Sprintf("%-39s", res.Hops[ttl][i].Hostname),
-			)
-		} else {
-			fmt.Fprintf(color.Output, " %s %s %s %s %s\n    %s   ",
-				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.Country),
-				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.Prov),
-				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.City),
-				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.District),
-				fmt.Sprintf("%-6s", res.Hops[ttl][i].Geo.Owner),
-				color.New(color.FgHiBlack, color.Bold).Sprintf("%-32s", res.Hops[ttl][i].Hostname),
-			)
-		}
-
-		for j := 1; j < len(v); j++ {
-			if len(v) == 2 || j == 1 {
-				fmt.Fprintf(color.Output, "%s",
-					color.New(color.FgHiCyan, color.Bold).Sprintf("%s", v[j]),
-				)
-			} else {
-				fmt.Fprintf(color.Output, " / %s",
-					color.New(color.FgHiCyan, color.Bold).Sprintf("%s", v[j]),
-				)
-			}
-		}
-		fmt.Println()
-		blockDisplay = true
-	}
-}

printer/realtime_printer_router.go

@@ -1,152 +0,0 @@
-package printer
-
-import (
-	"fmt"
-	"net"
-	"strconv"
-	"strings"
-
-	"github.com/fatih/color"
-	"github.com/xgadget-lab/nexttrace/trace"
-)
-
-func RealtimePrinterWithRouter(res *trace.Result, ttl int) {
-	fmt.Printf("%s  ", color.New(color.FgHiYellow, color.Bold).Sprintf("%-2d", ttl+1))
-
-	// 去重
-	var latestIP string
-	tmpMap := make(map[string][]string)
-	for i, v := range res.Hops[ttl] {
-		if v.Address == nil && latestIP != "" {
-			tmpMap[latestIP] = append(tmpMap[latestIP], fmt.Sprintf("%s ms", "*"))
-			continue
-		} else if v.Address == nil {
-			continue
-		}
-
-		if _, exist := tmpMap[v.Address.String()]; !exist {
-			tmpMap[v.Address.String()] = append(tmpMap[v.Address.String()], strconv.Itoa(i))
-			// 首次进入
-			if latestIP == "" {
-				for j := 0; j < i; j++ {
-					tmpMap[v.Address.String()] = append(tmpMap[v.Address.String()], fmt.Sprintf("%s ms", "*"))
-				}
-			}
-			latestIP = v.Address.String()
-		}
-
-		tmpMap[v.Address.String()] = append(tmpMap[v.Address.String()], fmt.Sprintf("%.2f ms", v.RTT.Seconds()*1000))
-	}
-
-	if latestIP == "" {
-		fmt.Fprintf(color.Output, "%s\n",
-			color.New(color.FgWhite, color.Bold).Sprintf("*"),
-		)
-		return
-	}
-
-	var blockDisplay = false
-	for ip, v := range tmpMap {
-		if blockDisplay {
-			fmt.Printf("%4s", "")
-		}
-		if net.ParseIP(ip).To4() == nil {
-			fmt.Fprintf(color.Output, "%s",
-				color.New(color.FgWhite, color.Bold).Sprintf("%-25s", ip),
-			)
-		} else {
-			fmt.Fprintf(color.Output, "%s",
-				color.New(color.FgWhite, color.Bold).Sprintf("%-15s", ip),
-			)
-		}
-
-		i, _ := strconv.Atoi(v[0])
-
-		if res.Hops[ttl][i].Geo.Asnumber != "" {
-			fmt.Fprintf(color.Output, " %s", color.New(color.FgHiGreen, color.Bold).Sprintf("AS%-6s", res.Hops[ttl][i].Geo.Asnumber))
-		} else {
-			fmt.Printf(" %-8s", "*")
-		}
-
-		if net.ParseIP(ip).To4() != nil {
-			whoisFormat := strings.Split(res.Hops[ttl][i].Geo.Whois, "-")
-			if len(whoisFormat) > 1 {
-				whoisFormat[0] = strings.Join(whoisFormat[:2], "-")
-			}
-
-			if whoisFormat[0] != "" {
-				whoisFormat[0] = "[" + whoisFormat[0] + "]"
-			}
-			fmt.Fprintf(color.Output, " %s", color.New(color.FgHiGreen, color.Bold).Sprintf("%-16s", whoisFormat[0]))
-		}
-
-		if res.Hops[ttl][i].Geo.Country == "" {
-			res.Hops[ttl][i].Geo.Country = "LAN Address"
-		}
-
-		if net.ParseIP(ip).To4() != nil {
-
-			fmt.Fprintf(color.Output, " %s %s %s %s %s\n    %s   ",
-				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.Country),
-				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.Prov),
-				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.City),
-				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.District),
-				fmt.Sprintf("%-6s", res.Hops[ttl][i].Geo.Owner),
-				color.New(color.FgHiBlack, color.Bold).Sprintf("%-39s", res.Hops[ttl][i].Hostname),
-			)
-		} else {
-			fmt.Fprintf(color.Output, " %s %s %s %s %s\n    %s   ",
-				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.Country),
-				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.Prov),
-				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.City),
-				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.District),
-				fmt.Sprintf("%-6s", res.Hops[ttl][i].Geo.Owner),
-				color.New(color.FgHiBlack, color.Bold).Sprintf("%-32s", res.Hops[ttl][i].Hostname),
-			)
-		}
-
-		for j := 1; j < len(v); j++ {
-			if len(v) == 2 || j == 1 {
-				fmt.Fprintf(color.Output, "%s",
-					color.New(color.FgHiCyan, color.Bold).Sprintf("%s", v[j]),
-				)
-			} else {
-				fmt.Fprintf(color.Output, " / %s",
-					color.New(color.FgHiCyan, color.Bold).Sprintf("%s", v[j]),
-				)
-			}
-		}
-		i = 0
-		fmt.Println()
-		if res.Hops[ttl][i].Geo != nil && !blockDisplay {
-			fmt.Fprintf(color.Output, "%s   %s %s %s   %s\n",
-				color.New(color.FgWhite, color.Bold).Sprintf("-"),
-				color.New(color.FgHiYellow, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.Prefix),
-				color.New(color.FgWhite, color.Bold).Sprintf("路由表"),
-				color.New(color.FgHiCyan, color.Bold).Sprintf("Beta"),
-				color.New(color.FgWhite, color.Bold).Sprintf("-"),
-			)
-			GetRouter(&res.Hops[ttl][i].Geo.Router, "AS"+res.Hops[ttl][i].Geo.Asnumber)
-		}
-		blockDisplay = true
-	}
-}
-
-func GetRouter(r *map[string][]string, node string) {
-	routeMap := *r
-	for _, v := range routeMap[node] {
-		if len(routeMap[v]) != 0 {
-			fmt.Fprintf(color.Output, "    %s %s %s\n",
-				color.New(color.FgWhite, color.Bold).Sprintf("%s", routeMap[v][0]),
-				color.New(color.FgWhite, color.Bold).Sprintf("%s", v),
-				color.New(color.FgHiBlue, color.Bold).Sprintf("%s", node),
-			)
-		} else {
-			fmt.Fprintf(color.Output, "    %s %s\n",
-				color.New(color.FgWhite, color.Bold).Sprintf("%s", v),
-				color.New(color.FgHiBlue, color.Bold).Sprintf("%s", node),
-			)
-		}
-
-	}
-}

printer/tableprinter.go

@@ -1,130 +0,0 @@
-package printer
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/xgadget-lab/nexttrace/ipgeo"
-
-	"github.com/xgadget-lab/nexttrace/trace"
-
-	"github.com/fatih/color"
-	"github.com/rodaine/table"
-)
-
-type rowData struct {
-	Hop      string
-	IP       string
-	Latency  string
-	Asnumber string
-	Country  string
-	Prov     string
-	City     string
-	District string
-	Owner    string
-}
-
-func TracerouteTablePrinter(res *trace.Result) {
-	// 初始化表格
-	tbl := New()
-	for _, hop := range res.Hops {
-		for k, h := range hop {
-			data := tableDataGenerator(h)
-			if k > 0 {
-				data.Hop = ""
-			}
-			if data.Country == "" && data.Prov == "" && data.City == "" {
-				tbl.AddRow(data.Hop, data.IP, data.Latency, data.Asnumber, "", data.Owner)
-			} else {
-				if data.City != "" {
-					tbl.AddRow(data.Hop, data.IP, data.Latency, data.Asnumber, data.City+", "+data.Prov+", "+data.Country, data.Owner)
-				} else if data.Prov != "" {
-					tbl.AddRow(data.Hop, data.IP, data.Latency, data.Asnumber, data.Prov+", "+data.Country, data.Owner)
-				} else {
-					tbl.AddRow(data.Hop, data.IP, data.Latency, data.Asnumber, data.Country, data.Owner)
-				}
-
-			}
-		}
-	}
-	fmt.Print("\033[H\033[2J")
-	// 打印表格
-	tbl.Print()
-}
-
-func New() table.Table {
-	// 初始化表格
-	headerFmt := color.New(color.FgGreen, color.Underline).SprintfFunc()
-	columnFmt := color.New(color.FgYellow).SprintfFunc()
-
-	tbl := table.New("Hop", "IP", "Lantency", "ASN", "Location", "Owner")
-	tbl.WithHeaderFormatter(headerFmt).WithFirstColumnFormatter(columnFmt)
-	return tbl
-}
-
-func tableDataGenerator(h trace.Hop) *rowData {
-	if h.Address == nil {
-		return &rowData{
-			Hop: fmt.Sprint(h.TTL),
-			IP:  "*",
-		}
-	} else {
-		lantency := fmt.Sprintf("%.2fms", h.RTT.Seconds()*1000)
-		IP := h.Address.String()
-
-		if strings.HasPrefix(IP, "9.") {
-			return &rowData{
-				Hop:     fmt.Sprint(h.TTL),
-				IP:      IP,
-				Latency: lantency,
-				Country: "LAN Address",
-				Prov:    "",
-				Owner:   "",
-			}
-		} else if strings.HasPrefix(IP, "11.") {
-			return &rowData{
-				Hop:     fmt.Sprint(h.TTL),
-				IP:      IP,
-				Latency: lantency,
-				Country: "LAN Address",
-				Prov:    "",
-				Owner:   "",
-			}
-		}
-
-		if h.Hostname != "" {
-			IP = fmt.Sprint(h.Hostname, " (", IP, ") ")
-		}
-
-		if h.Geo == nil {
-			h.Geo = &ipgeo.IPGeoData{}
-		}
-
-		r := &rowData{
-			Hop:      fmt.Sprint(h.TTL),
-			IP:       IP,
-			Latency:  lantency,
-			Asnumber: h.Geo.Asnumber,
-			Country:  h.Geo.CountryEn,
-			Prov:     h.Geo.ProvEn,
-			City:     h.Geo.CityEn,
-			District: h.Geo.District,
-			Owner:    h.Geo.Owner,
-		}
-
-		if h.Geo == nil {
-			return r
-		}
-
-		if h.Geo.Owner == "" {
-			h.Geo.Owner = h.Geo.Isp
-		}
-		r.Asnumber = h.Geo.Asnumber
-		r.Country = h.Geo.CountryEn
-		r.Prov = h.Geo.ProvEn
-		r.City = h.Geo.CityEn
-		r.District = h.Geo.District
-		r.Owner = h.Geo.Owner
-		return r
-	}
-}

reporter/reporter.go

@@ -1,183 +0,0 @@
-package reporter
-
-import (
-	"fmt"
-	"net"
-	"strings"
-	"sync"
-
-	"github.com/xgadget-lab/nexttrace/ipgeo"
-	"github.com/xgadget-lab/nexttrace/trace"
-)
-
-type Reporter interface {
-	Print()
-}
-
-func New(rs *trace.Result, ip string) Reporter {
-	experimentTag()
-	r := reporter{
-		routeResult: rs,
-		targetIP:    ip,
-	}
-	return &r
-}
-
-type reporter struct {
-	targetTTL       uint16
-	targetIP        string
-	routeReport     map[uint16][]routeReportNode
-	routeReportLock sync.Mutex
-	routeResult     *trace.Result
-	wg              sync.WaitGroup
-}
-
-type routeReportNode struct {
-	asn string
-	isp string
-	geo []string
-	ix  bool
-}
-
-func experimentTag() {
-	fmt.Println("Route-Path 功能实验室")
-}
-
-func (r *reporter) generateRouteReportNode(ip string, ipGeoData ipgeo.IPGeoData, ttl uint16) {
-
-	var success bool = true
-
-	defer r.wg.Done()
-
-	rpn := routeReportNode{}
-	ptr, err := net.LookupAddr(ip)
-
-	if err == nil {
-		if strings.Contains(strings.ToLower(ptr[0]), "ix") {
-			rpn.ix = true
-		} else {
-			rpn.ix = false
-		}
-	}
-	// TODO: 这种写法不好，后面再重构一下
-	// 判断反向解析的域名中又或者是IP地理位置数据库中，是否出现了 IX
-	if strings.Contains(strings.ToLower(ipGeoData.Isp), "exchange") || strings.Contains(strings.ToLower(ipGeoData.Isp), "ix") || strings.Contains(strings.ToLower(ipGeoData.Owner), "exchange") || strings.Contains(strings.ToLower(ipGeoData.Owner), "ix") {
-		rpn.ix = true
-	}
-
-	// TODO: 正则判断POP并且提取带宽大小等信息
-
-	// CN2 需要特殊处理，因为他们很多没有ASN
-	// 但是目前这种写法是不规范的，属于凭空标记4809的IP
-	// TODO: 用更好的方式显示 CN2 骨干网的路由 Path
-	if strings.HasPrefix(ip, "59.43") {
-		rpn.asn = "4809"
-	} else {
-		rpn.asn = ipGeoData.Asnumber
-	}
-
-	// 无论最后一跳是否为存在地理位置信息（AnyCast），都应该给予显示
-	if (ipGeoData.Country == "" || ipGeoData.Country == "LAN Address" || ipGeoData.Country == "-") && ip != r.targetIP {
-		success = false
-	} else {
-		if ipGeoData.City == "" {
-			rpn.geo = []string{ipGeoData.Country, ipGeoData.Prov}
-		} else {
-			rpn.geo = []string{ipGeoData.Country, ipGeoData.City}
-		}
-	}
-	if ipGeoData.Asnumber == "" {
-		rpn.asn = "*"
-	}
-
-	if ipGeoData.Isp == "" {
-		rpn.isp = ipGeoData.Owner
-	} else {
-		rpn.isp = ipGeoData.Isp
-	}
-
-	// 有效记录
-	if success {
-		// 锁住资源，防止同时写panic
-		r.routeReportLock.Lock()
-		// 添加到MAP中
-		r.routeReport[ttl] = append(r.routeReport[ttl], rpn)
-		// 写入完成，解锁释放资源给其他协程
-		r.routeReportLock.Unlock()
-	}
-}
-
-func (r *reporter) InitialBaseData() Reporter {
-	reportNodes := map[uint16][]routeReportNode{}
-
-	r.routeReport = reportNodes
-	r.targetTTL = uint16(len(r.routeResult.Hops))
-
-	for i := uint16(0); i < r.targetTTL; i++ {
-		traceHop := r.routeResult.Hops[i][0]
-		if traceHop.Success {
-			currentIP := traceHop.Address.String()
-			r.wg.Add(1)
-			go r.generateRouteReportNode(currentIP, *traceHop.Geo, i)
-		}
-	}
-
-	// 等待所有的子协程运行完毕
-	r.wg.Wait()
-	return r
-}
-
-func (r *reporter) Print() {
-	var beforeActiveTTL uint16 = 0
-	r.InitialBaseData()
-	// 尝试首个有效 TTL
-	for i := uint16(0); i < r.targetTTL; i++ {
-		if len(r.routeReport[i]) != 0 {
-			beforeActiveTTL = i
-			// 找到以后便不再循环
-			break
-		}
-	}
-
-	for i := beforeActiveTTL; i < r.targetTTL; i++ {
-		// 计算该TTL内的数据长度，如果为0，则代表没有有效数据
-		if len(r.routeReport[i]) == 0 {
-			// 跳过改跃点的数据整理
-			continue
-		}
-		nodeReport := r.routeReport[i][0]
-
-		if i == beforeActiveTTL {
-			fmt.Printf("AS%s %s「%s『%s", nodeReport.asn, nodeReport.isp, nodeReport.geo[0], nodeReport.geo[1])
-		} else {
-			nodeReportBefore := r.routeReport[beforeActiveTTL][0]
-			// ASN 相同，同个 ISP 内部的数据传递
-			if nodeReportBefore.asn == nodeReport.asn {
-				// Same ASN but Coutry or City Changed
-				if nodeReportBefore.geo[0] != nodeReport.geo[0] {
-					fmt.Printf("』→ %s『%s", nodeReport.geo[0], nodeReport.geo[1])
-				} else {
-					if nodeReportBefore.geo[1] != nodeReport.geo[1] {
-						fmt.Printf(" → %s", nodeReport.geo[1])
-					}
-				}
-			} else {
-				// ASN 不同，跨 ISP 的数据传递，这里可能会出现 POP、IP Transit、Peer、Exchange
-				fmt.Printf("』」")
-				if int(i) != len(r.routeReport)+1 {
-					// 部分 Shell 客户端可能无法很好的展示这个特殊字符
-					// TODO: 寻找其他替代字符
-					fmt.Printf("\n ╭╯\n ╰")
-				}
-				if nodeReport.ix {
-					fmt.Printf("AS%s \033[42;37mIXP\033[0m %s「%s『%s", nodeReport.asn, nodeReport.isp, nodeReport.geo[0], nodeReport.geo[1])
-				} else {
-					fmt.Printf("AS%s %s「%s『%s", nodeReport.asn, nodeReport.isp, nodeReport.geo[0], nodeReport.geo[1])
-				}
-			}
-		}
-		// 标记为最新的一个有效跃点
-		beforeActiveTTL = i
-	}
-	fmt.Println("』」")
-}

reporter/reporter_test.go

@@ -1,115 +0,0 @@
-package reporter
-
-import (
-	"net"
-	"testing"
-	"time"
-
-	"github.com/xgadget-lab/nexttrace/ipgeo"
-	"github.com/xgadget-lab/nexttrace/trace"
-)
-
-var testResult = &trace.Result{
-	Hops: [][]trace.Hop{
-		{
-			{
-				Success:  true,
-				Address:  &net.IPAddr{IP: net.ParseIP("192.168.3.1")},
-				Hostname: "test",
-				TTL:      0,
-				RTT:      10 * time.Millisecond,
-				Error:    nil,
-				Geo: &ipgeo.IPGeoData{
-					Asnumber: "4808",
-					Country:  "中国",
-					Prov:     "北京市",
-					City:     "北京市",
-					District: "北京市",
-					Owner:    "",
-					Isp:      "中国联通",
-				},
-			},
-		},
-		{
-			{
-				Success:  true,
-				Address:  &net.IPAddr{IP: net.ParseIP("114.249.16.1")},
-				Hostname: "test",
-				TTL:      0,
-				RTT:      10 * time.Millisecond,
-				Error:    nil,
-				Geo: &ipgeo.IPGeoData{
-					Asnumber: "4808",
-					Country:  "中国",
-					Prov:     "北京市",
-					City:     "北京市",
-					District: "北京市",
-					Owner:    "",
-					Isp:      "中国联通",
-				},
-			},
-		},
-		{
-			{
-				Success:  true,
-				Address:  &net.IPAddr{IP: net.ParseIP("219.158.5.150")},
-				Hostname: "test",
-				TTL:      0,
-				RTT:      10 * time.Millisecond,
-				Error:    nil,
-				Geo: &ipgeo.IPGeoData{
-					Asnumber: "4837",
-					Country:  "中国",
-					Prov:     "",
-					City:     "",
-					District: "",
-					Owner:    "",
-					Isp:      "中国联通",
-				},
-			},
-		},
-		{
-			{
-				Success:  true,
-				Address:  &net.IPAddr{IP: net.ParseIP("62.115.125.160")},
-				Hostname: "test",
-				TTL:      0,
-				RTT:      10 * time.Millisecond,
-				Error:    nil,
-				Geo: &ipgeo.IPGeoData{
-					Asnumber: "1299",
-					Country:  "Sweden",
-					Prov:     "Stockholm County",
-					City:     "Stockholm",
-					District: "",
-					Owner:    "",
-					Isp:      "Telia Company AB",
-				},
-			},
-		},
-		{
-			{
-				Success:  true,
-				Address:  &net.IPAddr{IP: net.ParseIP("213.226.68.73")},
-				Hostname: "test",
-				TTL:      0,
-				RTT:      10 * time.Millisecond,
-				Error:    nil,
-				Geo: &ipgeo.IPGeoData{
-					Asnumber: "56630",
-					Country:  "Germany",
-					Prov:     "Hesse, Frankfurt",
-					City:     "",
-					District: "",
-					Owner:    "",
-					Isp:      "Melbikomas UAB",
-				},
-			},
-		},
-	},
-}
-
-func TestPrint(t *testing.T) {
-	r := New(testResult, "213.226.68.73")
-	r.Print()
-}

trace/temp_printer.go

@@ -1,76 +0,0 @@
-package trace
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/xgadget-lab/nexttrace/ipgeo"
-)
-
-func HopPrinter(h Hop) {
-	if h.Address == nil {
-		fmt.Println("\t*")
-	} else {
-		txt := "\t"
-
-		if h.Hostname == "" {
-			txt += fmt.Sprint(h.Address, " ", fmt.Sprintf("%.2f", h.RTT.Seconds()*1000), "ms")
-		} else {
-			txt += fmt.Sprint(h.Hostname, " (", h.Address, ") ", fmt.Sprintf("%.2f", h.RTT.Seconds()*1000), "ms")
-		}
-
-		if h.Geo != nil {
-			txt += " " + formatIpGeoData(h.Address.String(), h.Geo)
-		}
-
-		fmt.Println(txt)
-	}
-}
-
-func formatIpGeoData(ip string, data *ipgeo.IPGeoData) string {
-	var res = make([]string, 0, 10)
-
-	if data.Asnumber == "" {
-		res = append(res, "*")
-	} else {
-		res = append(res, "AS"+data.Asnumber)
-	}
-
-	// TODO: 判断阿里云和腾讯云内网，数据不足，有待进一步完善
-	// TODO: 移动IDC判断到Hop.fetchIPData函数，减少API调用
-	if strings.HasPrefix(ip, "9.") {
-		res = append(res, "LAN Address", "")
-	} else if strings.HasPrefix(ip, "11.") {
-		res = append(res, "LAN Address", "")
-	} else if data.Country == "" {
-		res = append(res, "LAN Address")
-	} else {
-		// 有些IP的归属信息为空，这个时候将ISP的信息填入
-		if data.Owner == "" {
-			data.Owner = data.Isp
-		}
-		if data.District != "" {
-			data.City = data.City + ", " + data.District
-		}
-		if data.Prov == "" && data.City == "" {
-			// anyCast或是骨干网数据不应该有国家信息
-			data.Owner = data.Owner + ", " + data.Owner
-		} else {
-			// 非骨干网正常填入IP的国家信息数据
-			res = append(res, data.Country)
-		}
-
-		if data.Prov != "" {
-			res = append(res, data.Prov)
-		}
-		if data.City != "" {
-			res = append(res, data.City)
-		}
-
-		if data.Owner != "" {
-			res = append(res, data.Owner)
-		}
-	}
-
-	return strings.Join(res, ", ")
-}

trace/trace.go

@@ -1,207 +0,0 @@
-package trace
-
-import (
-	"errors"
-	"net"
-	"sync"
-	"time"
-
-	"github.com/xgadget-lab/nexttrace/ipgeo"
-)
-
-var (
-	ErrInvalidMethod      = errors.New("invalid method")
-	ErrTracerouteExecuted = errors.New("traceroute already executed")
-	ErrHopLimitTimeout    = errors.New("hop timeout")
-)
-
-type Config struct {
-	SrcAddr          string
-	BeginHop         int
-	MaxHops          int
-	NumMeasurements  int
-	ParallelRequests int
-	Timeout          time.Duration
-	DestIP           net.IP
-	DestPort         int
-	Quic             bool
-	IPGeoSource      ipgeo.Source
-	RDns             bool
-	AlwaysWaitRDNS   bool
-	PacketInterval   int
-	TTLInterval      int
-	Lang             string
-	DN42             bool
-	RealtimePrinter  func(res *Result, ttl int)
-	AsyncPrinter     func(res *Result)
-}
-
-type Method string
-
-const (
-	ICMPTrace Method = "icmp"
-	UDPTrace  Method = "udp"
-	TCPTrace  Method = "tcp"
-)
-
-type Tracer interface {
-	Execute() (*Result, error)
-}
-
-func Traceroute(method Method, config Config) (*Result, error) {
-	var tracer Tracer
-
-	if config.MaxHops == 0 {
-		config.MaxHops = 30
-	}
-	if config.NumMeasurements == 0 {
-		config.NumMeasurements = 3
-	}
-	if config.ParallelRequests == 0 {
-		config.ParallelRequests = config.NumMeasurements * 5
-	}
-
-	switch method {
-	case ICMPTrace:
-		if config.DestIP.To4() != nil {
-			tracer = &ICMPTracer{Config: config}
-		} else {
-			tracer = &ICMPTracerv6{Config: config}
-		}
-
-	case UDPTrace:
-		if config.DestIP.To4() != nil {
-			tracer = &UDPTracer{Config: config}
-		} else {
-			return nil, errors.New("IPv6 UDP Traceroute is not supported")
-		}
-	case TCPTrace:
-		if config.DestIP.To4() != nil {
-			tracer = &TCPTracer{Config: config}
-		} else {
-			tracer = &TCPTracerv6{Config: config}
-			// return nil, errors.New("IPv6 TCP Traceroute is not supported")
-		}
-	default:
-		return &Result{}, ErrInvalidMethod
-	}
-	return tracer.Execute()
-}
-
-type Result struct {
-	Hops [][]Hop
-	lock sync.Mutex
-}
-
-func (s *Result) add(hop Hop) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-	k := hop.TTL - 1
-	for len(s.Hops) < hop.TTL {
-		s.Hops = append(s.Hops, make([]Hop, 0))
-	}
-	s.Hops[k] = append(s.Hops[k], hop)
-
-}
-
-func (s *Result) reduce(final int) {
-	if final > 0 && final < len(s.Hops) {
-		s.Hops = s.Hops[:final]
-	}
-}
-
-type Hop struct {
-	Success  bool
-	Address  net.Addr
-	Hostname string
-	TTL      int
-	RTT      time.Duration
-	Error    error
-	Geo      *ipgeo.IPGeoData
-	Lang     string
-}
-
-func (h *Hop) fetchIPData(c Config) (err error) {
-	// DN42
-	if c.DN42 {
-		var ip string
-		// 首先查找 PTR 记录
-		r, err := net.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)
-		return nil
-	}
-
-	// Debug Area
-	// c.AlwaysWaitRDNS = true
-
-	// Initialize a rDNS Channel
-	rDNSChan := make(chan []string)
-	fetchDoneChan := make(chan bool)
-
-	if c.RDns && h.Hostname == "" {
-		// Create a rDNS Query go-routine
-		go func() {
-			r, err := net.LookupAddr(h.Address.String())
-			if err != nil {
-				// No PTR Record
-				rDNSChan <- nil
-			} else {
-				// One PTR Record is found
-				rDNSChan <- r
-			}
-		}()
-	}
-
-	// Create Data Fetcher go-routine
-	go func() {
-		// Start to fetch IP Geolocation data
-		if c.IPGeoSource != nil && h.Geo == nil {
-			res := false
-			h.Lang = c.Lang
-			h.Geo, res = ipgeo.Filter(h.Address.String())
-			if !res {
-				h.Geo, err = c.IPGeoSource(h.Address.String())
-			}
-		}
-		// Fetch Done
-		fetchDoneChan <- true
-	}()
-
-	// Select Close Flag
-	var selectClose bool
-	if !c.AlwaysWaitRDNS {
-		select {
-		case <-fetchDoneChan:
-			// When fetch done signal recieved, stop waiting PTR record
-		case ptr := <-rDNSChan:
-			// process result
-			if err == nil && len(ptr) > 0 {
-				h.Hostname = ptr[0][:len(ptr[0])-1]
-			}
-			selectClose = true
-		}
-	} else {
-		select {
-		case ptr := <-rDNSChan:
-			// process result
-			if err == nil && len(ptr) > 0 {
-				h.Hostname = ptr[0]
-			}
-		// 1 second timeout
-		case <-time.After(time.Second * 1):
-		}
-		selectClose = true
-	}
-
-	// When Select Close, fetchDoneChan Reciever will also be closed
-	if selectClose {
-		// New a reciever to prevent channel congestion
-		<-fetchDoneChan
-	}
-
-	return
-}

tracelog/log.go

@@ -1,111 +0,0 @@
-package tracelog
-
-import (
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"os"
-	"strconv"
-	"strings"
-
-	"github.com/xgadget-lab/nexttrace/trace"
-)
-
-func RealtimePrinter(res *trace.Result, ttl int) {
-	f, err := os.OpenFile("/tmp/trace.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, os.ModePerm)
-	if err != nil {
-		return
-	}
-	defer f.Close()
-
-	multiWriter := io.MultiWriter(os.Stdout, f)
-	log.SetOutput(multiWriter)
-	log.SetFlags(0)
-	var res_str string
-	res_str += fmt.Sprintf("%-2d  ", ttl+1)
-
-	// 去重
-	var latestIP string
-	tmpMap := make(map[string][]string)
-	for i, v := range res.Hops[ttl] {
-		if v.Address == nil && latestIP != "" {
-			tmpMap[latestIP] = append(tmpMap[latestIP], fmt.Sprintf("%s ms", "*"))
-			continue
-		} else if v.Address == nil {
-			continue
-		}
-
-		if _, exist := tmpMap[v.Address.String()]; !exist {
-			tmpMap[v.Address.String()] = append(tmpMap[v.Address.String()], strconv.Itoa(i))
-			// 首次进入
-			if latestIP == "" {
-				for j := 0; j < i; j++ {
-					tmpMap[v.Address.String()] = append(tmpMap[v.Address.String()], fmt.Sprintf("%s ms", "*"))
-				}
-			}
-			latestIP = v.Address.String()
-		}
-
-		tmpMap[v.Address.String()] = append(tmpMap[v.Address.String()], fmt.Sprintf("%.2f ms", v.RTT.Seconds()*1000))
-	}
-
-	if latestIP == "" {
-		res_str += fmt.Sprintf("%s\n", "*")
-		log.Print(res_str)
-		return
-	}
-
-	var blockDisplay = false
-	for ip, v := range tmpMap {
-		if blockDisplay {
-			res_str += fmt.Sprintf("%4s", "")
-		}
-		if net.ParseIP(ip).To4() == nil {
-			res_str += fmt.Sprintf("%-25s ", ip)
-		} else {
-			res_str += fmt.Sprintf("%-15s ", ip)
-		}
-
-		i, _ := strconv.Atoi(v[0])
-
-		if res.Hops[ttl][i].Geo.Asnumber != "" {
-			res_str += fmt.Sprintf("AS%-7s", res.Hops[ttl][i].Geo.Asnumber)
-		} else {
-			res_str += fmt.Sprintf(" %-8s", "*")
-		}
-
-		if net.ParseIP(ip).To4() != nil {
-			whoisFormat := strings.Split(res.Hops[ttl][i].Geo.Whois, "-")
-			if len(whoisFormat) > 1 {
-				whoisFormat[0] = strings.Join(whoisFormat[:2], "-")
-			}
-
-			if whoisFormat[0] != "" {
-				whoisFormat[0] = "[" + whoisFormat[0] + "]"
-			}
-			res_str += fmt.Sprintf("%-16s", whoisFormat[0])
-		}
-
-		if res.Hops[ttl][i].Geo.Country == "" {
-			res.Hops[ttl][i].Geo.Country = "LAN Address"
-		}
-
-		if net.ParseIP(ip).To4() != nil {
-
-			res_str += fmt.Sprintf(" %s %s %s %s %-6s\n    %-39s   ", 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].Hostname)
-		} else {
-			res_str += fmt.Sprintf(" %s %s %s %s %-6s\n    %-35s ", 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].Hostname)
-		}
-
-		for j := 1; j < len(v); j++ {
-			if len(v) == 2 || j == 1 {
-				res_str += v[j]
-			} else {
-				res_str += fmt.Sprintf("/ %s", v[j])
-			}
-		}
-		log.Print(res_str)
-		blockDisplay = true
-	}
-}

tracemap/tracemap.go

@@ -1,20 +0,0 @@
-package tracemap
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-
-	"github.com/fatih/color"
-)
-
-func GetMapUrl(r string) {
-	url := "https://api.leo.moe/tracemap/api"
-	resp, _ := http.Post(url, "application/json", strings.NewReader(string(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)),
-	)
-}

wshandle/client.go

@@ -1,223 +0,0 @@
-package wshandle
-
-import (
-	"crypto/tls"
-	"log"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"os/signal"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/gorilla/websocket"
-	"github.com/xgadget-lab/nexttrace/util"
-)
-
-type WsConn struct {
-	Connecting   bool
-	Connected    bool            // 连接状态
-	MsgSendCh    chan string     // 消息发送通道
-	MsgReceiveCh chan string     // 消息接收通道
-	Done         chan struct{}   // 发送结束通道
-	Exit         chan bool       // 程序退出信号
-	Interrupt    chan os.Signal  // 终端中止信号
-	Conn         *websocket.Conn // 主连接
-	ConnMux      sync.Mutex      // 连接互斥锁
-}
-
-var wsconn *WsConn
-var hostP = util.GetenvDefault("NEXTTRACE_HOSTPORT", "api.leo.moe")
-var host, port, fast_ip string
-
-func (c *WsConn) keepAlive() {
-	go func() {
-		// 开启一个定时器
-		for {
-			<-time.After(time.Second * 54)
-			if c.Connected {
-				err := c.Conn.WriteMessage(websocket.TextMessage, []byte("ping"))
-				if err != nil {
-					log.Println(err)
-					c.Connected = false
-					return
-				}
-			}
-		}
-	}()
-	for {
-		if !c.Connected && !c.Connecting {
-			c.Connecting = true
-			c.recreateWsConn()
-			// log.Println("WebSocket 连接意外断开，正在尝试重连...")
-			// return
-		}
-		// 降低检测频率，优化 CPU 占用情况
-		<-time.After(200 * time.Millisecond)
-	}
-}
-
-func (c *WsConn) messageReceiveHandler() {
-	// defer close(c.Done)
-	for {
-		if c.Connected {
-			_, msg, err := c.Conn.ReadMessage()
-			if err != nil {
-				// 读取信息出错，连接已经意外断开
-				// log.Println(err)
-				c.Connected = false
-				return
-			}
-			if string(msg) != "pong" {
-				c.MsgReceiveCh <- string(msg)
-			}
-		}
-	}
-}
-
-func (c *WsConn) messageSendHandler() {
-	for {
-		// 循环监听发送
-		select {
-		case <-c.Done:
-			log.Println("go-routine has been returned")
-			return
-		case t := <-c.MsgSendCh:
-			// log.Println(t)
-			if !c.Connected {
-				c.MsgReceiveCh <- `{"ip":"` + t + `", "asnumber":"API Server Error"}`
-			} else {
-				err := c.Conn.WriteMessage(websocket.TextMessage, []byte(t))
-				if err != nil {
-					log.Println("write:", err)
-					return
-				}
-			}
-		// 来自终端的中断运行请求
-		case <-c.Interrupt:
-			// 向 websocket 发起关闭连接任务
-			err := c.Conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
-			if err != nil {
-				// log.Println("write close:", err)
-				os.Exit(1)
-			}
-			select {
-			// 等到了结果，直接退出
-			case <-c.Done:
-			// 如果等待 1s 还是拿不到结果，不再等待，超时退出
-			case <-time.After(time.Second):
-			}
-			os.Exit(1)
-			// return
-		}
-	}
-}
-
-func (c *WsConn) recreateWsConn() {
-	u := url.URL{Scheme: "wss", Host: fast_ip + ":" + port, Path: "/v2/ipGeoWs"}
-	// log.Printf("connecting to %s", u.String())
-	requestHeader := http.Header{
-		"Host": []string{host},
-	}
-	dialer := websocket.DefaultDialer
-	dialer.TLSClientConfig = &tls.Config{
-		ServerName: host,
-	}
-	ws, _, err := websocket.DefaultDialer.Dial(u.String(), requestHeader)
-	c.Conn = ws
-	if err != nil {
-		log.Println("dial:", err)
-		// <-time.After(time.Second * 1)
-		c.Connected = false
-		c.Connecting = false
-		return
-	} else {
-		c.Connected = true
-	}
-	c.Connecting = false
-
-	c.Done = make(chan struct{})
-	go c.messageReceiveHandler()
-}
-
-func createWsConn() *WsConn {
-	// 设置终端中断通道
-	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 是一个 IP 使用默认域名
-	if valid := net.ParseIP(host); valid != nil {
-		host = "api.leo.moe"
-	}
-	// 判断是否是一个 IP
-	requestHeader := http.Header{
-		"Host": []string{host},
-	}
-	dialer := websocket.DefaultDialer
-	dialer.TLSClientConfig = &tls.Config{
-		ServerName: host,
-	}
-	u := url.URL{Scheme: "wss", Host: fast_ip + ":" + port, Path: "/v2/ipGeoWs"}
-	// log.Printf("connecting to %s", u.String())
-
-	c, _, err := websocket.DefaultDialer.Dial(u.String(), requestHeader)
-
-	wsconn = &WsConn{
-		Conn:         c,
-		Connected:    true,
-		Connecting:   false,
-		MsgSendCh:    make(chan string, 10),
-		MsgReceiveCh: make(chan string, 10),
-	}
-
-	if err != nil {
-		log.Println("dial:", err)
-		// <-time.After(time.Second * 1)
-		wsconn.Connected = false
-		wsconn.Done = make(chan struct{})
-		go wsconn.keepAlive()
-		go wsconn.messageSendHandler()
-		return wsconn
-	}
-	// defer c.Close()
-	// 将连接写入WsConn，方便随时可取
-	wsconn.Done = make(chan struct{})
-	go wsconn.keepAlive()
-	go wsconn.messageReceiveHandler()
-	go wsconn.messageSendHandler()
-	return wsconn
-}
-
-func New() *WsConn {
-	return createWsConn()
-}
-
-func GetWsConn() *WsConn {
-	return wsconn
-}

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
-	}
-}

wshandle/latency_test.go

@@ -1,9 +0,0 @@
-package wshandle
-
-import (
-	"testing"
-)
-
-func TestGetFastIP(t *testing.T) {
-	GetFastIP("api.leo.moe", "443")
-}