diff --git a/build b/build index e7338800..08610ffe 100755 --- a/build +++ b/build @@ -43,9 +43,9 @@ elif [ $ANDROID ]; then github.com/RiV-chain/RiV-mesh-extras/src/mobile \ github.com/RiV-chain/RiV-mesh/src/config else - for CMD in mesh meshctl ; do + for CMD in ./cmd/mesh ./cmd/meshctl ./contrib/ui/mesh-ui ; do echo "Building: $CMD" - go build $ARGS -ldflags="$LDFLAGS" -gcflags="$GCFLAGS" ./cmd/$CMD + go build $ARGS -ldflags="$LDFLAGS" -gcflags="$GCFLAGS" $CMD if [ $UPX ]; then upx --brute $CMD diff --git a/contrib/msi/build-msi.sh b/contrib/msi/build-msi.sh old mode 100644 new mode 100755 index 03cf9133..40f7d5c4 --- a/contrib/msi/build-msi.sh +++ b/contrib/msi/build-msi.sh @@ -69,6 +69,8 @@ EOF PKGNAME=$(sh contrib/semver/name.sh) PKGVERSION=$(sh contrib/msi/msversion.sh --bare) PKGVERSIONMS=$(echo $PKGVERSION | tr - .) +PKGINDEXFILE=contrib/ui/mesh-ui/index.html + [ "${PKGARCH}" == "x64" ] && \ PKGGUID="77757838-1a23-40a5-a720-c3b43e0260cc" PKGINSTFOLDER="ProgramFiles64Folder" || \ PKGGUID="54a3294e-a441-4322-aefb-3bb40dd022bb" PKGINSTFOLDER="ProgramFilesFolder" @@ -150,6 +152,12 @@ cat > wix.xml << EOF DiskId="1" Source="${PKGWINTUNDLL}" /> + + + + + + + + + Yggdrasil + + + + + + + +
+ + +
+ +
+ + +
+ +
+
+
IPv6
+
N/A
+
+ +
+
+ +
+
Subnet
+
N/A
+
+ +
+
+ +
+ +
Peers
+
+ +
+
+ +
+ +
+ +
+
+ + + + +
+ + +
+ +
+ + + + diff --git a/contrib/ui/mesh-ui/webview.go b/contrib/ui/mesh-ui/webview.go new file mode 100755 index 00000000..2ca2a3a9 --- /dev/null +++ b/contrib/ui/mesh-ui/webview.go @@ -0,0 +1,121 @@ +package main + +import ( + "github.com/webview/webview" + "path/filepath" + "io/ioutil" + "net/url" + "runtime" + "strings" + "os/exec" + "log" + "os" + "fmt" +) + +func main() { + debug := true + w := webview.New(debug) + defer w.Destroy() + w.SetTitle("RiV-mesh") + w.SetSize(465, 410, webview.HintNone) + path, err := filepath.Abs(filepath.Dir(os.Args[0])) + if err != nil { + log.Fatal(err) + } + log.Println(path) + w.Bind("onLoad", func() { + log.Println("page loaded") + go run(w) + }) + dat, err := ioutil.ReadFile(path+"/index.html") + w.Navigate("data:text/html,"+url.QueryEscape(string(dat))) + w.Run() +} + +func run(w webview.WebView){ + if runtime.GOOS == "windows" { + program_path := "programfiles" + path, exists := os.LookupEnv(program_path) + if exists { + fmt.Println("Program path: %s", path) + riv_ctrl_path := fmt.Sprintf("%s\\RiV-mesh\\meshctl.exe", path) + get_self(w, riv_ctrl_path) + get_peers(w, riv_ctrl_path) + } else { + fmt.Println("could not find Program Files path") + } + } else { + riv_ctrl_path := fmt.Sprintf("meshctl") + get_self(w, riv_ctrl_path) + get_peers(w, riv_ctrl_path) + } +} + +func run_command(riv_ctrl_path string, command string) []string{ + cmd := exec.Command(riv_ctrl_path, command) + out, err := cmd.CombinedOutput() + if err != nil { + log.Fatalf("cmd.Run() failed with %s\n", err) + return nil + } + lines := strings.Split(string(out), "\n") + return lines +} + +func get_self(w webview.WebView, riv_ctrl_path string){ + + lines := run_command(riv_ctrl_path, "getSelf") + m := make(map[string]string) + for _, s := range lines { + p := strings.SplitN(s, ":", 2) + if len(p)>1 { + m[p[0]]=strings.TrimSpace(p[1]) + } + } + if val, ok := m["IPv6 address"]; ok { + //found ipv6 + fmt.Printf("IPv6: %s\n", val) + go setFieldValue(w, "ipv6", val) + } + if val, ok := m["IPv6 subnet"]; ok { + //found subnet + fmt.Printf("Subnet: %s\n", val) + go setFieldValue(w, "subnet", val) + } +} + +func get_peers(w webview.WebView, riv_ctrl_path string){ + + lines := run_command(riv_ctrl_path, "getPeers") + lines = lines[1:] /*remove first element which is a header*/ + var m []string + r:="" + for _, s := range lines { + p := strings.SplitN(s, " ", -1) + if len(p)>1 { + for _, t := range p { + if len(strings.TrimSpace(t))>0 { + r=strings.TrimSpace(t) + } + } + index_p := strings.Index(r, "%") + index_b := strings.Index(r, "]") + if index_p>0 && index_b>0 { + r = r[:index_p]+r[index_b:] + } + m=append(m, r) + } + } + for k := range m { // Loop + fmt.Println(k) + } + inner_html := strings.Join(m[:], "
") + go setFieldValue(w, "peers", inner_html) +} + +func setFieldValue(p webview.WebView, id string, value string) { + p.Dispatch(func() { + p.Eval("setFieldValue('"+id+"','"+value+"');") + }) +}