Improve 扫码登陆集成到Web服务地址

diff --git a/CV/Var.go b/CV/Var.go
index f91acf897b4532e8cd9728a028965090b5634d03..0f0abe8be0e80c92987ad4c801de0919fae41acf 100644 (file)
--- a/CV/Var.go
+++ b/CV/Var.go
@@ -48,7 +48,7 @@ type Common struct {
        Token             string                //弹幕钥
        WSURL             []string              //弹幕链接
        LIVE_BUVID        bool                  //cookies含LIVE_BUVID
-       Stream_url        []string              //直播Web服务
+       Stream_url        *url.URL              //直播Web服务
        Proxy             string                //全局代理
        AcceptQn          map[int]string        //允许的直播流质量
        Qn                map[int]string        //全部直播流质量
@@ -220,7 +220,7 @@ func (t *Common) Init() Common {
                        Addr: serUrl.Host,
                }, t.SerF)
 
-               t.SerF.Store("/", func(w http.ResponseWriter, r *http.Request) {
+               t.SerF.Store("/", func(w http.ResponseWriter, _ *http.Request) {
                        var memStats runtime.MemStats
                        runtime.ReadMemStats(&memStats)
 
@@ -244,8 +244,7 @@ func (t *Common) Init() Common {
                        }.Write(w)
                })
 
-               t.Stream_url = []string{}
-               t.Stream_url = append(t.Stream_url, `http://`+serAdress)
+               t.Stream_url, _ = url.Parse(`http://` + serAdress)
        }
 
        if val, exist := t.K_v.Load("http代理地址"); exist {

diff --git a/F/api.go b/F/api.go
index 5b7257caff0b02f26c7a03a597c74cdae5819d4f..a005d3d618afd96fd62cc99bb33630bfc8a1d750 100644 (file)
--- a/F/api.go
+++ b/F/api.go
@@ -1,7 +1,6 @@
 package F
 
 import (
-       "context"
        "encoding/json"
        "fmt"
        "net/http"
@@ -11,18 +10,19 @@ import (
        "strings"
        "time"
 
+       "github.com/dustin/go-humanize"
        c "github.com/qydysky/bili_danmu/CV"
        cv "github.com/qydysky/bili_danmu/CV"
        J "github.com/qydysky/bili_danmu/Json"
        "github.com/skratchdot/open-golang/open"
 
        p "github.com/qydysky/part"
+       file "github.com/qydysky/part/file"
        funcCtrl "github.com/qydysky/part/funcCtrl"
        g "github.com/qydysky/part/get"
        limit "github.com/qydysky/part/limit"
        reqf "github.com/qydysky/part/reqf"
        sys "github.com/qydysky/part/sys"
-       web "github.com/qydysky/part/web"
 
        "github.com/mdp/qrterminal/v3"
        qr "github.com/skip2/go-qrcode"
@@ -1293,14 +1293,6 @@ func (c *GetFunc) Get_cookie() (missKey []string) {
                return
        }
 
-       scanPort := int(c.K_v.LoadV("扫码登录端口").(float64))
-       if scanPort <= 0 {
-               scanPort = sys.Sys().GetFreePort()
-       }
-       var server = &http.Server{
-               Addr: "0.0.0.0:" + strconv.Itoa(scanPort),
-       }
-
        { //生成二维码
                qr.WriteFile(img_url, qr.Medium, 256, `qr.png`)
                if !p.Checkfile().IsExist(`qr.png`) {
@@ -1308,24 +1300,16 @@ func (c *GetFunc) Get_cookie() (missKey []string) {
                        return
                }
                //启动web
-               s := web.New(server)
-               s.Handle(map[string]func(http.ResponseWriter, *http.Request){
-                       `/`: func(w http.ResponseWriter, r *http.Request) {
-                               var path string = r.URL.Path[1:]
-                               if path == `` {
-                                       path = `index.html`
-                               }
-                               http.ServeFile(w, r, path)
-                       },
-                       `/exit`: func(_ http.ResponseWriter, _ *http.Request) {
-                               s.Server.Shutdown(context.Background())
-                       },
-               })
-               defer server.Shutdown(context.Background())
-
-               if c.K_v.LoadV(`扫码登录自动打开标签页`).(bool) {
-                       open.Run(`http://` + server.Addr + `/qr.png`)
+               if scanPath, ok := c.K_v.LoadV("扫码登录路径").(string); ok && scanPath != "" {
+                       c.SerF.Store(scanPath, func(w http.ResponseWriter, _ *http.Request) {
+                               file.New("qr.png", 0, true).CopyToIoWriter(w, humanize.MByte, true)
+                       })
+                       if c.K_v.LoadV(`扫码登录自动打开标签页`).(bool) {
+                               open.Run(`http://127.0.0.1:` + c.Stream_url.Port() + scanPath)
+                       }
+                       apilog.L(`W: `, `或打开链接扫码登录：`+c.Stream_url.String()+scanPath)
                }
+
                apilog.Block(1000)
                //show qr code in cmd
                qrterminal.GenerateWithConfig(img_url, qrterminal.Config{
@@ -1335,7 +1319,6 @@ func (c *GetFunc) Get_cookie() (missKey []string) {
                        WhiteChar: `OO`,
                })
                apilog.L(`W: `, `手机扫命令行二维码登录`)
-               apilog.L(`W: `, `或打开链接扫码登录： http://`+s.Server.Addr+`/qr.png`)
                sys.Sys().Timeoutf(1)
        }
 

diff --git a/Reply/F.go b/Reply/F.go
index 397aea01239d6c536fe533a3af9ba032cc035ef9..6b9abaa11d6d27c19ae9bff99740f67058850c8a 100644 (file)
--- a/Reply/F.go
+++ b/Reply/F.go
@@ -1368,7 +1368,9 @@ func init() {
                        <-conn
                })
 
-               flog.L(`I: `, `启动于 `+path)
+               if s, ok := c.C.K_v.LoadV("直播Web服务路径").(string); ok && s != "" {
+                       flog.L(`I: `, `启动于 `+c.C.Stream_url.String()+s)
+               }
        }
 }
 

diff --git a/Reply/stream.go b/Reply/stream.go
index 8701f41c14b89815e965c5b8f7433d9b172906b9..ef18116812c597ec608ba6df92b755f9a697508b 100644 (file)
--- a/Reply/stream.go
+++ b/Reply/stream.go
@@ -526,8 +526,8 @@ func (t *M4SStream) saveStream() (e error) {
        } else {
                t.log.L(`W: `, err)
        }
-       for _, v := range t.common.Stream_url {
-               t.log.L(`I: `, "流地址:", v)
+       if s, ok := t.common.K_v.LoadV("直播Web服务路径").(string); ok && s != "" {
+               t.log.L(`I: `, "Web服务地址:", t.common.Stream_url.String()+s)
        }
 
        // 录制回调

diff --git a/bili_danmu.go b/bili_danmu.go
index fbfb31c26427b02d60c260a6fc0fc9edad786a45..c148b8c8249f807c719a4e2fd040751163f673d3 100644 (file)
--- a/bili_danmu.go
+++ b/bili_danmu.go
@@ -7,6 +7,7 @@ import (
        "os"
        "os/signal"
        "strconv"
+       "strings"
        "time"
 
        c "github.com/qydysky/bili_danmu/CV"
@@ -45,7 +46,7 @@ func Start() {
        var stop = sys.Sys().PreventSleep()
        defer stop.Done()
 
-       danmulog.L(`I: `, "version: ", version)
+       danmulog.L(`I: `, "version: ", strings.TrimSpace(version))
 
        //ctrl+c退出
        interrupt := make(chan os.Signal, 2)

diff --git a/cmd/cmd.go b/cmd/cmd.go
index f115482cf3c7ceefe5f1d081d2e912cc893a37bf..cdae15c154b235363ac6dc24ac6f74078f1920b1 100644 (file)
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -189,9 +189,7 @@ func Cmd() {
                                }
                                fmt.Println(`舰长数:`, c.C.GuardNum)
                                fmt.Println(`分区排行:`, c.C.Note, `人气：`, c.C.Renqi, `观看人数：`, c.C.Watched, `在线人数：`, c.C.OnlineNum)
-                               for _, v := range c.C.Stream_url {
-                                       fmt.Println(`Web服务地址:`, v)
-                               }
+                               fmt.Println(`Web服务地址:`, c.C.Stream_url.String())
                                var array = reply.StreamOCommon(-1)
                                fmt.Println(`正在录制的房间：`)
                                for _, v := range array {

diff --git a/demo/config/config_K_v.json b/demo/config/config_K_v.json
index d9d0dc5498069fcedb8336a3975b9bfa352378e2..d131c695e620baac6db46dddfa035c20b7577646 100644 (file)
--- a/demo/config/config_K_v.json
+++ b/demo/config/config_K_v.json
@@ -94,7 +94,7 @@
     "cookie解密私钥": "private.pem",
     "扫码登录-help": "当扫码登陆设置为true时，每次启动会检查，若失败则会要求登录",
     "扫码登录": true,
-    "扫码登录端口": 0,
+    "扫码登录路径": "/qr/",
     "扫码登录自动打开标签页": false,
     "网络中断不退出": true,
     "http代理地址-help":"例http://127.0.0.1:38223 为空时不使用",

diff --git a/go.mod b/go.mod
index b18422ef2cf488c2b81b95c444166c957ac9f7e8..9c9e955dd9b21d9053cc275d6cf14f90810e4156 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,6 @@ module github.com/qydysky/bili_danmu
 go 1.19
 
 require (
-       github.com/christopher-dG/go-obs-websocket v0.0.0-20200720193653-c4fed10356a5
        github.com/gofrs/uuid v4.3.0+incompatible
        github.com/gotk3/gotk3 v0.6.1
        github.com/mdp/qrterminal/v3 v3.0.0
@@ -21,10 +20,8 @@ require (
        github.com/gorilla/websocket v1.5.0 // indirect
        github.com/klauspost/compress v1.15.11 // indirect
        github.com/miekg/dns v1.1.50 // indirect
-       github.com/mitchellh/mapstructure v1.5.0 // indirect
        github.com/pmezard/go-difflib v1.0.0 // indirect
        github.com/shirou/gopsutil v3.21.11+incompatible // indirect
-       github.com/stretchr/testify v1.8.1 // indirect
        github.com/thedevsaddam/gojsonq/v2 v2.5.2 // indirect
        github.com/tklauser/go-sysconf v0.3.10 // indirect
        github.com/tklauser/numcpus v0.5.0 // indirect

diff --git a/go.sum b/go.sum
index 9ade2b1882f32f7c471110809a96fae6f3fa1382..df1269da1a51cbd22d0ccbd157f43d58cd7a6e81 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -1,104 +1,37 @@
-github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
-github.com/christopher-dG/go-obs-websocket v0.0.0-20200720193653-c4fed10356a5 h1:UFBgEMSPv6a2vgzowHOPphVit+ZBNQ3+4Q+dEBgwIww=
-github.com/christopher-dG/go-obs-websocket v0.0.0-20200720193653-c4fed10356a5/go.mod h1:P5w+dDqQEbCMFAkmucNcEQ6xgAt/NP+Aw58OQfY/H/o=
-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/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc=
 github.com/gofrs/uuid v4.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 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/gotk3/gotk3 v0.6.1 h1:GJ400a0ecEEWrzjBvzBzH+pB/esEMIGdB9zPSmBdoeo=
 github.com/gotk3/gotk3 v0.6.1/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
-github.com/klauspost/compress v1.11.6/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c=
 github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
-github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mdp/qrterminal v1.0.1/go.mod h1:Z33WhxQe9B6CdW37HaVqcRKzP+kByF3q/qLxOGe12xQ=
 github.com/mdp/qrterminal/v3 v3.0.0 h1:ywQqLRBXWTktytQNDKFjhAvoGkLVN3J2tAFZ0kMd9xQ=
 github.com/mdp/qrterminal/v3 v3.0.0/go.mod h1:NJpfAs7OAm77Dy8EkWrtE4aq+cE6McoLXlBqXQEwvE0=
-github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
 github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/qydysky/part v0.10.17 h1:xcMgJaEvPlOPAEfOniTZZM/pDiafWW3FA5ZQXNPthpI=
-github.com/qydysky/part v0.10.17/go.mod h1:B3GD/j5jmvwfKtnzDWqRYFqnwOXEyoUg/jShFk1yQSM=
-github.com/qydysky/part v0.20.0 h1:JkAdTrGwXjbL8FJuiinKK8Vrd2HU/rcRD+Bdx4RpGGw=
-github.com/qydysky/part v0.20.0/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.20.1 h1:C0VDY/OZHEVRD1SeudG67t/7/0qUMlfJcy8CQQKVZ9A=
-github.com/qydysky/part v0.20.1/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.21.0 h1:a38ZmzaKXrfXoempsLkMhuo4pzxQcZW/GnvkShInqig=
-github.com/qydysky/part v0.21.0/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.21.1 h1:SmtiTxNL2eYFHFwisx96mIrMTEsMttyoMYPnDOtHAMQ=
-github.com/qydysky/part v0.21.1/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.21.2 h1:KDPeTRlsjEl8mxn+M/wA0cmmiZisduptmzVjRYVUyoI=
-github.com/qydysky/part v0.21.2/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.21.3 h1:gZ7awiaT2ezvX6Y+H50JSA+vWkQoMYNuN/cl919cwdo=
-github.com/qydysky/part v0.21.3/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.21.4 h1:dIK3O6KQ3TLe6I1lGDlvHhUI9SJss//QnqZ3MJV9UME=
-github.com/qydysky/part v0.21.4/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.21.5 h1:0vEiUFTRLdWcOE+crh6HRXHARJtEK9vZfKfaWo55Dig=
-github.com/qydysky/part v0.21.5/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.21.6 h1:38mEneSgc47gnmPxFXRZcAywTbS+QxMqrwgOyznAokk=
-github.com/qydysky/part v0.21.6/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.21.7 h1:R3x5dv324ZeIYUMjZZ+LNQhT04KSNOQ+h2ahtG0hIfE=
-github.com/qydysky/part v0.21.7/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.21.8 h1:OheZz6YDO5L5kkZUGsLbm54vFHDzT5065legXaAaj+s=
-github.com/qydysky/part v0.21.8/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.21.9 h1:sgq56nNZcb6vaDSwzWChnkWJ07brKvj6lTVs9xKmG3A=
-github.com/qydysky/part v0.21.9/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.21.10 h1:GAMCJToiYp+G2FBD8YiptdZj3UhVAIrpxzEvw3aN4gg=
-github.com/qydysky/part v0.21.10/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.21.11 h1:9gAsrvyFBlrz5Y4ZpmkrKCwWV4hMGc2K7X8ryB1YFok=
-github.com/qydysky/part v0.21.11/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.21.12 h1:XcY5sEcSGnZX4/7kQS83RTLQyvwpeR18u1M2YWVH73I=
-github.com/qydysky/part v0.21.12/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.21.13 h1:K3G0NlVsTCx0GkxuJmgtPsSrU1t+e+z0prWm94aofis=
-github.com/qydysky/part v0.21.13/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.22.0 h1:FTNNEoA7NEvxI42CPY0m8wOnMepPboIlWgX6NMWcq7o=
-github.com/qydysky/part v0.22.0/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.22.1 h1:zHV4yW133dO5GH//8Ye8HU+LIEz5HDqvJTeMiWe0Wdk=
-github.com/qydysky/part v0.22.1/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.22.2 h1:JgGdUmDfa3E2IIESJ8OgS71O0W6JJVXA5V7uPPUX9KY=
-github.com/qydysky/part v0.22.2/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.22.3 h1:7BeZuXSt+o9gdA0fi1CZC+65BXY8ltVBqLBEo2ZiEgQ=
-github.com/qydysky/part v0.22.3/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.22.4 h1:as7goJRSc/JFT2IlCQWARCtX/DiN7UGPKAxAqb7I5Ek=
-github.com/qydysky/part v0.22.4/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/qydysky/part v0.22.5 h1:9rTwdcZwLiC0gRR5kUbp6LEeeu65Dt/nFSYSteBqlwY=
-github.com/qydysky/part v0.22.5/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
 github.com/qydysky/part v0.22.6 h1:43xGuzYg8RnivV6bNad42Y8uxaRwT59/HYeDVYp6rhE=
 github.com/qydysky/part v0.22.6/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
-github.com/shirou/gopsutil v3.20.12+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=
 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
-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.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/thedevsaddam/gojsonq v2.3.0+incompatible/go.mod h1:RBcQaITThgJAAYKH7FNp2onYodRz8URfsuEGpAch0NA=
 github.com/thedevsaddam/gojsonq/v2 v2.5.2 h1:CoMVaYyKFsVj6TjU6APqAhAvC07hTI6IQen8PHzHYY0=
 github.com/thedevsaddam/gojsonq/v2 v2.5.2/go.mod h1:bv6Xa7kWy82uT0LnXPE2SzGqTj33TAEeR560MdJkiXs=
 github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw=
@@ -107,57 +40,43 @@ github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hM
 github.com/tklauser/numcpus v0.5.0 h1:ooe7gN0fg6myJ0EKoTAf5hebTZrH52px3New/D9iJ+A=
 github.com/tklauser/numcpus v0.5.0/go.mod h1:OGzpTxpcIMNGYQdit2BYL1pvk/dSOaJWjKoflh+RQjo=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
 golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43 h1:OK7RB6t2WQX54srQQYSXMW8dF5C6/8+oA/s5QBmmto4=
 golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 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.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
@@ -165,7 +84,6 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 rsc.io/qr v0.2.0 h1:6vBLea5/NRMVTz8V66gipeLycZMl/+UlFmk8DvqQ6WY=