From 7ad3424d7f8cf4e43c54fedda622f2274b807c3e Mon Sep 17 00:00:00 2001 From: lilendian0x00 <116685464+lilendian0x00@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:15:55 -0800 Subject: [PATCH] Fixed version 2 module issue, Updated packages --- .gitignore | 2 +- cmd/net/http.go | 6 ++--- cmd/net/icmp.go | 6 ++--- cmd/net/tcp.go | 4 ++-- cmd/parse/parse.go | 4 ++-- cmd/proxy/proxy.go | 8 +++---- cmd/root.go | 12 +++++----- cmd/scan/cfscanner.go | 4 ++-- cmd/subs/fetch.go | 6 ++--- go.mod | 26 ++++++++++------------ go.sum | 48 +++++++++++++++++++++------------------- main.go | 2 +- network/icmp.go | 2 +- scanner/scanner.go | 6 ++--- speedtester/speedtest.go | 4 ++-- utils/utils.go | 2 +- xray/examiner.go | 2 +- xray/shadowsocks.go | 2 +- xray/socks.go | 2 +- xray/subscription.go | 4 ++-- xray/trojan.go | 2 +- xray/vless.go | 2 +- xray/vmess.go | 2 +- 23 files changed, 79 insertions(+), 79 deletions(-) diff --git a/.gitignore b/.gitignore index 22a400c..f0fbdf9 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,7 @@ # Go workspace file go.work - +.DS_Store .idea configs.txt valid.* diff --git a/cmd/net/http.go b/cmd/net/http.go index d8b8b60..104a8c2 100644 --- a/cmd/net/http.go +++ b/cmd/net/http.go @@ -10,9 +10,9 @@ import ( "github.com/fatih/color" "github.com/gocarina/gocsv" - "github.com/lilendian0x00/xray-knife/utils" - "github.com/lilendian0x00/xray-knife/utils/customlog" - "github.com/lilendian0x00/xray-knife/xray" + "github.com/lilendian0x00/xray-knife/v2/utils" + "github.com/lilendian0x00/xray-knife/v2/utils/customlog" + "github.com/lilendian0x00/xray-knife/v2/xray" "github.com/spf13/cobra" ) diff --git a/cmd/net/icmp.go b/cmd/net/icmp.go index 87069d0..d8f50cb 100644 --- a/cmd/net/icmp.go +++ b/cmd/net/icmp.go @@ -5,10 +5,10 @@ import ( "net" "os" - "github.com/lilendian0x00/xray-knife/utils/customlog" - "github.com/lilendian0x00/xray-knife/xray" + "github.com/lilendian0x00/xray-knife/v2/utils/customlog" + "github.com/lilendian0x00/xray-knife/v2/xray" - "github.com/lilendian0x00/xray-knife/network" + "github.com/lilendian0x00/xray-knife/v2/network" "github.com/spf13/cobra" ) diff --git a/cmd/net/tcp.go b/cmd/net/tcp.go index 22c20e5..3e480d6 100644 --- a/cmd/net/tcp.go +++ b/cmd/net/tcp.go @@ -5,8 +5,8 @@ import ( "os" "time" - "github.com/lilendian0x00/xray-knife/utils/customlog" - "github.com/lilendian0x00/xray-knife/xray" + "github.com/lilendian0x00/xray-knife/v2/utils/customlog" + "github.com/lilendian0x00/xray-knife/v2/xray" "github.com/spf13/cobra" ) diff --git a/cmd/parse/parse.go b/cmd/parse/parse.go index 52d3a91..9538bbe 100644 --- a/cmd/parse/parse.go +++ b/cmd/parse/parse.go @@ -7,8 +7,8 @@ import ( "time" "github.com/fatih/color" - "github.com/lilendian0x00/xray-knife/utils" - "github.com/lilendian0x00/xray-knife/xray" + "github.com/lilendian0x00/xray-knife/v2/utils" + "github.com/lilendian0x00/xray-knife/v2/xray" "github.com/spf13/cobra" ) diff --git a/cmd/proxy/proxy.go b/cmd/proxy/proxy.go index 0004c4f..db2f5e5 100644 --- a/cmd/proxy/proxy.go +++ b/cmd/proxy/proxy.go @@ -13,10 +13,10 @@ import ( "time" "github.com/fatih/color" - "github.com/lilendian0x00/xray-knife/cmd/net" - "github.com/lilendian0x00/xray-knife/utils" - "github.com/lilendian0x00/xray-knife/utils/customlog" - "github.com/lilendian0x00/xray-knife/xray" + "github.com/lilendian0x00/xray-knife/v2/cmd/net" + "github.com/lilendian0x00/xray-knife/v2/utils" + "github.com/lilendian0x00/xray-knife/v2/utils/customlog" + "github.com/lilendian0x00/xray-knife/v2/xray" "github.com/spf13/cobra" "github.com/xtls/xray-core/core" ) diff --git a/cmd/root.go b/cmd/root.go index 109c6fc..57165ad 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -3,11 +3,11 @@ package cmd import ( "os" - "github.com/lilendian0x00/xray-knife/cmd/net" - "github.com/lilendian0x00/xray-knife/cmd/parse" - "github.com/lilendian0x00/xray-knife/cmd/proxy" - "github.com/lilendian0x00/xray-knife/cmd/scan" - "github.com/lilendian0x00/xray-knife/cmd/subs" + "github.com/lilendian0x00/xray-knife/v2/cmd/net" + "github.com/lilendian0x00/xray-knife/v2/cmd/parse" + "github.com/lilendian0x00/xray-knife/v2/cmd/proxy" + "github.com/lilendian0x00/xray-knife/v2/cmd/scan" + "github.com/lilendian0x00/xray-knife/v2/cmd/subs" "github.com/spf13/cobra" ) @@ -16,7 +16,7 @@ var rootCmd = &cobra.Command{ Use: "github.com/lilendian0x00/xray-knife", Short: "Swiss Army Knife for xray-core", Long: ``, - Version: "2.14.20", + Version: "2.14.21", // Main Tools: //1. parse: Parses xray config link. //2. net: Multiple network tests for xray configs. diff --git a/cmd/scan/cfscanner.go b/cmd/scan/cfscanner.go index d57bcd8..c82678a 100644 --- a/cmd/scan/cfscanner.go +++ b/cmd/scan/cfscanner.go @@ -4,8 +4,8 @@ import ( "os" "strings" - "github.com/lilendian0x00/xray-knife/utils" - "github.com/lilendian0x00/xray-knife/utils/customlog" + "github.com/lilendian0x00/xray-knife/v2/utils" + "github.com/lilendian0x00/xray-knife/v2/utils/customlog" "github.com/spf13/cobra" ) diff --git a/cmd/subs/fetch.go b/cmd/subs/fetch.go index eefcdc9..93dcd7a 100644 --- a/cmd/subs/fetch.go +++ b/cmd/subs/fetch.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "github.com/lilendian0x00/xray-knife/utils" - "github.com/lilendian0x00/xray-knife/utils/customlog" - "github.com/lilendian0x00/xray-knife/xray" + "github.com/lilendian0x00/xray-knife/v2/utils" + "github.com/lilendian0x00/xray-knife/v2/utils/customlog" + "github.com/lilendian0x00/xray-knife/v2/xray" "github.com/spf13/cobra" ) diff --git a/go.mod b/go.mod index 26e6935..fa9a5b3 100644 --- a/go.mod +++ b/go.mod @@ -1,21 +1,19 @@ -module github.com/lilendian0x00/xray-knife +module github.com/lilendian0x00/xray-knife/v2 -go 1.22 - -toolchain go1.22.1 +go 1.23.1 require ( - github.com/fatih/color v1.17.0 - github.com/gocarina/gocsv v0.0.0-20231116093920-b87c2d0e983a + github.com/fatih/color v1.18.0 + github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1 github.com/refraction-networking/utls v1.6.7 - github.com/spf13/cobra v1.8.0 + github.com/spf13/cobra v1.8.1 github.com/xtls/xray-core v1.8.24 - golang.org/x/net v0.28.0 + golang.org/x/net v0.33.0 ) require ( - github.com/andybalholm/brotli v1.1.0 // indirect - github.com/cloudflare/circl v1.4.0 // indirect + github.com/andybalholm/brotli v1.1.1 // indirect + github.com/cloudflare/circl v1.5.0 // indirect github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect github.com/francoispqt/gojay v1.2.13 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect @@ -23,7 +21,7 @@ require ( github.com/google/pprof v0.0.0-20240528025155-186aa0362fba // indirect github.com/gorilla/websocket v1.5.3 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/klauspost/compress v1.17.8 // indirect + github.com/klauspost/compress v1.17.11 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect @@ -42,11 +40,11 @@ require ( github.com/xtls/reality v0.0.0-20240712055506-48f0b2d5ed6d // indirect go.uber.org/mock v0.4.0 // indirect go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect - golang.org/x/crypto v0.26.0 // indirect + golang.org/x/crypto v0.31.0 // indirect golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc // indirect golang.org/x/mod v0.18.0 // indirect - golang.org/x/sys v0.24.0 // indirect - golang.org/x/text v0.17.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.22.0 // indirect golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect diff --git a/go.sum b/go.sum index 147afca..bd37575 100644 --- a/go.sum +++ b/go.sum @@ -10,17 +10,17 @@ git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGy github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OmarTariq612/goech v0.0.0-20240405204721-8e2e1dafd3a0 h1:Wo41lDOevRJSGpevP+8Pk5bANX7fJacO2w04aqLiC5I= github.com/OmarTariq612/goech v0.0.0-20240405204721-8e2e1dafd3a0/go.mod h1:FVGavL/QEBQDcBpr3fAojoK17xX5k9bicBphrOpP7uM= -github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= -github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= +github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA= +github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudflare/circl v1.4.0 h1:BV7h5MgrktNzytKmWjpOtdYrf0lkkbF8YMlBGPhJQrY= -github.com/cloudflare/circl v1.4.0/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU= +github.com/cloudflare/circl v1.5.0 h1:hxIWksrX6XN5a1L2TI/h53AGPhNHoUBo+TD1ms9+pys= +github.com/cloudflare/circl v1.5.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs= github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4/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= @@ -28,8 +28,8 @@ github.com/dgryski/go-metro v0.0.0-20200812162917-85c65e2d0165/go.mod h1:c9O8+fp github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 h1:y7y0Oa6UawqTFPCDw9JG6pdKt4F9pAhHv0B7FMGaGD0= github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= -github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= +github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= +github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk= github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY= @@ -43,8 +43,8 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= -github.com/gocarina/gocsv v0.0.0-20231116093920-b87c2d0e983a h1:RYfmiM0zluBJOiPDJseKLEN4BapJ42uSi9SZBQ2YyiA= -github.com/gocarina/gocsv v0.0.0-20231116093920-b87c2d0e983a/go.mod h1:5YoVOkjYAQumqlV356Hj3xeYh4BdZuLE0/nRkf2NKkI= +github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1 h1:FWNFq4fM1wPfcK40yHE5UO3RUdSNPaBC+j3PokzA6OQ= +github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1/go.mod h1:5YoVOkjYAQumqlV356Hj3xeYh4BdZuLE0/nRkf2NKkI= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= @@ -79,8 +79,8 @@ github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= -github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -159,8 +159,8 @@ github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYED github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE= github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA= -github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= -github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= 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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -181,6 +181,8 @@ github.com/xtls/reality v0.0.0-20240712055506-48f0b2d5ed6d h1:+B97uD9uHLgAAulhig github.com/xtls/reality v0.0.0-20240712055506-48f0b2d5ed6d/go.mod h1:dm4y/1QwzjGaK17ofi0Vs6NpKAHegZky8qk6J2JJZAE= github.com/xtls/xray-core v1.8.24 h1:Y2NumdlnJ9C9gvh1Ivs2+73ui5XQgB70wZXYCiI9DyY= github.com/xtls/xray-core v1.8.24/go.mod h1:cWIOI6iBBOsB0HHU9PGhaiBhaMPfiktUjwA0IWolWJc= +github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU= +github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E= go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= @@ -191,8 +193,8 @@ golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+ golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= -golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc h1:O9NuF4s+E/PvMIy+9IUZB9znFwUIXEWSstNjek6VpVg= golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= @@ -209,8 +211,8 @@ golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -220,8 +222,8 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -232,12 +234,12 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= -golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= diff --git a/main.go b/main.go index a34e532..5ff8509 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/lilendian0x00/xray-knife/cmd" + "github.com/lilendian0x00/xray-knife/v2/cmd" ) func main() { diff --git a/network/icmp.go b/network/icmp.go index 4e4fdd7..f500593 100644 --- a/network/icmp.go +++ b/network/icmp.go @@ -10,7 +10,7 @@ import ( "os" "time" - "github.com/lilendian0x00/xray-knife/utils/customlog" + "github.com/lilendian0x00/xray-knife/v2/utils/customlog" "golang.org/x/net/icmp" "golang.org/x/net/ipv4" ) diff --git a/scanner/scanner.go b/scanner/scanner.go index b5ba876..5deb295 100644 --- a/scanner/scanner.go +++ b/scanner/scanner.go @@ -1,9 +1,9 @@ package scanner import ( - "github.com/lilendian0x00/xray-knife/speedtester" - "github.com/lilendian0x00/xray-knife/speedtester/cloudflare" - "github.com/lilendian0x00/xray-knife/utils/customlog" + "github.com/lilendian0x00/xray-knife/v2/speedtester" + "github.com/lilendian0x00/xray-knife/v2/speedtester/cloudflare" + "github.com/lilendian0x00/xray-knife/v2/utils/customlog" ) type CFScanner struct { diff --git a/speedtester/speedtest.go b/speedtester/speedtest.go index 2d9f52d..f2a1152 100644 --- a/speedtester/speedtest.go +++ b/speedtester/speedtest.go @@ -7,8 +7,8 @@ import ( "net/http" "time" - "github.com/lilendian0x00/xray-knife/network/customtls" - "github.com/lilendian0x00/xray-knife/speedtester/custom" + "github.com/lilendian0x00/xray-knife/v2/network/customtls" + "github.com/lilendian0x00/xray-knife/v2/speedtester/custom" ) type SpeedTester struct { diff --git a/utils/utils.go b/utils/utils.go index 4f741e7..240d5e7 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -9,7 +9,7 @@ import ( "runtime" "strings" - "github.com/lilendian0x00/xray-knife/utils/customlog" + "github.com/lilendian0x00/xray-knife/v2/utils/customlog" ) func Base64Decode(b64 string) ([]byte, error) { diff --git a/xray/examiner.go b/xray/examiner.go index 13ef493..c68dd07 100644 --- a/xray/examiner.go +++ b/xray/examiner.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/lilendian0x00/xray-knife/speedtester/cloudflare" + "github.com/lilendian0x00/xray-knife/v2/speedtester/cloudflare" ) type Result struct { diff --git a/xray/shadowsocks.go b/xray/shadowsocks.go index e48b3e9..21e8118 100644 --- a/xray/shadowsocks.go +++ b/xray/shadowsocks.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/fatih/color" - "github.com/lilendian0x00/xray-knife/utils" + "github.com/lilendian0x00/xray-knife/v2/utils" "github.com/xtls/xray-core/infra/conf" ) diff --git a/xray/socks.go b/xray/socks.go index e5d9f9e..e7df36f 100644 --- a/xray/socks.go +++ b/xray/socks.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/fatih/color" - "github.com/lilendian0x00/xray-knife/utils" + "github.com/lilendian0x00/xray-knife/v2/utils" net2 "github.com/xtls/xray-core/common/net" "github.com/xtls/xray-core/infra/conf" ) diff --git a/xray/subscription.go b/xray/subscription.go index 4651330..04e3537 100644 --- a/xray/subscription.go +++ b/xray/subscription.go @@ -6,8 +6,8 @@ import ( "net/url" "strings" - "github.com/lilendian0x00/xray-knife/utils" - "github.com/lilendian0x00/xray-knife/utils/customlog" + "github.com/lilendian0x00/xray-knife/v2/utils" + "github.com/lilendian0x00/xray-knife/v2/utils/customlog" ) // TODO: Make a database to store subscriptions diff --git a/xray/trojan.go b/xray/trojan.go index cfdfbe1..160b1a0 100644 --- a/xray/trojan.go +++ b/xray/trojan.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" "github.com/fatih/color" - "github.com/lilendian0x00/xray-knife/utils" + "github.com/lilendian0x00/xray-knife/v2/utils" "github.com/xtls/xray-core/infra/conf" "net" "net/url" diff --git a/xray/vless.go b/xray/vless.go index ece5b55..812e25d 100644 --- a/xray/vless.go +++ b/xray/vless.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" "github.com/fatih/color" - "github.com/lilendian0x00/xray-knife/utils" + "github.com/lilendian0x00/xray-knife/v2/utils" "github.com/xtls/xray-core/infra/conf" "net" "net/url" diff --git a/xray/vmess.go b/xray/vmess.go index b508aa0..8b7f72e 100644 --- a/xray/vmess.go +++ b/xray/vmess.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/fatih/color" - "github.com/lilendian0x00/xray-knife/utils" + "github.com/lilendian0x00/xray-knife/v2/utils" "github.com/xtls/xray-core/infra/conf" )