merging dev

.dockerignore

@@ -0,0 +1,8 @@
+*
+# exluding everything and only allowing directly relevant stuff
+!cmd/server/main.go
+!internal
+!tokens
+!go.mod
+!go.sum
+!server

.env

@@ -0,0 +1,4 @@
+INFLUXDB_USERNAME=admin
+INFLUXDB_PASSWORD=forelight
+INFLUXDB_ORG=ForeLight
+INFLUXDB_BUCKET=test

.gitignore

@@ -17,8 +17,10 @@
 # vendor/
 
 # binaries
-bin/*
+bin
 *.tar.gz
 # logs
 *.log
 
+tokens
+logs

Dockerfile.server

@@ -0,0 +1,23 @@
+# syntax=docker/dockerfile:1
+FROM golang:1.18-alpine as builder
+
+WORKDIR /app
+
+COPY . .
+
+RUN go mod download
+
+RUN CGO_ENABLED=0 go build -o /server ./cmd/server/main.go
+
+FROM alpine
+
+COPY --from=builder /server .
+COPY --from=builder /app/tokens/ ./tokens
+
+EXPOSE 2022
+EXPOSE 2023
+
+ENTRYPOINT [ "./server" ]
+
+
+

README.md

@@ -1,33 +1,3 @@
-# FRMS
+# DMAC
-ForeLight Reactor Management System
-
-Time to get to buisness
-
-## Main design principles
-
-- Flexible
-- Reliable
-- Scalable
-
-Those principles guide our design choices
-
-### Flexibile
-
-- System should support any reactor config
-- should be able to change sub packages in isolation
-    - portability of packages i.e. can swap databases or sub in testing packages for memory based storage
-
-### Realiable
-- should support any # of reactors failing (including network related failures)
-- should provide log and database correctness via atomic commits
-- automatic log recovery and reactor functioning despite sub-system or network failures
-- 100% uptime and seamless updates **goal**
-
-### Scalable
-- Add and use sensor packages at will
-- Group reactors logically regardless of physical location
-- Scale infastructure to efficiently support any # of reactors
-
-#### Brainstorming
-Everything here is subject to change
 
+Distributed Monitoring and Control

build.sh

@@ -1,12 +1,24 @@
 #!/bin/bash
+echo "Purging old builds"
+rm -v bin/* 2>/dev/null
+
+echo "Removing Logs"
+rm -v bin/log/* 2>/dev/null
+
+echo "Building reactor binaries"
 env GOOS=linux GOARCH=arm GOARM=7 go build -o bin/reactor_linux_arm cmd/reactor/main.go
 env GOOS=linux GOARCH=arm64 go build -o bin/reactor_linux_arm64 cmd/reactor/main.go
 
+echo "Building tui binaries"
 env GOOS=linux GOARCH=arm GOARM=7 go build -o bin/tui_linux_arm cmd/tui/main.go
+env GOOS=linux GOARCH=arm64 go build -o bin/tui_linux_arm64 cmd/tui/main.go
 env GOOS=linux GOARCH=amd64 go build -o bin/tui_linux_amd64 cmd/tui/main.go
 
+echo "Building server binary"
 env GOOS=linux GOARCH=amd64 go build -o bin/server_linux_amd64 cmd/server/main.go
-tar -czf pireactor.tar.gz bin/reactor_linux_arm64
+
-tar -czf bbreactor.tar.gz bin/reactor_linux_arm
+echo "Compressing binaries for distrubution"
-tar -czf tui.tar.gz bin/tui_linux_amd64
+tar -czf pireactor.tar.gz  -C bin reactor_linux_arm64
-tar -czf server.tar.gz bin/server_linux_amd64
+tar -czf bbreactor.tar.gz  -C bin reactor_linux_arm
+tar -czf server.tar.gz     -C bin server_linux_amd64
+tar -czf tui.tar.gz        -C bin tui_linux_amd64 tui_linux_arm tui_linux_arm64

cmd/server/main.go

@@ -1,13 +1,14 @@
 package main
 
 import (
-    "net/http"
+    _"net/http"
     _ "net/http/pprof"
-    "flag"
+    //"flag"
     "log"
     "os"
     "fmt"
     "FRMS/internal/pkg/logging"
+    "FRMS/internal/pkg/config"
     "FRMS/internal/pkg/server"
 )
 
@@ -15,37 +16,50 @@ type listener interface {
     Start()
 }
 
-func NewListener(s string,ch chan error) (listener, error) {
+func NewListener(ch chan error, port int) listener {
-    return server.NewListener(s, ch)
+    return server.NewListener(ch, port)
+}
+
+type dbconfig interface {
+    GetUrl() string
+    GetOrg() string
+    GetBucket() string
+    GetToken() string
+}
+
+func ReadConfig() dbconfig {
+    return config.ReadServerConfig()
 }
 
 func main() {
     // lets get this bread
     // all we need to do is call the reactor coordinator and thats it
-    go func() {
+    // removing os flags in favor of env vars
-        fmt.Println(http.ListenAndServe("localhost:6060",nil))
+    // go func() {
-    }()
+        // fmt.Println(http.ListenAndServe("localhost:6060",nil))
-    flag.Usage = func() {
+    // }()
-        w := flag.CommandLine.Output()
-        fmt.Fprintf(w,"Usage: %s [eth*,wlan*,etc.]\n",os.Args[0])
-    }
-    flag.Parse()
-    if flag.NArg() != 1 {
-        flag.Usage()
-        fmt.Println("Specify ifconfig interface. See man ifconfig for further information")
-        os.Exit(1)
-    }
-    ifconfig := string(flag.Arg(0))
     ch := make(chan error)
-    l, err := NewListener(ifconfig,ch)
+    // creating listener
-    if err != nil {
+    var lport int
-        log.Fatal(err)
+    //var dbport int
+    if port := os.Getenv("gRPC_PORT"); port == "" {
+        lport = 2022   // default docker port
     }
+    //if port := os.Getenv("DATABASE_PORT"); port == "" {
+        //dbport = 8086
+    //}
+    //fmt.Printf("DBPORT %d\n", dbport)
+    conf := ReadConfig()
+    fmt.Printf("Found %v %v %v %v\n",conf.GetUrl(),conf.GetBucket(),conf.GetOrg(),conf.GetToken())
+    fmt.Printf("Listening on %v\n", lport)
+    l := NewListener(ch,lport)
+
+    //db := os.Getenv("DATABASE_URL") // database url
+
     go l.Start()
     logging.Debug(logging.DStart, "CCO 01 Server started")
-    err = <-ch // blocking to wait for any errors and keep alive otherwise
+    err := <-ch // blocking to wait for any errors and keep alive otherwise
     if err != nil {
-        //fmt.Printf("ERROR: %v\n",err)
         log.Fatal(err)
     }
 }

docker-compose.yml

@@ -0,0 +1,40 @@
+version: "2.1"
+services:
+    server:
+        image: server
+        build:
+            context: .
+            dockerfile: Dockerfile.server
+        ports:
+            - "2022:2022"
+            - "2023:2023"
+        volumes:
+            - ./logs:/app/log
+        environment:
+            - LOGTYPE=SERVER
+            - VERBOSE=1
+        depends_on:
+            - db
+    db:
+        image: influxdb:latest
+        ports:
+            - "8086:8086"
+        volumes:
+            - influx-data:/var/lib/influxdb2
+            - influx-config:/etc/influxdb2
+        environment:
+            - DOCKER_INFLUXDB_INIT_MODE=setup
+            - DOCKER_INFLUXDB_INIT_USERNAME=${INFLUXDB_USERNAME}
+            - DOCKER_INFLUXDB_INIT_PASSWORD=${INFLUXDB_PASSWORD}
+            - DOCKER_INFLUXDB_INIT_ORG=${INFLUXDB_ORG}
+            - DOCKER_INFLUXDB_INIT_BUCKET=${INFLUXDB_BUCKET}
+    grafana:
+        image: grafana/grafana-oss:latest
+        ports:
+            - "3000:3000"
+        volumes:
+            - grafana-data:/var/lib/grafana
+volumes:
+    grafana-data:
+    influx-data:
+    influx-config:

go.mod

@@ -4,20 +4,39 @@ go 1.18
 
 require (
 	github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1
+	github.com/influxdata/influxdb-client-go/v2 v2.9.1
 	github.com/rivo/tview v0.0.0-20220610163003-691f46d6f500
+	github.com/spf13/viper v1.12.0
 	google.golang.org/grpc v1.47.0
-	google.golang.org/protobuf v1.27.1
+	google.golang.org/protobuf v1.28.0
 )
 
 require (
+	github.com/deepmap/oapi-codegen v1.8.2 // indirect
+	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/gdamore/encoding v1.0.0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
+	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.1 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
-	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
+	github.com/spf13/afero v1.8.2 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/subosito/gotenv v1.3.0 // indirect
+	golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
 	golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b // indirect
-	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
-	golang.org/x/text v0.3.6 // indirect
+	golang.org/x/text v0.3.7 // indirect
-	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
+	google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
+	gopkg.in/ini.v1 v1.66.4 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,33 +1,103 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
+cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
+cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
+cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
+cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
+cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
+cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
+cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
+cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
+cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
+cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
+cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
+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/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+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=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 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/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
 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/deepmap/oapi-codegen v1.8.2 h1:SegyeYGcdi0jLLrpbCMoJxnUUn8GBXHsvr4rbzjuhfU=
+github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
+github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
+github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
 github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
 github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1 h1:QqwPZCwh/k1uYqq6uXSb9TRDhTkfQbO80v8zhnIe5zM=
 github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1/go.mod h1:Az6Jt+M5idSED2YPGtwnfJV0kXohgdCBPmHGSYc1r04=
+github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
@@ -39,20 +109,88 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+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.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+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/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+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/influxdata/influxdb-client-go/v2 v2.9.1 h1:5kbH226fmmiV0MMTs7a8L7/ECCKdJWBi1QZNNv4/TkI=
+github.com/influxdata/influxdb-client-go/v2 v2.9.1/go.mod h1:x7Jo5UHHl+w8wu8UnGiNobDDHygojXwJX4mx7rXGKMk=
+github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 h1:W9WBk7wlPfJLvMCdtV4zPulc4uCPrlywQOmbFOhgQNU=
+github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo=
+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/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg=
+github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
+github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+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 v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
+github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
+github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU=
+github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+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/rivo/tview v0.0.0-20220610163003-691f46d6f500 h1:KvoRB2TMfMqK2NF2mIvZprDT/Ofvsa4RphWLoCmUDag=
@@ -60,69 +198,340 @@ github.com/rivo/tview v0.0.0-20220610163003-691f46d6f500/go.mod h1:WIfMkQNY+oq/m
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
+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.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
+github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
+github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
+github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
+github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
+github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
+github.com/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.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ=
+github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+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.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI=
+github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+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=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
+go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+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/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=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 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-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+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-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+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-20220520000938-2e3eb7b945c2 h1:NWy5+hlRbC7HK+PmcXVUmW1IMyFce7to56IUvhUFm7Y=
+golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 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=
+golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 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.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+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-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/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-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b h1:2n253B2r0pYSmEV+UNCQoPfU/FiaizQEK5Gu4Bq4JE8=
 golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+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=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+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.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+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=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
+golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
+golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
+google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
+google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
+google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
+google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
+google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
+google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd h1:e0TwkXOdbnH/1x5rc5MZ/VYyiZ4v+RdVfrGMqEwT68I=
+google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
+google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
+google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
 google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8=
 google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
@@ -133,14 +542,34 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
+google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 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.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4=
+gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 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=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

internal/configs/database.yaml

@@ -0,0 +1,3 @@
+orginization: ForeLight
+token: Zrtg0Q9u65HbFaK4KPWbl9y1xofJwsRHVwuWcIq3xvSOstVbjshDoRNjPiwsz31vIoP-GwDuGL8gzouEHqMuYg==
+url: http://localhost:8086

internal/pkg/I2C/bus.go

@@ -3,10 +3,10 @@ package I2C
 // file has general wrappers to interact with i2c-tools
 
 import (
-    _ "fmt"
+    "fmt"
     _ "log"
+    "encoding/hex"
     "os/exec"
-    "os/user"
     "bytes"
     "strings"
     "sync"
@@ -38,7 +38,7 @@ func (b *I2CBus) Scan() map[int]bool {
     cmd.Stderr = &errs
     cmd.Stdout = &out
     if err := cmd.Run(); err != nil {
-        logging.Debug(logging.DError, "I2C ERROR: %v", errs.String())
+        logging.Debug(logging.DError, "I2C error performing scan. %v", errs.String())
     }
 
     outString := out.String()
@@ -83,9 +83,11 @@ func (b *I2CBus) GetStatus(addr int) bool {
     a := strconv.Itoa(addr)
     cmd := exec.Command("i2cdetect","-y","-r",bus,a,a)
     var out bytes.Buffer
+    var errs bytes.Buffer
+    cmd.Stderr = &errs
     cmd.Stdout = &out
     if err := cmd.Run(); err != nil {
-        logging.Debug(logging.DError,"I2C ERROR: %v", err)
+        logging.Debug(logging.DError,"I2C error getting status! %v", errs.String())
     }
 
     outString := out.String()
@@ -102,3 +104,35 @@ func (b *I2CBus) GetStatus(addr int) bool {
         return true
     }
 }
+
+func (b *I2CBus) GetData(addr int) string {
+    b.Lock()
+    defer b.Unlock()
+
+    bus := strconv.Itoa(b.int)
+    a := strconv.FormatInt(int64(addr),16)
+    cmd := exec.Command("i2ctransfer","-y",bus,fmt.Sprintf("r40@0x%s",a))
+    var out bytes.Buffer
+    var errs bytes.Buffer
+    cmd.Stderr = &errs
+    cmd.Stdout = &out
+    if err := cmd.Run(); err != nil {
+        logging.Debug(logging.DError,"I2C error getting data! %v", errs.String())
+    }
+
+    outString := out.String()
+    split := strings.SplitAfter(outString," ") //getting chars 0x12 0x2f etc
+    var final string
+    for _,v := range split {
+        trimmed := strings.TrimLeft(v, "0x ") // trimming extra bs in front of num
+        trimmed = strings.TrimRight(trimmed," \n") // trimming back
+        if trimmed != "ff" {
+            final += trimmed
+        }
+    }
+    ret, err := hex.DecodeString(final)
+    if err != nil {
+        panic(err)
+    }
+    return string(ret)
+}

internal/pkg/I2C/device.go

@@ -20,7 +20,7 @@ type data struct {
 }
 
 func (d I2CDevice) String() string {
-    t := map[int]string{97:"DO Sensor",99:"pH Sensor",102:"Temperature Sensor"}
+    t := map[int]string{97:"DO Sensor",99:"pH Sensor",102:"Temperature Sensor",64:"DHT11 Sensor"}
     return t[d.int]
 }
 
@@ -56,6 +56,7 @@ func (d *I2CDevice) GetType() string {
 func (d *I2CDevice) GetData() string {
     d.Data.Lock()
     defer d.Data.Unlock()
+    d.Data.string = d.I2CBus.GetData(d.int)
     return d.Data.string
 }
 

internal/pkg/config/server.go

@@ -0,0 +1,70 @@
+package config
+
+// package serves to store/load config files for server
+
+import (
+    _ "fmt"
+    "github.com/spf13/viper"
+    "FRMS/internal/pkg/logging"
+    "log"
+    "os/exec"
+    "bytes"
+    "strings"
+)
+
+type serverconfig struct {
+    URL string
+    Token string
+    Bucket string
+    Orginization string
+}
+
+func ReadServerConfig() *serverconfig {
+
+    viper.SetConfigName("database")
+    viper.SetConfigType("yaml")
+    viper.AddConfigPath("./internal/configs")
+    viper.SetDefault("Orginization","ForeLight")
+    viper.SetDefault("URL","http://localhost:8086")
+    var C serverconfig
+    err := viper.Unmarshal(&C)
+    if err != nil {
+        logging.Debug(logging.DError,"Cannot unmarshal! %v",err)
+        log.Fatal(err)
+    }
+    if C.Token == "" {
+        // token unset
+        logging.Debug(logging.DClient,"CON Grabbing adming token")
+        cmd := exec.Command("cat","tokens/admin_token")
+        var out bytes.Buffer
+        var stderr bytes.Buffer
+        cmd.Stdout = &out
+        cmd.Stderr = &stderr
+        if err := cmd.Run(); err != nil {
+            logging.Debug(logging.DError,"CON Error grabbing token %v",err)
+            log.Fatal(err)
+        }
+        outstring := out.String()
+        C.Token = strings.Trim(outstring," \n")
+        viper.Set("token",C.Token)
+        viper.WriteConfig()
+    }
+    return &C
+}
+
+func (s *serverconfig) GetUrl() string {
+    return s.URL
+}
+
+
+func (s *serverconfig) GetOrg() string {
+    return s.Orginization
+}
+
+func (s *serverconfig) GetBucket() string {
+    return s.Bucket
+}
+
+func (s *serverconfig) GetToken() string {
+    return s.Token
+}

internal/pkg/grpc/management.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.27.1
+// 	protoc-gen-go v1.28.0
 // 	protoc        v3.6.1
 // source: internal/pkg/grpc/management.proto
 
@@ -27,6 +27,7 @@ type GetDevicesRequest struct {
 
 	ClientId  uint32 `protobuf:"varint,1,opt,name=clientId,proto3" json:"clientId,omitempty"`
 	ReactorId uint32 `protobuf:"varint,2,opt,name=reactorId,proto3" json:"reactorId,omitempty"` // if unspecified, don't return any devs
+	Refresh   bool   `protobuf:"varint,3,opt,name=refresh,proto3" json:"refresh,omitempty"`
 }
 
 func (x *GetDevicesRequest) Reset() {
@@ -75,6 +76,13 @@ func (x *GetDevicesRequest) GetReactorId() uint32 {
 	return 0
 }
 
+func (x *GetDevicesRequest) GetRefresh() bool {
+	if x != nil {
+		return x.Refresh
+	}
+	return false
+}
+
 type GetDevicesResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -474,71 +482,73 @@ var File_internal_pkg_grpc_management_proto protoreflect.FileDescriptor
 var file_internal_pkg_grpc_management_proto_rawDesc = []byte{
 	0x0a, 0x22, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x67,
 	0x72, 0x70, 0x63, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x67, 0x72, 0x70, 0x63, 0x22, 0x4d, 0x0a, 0x11, 0x47, 0x65,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x67, 0x72, 0x70, 0x63, 0x22, 0x67, 0x0a, 0x11, 0x47, 0x65,
 	0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
 	0x1a, 0x0a, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x0d, 0x52, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x72,
 	0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09,
-	0x72, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x73, 0x0a, 0x12, 0x47, 0x65, 0x74,
+	0x72, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x66,
-	0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x72, 0x65, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x72, 0x65, 0x66, 0x72,
-	0x1a, 0x0a, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x65, 0x73, 0x68, 0x22, 0x73, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65,
-	0x0d, 0x52, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x72,
+	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6c, 0x69,
-	0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09,
-	0x72, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x12, 0x23, 0x0a, 0x07, 0x64, 0x65, 0x76,
-	0x69, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x44, 0x65, 0x76, 0x52, 0x07, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x22, 0x50,
-	0x0a, 0x14, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74,
-	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74,
-	0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x49, 0x64,
-	0x22, 0x6b, 0x0a, 0x15, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f,
-	0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6c, 0x69,
 	0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x63, 0x6c, 0x69,
 	0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72,
 	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x6f,
-	0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x03,
+	0x72, 0x49, 0x64, 0x12, 0x23, 0x0a, 0x07, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0x70, 0x0a,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x65, 0x76, 0x52,
-	0x1a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x65,
+	0x07, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x22, 0x50, 0x0a, 0x14, 0x44, 0x65, 0x6c, 0x65,
-	0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63,
+	0x74, 0x65, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x63,
+	0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74,
+	0x28, 0x0d, 0x52, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09,
-	0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x72, 0x65, 0x61, 0x63,
+	0x72, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x74, 0x6f, 0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x76, 0x41, 0x64, 0x64, 0x72,
+	0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x6b, 0x0a, 0x15, 0x44, 0x65,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x65, 0x76, 0x41, 0x64, 0x64, 0x72, 0x22,
+	0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x8b, 0x01, 0x0a, 0x1b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18,
-	0x72, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12,
-	0x1a, 0x0a, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x1c, 0x0a, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x0d, 0x52, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x72,
+	0x28, 0x0d, 0x52, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x12, 0x18, 0x0a,
-	0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09,
+	0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07,
-	0x72, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x76,
+	0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0x70, 0x0a, 0x1a, 0x44, 0x65, 0x6c, 0x65, 0x74,
-	0x41, 0x64, 0x64, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x65, 0x76, 0x41,
+	0x65, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65,
-	0x64, 0x64, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x04,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0x6b, 0x0a,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49,
-	0x03, 0x44, 0x65, 0x76, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d,
+	0x64, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02,
-	0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x12,
-	0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74,
+	0x18, 0x0a, 0x07, 0x64, 0x65, 0x76, 0x41, 0x64, 0x64, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
-	0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0x52, 0x07, 0x64, 0x65, 0x76, 0x41, 0x64, 0x64, 0x72, 0x22, 0x8b, 0x01, 0x0a, 0x1b, 0x44, 0x65,
-	0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63,
-	0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x05, 0x20,
+	0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6c, 0x69,
-	0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x32, 0xf3, 0x01, 0x0a, 0x0a, 0x6d,
+	0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x63, 0x6c, 0x69,
-	0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x3f, 0x0a, 0x0a, 0x47, 0x65, 0x74,
+	0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72,
-	0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x17, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47,
+	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x6f,
-	0x65, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x76, 0x41, 0x64, 0x64, 0x72, 0x18, 0x03,
-	0x1a, 0x18, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x65, 0x76, 0x41, 0x64, 0x64, 0x72, 0x12, 0x18, 0x0a,
-	0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x48, 0x0a, 0x0d, 0x44, 0x65,
+	0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07,
-	0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x1a, 0x2e, 0x67, 0x72,
+	0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0x6b, 0x0a, 0x03, 0x44, 0x65, 0x76, 0x12, 0x0e,
-	0x70, 0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72,
+	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44,
+	0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79,
-	0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70,
+	0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5a, 0x0a, 0x13, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65,
+	0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61,
-	0x61, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x12, 0x20, 0x2e, 0x67, 0x72,
+	0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14,
-	0x70, 0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72,
+	0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69,
-	0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e,
+	0x6e, 0x64, 0x65, 0x78, 0x32, 0xf3, 0x01, 0x0a, 0x0a, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x61, 0x63, 0x74,
+	0x65, 0x6e, 0x74, 0x12, 0x3f, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65,
-	0x6f, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x73, 0x12, 0x17, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x65, 0x76, 0x69,
-	0x42, 0x13, 0x5a, 0x11, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x6b, 0x67,
+	0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x67, 0x72, 0x70,
-	0x2f, 0x67, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x63, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x48, 0x0a, 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65,
+	0x61, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x1a, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x65, 0x6c,
+	0x65, 0x74, 0x65, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x1b, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52,
+	0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5a,
+	0x0a, 0x13, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x44,
+	0x65, 0x76, 0x69, 0x63, 0x65, 0x12, 0x20, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x65, 0x6c,
+	0x65, 0x74, 0x65, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44,
+	0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x44, 0x65, 0x76, 0x69,
+	0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x13, 0x5a, 0x11, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

internal/pkg/grpc/management.proto

@@ -12,6 +12,7 @@ service management {
 message GetDevicesRequest {
     uint32 clientId = 1;
     uint32 reactorId = 2;           // if unspecified, don't return any devs
+    bool refresh = 3;
 }
 
 message GetDevicesResponse {

internal/pkg/grpc/monitoring.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.27.1
+// 	protoc-gen-go v1.28.0
 // 	protoc        v3.6.1
 // source: internal/pkg/grpc/monitoring.proto
 
@@ -20,7 +20,7 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-type ReactorStatusRequest struct {
+type ReactorStatusResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -28,8 +28,8 @@ type ReactorStatusRequest struct {
 	Id uint32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
 }
 
-func (x *ReactorStatusRequest) Reset() {
+func (x *ReactorStatusResponse) Reset() {
-	*x = ReactorStatusRequest{}
+	*x = ReactorStatusResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_internal_pkg_grpc_monitoring_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -37,13 +37,13 @@ func (x *ReactorStatusRequest) Reset() {
 	}
 }
 
-func (x *ReactorStatusRequest) String() string {
+func (x *ReactorStatusResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*ReactorStatusRequest) ProtoMessage() {}
+func (*ReactorStatusResponse) ProtoMessage() {}
 
-func (x *ReactorStatusRequest) ProtoReflect() protoreflect.Message {
+func (x *ReactorStatusResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_internal_pkg_grpc_monitoring_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -55,19 +55,19 @@ func (x *ReactorStatusRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ReactorStatusRequest.ProtoReflect.Descriptor instead.
+// Deprecated: Use ReactorStatusResponse.ProtoReflect.Descriptor instead.
-func (*ReactorStatusRequest) Descriptor() ([]byte, []int) {
+func (*ReactorStatusResponse) Descriptor() ([]byte, []int) {
 	return file_internal_pkg_grpc_monitoring_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *ReactorStatusRequest) GetId() uint32 {
+func (x *ReactorStatusResponse) GetId() uint32 {
 	if x != nil {
 		return x.Id
 	}
 	return 0
 }
 
-type ReactorStatusResponse struct {
+type ReactorStatusPing struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -76,8 +76,8 @@ type ReactorStatusResponse struct {
 	Devices []*Device `protobuf:"bytes,2,rep,name=devices,proto3" json:"devices,omitempty"`
 }
 
-func (x *ReactorStatusResponse) Reset() {
+func (x *ReactorStatusPing) Reset() {
-	*x = ReactorStatusResponse{}
+	*x = ReactorStatusPing{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_internal_pkg_grpc_monitoring_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -85,13 +85,13 @@ func (x *ReactorStatusResponse) Reset() {
 	}
 }
 
-func (x *ReactorStatusResponse) String() string {
+func (x *ReactorStatusPing) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*ReactorStatusResponse) ProtoMessage() {}
+func (*ReactorStatusPing) ProtoMessage() {}
 
-func (x *ReactorStatusResponse) ProtoReflect() protoreflect.Message {
+func (x *ReactorStatusPing) ProtoReflect() protoreflect.Message {
 	mi := &file_internal_pkg_grpc_monitoring_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -103,19 +103,19 @@ func (x *ReactorStatusResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ReactorStatusResponse.ProtoReflect.Descriptor instead.
+// Deprecated: Use ReactorStatusPing.ProtoReflect.Descriptor instead.
-func (*ReactorStatusResponse) Descriptor() ([]byte, []int) {
+func (*ReactorStatusPing) Descriptor() ([]byte, []int) {
 	return file_internal_pkg_grpc_monitoring_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *ReactorStatusResponse) GetId() uint32 {
+func (x *ReactorStatusPing) GetId() uint32 {
 	if x != nil {
 		return x.Id
 	}
 	return 0
 }
 
-func (x *ReactorStatusResponse) GetDevices() []*Device {
+func (x *ReactorStatusPing) GetDevices() []*Device {
 	if x != nil {
 		return x.Devices
 	}
@@ -198,28 +198,28 @@ var File_internal_pkg_grpc_monitoring_proto protoreflect.FileDescriptor
 var file_internal_pkg_grpc_monitoring_proto_rawDesc = []byte{
 	0x0a, 0x22, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x67,
 	0x72, 0x70, 0x63, 0x2f, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x67, 0x72, 0x70, 0x63, 0x22, 0x26, 0x0a, 0x14, 0x52, 0x65,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x67, 0x72, 0x70, 0x63, 0x22, 0x27, 0x0a, 0x15, 0x52, 0x65,
-	0x61, 0x63, 0x74, 0x6f, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x61, 0x63, 0x74, 0x6f, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02,
+	0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x69, 0x64, 0x22, 0x4f, 0x0a, 0x15, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x53, 0x74, 0x61,
+	0x02, 0x69, 0x64, 0x22, 0x4b, 0x0a, 0x11, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x53, 0x74,
-	0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x61, 0x74, 0x75, 0x73, 0x50, 0x69, 0x6e, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x07, 0x64,
+	0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x07, 0x64, 0x65, 0x76, 0x69,
-	0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x67,
+	0x63, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x72, 0x70, 0x63, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x07, 0x64, 0x65, 0x76, 0x69,
+	0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x07, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73,
-	0x63, 0x65, 0x73, 0x22, 0x5c, 0x0a, 0x06, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a,
+	0x22, 0x5c, 0x0a, 0x06, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x64,
-	0x04, 0x61, 0x64, 0x64, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x61, 0x64, 0x64,
+	0x64, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x61, 0x64, 0x64, 0x72, 0x12, 0x12,
-	0x72, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79,
-	0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18,
+	0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01,
-	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x12, 0x0a,
+	0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61,
-	0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74,
+	0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x32, 0x5a,
-	0x61, 0x32, 0x59, 0x0a, 0x0a, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x6e, 0x67, 0x12,
+	0x0a, 0x0a, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x4c, 0x0a, 0x14,
-	0x4b, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x53, 0x74, 0x61,
+	0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x48, 0x61, 0x6e,
-	0x74, 0x75, 0x73, 0x12, 0x1a, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x61, 0x63, 0x74,
+	0x64, 0x6c, 0x65, 0x72, 0x12, 0x17, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x61, 0x63,
-	0x6f, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x74, 0x6f, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x50, 0x69, 0x6e, 0x67, 0x1a, 0x1b, 0x2e,
-	0x1b, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x53, 0x74,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x53, 0x74, 0x61, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x13, 0x5a, 0x11,
+	0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x13, 0x5a, 0x11, 0x69, 0x6e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x67, 0x72, 0x70,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x62,
-	0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -236,14 +236,14 @@ func file_internal_pkg_grpc_monitoring_proto_rawDescGZIP() []byte {
 
 var file_internal_pkg_grpc_monitoring_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_internal_pkg_grpc_monitoring_proto_goTypes = []interface{}{
-	(*ReactorStatusRequest)(nil),  // 0: grpc.ReactorStatusRequest
+	(*ReactorStatusResponse)(nil), // 0: grpc.ReactorStatusResponse
-	(*ReactorStatusResponse)(nil), // 1: grpc.ReactorStatusResponse
+	(*ReactorStatusPing)(nil),     // 1: grpc.ReactorStatusPing
 	(*Device)(nil),                // 2: grpc.Device
 }
 var file_internal_pkg_grpc_monitoring_proto_depIdxs = []int32{
-	2, // 0: grpc.ReactorStatusResponse.devices:type_name -> grpc.Device
+	2, // 0: grpc.ReactorStatusPing.devices:type_name -> grpc.Device
-	0, // 1: grpc.monitoring.GetReactorStatus:input_type -> grpc.ReactorStatusRequest
+	1, // 1: grpc.monitoring.ReactorStatusHandler:input_type -> grpc.ReactorStatusPing
-	1, // 2: grpc.monitoring.GetReactorStatus:output_type -> grpc.ReactorStatusResponse
+	0, // 2: grpc.monitoring.ReactorStatusHandler:output_type -> grpc.ReactorStatusResponse
 	2, // [2:3] is the sub-list for method output_type
 	1, // [1:2] is the sub-list for method input_type
 	1, // [1:1] is the sub-list for extension type_name
@@ -258,7 +258,7 @@ func file_internal_pkg_grpc_monitoring_proto_init() {
 	}
 	if !protoimpl.UnsafeEnabled {
 		file_internal_pkg_grpc_monitoring_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ReactorStatusRequest); i {
+			switch v := v.(*ReactorStatusResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -270,7 +270,7 @@ func file_internal_pkg_grpc_monitoring_proto_init() {
 			}
 		}
 		file_internal_pkg_grpc_monitoring_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ReactorStatusResponse); i {
+			switch v := v.(*ReactorStatusPing); i {
 			case 0:
 				return &v.state
 			case 1:

internal/pkg/grpc/monitoring.proto

@@ -4,14 +4,14 @@ package grpc;
 option go_package = "internal/pkg/grpc";
 
 service monitoring {
-    rpc GetReactorStatus(ReactorStatusRequest) returns (ReactorStatusResponse);
+    rpc ReactorStatusHandler(ReactorStatusPing) returns (ReactorStatusResponse);
 }
 
-message ReactorStatusRequest {
+message ReactorStatusResponse {
     uint32 id = 1;
 }
 
-message ReactorStatusResponse {
+message ReactorStatusPing {
     uint32 id = 1;
     repeated Device devices = 2;
 }

internal/pkg/grpc/monitoring_grpc.pb.go

@@ -22,7 +22,7 @@ const _ = grpc.SupportPackageIsVersion7
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type MonitoringClient interface {
-	GetReactorStatus(ctx context.Context, in *ReactorStatusRequest, opts ...grpc.CallOption) (*ReactorStatusResponse, error)
+	ReactorStatusHandler(ctx context.Context, in *ReactorStatusPing, opts ...grpc.CallOption) (*ReactorStatusResponse, error)
 }
 
 type monitoringClient struct {
@@ -33,9 +33,9 @@ func NewMonitoringClient(cc grpc.ClientConnInterface) MonitoringClient {
 	return &monitoringClient{cc}
 }
 
-func (c *monitoringClient) GetReactorStatus(ctx context.Context, in *ReactorStatusRequest, opts ...grpc.CallOption) (*ReactorStatusResponse, error) {
+func (c *monitoringClient) ReactorStatusHandler(ctx context.Context, in *ReactorStatusPing, opts ...grpc.CallOption) (*ReactorStatusResponse, error) {
 	out := new(ReactorStatusResponse)
-	err := c.cc.Invoke(ctx, "/grpc.monitoring/GetReactorStatus", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/grpc.monitoring/ReactorStatusHandler", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -46,7 +46,7 @@ func (c *monitoringClient) GetReactorStatus(ctx context.Context, in *ReactorStat
 // All implementations must embed UnimplementedMonitoringServer
 // for forward compatibility
 type MonitoringServer interface {
-	GetReactorStatus(context.Context, *ReactorStatusRequest) (*ReactorStatusResponse, error)
+	ReactorStatusHandler(context.Context, *ReactorStatusPing) (*ReactorStatusResponse, error)
 	mustEmbedUnimplementedMonitoringServer()
 }
 
@@ -54,8 +54,8 @@ type MonitoringServer interface {
 type UnimplementedMonitoringServer struct {
 }
 
-func (UnimplementedMonitoringServer) GetReactorStatus(context.Context, *ReactorStatusRequest) (*ReactorStatusResponse, error) {
+func (UnimplementedMonitoringServer) ReactorStatusHandler(context.Context, *ReactorStatusPing) (*ReactorStatusResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetReactorStatus not implemented")
+	return nil, status.Errorf(codes.Unimplemented, "method ReactorStatusHandler not implemented")
 }
 func (UnimplementedMonitoringServer) mustEmbedUnimplementedMonitoringServer() {}
 
@@ -70,20 +70,20 @@ func RegisterMonitoringServer(s grpc.ServiceRegistrar, srv MonitoringServer) {
 	s.RegisterService(&Monitoring_ServiceDesc, srv)
 }
 
-func _Monitoring_GetReactorStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _Monitoring_ReactorStatusHandler_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ReactorStatusRequest)
+	in := new(ReactorStatusPing)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(MonitoringServer).GetReactorStatus(ctx, in)
+		return srv.(MonitoringServer).ReactorStatusHandler(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/grpc.monitoring/GetReactorStatus",
+		FullMethod: "/grpc.monitoring/ReactorStatusHandler",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MonitoringServer).GetReactorStatus(ctx, req.(*ReactorStatusRequest))
+		return srv.(MonitoringServer).ReactorStatusHandler(ctx, req.(*ReactorStatusPing))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -96,8 +96,8 @@ var Monitoring_ServiceDesc = grpc.ServiceDesc{
 	HandlerType: (*MonitoringServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
-			MethodName: "GetReactorStatus",
+			MethodName: "ReactorStatusHandler",
-			Handler:    _Monitoring_GetReactorStatus_Handler,
+			Handler:    _Monitoring_ReactorStatusHandler_Handler,
 		},
 	},
 	Streams:  []grpc.StreamDesc{},

internal/pkg/grpc/server.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.27.1
+// 	protoc-gen-go v1.28.0
 // 	protoc        v3.6.1
 // source: internal/pkg/grpc/server.proto
 
@@ -20,20 +20,17 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-type ReactorClientRequest struct {
+type ClientRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	ClientId    uint32 `protobuf:"varint,1,opt,name=clientId,proto3" json:"clientId,omitempty"`
+	ClientId   uint32 `protobuf:"varint,1,opt,name=clientId,proto3" json:"clientId,omitempty"`
-	ClientIp    string `protobuf:"bytes,2,opt,name=clientIp,proto3" json:"clientIp,omitempty"`
+	ClientType string `protobuf:"bytes,2,opt,name=clientType,proto3" json:"clientType,omitempty"`
-	ClientPort  int32  `protobuf:"varint,3,opt,name=clientPort,proto3" json:"clientPort,omitempty"`
-	ClientModel string `protobuf:"bytes,4,opt,name=clientModel,proto3" json:"clientModel,omitempty"`
-	ClientType  string `protobuf:"bytes,5,opt,name=clientType,proto3" json:"clientType,omitempty"`
 }
 
-func (x *ReactorClientRequest) Reset() {
+func (x *ClientRequest) Reset() {
-	*x = ReactorClientRequest{}
+	*x = ClientRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_internal_pkg_grpc_server_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -41,13 +38,13 @@ func (x *ReactorClientRequest) Reset() {
 	}
 }
 
-func (x *ReactorClientRequest) String() string {
+func (x *ClientRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*ReactorClientRequest) ProtoMessage() {}
+func (*ClientRequest) ProtoMessage() {}
 
-func (x *ReactorClientRequest) ProtoReflect() protoreflect.Message {
+func (x *ClientRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_internal_pkg_grpc_server_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -59,57 +56,36 @@ func (x *ReactorClientRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ReactorClientRequest.ProtoReflect.Descriptor instead.
+// Deprecated: Use ClientRequest.ProtoReflect.Descriptor instead.
-func (*ReactorClientRequest) Descriptor() ([]byte, []int) {
+func (*ClientRequest) Descriptor() ([]byte, []int) {
 	return file_internal_pkg_grpc_server_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *ReactorClientRequest) GetClientId() uint32 {
+func (x *ClientRequest) GetClientId() uint32 {
 	if x != nil {
 		return x.ClientId
 	}
 	return 0
 }
 
-func (x *ReactorClientRequest) GetClientIp() string {
+func (x *ClientRequest) GetClientType() string {
-	if x != nil {
-		return x.ClientIp
-	}
-	return ""
-}
-
-func (x *ReactorClientRequest) GetClientPort() int32 {
-	if x != nil {
-		return x.ClientPort
-	}
-	return 0
-}
-
-func (x *ReactorClientRequest) GetClientModel() string {
-	if x != nil {
-		return x.ClientModel
-	}
-	return ""
-}
-
-func (x *ReactorClientRequest) GetClientType() string {
 	if x != nil {
 		return x.ClientType
 	}
 	return ""
 }
 
-type ReactorClientResponse struct {
+type ClientResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	ClientId uint32 `protobuf:"varint,1,opt,name=clientId,proto3" json:"clientId,omitempty"`
+	ClientId   uint32 `protobuf:"varint,1,opt,name=clientId,proto3" json:"clientId,omitempty"`
-	Success  bool   `protobuf:"varint,2,opt,name=Success,proto3" json:"Success,omitempty"`
+	ServerPort uint32 `protobuf:"varint,2,opt,name=serverPort,proto3" json:"serverPort,omitempty"`
 }
 
-func (x *ReactorClientResponse) Reset() {
+func (x *ClientResponse) Reset() {
-	*x = ReactorClientResponse{}
+	*x = ClientResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_internal_pkg_grpc_server_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -117,13 +93,13 @@ func (x *ReactorClientResponse) Reset() {
 	}
 }
 
-func (x *ReactorClientResponse) String() string {
+func (x *ClientResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*ReactorClientResponse) ProtoMessage() {}
+func (*ClientResponse) ProtoMessage() {}
 
-func (x *ReactorClientResponse) ProtoReflect() protoreflect.Message {
+func (x *ClientResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_internal_pkg_grpc_server_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -135,129 +111,19 @@ func (x *ReactorClientResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ReactorClientResponse.ProtoReflect.Descriptor instead.
+// Deprecated: Use ClientResponse.ProtoReflect.Descriptor instead.
-func (*ReactorClientResponse) Descriptor() ([]byte, []int) {
+func (*ClientResponse) Descriptor() ([]byte, []int) {
 	return file_internal_pkg_grpc_server_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *ReactorClientResponse) GetClientId() uint32 {
+func (x *ClientResponse) GetClientId() uint32 {
 	if x != nil {
 		return x.ClientId
 	}
 	return 0
 }
 
-func (x *ReactorClientResponse) GetSuccess() bool {
+func (x *ClientResponse) GetServerPort() uint32 {
-	if x != nil {
-		return x.Success
-	}
-	return false
-}
-
-type TUIClientRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ClientId uint32 `protobuf:"varint,1,opt,name=clientId,proto3" json:"clientId,omitempty"`
-}
-
-func (x *TUIClientRequest) Reset() {
-	*x = TUIClientRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_pkg_grpc_server_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TUIClientRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TUIClientRequest) ProtoMessage() {}
-
-func (x *TUIClientRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_pkg_grpc_server_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TUIClientRequest.ProtoReflect.Descriptor instead.
-func (*TUIClientRequest) Descriptor() ([]byte, []int) {
-	return file_internal_pkg_grpc_server_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *TUIClientRequest) GetClientId() uint32 {
-	if x != nil {
-		return x.ClientId
-	}
-	return 0
-}
-
-type TUIClientResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ClientId   uint32 `protobuf:"varint,1,opt,name=clientId,proto3" json:"clientId,omitempty"`
-	ServerIp   string `protobuf:"bytes,2,opt,name=serverIp,proto3" json:"serverIp,omitempty"`
-	ServerPort int32  `protobuf:"varint,3,opt,name=serverPort,proto3" json:"serverPort,omitempty"`
-}
-
-func (x *TUIClientResponse) Reset() {
-	*x = TUIClientResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_pkg_grpc_server_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TUIClientResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TUIClientResponse) ProtoMessage() {}
-
-func (x *TUIClientResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_pkg_grpc_server_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TUIClientResponse.ProtoReflect.Descriptor instead.
-func (*TUIClientResponse) Descriptor() ([]byte, []int) {
-	return file_internal_pkg_grpc_server_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *TUIClientResponse) GetClientId() uint32 {
-	if x != nil {
-		return x.ClientId
-	}
-	return 0
-}
-
-func (x *TUIClientResponse) GetServerIp() string {
-	if x != nil {
-		return x.ServerIp
-	}
-	return ""
-}
-
-func (x *TUIClientResponse) GetServerPort() int32 {
 	if x != nil {
 		return x.ServerPort
 	}
@@ -269,46 +135,23 @@ var File_internal_pkg_grpc_server_proto protoreflect.FileDescriptor
 var file_internal_pkg_grpc_server_proto_rawDesc = []byte{
 	0x0a, 0x1e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x67,
 	0x72, 0x70, 0x63, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x12, 0x04, 0x67, 0x72, 0x70, 0x63, 0x22, 0xb0, 0x01, 0x0a, 0x14, 0x52, 0x65, 0x61, 0x63, 0x74,
+	0x12, 0x04, 0x67, 0x72, 0x70, 0x63, 0x22, 0x4b, 0x0a, 0x0d, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74,
-	0x6f, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e,
-	0x1a, 0x0a, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e,
-	0x0d, 0x52, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63,
+	0x74, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70,
-	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54,
-	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6c, 0x69, 0x65, 0x6e,
+	0x79, 0x70, 0x65, 0x22, 0x4c, 0x0a, 0x0e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73,
-	0x74, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x6c, 0x69,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49,
-	0x65, 0x6e, 0x74, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6c, 0x69, 0x65, 0x6e,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49,
-	0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6c,
+	0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x18,
-	0x69, 0x65, 0x6e, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6c, 0x69,
+	0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x50, 0x6f, 0x72,
-	0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63,
+	0x74, 0x32, 0x50, 0x0a, 0x09, 0x68, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x12, 0x43,
-	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x22, 0x4d, 0x0a, 0x15, 0x52, 0x65, 0x61,
+	0x0a, 0x16, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
-	0x63, 0x74, 0x6f, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x79, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x12, 0x13, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01,
+	0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e,
-	0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x18,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x6e, 0x73, 0x65, 0x42, 0x13, 0x5a, 0x11, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f,
-	0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0x2e, 0x0a, 0x10, 0x54, 0x55, 0x49, 0x43,
+	0x70, 0x6b, 0x67, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08,
-	0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08,
-	0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x6b, 0x0a, 0x11, 0x54, 0x55, 0x49, 0x43,
-	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a,
-	0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72,
-	0x76, 0x65, 0x72, 0x49, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x65, 0x72,
-	0x76, 0x65, 0x72, 0x49, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x50,
-	0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65,
-	0x72, 0x50, 0x6f, 0x72, 0x74, 0x32, 0xb3, 0x01, 0x0a, 0x09, 0x68, 0x61, 0x6e, 0x64, 0x73, 0x68,
-	0x61, 0x6b, 0x65, 0x12, 0x58, 0x0a, 0x1d, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x43, 0x6c,
-	0x69, 0x65, 0x6e, 0x74, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x48, 0x61, 0x6e,
-	0x64, 0x6c, 0x65, 0x72, 0x12, 0x1a, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x61, 0x63,
-	0x74, 0x6f, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x1b, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x43,
-	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4c, 0x0a,
-	0x19, 0x54, 0x55, 0x49, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76,
-	0x65, 0x72, 0x79, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x12, 0x16, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x54, 0x55, 0x49, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x17, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x55, 0x49, 0x43, 0x6c, 0x69,
-	0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x13, 0x5a, 0x11, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x67, 0x72, 0x70, 0x63,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -323,20 +166,16 @@ func file_internal_pkg_grpc_server_proto_rawDescGZIP() []byte {
 	return file_internal_pkg_grpc_server_proto_rawDescData
 }
 
-var file_internal_pkg_grpc_server_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_internal_pkg_grpc_server_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_internal_pkg_grpc_server_proto_goTypes = []interface{}{
-	(*ReactorClientRequest)(nil),  // 0: grpc.ReactorClientRequest
+	(*ClientRequest)(nil),  // 0: grpc.ClientRequest
-	(*ReactorClientResponse)(nil), // 1: grpc.ReactorClientResponse
+	(*ClientResponse)(nil), // 1: grpc.ClientResponse
-	(*TUIClientRequest)(nil),      // 2: grpc.TUIClientRequest
-	(*TUIClientResponse)(nil),     // 3: grpc.TUIClientResponse
 }
 var file_internal_pkg_grpc_server_proto_depIdxs = []int32{
-	0, // 0: grpc.handshake.ReactorClientDiscoveryHandler:input_type -> grpc.ReactorClientRequest
+	0, // 0: grpc.handshake.ClientDiscoveryHandler:input_type -> grpc.ClientRequest
-	2, // 1: grpc.handshake.TUIClientDiscoveryHandler:input_type -> grpc.TUIClientRequest
+	1, // 1: grpc.handshake.ClientDiscoveryHandler:output_type -> grpc.ClientResponse
-	1, // 2: grpc.handshake.ReactorClientDiscoveryHandler:output_type -> grpc.ReactorClientResponse
+	1, // [1:2] is the sub-list for method output_type
-	3, // 3: grpc.handshake.TUIClientDiscoveryHandler:output_type -> grpc.TUIClientResponse
+	0, // [0:1] is the sub-list for method input_type
-	2, // [2:4] is the sub-list for method output_type
-	0, // [0:2] is the sub-list for method input_type
 	0, // [0:0] is the sub-list for extension type_name
 	0, // [0:0] is the sub-list for extension extendee
 	0, // [0:0] is the sub-list for field type_name
@@ -349,7 +188,7 @@ func file_internal_pkg_grpc_server_proto_init() {
 	}
 	if !protoimpl.UnsafeEnabled {
 		file_internal_pkg_grpc_server_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ReactorClientRequest); i {
+			switch v := v.(*ClientRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -361,31 +200,7 @@ func file_internal_pkg_grpc_server_proto_init() {
 			}
 		}
 		file_internal_pkg_grpc_server_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ReactorClientResponse); i {
+			switch v := v.(*ClientResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_pkg_grpc_server_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TUIClientRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_pkg_grpc_server_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TUIClientResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -403,7 +218,7 @@ func file_internal_pkg_grpc_server_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_internal_pkg_grpc_server_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   4,
+			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

internal/pkg/grpc/server.proto

@@ -4,28 +4,22 @@ package grpc;
 option go_package = "internal/pkg/grpc";
 
 service handshake {
-    rpc ReactorClientDiscoveryHandler(ReactorClientRequest) returns (ReactorClientResponse);
+    rpc ClientDiscoveryHandler(ClientRequest) returns (ClientResponse);
-    rpc TUIClientDiscoveryHandler(TUIClientRequest) returns (TUIClientResponse);
 }
 
-message ReactorClientRequest {
+message ClientRequest {
     uint32 clientId = 1;
-    string clientIp = 2;
+    string clientType = 2;
-    int32 clientPort = 3;
-    string clientModel = 4;
 }
 
-message ReactorClientResponse {
+message ClientResponse {
     uint32 clientId = 1;
-    bool Success = 2;
+    uint32 serverPort = 2;
+    Database database = 3;
 }
 
-message TUIClientRequest {
+message Database {
-    uint32 clientId = 1;
+    string URL = 1;
-}
+    string ORG = 2;
-
+    string token = 3;
-message TUIClientResponse {
-    uint32 clientId = 1;
-    string serverIp = 2;
-    int32 serverPort = 3;
 }

internal/pkg/grpc/server_grpc.pb.go

@@ -22,8 +22,7 @@ const _ = grpc.SupportPackageIsVersion7
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type HandshakeClient interface {
-	ReactorClientDiscoveryHandler(ctx context.Context, in *ReactorClientRequest, opts ...grpc.CallOption) (*ReactorClientResponse, error)
+	ClientDiscoveryHandler(ctx context.Context, in *ClientRequest, opts ...grpc.CallOption) (*ClientResponse, error)
-	TUIClientDiscoveryHandler(ctx context.Context, in *TUIClientRequest, opts ...grpc.CallOption) (*TUIClientResponse, error)
 }
 
 type handshakeClient struct {
@@ -34,18 +33,9 @@ func NewHandshakeClient(cc grpc.ClientConnInterface) HandshakeClient {
 	return &handshakeClient{cc}
 }
 
-func (c *handshakeClient) ReactorClientDiscoveryHandler(ctx context.Context, in *ReactorClientRequest, opts ...grpc.CallOption) (*ReactorClientResponse, error) {
+func (c *handshakeClient) ClientDiscoveryHandler(ctx context.Context, in *ClientRequest, opts ...grpc.CallOption) (*ClientResponse, error) {
-	out := new(ReactorClientResponse)
+	out := new(ClientResponse)
-	err := c.cc.Invoke(ctx, "/grpc.handshake/ReactorClientDiscoveryHandler", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/grpc.handshake/ClientDiscoveryHandler", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *handshakeClient) TUIClientDiscoveryHandler(ctx context.Context, in *TUIClientRequest, opts ...grpc.CallOption) (*TUIClientResponse, error) {
-	out := new(TUIClientResponse)
-	err := c.cc.Invoke(ctx, "/grpc.handshake/TUIClientDiscoveryHandler", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -56,8 +46,7 @@ func (c *handshakeClient) TUIClientDiscoveryHandler(ctx context.Context, in *TUI
 // All implementations must embed UnimplementedHandshakeServer
 // for forward compatibility
 type HandshakeServer interface {
-	ReactorClientDiscoveryHandler(context.Context, *ReactorClientRequest) (*ReactorClientResponse, error)
+	ClientDiscoveryHandler(context.Context, *ClientRequest) (*ClientResponse, error)
-	TUIClientDiscoveryHandler(context.Context, *TUIClientRequest) (*TUIClientResponse, error)
 	mustEmbedUnimplementedHandshakeServer()
 }
 
@@ -65,11 +54,8 @@ type HandshakeServer interface {
 type UnimplementedHandshakeServer struct {
 }
 
-func (UnimplementedHandshakeServer) ReactorClientDiscoveryHandler(context.Context, *ReactorClientRequest) (*ReactorClientResponse, error) {
+func (UnimplementedHandshakeServer) ClientDiscoveryHandler(context.Context, *ClientRequest) (*ClientResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ReactorClientDiscoveryHandler not implemented")
+	return nil, status.Errorf(codes.Unimplemented, "method ClientDiscoveryHandler not implemented")
-}
-func (UnimplementedHandshakeServer) TUIClientDiscoveryHandler(context.Context, *TUIClientRequest) (*TUIClientResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method TUIClientDiscoveryHandler not implemented")
 }
 func (UnimplementedHandshakeServer) mustEmbedUnimplementedHandshakeServer() {}
 
@@ -84,38 +70,20 @@ func RegisterHandshakeServer(s grpc.ServiceRegistrar, srv HandshakeServer) {
 	s.RegisterService(&Handshake_ServiceDesc, srv)
 }
 
-func _Handshake_ReactorClientDiscoveryHandler_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _Handshake_ClientDiscoveryHandler_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ReactorClientRequest)
+	in := new(ClientRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(HandshakeServer).ReactorClientDiscoveryHandler(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/grpc.handshake/ReactorClientDiscoveryHandler",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(HandshakeServer).ReactorClientDiscoveryHandler(ctx, req.(*ReactorClientRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Handshake_TUIClientDiscoveryHandler_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TUIClientRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(HandshakeServer).TUIClientDiscoveryHandler(ctx, in)
+		return srv.(HandshakeServer).ClientDiscoveryHandler(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/grpc.handshake/TUIClientDiscoveryHandler",
+		FullMethod: "/grpc.handshake/ClientDiscoveryHandler",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(HandshakeServer).TUIClientDiscoveryHandler(ctx, req.(*TUIClientRequest))
+		return srv.(HandshakeServer).ClientDiscoveryHandler(ctx, req.(*ClientRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -128,12 +96,8 @@ var Handshake_ServiceDesc = grpc.ServiceDesc{
 	HandlerType: (*HandshakeServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
-			MethodName: "ReactorClientDiscoveryHandler",
+			MethodName: "ClientDiscoveryHandler",
-			Handler:    _Handshake_ReactorClientDiscoveryHandler_Handler,
+			Handler:    _Handshake_ClientDiscoveryHandler_Handler,
-		},
-		{
-			MethodName: "TUIClientDiscoveryHandler",
-			Handler:    _Handshake_TUIClientDiscoveryHandler_Handler,
 		},
 	},
 	Streams:  []grpc.StreamDesc{},

internal/pkg/influxdb/client.go

@@ -0,0 +1,6 @@
+package influxdb
+
+import (
+    "fmt"
+    "github.com/influxdata/influxdb-client-go/v2"
+)

internal/pkg/logging/logging.go

@@ -4,10 +4,18 @@ import (
     "log"
     "fmt"
     "os"
+    "errors"
     "time"
     "strconv"
 )
 
+func getLogType() string {
+    if t, ok := os.LookupEnv("LOGTYPE"); ok {
+        return t
+    }
+    return "DEFAULT"
+}
+
 func getVerbosity() int {
     v := os.Getenv("VERBOSE")
     level := 0
@@ -15,7 +23,7 @@ func getVerbosity() int {
         var err error
         level, err = strconv.Atoi(v)
         if err != nil {
-            log.Fatalf("Invalid Vverboity %v", v)
+            log.Fatalf("Invalid Verbosity %v", v)
         }
     }
     return level
@@ -38,12 +46,22 @@ var debugStart time.Time
 var debugVerbosity int
 
 func init() {
+
     debugVerbosity = getVerbosity()
     debugStart = time.Now()
     if debugVerbosity > 0 {
-        filename := time.Now().Format("01-02T15:04:05")
+        path := "log/"
-        filename += ".log"
+        if _, err := os.Stat(path); errors.Is(err, os.ErrNotExist) {
-        f, err := os.OpenFile(filename, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0664)
+            err := os.Mkdir(path, os.ModePerm)
+            if err != nil {
+               fmt.Println(err)
+               os.Exit(1)
+            }
+        }
+        logtype := getLogType() // start with "REACTOR" etc
+        timestamp := time.Now().Format("Mon-15:04:05")
+        filename := fmt.Sprintf("%s-%s.log", logtype, timestamp)
+        f, err := os.OpenFile(path+filename, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0664)
         if err != nil {
             log.Fatal(err)
         }

internal/pkg/reactor/monitoring.go

@@ -3,11 +3,15 @@ package reactor
 import (
     "sync"
     "context"
-    "log"
+    "strings"
-    "fmt"
+    "github.com/influxdata/influxdb-client-go/v2"
-    "net"
+    "strconv"
-    "FRMS/internal/pkg/logging"
+    "time"
-    "google.golang.org/grpc"
+    //"log"
+    //"fmt"
+    //"net"
+    //"FRMS/internal/pkg/logging"
+    //"google.golang.org/grpc"
     pb "FRMS/internal/pkg/grpc"
 )
 
@@ -28,9 +32,11 @@ func (c *Coordinator) DevStatus(ch chan *DeviceStatus, a int, dm DeviceManager)
     ch <-d
 }
 
-func (c *Coordinator) GetStatus() []*DeviceStatus {
+func (c *Coordinator) GetStatus(client influxdb2.Client) []*pb.Device {
+    // db stuff
+    api := client.WriteAPIBlocking(c.Org,c.Bucket)
     var wg sync.WaitGroup
-    devs := []*DeviceStatus{}
+    devs := []*pb.Device{}
     statusChan := make(chan *DeviceStatus)
     c.Devices.Lock()
     for a,dm := range c.Devices.Managers {
@@ -46,8 +52,26 @@ func (c *Coordinator) GetStatus() []*DeviceStatus {
     for {
         select{
         case s:= <-statusChan:
-            //fmt.Printf("%v is %v, ",s.Type,s.Status)
+            //fmt.Printf("%v is %v\n",s.Type,s.Status)
-            devs = append(devs,s)
+            data := strings.Split(s.Data,",") // T:10C,H:102% -> T:10C H:10%
+            for _, m := range data {
+                var meas string
+                splt := strings.Split(m,":") // T 10C or H 10%
+                if splt[0] == "T" {
+                    meas = "Temperature"
+                } else if splt[0] == "H" {
+                    meas = "Humidity"
+                }
+                val, err := strconv.ParseFloat(strings.Trim(splt[1]," %C\n"), 64)
+                if err != nil {
+                    panic(err)
+                }
+                p := influxdb2.NewPoint("measurements",map[string]string{"type":meas},map[string]interface{}{"val":val},time.Now())
+                if err := api.WritePoint(context.Background(), p); err != nil {
+                    panic(err)
+                }
+            }
+            devs = append(devs,&pb.Device{Addr:int32(s.Addr),Type:s.Type,Status:s.Status,Data:s.Data})
             wg.Done()
         case <-allDone:
             return devs
@@ -56,7 +80,17 @@ func (c *Coordinator) GetStatus() []*DeviceStatus {
 }
 
 // grpc status update handler
-
+func (c *Coordinator) Ping(client influxdb2.Client) {
+    // sends all device status to central coordinator
+    devs := c.GetStatus(client)
+    req := &pb.ReactorStatusPing{Id:c.Id,Devices:devs}
+    _, err := c.MonitoringClient.ReactorStatusHandler(context.Background(),req)
+    if err != nil {
+        c.Err <-err
+        go c.Exit()
+    }
+}
+/*
 func (c *Coordinator) Register() {
     ip := c.hwinfo.Ip
 
@@ -70,15 +104,4 @@ func (c *Coordinator) Register() {
     }
     logging.Debug(logging.DStart, "Listening for pings on %v:%v\n",ip,c.hwinfo.Port)
 }
-
+*/
-func (c *Coordinator) GetReactorStatus(ctx context.Context, ping *pb.ReactorStatusRequest) (*pb.ReactorStatusResponse, error) {
-    // status request handler
-    devs := []*pb.Device{}
-    resp := &pb.ReactorStatusResponse{Id:c.Id,Devices:devs}
-    devStatus := c.GetStatus()
-    for _,v := range devStatus {
-        d := &pb.Device{Addr:int32(v.Addr),Type:v.Type,Status:v.Status,Data:v.Data}
-        resp.Devices = append(resp.Devices,d)
-    }
-    return resp, nil
-}

internal/pkg/reactor/rlcoordinator.go

@@ -16,19 +16,32 @@ import (
     "google.golang.org/grpc"
     "google.golang.org/grpc/status"
     "google.golang.org/grpc/credentials/insecure"
+    "github.com/influxdata/influxdb-client-go/v2"
     pb "FRMS/internal/pkg/grpc"
 )
 
 // Coordinator == Reactor Level Coordinator
 
 type Coordinator struct {
-    *server
+    Ip string
-    *hwinfo
+    Port int        // listener port
+    MonitoringClient pb.MonitoringClient
+    *hw
     Devices *DeviceManagers // struct for fine grain locking
     Err chan error
     mu sync.Mutex
+    HB time.Duration
+    PingTimer chan struct{}
+    *DB
     Active active
-    pb.UnimplementedMonitoringServer
+}
+
+type DB struct {
+    // struct to hold db connection info
+    Org string
+    Bucket string
+    Token string
+    URL string
 }
 
 type active struct {
@@ -37,16 +50,8 @@ type active struct {
     sync.Mutex
 }
 
-type server struct {
+type hw struct {
-    // store central server endpoint
-    Ip string
-    Port int
-}
-
-type hwinfo struct {
     // store reactor info
-    Ip string
-    Port int
     Model string
     Bus int
     Id uint32
@@ -86,54 +91,61 @@ func NewI2CMonitor(b int,ch chan int) I2CMonitor {
 }
 
 func NewCoordinator(ip string,port int,ch chan error) *Coordinator {
-    serv := &server{Ip:ip,Port:port}
     sen := new(DeviceManagers)
     sen.Managers = make(map[int]DeviceManager)
     c := &Coordinator{Err:ch,Devices:sen}
-    c.server = serv
+    c.Ip = ip
-    c.hwinfo = &hwinfo{}
+    c.Port = port
+    c.hw = &hw{}
+    c.HB = time.Duration(5 * time.Second)
+    c.PingTimer = make(chan struct{})
+    // this is going to be scuffed
+    url := fmt.Sprintf("http://%s:8086",ip)
+    fmt.Println(url)
+    c.DB = &DB{Bucket:"bb",Org:"ForeLight",URL:url,Token:"S1UZssBu6KPfHaQCt34pZFpyc5lzbH9XanYJWCkOI5FqLY7gq205C6FTH-CmugiPH6o2WoKlTkEuPgIfaJjAhw=="}
     return c
 }
 
-type Hardware interface {
-    GetId() uint32
-    GetIp() string
-    GetBus() int
-    GetModel() string
-    GetPort() int
-}
-
-func GetHWInfo() (Hardware, error) {
-    return system.NewHWinfo()
-}
-
 func (c *Coordinator) Start() {
     // should discover hwinfo and sensors on its own
     // now setting up sensor managers
-    hw, err := GetHWInfo() // locking provided by struct is only useful on init
+    // setting up hw stuff
+    c.Activate()
+    var err error
+    c.Id, err = system.GetId("eth0")
+    c.Model, err = system.GetModel()
+    c.Bus, err = system.GetBus()
     if err != nil {
         c.Err <-err
     }
-    // setting up hw stuff
-    c.hwinfo.Ip = hw.GetIp() //get should prevent empty data
-    c.Id = hw.GetId()
-    c.Model = hw.GetModel()
-    c.Bus = hw.GetBus()
-    c.Register()
     go c.Monitor()
-    go c.Connect()
+    go c.Discover()
-    logging.Debug(logging.DStart, "%v RLC Starting", c.Id)
 }
 
 func (c *Coordinator) Monitor() {
     // function to automatically create and destroy sm
-    ch := make(chan int)
+    // scuffedaf
-    im := NewI2CMonitor(c.Bus,ch)
+    client := influxdb2.NewClient(c.URL,c.Token)
+    defer client.Close()
+    dch := make(chan int)
+    im := NewI2CMonitor(c.Bus,dch)
     go im.Monitor()
-    for {
+    for c.IsActive() {
-        d := <-ch
+        select {
-        i := im.GetDevice(d)
+        case d := <-dch:
-        go c.DeviceConnect(i)
+            i := im.GetDevice(d)
+            go c.DeviceConnect(i)
+        case <-c.PingTimer:
+            go c.Ping(client)
+        }
+    }
+}
+
+func (c *Coordinator) HeartBeat() {
+    for c.IsActive() {
+        c.PingTimer <-struct{}{}
+        logging.Debug(logging.DClient,"RLC Pinging server")
+        time.Sleep(c.HB)
     }
 }
 
@@ -150,42 +162,56 @@ func (c *Coordinator) DeviceConnect(i2c I2CDev) {
     }
 }
 
-func (c *Coordinator) Connect() {
+func (c *Coordinator) Discover() {
+    // sets up connection to central coordiantor
+    conn, err := c.Connect(c.Ip, c.Port)
+    if err != nil {
+        c.Err <-err
+    }
+    defer conn.Close()
+    client := pb.NewHandshakeClient(conn)
+    req := &pb.ClientRequest{ClientId:c.Id,ClientType:"reactor"}
+    resp, err := client.ClientDiscoveryHandler(context.Background(), req)
+    if err != nil {
+        c.Err <-err
+    }
+    c.Port = int(resp.GetServerPort()) // updating server port
+    logging.Debug(logging.DClient,"RLC Central server reached, supplied port %v",c.Port)
+    // connecting to manager now
+    clientConn, err := c.Connect(c.Ip, c.Port)
+    if err != nil {
+        c.Err <-err
+    }
+    c.MonitoringClient = pb.NewMonitoringClient(clientConn)
+    go c.HeartBeat()
+
+}
+
+func (c *Coordinator) Connect(ip string, port int) (*grpc.ClientConn, error) {
     // function connects to central server and passes hwinfo
     var opts []grpc.DialOption
     opts = append(opts,grpc.WithTransportCredentials(insecure.NewCredentials()))
     var conn *grpc.ClientConn
     var err error
     for {
-        conn, err = grpc.Dial(fmt.Sprintf("%v:%v",c.server.Ip,c.server.Port),opts...)
+        conn, err = grpc.Dial(fmt.Sprintf("%v:%v",ip,port),opts...)
         code := status.Code(err)
         if code != 0 { // != OK
             if code == (5 | 14) { // service temp down
                 to := c.Timeout()
                 if to == 0 {
                     err = errors.New("Failed to connect to central server")
-                    c.Err <-err
+                    return &grpc.ClientConn{}, err
                 }
                 logging.Debug(logging.DClient,"Server currently unavailable, retrying in %v ms", to)
                 time.Sleep(time.Duration(to) * time.Millisecond)
             } else {
-                c.Err <-err
+                return &grpc.ClientConn{}, err
             }
         }
         break;
     }
-    defer conn.Close()
+    return conn, nil
-    client := pb.NewHandshakeClient(conn)
-    req := &pb.ReactorClientRequest{ClientId:c.Id,ClientIp:c.hwinfo.Ip,ClientPort:int32(c.hwinfo.Port),ClientModel:c.Model}
-    resp, err := client.ReactorClientDiscoveryHandler(context.Background(), req)
-    if err != nil {
-        c.Err <-err
-    }
-    if resp.GetSuccess() {
-        logging.Debug(logging.DClient,"Central server reached")
-    } else {
-        c.Err <-errors.New("Failed to reach central server!")
-    }
 }
 
 func (c *Coordinator) Timeout() int {
@@ -200,3 +226,35 @@ func (c *Coordinator) Timeout() int {
         return 0
     }
 }
+
+func (c *Coordinator) IsActive() bool {
+    c.Active.Lock()
+    defer c.Active.Unlock()
+    return c.Active.bool
+}
+
+func (c *Coordinator) Exit() bool {
+    c.Active.Lock()
+    defer c.Active.Unlock()
+    if c.Active.bool {
+        c.Active.bool = false
+        logging.Debug(logging.DClient,"RLC Exiting...")
+        return true
+    } else {
+        logging.Debug(logging.DError, "RLC Already Dead!")
+        return false
+    }
+}
+
+func (c *Coordinator) Activate() bool {
+    c.Active.Lock()
+    defer c.Active.Unlock()
+    if c.Active.bool {
+        logging.Debug(logging.DError,"RLC Already Started!")
+        return false
+    } else {
+        logging.Debug(logging.DClient, "RLC Starting")
+        c.Active.bool = true
+        return c.Active.bool
+    }
+}

internal/pkg/server/coordinator.go

@@ -3,101 +3,192 @@ package server
 import (
     "sync"
     //"fmt"
+    "net"
+    "context"
+    "errors"
     "FRMS/internal/pkg/logging"
+    "google.golang.org/grpc"
+    pb "FRMS/internal/pkg/grpc"
+
 )
 
 // this package creates coordinators responsible for keeping track of active clients and invoking managers
-type CreateManager interface {
+type SubCoordinator interface {
     Start()
-    NewManager(*Client, chan error) GeneralManager
+    NewManager(*Client,*SystemViewer, chan error) GeneralManager
+    GetManager(uint32) (GeneralManager, bool)
+    AddManager(uint32, GeneralManager)
+    Register()
 }
 
 type GeneralManager interface {
-    Start(*Client)
+    Start()
-    GetPort() int
+    UpdateClient(*Client)
+    ReactorStatusHandler(context.Context,*pb.ReactorStatusPing) (*pb.ReactorStatusResponse, error)
+    GetDevices(context.Context, *pb.GetDevicesRequest) (*pb.GetDevicesResponse, error)
 }
 
 type Coordinator struct {
-    *Managers
+    Port int                // port that we set up gRPC endpoint on
-    CreateManager
+    //*Managers     going to embed this in subcoordinator
+    SubCoordinator
+    *SystemViewer
     Err chan error
-    Pc chan int
 }
 
 type Managers struct {
     Directory map[uint32]GeneralManager
-    sync.Mutex
+    sync.RWMutex                        // potential perf
 }
+
 // interface stuff
-func NewCoordinator(manager CreateManager, err chan error) *Coordinator {
+func NewCoordinator(clientType string, sys *SystemViewer, err chan error) *Coordinator {
     d := make(map[uint32]GeneralManager)
     m := &Managers{Directory:d}
     c := &Coordinator{Err:err}
-    c.CreateManager = manager
+    c.Port = 2023
-    c.Managers = m
+    sub, errs := NewSubCoordinator(clientType, m, err)
+    if errs != nil {
+        err <-errs
+    }
+    c.SubCoordinator = sub
+    c.SystemViewer = sys
+    //c.Managers = m
+    go c.Register()
     return c
 }
 
 func (c *Coordinator) Start() {
     // on start we need to create channel listener
     // on each new connection we want to check its id against our mapping
-    c.CreateManager.Start()
+    c.SubCoordinator.Start()
 }
 
 func (c *Coordinator) ClientHandler(cl *Client) int {
     // (creates and) notifies manager of client connection
-    m := c.GetManager(cl)
+    go c.UpdateManager(cl)
-    go m.Start(cl)
+    return c.Port
-    return m.GetPort()
+}
-}
+
-
+func (c *Coordinator) UpdateManager(cl *Client) {
-func (c *Coordinator) GetManager(cl *Client) GeneralManager {
+    // shouldn't happen all that often so should be fine to lock
-    c.Managers.Lock()
+    m, exists := c.GetManager(cl.Id)
-    defer c.Managers.Unlock()
+    if !exists {
-    var exists bool
+        m = c.NewManager(cl, c.SystemViewer, c.Err)
-    var m GeneralManager
+        m.UpdateClient(cl)
-    if m, exists = c.Managers.Directory[cl.Id]; !exists {
+        go c.AddManager(cl.Id, m)
-        // manager in memory
+        go m.Start()
-        m = c.NewManager(cl, c.Err)
+    }
-        c.Managers.Directory[cl.Id] = m
+    go m.UpdateClient(cl)
+}
+
+func (m *Managers) AddManager(id uint32, man GeneralManager) {
+    m.Lock()
+    defer m.Unlock()
+    m.Directory[id] = man
+}
+
+func (m *Managers) GetManager(id uint32) (GeneralManager, bool) {
+    // just read locks and reuturns
+    m.RLock()
+    defer m.RUnlock()
+    man, exists := m.Directory[id]
+    return man, exists
+}
+
+func NewSubCoordinator(clientType string, m *Managers, err chan error) (SubCoordinator, error) {
+
+    if clientType == "reactor" {
+        c := &reactorCoordinator{}
+        c.Managers = m
+        return c, nil
+    } else if clientType == "tui" {
+        c := &tuiCoordinator{}
+        c.Managers = m
+        return c, nil
     }
-    return m
+    return &reactorCoordinator{}, errors.New("Unrecognized client type")
 }
+
+// creating sub coordinators for associated gRPC handlers
 // reactor coordinator
 type reactorCoordinator struct {
-    //empty unexported for method
+    *Managers
-    Sys *SystemViewer
+    pb.UnimplementedMonitoringServer
 }
 
 func (r *reactorCoordinator) Start() {
     logging.Debug(logging.DStart,"RCO 01 Starting!")
 }
 
-func (r *reactorCoordinator) NewManager(cl *Client, err chan error) GeneralManager {
+func (r *reactorCoordinator) NewManager(cl *Client, sys *SystemViewer, err chan error) GeneralManager {
     logging.Debug(logging.DClient, "RCO 01 starting manager for %v client %v",cl.Type,cl.Id)
-    return NewReactorManager(cl,r.Sys,err)
+    return NewReactorManager(cl,sys,err)
+}
+
+func (r *reactorCoordinator) Register() {
+    lis, err := net.Listen("tcp", ":2023")
+    if err != nil {
+        // rip
+    }
+    grpcServer := grpc.NewServer()
+    pb.RegisterMonitoringServer(grpcServer,r)
+    go grpcServer.Serve(lis)
+    logging.Debug(logging.DClient, "RCO ready for client requests")
 }
 
-func NewReactorCoordinator(sys *SystemViewer, err chan error) *Coordinator {
+func (r *reactorCoordinator) ReactorStatusHandler(ctx context.Context, req *pb.ReactorStatusPing) (*pb.ReactorStatusResponse, error) {
-    return NewCoordinator(&reactorCoordinator{Sys:sys}, err)
+    m, exists := r.GetManager(req.GetId())
+    if !exists {
+        return &pb.ReactorStatusResponse{}, errors.New("Manager doesn't exists for that client")
+    }
+    return m.ReactorStatusHandler(ctx, req)
 }
 
 //tui coordinator
 type tuiCoordinator struct {
-    //can add fields as needed
+    *Managers
-    Ip string
+    pb.UnimplementedManagementServer
-    Sys *SystemViewer
 }
 
 func (t *tuiCoordinator) Start() {
     logging.Debug(logging.DStart,"TCO 01 Starting!")
 }
 
-func (t *tuiCoordinator) NewManager(cl *Client, err chan error) GeneralManager {
+func (t *tuiCoordinator) NewManager(cl *Client, sys *SystemViewer, err chan error) GeneralManager {
     logging.Debug(logging.DClient, "TCO 01 starting manager for %v client %v",cl.Type,cl.Id)
-    return NewTUIManager(t.Ip,cl,t.Sys,err)
+    return NewTUIManager(cl,sys,err)
 }
 
-func NewTUICoordinator(ip string, sys *SystemViewer, err chan error) *Coordinator {
+func (t *tuiCoordinator) Register() {
-    return NewCoordinator(&tuiCoordinator{Ip:ip,Sys:sys}, err)
+    lis, err := net.Listen("tcp", ":2024")
+    if err != nil {
+        // rip
+    }
+    grpcServer := grpc.NewServer()
+    pb.RegisterManagementServer(grpcServer,t)
+    go grpcServer.Serve(lis)
+    logging.Debug(logging.DClient, "TCO ready for client requests")
 }
+
+func (t *tuiCoordinator) GetDevices(ctx context.Context, req *pb.GetDevicesRequest) (*pb.GetDevicesResponse, error) {
+    // grpc handler to fwd to manager
+    m, exists := t.GetManager(req.GetClientId())
+    if !exists {
+        // doesnt exist for some reason
+        return &pb.GetDevicesResponse{}, errors.New("Manager doesn't exists for client")
+    }
+    return m.GetDevices(ctx,req)
+}
+
+// unimplemented bs for grpc
+func (t *tuiCoordinator) DeleteReactor(ctx context.Context, req *pb.DeleteReactorRequest) (*pb.DeleteReactorResponse, error) {
+    // TODO
+    return &pb.DeleteReactorResponse{}, nil
+}
+
+func (t *tuiCoordinator) DeleteReactorDevice(ctx context.Context, req *pb.DeleteReactorDeviceRequest) (*pb.DeleteReactorDeviceResponse, error) {
+    // TODO
+    return &pb.DeleteReactorDeviceResponse{}, nil
+}
+

internal/pkg/server/listener.go

@@ -5,27 +5,29 @@ import (
     "fmt"
     "net"
     "context"
-    "FRMS/internal/pkg/system"
+    // "FRMS/internal/pkg/system"
     "FRMS/internal/pkg/logging"
     "google.golang.org/grpc"
     pb "FRMS/internal/pkg/grpc"
 )
 
-// the goal here is to set up a gRPC server to respond to client pings with their IP and to establish a new manager for that specific client
+/*
+Originally this package served as a client listener to route requests
+I am going to repurpose this to serve as a listener for all gRPC requests
+should simplify interfaces
+*/
 
-// going to rename shit to be more general
 type Listener struct { // exporting for easy use in the short term
-    // Reactor map[uint32]*ReactorManager this will go in eventual "coordinator" struct
-    Ip string
     Port int
     Coordinators map[string]*Coordinator
+    CLis *grpc.Server
     Sys *SystemViewer
     Err chan error
     pb.UnimplementedHandshakeServer
 }
 
 type Client struct {
-    // can use general client and leave unset fields nil
+    // general client struct to store reqs from reactors/tui
     Ip string
     Port int
     Id uint32
@@ -33,23 +35,13 @@ type Client struct {
     Type string
 }
 
-
+func NewListener(ch chan error, port int) *Listener {
-func GetIp(e string) (string, error) {
-    return system.GetIp(e)
-}
-
-func NewListener(ifconfig string,ch chan error) (*Listener, error) {
-    //m := make(map[uint32]*ReactorManager)
-    var ip string
-    var err error
-    if ip, err = GetIp(ifconfig); err != nil {
-        return &Listener{}, err
-    }
     c := make(map[string]*Coordinator)
-    l := &Listener{Ip:ip,Err:ch}
+    l := &Listener{Err:ch}
     l.Coordinators = c
     l.Sys = NewSystemViewer()
-    return l, nil
+    l.Port = port
+    return l
 }
 
 func (l *Listener) Start() {
@@ -59,53 +51,45 @@ func (l *Listener) Start() {
     }
     go l.Sys.Start()
     // listener started and grpc handler registered
-    logging.Debug(logging.DStart,"Started listener on %v:%v\n",l.Ip,l.Port)
+    logging.Debug(logging.DStart,"Started client listener on port %v\n",l.Port)
-    fmt.Printf("=========================\n      PORT: %v\n=========================\n",l.Port)
+    //fmt.Printf("==========================\n        PORT: %v\n==========================\n",l.Port)
 }
 
 func (l *Listener) Register() error {
     // creates a gRPC service and binds it to our handler
-    lis, err := net.Listen("tcp", fmt.Sprintf("%v:0",l.Ip)) // by binding to :0 we should get assigned an empty port
+    lis, err := net.Listen("tcp", fmt.Sprintf(":%v",l.Port)) // either binding to supplied port or binding to docker default
     if err != nil {
         return err
     }
-    l.Port = lis.Addr().(*net.TCPAddr).Port // getting the port we were assigned
     grpcServer := grpc.NewServer()
     pb.RegisterHandshakeServer(grpcServer, l)
     go grpcServer.Serve(lis)
+    logging.Debug(logging.DStart, "LIS Registered on port %v", l.Port)
+
+    //lis, err = net.Listen("tcp", fmt.Sprintf(":%v",l.Port+1)) // either binding to supplied port or binding to docker default
+    //if err != nil {
+        //return err
+    //}
+    //grpcServer = grpc.NewServer()
+    //l.CLis = grpcServer
+    //go grpcServer.Serve(lis)
+    //logging.Debug(logging.DStart, "LIS Coordinator server registered on port %v", l.Port + 1)
+
     return nil
 }
 
-func (l *Listener) ReactorClientDiscoveryHandler(ctx context.Context, ping *pb.ReactorClientRequest) (*pb.ReactorClientResponse, error) {
+func (l *Listener) ClientDiscoveryHandler(ctx context.Context, ping *pb.ClientRequest) (*pb.ClientResponse, error) {
     // incoming reactor ping need to spawn coord
-    c := &Client{Ip:ping.GetClientIp(),Model:ping.GetClientModel(),Type:"reactor",Port:int(ping.GetClientPort()),Id:ping.GetClientId()}
+    c := &Client{Id:ping.GetClientId(),Type:ping.GetClientType()}
-    logging.Debug(logging.DClient, "%v %v has connected from %v:%v\n",c.Type,c.Id,c.Ip,c.Port)
+    logging.Debug(logging.DClient, "%v %v has connected\n",c.Type,c.Id)
-    coord, ok := l.Coordinators["reactor"]
+    coord, ok := l.Coordinators[c.Type]
-    if !ok {
-        logging.Debug(logging.DSpawn,"CCO 01 Created RCO")
-        coord = NewReactorCoordinator(l.Sys, l.Err)
-        l.Coordinators["reactor"] = coord
-        coord.Start()
-    }
-    go coord.ClientHandler(c)
-    // we dont handle any actual logic about the creation so we just respon true if the request was received
-    return &pb.ReactorClientResponse{ClientId:c.Id,Success:true}, nil
-}
-
-func (l *Listener) TUIClientDiscoveryHandler(ctx context.Context, ping *pb.TUIClientRequest) (*pb.TUIClientResponse, error) {
-    c := &Client{Type:"tui",Id:ping.GetClientId()}
-    var coord *Coordinator
-    var ok bool
-    coord, ok = l.Coordinators["tui"]
     if !ok {
-        logging.Debug(logging.DSpawn,"CCO 01 Created RCO")
+        logging.Debug(logging.DSpawn,"CCO 01 Created Coordinator")
-        coord = NewTUICoordinator(l.Ip, l.Sys, l.Err)
+        coord = NewCoordinator(c.Type, l.Sys, l.Err)
-        l.Coordinators["tui"] = coord
+        l.Coordinators[c.Type] = coord
-        coord.Start()
+        go coord.Start()
     }
     port := coord.ClientHandler(c)
-    logging.Debug(logging.DClient,"%v %v has connected from %v:%v\n",c.Type,c.Id,l.Ip,port)
+    // return the port for the incoming requests
-    r := &pb.TUIClientResponse{ClientId:c.Id,ServerIp:l.Ip,ServerPort:int32(port)}
+    return &pb.ClientResponse{ClientId:c.Id,ServerPort:uint32(port)}, nil
-    return r, nil
 }
-

internal/pkg/server/manager.go

@@ -6,7 +6,9 @@ import (
     "math"
     "sync"
     "errors"
-    //"FRMS/internal/pkg/logging"
+    "context"
+    "FRMS/internal/pkg/logging"
+    pb "FRMS/internal/pkg/grpc"     // unimplemented base methods
 )
 
 // this package will implement a boilerplate manager
@@ -14,7 +16,7 @@ import (
 
 type Manager struct {
     *Client             // gives access to c.Ip c.Id etc
-    Hb time.Duration
+    Hb time.Duration    // used for managing hb timer for client
     Active active
     Sig chan bool
     Err chan error
@@ -32,9 +34,7 @@ func NewManager(err chan error) *Manager {
     return m
 }
 
-func (m *Manager) Start(cl *Client) {
+func (m *Manager) Start() {
-    // establish connection with client and start pinging at set intervals
-    m.Client = cl
     if !m.Activate() {
         // manager already running
         m.Err <-errors.New("Manager already running!")
@@ -48,6 +48,11 @@ func (m *Manager) Exit() {
     }
 }
 
+func (m *Manager) UpdateClient(cl *Client) {
+    logging.Debug(logging.DClient,"MAN Updating client %v",cl.Id)
+    m.Client = cl
+}
+
 // reactor manager atomic operations
 
 func (m *Manager) IsActive() bool {
@@ -99,3 +104,11 @@ func (m *Manager) Timeout() int {
         return 0
     }
 }
+
+func (m *Manager) GetDevices(ctx context.Context, req *pb.GetDevicesRequest) (*pb.GetDevicesResponse, error) {
+    return &pb.GetDevicesResponse{}, errors.New("Get Devices not implemented!")
+}
+
+func (m *Manager) ReactorStatusHandler(ctx context.Context, req *pb.ReactorStatusPing) (*pb.ReactorStatusResponse, error) {
+    return &pb.ReactorStatusResponse{}, errors.New("Reactor Status Handler not implemented!")
+}

internal/pkg/server/reactormanager.go

@@ -18,7 +18,6 @@ import (
 type ReactorManager struct {
     *Manager
     StatusMon *StatusMonitor
-    DevsMon *StatusMonitor
     *devstatus
 }
 
@@ -32,32 +31,32 @@ func NewReactorManager(c *Client,sys *SystemViewer,err chan error) GeneralManage
     di := make(map[uint32]*DeviceInfo)
     r.devstatus = &devstatus{Devs:di}
     r.Manager = NewManager(err)
-    r.StatusMon = sys.AddReactorSender()
+    r.StatusMon = NewStatusMonitor("Reactor",c.Id,sys)
-    r.DevsMon = sys.AddDeviceSender(c.Id)
     return r
 }
 
-func (r *ReactorManager) Start(cl *Client) {
+func (r *ReactorManager) Start() {
-    r.Manager.Start(cl)
+    r.Manager.Start()
     logging.Debug(logging.DStart,"RMA %v starting", r.Id)
-    go r.StatusMon.Start()
+    go r.StatusMon.Send(&DeviceInfo{Id:r.Id,Type:"Reactor",Status:"[green]ONLINE[white]"},"Reactor")
-    go r.DevsMon.Start()
+    //conn := r.Connect()
-    go r.StatusMon.Send(&DeviceInfo{Id:r.Id,Type:"Reactor",Status:"[green]ONLINE[white]"})
+    //empty := &grpc.ClientConn{}
-    conn := r.Connect()
+    //if conn != empty {
-    empty := &grpc.ClientConn{}
+    //}
-    if conn != empty {
-        go r.Monitor(conn)
-    }
 }
 
 func (r *ReactorManager) Exit() {
     r.Manager.Exit()
     logging.Debug(logging.DExit, "RMA %v exiting", r.Id)
-    go r.StatusMon.Send(&DeviceInfo{Id:r.Id,Type:"Reactor",Status:"[red]OFFLINE[white]",Data:fmt.Sprintf("Last Seen %v",time.Now().Format("Mon at 03:04:05pm MST"))})
+    go r.StatusMon.Send(&DeviceInfo{Id:r.Id,Type:"Reactor",Status:"[red]OFFLINE[white]",Data:fmt.Sprintf("Last Seen %v",time.Now().Format("Mon at 03:04:05pm MST"))},"Reactor")
-}
+    r.devstatus.Lock()
-
+    defer r.devstatus.Unlock()
-func (r *ReactorManager) GetPort() int {
+    for _, d := range r.Devs {
-    return 0
+        newd := d
+        newd.Status = "[yellow]UNKOWN[white]"
+        r.Devs[newd.Id] = newd
+        go r.StatusMon.Send(newd,"Device")
+    }
 }
 
 func (r *ReactorManager) Connect() *grpc.ClientConn {
@@ -95,6 +94,18 @@ func (r *ReactorManager) Connect() *grpc.ClientConn {
     return conn
 }
 
+func (r *ReactorManager) ReactorStatusHandler(ctx context.Context, req *pb.ReactorStatusPing) (*pb.ReactorStatusResponse, error) {
+    // function client will call to update reactor information
+    //go r.PingReset()
+    for _, dev := range req.GetDevices() {
+        d := &DeviceInfo{Id:uint32(dev.GetAddr()),Type:dev.GetType(),Status:dev.GetStatus(),Data:dev.GetData()}
+        go r.UpdateDevice(d)
+    }
+    return &pb.ReactorStatusResponse{Id:r.Id}, nil
+}
+
+
+/*
 func (r *ReactorManager) Monitor(conn *grpc.ClientConn) {
     defer conn.Close()
     client := pb.NewMonitoringClient(conn)
@@ -108,20 +119,31 @@ func (r *ReactorManager) Monitor(conn *grpc.ClientConn) {
             for _, d := range r.Devs {
                 newd := d
                 newd.Status = "[yellow]UNKOWN[white]"
-                go r.DevsMon.Send(newd)
+                r.Devs[newd.Id] = newd
+                go r.StatusMon.Send(newd,"Device")
             }
             r.devstatus.Unlock()
             r.Exit()
             break;
         }
-        r.devstatus.Lock()
         for _,v := range resp.GetDevices() {
             d := &DeviceInfo{Id:uint32(v.GetAddr()),Type:v.GetType(),Status:v.GetStatus(),Data:v.GetData()}
-            go r.DevsMon.Send(d)
+            go r.UpdateDevice(d)
-            r.Devs[d.Id] = d
         }
-        r.devstatus.Unlock()
-        logging.Debug(logging.DPing, "RMA %v Reactor Reached", r.Id)
         time.Sleep(r.Hb) // time between sensor pings
     }
 }
+*/
+func (r *ReactorManager) UpdateDevice(d *DeviceInfo) {
+    r.devstatus.Lock()
+    defer r.devstatus.Unlock()
+    if olddev, ok := r.Devs[d.Id]; !ok {
+        // new device
+        r.Devs[d.Id] = d
+        go r.StatusMon.Send(d,"Device")
+    } else if olddev.Status != d.Status || olddev.Data != d.Data {
+            // dev status or data has changed
+        r.Devs[d.Id] = d
+        go r.StatusMon.Send(d,"Device")
+    }
+}

internal/pkg/server/system.go

@@ -3,9 +3,8 @@ package server
 import (
     "sync"
     _ "fmt"
+    "FRMS/internal/pkg/logging"
 )
-
-// package will create and maintain a concurrent system structure
 // allows for multiple readers/writers
 type DeviceInfo struct {
     Id uint32
@@ -16,23 +15,165 @@ type DeviceInfo struct {
     TransactionId uint32
 }
 
-func NewStatusMonitor(ch chan *DeviceInfo) *StatusMonitor {
+type StatusMonitor struct {
+    // allows for embedding into managers
+    TransactionId chan uint32 // monotonically increases to track outdated reqs
+    DevChan chan *DeviceInfo // channel for device status
+    ReactorChan chan *DeviceInfo // channel for reactor status
+    *SystemViewer
+    DevBuf *devbuf
+    sync.Mutex
+}
+
+type devbuf struct {
+    ReactorId uint32 // reactor we are looking at, if any
+    Buf map[string]map[uint32]*DeviceInfo // convienent way to store/seperate device data
+    sync.Mutex
+}
+
+func NewBuffer() map[string]map[uint32]*DeviceInfo {
+    rbuf := make(map[uint32]*DeviceInfo)
+    dbuf := make(map[uint32]*DeviceInfo)
+    sbuf := make(map[string]map[uint32]*DeviceInfo)
+    sbuf["Reactor"] = rbuf
+    sbuf["Device"] = dbuf
+    return sbuf
+}
+
+func NewStatusMonitor(t string, id uint32, sys *SystemViewer) *StatusMonitor {
     tid := make(chan uint32)
-    sm := &StatusMonitor{StatusChan:ch,TransactionId:tid}
+    sm := &StatusMonitor{TransactionId:tid}
+    sm.SystemViewer = sys
+    if t == "Reactor" {
+        // reactor status monitor
+        sm.ReactorChan = sys.AddReactorSender()
+        sm.DevChan = sys.AddDeviceSender(id)
+        go sm.GenerateIds()
+    } else {
+        // tui status monitor
+        sbuf := NewBuffer()
+        //sm.ReactorChan, sbuf["Reactor"] = sys.AddListener(id,0)
+        sm.DevBuf = &devbuf{Buf:sbuf} // makes it easier to work with
+        go sm.UpdateListener(id,0)
+    }
     return sm
 }
 
+func (s *StatusMonitor) GenerateIds() {
+    var id uint32
+    id = 0
+    for {
+        s.TransactionId <-id
+        id += 1
+    }
+}
+
+func (s *StatusMonitor) Send(d *DeviceInfo, dtype string) {
+    d.TransactionId = <-s.TransactionId
+    logging.Debug(logging.DClient,"SYS 01 Sending update for: %s (%s)", d.Type, d.Status)
+    if dtype == "Reactor" {
+        s.ReactorChan <-d
+    } else {
+        s.DevChan <-d
+    }
+}
+
+func (s *StatusMonitor) GetBuffer() []*DeviceInfo {
+    // also clears buffer
+    s.DevBuf.Lock()
+    defer s.DevBuf.Unlock()
+    res := []*DeviceInfo{}
+    if len(s.DevBuf.Buf["Reactor"]) != 0 || len(s.DevBuf.Buf["Device"]) != 0 {
+        logging.Debug(logging.DClient,"Clearing buff %v", s.DevBuf.Buf)
+    }
+    for _, devs := range s.DevBuf.Buf {
+        for _, dev := range devs {
+            // loops over reactors then devices
+            res = append(res,dev)
+        }
+    }
+    s.DevBuf.Buf = NewBuffer() // clearing old buffer
+    return res
+}
+
+func (s *StatusMonitor) UpdateListener(tid, reactorId uint32) {
+    s.DevBuf.Lock()
+    defer s.DevBuf.Unlock()
+    // clearing proper buffer
+    if reactorId == 0 {
+        logging.Debug(logging.DClient,"SYS 01 Adding %v as reactor listener", tid)
+        s.DevBuf.Buf["Reactor"] = make(map[uint32]*DeviceInfo)
+        s.ReactorChan, s.DevBuf.Buf["Reactor"] = s.SystemViewer.AddListener(tid, reactorId)
+        go s.Listen(s.ReactorChan)
+    } else {
+        logging.Debug(logging.DClient,"SYS 01 Adding %v as reactor %v listener", tid, reactorId)
+        s.DevBuf.Buf["Device"] = make(map[uint32]*DeviceInfo) // clearing old devices
+        if s.DevBuf.ReactorId != reactorId && s.DevBuf.ReactorId != 0{
+            go s.SystemViewer.RemoveListener(s.DevBuf.ReactorId, tid)
+        }
+        s.DevBuf.ReactorId = reactorId
+        s.DevChan, s.DevBuf.Buf["Device"] = s.SystemViewer.AddListener(tid, reactorId)
+        go s.Listen(s.DevChan)
+    }
+}
+
+func (s *StatusMonitor) UpdateBuffer(d *DeviceInfo, dtype string, ch chan *DeviceInfo) {
+    s.DevBuf.Lock()
+    defer s.DevBuf.Unlock()
+    logging.Debug(logging.DClient,"SYS 01 Dev %v update requested", d)
+    if dev, exists := s.DevBuf.Buf[dtype][d.Id]; exists {
+        // already a device in the buffer
+        if dev.TransactionId > d.TransactionId {
+            logging.Debug(logging.DClient,"SYS 01 Update Processed. Old: %v, New: %v \n", dev, d)
+            d = dev // not sure if i can do this lol
+        }
+    }
+    if ch == s.ReactorChan || ch == s.DevChan {
+        // hacky way to check if the device came from a listener of a current channel
+        s.DevBuf.Buf[dtype][d.Id] = d
+    } else {
+        logging.Debug(logging.DClient,"Dev out of date!")
+    }
+}
+
+func (s *StatusMonitor) Listen(ch chan *DeviceInfo) {
+    for dev := range ch {
+        if dev.Type == "Reactor" {
+            go s.UpdateBuffer(dev,"Reactor", ch)
+        } else {
+            go s.UpdateBuffer(dev, "Device", ch)
+        }
+    }
+}
+
 type InfoStream struct {
-    // used for reactor and device status streams
+    // base stream for any reactor/device
-    sync.Mutex
+    // NewSender embedds the channel to send updates on
+    // NewListener will add the statusmon to the list of devs to echo to
     Stream chan *DeviceInfo
     Layout *syslayout
+    *listeners
+}
+
+type listeners struct {
+    sync.RWMutex
+    Listeners map[uint32]*lischan
+}
+
+type lischan struct {
+    sync.WaitGroup
+    StatusChan chan *DeviceInfo
 }
 
 type syslayout struct {
     Devs map[uint32]*DeviceInfo
     uint32 //index
-    sync.Mutex
+    sync.RWMutex
+}
+
+func NewLisChan(ch chan *DeviceInfo) *lischan {
+    l := &lischan{StatusChan:ch}
+    return l
 }
 
 func NewInfoStream() *InfoStream {
@@ -40,71 +181,80 @@ func NewInfoStream() *InfoStream {
     s := &InfoStream{Stream:dch}
     m := make(map[uint32]*DeviceInfo)
     s.Layout = &syslayout{Devs:m}
+    s.listeners = &listeners{Listeners:make(map[uint32]*lischan)}
     return s
 }
 
 func (s *InfoStream) Start() {
     // consistency
-    go s.Listener()
+    go s.Listen()
 }
 // goal is to hook every new manager into the reactor status chan
-func (s *InfoStream) AddSender() *StatusMonitor {
+func (s *InfoStream) AddSender() chan *DeviceInfo {
-    sm := NewStatusMonitor(s.Stream) // give the channel we monitor for incoming updates
+    return s.Stream
-    return sm
 }
 
-func (s *InfoStream) Listener() {
+func (s *InfoStream) Listen() {
-    for {
+    for deviceInfo := range s.Stream {
-        deviceInfo := <-s.Stream
+        go s.Update(deviceInfo)
-        go s.Layout.Update(deviceInfo)
     }
 }
 
-func (s *syslayout) Update(d *DeviceInfo) {
+func (s *InfoStream) Update(d *DeviceInfo) {
-    s.Lock()
+    s.Layout.Lock()
-    defer s.Unlock()
+    defer s.Layout.Unlock()
-    // set index to be kept for the entire time the dev exists
+    if dev, ok := s.Layout.Devs[d.Id]; !ok {
-    if dev, ok := s.Devs[d.Id]; !ok {
+        d.Index = s.Layout.uint32
-        d.Index = s.uint32
+        s.Layout.uint32 += 1
-        s.uint32 += 1
     } else {
         d.Index = dev.Index
     }
-    s.Devs[d.Id] = d
+    s.Layout.Devs[d.Id] = d
+    go s.Echo(d)
 }
 
-func (s *InfoStream) GetLayout() map[uint32]*DeviceInfo {
+func (l *listeners) Echo(d *DeviceInfo) {
-    s.Layout.Lock()
+    l.RLock()
-    defer s.Layout.Unlock()
+    defer l.RUnlock()
-    return s.Layout.Devs
+    // read only lock
-}
+    for _, lis := range l.Listeners {
-
+        lis.Add(1)
-// status buffer maintaince
+        go func(listener *lischan, dev *DeviceInfo){
-type StatusMonitor struct {
+            defer listener.Done()
-    // serve as base to embed in managers to send/receive reactor info
+            listener.StatusChan <-dev
-    TransactionId chan uint32 // monotonically increases to track outdated reqs
+        }(lis,d)
-    StatusChan chan *DeviceInfo // sending reactor info in same fmt
+    }
-}
-
-func (s *StatusMonitor) Start() {
-    go s.GenerateIds()
 }
 
-func (s *StatusMonitor) GenerateIds() {
+func (s *InfoStream) AddListener(id uint32, ch chan *DeviceInfo) map[uint32]*DeviceInfo {
-    var id uint32
+    // if i get a memory leak ill eat my shoe
-    id = 0
+    s.listeners.Lock()
-    for {
+    defer s.listeners.Unlock()
-        s.TransactionId <-id
+    if _, ok := s.listeners.Listeners[id]; ok {
-        id += 1
+        // exists
+        go s.RemoveListener(id)
     }
+    s.listeners.Listeners[id] = NewLisChan(ch)
+    logging.Debug(logging.DClient,"SYS 01 Getting Devices")
+    //s.Layout.RLock()
+    //defer s.Layout.RUnlock()
+    logging.Debug(logging.DClient,"SYS 01 Returning Devices %v", s.Layout.Devs)
+    return s.Layout.Devs
 }
 
-func (s *StatusMonitor) Send(d *DeviceInfo) {
+func (l *listeners) RemoveListener(id uint32) {
-    d.TransactionId = <-s.TransactionId
+    l.Lock()
-    s.StatusChan <-d
+    defer l.Unlock()
+    if lis, ok := l.Listeners[id]; ok {
+        delete(l.Listeners,id)
+        go func(ls *lischan){
+            ls.Wait()
+            close(ls.StatusChan)
+        }(lis)
+    }
 }
 
-// now to tie it all together
+// status buffer maintaince
 
 type SystemViewer struct {
     // stores system directory and provide methods to be embedded in managers
@@ -129,11 +279,11 @@ func (s *SystemViewer) Start() {
     go s.ReactorStream.Start()
 }
 
-func (s *SystemViewer) AddReactorSender() *StatusMonitor {
+func (s *SystemViewer) AddReactorSender() chan *DeviceInfo {
     return s.ReactorStream.AddSender()
 }
 
-func (s *SystemViewer) AddDeviceSender(reactorId uint32) *StatusMonitor {
+func (s *SystemViewer) AddDeviceSender(reactorId uint32) chan *DeviceInfo {
     s.DeviceStream.Lock()
     defer s.DeviceStream.Unlock()
     var ds *InfoStream
@@ -146,23 +296,19 @@ func (s *SystemViewer) AddDeviceSender(reactorId uint32) *StatusMonitor {
     return ds.AddSender()
 }
 
-func (s *SystemViewer) GetReactorStatus() map[uint32]DeviceInfo {
+func (s *SystemViewer) AddListener(id, rid uint32) (chan *DeviceInfo, map[uint32]*DeviceInfo) {
-    devs := s.ReactorStream.GetLayout()
+    // returns a listener for that chan
-    ret := make(map[uint32]DeviceInfo)
+    ch := make(chan *DeviceInfo)
-    for id, dev := range devs {
+    if rid != 0 {
-        ret[id] = *dev
+        return ch, s.DeviceStream.Reactors[rid].AddListener(id, ch)
+    } else {
+        return ch, s.ReactorStream.AddListener(id, ch)
     }
-    return ret //value instead of ptr
 }
 
-func (s *SystemViewer) GetDeviceStatus(reactorId uint32) map[uint32]DeviceInfo {
+func (s *SystemViewer) RemoveListener(rid, tid uint32) {
+    // removes chan for specific tid and rid
     s.DeviceStream.Lock()
-    ds := s.DeviceStream.Reactors[reactorId]
+    defer s.DeviceStream.Unlock()
-    s.DeviceStream.Unlock()
+    go s.DeviceStream.Reactors[rid].RemoveListener(tid)
-    devs := ds.GetLayout()
-    ret := make(map[uint32]DeviceInfo)
-    for id, dev := range devs {
-        ret[id] = *dev
-    }
-    return ret
 }

internal/pkg/server/tuimanager.go

@@ -1,14 +1,14 @@
 package server
 
 import (
-    "fmt"
+    // "fmt"
     "time"
     "sync"
-    "net"
+    // "net"
-    "log"
+    // "log"
     "context"
     "FRMS/internal/pkg/logging"
-    "google.golang.org/grpc"
+    // "google.golang.org/grpc"
     pb "FRMS/internal/pkg/grpc"
 )
 
@@ -16,9 +16,7 @@ import (
 
 type TUIManager struct {
     *Manager        // embedded manager for access to methods and client
-    Ip string
+    StatusMon *StatusMonitor      // use it for all devs coming in
-    *SystemViewer
-    Port *port
     Err chan error
     *Timeout
     *pb.UnimplementedManagementServer
@@ -31,30 +29,23 @@ type Timeout struct {
     sync.Mutex
 }
 
-type port struct {
+func NewTUIManager(c *Client, sys *SystemViewer, err chan error) GeneralManager {
-    Chan chan int
-    int
-}
-
-func NewTUIManager(ip string, c *Client, sys *SystemViewer, err chan error) GeneralManager {
     m := NewManager(err)
     t := &TUIManager{Err: err}
-    t.Port = &port{Chan:make(chan int)}
     alert := make(chan bool)
     t.Timeout = &Timeout{Alert:alert,TO:time.Duration(2500*time.Millisecond)}   // short time outs are fine because we will just rejoin 
     t.Manager = m
-    t.SystemViewer = sys
+    t.StatusMon = NewStatusMonitor("TUI",c.Id,sys)
-    t.Ip = ip
+    t.Manager.UpdateClient(c)
     return t
 }
 
-func (t *TUIManager) Start(cl *Client) {
+func (t *TUIManager) Start() {
     //
     t.PingReset()
-    t.Manager.Start(cl)
+    t.Manager.Start()
     logging.Debug(logging.DStart,"TMA %v starting", t.Id)
     go t.Timeoutd()
-    go t.Register() // begin tui server to respond to tui client reqs
     //go t.Monitor(conn)
 }
 
@@ -62,6 +53,7 @@ func (t *TUIManager) Exit() {
     t.Manager.Exit()
     logging.Debug(logging.DExit,"TMA %v exiting",t.Id)
 }
+
 func (t *Timeout) PingReset() {
     t.Lock()
     defer t.Unlock()
@@ -93,46 +85,25 @@ func (t *Timeout) Elapsed() (time.Duration, bool) {
     }
 }
 
-func (t *TUIManager) Register() {
+// tui client requests and logic will be down here
-    lis, err := net.Listen("tcp", fmt.Sprintf("%v:0",t.Ip))
-    if err != nil {
-        log.Fatal(err)
-    }
-    grpcServer := grpc.NewServer()
-    pb.RegisterManagementServer(grpcServer,t)
-    go grpcServer.Serve(lis)
-    // send port now that server is up
-    t.Port.int = lis.Addr().(*net.TCPAddr).Port
-    go func(ch chan int,p int) {
-        ch <-p
-    }(t.Port.Chan, t.Port.int)
-    logging.Debug(logging.DClient, "TMA %v reayd for client conn", t.Id)
-    // up and running
-}
-
-func (t *TUIManager) GetPort() int {
-    port := <-t.Port.Chan
-    return port
-}
 
 func (t *TUIManager) GetDevices(ctx context.Context, req *pb.GetDevicesRequest) (*pb.GetDevicesResponse, error) {
     go t.PingReset()
-    rid := req.GetReactorId()
     devices := []*pb.Dev{}
-    resp := &pb.GetDevicesResponse{ClientId:t.Id,ReactorId:rid,Devices:devices}
+    resp := &pb.GetDevicesResponse{ClientId:t.Id,Devices:devices}
-    reactors := t.SystemViewer.GetReactorStatus()
+    if req.GetReactorId() > 0 || req.GetRefresh() {
-    for _, v := range reactors {
+        logging.Debug(logging.DClient,"TMA %v client requested devs from %v",t.Id,req.GetReactorId())
-        resp.Devices = append(resp.Devices, &pb.Dev{Id:v.Id,Type:v.Type,Status:v.Status,Data:v.Data,Index:v.Index})
+        resp.ReactorId = req.GetReactorId()
+        t.StatusMon.UpdateListener(t.Id, req.GetReactorId())
     }
+    devs := t.StatusMon.GetBuffer() // always empty buffer
 
-    if rid != 0 {
+    for _, v := range devs {
-        // need reactor devices
+        resp.Devices = append(resp.Devices, &pb.Dev{Id:v.Id,Type:v.Type,Status:v.Status,Data:v.Data,Index:v.Index})
-        devs := t.SystemViewer.GetDeviceStatus(rid)
+    }
-        for _, v := range devs {
+    if len(resp.Devices) > 0 {
-            resp.Devices = append(resp.Devices, &pb.Dev{Id:v.Id,Type:v.Type,Status:v.Status,Data:v.Data,Index:v.Index})
+        logging.Debug(logging.DClient,"TMA %v sending %v devices to client" ,t.Id, len(resp.Devices))
-        }
     }
-    logging.Debug(logging.DClient,"TMA %v sending devices to client" ,t.Id)
     return resp, nil
 }
 

internal/pkg/system/hwinfo.go

@@ -7,6 +7,7 @@ import (
     "strings"
     "net"
     "fmt"
+    "errors"
 )
 
 // this package serves to add in wrappers for system commands to get hwinfo from the board
@@ -21,41 +22,6 @@ import (
     // lshw -C system 2>/dev/null | head -n 1 > hwinfo.txt && ifconfig eth0 | awk '/inet |ether / {print $2}' >> hwinfo.txt
     // *** will just replace info in file everytime
 
-
-type HWinfo struct {
-    Ip string
-    Id uint32
-    Bus int
-    Model string
-    Port int
-}
-
-func (h *HWinfo) GetIp() string {
-    return h.Ip
-}
-
-func (h *HWinfo) GetId() uint32 {
-    return h.Id
-}
-
-func (h *HWinfo) GetBus() int {
-    return h.Bus
-}
-
-func (h *HWinfo) GetPort() int {
-    return h.Port
-}
-
-func (h *HWinfo) GetModel() string {
-    return h.Model
-}
-
-func NewHWinfo() (*HWinfo, error) {
-    h := &HWinfo{Port:2000}
-    err := h.Get()
-    return h, err
-}
-
 func GetId(eth string) (uint32, error) {
     maccmd := fmt.Sprintf("ifconfig %v | awk '/ether / {print $2}'", eth)
     var stderr bytes.Buffer
@@ -98,9 +64,42 @@ func GetPort() (int, error) {
     }
 }
 
-func (h *HWinfo) Get() error {
+func GetBus() (int, error) {
+    bus := map[string]int{"raspberrypi":1,"beaglebone":2}
+    devname := "lshw -C system 2>/dev/null | head -n 1"
+    var stderr, out bytes.Buffer
+    cmd := exec.Command("bash","-c",devname)
+    cmd.Stdout = &out
+    cmd.Stderr = &stderr
+    if err := cmd.Run(); err != nil {
+        return 0, err
+    }
+    b := out.String()
+    b = strings.Trim(b," \n")
+    if bs, ok := bus[b]; !ok {
+        return 0, errors.New(fmt.Sprintf("No bus for dev %v", b))
+    } else {
+        return bs, nil
+    }
+}
+
+func GetModel() (string, error) {
+    devname := "lshw -C system 2>/dev/null | head -n 1"
+    var stderr, out bytes.Buffer
+    cmd := exec.Command("bash","-c",devname)
+    cmd.Stdout = &out
+    cmd.Stderr = &stderr
+    if err := cmd.Run(); err != nil {
+        return "", err
+    }
+    b := out.String()
+    b = strings.Trim(b," \n")
+    return b, nil
+}
+
+func Get() error {
     // responsible for filling out struct
-    bus := map[string]int{"raspberrypi":1,"beaglebone":2} // eventually will replace this with a config file
+    //bus := map[string]int{"raspberrypi":1,"beaglebone":2} // eventually will replace this with a config file
 
     ipcmd := "ifconfig eth0 | awk '/inet / {print $2}'"
     maccmd := "ifconfig eth0 | awk '/ether / {print $2}'"
@@ -121,15 +120,11 @@ func (h *HWinfo) Get() error {
     // formatting
     ip := res[0].String()
     ip = strings.Trim(ip," \n")
-    h.Ip = ip
 
     hash := fnv.New32a()
     hash.Write(res[1].Bytes())
-    h.Id = hash.Sum32()
 
     b := res[2].String()
     b = strings.Trim(b," \n")
-    h.Model = b
-    h.Bus = bus[b]
     return nil
 }

internal/pkg/tui/client.go

@@ -82,14 +82,13 @@ func (t *TUIClient) Connect() {
     }
     // handle handshake logic here
     client := pb.NewHandshakeClient(conn)
-    req := &pb.TUIClientRequest{ClientId:t.Id}
+    req := &pb.ClientRequest{ClientId:t.Id,ClientType:"tui"}
-    resp, err := client.TUIClientDiscoveryHandler(context.Background(),req)
+    resp, err := client.ClientDiscoveryHandler(context.Background(),req)
     if err != nil {
         log.Fatal(err)
     }
     conn.Close() // closing old connection
     // setting up server connection with provided port
-    t.Ip = resp.GetServerIp()
     t.Port = int(resp.GetServerPort())
     for {
         conn, err = grpc.Dial(fmt.Sprintf("%v:%v",t.Ip,t.Port),opts...)
@@ -111,24 +110,21 @@ func (t *TUIClient) Connect() {
     }
 }
 
-// going to redo this idk wtf i was thinking
-
-// we just want a way to do two things
-// a) get all devices when we first select a reactor
-// b) ping the cs every 500ms-1s for updates and get back a list of devs that have changed
-
 func (t *TUIClient) GetDevices(id ...uint32) (map[uint32]*Device, error) {
     // returns
-    var rid uint32
+    req := &pb.GetDevicesRequest{ClientId:t.Id}
-    if len(id) > 0 && id[0] != 0 {
+    if len(id) > 0 {
-        rid = id[0]
+        if id[0] == 0 {
+            req.Refresh = true
+        } else {
+        req.ReactorId = id[0]
+        }
     }
-    req := &pb.GetDevicesRequest{ClientId:t.Id,ReactorId:rid}
     r := make(map[uint32]*Device)
     client := pb.NewManagementClient(t.ClientConn)
     resp, err := client.GetDevices(context.Background(), req)
     if err != nil {
-        return r, nil
+        return r, err
     }
     for _, v := range resp.GetDevices() {
         r[v.GetId()] = &Device{Type:v.GetType(),Status:v.GetStatus(),Id:v.GetId(),Data:v.GetData(),Index:v.GetIndex()}

internal/pkg/tui/tui.go

@@ -23,7 +23,6 @@ type Device struct {
 
 type TUI struct {
     *Display
-    //*LocalView
     *TUIClient
     SelectedReactor <-chan uint32
     SelectedDevice <-chan uint32
@@ -31,11 +30,7 @@ type TUI struct {
 }
 
 func NewTUI(ip string, port int, ifconfig string, ch chan error) *TUI {
-    //r := make(map[uint32]*Reactor)
     t := &TUI{}
-    //l := new(LocalView)
-    //l.Reactors = r
-    //t.LocalView = l
     t.Err = ch
     client := NewTUIClient(ip, port, ifconfig)
     t.TUIClient = client
@@ -51,7 +46,6 @@ func (t *TUI) Start() {
     go t.Monitor()
     t.CreateDisplay()
     t.Display.Start()
-    //go t.Refresh()
 }
 
 func (t *TUI) CreateDisplay() {
@@ -61,7 +55,7 @@ func (t *TUI) CreateDisplay() {
     t.SelectedReactor = rc
     t.SelectedDevice = dc
     t.Flex.AddItem(t.ReactorList,0,1,true).
-    AddItem(t.DevicePages,0,2,false)
+    AddItem(t.DeviceList,0,2,false)
 }
 
 func (t *TUI) Monitor() {
@@ -82,11 +76,12 @@ func (t *TUI) Monitor() {
                 t.UpdateDevices(reactor)
             })
             logging.Debug(logging.DClient, "%v getting reactor devices", t.Id)
-        case <-t.SelectedDevice:
+        case dev := <-t.SelectedDevice:
+            logging.Debug(logging.DClient, "%v editing device %v", t.Id, dev)
             // TODO
         case <-timer:
             // time to ping for status
-            logging.Debug(logging.DClient, "%v getting reactor status", t.Id)
+            logging.Debug(logging.DClient, "%v pinging for updates", t.Id)
             t.App.QueueUpdateDraw(func() {
                 t.UpdateDevices()
             })
@@ -96,39 +91,42 @@ func (t *TUI) Monitor() {
 
 func (t *TUI) UpdateDevices(r ...uint32) {
     // get devices for the reactor and update the tui
-    var id uint32
     // see if there is a page being displayed
-    if name, _ := t.Display.DevicePages.GetFrontPage(); name != "" {
-        if tmp, err := strconv.ParseUint(name, 10, 32); err != nil {
-            log.Fatal(err)
-        } else {
-            id = uint32(tmp)
-        }
-    }
     // overwrite if called as a func
+    var devs map[uint32]*Device
+    var err error
     if len(r) > 0 {
-        id = r[0]
+        // could be a reactor id or 1 for update reactors
+        if r[0] != 0 {
+            t.Display.DeviceList.Clear()
+        } else {
+            t.ReactorList.Clear()
+            t.ReactorList.AddItem("Refresh","Press (r) to refresh", 114, nil)
+            t.ReactorList.AddItem("Quit","Press (q) to quit",113,func() {
+                t.App.Stop()
+                os.Exit(0)
+            })
+        }
+        devs, err = t.TUIClient.GetDevices(r[0])
+    } else {
+        devs, err = t.TUIClient.GetDevices()
     }
-    devs, err := t.TUIClient.GetDevices(id)
     if err != nil {
         log.Fatal(err)
     }
-    if id != 0 {
+    //if id != 0 {
-        // reactor specificed split devs
+    // split based on type to simplify update
-        reactors := make(map[uint32]*Device)
+    reactors := make(map[uint32]*Device)
-        devices := make(map[uint32]*Device)
+    devices := make(map[uint32]*Device)
-        for id, dev := range devs {
+    for id, dev := range devs {
-            if dev.Type == "Reactor" {
+        if dev.Type == "Reactor" {
-                reactors[id] = dev
+            reactors[id] = dev
-            } else {
+        } else {
-                devices[id] = dev
+            devices[id] = dev
-            }
         }
-        t.DisplayDevices(devices, id)
-        t.DisplayReactors(reactors)
-    } else {
-        t.DisplayReactors(devs)
     }
+    t.DisplayDevices(devices)
+    t.DisplayReactors(reactors)
 }
 
 // display struct and logic
@@ -136,8 +134,7 @@ type Display struct {
     App *tview.Application
     Flex *tview.Flex
     ReactorList *tview.List
-    DevicePages *tview.Pages
+    DeviceList *tview.List
-    DeviceList map[string]*tview.List
     SelectedReactor chan<- uint32
     SelectedDevice chan<- uint32
     sync.Mutex
@@ -147,17 +144,17 @@ func NewDisplay(rc,dc chan uint32) *Display {
     d := &Display{}
     d.App = tview.NewApplication()
     d.Flex = tview.NewFlex()
-    lists := make(map[string]*tview.List)
+    d.DeviceList = tview.NewList().SetSelectedFocusOnly(true)
-    d.DeviceList = lists
+    d.ReactorList = tview.NewList()
-    d.ReactorList = tview.NewList()//.ShowSecondaryText(false)
+    d.ReactorList.AddItem("Refresh","Press (r) to refresh manually", 114, nil)
     d.ReactorList.AddItem("Quit","Press (q) to quit",113,func() {
         d.App.Stop()
         os.Exit(0)
     })
-    d.DevicePages = tview.NewPages()
     d.ReactorList.SetTitle("Reactors").SetBorder(true)
     d.ReactorList.SetSelectedFunc(d.SelectReactor)
-    d.DevicePages.SetTitle("Devices").SetBorder(true)
+    d.DeviceList.SetTitle("Devices").SetBorder(true)
+    d.DeviceList.SetSelectedFunc(d.SelectDevice)
     d.SelectedReactor = rc
     d.SelectedDevice = dc
     return d
@@ -171,58 +168,64 @@ func (d *Display) Start() {
 }
 
 func (d *Display) DisplayReactors(r map[uint32]*Device) {
-    // function to display reactor list to table
+    // this func takes in a list of devices to update and loops over them
-    //d.Lock()
+    // works by padding list for entries not seen yet
-    //defer d.Unlock()
-    // locking may break the hell out of this gonna trust tview
     for _, reactor := range r {
         txt := fmt.Sprintf("%v %v", reactor.Id, reactor.Status)
-        if d.ReactorList.GetItemCount() > int(reactor.Index) + 1 {
+        indx := int(reactor.Index)
-            d.ReactorList.RemoveItem(int(reactor.Index))
+        for indx + 2 >= d.ReactorList.GetItemCount() {
+            // this prevent overwriting quit entry
+            d.ReactorList.InsertItem(-3,txt,reactor.Data,rune(47+d.ReactorList.GetItemCount()),nil)
+        }
+        if indx + 2 < d.ReactorList.GetItemCount() {
+            d.ReactorList.SetItemText(indx,txt,reactor.Data)
         }
-        d.ReactorList.InsertItem(int(reactor.Index),txt,reactor.Data,rune(49+reactor.Index),nil)
     }
 }
 
-func (d *Display) DisplayDevices(devs map[uint32]*Device, rid uint32) {
+func (d *Display) DisplayDevices(devs map[uint32]*Device) {
-    //d.Lock()
+    // going to just clear every time as we reload new dev lists anyway
-    reactorPage := strconv.FormatUint(uint64(rid), 10)
+    // going to clear on every reactor selection to simplify
-    var reactorList *tview.List
+    // can probably just load from SM to save system resources on spam reloading
-    var ok bool
-    if reactorList, ok = d.DeviceList[reactorPage]; !ok {
-        reactorList = tview.NewList()//.ShowSecondaryText(false)
-        d.DeviceList[reactorPage] = reactorList
-        d.DevicePages.AddPage(reactorPage, reactorList, true, false)
-    }
-    //d.Unlock()
     for _, dev := range devs {
-        txt := fmt.Sprintf("0x%x %v %v",dev.Id,dev.Status,dev.Type) // sensor alive at 0x0 data
+        logging.Debug(logging.DClient,"Displaying device %v",dev)
-        if reactorList.GetItemCount() > int(dev.Index) {
+        txt := fmt.Sprintf("0x%x %v %v",dev.Id,dev.Status,dev.Type)
-            reactorList.RemoveItem(int(dev.Index))
+        indx := int(dev.Index)
+        for indx >= d.DeviceList.GetItemCount() {
+            d.DeviceList.AddItem(txt,dev.Data,rune(49+d.DeviceList.GetItemCount()), nil)
+        }
+        if indx < d.DeviceList.GetItemCount() {
+            d.DeviceList.SetItemText(indx,txt,dev.Data)
         }
-        reactorList.InsertItem(int(dev.Index),txt,dev.Data,0,nil)
     }
-    d.DevicePages.SwitchToPage(reactorPage)
 }
 
-
 func (d *Display) SelectReactor(index int, main, data string, r rune) {
     // called when reactor in list in selected
     if main != "Quit" {
-        maintxt := strings.Split(main," ")
+        if main == "Refresh" {
-        id := maintxt[0]
+            // TODO
-        if id, err := strconv.ParseUint(id, 10, 32); err != nil {
-            log.Fatal(err)
         } else {
-            d.SelectedReactor <-uint32(id)
+            maintxt := strings.Split(main," ")
+            id := maintxt[0]
+            if id, err := strconv.ParseUint(id, 10, 32); err != nil {
+                log.Fatal(err)
+            } else {
+                d.SelectedReactor <-uint32(id)
+            }
         }
     }
 }
 
-func (d *Display) SelectDevice(index int, main, id string, r rune) {
+func (d *Display) SelectDevice(index int, main, data string, r rune) {
     // called when device is selected in sub menu
-    if id, err := strconv.ParseUint(id, 10, 32); err != nil {
+    maintxt := strings.Split(main," ")
-        log.Fatal(err)
+    id := maintxt[0]
+    id = strings.Trim(id,"0x \n")
+    logging.Debug(logging.DClient,"Selected dev %v", id)
+    if id, err := strconv.ParseUint(id, 16, 32); err != nil {
+        logging.Debug(logging.DError, "Error parsing: %v", err)
+        os.Exit(1)
     } else {
         d.SelectedDevice <-uint32(id)
     }

notes

@@ -847,3 +847,32 @@ TUI - TUI Client
 
 every debug message will be of format
 topic, devcode: id
+
+alright time to get this damn tui updating working
+
+general implementation details
+
+- libary card method
+    - only allow clients to checkout 1 device stream at a time (besides reactor stream obviously)
+    - close stream when call to open new one
+        - should we even store the reactor devices locally? 
+        - or we could request when its selected and then let stream take care of itself
+- simplifies a few things
+    - same setup for reactors/devices
+        - just call/create device listeners dynamically and reactor listeners at the start
+    - only check out reactor stream and 1 device stream at a time
+    - request for devices gets you the current state and adds your listener to the echo chain so that you recieve any updates
+        - need to ensure sends can complete even if the manager is dead
+        - close the channel?
+
+
+
+docker time
+Need to refactor code so its eaisier to run in both envs
+Refactoring server code now
+    - bind all gRPC services to the same IP:port to make it efficent
+    - funnel all rpcs through the one external port
+    - could even use nginx to route from default :80
+is there ever a situation where I would need to run this not on docker?
+    - can i just hardcode for docker and then rely on nginx for routing etc?
+