Initial support for a serve port flag

CONTRIBUTORS.md

@@ -26,5 +26,4 @@ Wails is what it is because of the time and effort given by these great people.
   * [Reuben Thomas-Davis](https://github.com/Rested)
   * [Jarek](https://github.com/Jarek-SRT)
   * [Konez2k](https://github.com/konez2k)
-  * [msms](https://github.com/sayuthisobri)
-  * [dedo1911](https://github.com/dedo1911)
+  * [msms](https://github.com/sayuthisobri)

README.md

@@ -55,7 +55,7 @@ _Debian: 8, 9, 10_
 
 _Ubuntu: 16.04, 18.04, 19.04_
 
-_Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, Kali, Neon_, Pop!_OS
+_Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, Kali, Neon_
 
 #### Arch Linux / ArchLabs
 

cmd/helpers.go

@@ -510,6 +510,8 @@ func InstallRuntime(caller string, projectDir string, projectOptions *ProjectOpt
 // InstallBridge installs the relevant bridge javascript library
 func InstallBridge(projectDir string, projectOptions *ProjectOptions) error {
 	bridgeFileData := mewn.String("../runtime/assets/bridge.js")
+	// Inject the custom serve port
+	bridgeFileData = strings.ReplaceAll(bridgeFileData, "$SERVEPORT$", projectOptions.ServePort)
 	bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, "node_modules", "@wailsapp", "runtime", "init.js")
 	err := fs.CreateFile(bridgeFileTarget, []byte(bridgeFileData))
 	return err
@@ -561,6 +563,10 @@ func ldFlags(po *ProjectOptions, buildMode string) string {
 
 	ldflags += "-X github.com/wailsapp/wails.BuildMode=" + buildMode
 
+	// Inject port if we are using bridge mode
+	if buildMode == BuildModeBridge {
+		ldflags += " -X github.com/wailsapp/wails/lib/renderer/bridge.ServePort=" + po.ServePort
+	}
 	// If we wish to generate typescript
 	if po.typescriptDefsFilename != "" {
 		cwd, err := os.Getwd()

cmd/linux.go

@@ -59,10 +59,6 @@ const (
 	Leap
 	// ArchLabs distribution
 	ArchLabs
-	// PopOS distribution
-	PopOS
-	// Solus distribution
-	Solus
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -163,10 +159,6 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = Tumbleweed
 	case "opensuse-leap":
 		result.Distribution = Leap
-	case "pop":
-		result.Distribution = PopOS
-	case "solus":
-		result.Distribution = Solus
 	default:
 		result.Distribution = Unknown
 	}
@@ -203,17 +195,6 @@ func DpkgInstalled(packageName string) (bool, error) {
 	return exitCode == 0, nil
 }
 
-// EOpkgInstalled uses dpkg to see if a package is installed
-func EOpkgInstalled(packageName string) (bool, error) {
-	program := NewProgramHelper()
-	eopkg := program.FindProgram("eopkg")
-	if eopkg == nil {
-		return false, fmt.Errorf("cannot check dependencies: eopkg not found")
-	}
-	stdout, _, _, _ := eopkg.Run("info", packageName)
-	return strings.HasPrefix(stdout, "Installed"), nil
-}
-
 // PacmanInstalled uses pacman to see if a package is installed.
 func PacmanInstalled(packageName string) (bool, error) {
 	program := NewProgramHelper()
@@ -285,9 +266,5 @@ func RequestSupportForDistribution(distroInfo *DistroInfo) error {
 
 	fmt.Println("Opening browser to file request.")
 	browser.OpenURL(fullURL + url.PathEscape(params))
-	result = Prompt("We have a guide for adding support for your distribution. Would you like to view it?", "yes")
-	if strings.ToLower(result) == "yes" {
-		browser.OpenURL("https://wails.app/guides/distro/")
-	}
 	return nil
 }

cmd/linuxdb.yaml

@@ -28,15 +28,6 @@ distributions:
         gccversioncommand: &gccdumpfullversion -dumpfullversion
         programs: *debiandefaultprograms
         libraries: *debiandefaultlibraries
-  pop:
-    id: pop
-    releases:
-      default:
-        version: default
-        name: Pop!_OS
-        gccversioncommand: &gccdumpfullversion -dumpfullversion
-        programs: *debiandefaultprograms
-        libraries: *debiandefaultlibraries
   kali:
     id: kali
     releases:
@@ -241,25 +232,6 @@ distributions:
         gccversioncommand: *gccdumpfullversion
         programs: *debiandefaultprograms
         libraries: *debiandefaultlibraries
-  solus:
-    id: solus
-    releases:
-      default:
-        version: default
-        name: Solus
-        gccversioncommand: *gccdumpfullversion
-        programs: &solusdefaultprograms
-          - name: gcc
-            help: Please install with `sudo eopkg it -c system.devel` and try again
-          - name: pkg-config
-            help: Please install with `sudo eopkg it -c system.devel` and try again
-          - name: npm
-            help: Please install with `sudo eopkg it nodejs` and try again
-        libraries: &solusdefaultlibraries
-          - name: libgtk-3-devel
-            help: Please install with `sudo eopkg it libgtk-3-devel` and try again
-          - name: libwebkit-gtk-devel
-            help: Please install with `sudo eopkg it libwebkit-gtk-devel` and try again
         
   opensuse-tumbleweed:
     id: opensuse-tumbleweed

cmd/package.go

@@ -1,12 +1,9 @@
 package cmd
 
 import (
-	"bufio"
 	"bytes"
-	"encoding/binary"
 	"fmt"
 	"image"
-	"image/png"
 	"io/ioutil"
 	"os"
 	"path"
@@ -17,7 +14,6 @@ import (
 	"time"
 
 	"github.com/jackmordaunt/icns"
-	"golang.org/x/image/draw"
 )
 
 // PackageHelper helps with the 'wails package' command
@@ -59,111 +55,6 @@ func newPlistData(title, exe, packageID, version, author string) *plistData {
 	}
 }
 
-type windowsIcoHeader struct {
-	_          uint16
-	imageType  uint16
-	imageCount uint16
-}
-
-type windowsIcoDescriptor struct {
-	width   uint8
-	height  uint8
-	colours uint8
-	_       uint8
-	planes  uint16
-	bpp     uint16
-	size    uint32
-	offset  uint32
-}
-
-type windowsIcoContainer struct {
-	Header windowsIcoDescriptor
-	Data   []byte
-}
-
-func generateWindowsIcon(pngFilename string, iconfile string) error {
-	sizes := []int{256, 128, 64, 48, 32, 16}
-
-	pngfile, err := os.Open(pngFilename)
-	if err != nil {
-		return err
-	}
-	defer pngfile.Close()
-
-	pngdata, err := png.Decode(pngfile)
-	if err != nil {
-		return err
-	}
-
-	icons := []windowsIcoContainer{}
-
-	for _, size := range sizes {
-		rect := image.Rect(0, 0, int(size), int(size))
-		rawdata := image.NewRGBA(rect)
-		scale := draw.CatmullRom
-		scale.Scale(rawdata, rect, pngdata, pngdata.Bounds(), draw.Over, nil)
-
-		icondata := new(bytes.Buffer)
-		writer := bufio.NewWriter(icondata)
-		err = png.Encode(writer, rawdata)
-		if err != nil {
-			return err
-		}
-		writer.Flush()
-
-		imgSize := size
-		if imgSize >= 256 {
-			imgSize = 0
-		}
-
-		data := icondata.Bytes()
-
-		icn := windowsIcoContainer{
-			Header: windowsIcoDescriptor{
-				width:  uint8(imgSize),
-				height: uint8(imgSize),
-				planes: 1,
-				bpp:    32,
-				size:   uint32(len(data)),
-			},
-			Data: data,
-		}
-		icons = append(icons, icn)
-	}
-
-	outfile, err := os.Create(iconfile)
-	if err != nil {
-		return err
-	}
-	defer outfile.Close()
-
-	ico := windowsIcoHeader{
-		imageType:  1,
-		imageCount: uint16(len(sizes)),
-	}
-	err = binary.Write(outfile, binary.LittleEndian, ico)
-	if err != nil {
-		return err
-	}
-
-	offset := uint32(6 + 16*len(sizes))
-	for _, icon := range icons {
-		icon.Header.offset = offset
-		err = binary.Write(outfile, binary.LittleEndian, icon.Header)
-		if err != nil {
-			return err
-		}
-		offset += icon.Header.size
-	}
-	for _, icon := range icons {
-		_, err = outfile.Write(icon.Data)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func defaultString(val string, defaultVal string) string {
 	if val != "" {
 		return val
@@ -286,16 +177,14 @@ func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
 	outputDir := b.fs.Cwd()
 	basename := strings.TrimSuffix(po.BinaryName, ".exe")
 
-	// Copy default icon if needed
-	icon, err := b.copyIcon()
-	if err != nil {
-		return err
-	}
-
-	// Generate icon from PNG
-	err = generateWindowsIcon(icon, po.BinaryName+".ico")
-	if err != nil {
-		return err
+	// Copy icon
+	tgtIconFile := filepath.Join(outputDir, basename+".ico")
+	if !b.fs.FileExists(tgtIconFile) {
+		srcIconfile := filepath.Join(b.getPackageFileBaseDir(), "wails.ico")
+		err := b.fs.CopyFile(srcIconfile, tgtIconFile)
+		if err != nil {
+			return err
+		}
 	}
 
 	// Copy manifest
@@ -354,7 +243,7 @@ func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
 	return nil
 }
 
-func (b *PackageHelper) copyIcon() (string, error) {
+func (b *PackageHelper) copyIcon(resourceDir string) (string, error) {
 
 	// TODO: Read this from project.json
 	const appIconFilename = "appicon.png"
@@ -379,7 +268,7 @@ func (b *PackageHelper) copyIcon() (string, error) {
 
 func (b *PackageHelper) packageIconOSX(resourceDir string) error {
 
-	srcIcon, err := b.copyIcon()
+	srcIcon, err := b.copyIcon(resourceDir)
 	if err != nil {
 		return err
 	}

cmd/packages/windows/wails.rc

@@ -1,2 +1,2 @@
 100 ICON    "$NAME$.ico"
-110 24      "$NAME$.exe.manifest"
+100 24      "$NAME$.exe.manifest"

cmd/project.go

@@ -161,6 +161,7 @@ type ProjectOptions struct {
 	CrossCompile           bool
 	Platform               string
 	Architecture           string
+	ServePort              string
 }
 
 // Defaults sets the default project template

cmd/system.go

@@ -274,7 +274,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
 		distroInfo := GetLinuxDistroInfo()
 
 		switch distroInfo.Distribution {
-		case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian, PopOS:
+		case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian:
 			libraryChecker = DpkgInstalled
 		case Arch, ArcoLinux, ArchLabs, Manjaro, ManjaroARM:
 			libraryChecker = PacmanInstalled
@@ -284,8 +284,6 @@ func CheckDependencies(logger *Logger) (bool, error) {
 			libraryChecker = EqueryInstalled
 		case VoidLinux:
 			libraryChecker = XbpsInstalled
-		case Solus:
-			libraryChecker = EOpkgInstalled
 		default:
 			return false, RequestSupportForDistribution(distroInfo)
 		}

cmd/version.go

@@ -1,4 +1,4 @@
 package cmd
 
 // Version - Wails version
-const Version = "v1.6.0-pre3"
+const Version = "v1.6.0-pre2"

cmd/wails/6_serve.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"runtime"
+	"strconv"
 
 	"github.com/leaanthony/spinner"
 	"github.com/wailsapp/wails/cmd"
@@ -11,6 +11,7 @@ import (
 func init() {
 
 	var forceRebuild = false
+	var servePort = "34115"
 	var verbose = false
 	buildSpinner := spinner.NewSpinner()
 	buildSpinner.SetSpinSpeed(50)
@@ -19,7 +20,8 @@ func init() {
 	initCmd := app.Command("serve", "Run your Wails project in bridge mode").
 		LongDescription(commandDescription).
 		BoolFlag("verbose", "Verbose output", &verbose).
-		BoolFlag("f", "Force rebuild of application components", &forceRebuild)
+		BoolFlag("f", "Force rebuild of application components", &forceRebuild).
+		StringFlag("p", "Port to serve on", &servePort)
 
 	initCmd.Action(func() error {
 
@@ -35,8 +37,6 @@ func init() {
 
 		// Project options
 		projectOptions := &cmd.ProjectOptions{}
-		projectOptions.Verbose = verbose
-		projectOptions.Platform = runtime.GOOS
 
 		// Check we are in project directory
 		// Check project.json loads correctly
@@ -46,6 +46,16 @@ func init() {
 			return err
 		}
 
+		// Set Verbose flag
+		projectOptions.Verbose = verbose
+
+		// Check port
+		port, err := strconv.Atoi(servePort)
+		if err != nil || port <= 0 {
+			return fmt.Errorf("invalid port value: %s", servePort)
+		}
+		projectOptions.ServePort = servePort
+
 		// Save project directory
 		projectDir := fs.Cwd()
 

go.mod

@@ -22,7 +22,6 @@ require (
 	github.com/stretchr/testify v1.3.0 // indirect
 	github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba
 	golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529 // indirect
-	golang.org/x/image v0.0.0-20200430140353-33d19683fad8
 	golang.org/x/net v0.0.0-20190509222800-a4d6f7feada5 // indirect
 	golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862
 	golang.org/x/text v0.3.0

go.sum

@@ -70,8 +70,6 @@ golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529 h1:iMGN4xG0cnqj3t+zOM8wUB0BiPKHEwSxEZCvzcbZuvk=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/image v0.0.0-20200430140353-33d19683fad8 h1:6WW6V3x1P/jokJBpRQYUJnMHRP6isStQwCozxnU7XQw=
-golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190509222800-a4d6f7feada5 h1:6M3SDHlHHDCx2PcQw3S4KsR170vGqDhJDOmpVd4Hjak=
 golang.org/x/net v0.0.0-20190509222800-a4d6f7feada5/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=

lib/renderer/bridge/bridge.go

@@ -1,4 +1,4 @@
-package renderer
+package bridge
 
 import (
 	"encoding/json"
@@ -14,6 +14,10 @@ import (
 
 type messageType int
 
+// ServePort indicates which port to serve the backend on when using
+// `wails serve`
+var ServePort = "34115"
+
 const (
 	jsMessage messageType = iota
 	cssMessage
@@ -93,7 +97,7 @@ func (h *Bridge) startSession(conn *websocket.Conn) {
 
 // Run the app in Bridge mode!
 func (h *Bridge) Run() error {
-	h.server = &http.Server{Addr: ":34115"}
+	h.server = &http.Server{Addr: ":" + ServePort}
 	http.HandleFunc("/bridge", h.wsBridgeHandler)
 
 	h.log.Info("Bridge mode started.")

lib/renderer/bridge/session.go

@@ -1,4 +1,4 @@
-package renderer
+package bridge
 
 import (
 	"time"

lib/renderer/webview/webview.h

@@ -1410,8 +1410,6 @@ struct webview_priv
     wc.hInstance = hInstance;
     wc.lpfnWndProc = wndproc;
     wc.lpszClassName = classname;
-    wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(100));
-    wc.hIconSm = LoadIcon(hInstance, MAKEINTRESOURCE(100));
     RegisterClassEx(&wc);
 
     style = WS_OVERLAPPEDWINDOW;

runtime/assets/bridge.js

@@ -14,7 +14,7 @@ function init() {
 	window.wailsbridge = {
 		reconnectOverlay: null,
 		reconnectTimer: 300,
-		wsURL: 'ws://' + window.location.hostname + ':34115/bridge',
+		wsURL: 'ws://' + window.location.hostname + ':$SERVEPORT$/bridge',
 		connectionState: null,
 		config: {},
 		websocket: null,
@@ -149,38 +149,38 @@ function startBridge() {
 	function handleMessage(message) {
 		// As a bridge we ignore js and css injections
 		switch (message.data[0]) {
-		// Wails library - inject!
-		case 'w':
-			addScript(message.data.slice(1));
+			// Wails library - inject!
+			case 'w':
+				addScript(message.data.slice(1));
 
-			// Now wails runtime is loaded, wails for the ready event
-			// and callback to the main app
-			window.wails.Events.On('wails:loaded', function () {
-				window.wailsbridge.log('Wails Ready');
-				if (window.wailsbridge.callback) {
-					window.wailsbridge.log('Notifying application');
-					window.wailsbridge.callback(window.wails);
-				}
-			});
-			window.wailsbridge.log('Loaded Wails Runtime');
-			break;
+				// Now wails runtime is loaded, wails for the ready event
+				// and callback to the main app
+				window.wails.Events.On('wails:loaded', function () {
+					window.wailsbridge.log('Wails Ready');
+					if (window.wailsbridge.callback) {
+						window.wailsbridge.log('Notifying application');
+						window.wailsbridge.callback(window.wails);
+					}
+				});
+				window.wailsbridge.log('Loaded Wails Runtime');
+				break;
 			// Notifications
-		case 'n':
-			addScript(message.data.slice(1), true);
-			break;
+			case 'n':
+				addScript(message.data.slice(1), true);
+				break;
 			// Binding
-		case 'b':
-			var binding = message.data.slice(1);
-			//log("Binding: " + binding)
-			window.wails._.NewBinding(binding);
-			break;
+			case 'b':
+				var binding = message.data.slice(1);
+				//log("Binding: " + binding)
+				window.wails._.NewBinding(binding);
+				break;
 			// Call back
-		case 'c':
-			var callbackData = message.data.slice(1);
-			window.wails._.Callback(callbackData);
-			break;
-		default:
-			window.wails.Log.Error('Unknown message type received: ' + message.data[0]);
+			case 'c':
+				var callbackData = message.data.slice(1);
+				window.wails._.Callback(callbackData);
+				break;
+			default:
+				window.wails.Log.Error('Unknown message type received: ' + message.data[0]);
 		}
 	}