Windows installer

.gitignore

@@ -55,3 +55,4 @@ Char
 *.dmg
 /scripts/mac_installer/icon.iconset/
 releaseChangelog.md
+skywire.msi

Makefile

@@ -260,6 +260,9 @@ mac-installer: ## Create signed and notarized application, run make mac-installe
 mac-installer-help: ## Show installer creation help
 	./scripts/mac_installer/create_installer.sh -h
 
+win-installer:
+	@powershell '.\scripts\win_installer\script.ps1'
+
 help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 

internal/gui/gui.go

@@ -4,7 +4,6 @@
 package gui
 
 import (
-	"context"
 	"embed"
 	"fmt"
 	"io"
@@ -20,7 +19,6 @@ import (
 	"github.com/skycoin/skycoin/src/util/logging"
 	"github.com/toqueteos/webbrowser"
 
-	"github.com/skycoin/skywire/pkg/servicedisc"
 	"github.com/skycoin/skywire/pkg/skyenv"
 	"github.com/skycoin/skywire/pkg/visor/visorconfig"
 )
@@ -192,27 +190,6 @@ func handleVPNLinkButton(conf *visorconfig.V1) {
 	}
 }
 
-// GetAvailPublicVPNServers gets all available public VPN server from service discovery URL
-func GetAvailPublicVPNServers(conf *visorconfig.V1) []string {
-	sdClient := servicedisc.NewClient(log, servicedisc.Config{
-		Type:     servicedisc.ServiceTypeVPN,
-		PK:       conf.PK,
-		SK:       conf.SK,
-		DiscAddr: conf.Launcher.ServiceDisc,
-	})
-	//ctx, _ := context.WithTimeout(context.Background(), 7*time.Second)
-	vpnServers, err := sdClient.Services(context.Background(), 0)
-	if err != nil {
-		log.Error("Error getting public vpn servers: ", err)
-		return nil
-	}
-	serverAddrs := make([]string, len(vpnServers))
-	for idx, server := range vpnServers {
-		serverAddrs[idx] = server.Addr.PubKey().String()
-	}
-	return serverAddrs
-}
-
 func initUninstallBtn() {
 	if !checkIsPackage() {
 		mUninstall.Hide()

internal/gui/gui_test.go

@@ -6,26 +6,9 @@ package gui
 import (
 	"testing"
 
-	"github.com/skycoin/dmsg/cipher"
 	"github.com/stretchr/testify/require"
-
-	"github.com/skycoin/skywire/pkg/visor/visorconfig"
 )
 
-func TestGetAvailPublicVPNServers(t *testing.T) {
-	pk, sk := cipher.GenerateKeyPair()
-	common := &visorconfig.Common{
-		Version: "v1.1.0",
-		SK:      sk,
-		PK:      pk,
-	}
-	config := visorconfig.MakeBaseConfig(common)
-	servers := GetAvailPublicVPNServers(config)
-	require.NotEqual(t, nil, servers)
-	require.NotEqual(t, []string{}, servers)
-	t.Logf("Servers: %v", servers)
-}
-
 func TestReadEmbeddedIcon(t *testing.T) {
 	b, err := ReadSysTrayIcon()
 	require.NoError(t, err)

scripts/win_installer/README.md

@@ -0,0 +1,32 @@
+## Windows installer
+
+### Requirments
+- windows machine
+- Install **chocolatey** by its instruction [here](https://chocolatey.org/install).
+- Install **GNU Make** by choco
+  ```
+  choco install make
+  ```
+- Install **go-msi** by choco
+  ```
+  choco install go-msi
+  ```
+- Download and Install **Wix** from [here](https://github.com/wixtoolset/wix3/releases/tag/wix3112rtm).
+  - Need to add `C:\Program Files (x86)\WiX Toolset v3.11\bin` to path.
+- We need to install **.Net Framework 3.5 SP1**, you can download and install from [here](https://dotnet.microsoft.com/en-us/download/dotnet-framework/thank-you/net35-sp1-web-installer).
+
+### Build
+You can build **skywire.msi** by
+```
+make win-installer
+```
+
+### Install
+Double click the created installer to install skywire.
+
+### Run
+To run skywire open a terminal or cmd window and run
+```
+skywire
+```
+or open `skywire` shortcut on start menu.

scripts/win_installer/script.ps1

@@ -0,0 +1,21 @@
+echo "Building Systray Windows Binaries..."
+if (Test-Path ".\skywire.msi") { Remove-Item ".\skywire.msi" -Recurse -Force}
+make build-systray-windows > $null
+echo "Build Complete!"
+echo "Setting go-msi configuration..."
+cd .\scripts\win_installer
+if (Test-Path ".\build") { Remove-Item ".\build" -Recurse -Force}
+mkdir -p ".\build\amd64\apps" > $null
+mv ..\..\skywire-visor.exe .\build\amd64\skywire-visor.exe
+mv ..\..\skywire-cli.exe .\build\amd64\skywire-cli.exe
+mv ..\..\apps\vpn-client .\build\amd64\apps\vpn-client.exe
+rm ..\..\setup-node.exe
+rm -r -fo ..\..\apps
+cp skywire.bat .\build\amd64\skywire.bat
+echo "Configuration complete!"
+echo "Building msi..."
+go-msi make --msi skywire.msi --version 0.5.1 --arch amd64
+mv skywire.msi ../../skywire.msi
+Remove-Item ".\build" -Recurse -Force
+cd ../../
+echo "Build Complete!"

scripts/win_installer/skywire.bat

@@ -0,0 +1,12 @@
+@Echo Off
+%1 mshta vbscript:CreateObject("Shell.Application").ShellExecute("cmd.exe","/c %~s0 ::","","runas",1)(window.close)&&exit
+cd /d "%~dp0"
+if not exist "apps\" (
+    mkdir apps
+    move vpn-client.exe apps
+)
+if not exist "%HOMEPATH%\skywire-config.json" (
+skywire-cli config gen -biro "%HOMEPATH%\skywire-config.json" --os windows --disable-apps skychat,skysocks,skysocks-client,vpn-server
+)
+start "" http://127.0.0.1:8000
+skywire-visor.exe -c "%HOMEPATH%\skywire-config.json"

scripts/win_installer/wix.json

@@ -0,0 +1,47 @@
+{
+  "product": "Skywire",
+  "company": "Skycoin",
+  "upgrade-code": "",
+  "files": {
+    "guid": "",
+    "items": [
+      "build/amd64/skywire-cli.exe",
+      "build/amd64/skywire-visor.exe",
+      "build/amd64/apps/vpn-client.exe",
+      "build/amd64/skywire.bat",
+      "ico.ico"
+    ]
+  },
+  "env": {
+    "guid": "",
+    "vars": [
+      {
+        "name": "PATH",
+        "value": "[INSTALLDIR]",
+        "permanent": "yes",
+        "system": "yes",
+        "action": "set",
+        "part": "last"
+      }
+    ]
+  },
+  "shortcuts": {
+    "guid": "",
+    "items": [
+      {
+        "name": "Skywire",
+        "description": "run skywire",
+        "target": "[INSTALLDIR]\\skywire.bat",
+        "wdir": "INSTALLDIR",
+        "icon":"ico.ico"
+      }
+    ]
+  },
+  "hooks": [ ],
+  "choco": {
+    "description": "skywire",
+    "project-url": "https://github.com/skycoin/skywire",
+    "tags": "skywire",
+    "license-url": ""
+  }
+}