Merge branch 'develop' of github.com:RiV-chain/RiV-mesh into develop

contrib/msi/build-msi-gui.sh

@@ -106,6 +106,7 @@ else
   exit 1
 fi
 
+cp riv.ico "$PKGUIFOLDER"/favicon.ico
 PKG_UI_ASSETS_ZIP=$(pwd)/ui.zip
 ( cd "$PKGUIFOLDER" && 7z a "$PKG_UI_ASSETS_ZIP" * )
 PKG_UI_ASSETS_ZIP=ui.zip

contrib/msi/build-msi-ie.sh

@@ -84,10 +84,19 @@ then
   unzip wintun.zip
 fi
 
+cp riv.ico "$PKGUIFOLDER"/favicon.ico
 PKG_UI_ASSETS_ZIP=$(pwd)/ui.zip
 ( cd "$PKGUIFOLDER" && 7z a "$PKG_UI_ASSETS_ZIP" * )
 PKG_UI_ASSETS_ZIP=ui.zip
 
+#Build winres
+go-winres simply --icon riv.ico --file-version $PKGVERSION --file-description "RiV-mesh (c) service, 2022 RIV CHAIN" \
+--product-version $PKGVERSION --product-name "RiV-mesh" --copyright "Copyright (c) 2022, RIV CHAIN"
+cp *.syso cmd/mesh
+go-winres simply --file-version $PKGVERSION --file-description "RiV-mesh (c) CLI, 2022 RIV CHAIN" \
+--product-version $PKGVERSION --product-name "RiV-mesh" --copyright "Copyright (c) 2022, RIV CHAIN" --manifest cli
+cp *.syso cmd/meshctl
+
 if [ $PKGARCH = "x64" ]; then
   PKGWINTUNDLL=wintun/bin/amd64/wintun.dll
 elif [ $PKGARCH = "x86" ]; then
@@ -208,7 +217,6 @@ cat > wix.xml << EOF
               KeyPath="yes"/>
           </Component>
 
-
           <Component Id="UIExecutable" Guid="ef9f30e0-8274-4526-835b-51bc09b5b1b7">
             <File
               Id="UiAssets"
@@ -217,7 +225,6 @@ cat > wix.xml << EOF
               Source="${PKG_UI_ASSETS_ZIP}" />
           </Component>
 
-
           <Component Id="ConfigScript" Guid="64a3733b-c98a-4732-85f3-20cd7da1a785">
             <File
               Id="Configbat"

contrib/ui/mesh-ui/ui/assets/mesh-ui.css

@@ -70,7 +70,6 @@ img {
 
 body {
   max-width: 690px;
-  min-width: 690px;
   margin: auto;
 }
 
@@ -84,7 +83,7 @@ td.fi {
 }
 
 footer {
-  position:fixed;
+  position:-ms-device-fixed; /*works only in IE11 RIVM-37*/
   bottom:0;
   max-width: 690px;
   margin-top: auto;

contrib/ui/mesh-ui/webview.go

@@ -5,7 +5,6 @@ import (
 	"os"
 
 	"github.com/RiV-chain/RiV-mesh/src/defaults"
-	"github.com/jchv/go-webview-selector"
 
 	"github.com/docopt/docopt-go"
 )
@@ -37,10 +36,10 @@ func main() {
 		Console(false)
 	}
 	debug := true
-	w := webview.New(debug)
+	w := New(debug)
 	defer w.Destroy()
 	w.SetTitle("RiV-mesh")
-	w.SetSize(690, 920, webview.HintFixed)
+	w.SetSize(690, 920, HintFixed)
 
 	if confui.IndexHtml == "" {
 		confui.IndexHtml = defaults.GetHttpEndpoint("http://localhost:19019")

contrib/ui/mesh-ui/webview_other.go

@@ -3,5 +3,39 @@
 
 package main
 
+import (
+	"unsafe"
+
+	"github.com/webview/webview"
+)
+
 func Console(show bool) {
 }
+
+type WebView = webview.WebView
+
+type Hint = webview.Hint
+
+const (
+	// HintNone specifies that width and height are default size
+	HintNone Hint = iota
+
+	// HintFixed specifies that window size can not be changed by a user
+	HintFixed
+
+	// HintMin specifies that width and height are minimum bounds
+	HintMin
+
+	// HintMax specifies that width and height are maximum bounds
+	HintMax
+)
+
+// New creates a new webview in a new window.
+func New(debug bool) WebView {
+	return webview.New(debug)
+}
+
+// NewWindow creates a new webview using an existing window.
+func NewWindow(debug bool, window unsafe.Pointer) WebView {
+	return webview.NewWindow(debug, window)
+}

contrib/ui/mesh-ui/webview_windows.go

@@ -5,6 +5,9 @@ package main
 
 import (
 	"syscall"
+	"unsafe"
+
+	"github.com/jchv/go-webview2"
 )
 
 func Console(show bool) {
@@ -22,3 +25,40 @@ func Console(show bool) {
 		showWin.Call(hwnd, SW_HIDE)
 	}
 }
+
+type WebView = webview2.WebView
+
+type Hint = webview2.Hint
+
+const (
+	// HintNone specifies that width and height are default size
+	HintNone Hint = iota
+
+	// HintFixed specifies that window size can not be changed by a user
+	HintFixed
+
+	// HintMin specifies that width and height are minimum bounds
+	HintMin
+
+	// HintMax specifies that width and height are maximum bounds
+	HintMax
+)
+
+// New creates a new webview in a new window.
+func New(debug bool) WebView {
+	//return webview2.New(debug)
+	return webview2.NewWithOptions(webview2.WebViewOptions{
+		Debug: debug,
+		WindowOptions: webview2.WindowOptions{
+			IconId: 101,
+			Title:  "RiV-mesh",
+			Width:  706,
+			Height: 960,
+		},
+	})
+}
+
+// NewWindow creates a new webview using an existing window.
+func NewWindow(debug bool, window unsafe.Pointer) WebView {
+	return webview2.NewWindow(debug, window)
+}

go.mod

@@ -21,14 +21,15 @@ require (
 	golang.zx2c4.com/wireguard/windows v0.4.12
 )
 
-require gerace.dev/zipfs v0.2.0
-
 require (
-	github.com/jchv/go-webview-selector v0.0.0-20220126075917-13df59bce3cf // indirect
+	gerace.dev/zipfs v0.2.0
-	github.com/jchv/go-webview2 v0.0.0-20220126073738-2ea27096a5eb // indirect
+	github.com/jchv/go-webview2 v0.0.0-20221027045535-e2a104b55541
-	github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5 // indirect
 )
 
+require github.com/webview/webview v0.0.0-20221220082822-77e021440a0f
+
+require github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
+
 require (
 	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
 	github.com/dustin/go-humanize v1.0.0 // indirect

go.sum

@@ -47,12 +47,11 @@ github.com/hashicorp/go-syslog v1.0.0 h1:KaodqZuhUoZereWVIYmpUgZysurB1kBLX2j0MwM
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
 github.com/hjson/hjson-go v3.1.0+incompatible h1:DY/9yE8ey8Zv22bY+mHV1uk2yRy0h8tKhZ77hEdi0Aw=
 github.com/hjson/hjson-go v3.1.0+incompatible/go.mod h1:qsetwF8NlsTsOTwZTApNlTCerV+b2GjYRRcIk4JMFio=
-github.com/jchv/go-webview-selector v0.0.0-20220126075917-13df59bce3cf h1:LfCNdIjo0pYj7ChAEkRZKPW/GKOzQLGqz/8CbDTxBvE=
+github.com/jchv/go-webview2 v0.0.0-20221027045535-e2a104b55541 h1:a3nfcpypvn/2WUzZzmZ9Kc75nPOpCrYnV45zrlGcGJM=
-github.com/jchv/go-webview-selector v0.0.0-20220126075917-13df59bce3cf/go.mod h1:RfUO9QcPUZ27qVS+rq9SYhhjsVNiolWwaIQdNjqFUsQ=
+github.com/jchv/go-webview2 v0.0.0-20221027045535-e2a104b55541/go.mod h1:/BNVc0Sw3Wj6Sz9uSxPwhCEUhhWs92hPde75K2YV24A=
-github.com/jchv/go-webview2 v0.0.0-20220126073738-2ea27096a5eb h1:oKKhiqJVbFqiPo+cj7zmY/R8AaOxgLQixUAOP/bKuRM=
-github.com/jchv/go-webview2 v0.0.0-20220126073738-2ea27096a5eb/go.mod h1:/BNVc0Sw3Wj6Sz9uSxPwhCEUhhWs92hPde75K2YV24A=
-github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5 h1:pdFFlHXY9tZXmJz+tRSm1DzYEH4ebha7cffmm607bMU=
 github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
+github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck=
+github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
 github.com/kardianos/minwinsvc v1.0.2 h1:JmZKFJQrmTGa/WiW+vkJXKmfzdjabuEW4Tirj5lLdR0=
 github.com/kardianos/minwinsvc v1.0.2/go.mod h1:LUZNYhNmxujx2tR7FbdxqYJ9XDDoCd3MQcl1o//FWl4=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -99,6 +98,10 @@ github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYp
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f h1:p4VB7kIXpOQvVn1ZaTIVp+3vuYAXFe3OJEvjbUYJLaA=
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
+github.com/webview/webview v0.0.0-20221218140943-9db4b8c3e9af h1:QO77Qt3ucuL5l8tFIAMXrLaDx4rYI9Nz89x+nrJwYJo=
+github.com/webview/webview v0.0.0-20221218140943-9db4b8c3e9af/go.mod h1:rpXAuuHgyEJb6kXcXldlkOjU6y4x+YcASKKXJNUhh0Y=
+github.com/webview/webview v0.0.0-20221220082822-77e021440a0f h1:whomWpMJmyN9uHtIjBIE2jmjN8ZccngNh3kCg4G16FA=
+github.com/webview/webview v0.0.0-20221220082822-77e021440a0f/go.mod h1:rpXAuuHgyEJb6kXcXldlkOjU6y4x+YcASKKXJNUhh0Y=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=

makefile

@@ -18,7 +18,7 @@ $(addprefix $(OUT_DIR)/,$(ALL_PLATFORMS)):
 linux-amd64: $(addprefix linux-amd64-,$(ALL_EXE))
 
 windows-amd64: $(addprefix windows-amd64-,$(ALL_EXE))
-windows-amd64-%: BUILD_ENV=CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++
+#windows-amd64-%: BUILD_ENV=CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++
 
 macos-amd64: $(addprefix macos-amd64-,$(ALL_EXE))
 macos-amd64-%: BUILD_ENV=GO111MODULE=on