Merge branch 'feature/v2-mac' into v2-alpha

# Conflicts:
#	v2/cmd/wails/internal/commands/build/build.go
#	v2/cmd/wails/internal/commands/dev/dev.go
#	v2/cmd/wails/internal/commands/doctor/doctor.go
#	v2/cmd/wails/internal/commands/initialise/initialise.go
#	v2/cmd/wails/main.go
#	v2/go.mod
#	v2/go.sum
#	v2/internal/app/default.go
#	v2/internal/app/desktop.go
#	v2/internal/app/hybrid.go
#	v2/internal/app/server.go
#	v2/internal/binding/binding.go
#	v2/internal/binding/boundMethod.go
#	v2/internal/binding/db.go
#	v2/internal/binding/reflect.go
#	v2/internal/ffenestri/ffenestri.go
#	v2/internal/ffenestri/ffenestri.h
#	v2/internal/ffenestri/ffenestri_client.go
#	v2/internal/ffenestri/ffenestri_linux.c
#	v2/internal/fs/fs.go
#	v2/internal/html/asset.go
#	v2/internal/html/assetbundle.go
#	v2/internal/logger/custom_logger.go
#	v2/internal/logger/default_logger.go
#	v2/internal/messagedispatcher/dispatchclient.go
#	v2/internal/messagedispatcher/message/call.go
#	v2/internal/messagedispatcher/message/event.go
#	v2/internal/messagedispatcher/message/log.go
#	v2/internal/messagedispatcher/message/messageparser.go
#	v2/internal/messagedispatcher/message/runtime.go
#	v2/internal/messagedispatcher/message/window.go
#	v2/internal/messagedispatcher/messagedispatcher.go
#	v2/internal/parse/parse.go
#	v2/internal/process/process.go
#	v2/internal/project/project.go
#	v2/internal/runtime/js/core/bindings.js
#	v2/internal/runtime/js/core/browser.js
#	v2/internal/runtime/js/core/calls.js
#	v2/internal/runtime/js/core/desktop.js
#	v2/internal/runtime/js/core/events.js
#	v2/internal/runtime/js/core/log.js
#	v2/internal/runtime/js/core/main.js
#	v2/internal/runtime/js/core/utils.js
#	v2/internal/runtime/js/desktop/linux.js
#	v2/internal/runtime/js/package-lock.json
#	v2/internal/runtime/js/package.json
#	v2/internal/runtime/js/package.json.md5
#	v2/internal/runtime/js/runtime/.npmignore
#	v2/internal/runtime/js/runtime/README.md
#	v2/internal/runtime/js/runtime/browser.js
#	v2/internal/runtime/js/runtime/events.js
#	v2/internal/runtime/js/runtime/init.js
#	v2/internal/runtime/js/runtime/log.js
#	v2/internal/runtime/js/runtime/main.js
#	v2/internal/runtime/js/runtime/package.json
#	v2/internal/runtime/js/runtime/runtime.d.ts
#	v2/internal/runtime/js/webpack.desktop.js
#	v2/internal/servicebus/servicebus.go
#	v2/internal/signal/signal.go
#	v2/internal/subsystem/binding.go
#	v2/internal/subsystem/call.go
#	v2/internal/subsystem/event.go
#	v2/internal/subsystem/log.go
#	v2/internal/subsystem/runtime.go
#	v2/internal/system/packagemanager/packagemanager.go
#	v2/internal/system/system_windows.go
#	v2/internal/templates/templates.go
#	v2/internal/templates/templates/svelte-mui/basic.tmpl.go
#	v2/internal/templates/templates/svelte-mui/frontend/package.json
#	v2/internal/templates/templates/svelte-mui/main.tmpl.go
#	v2/internal/templates/templates/vanilla/basic.tmpl.go
#	v2/internal/templates/templates/vanilla/frontend/index.html
#	v2/internal/templates/templates/vanilla/frontend/main.css
#	v2/internal/templates/templates/vanilla/main.tmpl.go
#	v2/internal/templates/templates/vanilla/wails.tmpl.json
#	v2/internal/templates/templates/vuetify2-basic/basic.tmpl.go
#	v2/internal/templates/templates/vuetify2-basic/main.tmpl.go
#	v2/internal/templates/templates/vuetify2-basic/wails.tmpl.json
#	v2/internal/webserver/websockets.go
#	v2/pkg/commands/build/base.go
#	v2/pkg/commands/build/build.go
#	v2/pkg/commands/build/builder.go
#	v2/pkg/commands/build/desktop.go
#	v2/pkg/commands/build/hybrid.go
#	v2/pkg/commands/build/packager.go
#	v2/pkg/commands/build/packager_linux.go
#	v2/pkg/commands/build/server.go
#	v2/test/disable-resize/basic.go
#	v2/test/disable-resize/main.go
#	v2/test/frameless/basic.go
#	v2/test/frameless/main.go
#	v2/test/hidden/basic.go
#	v2/test/hidden/main.go
#	v2/test/minmax/basic.go
#	v2/test/minmax/main.go
#	v2/test/runtime/calc.go
#	v2/test/runtime/frontend/package-lock.json
#	v2/test/runtime/frontend/src/assets/css/main.css
#	v2/test/runtime/frontend/src/index.html
#	v2/test/runtime/frontend/src/main.js
#	v2/test/runtime/main.go
#	v2/test/runtime/runtime.go
#	v2/wails.go

.gitignore

@@ -27,5 +27,3 @@ v2/pkg/parser/testproject/frontend/wails
 v2/test/kitchensink/frontend/public
 v2/test/kitchensink/build/darwin/desktop/kitchensink
 v2/test/kitchensink/frontend/package.json.md5
-/v2/internal/ffenestri/windows/test/cmake-build-debug/
-.idea/

CONTRIBUTORS.md

@@ -40,5 +40,4 @@ Wails is what it is because of the time and effort given by these great people.
   * [Balakrishna Prasad Ganne](https://github.com/aayush420)
   * [Charaf Rezrazi](https://github.com/Rezrazi)
   * [misitebao](https://github.com/misitebao)
-  * [Elie Grenon](https://github.com/DrunkenPoney)
-  * [Amaury Tobias Quiroz](https://github.com/amaury-tobias)
+  * [Elie Grenon](https://github.com/DrunkenPoney)

v2/cmd/wails/internal/commands/build/build.go

@@ -2,21 +2,19 @@ package build
 
 import (
 	"fmt"
-	"io"
 	"os"
 	"runtime"
 	"strings"
-	"text/tabwriter"
 	"time"
 
 	"github.com/leaanthony/clir"
 	"github.com/leaanthony/slicer"
-	"github.com/wailsapp/wails/v2/pkg/clilogger"
+	"github.com/wailsapp/wails/v2/internal/logger"
 	"github.com/wailsapp/wails/v2/pkg/commands/build"
 )
 
 // AddBuildSubcommand adds the `build` command for the Wails application
-func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
+func AddBuildSubcommand(app *clir.Cli) {
 
 	outputType := "desktop"
 
@@ -24,152 +22,77 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 
 	command := app.NewSubCommand("build", "Builds the application")
 
+	// Setup target type flag
+	description := "Type of application to build. Valid types: " + validTargetTypes.Join(",")
+	command.StringFlag("t", description, &outputType)
+
 	// Setup production flag
 	production := false
 	command.BoolFlag("production", "Build in production mode", &production)
 
 	// Setup pack flag
 	pack := false
-	command.BoolFlag("package", "Create a platform specific package", &pack)
+	command.BoolFlag("pack", "Create a platform specific package", &pack)
 
 	compilerCommand := "go"
 	command.StringFlag("compiler", "Use a different go compiler to build, eg go1.15beta1", &compilerCommand)
 
-	compress := false
-	command.BoolFlag("compress", "Compress final binary", &compress)
-
 	// Setup Platform flag
 	platform := runtime.GOOS
 	command.StringFlag("platform", "Platform to target", &platform)
 
-	// Verbosity
-	verbosity := 1
-	command.IntFlag("v", "Verbosity level (0 - silent, 1 - default, 2 - verbose)", &verbosity)
+	// Quiet Build
+	quiet := false
+	command.BoolFlag("q", "Supress output to console", &quiet)
 
 	// ldflags to pass to `go`
 	ldflags := ""
 	command.StringFlag("ldflags", "optional ldflags", &ldflags)
 
-	// tags to pass to `go`
-	tags := ""
-	command.StringFlag("tags", "tags to pass to Go compiler (quoted and space separated)", &tags)
-
-	// Retain assets
-	keepAssets := false
-	command.BoolFlag("k", "Keep generated assets", &keepAssets)
-
-	// Retain assets
-	outputFilename := ""
-	command.StringFlag("o", "Output filename", &outputFilename)
-
-	// Clean build directory
-	cleanBuildDirectory := false
-	command.BoolFlag("clean", "Clean the build directory before building", &cleanBuildDirectory)
+	// Log to file
+	logFile := ""
+	command.StringFlag("l", "Log to file", &logFile)
 
 	command.Action(func() error {
 
-		quiet := verbosity == 0
-
 		// Create logger
-		logger := clilogger.New(w)
-		logger.Mute(quiet)
+		logger := logger.New()
+
+		if !quiet {
+			logger.AddOutput(os.Stdout)
+		}
 
 		// Validate output type
 		if !validTargetTypes.Contains(outputType) {
-			return fmt.Errorf("output type '%s' is not valid", outputType)
+			logger.Fatal(fmt.Sprintf("Output type '%s' is not valid.", outputType))
+			os.Exit(1)
 		}
 
 		if !quiet {
 			app.PrintBanner()
 		}
 
+		task := fmt.Sprintf("Building %s Application", strings.Title(outputType))
+		logger.Writeln(task)
+		logger.Writeln(strings.Repeat("-", len(task)))
+
 		// Setup mode
 		mode := build.Debug
 		if production {
 			mode = build.Production
 		}
 
-		// Check platform
-		validPlatformArch := slicer.String([]string{
-			"darwin",
-			"darwin/amd64",
-			"darwin/arm64",
-			"darwin/universal",
-			//"linux/amd64",
-			//"linux/arm-7",
-			"windows",
-			"windows/amd64",
-		})
-		if !validPlatformArch.Contains(platform) {
-			return fmt.Errorf("platform %s is not supported", platform)
-		}
-
-		if compress && platform == "darwin/universal" {
-			println("Warning: compress flag unsupported for universal binaries. Ignoring.")
-			compress = false
-		}
-
-		// Tags
-		userTags := []string{}
-		for _, tag := range strings.Split(tags, " ") {
-			thisTag := strings.TrimSpace(tag)
-			if thisTag != "" {
-				userTags = append(userTags, thisTag)
-			}
-		}
-
 		// Create BuildOptions
 		buildOptions := &build.Options{
-			Logger:              logger,
-			OutputType:          outputType,
-			OutputFile:          outputFilename,
-			CleanBuildDirectory: cleanBuildDirectory,
-			Mode:                mode,
-			Pack:                pack,
-			LDFlags:             ldflags,
-			Compiler:            compilerCommand,
-			KeepAssets:          keepAssets,
-			Verbosity:           verbosity,
-			Compress:            compress,
-			UserTags:            userTags,
+			Logger:     logger,
+			OutputType: outputType,
+			Mode:       mode,
+			Pack:       pack,
+			Platform:   platform,
+			LDFlags:    ldflags,
+			Compiler:   compilerCommand,
 		}
 
-		// Calculate platform and arch
-		platformSplit := strings.Split(platform, "/")
-		buildOptions.Platform = platformSplit[0]
-		buildOptions.Arch = runtime.GOARCH
-		if len(platformSplit) == 2 {
-			buildOptions.Arch = platformSplit[1]
-		}
-
-		// Start a new tabwriter
-		w := new(tabwriter.Writer)
-		w.Init(os.Stdout, 8, 8, 0, '\t', 0)
-
-		buildModeText := "debug"
-		if production {
-			buildModeText = "production"
-		}
-
-		// Write out the system information
-		fmt.Fprintf(w, "\n")
-		fmt.Fprintf(w, "App Type: \t%s\n", buildOptions.OutputType)
-		fmt.Fprintf(w, "Platform: \t%s\n", buildOptions.Platform)
-		fmt.Fprintf(w, "Arch: \t%s\n", buildOptions.Arch)
-		fmt.Fprintf(w, "Compiler: \t%s\n", buildOptions.Compiler)
-		fmt.Fprintf(w, "Compress: \t%t\n", buildOptions.Compress)
-		fmt.Fprintf(w, "Build Mode: \t%s\n", buildModeText)
-		fmt.Fprintf(w, "Package: \t%t\n", buildOptions.Pack)
-		fmt.Fprintf(w, "Clean Build Dir: \t%t\n", buildOptions.CleanBuildDirectory)
-		fmt.Fprintf(w, "KeepAssets: \t%t\n", buildOptions.KeepAssets)
-		fmt.Fprintf(w, "LDFlags: \t\"%s\"\n", buildOptions.LDFlags)
-		fmt.Fprintf(w, "Tags: \t[%s]\n", strings.Join(buildOptions.UserTags, ","))
-		if len(buildOptions.OutputFile) > 0 {
-			fmt.Fprintf(w, "Output File: \t%s\n", buildOptions.OutputFile)
-		}
-		fmt.Fprintf(w, "\n")
-		w.Flush()
-
 		return doBuild(buildOptions)
 	})
 }
@@ -184,12 +107,11 @@ func doBuild(buildOptions *build.Options) error {
 	if err != nil {
 		return err
 	}
-
 	// Output stats
 	elapsed := time.Since(start)
-	buildOptions.Logger.Println("")
-	buildOptions.Logger.Println(fmt.Sprintf("Built '%s' in %s.", outputFilename, elapsed.Round(time.Millisecond).String()))
-	buildOptions.Logger.Println("")
+	buildOptions.Logger.Writeln("")
+	buildOptions.Logger.Writeln(fmt.Sprintf("Built '%s' in %s.", outputFilename, elapsed.Round(time.Millisecond).String()))
+	buildOptions.Logger.Writeln("")
 
 	return nil
 }

v2/cmd/wails/internal/commands/dev/dev.go

@@ -2,45 +2,35 @@ package dev
 
 import (
 	"fmt"
-	"io"
 	"os"
 	"os/signal"
-	"path/filepath"
 	"runtime"
 	"strings"
 	"syscall"
 	"time"
 
-	"github.com/wailsapp/wails/v2/internal/colour"
-
 	"github.com/fsnotify/fsnotify"
 	"github.com/leaanthony/clir"
+	"github.com/leaanthony/slicer"
 	"github.com/wailsapp/wails/v2/internal/fs"
+	"github.com/wailsapp/wails/v2/internal/logger"
 	"github.com/wailsapp/wails/v2/internal/process"
-	"github.com/wailsapp/wails/v2/pkg/clilogger"
 	"github.com/wailsapp/wails/v2/pkg/commands/build"
 )
 
-func LogGreen(message string, args ...interface{}) {
-	text := fmt.Sprintf(message, args...)
-	println(colour.Green(text))
-}
-
-func LogRed(message string, args ...interface{}) {
-	text := fmt.Sprintf(message, args...)
-	println(colour.Red(text))
-}
-
-func LogDarkYellow(message string, args ...interface{}) {
-	text := fmt.Sprintf(message, args...)
-	println(colour.DarkYellow(text))
-}
-
 // AddSubcommand adds the `dev` command for the Wails application
-func AddSubcommand(app *clir.Cli, w io.Writer) error {
+func AddSubcommand(app *clir.Cli) error {
 
 	command := app.NewSubCommand("dev", "Development mode")
 
+	outputType := "desktop"
+
+	validTargetTypes := slicer.String([]string{"desktop", "hybrid", "server"})
+
+	// Setup target type flag
+	description := "Type of application to develop. Valid types: " + validTargetTypes.Join(",")
+	command.StringFlag("t", description, &outputType)
+
 	// Passthrough ldflags
 	ldflags := ""
 	command.StringFlag("ldflags", "optional ldflags", &ldflags)
@@ -51,19 +41,18 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 	// extensions to trigger rebuilds
 	extensions := "go"
-	command.StringFlag("e", "Extensions to trigger rebuilds (comma separated) eg go,js,css,html", &extensions)
-
-	// extensions to trigger rebuilds
-	showWarnings := false
-	command.BoolFlag("w", "Show warnings", &showWarnings)
-
-	loglevel := ""
-	command.StringFlag("loglevel", "Loglevel to use - Trace, Debug, Info, Warning, Error", &loglevel)
+	command.StringFlag("m", "Extensions to trigger rebuilds (comma separated) eg go,js,css,html", &extensions)
 
 	command.Action(func() error {
 
+		// Validate inputs
+		if !validTargetTypes.Contains(outputType) {
+			return fmt.Errorf("output type '%s' is not valid", outputType)
+		}
+
 		// Create logger
-		logger := clilogger.New(w)
+		logger := logger.New()
+		logger.AddOutput(os.Stdout)
 		app.PrintBanner()
 
 		// TODO: Check you are in a project directory
@@ -75,6 +64,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		defer watcher.Close()
 
 		var debugBinaryProcess *process.Process = nil
+		var buildFrontend bool = true
 		var extensionsThatTriggerARebuild = strings.Split(extensions, ",")
 
 		// Setup signal handler
@@ -84,27 +74,19 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		debounceQuit := make(chan bool, 1)
 
 		// Do initial build
-		logger.Println("Building application for development...")
-		newProcess, err := restartApp(logger, "dev", ldflags, compilerCommand, debugBinaryProcess, loglevel)
-		if newProcess != nil {
-			debugBinaryProcess = newProcess
-		}
-		if err != nil {
-			return err
-		}
+		logger.Info("Building application for development...")
+		debugBinaryProcess = restartApp(logger, outputType, ldflags, compilerCommand, buildFrontend, debugBinaryProcess)
+
 		go debounce(100*time.Millisecond, watcher.Events, debounceQuit, func(event fsnotify.Event) {
-			// logger.Println("event: %+v", event)
+			// logger.Info("event: %+v", event)
 
 			// Check for new directories
 			if event.Op&fsnotify.Create == fsnotify.Create {
 				// If this is a folder, add it to our watch list
 				if fs.DirExists(event.Name) {
 					if !strings.Contains(event.Name, "node_modules") {
-						err := watcher.Add(event.Name)
-						if err != nil {
-							logger.Fatal("%s", err.Error())
-						}
-						LogGreen("[New Directory] Watching new directory: %s", event.Name)
+						watcher.Add(event.Name)
+						logger.Info("Watching directory: %s", event.Name)
 					}
 				}
 				return
@@ -113,33 +95,38 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 			// Check for file writes
 			if event.Op&fsnotify.Write == fsnotify.Write {
 
+				// logger.Info("modified file: %s", event.Name)
 				var rebuild bool = false
 
 				// Iterate all file patterns
 				for _, pattern := range extensionsThatTriggerARebuild {
-					if strings.HasSuffix(event.Name, pattern) {
-						rebuild = true
+					rebuild = strings.HasSuffix(event.Name, pattern)
+					if err != nil {
+						logger.Fatal(err.Error())
+					}
+					if rebuild {
+						// Only build frontend when the file isn't a Go file
+						buildFrontend = !strings.HasSuffix(event.Name, "go")
 						break
 					}
 				}
 
 				if !rebuild {
-					if showWarnings {
-						LogDarkYellow("[File change] %s did not match extension list (%s)", event.Name, extensions)
-					}
+					logger.Info("Filename change: %s did not match extension list %s", event.Name, extensions)
 					return
 				}
 
-				LogGreen("[Attempting rebuild] %s updated", event.Name)
+				if buildFrontend {
+					logger.Info("Full rebuild triggered: %s updated", event.Name)
+				} else {
+					logger.Info("Partial build triggered: %s updated", event.Name)
+				}
 
 				// Do a rebuild
 
 				// Try and build the app
-				newBinaryProcess, err := restartApp(logger, "dev", ldflags, compilerCommand, debugBinaryProcess, loglevel)
-				if err != nil {
-					fmt.Printf("Error during build: %s", err.Error())
-					return
-				}
+				newBinaryProcess := restartApp(logger, outputType, ldflags, compilerCommand, buildFrontend, debugBinaryProcess)
+
 				// If we have a new process, save it
 				if newBinaryProcess != nil {
 					debugBinaryProcess = newBinaryProcess
@@ -149,28 +136,23 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		})
 
 		// Get project dir
-		projectDir, err := os.Getwd()
+		dir, err := os.Getwd()
 		if err != nil {
 			return err
 		}
 
 		// Get all subdirectories
-		dirs, err := fs.GetSubdirectories(projectDir)
+		dirs, err := fs.GetSubdirectories(dir)
 		if err != nil {
 			return err
 		}
 
-		LogGreen("Watching (sub)/directory: %s", projectDir)
-
 		// Setup a watcher for non-node_modules directories
 		dirs.Each(func(dir string) {
 			if strings.Contains(dir, "node_modules") {
 				return
 			}
-			// Ignore build directory
-			if strings.HasPrefix(dir, filepath.Join(projectDir, "build")) {
-				return
-			}
+			logger.Info("Watching directory: %s", dir)
 			err = watcher.Add(dir)
 			if err != nil {
 				logger.Fatal(err.Error())
@@ -182,7 +164,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		for quit == false {
 			select {
 			case <-quitChannel:
-				LogGreen("\nCaught quit")
+				println()
 				// Notify debouncer to quit
 				debounceQuit <- true
 				quit = true
@@ -191,13 +173,10 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 		// Kill the current program if running
 		if debugBinaryProcess != nil {
-			err := debugBinaryProcess.Kill()
-			if err != nil {
-				return err
-			}
+			debugBinaryProcess.Kill()
 		}
 
-		LogGreen("Development mode exited")
+		logger.Info("Development mode exited")
 
 		return nil
 	})
@@ -224,15 +203,15 @@ exit:
 	}
 }
 
-func restartApp(logger *clilogger.CLILogger, outputType string, ldflags string, compilerCommand string, debugBinaryProcess *process.Process, loglevel string) (*process.Process, error) {
+func restartApp(logger *logger.Logger, outputType string, ldflags string, compilerCommand string, buildFrontend bool, debugBinaryProcess *process.Process) *process.Process {
 
-	appBinary, err := buildApp(logger, outputType, ldflags, compilerCommand)
+	appBinary, err := buildApp(logger, outputType, ldflags, compilerCommand, buildFrontend)
 	println()
 	if err != nil {
-		LogRed("Build error - continuing to run current version")
-		LogDarkYellow(err.Error())
-		return nil, nil
+		logger.Error("Build Failed: %s", err.Error())
+		return nil
 	}
+	logger.Info("Build new binary: %s", appBinary)
 
 	// Kill existing binary if need be
 	if debugBinaryProcess != nil {
@@ -248,24 +227,21 @@ func restartApp(logger *clilogger.CLILogger, outputType string, ldflags string,
 	// TODO: Generate `backend.js`
 
 	// Start up new binary
-	newProcess := process.NewProcess(logger, appBinary, "-loglevel", loglevel)
+	newProcess := process.NewProcess(logger, appBinary)
 	err = newProcess.Start()
 	if err != nil {
 		// Remove binary
-		deleteError := fs.DeleteFile(appBinary)
-		if deleteError != nil {
-			logger.Fatal("Unable to delete app binary: " + appBinary)
-		}
+		fs.DeleteFile(appBinary)
 		logger.Fatal("Unable to start application: %s", err.Error())
 	}
 
-	return newProcess, nil
+	return newProcess
 }
 
-func buildApp(logger *clilogger.CLILogger, outputType string, ldflags string, compilerCommand string) (string, error) {
+func buildApp(logger *logger.Logger, outputType string, ldflags string, compilerCommand string, buildFrontend bool) (string, error) {
 
 	// Create random output file
-	outputFile := fmt.Sprintf("dev-%d", time.Now().Unix())
+	outputFile := fmt.Sprintf("debug-%d", time.Now().Unix())
 
 	// Create BuildOptions
 	buildOptions := &build.Options{
@@ -277,7 +253,7 @@ func buildApp(logger *clilogger.CLILogger, outputType string, ldflags string, co
 		LDFlags:        ldflags,
 		Compiler:       compilerCommand,
 		OutputFile:     outputFile,
-		IgnoreFrontend: true,
+		IgnoreFrontend: !buildFrontend,
 	}
 
 	return build.Build(buildOptions)

v2/cmd/wails/internal/commands/doctor/doctor.go

@@ -2,37 +2,37 @@ package doctor
 
 import (
 	"fmt"
-	"io"
-	"log"
 	"os"
 	"runtime"
 	"strings"
 	"text/tabwriter"
 
 	"github.com/leaanthony/clir"
+	"github.com/wailsapp/wails/v2/internal/logger"
 	"github.com/wailsapp/wails/v2/internal/system"
 	"github.com/wailsapp/wails/v2/internal/system/packagemanager"
-	"github.com/wailsapp/wails/v2/pkg/clilogger"
 )
 
 // AddSubcommand adds the `doctor` command for the Wails application
-func AddSubcommand(app *clir.Cli, w io.Writer) error {
+func AddSubcommand(app *clir.Cli) error {
 
 	command := app.NewSubCommand("doctor", "Diagnose your environment")
 
 	command.Action(func() error {
 
-		logger := clilogger.New(w)
+		// Create logger
+		logger := logger.New()
+		logger.AddOutput(os.Stdout)
 
 		app.PrintBanner()
-		logger.Print("Scanning system - please wait...")
+		print("Scanning system - please wait...")
 
 		// Get system info
 		info, err := system.GetInfo()
 		if err != nil {
 			return err
 		}
-		logger.Println("Done.")
+		println("Done.")
 
 		// Start a new tabwriter
 		w := new(tabwriter.Writer)
@@ -48,7 +48,9 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 		// Exit early if PM not found
 		if info.PM == nil {
+			fmt.Fprintf(w, "\n%s\t%s", "Package Manager:", "Not Found")
 			w.Flush()
+			println()
 			return nil
 		}
 		fmt.Fprintf(w, "%s\t%s\n", "Package Manager: ", info.PM.Name())
@@ -110,22 +112,22 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		fmt.Fprintf(w, "\n")
 		fmt.Fprintf(w, "* - Optional Dependency\n")
 		w.Flush()
-		logger.Println("")
-		logger.Println("Diagnosis")
-		logger.Println("---------\n")
+		println()
+		println("Diagnosis")
+		println("---------\n")
 
 		// Generate an appropriate diagnosis
 
 		if len(dependenciesMissing) == 0 && dependenciesAvailableRequired == 0 {
-			logger.Println("Your system is ready for Wails development!")
+			println("Your system is ready for Wails development!")
 		}
 
 		if dependenciesAvailableRequired != 0 {
-			log.Println("Install required packages using: " + info.Dependencies.InstallAllRequiredCommand())
+			println("Install required packages using: " + info.Dependencies.InstallAllRequiredCommand())
 		}
 
 		if dependenciesAvailableOptional != 0 {
-			log.Println("Install optional packages using: " + info.Dependencies.InstallAllOptionalCommand())
+			println("Install optional packages using: " + info.Dependencies.InstallAllOptionalCommand())
 		}
 
 		if len(externalPackages) > 0 {
@@ -133,18 +135,18 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 				if p.Optional {
 					print("[Optional] ")
 				}
-				log.Println("Install " + p.Name + ": " + p.InstallCommand)
+				println("Install " + p.Name + ": " + p.InstallCommand)
 			}
 		}
 
 		if len(dependenciesMissing) != 0 {
 			// TODO: Check if apps are available locally and if so, adjust the diagnosis
-			log.Println("Fatal:")
-			log.Println("Required dependencies missing: " + strings.Join(dependenciesMissing, " "))
-			log.Println("Please read this article on how to resolve this: https://wails.app/guides/resolving-missing-packages")
+			println("Fatal:")
+			println("Required dependencies missing: " + strings.Join(dependenciesMissing, " "))
+			println("Please read this article on how to resolve this: https://wails.app/guides/resolving-missing-packages")
 		}
 
-		log.Println("")
+		println()
 		return nil
 	})
 

v2/cmd/wails/internal/commands/generate/generate.go

@@ -9,7 +9,7 @@ import (
 	"github.com/wailsapp/wails/v2/pkg/parser"
 )
 
-// AddSubcommand adds the `generate` command for the Wails application
+// AddSubcommand adds the `dev` command for the Wails application
 func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 	command := app.NewSubCommand("generate", "Code Generation Tools")
@@ -19,7 +19,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 	// Quiet Init
 	quiet := false
-	backendAPI.BoolFlag("q", "Suppress output to console", &quiet)
+	backendAPI.BoolFlag("q", "Supress output to console", &quiet)
 
 	backendAPI.Action(func() error {
 
@@ -85,4 +85,7 @@ func logPackage(pkg *parser.Package, logger *clilogger.CLILogger) {
 		}
 	}
 	logger.Println("")
+
+	// logger.Println("  Original Go Package Path:", pkg.Gopackage.PkgPath)
+	// logger.Println("  Original Go Package Path:", pkg.Gopackage.PkgPath)
 }

v2/cmd/wails/internal/commands/initialise/initialise.go

@@ -2,20 +2,17 @@ package initialise
 
 import (
 	"fmt"
-	"io"
+	"os"
 	"strings"
 	"time"
 
-	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/initialise/templates"
-
 	"github.com/leaanthony/clir"
-	"github.com/pkg/errors"
-	"github.com/wailsapp/wails/v2/pkg/clilogger"
-	"github.com/wailsapp/wails/v2/pkg/git"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/templates"
 )
 
 // AddSubcommand adds the `init` command for the Wails application
-func AddSubcommand(app *clir.Cli, w io.Writer) error {
+func AddSubcommand(app *clir.Cli) error {
 
 	// Load the template shortnames
 	validShortNames, err := templates.TemplateShortNames()
@@ -35,24 +32,13 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 	command.StringFlag("n", "Name of project", &projectName)
 
 	// Setup project directory
-	projectDirectory := ""
+	projectDirectory := "."
 	command.StringFlag("d", "Project directory", &projectDirectory)
 
 	// Quiet Init
 	quiet := false
 	command.BoolFlag("q", "Supress output to console", &quiet)
 
-	initGit := false
-	gitInstalled := git.IsInstalled()
-	if gitInstalled {
-		// Git Init
-		command.BoolFlag("g", "Initialise git repository", &initGit)
-	}
-
-	// VSCode project files
-	vscode := false
-	command.BoolFlag("vscode", "Generate VSCode project files", &vscode)
-
 	// List templates
 	list := false
 	command.BoolFlag("l", "List templates", &list)
@@ -60,29 +46,32 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 	command.Action(func() error {
 
 		// Create logger
-		logger := clilogger.New(w)
-		logger.Mute(quiet)
+		logger := logger.New()
+
+		if !quiet {
+			logger.AddOutput(os.Stdout)
+		}
 
 		// Are we listing templates?
 		if list {
 			app.PrintBanner()
 			err := templates.OutputList(logger)
-			logger.Println("")
+			logger.Writeln("")
 			return err
 		}
 
 		// Validate output type
 		if !validShortNames.Contains(templateName) {
-			logger.Print(fmt.Sprintf("[ERROR] Template '%s' is not valid", templateName))
-			logger.Println("")
+			logger.Write(fmt.Sprintf("ERROR: Template '%s' is not valid", templateName))
+			logger.Writeln("")
 			command.PrintHelp()
 			return nil
 		}
 
 		// Validate name
 		if len(projectName) == 0 {
-			logger.Println("ERROR: Project name required")
-			logger.Println("")
+			logger.Writeln("ERROR: Project name required")
+			logger.Writeln("")
 			command.PrintHelp()
 			return nil
 		}
@@ -92,23 +81,15 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		}
 
 		task := fmt.Sprintf("Initialising Project %s", strings.Title(projectName))
-		logger.Println(task)
-		logger.Println(strings.Repeat("-", len(task)))
+		logger.Writeln(task)
+		logger.Writeln(strings.Repeat("-", len(task)))
 
 		// Create Template Options
 		options := &templates.Options{
-			ProjectName:    projectName,
-			TargetDir:      projectDirectory,
-			TemplateName:   templateName,
-			Logger:         logger,
-			GenerateVSCode: vscode,
-			InitGit:        initGit,
-		}
-
-		// Try to discover author details from git config
-		err := findAuthorDetails(options)
-		if err != nil {
-			return err
+			ProjectName:  projectName,
+			TargetDir:    projectDirectory,
+			TemplateName: templateName,
+			Logger:       logger,
 		}
 
 		return initProject(options)
@@ -129,55 +110,11 @@ func initProject(options *templates.Options) error {
 		return err
 	}
 
-	if options.InitGit {
-		err = initGit(options)
-		if err != nil {
-			return err
-		}
-	}
-
 	// Output stats
 	elapsed := time.Since(start)
-	options.Logger.Println("")
-	options.Logger.Println("Project Name:      " + options.ProjectName)
-	options.Logger.Println("Project Directory: " + options.TargetDir)
-	options.Logger.Println("Project Template:  " + options.TemplateName)
-	if options.GenerateVSCode {
-		options.Logger.Println("VSCode config files generated.")
-	}
-	if options.InitGit {
-		options.Logger.Println("Git repository initialised.")
-	}
-	options.Logger.Println("")
-	options.Logger.Println(fmt.Sprintf("Initialised project '%s' in %s.", options.ProjectName, elapsed.Round(time.Millisecond).String()))
-	options.Logger.Println("")
-
-	return nil
-}
-
-func initGit(options *templates.Options) error {
-	err := git.InitRepo(options.TargetDir)
-	if err != nil {
-		return errors.Wrap(err, "Unable to initialise git repository:")
-	}
-
-	return nil
-}
-
-func findAuthorDetails(options *templates.Options) error {
-	if git.IsInstalled() {
-		name, err := git.Name()
-		if err != nil {
-			return err
-		}
-		options.AuthorName = strings.TrimSpace(name)
-
-		email, err := git.Email()
-		if err != nil {
-			return err
-		}
-		options.AuthorEmail = strings.TrimSpace(email)
-	}
+	options.Logger.Writeln("")
+	options.Logger.Writeln(fmt.Sprintf("Initialised project '%s' in %s.", options.ProjectName, elapsed.Round(time.Millisecond).String()))
+	options.Logger.Writeln("")
 
 	return nil
 }

v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/main.tmpl.go

@@ -1,39 +0,0 @@
-package main
-
-import (
-	"log"
-
-	"github.com/wailsapp/wails/v2"
-	"github.com/wailsapp/wails/v2/pkg/logger"
-	"github.com/wailsapp/wails/v2/pkg/menu"
-	"github.com/wailsapp/wails/v2/pkg/options"
-	"github.com/wailsapp/wails/v2/pkg/options/mac"
-)
-
-func main() {
-
-	// Create application with options
-	app := NewBasic()
-
-	err := wails.Run(&options.App{
-		Title:         "{{.ProjectName}}",
-		Width:         800,
-		Height:        600,
-		DisableResize: true,
-		Mac: &mac.Options{
-			WebviewIsTransparent:          true,
-			WindowBackgroundIsTranslucent: true,
-			TitleBar:                      mac.TitleBarHiddenInset(),
-			Menu:                          menu.DefaultMacMenu(),
-		},
-		LogLevel: logger.DEBUG,
-		Startup:  app.startup,
-		Shutdown: app.shutdown,
-		Bind: []interface{}{
-			app,
-		},
-	})
-	if err != nil {
-		log.Fatal(err)
-	}
-}

v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/wails.tmpl.json

@@ -1,9 +0,0 @@
-{
-    "name": "{{.ProjectName}}",
-    "outputfilename": "{{.BinaryName}}",
-    "html": "frontend/src/index.html",
-    "author": {
-        "name": "{{.AuthorName}}",
-        "email": "{{.AuthorEmail}}"
-    }
-}

v2/cmd/wails/internal/commands/initialise/templates/templates_test.go

@@ -1,46 +0,0 @@
-package templates
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/matryer/is"
-)
-
-func TestList(t *testing.T) {
-
-	is2 := is.New(t)
-	templates, err := List()
-	is2.NoErr(err)
-
-	println("Found these templates:")
-	for _, template := range templates {
-		fmt.Printf("%+v\n", template)
-	}
-}
-
-func TestShortname(t *testing.T) {
-
-	is2 := is.New(t)
-
-	template, err := getTemplateByShortname("vanilla")
-	is2.NoErr(err)
-
-	println("Found this template:")
-	fmt.Printf("%+v\n", template)
-}
-
-func TestInstall(t *testing.T) {
-
-	is2 := is.New(t)
-
-	options := &Options{
-		ProjectName:  "test",
-		TemplateName: "vanilla",
-		AuthorName:   "Lea Anthony",
-		AuthorEmail:  "lea.anthony@gmail.com",
-	}
-
-	err := Install(options)
-	is2.NoErr(err)
-}

v2/cmd/wails/main.go

@@ -1,19 +1,11 @@
 package main
 
 import (
-	"fmt"
 	"os"
 
-	"github.com/wailsapp/wails/v2/internal/colour"
-
-	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/update"
-
 	"github.com/leaanthony/clir"
 	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/build"
-	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/debug"
-	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/dev"
 	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/doctor"
-	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/generate"
 	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/initialise"
 )
 
@@ -22,44 +14,19 @@ func fatal(message string) {
 	os.Exit(1)
 }
 
-func banner(_ *clir.Cli) string {
-	return fmt.Sprintf("%s %s", colour.Yellow("Wails CLI"), colour.DarkRed(version))
-}
-
 func main() {
 
 	var err error
+	version := "v2.0.0-alpha"
 
-	app := clir.NewCli("Wails", "Go/HTML Appkit", version)
+	app := clir.NewCli("Wails", "Go/HTML Application Framework", version)
 
-	app.SetBannerFunction(banner)
-
-	build.AddBuildSubcommand(app, os.Stdout)
-	err = initialise.AddSubcommand(app, os.Stdout)
+	build.AddBuildSubcommand(app)
+	err = initialise.AddSubcommand(app)
 	if err != nil {
 		fatal(err.Error())
 	}
-
-	err = debug.AddSubcommand(app, os.Stdout)
-	if err != nil {
-		fatal(err.Error())
-	}
-	err = doctor.AddSubcommand(app, os.Stdout)
-	if err != nil {
-		fatal(err.Error())
-	}
-
-	err = dev.AddSubcommand(app, os.Stdout)
-	if err != nil {
-		fatal(err.Error())
-	}
-
-	err = generate.AddSubcommand(app, os.Stdout)
-	if err != nil {
-		fatal(err.Error())
-	}
-
-	err = update.AddSubcommand(app, os.Stdout, version)
+	err = doctor.AddSubcommand(app)
 	if err != nil {
 		fatal(err.Error())
 	}
@@ -67,6 +34,5 @@ func main() {
 	err = app.Run()
 	if err != nil {
 		println("\n\nERROR: " + err.Error())
-		os.Exit(1)
 	}
 }

v2/cmd/wails/version.go

@@ -1,3 +1,3 @@
 package main
 
-var version = "v2.0.0-alpha.65"
+var version = "v2.0.0-alpha.54"

v2/go.mod

@@ -1,30 +1,14 @@
 module github.com/wailsapp/wails/v2
 
-go 1.16
+go 1.13
 
 require (
-	github.com/Masterminds/semver v1.5.0
-	github.com/fatih/structtag v1.2.0
-	github.com/fsnotify/fsnotify v1.4.9
-	github.com/gorilla/websocket v1.4.1
-	github.com/imdario/mergo v0.3.11
-	github.com/jackmordaunt/icns v1.0.0
-	github.com/leaanthony/clir v1.0.4
-	github.com/leaanthony/debme v1.1.2
-	github.com/leaanthony/go-ansi-parser v1.0.1
-	github.com/leaanthony/gosod v1.0.1
-	github.com/leaanthony/slicer v1.5.0
-	github.com/matryer/is v1.4.0
-	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
+	github.com/leaanthony/clir v1.0.2
+	github.com/leaanthony/gosod v0.0.3
+	github.com/leaanthony/slicer v1.4.1
+	github.com/matryer/is v1.3.0
 	github.com/olekukonko/tablewriter v0.0.4
-	github.com/pkg/errors v0.9.1
-	github.com/tdewolff/minify v2.3.6+incompatible
-	github.com/tdewolff/parse v2.3.4+incompatible // indirect
-	github.com/tdewolff/test v1.0.6 // indirect
-	github.com/wzshiming/ctc v1.2.3
 	github.com/xyproto/xpm v1.2.1
-	golang.org/x/net v0.0.0-20200822124328-c89045814202
-	golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c
-	golang.org/x/tools v0.0.0-20200902012652-d1954cc86c82
-	nhooyr.io/websocket v1.8.6
+	golang.org/x/net v0.0.0-20200301022130-244492dfa37a
+	nhooyr.io/websocket v1.7.4
 )

v2/go.sum

@@ -1,129 +1,57 @@
-github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
-github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 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/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
-github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
-github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
-github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
-github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
-github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
 github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
-github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-github.com/jackmordaunt/icns v1.0.0 h1:RYSxplerf/l/DUd09AHtITwckkv/mqjVv4DjYdPmAMQ=
-github.com/jackmordaunt/icns v1.0.0/go.mod h1:7TTQVEuGzVVfOPPlLNHJIkzA6CoV7aH1Dv9dW351oOo=
-github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/klauspost/compress v1.10.3 h1:OP96hzwJVBIHYU52pVTI6CczrxPvrGfgqF9N5eTO0Q8=
-github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-github.com/leaanthony/clir v1.0.4 h1:Dov2y9zWJmZr7CjaCe86lKa4b5CSxskGAt2yBkoDyiU=
-github.com/leaanthony/clir v1.0.4/go.mod h1:k/RBkdkFl18xkkACMCLt09bhiZnrGORoxmomeMvDpE0=
-github.com/leaanthony/debme v1.1.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA=
-github.com/leaanthony/debme v1.1.2 h1:dGeQuj0+xPIlDQzGIjmAU52+yRg85u5pWaaqrdLBjD0=
-github.com/leaanthony/debme v1.1.2/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA=
-github.com/leaanthony/go-ansi-parser v1.0.1 h1:97v6c5kYppVsbScf4r/VZdXyQ21KQIfeQOk2DgKxGG4=
-github.com/leaanthony/go-ansi-parser v1.0.1/go.mod h1:7arTzgVI47srICYhvgUV4CGd063sGEeoSlych5yeSPM=
-github.com/leaanthony/gosod v1.0.1 h1:F+4c3DmEBfigi7oAswCV2RpQ+k4DcNbhuCZUGdBHacQ=
-github.com/leaanthony/gosod v1.0.1/go.mod h1:W8RyeSFBXu7RpIxPGEJfW4moSyGGEjlJMLV25wEbAdU=
-github.com/leaanthony/slicer v1.5.0 h1:aHYTN8xbCCLxJmkNKiLB6tgcMARl4eWmH9/F+S/0HtY=
-github.com/leaanthony/slicer v1.5.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
-github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
-github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
-github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
-github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/leaanthony/clir v1.0.2 h1:Ham9Ep7NH95il0x/ci5s2ExJa/K4B2dE8L2uaSj2cxo=
+github.com/leaanthony/clir v1.0.2/go.mod h1:k/RBkdkFl18xkkACMCLt09bhiZnrGORoxmomeMvDpE0=
+github.com/leaanthony/gosod v0.0.3 h1:VlPilye0zoH4I0WihShyoiTHyiAN1v6dcBW4mMvGJao=
+github.com/leaanthony/gosod v0.0.3/go.mod h1:nGMCb1PJfXwBDbOAike78jEYlpqge+xUKFf0iBKjKxU=
+github.com/leaanthony/slicer v1.4.1 h1:X/SmRIDhkUAolP79mSTO0jTcVX1k504PJBqvV6TwP0w=
+github.com/leaanthony/slicer v1.4.1/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
+github.com/matryer/is v1.3.0 h1:9qiso3jaJrOe6qBRJRBt2Ldht05qDiFP9le0JOIhRSI=
+github.com/matryer/is v1.3.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
 github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
-github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8=
 github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/tdewolff/minify v2.3.6+incompatible h1:2hw5/9ZvxhWLvBUnHE06gElGYz+Jv9R4Eys0XUzItYo=
-github.com/tdewolff/minify v2.3.6+incompatible/go.mod h1:9Ov578KJUmAWpS6NeZwRZyT56Uf6o3Mcz9CEsg8USYs=
-github.com/tdewolff/parse v2.3.4+incompatible h1:x05/cnGwIMf4ceLuDMBOdQ1qGniMoxpP46ghf0Qzh38=
-github.com/tdewolff/parse v2.3.4+incompatible/go.mod h1:8oBwCsVmUkgHO8M5iCzSIDtpzXOT0WXX9cWhz+bIzJQ=
-github.com/tdewolff/test v1.0.6 h1:76mzYJQ83Op284kMT+63iCNCI7NEERsIN8dLM+RiKr4=
-github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
-github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
-github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
-github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/wzshiming/ctc v1.2.3 h1:q+hW3IQNsjIlOFBTGZZZeIXTElFM4grF4spW/errh/c=
-github.com/wzshiming/ctc v1.2.3/go.mod h1:2tVAtIY7SUyraSk0JxvwmONNPFL4ARavPuEsg5+KA28=
-github.com/wzshiming/winseq v0.0.0-20200112104235-db357dc107ae h1:tpXvBXC3hpQBDCc9OojJZCQMVRAbT3TTdUMP8WguXkY=
-github.com/wzshiming/winseq v0.0.0-20200112104235-db357dc107ae/go.mod h1:VTAq37rkGeV+WOybvZwjXiJOicICdpLCN8ifpISjK20=
 github.com/xyproto/xpm v1.2.1 h1:trdvGjjWBsOOKzBBUPT6JvaIQM3acJEEYfbxN7M96wg=
 github.com/xyproto/xpm v1.2.1/go.mod h1:cMnesLsD0PBXLgjDfTDEaKr8XyTFsnP1QycSqRw7BiY=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
+go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
+go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-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/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c h1:UIcGWL6/wpCfyGuJnRFJRurA+yj8RrW7Q6x2YMCXt6c=
-golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/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-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200902012652-d1954cc86c82 h1:shxDsb9Dz27xzk3A0DxP0JuJnZMpKrdg8+E14eiUAX4=
-golang.org/x/tools v0.0.0-20200902012652-d1954cc86c82/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
-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=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 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/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k=
-nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
+nhooyr.io/websocket v1.7.4 h1:w/LGB2sZT0RV8lZYR7nfyaYz4PUbYZ5oF7NBon2M0NY=
+nhooyr.io/websocket v1.7.4/go.mod h1:PxYxCwFdFYQ0yRvtQz3s/dC+VEm7CSuC/4b9t8MQQxw=

v2/init.go

@@ -1,7 +0,0 @@
-// +build !windows
-
-package wails
-
-func Init() error {
-	return nil
-}

v2/init_windows.go

@@ -1,14 +0,0 @@
-package wails
-
-import (
-	"fmt"
-	"syscall"
-)
-
-func Init() error {
-	status, r, err := syscall.NewLazyDLL("user32.dll").NewProc("SetProcessDPIAware").Call()
-	if status == 0 {
-		return fmt.Errorf("exit status %d: %v %v", status, r, err)
-	}
-	return nil
-}

v2/internal/app/default.go

@@ -1,4 +1,4 @@
-// +build !desktop,!hybrid,!server,!dev
+// +build !desktop,!hybrid,!server
 
 package app
 
@@ -10,9 +10,7 @@ package app
 import (
 	"os"
 
-	"github.com/wailsapp/wails/v2/internal/logger"
-
-	"github.com/wailsapp/wails/v2/pkg/options"
+	"github.com/wailsapp/wails/v2/internal/features"
 )
 
 // App defines a Wails application structure
@@ -22,15 +20,12 @@ type App struct {
 	Height    int
 	Resizable bool
 
-	// Indicates if the app is running in debug mode
-	debug bool
-
-	logger *logger.Logger
+	Features *features.Features
 }
 
 // CreateApp returns a null application
-func CreateApp(_ *options.App) (*App, error) {
-	return &App{}, nil
+func CreateApp(options *Options) *App {
+	return &App{}
 }
 
 // Run the application
@@ -39,3 +34,8 @@ func (a *App) Run() error {
 	os.Exit(1)
 	return nil
 }
+
+// Bind the dummy interface
+func (a *App) Bind(dummy interface{}) error {
+	return nil
+}

v2/internal/app/desktop.go

@@ -3,152 +3,117 @@
 package app
 
 import (
-	"context"
-	"sync"
+	"os"
 
 	"github.com/wailsapp/wails/v2/internal/binding"
+	"github.com/wailsapp/wails/v2/internal/features"
 	"github.com/wailsapp/wails/v2/internal/ffenestri"
 	"github.com/wailsapp/wails/v2/internal/logger"
-	"github.com/wailsapp/wails/v2/internal/menumanager"
 	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
-	"github.com/wailsapp/wails/v2/internal/runtime"
 	"github.com/wailsapp/wails/v2/internal/servicebus"
 	"github.com/wailsapp/wails/v2/internal/signal"
 	"github.com/wailsapp/wails/v2/internal/subsystem"
-	"github.com/wailsapp/wails/v2/pkg/options"
 )
 
 // App defines a Wails application structure
 type App struct {
-	appType string
-
 	window     *ffenestri.Application
 	servicebus *servicebus.ServiceBus
 	logger     *logger.Logger
 	signal     *signal.Manager
-	options    *options.App
 
 	// Subsystems
-	log     *subsystem.Log
-	runtime *subsystem.Runtime
-	event   *subsystem.Event
-	//binding    *subsystem.Binding
+	log        *subsystem.Log
+	runtime    *subsystem.Runtime
+	event      *subsystem.Event
+	binding    *subsystem.Binding
 	call       *subsystem.Call
-	menu       *subsystem.Menu
-	url        *subsystem.URL
 	dispatcher *messagedispatcher.Dispatcher
 
-	menuManager *menumanager.Manager
-
-	// Indicates if the app is in debug mode
-	debug bool
-
 	// This is our binding DB
 	bindings *binding.Bindings
 
-	// Application Stores
-	loglevelStore  *runtime.Store
-	appconfigStore *runtime.Store
-
-	// Startup/Shutdown
-	startupCallback  func(*runtime.Runtime)
-	shutdownCallback func()
+	// Feature flags
+	Features *features.Features
 }
 
 // Create App
-func CreateApp(appoptions *options.App) (*App, error) {
+func CreateApp(options *Options) *App {
 
 	// Merge default options
-	options.MergeDefaults(appoptions)
+	options.mergeDefaults()
 
 	// Set up logger
-	myLogger := logger.New(appoptions.Logger)
-	myLogger.SetLogLevel(appoptions.LogLevel)
+	myLogger := logger.New(os.Stdout)
+	myLogger.SetLogLevel(logger.TRACE)
 
-	// Create the menu manager
-	menuManager := menumanager.NewManager()
+	window := ffenestri.NewApplicationWithConfig(&ffenestri.Config{
+		Title:     options.Title,
+		Width:     options.Width,
+		Height:    options.Height,
+		MinWidth:  options.MinWidth,
+		MinHeight: options.MinHeight,
+		MaxWidth:  options.MaxWidth,
+		MaxHeight: options.MaxHeight,
+		Frameless: options.Frameless,
 
-	// Process the application menu
-	menuManager.SetApplicationMenu(options.GetApplicationMenu(appoptions))
+		// This should be controlled by the compile time flags...
+		DevTools: true,
 
-	// Process context menus
-	contextMenus := options.GetContextMenus(appoptions)
-	for _, contextMenu := range contextMenus {
-		menuManager.AddContextMenu(contextMenu)
-	}
-
-	// Process tray menus
-	trayMenus := options.GetTrayMenus(appoptions)
-	for _, trayMenu := range trayMenus {
-		menuManager.AddTrayMenu(trayMenu)
-	}
-
-	window := ffenestri.NewApplicationWithConfig(appoptions, myLogger, menuManager)
-
-	// Create binding exemptions - Ugly hack. There must be a better way
-	bindingExemptions := []interface{}{appoptions.Startup, appoptions.Shutdown}
+		Resizable:  !options.DisableResize,
+		Fullscreen: options.Fullscreen,
+	}, myLogger)
 
 	result := &App{
-		appType:          "desktop",
-		window:           window,
-		servicebus:       servicebus.New(myLogger),
-		logger:           myLogger,
-		bindings:         binding.NewBindings(myLogger, appoptions.Bind, bindingExemptions),
-		menuManager:      menuManager,
-		startupCallback:  appoptions.Startup,
-		shutdownCallback: appoptions.Shutdown,
+		window:     window,
+		servicebus: servicebus.New(myLogger),
+		logger:     myLogger,
+		bindings:   binding.NewBindings(myLogger),
+		Features:   features.New(),
 	}
 
-	result.options = appoptions
-
-	// Initialise the app
-	err := result.Init()
-
-	return result, err
+	return result
 
 }
 
 // Run the application
 func (a *App) Run() error {
 
-	var err error
-
-	// Setup a context
-	var subsystemWaitGroup sync.WaitGroup
-	parentContext := context.WithValue(context.Background(), "waitgroup", &subsystemWaitGroup)
-	ctx, cancel := context.WithCancel(parentContext)
+	// Setup signal handler
+	signal, err := signal.NewManager(a.servicebus, a.logger)
+	if err != nil {
+		return err
+	}
+	a.signal = signal
+	a.signal.Start()
 
 	// Start the service bus
 	a.servicebus.Debug()
-	err = a.servicebus.Start()
-	if err != nil {
-		return err
-	}
+	a.servicebus.Start()
 
-	runtimesubsystem, err := subsystem.NewRuntime(ctx, a.servicebus, a.logger, a.startupCallback)
-	if err != nil {
-		return err
-	}
-	a.runtime = runtimesubsystem
-	err = a.runtime.Start()
+	// Start the runtime
+	runtime, err := subsystem.NewRuntime(a.servicebus, a.logger)
 	if err != nil {
 		return err
 	}
+	a.runtime = runtime
+	a.runtime.Start()
 
-	// Application Stores
-	a.loglevelStore = a.runtime.GoRuntime().Store.New("wails:loglevel", a.options.LogLevel)
-	a.appconfigStore = a.runtime.GoRuntime().Store.New("wails:appconfig", a.options)
+	// Start the binding subsystem
+	binding, err := subsystem.NewBinding(a.servicebus, a.logger, a.bindings, a.runtime.GoRuntime())
+	if err != nil {
+		return err
+	}
+	a.binding = binding
+	a.binding.Start()
 
 	// Start the logging subsystem
-	log, err := subsystem.NewLog(a.servicebus, a.logger, a.loglevelStore)
+	log, err := subsystem.NewLog(a.servicebus, a.logger)
 	if err != nil {
 		return err
 	}
 	a.log = log
-	err = a.log.Start()
-	if err != nil {
-		return err
-	}
+	a.log.Start()
 
 	// create the dispatcher
 	dispatcher, err := messagedispatcher.New(a.servicebus, a.logger)
@@ -156,56 +121,23 @@ func (a *App) Run() error {
 		return err
 	}
 	a.dispatcher = dispatcher
-	err = dispatcher.Start()
-	if err != nil {
-		return err
-	}
-
-	if a.options.Mac.URLHandlers != nil {
-		// Start the url handler subsystem
-		url, err := subsystem.NewURL(a.servicebus, a.logger, a.options.Mac.URLHandlers)
-		if err != nil {
-			return err
-		}
-		a.url = url
-		err = a.url.Start()
-		if err != nil {
-			return err
-		}
-	}
+	dispatcher.Start()
 
 	// Start the eventing subsystem
-	eventsubsystem, err := subsystem.NewEvent(ctx, a.servicebus, a.logger)
-	if err != nil {
-		return err
-	}
-	a.event = eventsubsystem
-	err = a.event.Start()
-	if err != nil {
-		return err
-	}
-
-	// Start the menu subsystem
-	menusubsystem, err := subsystem.NewMenu(ctx, a.servicebus, a.logger, a.menuManager)
-	if err != nil {
-		return err
-	}
-	a.menu = menusubsystem
-	err = a.menu.Start()
+	event, err := subsystem.NewEvent(a.servicebus, a.logger)
 	if err != nil {
 		return err
 	}
+	a.event = event
+	a.event.Start()
 
 	// Start the call subsystem
-	callSubsystem, err := subsystem.NewCall(ctx, a.servicebus, a.logger, a.bindings.DB(), a.runtime.GoRuntime())
-	if err != nil {
-		return err
-	}
-	a.call = callSubsystem
-	err = a.call.Start()
+	call, err := subsystem.NewCall(a.servicebus, a.logger, a.bindings.DB())
 	if err != nil {
 		return err
 	}
+	a.call = call
+	a.call.Start()
 
 	// Dump bindings as a debug
 	bindingDump, err := a.bindings.ToJSON()
@@ -213,42 +145,20 @@ func (a *App) Run() error {
 		return err
 	}
 
-	// Setup signal handler
-	signalsubsystem, err := signal.NewManager(ctx, cancel, a.servicebus, a.logger)
-	if err != nil {
-		return err
-	}
-	a.signal = signalsubsystem
-	a.signal.Start()
-
-	err = a.window.Run(dispatcher, bindingDump, a.debug)
+	result := a.window.Run(dispatcher, bindingDump, a.Features)
 	a.logger.Trace("Ffenestri.Run() exited")
-	if err != nil {
-		return err
-	}
+	a.servicebus.Stop()
 
-	// Close down all the subsystems
-	a.logger.Trace("Cancelling subsystems")
-	cancel()
-	subsystemWaitGroup.Wait()
-
-	a.logger.Trace("Cancelling dispatcher")
-	dispatcher.Close()
-
-	// Close log
-	a.logger.Trace("Stopping log")
-	log.Close()
-
-	a.logger.Trace("Stopping Service bus")
-	err = a.servicebus.Stop()
-	if err != nil {
-		return err
-	}
-
-	// Shutdown callback
-	if a.shutdownCallback != nil {
-		a.shutdownCallback()
-	}
-
-	return nil
+	return result
+}
+
+// Bind a struct to the application by passing in
+// a pointer to it
+func (a *App) Bind(structPtr interface{}) {
+
+	// Add the struct to the bindings
+	err := a.bindings.Add(structPtr)
+	if err != nil {
+		a.logger.Fatal("Error during binding: " + err.Error())
+	}
 }

v2/internal/app/hybrid.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/leaanthony/clir"
 	"github.com/wailsapp/wails/v2/internal/binding"
+	"github.com/wailsapp/wails/v2/internal/features"
 	"github.com/wailsapp/wails/v2/internal/ffenestri"
 	"github.com/wailsapp/wails/v2/internal/logger"
 	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
@@ -42,7 +43,8 @@ type App struct {
 	dispatcher *messagedispatcher.Dispatcher
 	servicebus *servicebus.ServiceBus
 
-	debug bool
+	// Feature flags
+	Features *features.Features
 }
 
 // Create App
@@ -56,15 +58,17 @@ func CreateApp(options *Options) *App {
 	myLogger.SetLogLevel(logger.INFO)
 
 	window := ffenestri.NewApplicationWithConfig(&ffenestri.Config{
-		Title:       options.Title,
-		Width:       options.Width,
-		Height:      options.Height,
-		MinWidth:    options.MinWidth,
-		MinHeight:   options.MinHeight,
-		MaxWidth:    options.MaxWidth,
-		MaxHeight:   options.MaxHeight,
-		StartHidden: options.StartHidden,
-		DevTools:    options.DevTools,
+		Title:     options.Title,
+		Width:     options.Width,
+		Height:    options.Height,
+		MinWidth:  options.MinWidth,
+		MinHeight: options.MinHeight,
+		MaxWidth:  options.MaxWidth,
+		MaxHeight: options.MaxHeight,
+		Frameless: options.Frameless,
+
+		// This should be controlled by the compile time flags...
+		DevTools: true,
 
 		Resizable:  !options.DisableResize,
 		Fullscreen: options.Fullscreen,
@@ -75,12 +79,9 @@ func CreateApp(options *Options) *App {
 		webserver:  webserver.NewWebServer(myLogger),
 		servicebus: servicebus.New(myLogger),
 		logger:     myLogger,
-		bindings:   binding.NewBindings(myLogger, options.Bind),
+		bindings:   binding.NewBindings(myLogger),
 	}
 
-	// Initialise the app
-	app.Init()
-
 	return app
 }
 
@@ -184,7 +185,7 @@ func (a *App) Run() error {
 			}
 		}()
 
-		result := a.window.Run(dispatcher, bindingDump)
+		result := a.window.Run(dispatcher, bindingDump, a.Features)
 		a.servicebus.Stop()
 
 		return result
@@ -192,3 +193,14 @@ func (a *App) Run() error {
 
 	return cli.Run()
 }
+
+// Bind a struct to the application by passing in
+// a pointer to it
+func (a *App) Bind(structPtr interface{}) {
+
+	// Add the struct to the bindings
+	err := a.bindings.Add(structPtr)
+	if err != nil {
+		a.logger.Fatal("Error during binding: " + err.Error())
+	}
+}

v2/internal/app/options.go

@@ -0,0 +1,34 @@
+package app
+
+// Options for creating the App
+type Options struct {
+	Title         string
+	Width         int
+	Height        int
+	DisableResize bool
+	Fullscreen    bool
+	Frameless     bool
+	MinWidth      int
+	MinHeight     int
+	MaxWidth      int
+	MaxHeight     int
+}
+
+// mergeDefaults will set the minimum default values for an application
+func (o *Options) mergeDefaults() {
+
+	// Create a default title
+	if len(o.Title) == 0 {
+		o.Title = "My Wails App"
+	}
+
+	// Default width
+	if o.Width == 0 {
+		o.Width = 1024
+	}
+
+	// Default height
+	if o.Height == 0 {
+		o.Height = 768
+	}
+}

v2/internal/app/server.go

@@ -6,13 +6,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/wailsapp/wails/v2/pkg/options"
-
 	"github.com/leaanthony/clir"
 	"github.com/wailsapp/wails/v2/internal/binding"
 	"github.com/wailsapp/wails/v2/internal/logger"
 	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
-	"github.com/wailsapp/wails/v2/internal/runtime"
 	"github.com/wailsapp/wails/v2/internal/servicebus"
 	"github.com/wailsapp/wails/v2/internal/subsystem"
 	"github.com/wailsapp/wails/v2/internal/webserver"
@@ -20,57 +17,36 @@ import (
 
 // App defines a Wails application structure
 type App struct {
-	appType string
-
 	binding *subsystem.Binding
 	call    *subsystem.Call
 	event   *subsystem.Event
 	log     *subsystem.Log
 	runtime *subsystem.Runtime
 
-	options *options.App
-
 	bindings   *binding.Bindings
 	logger     *logger.Logger
 	dispatcher *messagedispatcher.Dispatcher
 	servicebus *servicebus.ServiceBus
 	webserver  *webserver.WebServer
-
-	debug bool
-
-	// Application Stores
-	loglevelStore  *runtime.Store
-	appconfigStore *runtime.Store
-
-	// Startup/Shutdown
-	startupCallback  func(*runtime.Runtime)
-	shutdownCallback func()
 }
 
 // Create App
-func CreateApp(appoptions *options.App) (*App, error) {
+func CreateApp(options *Options) *App {
+	options.mergeDefaults()
+	// We ignore the inputs (for now)
 
-	// Merge default options
-	options.MergeDefaults(appoptions)
-
-	// Set up logger
-	myLogger := logger.New(appoptions.Logger)
-	myLogger.SetLogLevel(appoptions.LogLevel)
+	// TODO: Allow logger output override on CLI
+	myLogger := logger.New(os.Stdout)
+	myLogger.SetLogLevel(logger.TRACE)
 
 	result := &App{
-		appType:          "server",
-		bindings:         binding.NewBindings(myLogger, options.Bind),
-		logger:           myLogger,
-		servicebus:       servicebus.New(myLogger),
-		webserver:        webserver.NewWebServer(myLogger),
-		startupCallback:  appoptions.Startup,
-		shutdownCallback: appoptions.Shutdown,
+		bindings:   binding.NewBindings(myLogger),
+		logger:     myLogger,
+		servicebus: servicebus.New(myLogger),
+		webserver:  webserver.NewWebServer(myLogger),
 	}
 
-	// Initialise app
-	result.Init()
-
-	return result, nil
+	return result
 }
 
 // Run the application
@@ -107,21 +83,8 @@ func (a *App) Run() error {
 		if debugMode {
 			a.servicebus.Debug()
 		}
-
-		// Start the runtime
-		runtime, err := subsystem.NewRuntime(a.servicebus, a.logger, a.startupCallback, a.shutdownCallback)
-		if err != nil {
-			return err
-		}
-		a.runtime = runtime
-		a.runtime.Start()
-
-		// Application Stores
-		a.loglevelStore = a.runtime.GoRuntime().Store.New("wails:loglevel", a.options.LogLevel)
-		a.appconfigStore = a.runtime.GoRuntime().Store.New("wails:appconfig", a.options)
-
 		a.servicebus.Start()
-		log, err := subsystem.NewLog(a.servicebus, a.logger, a.loglevelStore)
+		log, err := subsystem.NewLog(a.servicebus, a.logger)
 		if err != nil {
 			return err
 		}
@@ -134,6 +97,14 @@ func (a *App) Run() error {
 		a.dispatcher = dispatcher
 		a.dispatcher.Start()
 
+		// Start the runtime
+		runtime, err := subsystem.NewRuntime(a.servicebus, a.logger)
+		if err != nil {
+			return err
+		}
+		a.runtime = runtime
+		a.runtime.Start()
+
 		// Start the binding subsystem
 		binding, err := subsystem.NewBinding(a.servicebus, a.logger, a.bindings, runtime.GoRuntime())
 		if err != nil {
@@ -151,7 +122,7 @@ func (a *App) Run() error {
 		a.event.Start()
 
 		// Start the call subsystem
-		call, err := subsystem.NewCall(a.servicebus, a.logger, a.bindings.DB(), a.runtime.GoRuntime())
+		call, err := subsystem.NewCall(a.servicebus, a.logger, a.bindings.DB())
 		if err != nil {
 			return err
 		}
@@ -171,3 +142,14 @@ func (a *App) Run() error {
 
 	return cli.Run()
 }
+
+// Bind a struct to the application by passing in
+// a pointer to it
+func (a *App) Bind(structPtr interface{}) {
+
+	// Add the struct to the bindings
+	err := a.bindings.Add(structPtr)
+	if err != nil {
+		a.logger.Fatal("Error during binding: " + err.Error())
+	}
+}

v2/internal/binding/binding.go

@@ -2,55 +2,30 @@ package binding
 
 import (
 	"fmt"
-	"reflect"
-	"runtime"
 	"strings"
 
-	"github.com/leaanthony/slicer"
-
 	"github.com/wailsapp/wails/v2/internal/logger"
 )
 
 type Bindings struct {
-	db         *DB
-	logger     logger.CustomLogger
-	exemptions slicer.StringSlicer
+	db     *DB
+	logger logger.CustomLogger
 }
 
 // NewBindings returns a new Bindings object
-func NewBindings(logger *logger.Logger, structPointersToBind []interface{}, exemptions []interface{}) *Bindings {
-	result := &Bindings{
+func NewBindings(logger *logger.Logger) *Bindings {
+	return &Bindings{
 		db:     newDB(),
 		logger: logger.CustomLogger("Bindings"),
 	}
-
-	for _, exemption := range exemptions {
-		if exemptions == nil {
-			continue
-		}
-		name := runtime.FuncForPC(reflect.ValueOf(exemption).Pointer()).Name()
-		// Yuk yuk yuk! Is there a better way?
-		name = strings.TrimSuffix(name, "-fm")
-		result.exemptions.Add(name)
-	}
-
-	// Add the structs to bind
-	for _, ptr := range structPointersToBind {
-		err := result.Add(ptr)
-		if err != nil {
-			logger.Fatal("Error during binding: " + err.Error())
-		}
-	}
-
-	return result
 }
 
 // Add the given struct methods to the Bindings
 func (b *Bindings) Add(structPtr interface{}) error {
 
-	methods, err := b.getMethods(structPtr)
+	methods, err := getMethods(structPtr)
 	if err != nil {
-		return fmt.Errorf("cannot bind value to app: %s", err.Error())
+		return fmt.Errorf("unable to Add() - %s", err.Error())
 	}
 
 	for _, method := range methods {
@@ -59,8 +34,29 @@ func (b *Bindings) Add(structPtr interface{}) error {
 		structName := splitName[1]
 		methodName := splitName[2]
 
+		// Is this WailsInit?
+		if method.IsWailsInit() {
+			err := b.db.AddWailsInit(method)
+			if err != nil {
+				return err
+			}
+			b.logger.Trace("Registered WailsInit method: %s", method.Name)
+			continue
+		}
+
+		// Is this WailsShutdown?
+		if method.IsWailsShutdown() {
+			err := b.db.AddWailsShutdown(method)
+			if err != nil {
+				return err
+			}
+			b.logger.Trace("Registered WailsShutdown method: %s", method.Name)
+			continue
+		}
+
 		// Add it as a regular method
 		b.db.AddMethod(packageName, structName, methodName, method)
+
 	}
 	return nil
 }

v2/internal/binding/boundMethod.go

@@ -1,9 +1,9 @@
 package binding
 
 import (
-	"encoding/json"
 	"fmt"
 	"reflect"
+	"strings"
 )
 
 // BoundMethod defines all the data related to a Go method that is
@@ -16,6 +16,58 @@ type BoundMethod struct {
 	Method   reflect.Value `json:"-"`
 }
 
+// IsWailsInit returns true if the method name is "WailsInit"
+func (b *BoundMethod) IsWailsInit() bool {
+	return strings.HasSuffix(b.Name, "WailsInit")
+}
+
+// IsWailsShutdown returns true if the method name is "WailsShutdown"
+func (b *BoundMethod) IsWailsShutdown() bool {
+	return strings.HasSuffix(b.Name, "WailsShutdown")
+}
+
+// VerifyWailsInit checks if the WailsInit signature is correct
+func (b *BoundMethod) VerifyWailsInit() error {
+	// Must only have 1 input
+	if b.InputCount() != 1 {
+		return fmt.Errorf("invalid method signature for %s: expected `WailsInit(*wails.Runtime) error`", b.Name)
+	}
+
+	// Check input type
+	if !b.Inputs[0].IsType("*goruntime.Runtime") {
+		return fmt.Errorf("invalid method signature for %s: expected `WailsInit(*wails.Runtime) error`", b.Name)
+	}
+
+	// Must only have 1 output
+	if b.OutputCount() != 1 {
+		return fmt.Errorf("invalid method signature for %s: expected `WailsInit(*wails.Runtime) error`", b.Name)
+	}
+
+	// Check output type
+	if !b.Outputs[0].IsError() {
+		return fmt.Errorf("invalid method signature for %s: expected `WailsInit(*wails.Runtime) error`", b.Name)
+	}
+
+	// Input must be of type Runtime
+	return nil
+}
+
+// VerifyWailsShutdown checks if the WailsShutdown signature is correct
+func (b *BoundMethod) VerifyWailsShutdown() error {
+	// Must have no inputs
+	if b.InputCount() != 0 {
+		return fmt.Errorf("invalid method signature for WailsShutdown: expected `WailsShutdown()`")
+	}
+
+	// Must have no outputs
+	if b.OutputCount() != 0 {
+		return fmt.Errorf("invalid method signature for WailsShutdown: expected `WailsShutdown()`")
+	}
+
+	// Input must be of type Runtime
+	return nil
+}
+
 // InputCount returns the number of inputs this bound method has
 func (b *BoundMethod) InputCount() int {
 	return len(b.Inputs)
@@ -26,29 +78,6 @@ func (b *BoundMethod) OutputCount() int {
 	return len(b.Outputs)
 }
 
-// ParseArgs method converts the input json into the types expected by the method
-func (b *BoundMethod) ParseArgs(args []json.RawMessage) ([]interface{}, error) {
-
-	result := make([]interface{}, b.InputCount())
-	if len(args) != b.InputCount() {
-		return nil, fmt.Errorf("received %d arguments to method '%s', expected %d", len(args), b.Name, b.InputCount())
-	}
-	for index, arg := range args {
-		typ := b.Inputs[index].reflectType
-		inputValue := reflect.New(typ).Interface()
-		err := json.Unmarshal(arg, inputValue)
-		if err != nil {
-			return nil, err
-		}
-		if inputValue == nil {
-			result[index] = reflect.Zero(typ).Interface()
-		} else {
-			result[index] = reflect.ValueOf(inputValue).Elem().Interface()
-		}
-	}
-	return result, nil
-}
-
 // Call will attempt to call this bound method with the given args
 func (b *BoundMethod) Call(args []interface{}) (interface{}, error) {
 	// Check inputs
@@ -65,8 +94,17 @@ func (b *BoundMethod) Call(args []interface{}) (interface{}, error) {
 
 	// Iterate over given arguments
 	for index, arg := range args {
+
+		// Attempt to convert the argument to the type expected by the method
+		value, err := convertArgToValue(arg, b.Inputs[index])
+
+		// If it fails, return a suitable error
+		if err != nil {
+			return nil, fmt.Errorf("%s (parameter %d): %s", b.Name, index+1, err.Error())
+		}
+
 		// Save the converted argument
-		callArgs[index] = reflect.ValueOf(arg)
+		callArgs[index] = value
 	}
 
 	// Do the call

v2/internal/binding/db.go

@@ -15,6 +15,10 @@ type DB struct {
 	// It used for performance gains at runtime
 	methodMap map[string]*BoundMethod
 
+	// These are slices of methods registered using WailsInit and WailsShutdown
+	wailsInitMethods     []*BoundMethod
+	wailsShutdownMethods []*BoundMethod
+
 	// Lock to ensure sync access to the data
 	lock sync.RWMutex
 }
@@ -90,6 +94,38 @@ func (d *DB) AddMethod(packageName string, structName string, methodName string,
 
 }
 
+// AddWailsInit checks the given method is a WailsInit method and if it
+// is, adds it to the list of WailsInit methods
+func (d *DB) AddWailsInit(method *BoundMethod) error {
+	err := method.VerifyWailsInit()
+	if err != nil {
+		return err
+	}
+
+	// Lock the db whilst processing and unlock on return
+	d.lock.Lock()
+	defer d.lock.Unlock()
+
+	d.wailsInitMethods = append(d.wailsInitMethods, method)
+	return nil
+}
+
+// AddWailsShutdown checks the given method is a WailsInit method and if it
+// is, adds it to the list of WailsShutdown methods
+func (d *DB) AddWailsShutdown(method *BoundMethod) error {
+	err := method.VerifyWailsShutdown()
+	if err != nil {
+		return err
+	}
+
+	// Lock the db whilst processing and unlock on return
+	d.lock.Lock()
+	defer d.lock.Unlock()
+
+	d.wailsShutdownMethods = append(d.wailsShutdownMethods, method)
+	return nil
+}
+
 // ToJSON converts the method map to JSON
 func (d *DB) ToJSON() (string, error) {
 
@@ -102,3 +138,13 @@ func (d *DB) ToJSON() (string, error) {
 	// Return zero copy string as this string will be read only
 	return *(*string)(unsafe.Pointer(&bytes)), err
 }
+
+// WailsInitMethods returns the list of registered WailsInit methods
+func (d *DB) WailsInitMethods() []*BoundMethod {
+	return d.wailsInitMethods
+}
+
+// WailsShutdownMethods returns the list of registered WailsInit methods
+func (d *DB) WailsShutdownMethods() []*BoundMethod {
+	return d.wailsShutdownMethods
+}

v2/internal/binding/generate.go

@@ -14,6 +14,30 @@ import (
 	"github.com/leaanthony/slicer"
 )
 
+const _comment = `
+
+const backend = {
+        main: {
+            "xbarApp": {
+                "GetCategories": () => {
+                    window.backend.main.xbarApp.GetCategories.call(arguments);
+                },
+
+                /**
+                 * @param {string} arg1
+                 */
+                "InstallPlugin": (arg1) => {
+                    window.backend.main.xbarApp.InstallPlugin.call(arguments);
+                },
+                "GetPlugins": () => {
+                    window.backend.main.xbarApp.GetPlugins.call(arguments);
+                }
+            }
+        }
+}
+
+export default backend;`
+
 //go:embed assets/package.json
 var packageJSON []byte
 
@@ -76,8 +100,6 @@ const backend = {`)
 					}
 					returnType += ">"
 					returnTypeDetails = " - Go Type: " + methodDetails.Outputs[0].TypeName
-				} else {
-					returnType = "Promise<void>"
 				}
 				output.WriteString("       * @returns {" + returnType + "} " + returnTypeDetails + "\n")
 				output.WriteString("       */\n")
@@ -103,14 +125,13 @@ const backend = {`)
 export default backend;`)
 	output.WriteString("\n")
 
-	// TODO: Make this configurable in wails.json
 	dirname, err := fs.RelativeToCwd("frontend/src/backend")
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	if !fs.DirExists(dirname) {
-		err := fs.MkDirs(dirname)
+		err := fs.Mkdir(dirname)
 		if err != nil {
 			log.Fatal(err)
 		}
@@ -144,8 +165,6 @@ func goTypeToJSDocType(input string) string {
 		return "number"
 	case input == "bool":
 		return "boolean"
-	case input == "[]byte":
-		return "string"
 	case strings.HasPrefix(input, "[]"):
 		arrayType := goTypeToJSDocType(input[2:])
 		return "Array.<" + arrayType + ">"

v2/internal/binding/generate_test.go

@@ -1,87 +0,0 @@
-package binding
-
-import (
-	"testing"
-)
-
-func Test_goTypeToJSDocType(t *testing.T) {
-
-	tests := []struct {
-		name  string
-		input string
-		want  string
-	}{
-		{
-			name:  "string",
-			input: "string",
-			want:  "string",
-		},
-		{
-			name:  "error",
-			input: "error",
-			want:  "Error",
-		},
-		{
-			name:  "int",
-			input: "int",
-			want:  "number",
-		},
-		{
-			name:  "int32",
-			input: "int32",
-			want:  "number",
-		},
-		{
-			name:  "uint",
-			input: "uint",
-			want:  "number",
-		},
-		{
-			name:  "uint32",
-			input: "uint32",
-			want:  "number",
-		},
-		{
-			name:  "float32",
-			input: "float32",
-			want:  "number",
-		},
-		{
-			name:  "float64",
-			input: "float64",
-			want:  "number",
-		},
-		{
-			name:  "bool",
-			input: "bool",
-			want:  "boolean",
-		},
-		{
-			name:  "[]byte",
-			input: "[]byte",
-			want:  "string",
-		},
-		{
-			name:  "[]int",
-			input: "[]int",
-			want:  "Array.<number>",
-		},
-		{
-			name:  "[]bool",
-			input: "[]bool",
-			want:  "Array.<boolean>",
-		},
-		{
-			name:  "anything else",
-			input: "foo",
-			want:  "any",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := goTypeToJSDocType(tt.input); got != tt.want {
-				t.Errorf("goTypeToJSDocType() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}

v2/internal/binding/reflect.go

@@ -3,7 +3,6 @@ package binding
 import (
 	"fmt"
 	"reflect"
-	"runtime"
 )
 
 // isStructPtr returns true if the value given is a
@@ -13,35 +12,14 @@ func isStructPtr(value interface{}) bool {
 		reflect.ValueOf(value).Elem().Kind() == reflect.Struct
 }
 
-// isFunction returns true if the given value is a function
-func isFunction(value interface{}) bool {
-	return reflect.ValueOf(value).Kind() == reflect.Func
-}
-
-// isStructPtr returns true if the value given is a struct
-func isStruct(value interface{}) bool {
-	return reflect.ValueOf(value).Kind() == reflect.Struct
-}
-
-func (b *Bindings) getMethods(value interface{}) ([]*BoundMethod, error) {
+func getMethods(value interface{}) ([]*BoundMethod, error) {
 
 	// Create result placeholder
 	var result []*BoundMethod
 
 	// Check type
 	if !isStructPtr(value) {
-
-		if isStruct(value) {
-			name := reflect.ValueOf(value).Type().Name()
-			return nil, fmt.Errorf("%s is a struct, not a pointer to a struct", name)
-		}
-
-		if isFunction(value) {
-			name := runtime.FuncForPC(reflect.ValueOf(value).Pointer()).Name()
-			return nil, fmt.Errorf("%s is a function, not a pointer to a struct. Wails v2 has deprecated the binding of functions. Please wrap your functions up in a struct and bind a pointer to that struct.", name)
-		}
-
-		return nil, fmt.Errorf("not a pointer to a struct.")
+		return nil, fmt.Errorf("not a pointer to an interface")
 	}
 
 	// Process Struct
@@ -56,11 +34,6 @@ func (b *Bindings) getMethods(value interface{}) ([]*BoundMethod, error) {
 		fullMethodName := baseName + "." + methodName
 		method := structValue.MethodByName(methodName)
 
-		methodReflectName := runtime.FuncForPC(methodDef.Func.Pointer()).Name()
-		if b.exemptions.Contains(methodReflectName) {
-			continue
-		}
-
 		// Create new method
 		boundMethod := &BoundMethod{
 			Name:     fullMethodName,
@@ -83,8 +56,6 @@ func (b *Bindings) getMethods(value interface{}) ([]*BoundMethod, error) {
 		boundMethod.Inputs = inputs
 
 		// Iterate outputs
-		// TODO: Determine what to do about limiting return types
-		//       especially around errors.
 		outputParamCount := methodType.NumOut()
 		var outputs []*Parameter
 		for outputIndex := 0; outputIndex < outputParamCount; outputIndex++ {
@@ -100,3 +71,39 @@ func (b *Bindings) getMethods(value interface{}) ([]*BoundMethod, error) {
 	}
 	return result, nil
 }
+
+// convertArgToValue
+func convertArgToValue(input interface{}, target *Parameter) (result reflect.Value, err error) {
+
+	// Catch type conversion panics thrown by convert
+	defer func() {
+		if r := recover(); r != nil {
+			// Modify error
+			err = fmt.Errorf("%s", r.(string)[23:])
+		}
+	}()
+
+	// Do the conversion
+
+	// Handle nil values
+	if input == nil {
+		switch target.reflectType.Kind() {
+		case reflect.Chan,
+			reflect.Func,
+			reflect.Interface,
+			reflect.Map,
+			reflect.Ptr,
+			reflect.Slice:
+			result = reflect.ValueOf(input).Convert(target.reflectType)
+		default:
+			return reflect.Zero(target.reflectType), fmt.Errorf("Unable to use null value")
+		}
+	} else {
+		result = reflect.ValueOf(input).Convert(target.reflectType)
+	}
+
+	// We don't like doing this but it's the only way to
+	// handle recover() correctly
+	return
+
+}

v2/internal/bridge/client.go

@@ -26,8 +26,9 @@ func (b BridgeClient) Quit() {
 }
 
 func (b BridgeClient) NotifyEvent(message string) {
-	b.session.sendMessage("n" + message)
+	//b.session.sendMessage("n" + message)
 	b.session.log.Info("NotifyEvent: %s", message)
+	b.session.log.Info("NotifyEvent unsupported in Bridge mode")
 }
 
 func (b BridgeClient) CallResult(message string) {

v2/internal/features/features.go

@@ -0,0 +1,13 @@
+package features
+
+// Features holds generic and platform specific feature flags
+type Features struct {
+	Linux *Linux
+}
+
+// New creates a new Features object
+func New() *Features {
+	return &Features{
+		Linux: &Linux{},
+	}
+}

v2/internal/features/features_linux.go

@@ -0,0 +1,5 @@
+package features
+
+// Linux holds linux specific feature flags
+type Linux struct {
+}

v2/internal/ffenestri/LICENCES.md

@@ -1,11 +1,5 @@
 # 3rd Party Licenses
 
-## Webview
-Whilst not using the library directly, there is certainly some code that is inspired by or used from the webview library.
-
-Homepage: https://github.com/webview/webview
-License: https://github.com/webview/webview/blob/master/LICENSE
-
 ## vec
 Homepage: https://github.com/rxi/vec
 License: https://github.com/rxi/vec/blob/master/LICENSE

v2/internal/ffenestri/common.c

@@ -1,6 +1,3 @@
-// +build !windows
-
-
 //
 // Created by Lea Anthony on 6/1/21.
 //

v2/internal/ffenestri/common.h

@@ -5,6 +5,10 @@
 #ifndef COMMON_H
 #define COMMON_H
 
+#define OBJC_OLD_DISPATCH_PROTOTYPES 1
+#include <objc/objc-runtime.h>
+#include <CoreGraphics/CoreGraphics.h>
+
 #include <stdio.h>
 #include <stdarg.h>
 #include "string.h"

v2/internal/ffenestri/contextmenus_darwin.c

@@ -82,10 +82,10 @@ void ShowContextMenu(ContextMenuStore* store, id mainWindow, const char *context
     FREE_AND_SET(contextMenu->contextMenuData, contextMenuData);
 
 	// Grab the content view and show the menu
-	id contentView = msg_reg(mainWindow, s("contentView"));
+	id contentView = msg(mainWindow, s("contentView"));
 
 	// Get the triggering event
-	id menuEvent = msg_reg(mainWindow, s("currentEvent"));
+	id menuEvent = msg(mainWindow, s("currentEvent"));
 
 	if( contextMenu->nsmenu == NULL ) {
         // GetMenu creates the NSMenu
@@ -93,7 +93,7 @@ void ShowContextMenu(ContextMenuStore* store, id mainWindow, const char *context
 	}
 
 	// Show popup
-	((id(*)(id, SEL, id, id, id))objc_msgSend)(c("NSMenu"), s("popUpContextMenu:withEvent:forView:"), contextMenu->nsmenu, menuEvent, contentView);
+	msg(c("NSMenu"), s("popUpContextMenu:withEvent:forView:"), contextMenu->nsmenu, menuEvent, contentView);
 
 }
 

v2/internal/ffenestri/effectstructs_windows.h

@@ -1,64 +0,0 @@
-// Credit: https://gist.github.com/ysc3839/b08d2bff1c7dacde529bed1d37e85ccf
-#pragma once
-
-typedef enum _WINDOWCOMPOSITIONATTRIB
-{
-	WCA_UNDEFINED = 0,
-	WCA_NCRENDERING_ENABLED = 1,
-	WCA_NCRENDERING_POLICY = 2,
-	WCA_TRANSITIONS_FORCEDISABLED = 3,
-	WCA_ALLOW_NCPAINT = 4,
-	WCA_CAPTION_BUTTON_BOUNDS = 5,
-	WCA_NONCLIENT_RTL_LAYOUT = 6,
-	WCA_FORCE_ICONIC_REPRESENTATION = 7,
-	WCA_EXTENDED_FRAME_BOUNDS = 8,
-	WCA_HAS_ICONIC_BITMAP = 9,
-	WCA_THEME_ATTRIBUTES = 10,
-	WCA_NCRENDERING_EXILED = 11,
-	WCA_NCADORNMENTINFO = 12,
-	WCA_EXCLUDED_FROM_LIVEPREVIEW = 13,
-	WCA_VIDEO_OVERLAY_ACTIVE = 14,
-	WCA_FORCE_ACTIVEWINDOW_APPEARANCE = 15,
-	WCA_DISALLOW_PEEK = 16,
-	WCA_CLOAK = 17,
-	WCA_CLOAKED = 18,
-	WCA_ACCENT_POLICY = 19,
-	WCA_FREEZE_REPRESENTATION = 20,
-	WCA_EVER_UNCLOAKED = 21,
-	WCA_VISUAL_OWNER = 22,
-	WCA_HOLOGRAPHIC = 23,
-	WCA_EXCLUDED_FROM_DDA = 24,
-	WCA_PASSIVEUPDATEMODE = 25,
-	WCA_USEDARKMODECOLORS = 26,
-	WCA_LAST = 27
-} WINDOWCOMPOSITIONATTRIB;
-
-typedef struct _WINDOWCOMPOSITIONATTRIBDATA
-{
-	WINDOWCOMPOSITIONATTRIB Attrib;
-	PVOID pvData;
-	SIZE_T cbData;
-} WINDOWCOMPOSITIONATTRIBDATA;
-
-typedef enum _ACCENT_STATE
-{
-	ACCENT_DISABLED = 0,
-	ACCENT_ENABLE_GRADIENT = 1,
-	ACCENT_ENABLE_TRANSPARENTGRADIENT = 2,
-	ACCENT_ENABLE_BLURBEHIND = 3,
-	ACCENT_ENABLE_ACRYLICBLURBEHIND = 4, // RS4 1803
-	ACCENT_ENABLE_HOSTBACKDROP = 5, // RS5 1809
- 	ACCENT_INVALID_STATE = 6
-} ACCENT_STATE;
-
-typedef struct _ACCENT_POLICY
-{
-	ACCENT_STATE AccentState;
-	DWORD AccentFlags;
-	DWORD GradientColor;
-	DWORD AnimationId;
-} ACCENT_POLICY;
-
-typedef BOOL (WINAPI *pfnGetWindowCompositionAttribute)(HWND, WINDOWCOMPOSITIONATTRIBDATA*);
-
-typedef BOOL (WINAPI *pfnSetWindowCompositionAttribute)(HWND, WINDOWCOMPOSITIONATTRIBDATA*);

v2/internal/ffenestri/features_linux.go

@@ -0,0 +1,23 @@
+// +build linux
+
+package ffenestri
+
+/*
+
+#cgo linux CFLAGS: -DFFENESTRI_LINUX=1
+#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
+
+#include <stdlib.h>
+#include "ffenestri.h"
+
+
+*/
+import "C"
+import "github.com/wailsapp/wails/v2/internal/features"
+
+func (a *Application) processOSFeatureFlags(features *features.Features) {
+
+	// Process Linux features
+	// linux := features.Linux
+
+}

v2/internal/ffenestri/ffenestri.go

@@ -5,38 +5,59 @@ import (
 	"strings"
 	"unsafe"
 
-	"github.com/wailsapp/wails/v2/internal/menumanager"
-
+	"github.com/wailsapp/wails/v2/internal/features"
 	"github.com/wailsapp/wails/v2/internal/logger"
 	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
-	"github.com/wailsapp/wails/v2/pkg/options"
 )
 
 /*
+
 #cgo linux CFLAGS: -DFFENESTRI_LINUX=1
 #cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
 
-#cgo darwin CFLAGS: -DFFENESTRI_DARWIN=1
-#cgo darwin LDFLAGS: -framework WebKit -lobjc
-
-#cgo windows CXXFLAGS: -std=c++11
-#cgo windows,amd64 LDFLAGS: -L./windows/x64 -lwebview -lWebView2Loader -lgdi32 -lole32 -lShlwapi -luser32 -loleaut32
-
 #include <stdlib.h>
 #include "ffenestri.h"
+
+
 */
 import "C"
 
+// DEBUG is the global Ffenestri debug flag.
+// TODO: move to compile time.
+var DEBUG bool = true
+
+// Config defines how our application should be configured
+type Config struct {
+	Title      string
+	Width      int
+	Height     int
+	MinWidth   int
+	MinHeight  int
+	MaxWidth   int
+	MaxHeight  int
+	DevTools   bool
+	Resizable  bool
+	Fullscreen bool
+	Frameless  bool
+}
+
+var defaultConfig = &Config{
+	Title:      "My Wails App",
+	Width:      800,
+	Height:     600,
+	DevTools:   true,
+	Resizable:  true,
+	Fullscreen: false,
+	Frameless:  false,
+}
+
 // Application is our main application object
 type Application struct {
-	config *options.App
+	config *Config
 	memory []unsafe.Pointer
 
 	// This is the main app pointer
-	app *C.struct_Application
-
-	// Manages menus
-	menuManager *menumanager.Manager
+	app unsafe.Pointer
 
 	// Logger
 	logger logger.CustomLogger
@@ -57,11 +78,18 @@ func init() {
 }
 
 // NewApplicationWithConfig creates a new application based on the given config
-func NewApplicationWithConfig(config *options.App, logger *logger.Logger, menuManager *menumanager.Manager) *Application {
+func NewApplicationWithConfig(config *Config, logger *logger.Logger) *Application {
 	return &Application{
-		config:      config,
-		logger:      logger.CustomLogger("Ffenestri"),
-		menuManager: menuManager,
+		config: config,
+		logger: logger.CustomLogger("Ffenestri"),
+	}
+}
+
+// NewApplication creates a new Application with the default config
+func NewApplication(logger *logger.Logger) *Application {
+	return &Application{
+		config: defaultConfig,
+		logger: logger.CustomLogger("Ffenestri"),
 	}
 }
 
@@ -93,29 +121,18 @@ type DispatchClient interface {
 	SendMessage(string)
 }
 
-func intToColour(colour int) (C.int, C.int, C.int, C.int) {
-	var alpha = C.int(colour & 0xFF)
-	var blue = C.int((colour >> 8) & 0xFF)
-	var green = C.int((colour >> 16) & 0xFF)
-	var red = C.int((colour >> 24) & 0xFF)
-	return red, green, blue, alpha
-}
-
 // Run the application
-func (a *Application) Run(incomingDispatcher Dispatcher, bindings string, debug bool) error {
+func (a *Application) Run(incomingDispatcher Dispatcher, bindings string, features *features.Features) error {
 	title := a.string2CString(a.config.Title)
 	width := C.int(a.config.Width)
 	height := C.int(a.config.Height)
-	resizable := a.bool2Cint(!a.config.DisableResize)
+	resizable := a.bool2Cint(a.config.Resizable)
 	devtools := a.bool2Cint(a.config.DevTools)
 	fullscreen := a.bool2Cint(a.config.Fullscreen)
-	startHidden := a.bool2Cint(a.config.StartHidden)
-	logLevel := C.int(a.config.LogLevel)
-	hideWindowOnClose := a.bool2Cint(a.config.HideWindowOnClose)
-	app := C.NewApplication(title, width, height, resizable, devtools, fullscreen, startHidden, logLevel, hideWindowOnClose)
+	app := C.NewApplication(title, width, height, resizable, devtools, fullscreen)
 
 	// Save app reference
-	a.app = (*C.struct_Application)(app)
+	a.app = unsafe.Pointer(app)
 
 	// Set Min Window Size
 	minWidth := C.int(a.config.MinWidth)
@@ -128,34 +145,26 @@ func (a *Application) Run(incomingDispatcher Dispatcher, bindings string, debug
 	C.SetMaxWindowSize(a.app, maxWidth, maxHeight)
 
 	// Set debug if needed
-	C.SetDebug(app, a.bool2Cint(debug))
+	C.SetDebug(app, a.bool2Cint(DEBUG))
 
-	// TODO: Move frameless to Linux options
+	// Set Frameless
 	if a.config.Frameless {
 		C.DisableFrame(a.app)
 	}
 
-	if a.config.RGBA != 0 {
-		r, g, b, alpha := intToColour(a.config.RGBA)
-		C.SetColour(a.app, r, g, b, alpha)
-	}
-
 	// Escape bindings so C doesn't freak out
 	bindings = strings.ReplaceAll(bindings, `"`, `\"`)
 
 	// Set bindings
 	C.SetBindings(app, a.string2CString(bindings))
 
+	// Process feature flags
+	a.processFeatureFlags(features)
+
 	// save the dispatcher in a package variable so that the C callbacks
 	// can access it
 	dispatcher = incomingDispatcher.RegisterClient(newClient(a))
 
-	// Process platform settings
-	err := a.processPlatformSettings()
-	if err != nil {
-		return err
-	}
-
 	// Check we could initialise the application
 	if app != nil {
 		// Yes - Save memory reference and run app, cleaning up afterwards
@@ -165,7 +174,7 @@ func (a *Application) Run(incomingDispatcher Dispatcher, bindings string, debug
 		// Oh no! We couldn't initialise the application
 		a.logger.Fatal("Cannot initialise Application.")
 	}
-	//println("\n\n\n\n\n\nhererererer\n\n\n\n")
+
 	a.freeMemory()
 	return nil
 }
@@ -177,3 +186,11 @@ func (a *Application) Run(incomingDispatcher Dispatcher, bindings string, debug
 func messageFromWindowCallback(data *C.char) {
 	dispatcher.DispatchMessage(C.GoString(data))
 }
+
+func (a *Application) processFeatureFlags(features *features.Features) {
+
+	// Process generic features
+
+	// Process OS Specific flags
+	a.processOSFeatureFlags(features)
+}

v2/internal/ffenestri/ffenestri.h

@@ -1,55 +1,24 @@
 #ifndef __FFENESTRI_H__
 #define __FFENESTRI_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdio.h>
-struct Application;
 
-extern struct Application *NewApplication(const char *title, int width, int height, int resizable, int devtools, int fullscreen, int startHidden, int logLevel, int hideWindowOnClose);
-extern void SetMinWindowSize(struct Application*, int minWidth, int minHeight);
-extern void SetMaxWindowSize(struct Application*, int maxWidth, int maxHeight);
-extern void Run(struct Application*, int argc, char **argv);
-extern void DestroyApplication(struct Application*);
-extern void SetDebug(struct Application*, int flag);
-extern void SetBindings(struct Application*, const char *bindings);
-extern void ExecJS(struct Application*, const char *script);
-extern void Hide(struct Application*);
-extern void Show(struct Application*);
-extern void Center(struct Application*);
-extern void Maximise(struct Application*);
-extern void Unmaximise(struct Application*);
-extern void ToggleMaximise(struct Application*);
-extern void Minimise(struct Application*);
-extern void Unminimise(struct Application*);
-extern void ToggleMinimise(struct Application*);
-extern void SetColour(struct Application*, int red, int green, int blue, int alpha);
-extern void SetSize(struct Application*, int width, int height);
-extern void SetPosition(struct Application*, int x, int y);
-extern void Quit(struct Application*);
-extern void SetTitle(struct Application*, const char *title);
-extern void Fullscreen(struct Application*);
-extern void UnFullscreen(struct Application*);
-extern void ToggleFullscreen(struct Application*);
-extern void DisableFrame(struct Application*);
-extern void OpenDialog(struct Application*, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int allowFiles, int allowDirs, int allowMultiple, int showHiddenFiles, int canCreateDirectories, int resolvesAliases, int treatPackagesAsDirectories);
-extern void SaveDialog(struct Application*, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int showHiddenFiles, int canCreateDirectories, int treatPackagesAsDirectories);
-extern void MessageDialog(struct Application*, char *callbackID, char *type, char *title, char *message, char *icon, char *button1, char *button2, char *button3, char *button4, char *defaultButton, char *cancelButton);
-extern void DarkModeEnabled(struct Application*, char *callbackID);
-extern void SetApplicationMenu(struct Application*, const char *);
-extern void AddTrayMenu(struct Application*, const char *menuTrayJSON);
-extern void SetTrayMenu(struct Application*, const char *menuTrayJSON);
-extern void DeleteTrayMenuByID(struct Application*, const char *id);
-extern void UpdateTrayMenuLabel(struct Application*, const char* JSON);
-extern void AddContextMenu(struct Application*, char *contextMenuJSON);
-extern void UpdateContextMenu(struct Application*, char *contextMenuJSON);
-extern void WebviewIsTransparent(struct Application*);
-extern void WindowBackgroundIsTranslucent(struct Application*);
-
-#ifdef __cplusplus
-}
-#endif
+extern void *NewApplication(const char *title, int width, int height, int resizable, int devtools, int fullscreen);
+extern void SetMinWindowSize(void *app, int minWidth, int minHeight);
+extern void SetMaxWindowSize(void *app, int maxWidth, int maxHeight);
+extern void Run(void *app, int argc, char **argv);
+extern void DestroyApplication(void *app);
+extern void SetDebug(void *app, int flag);
+extern void SetBindings(void *app, const char *bindings);
+extern void ExecJS(void *app, const char *script);
+extern void Quit(void *app);
+extern void SetTitle(void *app, const char *title);
+extern void Fullscreen(void *app);
+extern void UnFullscreen(void *app);
+extern int SetColour(void *app, const char *colourString);
+extern void DisableFrame(void *app);
+extern char *SaveFileDialogOnMainThread(void *appPointer, char *title);
+extern char *OpenFileDialogOnMainThread(void *appPointer, char *title);
+extern char *OpenDirectoryDialogOnMainThread(void *appPointer, char *title);
 
 #endif

v2/internal/ffenestri/ffenestri_client.go

@@ -1,14 +1,19 @@
 package ffenestri
 
 /*
+
+#cgo linux CFLAGS: -DFFENESTRI_LINUX=1
+#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
+
+#include <stdlib.h>
 #include "ffenestri.h"
+
 */
 import "C"
 
 import (
 	"strconv"
-
-	"github.com/wailsapp/wails/v2/pkg/options/dialog"
+	"unsafe"
 
 	"github.com/wailsapp/wails/v2/internal/logger"
 )
@@ -61,148 +66,44 @@ func (c *Client) WindowUnFullscreen() {
 	C.UnFullscreen(c.app.app)
 }
 
-// WindowShow will show the window
-func (c *Client) WindowShow() {
-	C.Show(c.app.app)
-}
-
-// WindowHide will hide the window
-func (c *Client) WindowHide() {
-	C.Hide(c.app.app)
-}
-
-// WindowCenter will hide the window
-func (c *Client) WindowCenter() {
-	C.Center(c.app.app)
-}
-
-// WindowMaximise will maximise the window
-func (c *Client) WindowMaximise() {
-	C.Maximise(c.app.app)
-}
-
-// WindowMinimise will minimise the window
-func (c *Client) WindowMinimise() {
-	C.Minimise(c.app.app)
-}
-
-// WindowUnmaximise will unmaximise the window
-func (c *Client) WindowUnmaximise() {
-	C.Unmaximise(c.app.app)
-}
-
-// WindowUnminimise will unminimise the window
-func (c *Client) WindowUnminimise() {
-	C.Unminimise(c.app.app)
-}
-
-// WindowPosition will position the window to x,y on the
-// monitor that the window is mostly on
-func (c *Client) WindowPosition(x int, y int) {
-	C.SetPosition(c.app.app, C.int(x), C.int(y))
-}
-
-// WindowSize will resize the window to the given
-// width and height
-func (c *Client) WindowSize(width int, height int) {
-	C.SetSize(c.app.app, C.int(width), C.int(height))
-}
-
-func (c *Client) WindowSetMinSize(width int, height int) {
-	C.SetMinWindowSize(c.app.app, C.int(width), C.int(height))
-}
-
-func (c *Client) WindowSetMaxSize(width int, height int) {
-	C.SetMaxWindowSize(c.app.app, C.int(width), C.int(height))
-}
-
 // WindowSetColour sets the window colour
-func (c *Client) WindowSetColour(colour int) {
-	r, g, b, a := intToColour(colour)
-	C.SetColour(c.app.app, r, g, b, a)
+func (c *Client) WindowSetColour(colour string) bool {
+	result := C.SetColour(c.app.app, c.app.string2CString(colour))
+	return result == 1
 }
 
-// OpenDialog will open a dialog with the given title and filter
-func (c *Client) OpenDialog(dialogOptions *dialog.OpenDialog, callbackID string) {
-	C.OpenDialog(c.app.app,
-		c.app.string2CString(callbackID),
-		c.app.string2CString(dialogOptions.Title),
-		c.app.string2CString(dialogOptions.Filters),
-		c.app.string2CString(dialogOptions.DefaultFilename),
-		c.app.string2CString(dialogOptions.DefaultDirectory),
-		c.app.bool2Cint(dialogOptions.AllowFiles),
-		c.app.bool2Cint(dialogOptions.AllowDirectories),
-		c.app.bool2Cint(dialogOptions.AllowMultiple),
-		c.app.bool2Cint(dialogOptions.ShowHiddenFiles),
-		c.app.bool2Cint(dialogOptions.CanCreateDirectories),
-		c.app.bool2Cint(dialogOptions.ResolvesAliases),
-		c.app.bool2Cint(dialogOptions.TreatPackagesAsDirectories),
-	)
-}
-
-// SaveDialog will open a dialog with the given title and filter
-func (c *Client) SaveDialog(dialogOptions *dialog.SaveDialog, callbackID string) {
-	C.SaveDialog(c.app.app,
-		c.app.string2CString(callbackID),
-		c.app.string2CString(dialogOptions.Title),
-		c.app.string2CString(dialogOptions.Filters),
-		c.app.string2CString(dialogOptions.DefaultFilename),
-		c.app.string2CString(dialogOptions.DefaultDirectory),
-		c.app.bool2Cint(dialogOptions.ShowHiddenFiles),
-		c.app.bool2Cint(dialogOptions.CanCreateDirectories),
-		c.app.bool2Cint(dialogOptions.TreatPackagesAsDirectories),
-	)
-}
-
-// MessageDialog will open a message dialog with the given options
-func (c *Client) MessageDialog(dialogOptions *dialog.MessageDialog, callbackID string) {
-
-	// Sanity check button length
-	if len(dialogOptions.Buttons) > 4 {
-		c.app.logger.Error("Given %d message dialog buttons. Maximum is 4", len(dialogOptions.Buttons))
-		return
+// OpenFileDialog will open a file dialog with the given title
+func (c *Client) OpenFileDialog(title string) string {
+	cstring := C.OpenFileDialogOnMainThread(c.app.app, c.app.string2CString(title))
+	var result string
+	if cstring != nil {
+		result = C.GoString(cstring)
+		// Free the C string that was allocated by the dialog
+		C.free(unsafe.Pointer(cstring))
 	}
+	return result
+}
 
-	// Process buttons
-	buttons := []string{"", "", "", ""}
-	for i, button := range dialogOptions.Buttons {
-		buttons[i] = button
+// SaveFileDialog will open a save file dialog with the given title
+func (c *Client) SaveFileDialog(title string) string {
+	cstring := C.SaveFileDialogOnMainThread(c.app.app, c.app.string2CString(title))
+	var result string
+	if cstring != nil {
+		result = C.GoString(cstring)
+		// Free the C string that was allocated by the dialog
+		C.free(unsafe.Pointer(cstring))
 	}
-
-	C.MessageDialog(c.app.app,
-		c.app.string2CString(callbackID),
-		c.app.string2CString(string(dialogOptions.Type)),
-		c.app.string2CString(dialogOptions.Title),
-		c.app.string2CString(dialogOptions.Message),
-		c.app.string2CString(dialogOptions.Icon),
-		c.app.string2CString(buttons[0]),
-		c.app.string2CString(buttons[1]),
-		c.app.string2CString(buttons[2]),
-		c.app.string2CString(buttons[3]),
-		c.app.string2CString(dialogOptions.DefaultButton),
-		c.app.string2CString(dialogOptions.CancelButton))
+	return result
 }
 
-func (c *Client) DarkModeEnabled(callbackID string) {
-	C.DarkModeEnabled(c.app.app, c.app.string2CString(callbackID))
-}
-
-func (c *Client) SetApplicationMenu(applicationMenuJSON string) {
-	C.SetApplicationMenu(c.app.app, c.app.string2CString(applicationMenuJSON))
-}
-
-func (c *Client) SetTrayMenu(trayMenuJSON string) {
-	C.SetTrayMenu(c.app.app, c.app.string2CString(trayMenuJSON))
-}
-
-func (c *Client) UpdateTrayMenuLabel(JSON string) {
-	C.UpdateTrayMenuLabel(c.app.app, c.app.string2CString(JSON))
-}
-
-func (c *Client) UpdateContextMenu(contextMenuJSON string) {
-	C.UpdateContextMenu(c.app.app, c.app.string2CString(contextMenuJSON))
-}
-
-func (c *Client) DeleteTrayMenuByID(id string) {
-	C.DeleteTrayMenuByID(c.app.app, c.app.string2CString(id))
+// OpenDirectoryDialog will open a directory dialog with the given title
+func (c *Client) OpenDirectoryDialog(title string) string {
+	cstring := C.OpenDirectoryDialogOnMainThread(c.app.app, c.app.string2CString(title))
+	var result string
+	if cstring != nil {
+		result = C.GoString(cstring)
+		// Free the C string that was allocated by the dialog
+		C.free(unsafe.Pointer(cstring))
+	}
+	return result
 }

v2/internal/ffenestri/ffenestri_darwin.h

@@ -11,21 +11,9 @@
 #include "hashmap.h"
 #include "stdlib.h"
 
-typedef struct {
-    long maj;
-    long min;
-    long patch;
-} OSVersion;
-
 // Macros to make it slightly more sane
 #define msg objc_msgSend
-#define msg_reg ((id(*)(id, SEL))objc_msgSend)
-#define msg_id ((id(*)(id, SEL, id))objc_msgSend)
-#define msg_id_id ((id(*)(id, SEL, id, id))objc_msgSend)
-#define msg_bool ((id(*)(id, SEL, BOOL))objc_msgSend)
-#define msg_int ((id(*)(id, SEL, int))objc_msgSend)
-#define msg_uint ((id(*)(id, SEL, unsigned int))objc_msgSend)
-#define msg_float ((id(*)(id, SEL, float))objc_msgSend)
+
 #define kInternetEventClass 'GURL'
 #define kAEGetURL 'GURL'
 #define keyDirectObject '----'
@@ -33,29 +21,18 @@ typedef struct {
 #define c(str) (id)objc_getClass(str)
 #define s(str) sel_registerName(str)
 #define u(str) sel_getUid(str)
-#define str(input) ((id(*)(id, SEL, const char *))objc_msgSend)(c("NSString"), s("stringWithUTF8String:"), input)
-#define strunicode(input) ((id(*)(id, SEL, id, unsigned short))objc_msgSend)(c("NSString"), s("stringWithFormat:"), str("%C"), (unsigned short)input)
-#define cstr(input) (const char *)msg_reg(input, s("UTF8String"))
-#define url(input) msg_id(c("NSURL"), s("fileURLWithPath:"), str(input))
-#define ALLOC(classname) msg_reg(c(classname), s("alloc"))
-#define ALLOC_INIT(classname) msg_reg(msg_reg(c(classname), s("alloc")), s("init"))
-
-#if defined (__aarch64__)
-#define GET_FRAME(receiver) ((CGRect(*)(id, SEL))objc_msgSend)(receiver, s("frame"))
-#define GET_BOUNDS(receiver) ((CGRect(*)(id, SEL))objc_msgSend)(receiver, s("bounds"))
-#define GET_OSVERSION(receiver) ((OSVersion(*)(id, SEL))objc_msgSend)(processInfo, s("operatingSystemVersion"));
-#endif
-
-#if defined (__x86_64__)
+#define str(input) msg(c("NSString"), s("stringWithUTF8String:"), input)
+#define strunicode(input) msg(c("NSString"), s("stringWithFormat:"), str("%C"), (unsigned short)input)
+#define cstr(input) (const char *)msg(input, s("UTF8String"))
+#define url(input) msg(c("NSURL"), s("fileURLWithPath:"), str(input))
+#define ALLOC(classname) msg(c(classname), s("alloc"))
+#define ALLOC_INIT(classname) msg(msg(c(classname), s("alloc")), s("init"))
 #define GET_FRAME(receiver) ((CGRect(*)(id, SEL))objc_msgSend_stret)(receiver, s("frame"))
 #define GET_BOUNDS(receiver) ((CGRect(*)(id, SEL))objc_msgSend_stret)(receiver, s("bounds"))
-#define GET_OSVERSION(receiver) ((OSVersion(*)(id, SEL))objc_msgSend_stret)(processInfo, s("operatingSystemVersion"));
-#endif
-
-#define GET_BACKINGSCALEFACTOR(receiver) ((CGFloat(*)(id, SEL))objc_msgSend)(receiver, s("backingScaleFactor"))
+#define GET_BACKINGSCALEFACTOR(receiver) ((CGFloat(*)(id, SEL))msg)(receiver, s("backingScaleFactor"))
 
 #define ON_MAIN_THREAD(str) dispatch( ^{ str; } )
-#define MAIN_WINDOW_CALL(str) msg_reg(app->mainWindow, s((str)))
+#define MAIN_WINDOW_CALL(str) msg(app->mainWindow, s((str)))
 
 #define NSBackingStoreBuffered 2
 
@@ -125,8 +102,6 @@ typedef struct {
 #define NSAlertSecondButtonReturn  1001
 #define NSAlertThirdButtonReturn   1002
 
-#define BrokenImage "iVBORw0KGgoAAAANSUhEUgAAABAAAAASCAMAAABl5a5YAAABj1BMVEWopan///+koqSWk5P9/v3///////////+AgACMiovz8/PB0fG9z+3i4+WysbGBfX1Erh80rACLiYqBxolEsDhHlDEbqQDDx+CNho7W1tj4+/bw+O3P5Mn4/f/W1tbK6sX////b2dn////////////8/Pz6+vro6Ojj4+P////G1PL////EzNydmp2cmZnd3eDF1PHs8v/o8P/Q3vrS3vfE0vCdmpqZkpr19/3N2vXI1vPH1fOgnqDg6frP3PbCytvHx8irqq6HhIZtuGtjnlZetU1Xs0NWskBNsi7w9v/d6P7w9P3S4Pzr8Pvl7PrY5PrU4PjQ3fjD1Ozo6Om30NjGzNi7ubm34K+UxKmbnaWXlJeUjpSPi4tppF1TtjxSsTf2+f7L2PTr7e3H2+3V7+q+0uXg4OPg4eLR1uG7z+Hg4ODGzODV2N7V1trP5dmxzs65vcfFxMWq0cKxxr+/vr+0s7apxbWaxrCv2qao05+dlp2Uuo2Dn4F8vIB6xnyAoHmAym9zqGpctENLryNFsgoblJpnAAAAKnRSTlP+hP7+5ZRmYgL+/f39/f39/f38/Pz8/Pv69+7j083My8GocnBPTTMWEgjxeITOAAABEklEQVQY0y3KZXuCYBiG4ceYuu7u3nyVAaKOMBBQ7O5Yd3f3fvheDnd9u8/jBkGwNxP6sjOWVQvY/ftrzfT6bd3yEhCnYZqiaYoKiwX/gXkFiHySTcUTLJMsZ9v8nQvgssWYOEKedKpcOO6CUXD5IlGEY5hLUbyDAAZ6HRf1bnkoavOsFQibg+Q4nuNYL+ON5PHD5nBaraRVyxnzGf6BJzUi2QQCQgMyk8tleL7dg1owpJ17D5IkvV100EingeOopPyo6vfAuXF+9hbDTknZCIaUoeK4efKwG4iT6xDewd7imGlid7gGwv37b6Oh9jwaTdOf/Tc1qH7UZVmuP6G5qZfBr9cAGNy4KiDd4tXIs7tS+QO9aUKvPAIKuQAAAABJRU5ErkJggg=="
-
 struct Application;
 int releaseNSObject(void *const context, struct hashmap_element_s *const e);
 void TitlebarAppearsTransparent(struct Application* app);
@@ -149,6 +124,4 @@ void* lookupStringConstant(id constantName);
 
 void HasURLHandlers(struct Application* app);
 
-id createImageFromBase64Data(const char *data, bool isTemplateImage);
-
 #endif

v2/internal/ffenestri/ffenestri_linux.c

@@ -80,7 +80,6 @@ struct Application
     int height;
     int resizable;
     int devtools;
-    int startHidden;
     int fullscreen;
     int minWidth;
     int minHeight;
@@ -101,7 +100,7 @@ struct Application
     int lock;
 };
 
-void *NewApplication(const char *title, int width, int height, int resizable, int devtools, int fullscreen, int startHidden)
+void *NewApplication(const char *title, int width, int height, int resizable, int devtools, int fullscreen)
 {
     // Setup main application struct
     struct Application *result = malloc(sizeof(struct Application));
@@ -116,11 +115,15 @@ void *NewApplication(const char *title, int width, int height, int resizable, in
     result->maxWidth = 0;
     result->maxHeight = 0;
     result->frame = 1;
-    result->startHidden = startHidden;
 
     // Default drag button is PRIMARY
     result->dragButton = PRIMARY_MOUSE_BUTTON;
 
+    // printf("\n\nWidth: %d\n", result->width);
+    // printf("Height: %d\n\n", result->height);
+
+    // Features
+
     result->sendMessageToBackend = (ffenestriCallback)messageFromWindowCallback;
 
     // Create a unique ID based on the current unix timestamp
@@ -136,9 +139,10 @@ void *NewApplication(const char *title, int width, int height, int resizable, in
     return (void *)result;
 }
 
-void DestroyApplication(struct Application *app)
+void DestroyApplication(void *appPointer)
 {
     Debug("Destroying Application");
+    struct Application *app = (struct Application *)appPointer;
 
     g_application_quit(G_APPLICATION(app->application));
 
@@ -167,11 +171,9 @@ void DestroyApplication(struct Application *app)
     // Disconnect signal handlers
     WebKitUserContentManager *manager = webkit_web_view_get_user_content_manager((WebKitWebView *)app->webView);
     g_signal_handler_disconnect(manager, app->signalInvoke);
-    if( app->frame == 0) {
-        g_signal_handler_disconnect(manager, app->signalWindowDrag);
-        g_signal_handler_disconnect(app->webView, app->signalButtonPressed);
-        g_signal_handler_disconnect(app->webView, app->signalButtonReleased);
-    }
+    g_signal_handler_disconnect(manager, app->signalWindowDrag);
+    g_signal_handler_disconnect(app->webView, app->signalButtonPressed);
+    g_signal_handler_disconnect(app->webView, app->signalButtonReleased);
     g_signal_handler_disconnect(app->webView, app->signalLoadChanged);
 
     // Release the main GTK Application
@@ -189,34 +191,45 @@ void DestroyApplication(struct Application *app)
 
 // Quit will stop the gtk application and free up all the memory
 // used by the application
-void Quit(struct Application *app)
+void Quit(void *appPointer)
 {
     Debug("Quit Called");
+    struct Application *app = (struct Application *)appPointer;
     gtk_window_close((GtkWindow *)app->mainWindow);
     g_application_quit((GApplication *)app->application);
-    DestroyApplication(app);
+    DestroyApplication(appPointer);
 }
 
 // SetTitle sets the main window title to the given string
-void SetTitle(struct Application *app, const char *title)
+void SetTitle(void *appPointer, const char *title)
 {
+    struct Application *app = (struct Application *)appPointer;
     gtk_window_set_title(app->mainWindow, title);
 }
 
 // Fullscreen sets the main window to be fullscreen
-void Fullscreen(struct Application *app)
+void Fullscreen(void *appPointer)
 {
+    struct Application *app = (struct Application *)appPointer;
     gtk_window_fullscreen(app->mainWindow);
 }
 
 // UnFullscreen resets the main window after a fullscreen
-void UnFullscreen(struct Application *app)
+void UnFullscreen(void *appPointer)
 {
+    struct Application *app = (struct Application *)appPointer;
     gtk_window_unfullscreen(app->mainWindow);
 }
 
-void setMinMaxSize(struct Application *app)
+void Center(void *appPointer)
 {
+    struct Application *app = (struct Application *)appPointer;
+    gtk_window_set_position(app->mainWindow, GTK_WIN_POS_CENTER);
+}
+
+void setMinMaxSize(void *appPointer)
+{
+    struct Application *app = (struct Application *)appPointer;
     GdkGeometry size;
     size.min_width = size.min_height = size.max_width = size.max_height = 0;
     int flags = 0;
@@ -232,43 +245,32 @@ void setMinMaxSize(struct Application *app)
         size.min_width = app->minWidth;
         flags |= GDK_HINT_MIN_SIZE;
     }
+    Debug("size: %dx%d", app->width, app->height);
+    Debug("min: %dx%d", size.min_width, size.min_height);
+    Debug("max: %dx%d", size.max_width, size.max_height);
     gtk_window_set_geometry_hints(app->mainWindow, NULL, &size, flags);
 }
 
-char *fileDialogInternal(struct Application *app, GtkFileChooserAction chooserAction, char **args) {
+// OpenFileDialog opens a dialog to select a file
+// NOTE: The result is a string that will need to be freed!
+char *OpenFileDialog(void *appPointer, char *title)
+{
+    struct Application *app = (struct Application *)appPointer;
     GtkFileChooserNative *native;
-    GtkFileChooserAction action = chooserAction;
+    GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN;
     gint res;
     char *filename;
 
-    char *title = args[0];
-    char *filter = args[1];
-
     native = gtk_file_chooser_native_new(title,
                                          app->mainWindow,
                                          action,
                                          "_Open",
                                          "_Cancel");
 
-    GtkFileChooser *chooser = GTK_FILE_CHOOSER(native);
-
-    // If we have filters, process them
-    if (filter[0] != '\0') {
-        GtkFileFilter *file_filter = gtk_file_filter_new();
-        gchar **filters  = g_strsplit(filter, ",", -1);
-        gint i;
-        for(i = 0; filters && filters[i]; i++) {
-            gtk_file_filter_add_pattern(file_filter, filters[i]);
-            // Debug("Adding filter pattern: %s\n", filters[i]);
-        }
-        gtk_file_filter_set_name(file_filter, filter);
-        gtk_file_chooser_add_filter(chooser, file_filter);
-        g_strfreev(filters);
-    }
-
     res = gtk_native_dialog_run(GTK_NATIVE_DIALOG(native));
     if (res == GTK_RESPONSE_ACCEPT)
     {
+        GtkFileChooser *chooser = GTK_FILE_CHOOSER(native);
         filename = gtk_file_chooser_get_filename(chooser);
     }
 
@@ -277,65 +279,104 @@ char *fileDialogInternal(struct Application *app, GtkFileChooserAction chooserAc
     return filename;
 }
 
-// openFileDialogInternal opens a dialog to select a file
+// SaveFileDialog opens a dialog to select a file
 // NOTE: The result is a string that will need to be freed!
-char *openFileDialogInternal(struct Application *app, char **args)
+char *SaveFileDialog(void *appPointer, char *title)
 {
-    return fileDialogInternal(app, GTK_FILE_CHOOSER_ACTION_OPEN, args);
+    struct Application *app = (struct Application *)appPointer;
+    GtkFileChooserNative *native;
+    GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_SAVE;
+    gint res;
+    char *filename;
+
+    native = gtk_file_chooser_native_new(title,
+                                         app->mainWindow,
+                                         action,
+                                         "_Save",
+                                         "_Cancel");
+
+    res = gtk_native_dialog_run(GTK_NATIVE_DIALOG(native));
+    if (res == GTK_RESPONSE_ACCEPT)
+    {
+        GtkFileChooser *chooser = GTK_FILE_CHOOSER(native);
+        filename = gtk_file_chooser_get_filename(chooser);
+    }
+
+    g_object_unref(native);
+
+    return filename;
 }
 
-// saveFileDialogInternal opens a dialog to select a file
+// OpenDirectoryDialog opens a dialog to select a directory
 // NOTE: The result is a string that will need to be freed!
-char *saveFileDialogInternal(struct Application *app, char **args)
+char *OpenDirectoryDialog(void *appPointer, char *title)
 {
-    return fileDialogInternal(app, GTK_FILE_CHOOSER_ACTION_SAVE, args);
+    struct Application *app = (struct Application *)appPointer;
+    GtkFileChooserNative *native;
+    GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
+    gint res;
+    char *foldername;
+
+    native = gtk_file_chooser_native_new(title,
+                                         app->mainWindow,
+                                         action,
+                                         "_Open",
+                                         "_Cancel");
+
+    res = gtk_native_dialog_run(GTK_NATIVE_DIALOG(native));
+    if (res == GTK_RESPONSE_ACCEPT)
+    {
+        GtkFileChooser *chooser = GTK_FILE_CHOOSER(native);
+        foldername = gtk_file_chooser_get_filename(chooser);
+    }
+
+    g_object_unref(native);
+
+    return foldername;
 }
 
-
-// openDirectoryDialogInternal opens a dialog to select a directory
-// NOTE: The result is a string that will need to be freed!
-char *openDirectoryDialogInternal(struct Application *app, char **args)
-{
-    return fileDialogInternal(app, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, args);
-}
-
-void SetMinWindowSize(struct Application *app, int minWidth, int minHeight)
+void SetMinWindowSize(void *appPointer, int minWidth, int minHeight)
 {
+    struct Application *app = (struct Application *)appPointer;
     app->minWidth = minWidth;
     app->minHeight = minHeight;
 }
 
-void SetMaxWindowSize(struct Application *app, int maxWidth, int maxHeight)
+void SetMaxWindowSize(void *appPointer, int maxWidth, int maxHeight)
 {
+    struct Application *app = (struct Application *)appPointer;
     app->maxWidth = maxWidth;
     app->maxHeight = maxHeight;
 }
 
 // SetColour sets the colour of the webview to the given colour string
-int SetColour(struct Application *app, const char *colourString)
+int SetColour(void *appPointer, const char *colourString)
 {
+    struct Application *app = (struct Application *)appPointer;
     GdkRGBA rgba;
     gboolean result = gdk_rgba_parse(&rgba, colourString);
     if (result == FALSE)
     {
         return 0;
     }
-    // Debug("Setting webview colour to: %s", colourString);
+    Debug("Setting webview colour to: %s", colourString);
     webkit_web_view_get_background_color((WebKitWebView *)(app->webView), &rgba);
     return 1;
 }
 
 // DisableFrame disables the window frame
-void DisableFrame(struct Application *app)
+void DisableFrame(void *appPointer)
 {
+    struct Application *app = (struct Application *)appPointer;
     app->frame = 0;
 }
 
 void syncCallback(GObject *source_object,
                   GAsyncResult *res,
-                  void *data)
+                  gpointer user_data)
 {
-    struct Application *app = (struct Application *)data;
+
+    struct Application *app = (struct Application *)user_data;
     app->lock = 0;
 }
 
@@ -343,6 +384,8 @@ void syncEval(struct Application *app, const gchar *script)
 {
 
     WebKitWebView *webView = (WebKitWebView *)(app->webView);
+    // Debug("[%p] webview\n", webView);
+    // Debug("[%p] Running sync\n", script);
 
     // wait for lock to free
     while (app->lock == 1)
@@ -352,15 +395,18 @@ void syncEval(struct Application *app, const gchar *script)
     // Set lock
     app->lock = 1;
 
+    //
     webkit_web_view_run_javascript(
         webView,
         script,
-        NULL, syncCallback, (void*)app);
+        NULL, syncCallback, app);
 
     while (app->lock == 1)
     {
+        // Debug("[%p] Waiting for callback\n", script);
         g_main_context_iteration(0, true);
     }
+    // Debug("[%p] Finished\n", script);
 }
 
 void asyncEval(WebKitWebView *webView, const gchar *script)
@@ -371,7 +417,7 @@ void asyncEval(WebKitWebView *webView, const gchar *script)
         NULL, NULL, NULL);
 }
 
-typedef void (*dispatchMethod)(struct Application *app, void *);
+typedef void (*dispatchMethod)(void *app, void *);
 
 struct dispatchData
 {
@@ -383,14 +429,20 @@ struct dispatchData
 gboolean executeMethod(gpointer data)
 {
     struct dispatchData *d = (struct dispatchData *)data;
-    (d->method)(d->app, d->args);
+    struct Application *app = (struct Application *)(d->app);
+    // Debug("Webview %p\n", app->webView);
+    // Debug("Args %s\n", d->args);
+    // Debug("Method %p\n", (d->method));
+    (d->method)(app, d->args);
+    // Debug("Method Execute Complete. Freeing memory");
     g_free(d);
     return FALSE;
 }
 
-void ExecJS(struct Application *app, char *js)
+void ExecJS(void *app, char *js)
 {
-    struct dispatchData *data = (struct dispatchData *)g_new(struct dispatchData, 1);
+    struct dispatchData *data =
+        (struct dispatchData *)g_new(struct dispatchData, 1);
     data->method = (dispatchMethod)syncEval;
     data->args = js;
     data->app = app;
@@ -398,14 +450,13 @@ void ExecJS(struct Application *app, char *js)
     gdk_threads_add_idle(executeMethod, data);
 }
 
-typedef char *(*dialogMethod)(struct Application *app, void *);
+typedef char *(*dialogMethod)(void *app, void *);
 
 struct dialogCall
 {
     struct Application *app;
     dialogMethod method;
     void *args;
-    void *filter;
     char *result;
     int done;
 };
@@ -413,70 +464,79 @@ struct dialogCall
 gboolean executeMethodWithReturn(gpointer data)
 {
     struct dialogCall *d = (struct dialogCall *)data;
-
-    d->result = (d->method)(d->app, d->args);
+    struct Application *app = (struct Application *)(d->app);
+    Debug("Webview %p\n", app->webView);
+    Debug("Args %s\n", d->args);
+    Debug("Method %p\n", (d->method));
+    d->result = (d->method)(app, d->args);
     d->done = 1;
+    // Debug("Method Execute Complete. Freeing memory");
     return FALSE;
 }
 
-char *OpenFileDialog(struct Application *app, char *title, char *filter)
+char *OpenFileDialogOnMainThread(void *app, char *title)
 {
-    struct dialogCall *data = (struct dialogCall *)g_new(struct dialogCall, 1);
+    struct dialogCall *data =
+        (struct dialogCall *)g_new(struct dialogCall, 1);
     data->result = NULL;
     data->done = 0;
-    data->method = (dialogMethod)openFileDialogInternal;
-    const char* dialogArgs[]={ title, filter };
-    data->args = dialogArgs;
-    data->app = app;
-
-    gdk_threads_add_idle(executeMethodWithReturn, data);
-
-    while (data->done == 0)
-    {
-        usleep(100000);
-    }
-    g_free(data);
-    return data->result;
-}
-
-char *SaveFileDialog(struct Application *app, char *title, char *filter)
-{
-    struct dialogCall *data = (struct dialogCall *)g_new(struct dialogCall, 1);
-    data->result = NULL;
-    data->done = 0;
-    data->method = (dialogMethod)saveFileDialogInternal;
-    const char* dialogArgs[]={ title, filter };
-    data->args = dialogArgs;
+    data->method = (dialogMethod)OpenFileDialog;
+    data->args = title;
     data->app = app;
 
     gdk_threads_add_idle(executeMethodWithReturn, data);
 
     while (data->done == 0)
     {
+        // Debug("Waiting for dialog");
         usleep(100000);
     }
     Debug("Dialog done");
     Debug("Result = %s\n", data->result);
-
     g_free(data);
     // Fingers crossed this wasn't freed by g_free above
     return data->result;
 }
 
-char *OpenDirectoryDialog(struct Application *app, char *title, char *filter)
+char *SaveFileDialogOnMainThread(void *app, char *title)
 {
-    struct dialogCall *data = (struct dialogCall *)g_new(struct dialogCall, 1);
+    struct dialogCall *data =
+        (struct dialogCall *)g_new(struct dialogCall, 1);
     data->result = NULL;
     data->done = 0;
-    data->method = (dialogMethod)openDirectoryDialogInternal;
-    const char* dialogArgs[]={ title, filter };
-    data->args = dialogArgs;
+    data->method = (dialogMethod)SaveFileDialog;
+    data->args = title;
     data->app = app;
 
     gdk_threads_add_idle(executeMethodWithReturn, data);
 
     while (data->done == 0)
     {
+        // Debug("Waiting for dialog");
+        usleep(100000);
+    }
+    Debug("Dialog done");
+    Debug("Result = %s\n", data->result);
+    g_free(data);
+    // Fingers crossed this wasn't freed by g_free above
+    return data->result;
+}
+
+char *OpenDirectoryDialogOnMainThread(void *app, char *title)
+{
+    struct dialogCall *data =
+        (struct dialogCall *)g_new(struct dialogCall, 1);
+    data->result = NULL;
+    data->done = 0;
+    data->method = (dialogMethod)OpenDirectoryDialog;
+    data->args = title;
+    data->app = app;
+
+    gdk_threads_add_idle(executeMethodWithReturn, data);
+
+    while (data->done == 0)
+    {
+        // Debug("Waiting for dialog");
         usleep(100000);
     }
     Debug("Directory Dialog done");
@@ -495,8 +555,10 @@ void setIcon(struct Application *app)
 
 static void load_finished_cb(WebKitWebView *webView,
                              WebKitLoadEvent load_event,
-                             struct Application *app)
+                             gpointer userData)
 {
+    struct Application *app;
+
     switch (load_event)
     {
     // case WEBKIT_LOAD_STARTED:
@@ -518,6 +580,7 @@ static void load_finished_cb(WebKitWebView *webView,
     case WEBKIT_LOAD_FINISHED:
         /* Load finished, we can now stop the spinner */
         // printf("Finished loading: %s\n", webkit_web_view_get_uri(web_view));
+        app = (struct Application *)userData;
 
         // Bindings
         Debug("Binding Methods");
@@ -574,23 +637,21 @@ static void load_finished_cb(WebKitWebView *webView,
         setMinMaxSize(app);
 
         // Centre by default
-        gtk_window_set_position(app->mainWindow, GTK_WIN_POS_CENTER);
+        Center(app);
 
         // Show window and focus
-        if( app->startHidden == 0) {
-            gtk_widget_show_all(GTK_WIDGET(app->mainWindow));
-            gtk_widget_grab_focus(app->webView);
-        }
+        gtk_widget_show_all(GTK_WIDGET(app->mainWindow));
+        gtk_widget_grab_focus(app->webView);
         break;
     }
 }
 
-static gboolean disable_context_menu_cb(
-    WebKitWebView *web_view,
-    WebKitContextMenu *context_menu,
-    GdkEvent *event,
-    WebKitHitTestResult *hit_test_result,
-    gpointer user_data)
+static gboolean
+disable_context_menu_cb(WebKitWebView *web_view,
+                        WebKitContextMenu *context_menu,
+                        GdkEvent *event,
+                        WebKitHitTestResult *hit_test_result,
+                        gpointer user_data)
 {
     return TRUE;
 }
@@ -605,11 +666,12 @@ static void printEvent(const char *message, GdkEventButton *event)
           event->time);
 }
 
-
 static void dragWindow(WebKitUserContentManager *contentManager,
                        WebKitJavascriptResult *result,
-                       struct Application *app)
+                       gpointer arg)
 {
+    struct Application *app = (struct Application *)arg;
+
     // If we get this message erroneously, ignore
     if (app->dragButtonEvent == NULL)
     {
@@ -634,22 +696,31 @@ static void dragWindow(WebKitUserContentManager *contentManager,
     // Clear the event
     app->dragButtonEvent = NULL;
 
-    return;
+    return FALSE;
 }
 
-gboolean buttonPress(GtkWidget *widget, GdkEventButton *event, struct Application *app)
+gboolean buttonPress(GtkWidget *widget, GdkEventButton *event, gpointer arg)
 {
+    struct Application *app = (struct Application *)arg;
+    Debug("I am pressing a button");
+
     if (event->type == GDK_BUTTON_PRESS && event->button == app->dragButton)
     {
+        printEvent("Drag button event was saved", event);
         app->dragButtonEvent = event;
     }
     return FALSE;
 }
 
-gboolean buttonRelease(GtkWidget *widget, GdkEventButton *event, struct Application *app)
+gboolean buttonRelease(GtkWidget *widget, GdkEventButton *event, gpointer arg)
 {
+    struct Application *app = (struct Application *)arg;
+    Debug("I am releasing a button");
+
     if (event->type == GDK_BUTTON_RELEASE && event->button == app->dragButton)
     {
+        printEvent("Drag button event was reset", event);
+
         app->dragButtonEvent = NULL;
     }
     return FALSE;
@@ -657,8 +728,9 @@ gboolean buttonRelease(GtkWidget *widget, GdkEventButton *event, struct Applicat
 
 static void sendMessageToBackend(WebKitUserContentManager *contentManager,
                                  WebKitJavascriptResult *result,
-                                 struct Application *app)
+                                 gpointer arg)
 {
+    struct Application *app = (struct Application *)arg;
 #if WEBKIT_MAJOR_VERSION >= 2 && WEBKIT_MINOR_VERSION >= 22
     JSCValue *value = webkit_javascript_result_get_js_value(result);
     char *message = jsc_value_to_string(value);
@@ -675,225 +747,16 @@ static void sendMessageToBackend(WebKitUserContentManager *contentManager,
     g_free(message);
 }
 
-void SetDebug(struct Application *app, int flag)
+void SetDebug(void *applicationPointer, int flag)
 {
+    struct Application *app = (struct Application *)applicationPointer;
     debug = flag;
 }
 
-// getCurrentMonitorGeometry gets the geometry of the monitor
-// that the window is mostly on.
-GdkRectangle getCurrentMonitorGeometry(GtkWindow *window) {
-    // Get the monitor that the window is currently on
-    GdkDisplay *display = gtk_widget_get_display(GTK_WIDGET(window));
-    GdkWindow *gdk_window = gtk_widget_get_window(GTK_WIDGET(window));
-    GdkMonitor *monitor = gdk_display_get_monitor_at_window (display, gdk_window);
-
-    // Get the geometry of the monitor
-    GdkRectangle result;
-    gdk_monitor_get_geometry (monitor,&result);
-
-    return result;
-}
-
-/*******************
- * Window Position *
- *******************/
-
-// Position holds an x/y corrdinate
-struct Position {
-    int x;
-    int y;
-};
-
-// Internal call for setting the position of the window.
-void setPositionInternal(struct Application *app, struct Position *pos) {
-
-    // Get the monitor geometry
-    GdkRectangle m = getCurrentMonitorGeometry(app->mainWindow);
-
-    // Move the window relative to the monitor
-    gtk_window_move(app->mainWindow, m.x + pos->x, m.y + pos->y);
-    
-    // Free memory
-    free(pos);
-}
-
-// SetPosition sets the position of the window to the given x/y 
-// coordinates. The x/y values are relative to the monitor 
-// the window is mostly on.
-void SetPosition(struct Application *app, int x, int y) {
-    struct dispatchData *data = (struct dispatchData *)g_new(struct dispatchData, 1);
-    data->method = (dispatchMethod)setPositionInternal;
-    struct Position *pos = malloc(sizeof(struct Position));
-    pos->x = x;
-    pos->y = y;
-    data->args = pos;
-    data->app = app;
-
-    gdk_threads_add_idle(executeMethod, data);  
-}
-
-/***************
- * Window Size *
- ***************/
-
-// Size holds a width/height
-struct Size {
-    int width;
-    int height;
-};
-
-// Internal call for setting the size of the window.
-void setSizeInternal(struct Application *app, struct Size *size) {
-    gtk_window_resize(app->mainWindow, size->width, size->height);
-    free(size);
-}
-
-// SetSize sets the size of the window to the given width/height
-void SetSize(struct Application *app, int width, int height) {
-    struct dispatchData *data = (struct dispatchData *)g_new(struct dispatchData, 1);
-    data->method = (dispatchMethod)setSizeInternal;
-    struct Size *size = malloc(sizeof(struct Size));
-    size->width = width;
-    size->height = height;
-    data->args = size;
-    data->app = app;
-
-    gdk_threads_add_idle(executeMethod, data);  
-}
-
-
-// centerInternal will center the main window on the monitor it is mostly in
-void centerInternal(struct Application *app)
+void SetBindings(void *applicationPointer, const char *bindings)
 {
-    // Get the geometry of the monitor
-    GdkRectangle m = getCurrentMonitorGeometry(app->mainWindow);
+    struct Application *app = (struct Application *)applicationPointer;
 
-    // Get the window width/height
-    int windowWidth, windowHeight;
-    gtk_window_get_size(app->mainWindow, &windowWidth, &windowHeight);
-
-    // Place the window at the center of the monitor
-    gtk_window_move(app->mainWindow, ((m.width - windowWidth) / 2) + m.x, ((m.height - windowHeight) / 2) + m.y);
-}
-
-// Center the window
-void Center(struct Application *app) {
-
-    // Setup a call to centerInternal on the main thread
-    struct dispatchData *data = (struct dispatchData *)g_new(struct dispatchData, 1);
-    data->method = (dispatchMethod)centerInternal;
-    data->app = app;
-
-    // Add call to main thread
-    gdk_threads_add_idle(executeMethod, data);  
-}
-
-// hideInternal hides the main window
-void hideInternal(struct Application *app) {
-    gtk_widget_hide (GTK_WIDGET(app->mainWindow));
-}
-
-// Hide places the hideInternal method onto the main thread for execution
-void Hide(struct Application *app) {
-
-    // Setup a call to hideInternal on the main thread
-    struct dispatchData *data = (struct dispatchData *)g_new(struct dispatchData, 1);
-    data->method = (dispatchMethod)hideInternal;
-    data->app = app;
-
-    // Add call to main thread
-    gdk_threads_add_idle(executeMethod, data);  
-}
-
-// showInternal shows the main window 
-void showInternal(struct Application *app) {
-    gtk_widget_show_all(GTK_WIDGET(app->mainWindow));
-    gtk_widget_grab_focus(app->webView);
-}
-
-// Show places the showInternal method onto the main thread for execution
-void Show(struct Application *app) {
-    struct dispatchData *data = (struct dispatchData *)g_new(struct dispatchData, 1);
-    data->method = (dispatchMethod)showInternal;
-    data->app = app;
-
-    gdk_threads_add_idle(executeMethod, data);  
-}
-
-
-// maximiseInternal maximises the main window
-void maximiseInternal(struct Application *app) {
-    gtk_window_maximize(GTK_WIDGET(app->mainWindow));
-}
-
-// Maximise places the maximiseInternal method onto the main thread for execution
-void Maximise(struct Application *app) {
-
-    // Setup a call to maximiseInternal on the main thread
-    struct dispatchData *data = (struct dispatchData *)g_new(struct dispatchData, 1);
-    data->method = (dispatchMethod)maximiseInternal;
-    data->app = app;
-
-    // Add call to main thread
-    gdk_threads_add_idle(executeMethod, data);  
-}
-
-// unmaximiseInternal unmaximises the main window
-void unmaximiseInternal(struct Application *app) {
-    gtk_window_unmaximize(GTK_WIDGET(app->mainWindow));
-}
-
-// Unmaximise places the unmaximiseInternal method onto the main thread for execution
-void Unmaximise(struct Application *app) {
-
-    // Setup a call to unmaximiseInternal on the main thread
-    struct dispatchData *data = (struct dispatchData *)g_new(struct dispatchData, 1);
-    data->method = (dispatchMethod)unmaximiseInternal;
-    data->app = app;
-
-    // Add call to main thread
-    gdk_threads_add_idle(executeMethod, data);  
-}
-
-
-// minimiseInternal minimises the main window
-void minimiseInternal(struct Application *app) {
-    gtk_window_iconify(app->mainWindow);
-}
-
-// Minimise places the minimiseInternal method onto the main thread for execution
-void Minimise(struct Application *app) {
-
-    // Setup a call to minimiseInternal on the main thread
-    struct dispatchData *data = (struct dispatchData *)g_new(struct dispatchData, 1);
-    data->method = (dispatchMethod)minimiseInternal;
-    data->app = app;
-
-    // Add call to main thread
-    gdk_threads_add_idle(executeMethod, data);  
-}
-
-// unminimiseInternal unminimises the main window
-void unminimiseInternal(struct Application *app) {
-    gtk_window_present(app->mainWindow);
-}
-
-// Unminimise places the unminimiseInternal method onto the main thread for execution
-void Unminimise(struct Application *app) {
-
-    // Setup a call to unminimiseInternal on the main thread
-    struct dispatchData *data = (struct dispatchData *)g_new(struct dispatchData, 1);
-    data->method = (dispatchMethod)unminimiseInternal;
-    data->app = app;
-
-    // Add call to main thread
-    gdk_threads_add_idle(executeMethod, data);  
-}
-
-
-void SetBindings(struct Application *app, const char *bindings)
-{
     const char *temp = concat("window.wailsbindings = \"", bindings);
     const char *jscall = concat(temp, "\";");
     free((void *)temp);
@@ -903,15 +766,18 @@ void SetBindings(struct Application *app, const char *bindings)
 // This is called when the close button on the window is pressed
 gboolean close_button_pressed(GtkWidget *widget,
                               GdkEvent *event,
-                              struct Application *app)
+                              gpointer user_data)
 {
+    struct Application *app = (struct Application *)user_data;
     app->sendMessageToBackend("WC"); // Window Close
     return TRUE;
 }
 
-static void setupWindow(struct Application *app)
+static void setupWindow(void *applicationPointer)
 {
 
+    struct Application *app = (struct Application *)applicationPointer;
+
     // Create the window
     GtkWidget *mainWindow = gtk_application_window_new(app->application);
     // Save reference
@@ -930,14 +796,10 @@ static void setupWindow(struct Application *app)
     webkit_user_content_manager_register_script_message_handler(contentManager, "external");
     app->signalInvoke = g_signal_connect(contentManager, "script-message-received::external", G_CALLBACK(sendMessageToBackend), app);
 
-    // Setup the window drag handler if this is a frameless app
-    if ( app->frame == 0 ) {
-        webkit_user_content_manager_register_script_message_handler(contentManager, "windowDrag");
-        app->signalWindowDrag = g_signal_connect(contentManager, "script-message-received::windowDrag", G_CALLBACK(dragWindow), app);
-        // Setup the mouse handlers
-        app->signalButtonPressed = g_signal_connect(app->webView, "button-press-event", G_CALLBACK(buttonPress), app);
-        app->signalButtonReleased = g_signal_connect(app->webView, "button-release-event", G_CALLBACK(buttonRelease), app);
-    }
+    // Setup the window drag handler
+    webkit_user_content_manager_register_script_message_handler(contentManager, "windowDrag");
+    app->signalWindowDrag = g_signal_connect(contentManager, "script-message-received::windowDrag", G_CALLBACK(dragWindow), app);
+
     GtkWidget *webView = webkit_web_view_new_with_user_content_manager(contentManager);
 
     // Save reference
@@ -946,6 +808,9 @@ static void setupWindow(struct Application *app)
     // Add the webview to the window
     gtk_container_add(GTK_CONTAINER(mainWindow), webView);
 
+    // Setup the mouse handlers
+    app->signalButtonPressed = g_signal_connect(app->webView, "button-press-event", G_CALLBACK(buttonPress), app);
+    app->signalButtonReleased = g_signal_connect(app->webView, "button-release-event", G_CALLBACK(buttonRelease), app);
 
     // Load default HTML
     app->signalLoadChanged = g_signal_connect(G_OBJECT(webView), "load-changed", G_CALLBACK(load_finished_cb), app);
@@ -970,13 +835,20 @@ static void setupWindow(struct Application *app)
     g_signal_connect(GTK_WIDGET(mainWindow), "delete-event", G_CALLBACK(close_button_pressed), app);
 }
 
-static void activate(GtkApplication* _, struct Application *app)
+static void
+activate(GtkApplication *app,
+         gpointer user_data)
 {
-    setupWindow(app);
+    struct Application *mainApp = (struct Application *)user_data;
+
+    // Main Window
+    setupWindow(mainApp);
 }
 
-void Run(struct Application *app, int argc, char **argv)
+void Run(void *applicationPointer, int argc, char **argv)
 {
+    struct Application *app = (struct Application *)applicationPointer;
+
     g_signal_connect(app->application, "activate", G_CALLBACK(activate), app);
     g_application_run(G_APPLICATION(app->application), argc, argv);
 }

v2/internal/ffenestri/ffenestri_windows.cpp

@@ -1,620 +0,0 @@
-// Some code may be inspired by or directly used from Webview (c) zserge.
-// License included in README.md
-
-#include "ffenestri_windows.h"
-#include "wv2ComHandler_windows.h"
-#include <functional>
-#include <atomic>
-#include <Shlwapi.h>
-#include <locale>
-#include <codecvt>
-#include "windows/WebView2.h"
-#include "effectstructs_windows.h"
-#include <Shlobj.h>
-
-int debug = 0;
-DWORD mainThread;
-
-// --- Assets
-extern const unsigned char runtime;
-extern const unsigned char *defaultDialogIcons[];
-
-// dispatch will execute the given `func` pointer
-void dispatch(dispatchFunction func) {
-    PostThreadMessage(mainThread, WM_APP, 0, (LPARAM) new dispatchFunction(func));
-}
-
-LPWSTR cstrToLPWSTR(const char *cstr) {
-    int wchars_num = MultiByteToWideChar( CP_UTF8 , 0 , cstr , -1, NULL , 0 );
-    wchar_t* wstr = new wchar_t[wchars_num+1];
-    MultiByteToWideChar( CP_UTF8 , 0 , cstr , -1, wstr , wchars_num );
-    return wstr;
-}
-
-// Credit: https://stackoverflow.com/a/9842450
-char* LPWSTRToCstr(LPWSTR input) {
-    int length = WideCharToMultiByte(CP_UTF8, 0, input, -1, 0, 0, NULL, NULL);
-    char* output = new char[length];
-    WideCharToMultiByte(CP_UTF8, 0, input, -1, output , length, NULL, NULL);
-    return output;
-}
-
-struct Application *NewApplication(const char *title, int width, int height, int resizable, int devtools, int fullscreen, int startHidden, int logLevel, int hideWindowOnClose) {
-
-    // Create application
-    struct Application *result = (struct Application*)malloc(sizeof(struct Application));
-
-    result->window = nullptr;
-    result->webview = nullptr;
-    result->webviewController = nullptr;
-
-    result->title = title;
-    result->width = width;
-    result->height = height;
-    result->resizable = resizable;
-    result->devtools = devtools;
-    result->fullscreen = fullscreen;
-    result->startHidden = startHidden;
-    result->logLevel = logLevel;
-    result->hideWindowOnClose = hideWindowOnClose;
-    result->webviewIsTranparent = false;
-    result->windowBackgroundIsTranslucent = false;
-
-    // Min/Max Width/Height
-    result->minWidth = 0;
-    result->minHeight = 0;
-    result->maxWidth = 0;
-    result->maxHeight = 0;
-
-    // Default colour
-    result->backgroundColour.R = 255;
-    result->backgroundColour.G = 255;
-    result->backgroundColour.B = 255;
-    result->backgroundColour.A = 255;
-
-    // Have a frame by default
-    result->frame = 1;
-
-    // Capture Main Thread
-    mainThread = GetCurrentThreadId();
-
-    // Startup url
-    result->startupURL = nullptr;
-
-    return result;
-}
-
-void SetMinWindowSize(struct Application* app, int minWidth, int minHeight) {
-    app->minWidth = (LONG)minWidth;
-    app->minHeight = (LONG)minHeight;
-}
-
-void SetMaxWindowSize(struct Application* app, int maxWidth, int maxHeight) {
-    app->maxWidth = (LONG)maxWidth;
-    app->maxHeight = (LONG)maxHeight;
-}
-
-void SetBindings(struct Application *app, const char *bindings) {
-    std::string temp = std::string("window.wailsbindings = \"") + std::string(bindings) + std::string("\";");
-    app->bindings = new char[temp.length()+1];
-	memcpy(app->bindings, temp.c_str(), temp.length()+1);
-}
-
-void performShutdown(struct Application *app) {
-    if( app->startupURL != nullptr ) {
-        delete[] app->startupURL;
-    }
-    messageFromWindowCallback("WC");
-}
-
-void enableTranslucentBackground(struct Application *app) {
-    HMODULE hUser = GetModuleHandleA("user32.dll");
-    if (hUser)
-    {
-        pfnSetWindowCompositionAttribute setWindowCompositionAttribute = (pfnSetWindowCompositionAttribute)GetProcAddress(hUser, "SetWindowCompositionAttribute");
-        if (setWindowCompositionAttribute)
-        {
-            ACCENT_POLICY accent = { ACCENT_ENABLE_BLURBEHIND, 0, 0, 0 };
-            WINDOWCOMPOSITIONATTRIBDATA data;
-            data.Attrib = WCA_ACCENT_POLICY;
-            data.pvData = &accent;
-            data.cbData = sizeof(accent);
-            setWindowCompositionAttribute(app->window, &data);
-        }
-    }
-}
-
-LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
-
-    struct Application *app = (struct Application *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
-
-    switch(msg) {
-
-        case WM_DESTROY: {
-            DestroyApplication(app);
-            break;
-        }
-        case WM_SIZE: {
-            if( app->webviewController != nullptr) {
-                RECT bounds;
-                GetClientRect(app->window, &bounds);
-                app->webviewController->put_Bounds(bounds);
-            }
-            break;
-        }
-        case WM_GETMINMAXINFO: {
-            // Exit early if this is called before the window is created.
-            if ( app == NULL ) {
-                return 0;
-            }
-
-            // get pixel density
-            HDC hDC = GetDC(NULL);
-            double DPIScaleX = GetDeviceCaps(hDC, 88)/96.0;
-            double DPIScaleY = GetDeviceCaps(hDC, 90)/96.0;
-            ReleaseDC(NULL, hDC);
-
-            RECT rcClient, rcWind;
-            POINT ptDiff;
-            GetClientRect(hwnd, &rcClient);
-            GetWindowRect(hwnd, &rcWind);
-
-            int widthExtra = (rcWind.right - rcWind.left) - rcClient.right;
-            int heightExtra = (rcWind.bottom - rcWind.top) - rcClient.bottom;
-
-            LPMINMAXINFO mmi = (LPMINMAXINFO) lParam;
-            if (app->minWidth > 0 && app->minHeight > 0) {
-                mmi->ptMinTrackSize.x = app->minWidth * DPIScaleX + widthExtra;
-                mmi->ptMinTrackSize.y = app->minHeight * DPIScaleY + heightExtra;
-            }
-            if (app->maxWidth > 0 && app->maxHeight > 0) {
-                mmi->ptMaxSize.x = app->maxWidth * DPIScaleX + widthExtra;
-                mmi->ptMaxSize.y = app->maxHeight * DPIScaleY + heightExtra;
-                mmi->ptMaxTrackSize.x = app->maxWidth * DPIScaleX + widthExtra;
-                mmi->ptMaxTrackSize.y = app->maxHeight * DPIScaleY + heightExtra;
-            }
-            return 0;
-        }
-        default:
-            return DefWindowProc(hwnd, msg, wParam, lParam);
-    }
-    return 0;
-}
-
-void init(struct Application *app, const char* js) {
-    LPCWSTR wjs = cstrToLPWSTR(js);
-    app->webview->AddScriptToExecuteOnDocumentCreated(wjs, nullptr);
-    delete[] wjs;
-}
-
-void execJS(struct Application* app, const char *script) {
-    LPWSTR s = cstrToLPWSTR(script);
-    app->webview->ExecuteScript(s, nullptr);
-    delete[] s;
-}
-
-void loadAssets(struct Application* app) {
-
-    // patch window.external.invoke
-    std::string initialCode = std::string("window.external={invoke:s=>window.chrome.webview.postMessage(s)};");
-
-    // Load bindings
-    initialCode += std::string(app->bindings);
-    delete[] app->bindings;
-
-    // Load runtime
-    initialCode += std::string((const char*)&runtime);
-
-    int index = 1;
-    while(1) {
-        // Get next asset pointer
-        const unsigned char *asset = assets[index];
-
-        // If we have no more assets, break
-        if (asset == 0x00) {
-            break;
-        }
-
-        initialCode += std::string((const char*)asset);
-        index++;
-    };
-
-    // Disable context menu if not in debug mode
-    if( debug != 1 ) {
-        initialCode += std::string("wails._.DisableDefaultContextMenu();");
-    }
-
-    initialCode += std::string("window.external.invoke('completed');");
-
-    // Keep a copy of the code
-    app->initialCode = new char[initialCode.length()+1];
-	memcpy(app->initialCode, initialCode.c_str(), initialCode.length()+1);
-
-    execJS(app, app->initialCode);
-
-    // Show app if we need to
-    if( app->startHidden == false ) {
-        Show(app);
-    }
-}
-
-// This is called when all our assets are loaded into the DOM
-void completed(struct Application* app) {
-    delete[] app->initialCode;
-    app->initialCode = nullptr;
-
-    if( app->startupURL == nullptr ) {
-        messageFromWindowCallback("SS");
-        return;
-    }
-    std::string readyMessage = std::string("SS") + std::string(app->startupURL);
-    messageFromWindowCallback(readyMessage.c_str());
-}
-
-
-//
-bool initWebView2(struct Application *app, int debugEnabled, messageCallback cb) {
-
-    debug = debugEnabled;
-
-    CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
-
-    std::atomic_flag flag = ATOMIC_FLAG_INIT;
-    flag.test_and_set();
-
-//    char currentExePath[MAX_PATH];
-//    GetModuleFileNameA(NULL, currentExePath, MAX_PATH);
-//    char *currentExeName = PathFindFileNameA(currentExePath);
-//    std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> wideCharConverter;
-//    auto exeName = wideCharConverter.from_bytes(currentExeName);
-//
-//    PWSTR path;
-//    HRESULT appDataResult = SHGetFolderPathAndSubDir(app->window, CSIDL_LOCAL_APPDATA, nullptr, SHGFP_TYPE_CURRENT, exeName.c_str(), path);
-//    if ( appDataResult == false ) {
-//        path = nullptr;
-//    }
-//
-
-    ICoreWebView2Controller *controller;
-    ICoreWebView2* webview;
-
-    HRESULT res = CreateCoreWebView2EnvironmentWithOptions(
-            nullptr, nullptr, nullptr,
-            new wv2ComHandler(app, app->window, cb,
-                                     [&](ICoreWebView2Controller *webviewController) {
-                                         controller = webviewController;
-                                         controller->get_CoreWebView2(&webview);
-                                         webview->AddRef();
-                                         flag.clear();
-                                     }));
-    if (res != S_OK) {
-        CoUninitialize();
-        return false;
-    }
-
-    MSG msg = {};
-    while (flag.test_and_set() && GetMessage(&msg, NULL, 0, 0)) {
-        TranslateMessage(&msg);
-        DispatchMessage(&msg);
-    }
-    app->webviewController = controller;
-    app->webview = webview;
-    // Resize WebView to fit the bounds of the parent window
-    RECT bounds;
-    GetClientRect(app->window, &bounds);
-    app->webviewController->put_Bounds(bounds);
-
-    // Callback hack
-    app->webview->AddScriptToExecuteOnDocumentCreated(L"window.chrome.webview.postMessage('I');", nullptr);
-    // Load the HTML
-    LPCWSTR html = (LPCWSTR) cstrToLPWSTR((char*)assets[0]);
-    app->webview->Navigate(html);
-
-	messageFromWindowCallback("Ej{\"name\":\"wails:launched\",\"data\":[]}");
-    return true;
-}
-
-void initialCallback(std::string message) {
-    printf("MESSAGE=%s\n", message);
-}
-
-void Run(struct Application* app, int argc, char **argv) {
-
-    WNDCLASSEX wc;
-    HINSTANCE hInstance = GetModuleHandle(NULL);
-    ZeroMemory(&wc, sizeof(WNDCLASSEX));
-    wc.cbSize = sizeof(WNDCLASSEX);
-    wc.style = CS_HREDRAW | CS_VREDRAW;
-    wc.hInstance = hInstance;
-    wc.lpszClassName = (LPCWSTR)"ffenestri";
-    wc.lpfnWndProc   = WndProc;
-
-    // TODO: Menu
-//    wc.lpszMenuName = nullptr;
-
-
-    // Process window resizable
-    DWORD windowStyle = WS_OVERLAPPEDWINDOW;
-    if (app->resizable == 0) {
-        windowStyle &= ~WS_MAXIMIZEBOX;
-        windowStyle &= ~WS_THICKFRAME;
-    }
-    if ( app->frame == 0 ) {
-        windowStyle = WS_POPUP;
-    }
-
-    RegisterClassEx(&wc);
-    app->window = CreateWindow((LPCWSTR)"ffenestri", (LPCWSTR)"", windowStyle, CW_USEDEFAULT,
-                                CW_USEDEFAULT, app->width, app->height, NULL, NULL,
-                                hInstance, NULL);
-
-    // Private setTitle as we're on the main thread
-    setTitle(app, app->title);
-
-    // Store application pointer in window handle
-    SetWindowLongPtr(app->window, GWLP_USERDATA, (LONG_PTR)app);
-
-    // Process whether window should show by default
-    int startVisibility = SW_SHOWNORMAL;
-    if ( app->startHidden == 1 ) {
-        startVisibility = SW_HIDE;
-    }
-
-    // TODO: Make configurable
-//    COREWEBVIEW2_COLOR wvColor;
-//    wvColor.A = 255;
-//    std::weak_ptr<ICoreWebView2Controller2> controller2 = app->webviewController->query<ICoreWebView2Controller2>();
-//    controller2->put_DefaultBackgroundColor(wvColor);
-
-    if( app->windowBackgroundIsTranslucent ) {
-        enableTranslucentBackground(app);
-    }
-
-    // private center() as we are on main thread
-    center(app);
-    ShowWindow(app->window, startVisibility);
-    UpdateWindow(app->window);
-    SetFocus(app->window);
-
-    // Add webview2
-    initWebView2(app, 1, initialCallback);
-
-    // Main event loop
-    MSG  msg;
-    BOOL res;
-    while ((res = GetMessage(&msg, NULL, 0, 0)) != -1) {
-      if (msg.hwnd) {
-        TranslateMessage(&msg);
-        DispatchMessage(&msg);
-        continue;
-      }
-      if (msg.message == WM_APP) {
-          dispatchFunction *f = (dispatchFunction*) msg.lParam;
-          (*f)();
-          delete(f);
-      } else if (msg.message == WM_QUIT) {
-        performShutdown(app);
-        return;
-      }
-    }
-}
-
-void DestroyApplication(struct Application* app) {
-    PostQuitMessage(0);
-}
-void SetDebug(struct Application* app, int flag) {
-    debug = flag;
-}
-
-void ExecJS(struct Application* app, const char *script) {
-    ON_MAIN_THREAD(
-        execJS(app, script);
-    );
-}
-
-void hide(struct Application* app) {
-    ShowWindow(app->window, SW_HIDE);
-}
-
-void Hide(struct Application* app) {
-    ON_MAIN_THREAD(
-        hide(app);
-    );
-}
-
-void show(struct Application* app) {
-    ShowWindow(app->window, SW_SHOW);
-}
-
-void Show(struct Application* app) {
-    ON_MAIN_THREAD(
-        show(app);
-    );
-}
-
-void center(struct Application* app) {
-
-    HMONITOR currentMonitor = MonitorFromWindow(app->window, MONITOR_DEFAULTTONEAREST);
-    MONITORINFO info = {0};
-    info.cbSize = sizeof(info);
-    GetMonitorInfoA(currentMonitor, &info);
-    RECT workRect = info.rcWork;
-    LONG screenMiddleW = (workRect.right - workRect.left) / 2;
-    LONG screenMiddleH = (workRect.bottom - workRect.top) / 2;
-    RECT winRect;
-    if (app->frame == 1) {
-        GetWindowRect(app->window, &winRect);
-    } else {
-        GetClientRect(app->window, &winRect);
-    }
-    LONG winWidth = winRect.right - winRect.left;
-    LONG winHeight = winRect.bottom - winRect.top;
-
-    LONG windowX = screenMiddleW - (winWidth / 2);
-    LONG windowY = screenMiddleH - (winHeight / 2);
-
-    SetWindowPos(app->window, HWND_TOP, windowX, windowY, winWidth, winHeight, SWP_NOSIZE);
-}
-
-void Center(struct Application* app) {
-    ON_MAIN_THREAD(
-        center(app);
-    );
-}
-
-UINT getWindowPlacement(struct Application* app) {
-    WINDOWPLACEMENT lpwndpl;
-    lpwndpl.length = sizeof(WINDOWPLACEMENT);
-    BOOL result = GetWindowPlacement(app->window, &lpwndpl);
-    if( result == 0 ) {
-        // TODO: Work out what this call failing means
-        return -1;
-    }
-    return lpwndpl.showCmd;
-}
-
-int isMaximised(struct Application* app) {
-    return getWindowPlacement(app) == SW_SHOWMAXIMIZED;
-}
-
-void maximise(struct Application* app) {
-    ShowWindow(app->window, SW_MAXIMIZE);
-}
-
-void Maximise(struct Application* app) {
-    ON_MAIN_THREAD(
-        maximise(app);
-    );
-}
-
-void unmaximise(struct Application* app) {
-    ShowWindow(app->window, SW_RESTORE);
-}
-
-void Unmaximise(struct Application* app) {
-    ON_MAIN_THREAD(
-        unmaximise(app);
-    );
-}
-
-
-void ToggleMaximise(struct Application* app) {
-    if(isMaximised(app)) {
-        return Unmaximise(app);
-    }
-    return Maximise(app);
-}
-
-int isMinimised(struct Application* app) {
-    return getWindowPlacement(app) == SW_SHOWMINIMIZED;
-}
-
-void minimise(struct Application* app) {
-    ShowWindow(app->window, SW_MINIMIZE);
-}
-
-void Minimise(struct Application* app) {
-    ON_MAIN_THREAD(
-        minimise(app);
-    );
-}
-
-void unminimise(struct Application* app) {
-    ShowWindow(app->window, SW_RESTORE);
-}
-
-void Unminimise(struct Application* app) {
-    ON_MAIN_THREAD(
-        unminimise(app);
-    );
-}
-
-void ToggleMinimise(struct Application* app) {
-    if(isMinimised(app)) {
-        return Unminimise(app);
-    }
-    return Minimise(app);
-}
-
-void SetColour(struct Application* app, int red, int green, int blue, int alpha) {
-// TBD
-}
-
-void SetSize(struct Application* app, int width, int height) {
-    // TBD
-}
-
-void setPosition(struct Application* app, int x, int y) {
-    // TBD
-}
-
-void SetPosition(struct Application* app, int x, int y) {
-//    ON_MAIN_THREAD(
-//        setPosition(app, x, y);
-//    );
-}
-
-void Quit(struct Application* app) {
-    DestroyWindow(app->window);
-}
-
-
-// Credit: https://stackoverflow.com/a/6693107
-void setTitle(struct Application* app, const char *title) {
-    LPCTSTR text = cstrToLPWSTR(title);
-    SetWindowText(app->window, text);
-    delete[] text;
-}
-
-void SetTitle(struct Application* app, const char *title) {
-    ON_MAIN_THREAD(
-        setTitle(app, title);
-    );
-}
-
-void Fullscreen(struct Application* app) {
-}
-
-void UnFullscreen(struct Application* app) {
-}
-
-void ToggleFullscreen(struct Application* app) {
-}
-
-void DisableFrame(struct Application* app) {
-    app->frame = 0;
-}
-
-// WebviewIsTransparent will make the webview transparent
-// revealing the window underneath
-void WebviewIsTransparent(struct Application *app) {
-	app->webviewIsTranparent = true;
-}
-
-void WindowBackgroundIsTranslucent(struct Application *app) {
-	app->windowBackgroundIsTranslucent = true;
-}
-
-
-void OpenDialog(struct Application* app, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int allowFiles, int allowDirs, int allowMultiple, int showHiddenFiles, int canCreateDirectories, int resolvesAliases, int treatPackagesAsDirectories) {
-}
-void SaveDialog(struct Application* app, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int showHiddenFiles, int canCreateDirectories, int treatPackagesAsDirectories) {
-}
-void MessageDialog(struct Application* app, char *callbackID, char *type, char *title, char *message, char *icon, char *button1, char *button2, char *button3, char *button4, char *defaultButton, char *cancelButton) {
-}
-void DarkModeEnabled(struct Application* app, char *callbackID) {
-}
-void SetApplicationMenu(struct Application* app, const char *applicationMenuJSON) {
-}
-void AddTrayMenu(struct Application* app, const char *menuTrayJSON) {
-}
-void SetTrayMenu(struct Application* app, const char *menuTrayJSON) {
-}
-void DeleteTrayMenuByID(struct Application* app, const char *id) {
-}
-void UpdateTrayMenuLabel(struct Application* app, const char* JSON) {
-}
-void AddContextMenu(struct Application* app, char *contextMenuJSON) {
-}
-void UpdateContextMenu(struct Application* app, char *contextMenuJSON) {
-}

v2/internal/ffenestri/ffenestri_windows.go

@@ -1,63 +0,0 @@
-package ffenestri
-
-import "C"
-
-/*
-
-#cgo windows CXXFLAGS: -std=c++11
-#cgo windows,amd64 LDFLAGS: -L./windows/x64 -lwebview -lWebView2Loader -lgdi32 -lole32 -lShlwapi -luser32 -loleaut32
-
-#include "ffenestri.h"
-
-*/
-import "C"
-
-func (a *Application) processPlatformSettings() error {
-
-	config := a.config.Windows
-
-	// Check if the webview should be transparent
-	if config.WebviewIsTransparent {
-		C.WebviewIsTransparent(a.app)
-	}
-
-	if config.WindowBackgroundIsTranslucent {
-		C.WindowBackgroundIsTranslucent(a.app)
-	}
-
-	//// Process menu
-	////applicationMenu := options.GetApplicationMenu(a.config)
-	//applicationMenu := a.menuManager.GetApplicationMenuJSON()
-	//if applicationMenu != "" {
-	//	C.SetApplicationMenu(a.app, a.string2CString(applicationMenu))
-	//}
-	//
-	//// Process tray
-	//trays, err := a.menuManager.GetTrayMenus()
-	//if err != nil {
-	//	return err
-	//}
-	//if trays != nil {
-	//	for _, tray := range trays {
-	//		C.AddTrayMenu(a.app, a.string2CString(tray))
-	//	}
-	//}
-	//
-	//// Process context menus
-	//contextMenus, err := a.menuManager.GetContextMenus()
-	//if err != nil {
-	//	return err
-	//}
-	//if contextMenus != nil {
-	//	for _, contextMenu := range contextMenus {
-	//		C.AddContextMenu(a.app, a.string2CString(contextMenu))
-	//	}
-	//}
-	//
-	//// Process URL Handlers
-	//if a.config.Mac.URLHandlers != nil {
-	//	C.HasURLHandlers(a.app)
-	//}
-
-	return nil
-}

v2/internal/ffenestri/ffenestri_windows.h

@@ -1,75 +0,0 @@
-
-#ifndef _FFENESTRI_WINDOWS_H
-#define _FFENESTRI_WINDOWS_H
-
-#define WIN32_LEAN_AND_MEAN
-#define UNICODE 1
-
-#include "ffenestri.h"
-#include <windows.h>
-#include <wingdi.h>
-#include <functional>
-#include <codecvt>
-#include "windows/WebView2.h"
-
-#include "assets.h"
-
-// TODO:
-//#include "userdialogicons.h"
-
-
-struct Application{
-    // Window specific
-    HWND window;
-    ICoreWebView2 *webview;
-    ICoreWebView2Controller* webviewController;
-
-    // Application
-    const char *title;
-    int width;
-    int height;
-    int resizable;
-    int devtools;
-    int fullscreen;
-    int startHidden;
-    int logLevel;
-    int hideWindowOnClose;
-    int minSizeSet;
-    LONG minWidth;
-    LONG minHeight;
-    int maxSizeSet;
-    LONG maxWidth;
-    LONG maxHeight;
-    int frame;
-    char *startupURL;
-    bool webviewIsTranparent;
-    bool windowBackgroundIsTranslucent;
-    COREWEBVIEW2_COLOR backgroundColour;
-
-    // placeholders
-    char* bindings;
-    char* initialCode;
-};
-
-#define ON_MAIN_THREAD(code) dispatch( [=]{ code; } )
-
-typedef std::function<void()> dispatchFunction;
-typedef std::function<void(const std::string)> messageCallback;
-typedef std::function<void(ICoreWebView2Controller *)> comHandlerCallback;
-
-void center(struct Application*);
-void setTitle(struct Application* app, const char *title);
-char* LPWSTRToCstr(LPWSTR input);
-
-// called when the DOM is ready
-void loadAssets(struct Application* app);
-
-// called when the application assets have been loaded into the DOM
-void completed(struct Application* app);
-
-// Callback
-extern "C" {
-    void messageFromWindowCallback(const char *);
-}
-
-#endif

v2/internal/ffenestri/json.c

@@ -1,5 +1,3 @@
-// +build !windows
-
 /*
   Copyright (C) 2011 Joseph A. Adams (joeyadams3.14159@gmail.com)
   All rights reserved.

v2/internal/ffenestri/menu_darwin.c

@@ -90,7 +90,7 @@ void DeleteMenu(Menu *menu) {
 
     // Free nsmenu if we have it
     if ( menu->menu != NULL ) {
-        msg_reg(menu->menu, s("release"));
+        msg(menu->menu, s("release"));
     }
 
     free(menu);
@@ -120,17 +120,17 @@ const char* createMenuClickedMessage(const char *menuItemID, const char *data, e
 
 // Callback for text menu items
 void menuItemCallback(id self, SEL cmd, id sender) {
-    MenuItemCallbackData *callbackData = (MenuItemCallbackData *)msg_reg(msg_reg(sender, s("representedObject")), s("pointerValue"));
+    MenuItemCallbackData *callbackData = (MenuItemCallbackData *)msg(msg(sender, s("representedObject")), s("pointerValue"));
     const char *message;
 
     // Update checkbox / radio item
     if( callbackData->menuItemType == Checkbox) {
         // Toggle state
-        bool state = msg_reg(callbackData->menuItem, s("state"));
-        msg_int(callbackData->menuItem, s("setState:"), (state? NSControlStateValueOff : NSControlStateValueOn));
+        bool state = msg(callbackData->menuItem, s("state"));
+        msg(callbackData->menuItem, s("setState:"), (state? NSControlStateValueOff : NSControlStateValueOn));
     } else if( callbackData->menuItemType == Radio ) {
         // Check the menu items' current state
-        bool selected = (bool)msg_reg(callbackData->menuItem, s("state"));
+        bool selected = msg(callbackData->menuItem, s("state"));
 
         // If it's already selected, exit early
         if (selected) return;
@@ -142,13 +142,13 @@ void menuItemCallback(id self, SEL cmd, id sender) {
         id thisMember = members[0];
         int count = 0;
         while(thisMember != NULL) {
-            msg_int(thisMember, s("setState:"), NSControlStateValueOff);
+            msg(thisMember, s("setState:"), NSControlStateValueOff);
             count = count + 1;
             thisMember = members[count];
         }
 
         // check the selected menu item
-        msg_int(callbackData->menuItem, s("setState:"), NSControlStateValueOn);
+        msg(callbackData->menuItem, s("setState:"), NSControlStateValueOn);
     }
 
     const char *menuID = callbackData->menuID;
@@ -189,9 +189,6 @@ id processAcceleratorKey(const char *key) {
     if( STREQ(key, "return") ) {
         return strunicode(0x000d);
     }
-    if( STREQ(key, "enter") ) {
-        return strunicode(0x000d);
-    }
     if( STREQ(key, "escape") ) {
         return strunicode(0x001b);
     }
@@ -348,61 +345,61 @@ id processAcceleratorKey(const char *key) {
 
 
 void addSeparator(id menu) {
-    id item = msg_reg(c("NSMenuItem"), s("separatorItem"));
-    msg_id(menu, s("addItem:"), item);
+    id item = msg(c("NSMenuItem"), s("separatorItem"));
+    msg(menu, s("addItem:"), item);
 }
 
 id createMenuItemNoAutorelease( id title, const char *action, const char *key) {
     id item = ALLOC("NSMenuItem");
-    ((id(*)(id, SEL, id, SEL, id))objc_msgSend)(item, s("initWithTitle:action:keyEquivalent:"), title, s(action), str(key));
+    msg(item, s("initWithTitle:action:keyEquivalent:"), title, s(action), str(key));
     return item;
 }
 
 id createMenuItem(id title, const char *action, const char *key) {
     id item = ALLOC("NSMenuItem");
-    ((id(*)(id, SEL, id, SEL, id))objc_msgSend)(item, s("initWithTitle:action:keyEquivalent:"), title, s(action), str(key));
-    msg_reg(item, s("autorelease"));
+    msg(item, s("initWithTitle:action:keyEquivalent:"), title, s(action), str(key));
+    msg(item, s("autorelease"));
     return item;
 }
 
 id addMenuItem(id menu, const char *title, const char *action, const char *key, bool disabled) {
     id item = createMenuItem(str(title), action, key);
-    msg_bool(item, s("setEnabled:"), !disabled);
-    msg_id(menu, s("addItem:"), item);
+    msg(item, s("setEnabled:"), !disabled);
+    msg(menu, s("addItem:"), item);
     return item;
 }
 
 id createMenu(id title) {
     id menu = ALLOC("NSMenu");
-    msg_id(menu, s("initWithTitle:"), title);
-    msg_bool(menu, s("setAutoenablesItems:"), NO);
+    msg(menu, s("initWithTitle:"), title);
+    msg(menu, s("setAutoenablesItems:"), NO);
 //  msg(menu, s("autorelease"));
     return menu;
 }
 
 void createDefaultAppMenu(id parentMenu) {
 // App Menu
-    id appName = msg_reg(msg_reg(c("NSProcessInfo"), s("processInfo")), s("processName"));
+    id appName = msg(msg(c("NSProcessInfo"), s("processInfo")), s("processName"));
     id appMenuItem = createMenuItemNoAutorelease(appName, NULL, "");
     id appMenu = createMenu(appName);
 
-    msg_id(appMenuItem, s("setSubmenu:"), appMenu);
-    msg_id(parentMenu, s("addItem:"), appMenuItem);
+    msg(appMenuItem, s("setSubmenu:"), appMenu);
+    msg(parentMenu, s("addItem:"), appMenuItem);
 
-    id title = msg_id(str("Hide "), s("stringByAppendingString:"), appName);
+    id title = msg(str("Hide "), s("stringByAppendingString:"), appName);
     id item = createMenuItem(title, "hide:", "h");
-    msg_id(appMenu, s("addItem:"), item);
+    msg(appMenu, s("addItem:"), item);
 
     id hideOthers = addMenuItem(appMenu, "Hide Others", "hideOtherApplications:", "h", FALSE);
-    msg_int(hideOthers, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagCommand));
+    msg(hideOthers, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagCommand));
 
     addMenuItem(appMenu, "Show All", "unhideAllApplications:", "", FALSE);
 
     addSeparator(appMenu);
 
-    title = msg_id(str("Quit "), s("stringByAppendingString:"), appName);
+    title = msg(str("Quit "), s("stringByAppendingString:"), appName);
     item = createMenuItem(title, "terminate:", "q");
-    msg_id(appMenu, s("addItem:"), item);
+    msg(appMenu, s("addItem:"), item);
 }
 
 void createDefaultEditMenu(id parentMenu) {
@@ -410,8 +407,8 @@ void createDefaultEditMenu(id parentMenu) {
     id editMenuItem = createMenuItemNoAutorelease(str("Edit"), NULL, "");
     id editMenu = createMenu(str("Edit"));
 
-    msg_id(editMenuItem, s("setSubmenu:"), editMenu);
-    msg_id(parentMenu, s("addItem:"), editMenuItem);
+    msg(editMenuItem, s("setSubmenu:"), editMenu);
+    msg(parentMenu, s("addItem:"), editMenuItem);
 
     addMenuItem(editMenu, "Undo", "undo:", "z", FALSE);
     addMenuItem(editMenu, "Redo", "redo:", "y", FALSE);
@@ -439,7 +436,7 @@ void processMenuRole(Menu *menu, id parentMenu, JsonNode *item) {
     }
     if ( STREQ(roleName, "hideothers")) {
         id hideOthers = addMenuItem(parentMenu, "Hide Others", "hideOtherApplications:", "h", FALSE);
-        msg_int(hideOthers, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagCommand));
+        msg(hideOthers, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagCommand));
         return;
     }
     if ( STREQ(roleName, "unhide")) {
@@ -476,7 +473,7 @@ void processMenuRole(Menu *menu, id parentMenu, JsonNode *item) {
     }
     if( STREQ(roleName, "pasteandmatchstyle")) {
         id pasteandmatchstyle = addMenuItem(parentMenu, "Paste and Match Style", "pasteandmatchstyle:", "v", FALSE);
-        msg_int(pasteandmatchstyle, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagShift | NSEventModifierFlagCommand));
+        msg(pasteandmatchstyle, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagShift | NSEventModifierFlagCommand));
     }
     if ( STREQ(roleName, "selectall")) {
         addMenuItem(parentMenu, "Select All", "selectAll:", "a", FALSE);
@@ -543,18 +540,18 @@ id processRadioMenuItem(Menu *menu, id parentmenu, const char *title, const char
     // Create a MenuItemCallbackData
     MenuItemCallbackData *callback = CreateMenuItemCallbackData(menu, item, menuid, Radio);
 
-    id wrappedId = msg_id(c("NSValue"), s("valueWithPointer:"), (id)callback);
-    msg_id(item, s("setRepresentedObject:"), wrappedId);
+    id wrappedId = msg(c("NSValue"), s("valueWithPointer:"), callback);
+    msg(item, s("setRepresentedObject:"), wrappedId);
 
     id key = processAcceleratorKey(acceleratorkey);
 
-    ((id(*)(id, SEL, id, SEL, id))objc_msgSend)(item, s("initWithTitle:action:keyEquivalent:"), str(title), s("menuItemCallback:"), key);
+    msg(item, s("initWithTitle:action:keyEquivalent:"), str(title), s("menuItemCallback:"), key);
 
-    msg_bool(item, s("setEnabled:"), !disabled);
-    msg_reg(item, s("autorelease"));
-    msg_int(item, s("setState:"), (checked ? NSControlStateValueOn : NSControlStateValueOff));
+    msg(item, s("setEnabled:"), !disabled);
+    msg(item, s("autorelease"));
+    msg(item, s("setState:"), (checked ? NSControlStateValueOn : NSControlStateValueOff));
 
-    msg_id(parentmenu, s("addItem:"), item);
+    msg(parentmenu, s("addItem:"), item);
     return item;
 
 }
@@ -569,136 +566,46 @@ id processCheckboxMenuItem(Menu *menu, id parentmenu, const char *title, const c
     // Create a MenuItemCallbackData
     MenuItemCallbackData *callback = CreateMenuItemCallbackData(menu, item, menuid, Checkbox);
 
-    id wrappedId = msg_id(c("NSValue"), s("valueWithPointer:"), (id)callback);
-    msg_id(item, s("setRepresentedObject:"), wrappedId);
-    ((id(*)(id, SEL, id, SEL, id))objc_msgSend)(item, s("initWithTitle:action:keyEquivalent:"), str(title), s("menuItemCallback:"), str(key));
-    msg_bool(item, s("setEnabled:"), !disabled);
-    msg_reg(item, s("autorelease"));
-    msg_int(item, s("setState:"), (checked ? NSControlStateValueOn : NSControlStateValueOff));
-    msg_id(parentmenu, s("addItem:"), item);
+    id wrappedId = msg(c("NSValue"), s("valueWithPointer:"), callback);
+    msg(item, s("setRepresentedObject:"), wrappedId);
+    msg(item, s("initWithTitle:action:keyEquivalent:"), str(title), s("menuItemCallback:"), str(key));
+    msg(item, s("setEnabled:"), !disabled);
+    msg(item, s("autorelease"));
+    msg(item, s("setState:"), (checked ? NSControlStateValueOn : NSControlStateValueOff));
+    msg(parentmenu, s("addItem:"), item);
     return item;
 }
 
-// getColour returns the colour from a styledLabel based on the key
-const char* getColour(JsonNode *styledLabelEntry, const char* key) {
-    JsonNode* colEntry = getJSONObject(styledLabelEntry, key);
-    if( colEntry == NULL ) {
-        return NULL;
-    }
-    return getJSONString(colEntry, "hex");
-}
-
-id createAttributedStringFromStyledLabel(JsonNode *styledLabel, const char* fontName, int fontSize) {
-
-    // Create result
-    id attributedString = ALLOC_INIT("NSMutableAttributedString");
-    msg_reg(attributedString, s("autorelease"));
-
-    // Create new Dictionary
-    id dictionary = ALLOC_INIT("NSMutableDictionary");
-    msg_reg(dictionary, s("autorelease"));
-
-    // Use default font
-    CGFloat fontSizeFloat = (CGFloat)fontSize;
-    id font = ((id(*)(id, SEL, CGFloat))objc_msgSend)(c("NSFont"), s("menuBarFontOfSize:"), fontSizeFloat);
-
-    // Check user supplied font
-    if( STR_HAS_CHARS(fontName) ) {
-        id fontNameAsNSString = str(fontName);
-        id userFont = ((id(*)(id, SEL, id, CGFloat))objc_msgSend)(c("NSFont"), s("fontWithName:size:"), fontNameAsNSString, fontSizeFloat);
-        if( userFont != NULL ) {
-            font = userFont;
-        }
-    }
-
-    id fan = lookupStringConstant(str("NSFontAttributeName"));
-    id NSForegroundColorAttributeName = lookupStringConstant(str("NSForegroundColorAttributeName"));
-    id NSBackgroundColorAttributeName = lookupStringConstant(str("NSBackgroundColorAttributeName"));
-
-    // Loop over styled text creating NSAttributedText and appending to result
-    JsonNode *styledLabelEntry;
-    json_foreach(styledLabelEntry, styledLabel) {
-
-        // Clear dictionary
-        msg_reg(dictionary, s("removeAllObjects"));
-
-        // Add font to dictionary
-        msg_id_id(dictionary, s("setObject:forKey:"), font, fan);
-
-        // Get Text
-        const char* thisLabel = mustJSONString(styledLabelEntry, "Label");
-
-        // Get foreground colour
-        const char *hexColour = getColour(styledLabelEntry, "FgCol");
-        if( hexColour != NULL) {
-            unsigned short r, g, b, a;
-
-            // white by default
-            r = g = b = a = 255;
-            int count = sscanf(hexColour, "#%02hx%02hx%02hx%02hx", &r, &g, &b, &a);
-            if (count > 0) {
-                id colour = ((id(*)(id, SEL, CGFloat, CGFloat, CGFloat, CGFloat))objc_msgSend)(c("NSColor"), s("colorWithCalibratedRed:green:blue:alpha:"),
-                                    (CGFloat)r / (CGFloat)255.0,
-                                    (CGFloat)g / (CGFloat)255.0,
-                                    (CGFloat)b / (CGFloat)255.0,
-                                    (CGFloat)a / (CGFloat)255.0);
-                msg_id_id(dictionary, s("setObject:forKey:"), colour, NSForegroundColorAttributeName);
-            }
-        }
-
-        // Get background colour
-        hexColour = getColour(styledLabelEntry, "BgCol");
-        if( hexColour != NULL) {
-            unsigned short r, g, b, a;
-
-            // white by default
-            r = g = b = a = 255;
-            int count = sscanf(hexColour, "#%02hx%02hx%02hx%02hx", &r, &g, &b, &a);
-            if (count > 0) {
-                id colour = ((id(*)(id, SEL, CGFloat, CGFloat, CGFloat, CGFloat))objc_msgSend)(c("NSColor"), s("colorWithCalibratedRed:green:blue:alpha:"),
-                                    (CGFloat)r / (CGFloat)255.0,
-                                    (CGFloat)g / (CGFloat)255.0,
-                                    (CGFloat)b / (CGFloat)255.0,
-                                    (CGFloat)a / (CGFloat)255.0);
-                msg_id_id(dictionary, s("setObject:forKey:"), colour, NSForegroundColorAttributeName);
-            }
-        }
-
-        // Create AttributedText
-        id thisString = ALLOC("NSMutableAttributedString");
-        msg_reg(thisString, s("autorelease"));
-        msg_id_id(thisString, s("initWithString:attributes:"), str(thisLabel), dictionary);
-
-        // Append text to result
-        msg_id(attributedString, s("appendAttributedString:"), thisString);
-    }
-
-    return attributedString;
-
-}
-
-
 id createAttributedString(const char* title, const char* fontName, int fontSize, const char* RGBA) {
 
-    // Create new Dictionary
+    // Process Menu Item attributes
     id dictionary = ALLOC_INIT("NSMutableDictionary");
+
+    // Process font
+    id font;
     CGFloat fontSizeFloat = (CGFloat)fontSize;
 
-    // Use default font
-    id font = ((id(*)(id, SEL, CGFloat))objc_msgSend)(c("NSFont"), s("menuBarFontOfSize:"), fontSizeFloat);
-
-    // Check user supplied font
-    if( STR_HAS_CHARS(fontName) ) {
-        id fontNameAsNSString = str(fontName);
-        id userFont = ((id(*)(id, SEL, id, CGFloat))objc_msgSend)(c("NSFont"), s("fontWithName:size:"), fontNameAsNSString, fontSizeFloat);
-        if( userFont != NULL ) {
-            font = userFont;
+    // Check if valid
+    id fontNameAsNSString = str(fontName);
+    id fontsOnSystem = msg(msg(c("NSFontManager"), s("sharedFontManager")), s("availableFonts"));
+    bool valid = msg(fontsOnSystem, s("containsObject:"), fontNameAsNSString);
+    if( valid ) {
+        font = msg(c("NSFont"), s("fontWithName:size:"), fontNameAsNSString, fontSizeFloat);
+    } else {
+        bool supportsMonospacedDigitSystemFont = (bool) msg(c("NSFont"), s("respondsToSelector:"), s("monospacedDigitSystemFontOfSize:weight:"));
+        if( supportsMonospacedDigitSystemFont ) {
+            font = msg(c("NSFont"), s("monospacedDigitSystemFontOfSize:weight:"), fontSizeFloat, NSFontWeightRegular);
+        } else {
+            font = msg(c("NSFont"), s("menuFontOfSize:"), fontSizeFloat);
         }
     }
 
     // Add font to dictionary
-    id fan = lookupStringConstant(str("NSFontAttributeName"));
-    msg_id_id(dictionary, s("setObject:forKey:"), font, fan);
+    msg(dictionary, s("setObject:forKey:"), font, lookupStringConstant(str("NSFontAttributeName")));
+
+    // Add offset to dictionary
+    id offset = msg(c("NSNumber"), s("numberWithFloat:"), 0.0);
+    msg(dictionary, s("setObject:forKey:"), offset, lookupStringConstant(str("NSBaselineOffsetAttributeName")));
 
     // RGBA
     if( RGBA != NULL && strlen(RGBA) > 0) {
@@ -708,75 +615,74 @@ id createAttributedString(const char* title, const char* fontName, int fontSize,
         r = g = b = a = 255;
         int count = sscanf(RGBA, "#%02hx%02hx%02hx%02hx", &r, &g, &b, &a);
         if (count > 0) {
-			id colour = ((id(*)(id, SEL, CGFloat, CGFloat, CGFloat, CGFloat))objc_msgSend)(c("NSColor"), s("colorWithCalibratedRed:green:blue:alpha:"),
-								(CGFloat)r / (CGFloat)255.0,
-								(CGFloat)g / (CGFloat)255.0,
-								(CGFloat)b / (CGFloat)255.0,
-								(CGFloat)a / (CGFloat)255.0);
-			id NSForegroundColorAttributeName = lookupStringConstant(str("NSForegroundColorAttributeName"));
-            msg_id_id(dictionary, s("setObject:forKey:"), colour, NSForegroundColorAttributeName);
+			id colour = msg(c("NSColor"), s("colorWithCalibratedRed:green:blue:alpha:"),
+								(float)r / 255.0,
+								(float)g / 255.0,
+								(float)b / 255.0,
+								(float)a / 255.0);
+            msg(dictionary, s("setObject:forKey:"), colour, lookupStringConstant(str("NSForegroundColorAttributeName")));
+            msg(colour, s("release"));
         }
     }
 
     id attributedString = ALLOC("NSMutableAttributedString");
-    msg_id_id(attributedString, s("initWithString:attributes:"), str(title), dictionary);
-    msg_reg(attributedString, s("autorelease"));
-    msg_reg(dictionary, s("autorelease"));
+    msg(attributedString, s("initWithString:attributes:"), str(title), dictionary);
+    msg(attributedString, s("autorelease"));
+    msg(dictionary, s("release"));
     return attributedString;
 }
 
-id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip, const char* image, const char* fontName, int fontSize, const char* RGBA, bool templateImage, bool alternate, JsonNode* styledLabel) {
+id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip, const char* image, const char* fontName, int fontSize, const char* RGBA, bool templateImage, bool alternate) {
     id item = ALLOC("NSMenuItem");
 
     // Create a MenuItemCallbackData
     MenuItemCallbackData *callback = CreateMenuItemCallbackData(menu, item, menuid, Text);
 
-    id wrappedId = msg_id(c("NSValue"), s("valueWithPointer:"), (id)callback);
-    msg_id(item, s("setRepresentedObject:"), wrappedId);
+    id wrappedId = msg(c("NSValue"), s("valueWithPointer:"), callback);
+    msg(item, s("setRepresentedObject:"), wrappedId);
 
     if( !alternate ) {
         id key = processAcceleratorKey(acceleratorkey);
-        ((id(*)(id, SEL, id, SEL, id))objc_msgSend)(item, s("initWithTitle:action:keyEquivalent:"), str(title),
+        msg(item, s("initWithTitle:action:keyEquivalent:"), str(title),
             s("menuItemCallback:"), key);
     } else {
-        ((id(*)(id, SEL, id, SEL, id))objc_msgSend)(item, s("initWithTitle:action:keyEquivalent:"), str(title), s("menuItemCallback:"), str(""));
+        msg(item, s("initWithTitle:action:keyEquivalent:"), str(title), s("menuItemCallback:"), str(""));
     }
 
     if( tooltip != NULL ) {
-        msg_id(item, s("setToolTip:"), str(tooltip));
+        msg(item, s("setToolTip:"), str(tooltip));
     }
 
     // Process image
     if( image != NULL && strlen(image) > 0) {
-        id nsimage = createImageFromBase64Data(image, templateImage);
-        msg_id(item, s("setImage:"), nsimage);
+        id data = ALLOC("NSData");
+        id imageData = msg(data, s("initWithBase64EncodedString:options:"), str(image), 0);
+        id nsimage = ALLOC("NSImage");
+        msg(nsimage, s("initWithData:"), imageData);
+        if( templateImage ) {
+            msg(nsimage, s("setTemplate:"), YES);
+        }
+        msg(item, s("setImage:"), nsimage);
     }
 
-    id attributedString = NULL;
-    if( styledLabel != NULL) {
-        attributedString = createAttributedStringFromStyledLabel(styledLabel, fontName, fontSize);
-    } else {
-        attributedString = createAttributedString(title, fontName, fontSize, RGBA);
-    }
-    msg_id(item, s("setAttributedTitle:"), attributedString);
+    id attributedString = createAttributedString(title, fontName, fontSize, RGBA);
+    msg(item, s("setAttributedTitle:"), attributedString);
 
-//msg_id(item, s("setTitle:"), str(title));
-
-    msg_bool(item, s("setEnabled:"), !disabled);
-    msg_reg(item, s("autorelease"));
+    msg(item, s("setEnabled:"), !disabled);
+    msg(item, s("autorelease"));
 
     // Process modifiers
     if( modifiers != NULL && !alternate) {
         unsigned long modifierFlags = parseModifiers(modifiers);
-        ((id(*)(id, SEL, unsigned long))objc_msgSend)(item, s("setKeyEquivalentModifierMask:"), modifierFlags);
+        msg(item, s("setKeyEquivalentModifierMask:"), modifierFlags);
     }
 
     // alternate
     if( alternate ) {
-        msg_bool(item, s("setAlternate:"), true);
-        msg_int(item, s("setKeyEquivalentModifierMask:"), NSEventModifierFlagOption);
+        msg(item, s("setAlternate:"), true);
+        msg(item, s("setKeyEquivalentModifierMask:"), NSEventModifierFlagOption);
     }
-    msg_id(parentMenu, s("addItem:"), item);
+    msg(parentMenu, s("addItem:"), item);
 
     return item;
 }
@@ -797,6 +703,38 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
         return;
     }
 
+    // Check if this is a submenu
+    JsonNode *submenu = json_find_member(item, "SubMenu");
+    if( submenu != NULL ) {
+        // Get the label
+        JsonNode *menuNameNode = json_find_member(item, "Label");
+        const char *name = "";
+        if ( menuNameNode != NULL) {
+            name = menuNameNode->string_;
+        }
+
+        id thisMenuItem = createMenuItemNoAutorelease(str(name), NULL, "");
+        id thisMenu = createMenu(str(name));
+
+        msg(thisMenuItem, s("setSubmenu:"), thisMenu);
+        msg(parentMenu, s("addItem:"), thisMenuItem);
+
+        JsonNode *submenuItems = json_find_member(submenu, "Items");
+        // If we have no items, just return
+        if ( submenuItems == NULL ) {
+            return;
+        }
+
+        // Loop over submenu items
+        JsonNode *item;
+        json_foreach(item, submenuItems) {
+            // Get item label
+            processMenuItem(menu, thisMenu, item);
+        }
+
+        return;
+    }
+
     // This is a user menu. Get the common data
     // Get the label
     const char *label = getJSONString(item, "Label");
@@ -804,8 +742,6 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
         label = "(empty)";
     }
 
-    // Check for a styled label
-    JsonNode *styledLabel = getJSONObject(item, "StyledLabel");
 
     // Is this an alternate menu item?
     bool alternate = false;
@@ -864,36 +800,9 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
     // Get the Type
     JsonNode *type = json_find_member(item, "Type");
     if( type != NULL ) {
-        if( STREQ(type->string_, "Text") || STREQ(type->string_, "Submenu")) {
-            id thisMenuItem = processTextMenuItem(menu, parentMenu, label, menuid, disabled, acceleratorkey, modifiers, tooltip, image, fontName, fontSize, RGBA, templateImage, alternate, styledLabel);
 
-            // Check if this node has a submenu
-            JsonNode *submenu = json_find_member(item, "SubMenu");
-            if( submenu != NULL ) {
-                // Get the label
-                JsonNode *menuNameNode = json_find_member(item, "Label");
-                const char *name = "";
-                if ( menuNameNode != NULL) {
-                    name = menuNameNode->string_;
-                }
-
-                id thisMenu = createMenu(str(name));
-
-                msg_id(thisMenuItem, s("setSubmenu:"), thisMenu);
-
-                JsonNode *submenuItems = json_find_member(submenu, "Items");
-                // If we have no items, just return
-                if ( submenuItems == NULL ) {
-                    return;
-                }
-
-                // Loop over submenu items
-                JsonNode *item;
-                json_foreach(item, submenuItems) {
-                    // Get item label
-                    processMenuItem(menu, thisMenu, item);
-                }
-            }
+        if( STREQ(type->string_, "Text")) {
+            processTextMenuItem(menu, parentMenu, label, menuid, disabled, acceleratorkey, modifiers, tooltip, image, fontName, fontSize, RGBA, templateImage, alternate);
         }
         else if ( STREQ(type->string_, "Separator")) {
             addSeparator(parentMenu);
@@ -912,6 +821,7 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
 
             processRadioMenuItem(menu, parentMenu, label, menuid, disabled, checked, "");
         }
+
     }
 
     if ( modifiers != NULL ) {

v2/internal/ffenestri/menu_darwin.h

@@ -105,13 +105,12 @@ id processRadioMenuItem(Menu *menu, id parentmenu, const char *title, const char
 
 id processCheckboxMenuItem(Menu *menu, id parentmenu, const char *title, const char *menuid, bool disabled, bool checked, const char *key);
 
-id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip, const char* image, const char* fontName, int fontSize, const char* RGBA, bool templateImage, bool alternate, JsonNode* styledLabel);
+id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip, const char* image, const char* fontName, int fontSize, const char* RGBA, bool templateImage, bool alternate);
 void processMenuItem(Menu *menu, id parentMenu, JsonNode *item);
 void processMenuData(Menu *menu, JsonNode *menuData);
 
 void processRadioGroupJSON(Menu *menu, JsonNode *radioGroup);
 id GetMenu(Menu *menu);
 id createAttributedString(const char* title, const char* fontName, int fontSize, const char* RGBA);
-id createAttributedStringFromStyledLabel(JsonNode *styledLabel, const char* fontName, int fontSize);
 
 #endif //ASSETS_C_MENU_DARWIN_H

v2/internal/ffenestri/traymenu_darwin.c

@@ -42,8 +42,6 @@ TrayMenu* NewTrayMenu(const char* menuJSON) {
     result->disabled = false;
     getJSONBool(processedJSON, "Disabled", &result->disabled);
 
-    result->styledLabel = getJSONObject(processedJSON, "StyledLabel");
-
     // Create the menu
     JsonNode* processedMenu = mustJSONObject(processedJSON, "ProcessedMenu");
     result->menu = NewMenu(processedMenu);
@@ -65,28 +63,23 @@ void DumpTrayMenu(TrayMenu* trayMenu) {
 }
 
 
-void UpdateTrayLabel(TrayMenu *trayMenu, const char *label, const char *fontName, int fontSize, const char *RGBA, const char *tooltip, bool disabled, JsonNode *styledLabel) {
+void UpdateTrayLabel(TrayMenu *trayMenu, const char *label, const char *fontName, int fontSize, const char *RGBA, const char *tooltip, bool disabled) {
 
     // Exit early if NULL
     if( trayMenu->label == NULL ) {
         return;
     }
     // Update button label
-    id statusBarButton = msg_reg(trayMenu->statusbaritem, s("button"));
-    id attributedString = NULL;
-    if( styledLabel != NULL) {
-        attributedString = createAttributedStringFromStyledLabel(styledLabel, fontName, fontSize);
-    } else {
-        attributedString = createAttributedString(label, fontName, fontSize, RGBA);
-    }
+    id statusBarButton = msg(trayMenu->statusbaritem, s("button"));
+    id attributedString = createAttributedString(label, fontName, fontSize, RGBA);
 
     if( tooltip != NULL ) {
-        msg_id(statusBarButton, s("setToolTip:"), str(tooltip));
+        msg(statusBarButton, s("setToolTip:"), str(tooltip));
     }
 
-    msg_bool(statusBarButton, s("setEnabled:"), !disabled);
+    msg(statusBarButton, s("setEnabled:"), !disabled);
 
-    msg_id(statusBarButton, s("setAttributedTitle:"), attributedString);
+    msg(statusBarButton, s("setAttributedTitle:"), attributedString);
 }
 
 void UpdateTrayIcon(TrayMenu *trayMenu) {
@@ -96,12 +89,12 @@ void UpdateTrayIcon(TrayMenu *trayMenu) {
         return;
     }
 
-    id statusBarButton = msg_reg(trayMenu->statusbaritem, s("button"));
+    id statusBarButton = msg(trayMenu->statusbaritem, s("button"));
 
     // Empty icon means remove it
     if( STREMPTY(trayMenu->icon) ) {
         // Remove image
-        msg_id(statusBarButton, s("setImage:"), NULL);
+        msg(statusBarButton, s("setImage:"), NULL);
         return;
     }
 
@@ -109,11 +102,18 @@ void UpdateTrayIcon(TrayMenu *trayMenu) {
 
     // If we don't have the image in the icon cache then assume it's base64 encoded image data
     if (trayImage == NULL) {
-        trayImage = createImageFromBase64Data(trayMenu->icon, trayMenu->templateImage);
+        id data = ALLOC("NSData");
+        id imageData = msg(data, s("initWithBase64EncodedString:options:"), str(trayMenu->icon), 0);
+        trayImage = ALLOC("NSImage");
+        msg(trayImage, s("initWithData:"), imageData);
+
+        if( trayMenu->templateImage ) {
+            msg(trayImage, s("setTemplate:"), YES);
+        }
     }
 
-    msg_int(statusBarButton, s("setImagePosition:"), trayMenu->trayIconPosition);
-    msg_id(statusBarButton, s("setImage:"), trayImage);
+    msg(statusBarButton, s("setImagePosition:"), trayMenu->trayIconPosition);
+    msg(statusBarButton, s("setImage:"), trayImage);
 
 }
 
@@ -121,32 +121,33 @@ void ShowTrayMenu(TrayMenu* trayMenu) {
 
     // Create a status bar item if we don't have one
     if( trayMenu->statusbaritem == NULL ) {
-        id statusBar = msg_reg( c("NSStatusBar"), s("systemStatusBar") );
-        trayMenu->statusbaritem = ((id(*)(id, SEL, CGFloat))objc_msgSend)(statusBar, s("statusItemWithLength:"), NSVariableStatusItemLength);
-        msg_reg(trayMenu->statusbaritem, s("retain"));
+        id statusBar = msg( c("NSStatusBar"), s("systemStatusBar") );
+        trayMenu->statusbaritem = msg(statusBar, s("statusItemWithLength:"), NSVariableStatusItemLength);
+        msg(trayMenu->statusbaritem, s("retain"));
     }
 
-    id statusBarButton = msg_reg(trayMenu->statusbaritem, s("button"));
-    msg_uint(statusBarButton, s("setImagePosition:"), trayMenu->trayIconPosition);
+    id statusBarButton = msg(trayMenu->statusbaritem, s("button"));
+    msg(statusBarButton, s("setImagePosition:"), trayMenu->trayIconPosition);
+
     // Update the icon if needed
     UpdateTrayIcon(trayMenu);
 
     // Update the label if needed
-    UpdateTrayLabel(trayMenu, trayMenu->label, trayMenu->fontName, trayMenu->fontSize, trayMenu->RGBA, trayMenu->tooltip, trayMenu->disabled, trayMenu->styledLabel);
+    UpdateTrayLabel(trayMenu, trayMenu->label, trayMenu->fontName, trayMenu->fontSize, trayMenu->RGBA, trayMenu->tooltip, trayMenu->disabled);
 
     // Update the menu
     id menu = GetMenu(trayMenu->menu);
     objc_setAssociatedObject(menu, "trayMenuID", str(trayMenu->ID), OBJC_ASSOCIATION_ASSIGN);
 
 	// Create delegate
-	id trayMenuDelegate = msg_reg((id)trayMenuDelegateClass, s("new"));
-	msg_id(menu, s("setDelegate:"), trayMenuDelegate);
-    objc_setAssociatedObject(trayMenuDelegate, "menu", menu, OBJC_ASSOCIATION_ASSIGN);
+	id trayMenuDelegate = msg((id)trayMenuDelegateClass, s("new"));
+	msg(menu, s("setDelegate:"), trayMenuDelegate);
+	objc_setAssociatedObject(trayMenuDelegate, "menu", menu, OBJC_ASSOCIATION_ASSIGN);
 
     // Create menu delegate
     trayMenu->delegate = trayMenuDelegate;
 
-    msg_id(trayMenu->statusbaritem, s("setMenu:"), menu);
+    msg(trayMenu->statusbaritem, s("setMenu:"), menu);
 }
 
 // UpdateTrayMenuInPlace receives 2 menus. The current menu gets
@@ -168,7 +169,6 @@ void UpdateTrayMenuInPlace(TrayMenu* currentMenu, TrayMenu* newMenu) {
     // Copy the other data
     currentMenu->ID = newMenu->ID;
     currentMenu->label = newMenu->label;
-    currentMenu->styledLabel = newMenu->styledLabel;
     currentMenu->trayIconPosition = newMenu->trayIconPosition;
     currentMenu->icon = newMenu->icon;
 
@@ -189,14 +189,14 @@ void DeleteTrayMenu(TrayMenu* trayMenu) {
 
     // Free the status item
     if ( trayMenu->statusbaritem != NULL ) {
-        id statusBar = msg_reg( c("NSStatusBar"), s("systemStatusBar") );
-        msg_id(statusBar, s("removeStatusItem:"), trayMenu->statusbaritem);
-        msg_reg(trayMenu->statusbaritem, s("release"));
+        id statusBar = msg( c("NSStatusBar"), s("systemStatusBar") );
+        msg(statusBar, s("removeStatusItem:"), trayMenu->statusbaritem);
+        msg(trayMenu->statusbaritem, s("release"));
         trayMenu->statusbaritem = NULL;
     }
 
     if ( trayMenu->delegate != NULL ) {
-        msg_reg(trayMenu->delegate, s("release"));
+        msg(trayMenu->delegate, s("release"));
     }
 
     // Free the tray menu memory
@@ -228,9 +228,9 @@ void LoadTrayIcons() {
         int length = atoi((const char *)lengthAsString);
 
         // Create the icon and add to the hashmap
-        id imageData = ((id(*)(id, SEL, id, int))objc_msgSend)(c("NSData"), s("dataWithBytes:length:"), (id)data, length);
+        id imageData = msg(c("NSData"), s("dataWithBytes:length:"), data, length);
         id trayImage = ALLOC("NSImage");
-        msg_id(trayImage, s("initWithData:"), imageData);
+        msg(trayImage, s("initWithData:"), imageData);
         hashmap_put(&trayIconCache, (const char *)name, strlen((const char *)name), trayImage);
     }
 }

v2/internal/ffenestri/traymenu_darwin.h

@@ -25,12 +25,10 @@ typedef struct {
     Menu* menu;
 
     id statusbaritem;
-    unsigned int trayIconPosition;
+    int trayIconPosition;
 
     JsonNode* processedJSON;
 
-    JsonNode* styledLabel;
-
     id delegate;
 
 } TrayMenu;
@@ -40,7 +38,7 @@ void DumpTrayMenu(TrayMenu* trayMenu);
 void ShowTrayMenu(TrayMenu* trayMenu);
 void UpdateTrayMenuInPlace(TrayMenu* currentMenu, TrayMenu* newMenu);
 void UpdateTrayIcon(TrayMenu *trayMenu);
-void UpdateTrayLabel(TrayMenu *trayMenu, const char *label, const char *fontName, int fontSize, const char *RGBA, const char *tooltip, bool disabled, JsonNode *styledLabel);
+void UpdateTrayLabel(TrayMenu *trayMenu, const char *label, const char *fontName, int fontSize, const char *RGBA, const char *tooltip, bool disabled);
 
 void LoadTrayIcons();
 void UnloadTrayIcons();

v2/internal/ffenestri/traymenustore_darwin.c

@@ -127,9 +127,7 @@ void UpdateTrayMenuLabelInStore(TrayMenuStore* store, const char* JSON) {
     bool disabled = false;
     getJSONBool(parsedUpdate, "Disabled", &disabled);
 
-    JsonNode *styledLabel = getJSONObject(parsedUpdate, "StyledLabel");
-
-    UpdateTrayLabel(menu, Label, fontName, fontSize, RGBA, tooltip, disabled, styledLabel);
+    UpdateTrayLabel(menu, Label, fontName, fontSize, RGBA, tooltip, disabled);
 
 
 }

v2/internal/ffenestri/vec.c

@@ -1,6 +1,4 @@
-// +build !windows
-
-/**
+/** 
  * Copyright (c) 2014 rxi
  *
  * This library is free software; you can redistribute it and/or modify it

v2/internal/ffenestri/vec.h

@@ -1,4 +1,4 @@
-/**
+/** 
  * Copyright (c) 2014 rxi
  *
  * This library is free software; you can redistribute it and/or modify it

v2/internal/ffenestri/windows/EventToken.h

@@ -1,68 +0,0 @@
-
-
-/* this ALWAYS GENERATED file contains the definitions for the interfaces */
-
-
- /* File created by MIDL compiler version 8.01.0622 */
-/* @@MIDL_FILE_HEADING(  ) */
-
-
-
-/* verify that the <rpcndr.h> version is high enough to compile this file*/
-#ifndef __REQUIRED_RPCNDR_H_VERSION__
-#define __REQUIRED_RPCNDR_H_VERSION__ 500
-#endif
-
-/* verify that the <rpcsal.h> version is high enough to compile this file*/
-#ifndef __REQUIRED_RPCSAL_H_VERSION__
-#define __REQUIRED_RPCSAL_H_VERSION__ 100
-#endif
-
-#include "rpc.h"
-#include "rpcndr.h"
-
-#ifndef __RPCNDR_H_VERSION__
-#error this stub requires an updated version of <rpcndr.h>
-#endif /* __RPCNDR_H_VERSION__ */
-
-
-#ifndef __eventtoken_h__
-#define __eventtoken_h__
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-#pragma once
-#endif
-
-/* Forward Declarations */
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-
-/* interface __MIDL_itf_eventtoken_0000_0000 */
-/* [local] */
-
-//  Microsoft Windows
-//  Copyright (c) Microsoft Corporation. All rights reserved.
-#pragma once
-typedef struct EventRegistrationToken
-    {
-    __int64 value;
-    } 	EventRegistrationToken;
-
-
-
-extern RPC_IF_HANDLE __MIDL_itf_eventtoken_0000_0000_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_eventtoken_0000_0000_v0_0_s_ifspec;
-
-/* Additional Prototypes for ALL interfaces */
-
-/* end of Additional Prototypes */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-

v2/internal/ffenestri/windows/README.md

@@ -1 +0,0 @@
-These files were generated using the scripts in the [webview](https://github.com/webview/webview) project and compressed using UPX.

v2/internal/ffenestri/windows/test/CMakeLists.txt

@@ -1,7 +0,0 @@
-cmake_minimum_required(VERSION 3.19)
-project(test C)
-
-set(CMAKE_C_STANDARD 99)
-set(SOURCES ../../ffenestri_windows.cpp)
-
-add_executable(test ${SOURCES} main.c)

v2/internal/ffenestri/windows/test/compile.bat

@@ -1 +0,0 @@
-g++ main.c ..\..\ffenestri_windows.cpp -lgdi32 -std=c++11

v2/internal/ffenestri/windows/x64/x64.go

@@ -1,11 +0,0 @@
-// +build windows
-
-package x64
-
-import _ "embed"
-
-//go:embed webview.dll
-var WebView2 []byte
-
-//go:embed WebView2Loader.dll
-var WebView2Loader []byte

v2/internal/ffenestri/windows/x64/x64_stub.go

@@ -1,9 +0,0 @@
-// +build !windows
-
-// This is a stub to define the following even though they don't exist
-// on non-Windows systems.  Note: This is not the right way to handle this.
-package x64
-
-var WebView2 []byte
-
-var WebView2Loader []byte

v2/internal/ffenestri/wv2ComHandler_windows.h

@@ -1,103 +0,0 @@
-
-#ifndef WV2COMHANDLER_H
-#define WV2COMHANDLER_H
-
-#include "ffenestri_windows.h"
-#include "windows/WebView2.h"
-
-#include <locale>
-#include <codecvt>
-
-class wv2ComHandler
-        :   public ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler,
-            public ICoreWebView2CreateCoreWebView2ControllerCompletedHandler,
-            public ICoreWebView2WebMessageReceivedEventHandler,
-            public ICoreWebView2PermissionRequestedEventHandler
-{
-
-    struct Application *app;
-    HWND window;
-    messageCallback mcb;
-    comHandlerCallback cb;
-
-    public:
-        wv2ComHandler(struct Application *app, HWND window, messageCallback mcb, comHandlerCallback cb) {
-            this->app = app;
-            this->window = window;
-            this->mcb = mcb;
-            this->cb = cb;
-        }
-        ULONG STDMETHODCALLTYPE AddRef() { return 1; }
-        ULONG STDMETHODCALLTYPE Release() { return 1; }
-        HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, LPVOID *ppv) {
-          return S_OK;
-        }
-        HRESULT STDMETHODCALLTYPE Invoke(HRESULT res,
-                                         ICoreWebView2Environment *env) {
-          env->CreateCoreWebView2Controller(window, this);
-          return S_OK;
-        }
-        HRESULT STDMETHODCALLTYPE Invoke(HRESULT res,
-                                         ICoreWebView2Controller *controller) {
-          controller->AddRef();
-
-          ICoreWebView2 *webview;
-          ::EventRegistrationToken token;
-          controller->get_CoreWebView2(&webview);
-          webview->add_WebMessageReceived(this, &token);
-          webview->add_PermissionRequested(this, &token);
-
-          cb(controller);
-          return S_OK;
-        }
-
-        // This is called when JS posts a message back to webkit
-        HRESULT STDMETHODCALLTYPE Invoke(
-            ICoreWebView2 *sender, ICoreWebView2WebMessageReceivedEventArgs *args) {
-          LPWSTR message;
-          args->TryGetWebMessageAsString(&message);
-          if ( message == nullptr ) {
-            return S_OK;
-          }
-          const char *m = LPWSTRToCstr(message);
-
-          // check for internal messages
-          if (strcmp(m, "completed") == 0) {
-            completed(app);
-            return S_OK;
-          }
-
-          switch(m[0]) {
-
-          // Standard message for backend
-          case 'S':
-            printf("--> Message to backend: %s\n", &m[1]);
-            messageFromWindowCallback(&m[1]);
-            break;
-          // DOM Initialised
-        case 'I':
-            loadAssets(app);
-            break;
-
-          default:
-            printf("----> Unknown message type: %c\n", m[0]);
-          }
-          delete[] m;
-          return S_OK;
-        }
-        HRESULT STDMETHODCALLTYPE
-        Invoke(ICoreWebView2 *sender,
-               ICoreWebView2PermissionRequestedEventArgs *args) {
-                                                        printf("DDDDDDDDDDDD\n");
-
-          COREWEBVIEW2_PERMISSION_KIND kind;
-          args->get_PermissionKind(&kind);
-          if (kind == COREWEBVIEW2_PERMISSION_KIND_CLIPBOARD_READ) {
-            args->put_State(COREWEBVIEW2_PERMISSION_STATE_ALLOW);
-          }
-          return S_OK;
-        }
-
-};
-
-#endif

v2/internal/fs/fs.go

@@ -9,8 +9,6 @@ import (
 	"path/filepath"
 	"runtime"
 	"unsafe"
-
-	"github.com/leaanthony/slicer"
 )
 
 // LocalDirectory gets the caller's file directory
@@ -20,45 +18,11 @@ func LocalDirectory() string {
 	return filepath.Dir(thisFile)
 }
 
-// RelativeToCwd returns an absolute path based on the cwd
-// and the given relative path
-func RelativeToCwd(relativePath string) (string, error) {
-	cwd, err := os.Getwd()
-	if err != nil {
-		return "", err
-	}
-
-	return filepath.Join(cwd, relativePath), nil
-}
-
 // Mkdir will create the given directory
 func Mkdir(dirname string) error {
 	return os.Mkdir(dirname, 0755)
 }
 
-// MkDirs creates the given nested directories.
-// Returns error on failure
-func MkDirs(fullPath string, mode ...os.FileMode) error {
-	var perms os.FileMode
-	perms = 0755
-	if len(mode) == 1 {
-		perms = mode[0]
-	}
-	return os.MkdirAll(fullPath, perms)
-}
-
-// MoveFile attempts to move the source file to the target
-// Target is a fully qualified path to a file *name*, not a
-// directory
-func MoveFile(source string, target string) error {
-	return os.Rename(source, target)
-}
-
-// DeleteFile will delete the given file
-func DeleteFile(filename string) error {
-	return os.Remove(filename)
-}
-
 // CopyFile from source to target
 func CopyFile(source string, target string) error {
 	s, err := os.Open(source)
@@ -180,96 +144,3 @@ func fatal(message ...string) {
 	}
 	os.Exit(1)
 }
-
-// GetSubdirectories returns a list of subdirectories for the given root directory
-func GetSubdirectories(rootDir string) (*slicer.StringSlicer, error) {
-	var result slicer.StringSlicer
-
-	// Iterate root dir
-	err := filepath.Walk(rootDir, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		// If we have a directory, save it
-		if info.IsDir() {
-			result.Add(path)
-		}
-		return nil
-	})
-	return &result, err
-}
-
-func DirIsEmpty(dir string) (bool, error) {
-
-	// CREDIT: https://stackoverflow.com/a/30708914/8325411
-	f, err := os.Open(dir)
-	if err != nil {
-		return false, err
-	}
-	defer f.Close()
-
-	_, err = f.Readdirnames(1) // Or f.Readdir(1)
-	if err == io.EOF {
-		return true, nil
-	}
-	return false, err // Either not empty or error, suits both cases
-}
-
-// Credit: https://gist.github.com/r0l1/92462b38df26839a3ca324697c8cba04
-// CopyDir recursively copies a directory tree, attempting to preserve permissions.
-// Source directory must exist, destination directory must *not* exist.
-// Symlinks are ignored and skipped.
-func CopyDir(src string, dst string) (err error) {
-	src = filepath.Clean(src)
-	dst = filepath.Clean(dst)
-
-	si, err := os.Stat(src)
-	if err != nil {
-		return err
-	}
-	if !si.IsDir() {
-		return fmt.Errorf("source is not a directory")
-	}
-
-	_, err = os.Stat(dst)
-	if err != nil && !os.IsNotExist(err) {
-		return
-	}
-	if err == nil {
-		return fmt.Errorf("destination already exists")
-	}
-
-	err = MkDirs(dst)
-	if err != nil {
-		return
-	}
-
-	entries, err := ioutil.ReadDir(src)
-	if err != nil {
-		return
-	}
-
-	for _, entry := range entries {
-		srcPath := filepath.Join(src, entry.Name())
-		dstPath := filepath.Join(dst, entry.Name())
-
-		if entry.IsDir() {
-			err = CopyDir(srcPath, dstPath)
-			if err != nil {
-				return
-			}
-		} else {
-			// Skip symlinks.
-			if entry.Mode()&os.ModeSymlink != 0 {
-				continue
-			}
-
-			err = CopyFile(srcPath, dstPath)
-			if err != nil {
-				return
-			}
-		}
-	}
-
-	return
-}

v2/internal/html/asset.go

@@ -3,15 +3,11 @@ package html
 import (
 	"fmt"
 	"io/ioutil"
-	"log"
 	"net/url"
 	"path/filepath"
 	"regexp"
 	"strings"
 	"unsafe"
-
-	"github.com/tdewolff/minify"
-	"github.com/tdewolff/minify/js"
 )
 
 type assetTypes struct {
@@ -67,10 +63,6 @@ func (a *Asset) AsCHexData() string {
 		result = strings.ReplaceAll(result, "\n", "")
 		result = strings.ReplaceAll(result, "\r\n", "")
 		result = strings.ReplaceAll(result, "\n", "")
-
-		// Inject wailsloader code
-		result = strings.Replace(result, `</body>`, `<script id='wailsloader'>window.wailsloader = { html: true, runtime: false, userjs: false, usercss: false };var self=document.querySelector('#wailsloader');self.parentNode.removeChild(self);</script></body>`, 1)
-
 		url := url.URL{Path: result}
 		urlString := strings.ReplaceAll(url.String(), "/", "%2f")
 
@@ -92,16 +84,6 @@ func (a *Asset) AsCHexData() string {
 		result = strings.ReplaceAll(result, ` {`, `{`)
 		result = strings.ReplaceAll(result, `: `, `:`)
 		dataString = fmt.Sprintf("window.wails._.InjectCSS(\"%s\");", result)
-
-	case AssetTypes.JS:
-		m := minify.New()
-		m.AddFunc("application/javascript", js.Minify)
-		var err error
-		dataString, err = m.String("application/javascript", a.Data+";")
-		if err != nil {
-			log.Fatal(err)
-		}
-		a.Data = dataString
 	}
 
 	// Get byte data of the string
@@ -121,7 +103,6 @@ func (a *Asset) AsCHexData() string {
 	return cdata.String()
 }
 
-// Dump will output the asset to the terminal
 func (a *Asset) Dump() {
 	fmt.Printf("{ Type: %s, Path: %s, Data: %+v }\n", a.Type, a.Path, a.Data[:10])
 }

v2/internal/html/assetbundle.go

@@ -61,8 +61,6 @@ func (a *AssetBundle) processHTML(htmldata string) error {
 	buf := bytes.NewBufferString(htmldata)
 	tokenizer := html.NewTokenizer(buf)
 
-	paths := slicer.String()
-
 	for {
 		//get the next token type
 		tokenType := tokenizer.Next()
@@ -102,32 +100,19 @@ func (a *AssetBundle) processHTML(htmldata string) error {
 					if attr.Key == "href" {
 						asset.Path = attr.Val
 					}
-					// standard stylesheet
+					// stylesheet
 					if attr.Key == "rel" && attr.Val == "stylesheet" {
 						asset.Type = AssetTypes.CSS
 					}
-					if attr.Key == "as" && attr.Val == "style" {
-						asset.Type = AssetTypes.CSS
-					}
-					if attr.Key == "as" && attr.Val == "script" {
-						asset.Type = AssetTypes.JS
-					}
-					if attr.Key == "rel" && attr.Val == "modulepreload" {
-						asset.Type = AssetTypes.JS
-					}
 				}
-
-				// Ensure we don't include duplicates
-				if !paths.Contains(asset.Path) {
-					err := asset.Load(a.basedirectory)
-					if err != nil {
-						return err
-					}
-					a.assets = append(a.assets, asset)
-					paths.Add(asset.Path)
+				err := asset.Load(a.basedirectory)
+				if err != nil {
+					return err
 				}
+				a.assets = append(a.assets, asset)
 			}
 			if "script" == token.Data {
+
 				tokenType = tokenizer.Next()
 				//just make sure it's actually a text token
 				asset := &Asset{Type: AssetTypes.JS}
@@ -137,14 +122,11 @@ func (a *AssetBundle) processHTML(htmldata string) error {
 						break
 					}
 				}
-				if !paths.Contains(asset.Path) {
-					err := asset.Load(a.basedirectory)
-					if err != nil {
-						return err
-					}
-					a.assets = append(a.assets, asset)
-					paths.Add(asset.Path)
+				err := asset.Load(a.basedirectory)
+				if err != nil {
+					return err
 				}
+				a.assets = append(a.assets, asset)
 			}
 		}
 	}
@@ -159,7 +141,7 @@ func (a *AssetBundle) WriteToCFile(targetDir string) (string, error) {
 	var cdata strings.Builder
 
 	// Write header
-	header := `// assets.h
+	header := `// assets.c
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL.
 // This file was auto-generated. DO NOT MODIFY.
 
@@ -171,10 +153,6 @@ func (a *AssetBundle) WriteToCFile(targetDir string) (string, error) {
 	assetVariables := slicer.String()
 	var variableName string
 	for index, asset := range a.assets {
-		// For desktop we ignore the favicon
-		if asset.Type == AssetTypes.FAVICON {
-			continue
-		}
 		variableName = fmt.Sprintf("%s%d", asset.Type, index)
 		assetCdata := fmt.Sprintf("const unsigned char %s[]={ %s0x00 };\n", variableName, asset.AsCHexData())
 		cdata.WriteString(assetCdata)
@@ -182,13 +160,13 @@ func (a *AssetBundle) WriteToCFile(targetDir string) (string, error) {
 	}
 
 	if assetVariables.Length() > 0 {
-		cdata.WriteString(fmt.Sprintf("\nconst unsigned char *assets[] = { %s, 0x00 };", assetVariables.Join(", ")))
+		cdata.WriteString(fmt.Sprintf("\nconst char *assets[] = { %s, 0x00 };", assetVariables.Join(", ")))
 	} else {
-		cdata.WriteString("\nconst unsigned char *assets[] = { 0x00 };")
+		cdata.WriteString("\nconst char *assets[] = { 0x00 };")
 	}
 
 	// Save file
-	assetsFile := filepath.Join(targetDir, "assets.h")
+	assetsFile := filepath.Join(targetDir, "assets.c")
 	err = ioutil.WriteFile(assetsFile, []byte(cdata.String()), 0600)
 	if err != nil {
 		return "", err
@@ -199,17 +177,16 @@ func (a *AssetBundle) WriteToCFile(targetDir string) (string, error) {
 // ConvertToAssetDB returns an assetdb.AssetDB initialized with
 // the items in the AssetBundle
 func (a *AssetBundle) ConvertToAssetDB() (*assetdb.AssetDB, error) {
-	theassetdb := assetdb.NewAssetDB()
+	assetdb := assetdb.NewAssetDB()
 
 	// Loop over the Assets
 	for _, asset := range a.assets {
-		theassetdb.AddAsset(asset.Path, []byte(asset.Data))
+		assetdb.AddAsset(asset.Path, []byte(asset.Data))
 	}
 
-	return theassetdb, nil
+	return assetdb, nil
 }
 
-// Dump will output the assets to the terminal
 func (a *AssetBundle) Dump() {
 	println("Assets:")
 	for _, asset := range a.assets {

v2/internal/logger/custom_logger.go

@@ -2,30 +2,31 @@ package logger
 
 import (
 	"fmt"
+	"os"
 )
 
 // CustomLogger defines what a user can do with a logger
 type CustomLogger interface {
 	// Writeln writes directly to the output with no log level plus line ending
-	Writeln(message string)
+	Writeln(message string) error
 
 	// Write writes directly to the output with no log level
-	Write(message string)
+	Write(message string) error
 
 	// Trace level logging. Works like Sprintf.
-	Trace(format string, args ...interface{})
+	Trace(format string, args ...interface{}) error
 
 	// Debug level logging. Works like Sprintf.
-	Debug(format string, args ...interface{})
+	Debug(format string, args ...interface{}) error
 
 	// Info level logging. Works like Sprintf.
-	Info(format string, args ...interface{})
+	Info(format string, args ...interface{}) error
 
 	// Warning level logging. Works like Sprintf.
-	Warning(format string, args ...interface{})
+	Warning(format string, args ...interface{}) error
 
 	// Error level logging. Works like Sprintf.
-	Error(format string, args ...interface{})
+	Error(format string, args ...interface{}) error
 
 	// Fatal level logging. Works like Sprintf.
 	Fatal(format string, args ...interface{})
@@ -49,48 +50,49 @@ func newcustomLogger(logger *Logger, name string) *customLogger {
 
 // Writeln writes directly to the output with no log level
 // Appends a carriage return to the message
-func (l *customLogger) Writeln(message string) {
-	l.logger.Writeln(message)
+func (l *customLogger) Writeln(message string) error {
+	return l.logger.Writeln(message)
 }
 
 // Write writes directly to the output with no log level
-func (l *customLogger) Write(message string) {
-	l.logger.Write(message)
+func (l *customLogger) Write(message string) error {
+	return l.logger.Write(message)
 }
 
 // Trace level logging. Works like Sprintf.
-func (l *customLogger) Trace(format string, args ...interface{}) {
+func (l *customLogger) Trace(format string, args ...interface{}) error {
 	format = fmt.Sprintf("%s | %s", l.name, format)
-	l.logger.Trace(format, args...)
+	return l.logger.processLogMessage(TRACE, format, args...)
 }
 
 // Debug level logging. Works like Sprintf.
-func (l *customLogger) Debug(format string, args ...interface{}) {
+func (l *customLogger) Debug(format string, args ...interface{}) error {
 	format = fmt.Sprintf("%s | %s", l.name, format)
-	l.logger.Debug(format, args...)
+	return l.logger.processLogMessage(DEBUG, format, args...)
 }
 
 // Info level logging. Works like Sprintf.
-func (l *customLogger) Info(format string, args ...interface{}) {
+func (l *customLogger) Info(format string, args ...interface{}) error {
 	format = fmt.Sprintf("%s | %s", l.name, format)
-	l.logger.Info(format, args...)
+	return l.logger.processLogMessage(INFO, format, args...)
 }
 
 // Warning level logging. Works like Sprintf.
-func (l *customLogger) Warning(format string, args ...interface{}) {
+func (l *customLogger) Warning(format string, args ...interface{}) error {
 	format = fmt.Sprintf("%s | %s", l.name, format)
-	l.logger.Warning(format, args...)
+	return l.logger.processLogMessage(WARNING, format, args...)
 }
 
 // Error level logging. Works like Sprintf.
-func (l *customLogger) Error(format string, args ...interface{}) {
+func (l *customLogger) Error(format string, args ...interface{}) error {
 	format = fmt.Sprintf("%s | %s", l.name, format)
-	l.logger.Error(format, args...)
+	return l.logger.processLogMessage(ERROR, format, args...)
 
 }
 
 // Fatal level logging. Works like Sprintf.
 func (l *customLogger) Fatal(format string, args ...interface{}) {
 	format = fmt.Sprintf("%s | %s", l.name, format)
-	l.logger.Fatal(format, args...)
+	l.logger.processLogMessage(FATAL, format, args...)
+	os.Exit(1)
 }

v2/internal/logger/default_logger.go

@@ -2,32 +2,37 @@ package logger
 
 import (
 	"fmt"
+	"io"
 	"os"
-
-	"github.com/wailsapp/wails/v2/pkg/logger"
+	"sync"
 )
 
-// LogLevel is an alias for the public LogLevel
-type LogLevel = logger.LogLevel
-
 // Logger is a utlility to log messages to a number of destinations
 type Logger struct {
-	output         logger.Logger
-	logLevel       LogLevel
+	writers        []io.Writer
+	logLevel       uint8
 	showLevelInLog bool
+	lock           sync.RWMutex
 }
 
 // New creates a new Logger. You may pass in a number of `io.Writer`s that
 // are the targets for the logs
-func New(output logger.Logger) *Logger {
+func New(writers ...io.Writer) *Logger {
 	result := &Logger{
-		logLevel:       logger.INFO,
+		logLevel:       INFO,
 		showLevelInLog: true,
-		output:         output,
+	}
+	for _, writer := range writers {
+		result.AddOutput(writer)
 	}
 	return result
 }
 
+// Writers gets the log writers
+func (l *Logger) Writers() []io.Writer {
+	return l.writers
+}
+
 // CustomLogger creates a new custom logger that prints out a name/id
 // before the messages
 func (l *Logger) CustomLogger(name string) CustomLogger {
@@ -40,66 +45,99 @@ func (l *Logger) HideLogLevel() {
 }
 
 // SetLogLevel sets the minimum level of logs that will be output
-func (l *Logger) SetLogLevel(level LogLevel) {
+func (l *Logger) SetLogLevel(level uint8) {
 	l.logLevel = level
 }
 
+// AddOutput adds the given `io.Writer` to the list of destinations
+// that get logged to
+func (l *Logger) AddOutput(writer io.Writer) {
+	l.writers = append(l.writers, writer)
+}
+
+func (l *Logger) write(loglevel uint8, message string) error {
+
+	// Don't print logs lower than the current log level
+	if loglevel < l.logLevel {
+		return nil
+	}
+
+	// Show log level text if enabled
+	if l.showLevelInLog {
+		message = mapLogLevel[loglevel] + message
+	}
+
+	// write out the logs
+	l.lock.Lock()
+	for _, writer := range l.writers {
+		_, err := writer.Write([]byte(message))
+		if err != nil {
+			l.lock.Unlock() // Because defer is slow
+			return err
+		}
+	}
+	l.lock.Unlock()
+	return nil
+}
+
+// writeln appends a newline character to the message before writing
+func (l *Logger) writeln(loglevel uint8, message string) error {
+	return l.write(loglevel, message+"\n")
+}
+
 // Writeln writes directly to the output with no log level
 // Appends a carriage return to the message
-func (l *Logger) Writeln(message string) {
-	l.output.Print(message)
+func (l *Logger) Writeln(message string) error {
+	return l.write(BYPASS, message+"\n")
 }
 
 // Write writes directly to the output with no log level
-func (l *Logger) Write(message string) {
-	l.output.Print(message)
+func (l *Logger) Write(message string) error {
+	return l.write(BYPASS, message)
 }
 
-// Print writes directly to the output with no log level
-// Appends a carriage return to the message
-func (l *Logger) Print(message string) {
-	l.Write(message)
+// processLogMessage formats the given message before writing it out
+func (l *Logger) processLogMessage(loglevel uint8, format string, args ...interface{}) error {
+	message := fmt.Sprintf(format, args...)
+	return l.writeln(loglevel, message)
 }
 
 // Trace level logging. Works like Sprintf.
-func (l *Logger) Trace(format string, args ...interface{}) {
-	if l.logLevel <= logger.TRACE {
-		l.output.Trace(fmt.Sprintf(format, args...))
+func (l *Logger) Trace(format string, args ...interface{}) error {
+	return l.processLogMessage(TRACE, format, args...)
+}
+
+// CustomTrace returns a custom Logging function that will insert the given name before the message
+func (l *Logger) CustomTrace(name string) func(format string, args ...interface{}) {
+	return func(format string, args ...interface{}) {
+		format = name + " | " + format
+		l.processLogMessage(TRACE, format, args...)
 	}
 }
 
 // Debug level logging. Works like Sprintf.
-func (l *Logger) Debug(format string, args ...interface{}) {
-	if l.logLevel <= logger.DEBUG {
-		l.output.Debug(fmt.Sprintf(format, args...))
-	}
+func (l *Logger) Debug(format string, args ...interface{}) error {
+	return l.processLogMessage(DEBUG, format, args...)
 }
 
 // Info level logging. Works like Sprintf.
-func (l *Logger) Info(format string, args ...interface{}) {
-	if l.logLevel <= logger.INFO {
-		l.output.Info(fmt.Sprintf(format, args...))
-	}
-
+func (l *Logger) Info(format string, args ...interface{}) error {
+	return l.processLogMessage(INFO, format, args...)
 }
 
 // Warning level logging. Works like Sprintf.
-func (l *Logger) Warning(format string, args ...interface{}) {
-	if l.logLevel <= logger.WARNING {
-		l.output.Warning(fmt.Sprintf(format, args...))
-	}
+func (l *Logger) Warning(format string, args ...interface{}) error {
+	return l.processLogMessage(WARNING, format, args...)
 }
 
 // Error level logging. Works like Sprintf.
-func (l *Logger) Error(format string, args ...interface{}) {
-	if l.logLevel <= logger.ERROR {
-		l.output.Error(fmt.Sprintf(format, args...))
-	}
+func (l *Logger) Error(format string, args ...interface{}) error {
+	return l.processLogMessage(ERROR, format, args...)
 
 }
 
 // Fatal level logging. Works like Sprintf.
 func (l *Logger) Fatal(format string, args ...interface{}) {
-	l.output.Fatal(fmt.Sprintf(format, args...))
+	l.processLogMessage(FATAL, format, args...)
 	os.Exit(1)
 }

v2/internal/logger/logger.go

@@ -0,0 +1,34 @@
+package logger
+
+const (
+	// TRACE level
+	TRACE uint8 = 0
+
+	// DEBUG level logging
+	DEBUG uint8 = 1
+
+	// INFO level logging
+	INFO uint8 = 2
+
+	// WARNING level logging
+	WARNING uint8 = 4
+
+	// ERROR level logging
+	ERROR uint8 = 8
+
+	// FATAL level logging
+	FATAL uint8 = 16
+
+	// BYPASS level logging - does not use a log level
+	BYPASS uint8 = 255
+)
+
+var mapLogLevel = map[uint8]string{
+	TRACE:   "TRACE | ",
+	DEBUG:   "DEBUG | ",
+	INFO:    "INFO  | ",
+	WARNING: "WARN  | ",
+	ERROR:   "ERROR | ",
+	FATAL:   "FATAL | ",
+	BYPASS:  "",
+}

v2/internal/logger/logger_test.go

@@ -0,0 +1,202 @@
+package logger
+
+import (
+	"bytes"
+	"io/ioutil"
+	"log"
+	"os"
+	"testing"
+
+	"github.com/matryer/is"
+)
+
+func TestByteBufferLogger(t *testing.T) {
+
+	is := is.New(t)
+
+	// Create new byte buffer logger
+	var buf bytes.Buffer
+
+	myLogger := New(&buf)
+	myLogger.SetLogLevel(TRACE)
+
+	tests := map[uint8]string{
+		TRACE:   "TRACE | I am a message!\n",
+		DEBUG:   "DEBUG | I am a message!\n",
+		WARNING: "WARN  | I am a message!\n",
+		INFO:    "INFO  | I am a message!\n",
+		ERROR:   "ERROR | I am a message!\n",
+	}
+
+	methods := map[uint8]func(string, ...interface{}) error{
+		TRACE:   myLogger.Trace,
+		DEBUG:   myLogger.Debug,
+		WARNING: myLogger.Warning,
+		INFO:    myLogger.Info,
+		ERROR:   myLogger.Error,
+	}
+
+	for level, expected := range tests {
+
+		buf.Reset()
+
+		method := methods[level]
+
+		// Write message
+		err := method("I am a message!")
+		if err != nil {
+			panic(err)
+		}
+		actual := buf.String()
+
+		is.Equal(actual, expected)
+	}
+
+}
+func TestCustomLogger(t *testing.T) {
+
+	is := is.New(t)
+
+	// Create new byte buffer logger
+	var buf bytes.Buffer
+
+	myLogger := New(&buf)
+	myLogger.SetLogLevel(TRACE)
+	customLogger := myLogger.CustomLogger("Test")
+
+	tests := map[uint8]string{
+		TRACE:   "TRACE | Test | I am a message!\n",
+		DEBUG:   "DEBUG | Test | I am a message!\n",
+		WARNING: "WARN  | Test | I am a message!\n",
+		INFO:    "INFO  | Test | I am a message!\n",
+		ERROR:   "ERROR | Test | I am a message!\n",
+	}
+
+	methods := map[uint8]func(string, ...interface{}) error{
+		TRACE:   customLogger.Trace,
+		DEBUG:   customLogger.Debug,
+		WARNING: customLogger.Warning,
+		INFO:    customLogger.Info,
+		ERROR:   customLogger.Error,
+	}
+
+	for level, expected := range tests {
+
+		buf.Reset()
+
+		method := methods[level]
+
+		// Write message
+		err := method("I am a message!")
+		if err != nil {
+			panic(err)
+		}
+		actual := buf.String()
+
+		is.Equal(actual, expected)
+	}
+
+}
+func TestWriteln(t *testing.T) {
+
+	is := is.New(t)
+
+	// Create new byte buffer logger
+	var buf bytes.Buffer
+
+	myLogger := New(&buf)
+	myLogger.SetLogLevel(DEBUG)
+
+	buf.Reset()
+
+	// Write message
+	err := myLogger.Writeln("I am a message!")
+	if err != nil {
+		panic(err)
+	}
+	actual := buf.String()
+
+	is.Equal(actual, "I am a message!\n")
+
+	buf.Reset()
+
+	// Write message
+	err = myLogger.Write("I am a message!")
+	if err != nil {
+		panic(err)
+	}
+	actual = buf.String()
+
+	is.Equal(actual, "I am a message!")
+
+}
+
+func TestLogLevel(t *testing.T) {
+
+	is := is.New(t)
+
+	// Create new byte buffer logger
+	var buf bytes.Buffer
+
+	myLogger := New(&buf)
+	myLogger.SetLogLevel(ERROR)
+
+	tests := map[uint8]string{
+		TRACE:   "",
+		DEBUG:   "",
+		WARNING: "",
+		INFO:    "",
+		ERROR:   "ERROR | I am a message!\n",
+	}
+
+	methods := map[uint8]func(string, ...interface{}) error{
+		TRACE:   myLogger.Trace,
+		DEBUG:   myLogger.Debug,
+		WARNING: myLogger.Warning,
+		INFO:    myLogger.Info,
+		ERROR:   myLogger.Error,
+	}
+
+	for level := range tests {
+
+		method := methods[level]
+
+		// Write message
+		err := method("I am a message!")
+		if err != nil {
+			panic(err)
+		}
+
+	}
+	actual := buf.String()
+
+	is.Equal(actual, "ERROR | I am a message!\n")
+}
+
+func TestFileLogger(t *testing.T) {
+
+	is := is.New(t)
+
+	// Create new byte buffer logger
+	file, err := ioutil.TempFile(".", "wailsv2test")
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer os.Remove(file.Name())
+
+	myLogger := New(file)
+	myLogger.SetLogLevel(DEBUG)
+
+	// Write message
+	err = myLogger.Info("I am a message!")
+	if err != nil {
+		panic(err)
+	}
+	actual, err := ioutil.ReadFile(file.Name())
+	if err != nil {
+		panic(err)
+	}
+
+	is.Equal(string(actual), "INFO  | I am a message!\n")
+
+}

v2/internal/menumanager/processedMenu.go

@@ -2,9 +2,6 @@ package menumanager
 
 import (
 	"encoding/json"
-	"strings"
-
-	"github.com/leaanthony/go-ansi-parser"
 
 	"github.com/wailsapp/wails/v2/pkg/menu"
 	"github.com/wailsapp/wails/v2/pkg/menu/keys"
@@ -44,25 +41,11 @@ type ProcessedMenuItem struct {
 
 	// Tooltip
 	Tooltip string `json:",omitempty"`
-
-	// Styled label
-	StyledLabel []*ansi.StyledText `json:",omitempty"`
 }
 
 func NewProcessedMenuItem(menuItemMap *MenuItemMap, menuItem *menu.MenuItem) *ProcessedMenuItem {
 
 	ID := menuItemMap.menuItemToIDMap[menuItem]
-
-	// Parse ANSI text
-	var styledLabel []*ansi.StyledText
-	tempLabel := menuItem.Label
-	if strings.Contains(tempLabel, "\033[") {
-		parsedLabel, err := ansi.Parse(menuItem.Label)
-		if err == nil {
-			styledLabel = parsedLabel
-		}
-	}
-
 	result := &ProcessedMenuItem{
 		ID:               ID,
 		Label:            menuItem.Label,
@@ -80,7 +63,6 @@ func NewProcessedMenuItem(menuItemMap *MenuItemMap, menuItem *menu.MenuItem) *Pr
 		MacTemplateImage: menuItem.MacTemplateImage,
 		MacAlternate:     menuItem.MacAlternate,
 		Tooltip:          menuItem.Tooltip,
-		StyledLabel:      styledLabel,
 	}
 
 	if menuItem.SubMenu != nil {

v2/internal/menumanager/traymenu.go

@@ -4,11 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"strconv"
-	"strings"
 	"sync"
 
-	"github.com/leaanthony/go-ansi-parser"
-
 	"github.com/pkg/errors"
 	"github.com/wailsapp/wails/v2/pkg/menu"
 )
@@ -39,7 +36,6 @@ type TrayMenu struct {
 	menu             *menu.Menu
 	ProcessedMenu    *WailsMenu
 	trayMenu         *menu.TrayMenu
-	StyledLabel      []*ansi.StyledText `json:",omitempty"`
 }
 
 func (t *TrayMenu) AsJSON() (string, error) {
@@ -52,16 +48,6 @@ func (t *TrayMenu) AsJSON() (string, error) {
 
 func NewTrayMenu(trayMenu *menu.TrayMenu) *TrayMenu {
 
-	// Parse ANSI text
-	var styledLabel []*ansi.StyledText
-	tempLabel := trayMenu.Label
-	if strings.Contains(tempLabel, "\033[") {
-		parsedLabel, err := ansi.Parse(tempLabel)
-		if err == nil {
-			styledLabel = parsedLabel
-		}
-	}
-
 	result := &TrayMenu{
 		Label:            trayMenu.Label,
 		FontName:         trayMenu.FontName,
@@ -74,7 +60,6 @@ func NewTrayMenu(trayMenu *menu.TrayMenu) *TrayMenu {
 		RGBA:             trayMenu.RGBA,
 		menuItemMap:      NewMenuItemMap(),
 		trayMenu:         trayMenu,
-		StyledLabel:      styledLabel,
 	}
 
 	result.menuItemMap.AddMenu(trayMenu.Menu)
@@ -165,25 +150,14 @@ func (m *Manager) UpdateTrayMenuLabel(trayMenu *menu.TrayMenu) (string, error) {
 
 	type LabelUpdate struct {
 		ID               string
-		Label            string `json:",omitempty"`
-		FontName         string `json:",omitempty"`
+		Label            string
+		FontName         string
 		FontSize         int
-		RGBA             string `json:",omitempty"`
+		RGBA             string
 		Disabled         bool
-		Tooltip          string `json:",omitempty"`
-		Image            string `json:",omitempty"`
+		Tooltip          string
+		Image            string
 		MacTemplateImage bool
-		StyledLabel      []*ansi.StyledText `json:",omitempty"`
-	}
-
-	// Parse ANSI text
-	var styledLabel []*ansi.StyledText
-	tempLabel := trayMenu.Label
-	if strings.Contains(tempLabel, "\033[") {
-		parsedLabel, err := ansi.Parse(tempLabel)
-		if err == nil {
-			styledLabel = parsedLabel
-		}
 	}
 
 	update := &LabelUpdate{
@@ -196,7 +170,6 @@ func (m *Manager) UpdateTrayMenuLabel(trayMenu *menu.TrayMenu) (string, error) {
 		Image:            trayMenu.Image,
 		MacTemplateImage: trayMenu.MacTemplateImage,
 		RGBA:             trayMenu.RGBA,
-		StyledLabel:      styledLabel,
 	}
 
 	data, err := json.Marshal(update)

v2/internal/messagedispatcher/dispatchclient.go

@@ -6,38 +6,19 @@ import (
 	"github.com/wailsapp/wails/v2/internal/logger"
 	"github.com/wailsapp/wails/v2/internal/messagedispatcher/message"
 	"github.com/wailsapp/wails/v2/internal/servicebus"
-	"github.com/wailsapp/wails/v2/pkg/options/dialog"
 )
 
-// Client defines what a frontend client can do
 type Client interface {
 	Quit()
 	NotifyEvent(message string)
 	CallResult(message string)
-	OpenDialog(dialogOptions *dialog.OpenDialog, callbackID string)
-	SaveDialog(dialogOptions *dialog.SaveDialog, callbackID string)
-	MessageDialog(dialogOptions *dialog.MessageDialog, callbackID string)
+	SaveFileDialog(title string) string
+	OpenFileDialog(title string) string
+	OpenDirectoryDialog(title string) string
 	WindowSetTitle(title string)
-	WindowShow()
-	WindowHide()
-	WindowCenter()
-	WindowMaximise()
-	WindowUnmaximise()
-	WindowMinimise()
-	WindowUnminimise()
-	WindowPosition(x int, y int)
-	WindowSize(width int, height int)
-	WindowSetMinSize(width int, height int)
-	WindowSetMaxSize(width int, height int)
 	WindowFullscreen()
 	WindowUnFullscreen()
-	WindowSetColour(colour int)
-	DarkModeEnabled(callbackID string)
-	SetApplicationMenu(menuJSON string)
-	SetTrayMenu(trayMenuJSON string)
-	UpdateTrayMenuLabel(JSON string)
-	UpdateContextMenu(contextMenuJSON string)
-	DeleteTrayMenuByID(id string)
+	WindowSetColour(colour string) bool
 }
 
 // DispatchClient is what the frontends use to interface with the
@@ -72,7 +53,7 @@ func (d *DispatchClient) DispatchMessage(incomingMessage string) {
 	d.logger.Trace(fmt.Sprintf("Received message: %+v", incomingMessage))
 	parsedMessage, err := message.Parse(incomingMessage)
 	if err != nil {
-		d.logger.Error(err.Error())
+		d.logger.Trace("Error: " + err.Error())
 		return
 	}
 
@@ -81,6 +62,14 @@ func (d *DispatchClient) DispatchMessage(incomingMessage string) {
 
 	d.logger.Trace("I got a parsedMessage: %+v", parsedMessage)
 
+	// Check error
+	if err != nil {
+		d.logger.Trace("Error: " + err.Error())
+		// Hrm... what do we do with this?
+		d.bus.PublishForTarget("generic:message", incomingMessage, d.id)
+		return
+	}
+
 	// Publish the parsed message
 	d.bus.PublishForTarget(parsedMessage.Topic, parsedMessage.Data, d.id)
 

v2/internal/messagedispatcher/message/call.go

@@ -6,9 +6,9 @@ import (
 )
 
 type CallMessage struct {
-	Name       string            `json:"name"`
-	Args       []json.RawMessage `json:"args"`
-	CallbackID string            `json:"callbackID,omitempty"`
+	Name       string        `json:"name"`
+	Args       []interface{} `json:"args"`
+	CallbackID string        `json:"callbackID,omitempty"`
 }
 
 // callMessageParser does what it says on the tin!
@@ -22,7 +22,6 @@ func callMessageParser(message string) (*parsedMessage, error) {
 	callMessage := new(CallMessage)
 
 	m := message[1:]
-
 	err := json.Unmarshal([]byte(m), callMessage)
 	if err != nil {
 		println(err.Error())

v2/internal/messagedispatcher/message/event.go

@@ -1,9 +1,8 @@
 package message
 
-import (
-	"encoding/json"
-	"fmt"
-)
+import "fmt"
+
+import "encoding/json"
 
 type EventMessage struct {
 	Name string        `json:"name"`
@@ -13,7 +12,6 @@ type EventMessage struct {
 type OnEventMessage struct {
 	Name     string
 	Callback func(optionalData ...interface{})
-	Counter  int
 }
 
 // eventMessageParser does what it says on the tin!
@@ -29,6 +27,8 @@ func eventMessageParser(message string) (*parsedMessage, error) {
 
 	// Switch the event type (with or without data)
 	switch message[0] {
+	case 'e':
+		eventMessage.Name = message[2:]
 	case 'E':
 		m := message[2:]
 		err := json.Unmarshal([]byte(m), eventMessage)

v2/internal/messagedispatcher/message/log.go

@@ -3,19 +3,16 @@ package message
 import "fmt"
 
 var logMessageMap = map[byte]string{
-	'P': "log:print",
-	'T': "log:trace",
 	'D': "log:debug",
 	'I': "log:info",
 	'W': "log:warning",
 	'E': "log:error",
 	'F': "log:fatal",
-	'S': "log:setlevel",
 }
 
 // logMessageParser does what it says on the tin!
 func logMessageParser(message string) (*parsedMessage, error) {
-
+	
 	// Sanity check: Log messages must be at least 2 bytes
 	if len(message) < 2 {
 		return nil, fmt.Errorf("log message was an invalid length")
@@ -26,7 +23,7 @@ func logMessageParser(message string) (*parsedMessage, error) {
 
 	// If the type is invalid, raise error
 	if messageTopic == "" {
-		return nil, fmt.Errorf("log message type '%c' invalid", message[1])
+		return nil, fmt.Errorf("log message type '%b' invalid", message[1])
 	}
 
 	// Create a new parsed message struct

v2/internal/messagedispatcher/message/messageparser.go

@@ -14,26 +14,17 @@ var messageParsers = map[byte]func(string) (*parsedMessage, error){
 	'L': logMessageParser,
 	'R': runtimeMessageParser,
 	'E': eventMessageParser,
+	'e': eventMessageParser,
 	'C': callMessageParser,
 	'W': windowMessageParser,
-	'D': dialogMessageParser,
-	'S': systemMessageParser,
-	'M': menuMessageParser,
-	'T': trayMessageParser,
-	'X': contextMenusMessageParser,
-	'U': urlMessageParser,
 }
 
 // Parse will attempt to parse the given message
 func Parse(message string) (*parsedMessage, error) {
 
-	if len(message) == 0 {
-		return nil, fmt.Errorf("MessageParser received blank message")
-	}
-
 	parseMethod := messageParsers[message[0]]
 	if parseMethod == nil {
-		return nil, fmt.Errorf("message type '%c' invalid", message[0])
+		return nil, fmt.Errorf("message type '%b' invalid", message[0])
 	}
 
 	return parseMethod(message)

v2/internal/messagedispatcher/message/runtime.go

@@ -22,14 +22,13 @@ func runtimeMessageParser(message string) (*parsedMessage, error) {
 
 // processBrowserMessage expects messages of the following format:
 // RB<METHOD><DATA>
-// O = Open
 func processBrowserMessage(message string) (*parsedMessage, error) {
 	method := message[2]
 	switch method {
-	case 'O':
+	case 'U':
 		// Open URL
-		target := message[3:]
-		return &parsedMessage{Topic: "runtime:browser:open", Data: target}, nil
+		url := message[3:]
+		return &parsedMessage{Topic: "runtime:browser:openurl", Data: url}, nil
 	}
 
 	return nil, fmt.Errorf("unknown browser message: %s", message)

v2/internal/messagedispatcher/message/window.go

@@ -22,66 +22,6 @@ func windowMessageParser(message string) (*parsedMessage, error) {
 		parsedMessage.Topic = "quit"
 		parsedMessage.Data = "Window Closed"
 
-	// Center window
-	case 'c':
-		parsedMessage.Topic = "window:center"
-		parsedMessage.Data = ""
-
-	// Hide window
-	case 'H':
-		parsedMessage.Topic = "window:hide"
-		parsedMessage.Data = ""
-
-	// Show window
-	case 'S':
-		parsedMessage.Topic = "window:show"
-		parsedMessage.Data = ""
-
-	// Position window
-	case 'p':
-		parsedMessage.Topic = "window:position:" + message[3:]
-		parsedMessage.Data = ""
-
-	// Set window size
-	case 's':
-		parsedMessage.Topic = "window:size:" + message[3:]
-		parsedMessage.Data = ""
-
-	// Maximise window
-	case 'M':
-		parsedMessage.Topic = "window:maximise"
-		parsedMessage.Data = ""
-
-	// Unmaximise window
-	case 'U':
-		parsedMessage.Topic = "window:unmaximise"
-		parsedMessage.Data = ""
-
-	// Minimise window
-	case 'm':
-		parsedMessage.Topic = "window:minimise"
-		parsedMessage.Data = ""
-
-	// Unminimise window
-	case 'u':
-		parsedMessage.Topic = "window:unminimise"
-		parsedMessage.Data = ""
-
-	// Fullscreen window
-	case 'F':
-		parsedMessage.Topic = "window:fullscreen"
-		parsedMessage.Data = ""
-
-		// UnFullscreen window
-	case 'f':
-		parsedMessage.Topic = "window:unfullscreen"
-		parsedMessage.Data = ""
-
-		// Set Title
-	case 'T':
-		parsedMessage.Topic = "window:settitle"
-		parsedMessage.Data = message[2:]
-
 	// Unknown event type
 	default:
 		return nil, fmt.Errorf("unknown message: %s", message)

v2/internal/messagedispatcher/messagedispatcher.go

@@ -1,14 +1,10 @@
 package messagedispatcher
 
 import (
-	"context"
 	"encoding/json"
-	"strconv"
 	"strings"
 	"sync"
 
-	"github.com/wailsapp/wails/v2/pkg/options/dialog"
-
 	"github.com/wailsapp/wails/v2/internal/crypto"
 	"github.com/wailsapp/wails/v2/internal/logger"
 	"github.com/wailsapp/wails/v2/internal/messagedispatcher/message"
@@ -23,8 +19,7 @@ type Dispatcher struct {
 	eventChannel  <-chan *servicebus.Message
 	windowChannel <-chan *servicebus.Message
 	dialogChannel <-chan *servicebus.Message
-	systemChannel <-chan *servicebus.Message
-	menuChannel   <-chan *servicebus.Message
+	running       bool
 
 	servicebus *servicebus.ServiceBus
 	logger     logger.CustomLogger
@@ -32,13 +27,6 @@ type Dispatcher struct {
 	// Clients
 	clients map[string]*DispatchClient
 	lock    sync.RWMutex
-
-	// Context for cancellation
-	ctx    context.Context
-	cancel context.CancelFunc
-
-	// internal wait group
-	wg sync.WaitGroup
 }
 
 // New dispatcher. Needs a service bus to send to.
@@ -73,19 +61,6 @@ func New(servicebus *servicebus.ServiceBus, logger *logger.Logger) (*Dispatcher,
 		return nil, err
 	}
 
-	systemChannel, err := servicebus.Subscribe("system:")
-	if err != nil {
-		return nil, err
-	}
-
-	menuChannel, err := servicebus.Subscribe("menufrontend:")
-	if err != nil {
-		return nil, err
-	}
-
-	// Create context
-	ctx, cancel := context.WithCancel(context.Background())
-
 	result := &Dispatcher{
 		servicebus:    servicebus,
 		eventChannel:  eventChannel,
@@ -95,10 +70,6 @@ func New(servicebus *servicebus.ServiceBus, logger *logger.Logger) (*Dispatcher,
 		quitChannel:   quitChannel,
 		windowChannel: windowChannel,
 		dialogChannel: dialogChannel,
-		systemChannel: systemChannel,
-		menuChannel:   menuChannel,
-		ctx:           ctx,
-		cancel:        cancel,
 	}
 
 	return result, nil
@@ -109,18 +80,15 @@ func (d *Dispatcher) Start() error {
 
 	d.logger.Trace("Starting")
 
-	d.wg.Add(1)
+	d.running = true
 
 	// Spin off a go routine
 	go func() {
-		defer d.logger.Trace("Shutdown")
-		for {
+		for d.running {
 			select {
-			case <-d.ctx.Done():
-				d.wg.Done()
-				return
 			case <-d.quitChannel:
 				d.processQuit()
+				d.running = false
 			case resultMessage := <-d.resultChannel:
 				d.processCallResult(resultMessage)
 			case eventMessage := <-d.eventChannel:
@@ -129,12 +97,11 @@ func (d *Dispatcher) Start() error {
 				d.processWindowMessage(windowMessage)
 			case dialogMessage := <-d.dialogChannel:
 				d.processDialogMessage(dialogMessage)
-			case systemMessage := <-d.systemChannel:
-				d.processSystemMessage(systemMessage)
-			case menuMessage := <-d.menuChannel:
-				d.processMenuMessage(menuMessage)
 			}
 		}
+
+		// Call shutdown
+		d.shutdown()
 	}()
 
 	return nil
@@ -148,6 +115,10 @@ func (d *Dispatcher) processQuit() {
 	}
 }
 
+func (d *Dispatcher) shutdown() {
+	d.logger.Trace("Shutdown")
+}
+
 // RegisterClient will register the given callback with the dispatcher
 // and return a DispatchClient that the caller can use to send messages
 func (d *Dispatcher) RegisterClient(client Client) *DispatchClient {
@@ -195,35 +166,12 @@ func (d *Dispatcher) processCallResult(result *servicebus.Message) {
 	if client == nil {
 		// This is fatal - unknown target!
 		d.logger.Fatal("Unknown target for call result: %+v", result)
-		return
 	}
 
 	d.logger.Trace("Sending message to client %s: R%s", target, result.Data().(string))
 	client.frontend.CallResult(result.Data().(string))
 }
 
-// processSystem
-func (d *Dispatcher) processSystemMessage(result *servicebus.Message) {
-
-	d.logger.Trace("Got system in message dispatcher: %+v", result)
-
-	splitTopic := strings.Split(result.Topic(), ":")
-	command := splitTopic[1]
-	callbackID := splitTopic[2]
-	switch command {
-	case "isdarkmode":
-		d.lock.RLock()
-		for _, client := range d.clients {
-			client.frontend.DarkModeEnabled(callbackID)
-			break
-		}
-		d.lock.RUnlock()
-
-	default:
-		d.logger.Error("Unknown system command: %s", command)
-	}
-}
-
 // processEvent will
 func (d *Dispatcher) processEvent(result *servicebus.Message) {
 
@@ -282,7 +230,7 @@ func (d *Dispatcher) processWindowMessage(result *servicebus.Message) {
 			client.frontend.WindowUnFullscreen()
 		}
 	case "setcolour":
-		colour, ok := result.Data().(int)
+		colour, ok := result.Data().(string)
 		if !ok {
 			d.logger.Error("Invalid colour for 'window:setcolour' : %#v", result.Data())
 			return
@@ -291,105 +239,6 @@ func (d *Dispatcher) processWindowMessage(result *servicebus.Message) {
 		for _, client := range d.clients {
 			client.frontend.WindowSetColour(colour)
 		}
-	case "show":
-		// Notify clients
-		for _, client := range d.clients {
-			client.frontend.WindowShow()
-		}
-	case "hide":
-		// Notify clients
-		for _, client := range d.clients {
-			client.frontend.WindowHide()
-		}
-	case "center":
-		// Notify clients
-		for _, client := range d.clients {
-			client.frontend.WindowCenter()
-		}
-	case "maximise":
-		// Notify clients
-		for _, client := range d.clients {
-			client.frontend.WindowMaximise()
-		}
-	case "unmaximise":
-		// Notify clients
-		for _, client := range d.clients {
-			client.frontend.WindowUnmaximise()
-		}
-	case "minimise":
-		// Notify clients
-		for _, client := range d.clients {
-			client.frontend.WindowMinimise()
-		}
-	case "unminimise":
-		// Notify clients
-		for _, client := range d.clients {
-			client.frontend.WindowUnminimise()
-		}
-	case "position":
-		// We need 2 arguments
-		if len(splitTopic) != 4 {
-			d.logger.Error("Invalid number of parameters for 'window:position' : %#v", result.Data())
-			return
-		}
-		x, err1 := strconv.Atoi(splitTopic[2])
-		y, err2 := strconv.Atoi(splitTopic[3])
-		if err1 != nil || err2 != nil {
-			d.logger.Error("Invalid integer parameters for 'window:position' : %#v", result.Data())
-			return
-		}
-		// Notify clients
-		for _, client := range d.clients {
-			client.frontend.WindowPosition(x, y)
-		}
-	case "size":
-		// We need 2 arguments
-		if len(splitTopic) != 4 {
-			d.logger.Error("Invalid number of parameters for 'window:size' : %#v", result.Data())
-			return
-		}
-		w, err1 := strconv.Atoi(splitTopic[2])
-		h, err2 := strconv.Atoi(splitTopic[3])
-		if err1 != nil || err2 != nil {
-			d.logger.Error("Invalid integer parameters for 'window:size' : %#v", result.Data())
-			return
-		}
-		// Notifh clients
-		for _, client := range d.clients {
-			client.frontend.WindowSize(w, h)
-		}
-	case "minsize":
-		// We need 2 arguments
-		if len(splitTopic) != 4 {
-			d.logger.Error("Invalid number of parameters for 'window:minsize' : %#v", result.Data())
-			return
-		}
-		w, err1 := strconv.Atoi(splitTopic[2])
-		h, err2 := strconv.Atoi(splitTopic[3])
-		if err1 != nil || err2 != nil {
-			d.logger.Error("Invalid integer parameters for 'window:minsize' : %#v", result.Data())
-			return
-		}
-		// Notifh clients
-		for _, client := range d.clients {
-			client.frontend.WindowSetMinSize(w, h)
-		}
-	case "maxsize":
-		// We need 2 arguments
-		if len(splitTopic) != 4 {
-			d.logger.Error("Invalid number of parameters for 'window:maxsize' : %#v", result.Data())
-			return
-		}
-		w, err1 := strconv.Atoi(splitTopic[2])
-		h, err2 := strconv.Atoi(splitTopic[3])
-		if err1 != nil || err2 != nil {
-			d.logger.Error("Invalid integer parameters for 'window:maxsize' : %#v", result.Data())
-			return
-		}
-		// Notifh clients
-		for _, client := range d.clients {
-			client.frontend.WindowSetMaxSize(w, h)
-		}
 	default:
 		d.logger.Error("Unknown window command: %s", command)
 	}
@@ -400,6 +249,7 @@ func (d *Dispatcher) processWindowMessage(result *servicebus.Message) {
 // processDialogMessage processes dialog messages
 func (d *Dispatcher) processDialogMessage(result *servicebus.Message) {
 	splitTopic := strings.Split(result.Topic(), ":")
+
 	if len(splitTopic) < 4 {
 		d.logger.Error("Invalid dialog message : %#v", result.Data())
 		return
@@ -409,142 +259,61 @@ func (d *Dispatcher) processDialogMessage(result *servicebus.Message) {
 	switch command {
 	case "select":
 		dialogType := splitTopic[2]
+		title := splitTopic[3]
 		switch dialogType {
-		case "open":
-			dialogOptions, ok := result.Data().(*dialog.OpenDialog)
+		case "file":
+			responseTopic, ok := result.Data().(string)
 			if !ok {
-				d.logger.Error("Invalid data for 'dialog:select:open' : %#v", result.Data())
+				d.logger.Error("Invalid responseTopic for 'dialog:select:file' : %#v", result.Data())
 				return
 			}
-			// This is hardcoded in the sender too
-			callbackID := splitTopic[3]
+			d.logger.Info("Opening File dialog! responseTopic = %s", responseTopic)
 
 			// TODO: Work out what we mean in a multi window environment...
 			// For now we will just pick the first one
+			var result string
 			for _, client := range d.clients {
-				client.frontend.OpenDialog(dialogOptions, callbackID)
+				result = client.frontend.OpenFileDialog(title)
 			}
-		case "save":
-			dialogOptions, ok := result.Data().(*dialog.SaveDialog)
+
+			// Send dummy response
+			d.servicebus.Publish(responseTopic, result)
+		case "filesave":
+			responseTopic, ok := result.Data().(string)
 			if !ok {
-				d.logger.Error("Invalid data for 'dialog:select:save' : %#v", result.Data())
+				d.logger.Error("Invalid responseTopic for 'dialog:select:filesave' : %#v", result.Data())
 				return
 			}
-			// This is hardcoded in the sender too
-			callbackID := splitTopic[3]
+			d.logger.Info("Opening Save File dialog! responseTopic = %s", responseTopic)
 
 			// TODO: Work out what we mean in a multi window environment...
 			// For now we will just pick the first one
+			var result string
 			for _, client := range d.clients {
-				client.frontend.SaveDialog(dialogOptions, callbackID)
+				result = client.frontend.SaveFileDialog(title)
 			}
-		case "message":
-			dialogOptions, ok := result.Data().(*dialog.MessageDialog)
+
+			// Send dummy response
+			d.servicebus.Publish(responseTopic, result)
+		case "directory":
+			responseTopic, ok := result.Data().(string)
 			if !ok {
-				d.logger.Error("Invalid data for 'dialog:select:message' : %#v", result.Data())
+				d.logger.Error("Invalid responseTopic for 'dialog:select:directory' : %#v", result.Data())
 				return
 			}
-			// This is hardcoded in the sender too
-			callbackID := splitTopic[3]
+			d.logger.Info("Opening Directory dialog! responseTopic = %s", responseTopic)
 
 			// TODO: Work out what we mean in a multi window environment...
 			// For now we will just pick the first one
+			var result string
 			for _, client := range d.clients {
-				client.frontend.MessageDialog(dialogOptions, callbackID)
+				result = client.frontend.OpenDirectoryDialog(title)
 			}
+			// Send dummy response
+			d.servicebus.Publish(responseTopic, result)
+
 		default:
-			d.logger.Error("Unknown dialog type: %s", dialogType)
+			d.logger.Error("Unknown dialog command: %s", command)
 		}
-
-	default:
-		d.logger.Error("Unknown dialog command: %s", command)
-	}
-
-}
-
-func (d *Dispatcher) processMenuMessage(result *servicebus.Message) {
-	splitTopic := strings.Split(result.Topic(), ":")
-	if len(splitTopic) < 2 {
-		d.logger.Error("Invalid menu message : %#v", result.Data())
-		return
-	}
-
-	command := splitTopic[1]
-	switch command {
-	case "updateappmenu":
-
-		updatedMenu, ok := result.Data().(string)
-		if !ok {
-			d.logger.Error("Invalid data for 'menufrontend:updateappmenu' : %#v",
-				result.Data())
-			return
-		}
-
-		// TODO: Work out what we mean in a multi window environment...
-		// For now we will just pick the first one
-		for _, client := range d.clients {
-			client.frontend.SetApplicationMenu(updatedMenu)
-		}
-
-	case "settraymenu":
-		trayMenuJSON, ok := result.Data().(string)
-		if !ok {
-			d.logger.Error("Invalid data for 'menufrontend:settraymenu' : %#v",
-				result.Data())
-			return
-		}
-
-		// TODO: Work out what we mean in a multi window environment...
-		// For now we will just pick the first one
-		for _, client := range d.clients {
-			client.frontend.SetTrayMenu(trayMenuJSON)
-		}
-
-	case "updatecontextmenu":
-		updatedContextMenu, ok := result.Data().(string)
-		if !ok {
-			d.logger.Error("Invalid data for 'menufrontend:updatecontextmenu' : %#v",
-				result.Data())
-			return
-		}
-
-		// TODO: Work out what we mean in a multi window environment...
-		// For now we will just pick the first one
-		for _, client := range d.clients {
-			client.frontend.UpdateContextMenu(updatedContextMenu)
-		}
-
-	case "updatetraymenulabel":
-		updatedTrayMenuLabel, ok := result.Data().(string)
-		if !ok {
-			d.logger.Error("Invalid data for 'menufrontend:updatetraymenulabel' : %#v",
-				result.Data())
-			return
-		}
-
-		// TODO: Work out what we mean in a multi window environment...
-		// For now we will just pick the first one
-		for _, client := range d.clients {
-			client.frontend.UpdateTrayMenuLabel(updatedTrayMenuLabel)
-		}
-	case "deletetraymenu":
-		traymenuid, ok := result.Data().(string)
-		if !ok {
-			d.logger.Error("Invalid data for 'menufrontend:updatetraymenulabel' : %#v",
-				result.Data())
-			return
-		}
-
-		for _, client := range d.clients {
-			client.frontend.DeleteTrayMenuByID(traymenuid)
-		}
-
-	default:
-		d.logger.Error("Unknown menufrontend command: %s", command)
 	}
 }
-
-func (d *Dispatcher) Close() {
-	d.cancel()
-	d.wg.Wait()
-}

v2/internal/parse/parse.go

@@ -10,6 +10,8 @@ import (
 	"golang.org/x/tools/go/packages"
 )
 
+var internalMethods = slicer.String([]string{"WailsInit", "Wails Shutdown"})
+
 var structCache = make(map[string]*ParsedStruct)
 var boundStructs = make(map[string]*ParsedStruct)
 var boundMethods = []string{}
@@ -47,7 +49,7 @@ func ParseProject(projectPath string) (BoundStructs, error) {
 	cfg := &packages.Config{Mode: packages.NeedFiles | packages.NeedSyntax | packages.NeedTypesInfo}
 	pkgs, err := packages.Load(cfg, projectPath)
 	if err != nil {
-		_, _ = fmt.Fprintf(os.Stderr, "load: %v\n", err)
+		fmt.Fprintf(os.Stderr, "load: %v\n", err)
 		os.Exit(1)
 	}
 	if packages.PrintErrors(pkgs) > 0 {
@@ -63,6 +65,7 @@ func ParseProject(projectPath string) (BoundStructs, error) {
 			var wailsPkgVar = ""
 
 			ast.Inspect(file, func(n ast.Node) bool {
+				var s string
 				switch x := n.(type) {
 				// Parse import declarations
 				case *ast.ImportSpec:
@@ -201,6 +204,10 @@ func ParseProject(projectPath string) (BoundStructs, error) {
 								// This is a struct pointer method
 								i, ok := se.X.(*ast.Ident)
 								if ok {
+									// We want to ignore Internal functions
+									if internalMethods.Contains(x.Name.Name) {
+										continue
+									}
 									// If we haven't already found this struct,
 									// Create a placeholder in the cache
 									parsedStruct := structCache[i.Name]
@@ -431,6 +438,4 @@ func ParseProject(projectPath string) (BoundStructs, error) {
 	println()
 	println("}")
 	println()
-
-	return nil, nil
 }

v2/internal/process/process.go

@@ -1,30 +1,26 @@
 package process
 
 import (
-	"os"
 	"os/exec"
 
-	"github.com/wailsapp/wails/v2/pkg/clilogger"
+	"github.com/wailsapp/wails/v2/internal/logger"
 )
 
 // Process defines a process that can be executed
 type Process struct {
-	logger      *clilogger.CLILogger
+	logger      *logger.Logger
 	cmd         *exec.Cmd
 	exitChannel chan bool
 	Running     bool
 }
 
 // NewProcess creates a new process struct
-func NewProcess(logger *clilogger.CLILogger, cmd string, args ...string) *Process {
-	result := &Process{
+func NewProcess(logger *logger.Logger, cmd string, args ...string) *Process {
+	return &Process{
 		logger:      logger,
 		cmd:         exec.Command(cmd, args...),
 		exitChannel: make(chan bool, 1),
 	}
-	result.cmd.Stdout = os.Stdout
-	result.cmd.Stderr = os.Stderr
-	return result
 }
 
 // Start the process
@@ -37,15 +33,10 @@ func (p *Process) Start() error {
 
 	p.Running = true
 
-	go func(cmd *exec.Cmd, running *bool, logger *clilogger.CLILogger, exitChannel chan bool) {
-		logger.Println("Starting process (PID: %d)", cmd.Process.Pid)
-		err := cmd.Wait()
-		if err != nil {
-			if err.Error() != "signal: killed" {
-				logger.Fatal("Fatal error from app: " + err.Error())
-			}
-		}
-		logger.Println("Exiting process (PID: %d)", cmd.Process.Pid)
+	go func(cmd *exec.Cmd, running *bool, logger *logger.Logger, exitChannel chan bool) {
+		logger.Info("Starting process (PID: %d)", cmd.Process.Pid)
+		cmd.Wait()
+		logger.Info("Exiting process (PID: %d)", cmd.Process.Pid)
 		*running = false
 		exitChannel <- true
 	}(p.cmd, &p.Running, p.logger, p.exitChannel)

v2/internal/project/project.go

@@ -25,9 +25,6 @@ type Project struct {
 	// The path to the project directory
 	Path string
 
-	// Assets directory
-	AssetsDir string `json:"assetsdir"`
-
 	// The output filename
 	OutputFilename string `json:"outputfilename"`
 
@@ -36,15 +33,6 @@ type Project struct {
 
 	// The platform to target
 	Platform string
-
-	// The application author
-	Author Author
-}
-
-// Author stores details about the application author
-type Author struct {
-	Name  string `json:"name"`
-	Email string `json:"email"`
 }
 
 // Load the project from the current working directory
@@ -75,11 +63,6 @@ func Load(projectPath string) (*Project, error) {
 		result.Name = "wailsapp"
 	}
 
-	// Set default assets directory if none given
-	if result.AssetsDir == "" {
-		result.AssetsDir = filepath.Join(result.Path, "assets")
-	}
-
 	// Fix up OutputFilename
 	switch runtime.GOOS {
 	case "windows":

v2/internal/runtime/goruntime/browser.go

@@ -0,0 +1,36 @@
+package goruntime
+
+import (
+	"fmt"
+	"os/exec"
+	"runtime"
+)
+
+// Browser defines all browser related operations
+type Browser interface {
+	Open(url string) error
+}
+
+type browser struct{}
+
+// Open a url / file using the system default application
+// Credit: https://gist.github.com/hyg/9c4afcd91fe24316cbf0
+func (b *browser) Open(url string) error {
+	var err error
+
+	switch runtime.GOOS {
+	case "linux":
+		err = exec.Command("xdg-open", url).Start()
+	case "windows":
+		err = exec.Command("rundll32", "url.dll,FileProtocolHandler", url).Start()
+	case "darwin":
+		err = exec.Command("open", url).Start()
+	default:
+		err = fmt.Errorf("unsupported platform")
+	}
+	return err
+}
+
+func newBrowser() *browser {
+	return &browser{}
+}

v2/internal/runtime/goruntime/browser_test.go

@@ -0,0 +1,16 @@
+package goruntime
+
+import (
+	"os"
+	"testing"
+
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/servicebus"
+)
+
+func TestBrowserOpen(t *testing.T) {
+	mylogger := logger.New(os.Stdout)
+	myServiceBus := servicebus.New(mylogger)
+	myRuntime := New(myServiceBus)
+	myRuntime.Browser.Open("http://www.google.com")
+}

v2/internal/runtime/goruntime/dialog.go

@@ -0,0 +1,105 @@
+package goruntime
+
+import (
+	"fmt"
+
+	"github.com/wailsapp/wails/v2/internal/crypto"
+	"github.com/wailsapp/wails/v2/internal/servicebus"
+)
+
+// Dialog defines all Dialog related operations
+type Dialog interface {
+	SaveFile(title string) string
+	SelectFile(title string) string
+	SelectDirectory(title string) string
+}
+
+// dialog exposes the Dialog interface
+type dialog struct {
+	bus *servicebus.ServiceBus
+}
+
+// newDialogs creates a new Dialogs struct
+func newDialog(bus *servicebus.ServiceBus) Dialog {
+	return &dialog{
+		bus: bus,
+	}
+}
+
+// SelectFile prompts the user to select a file
+func (r *dialog) SelectFile(title string) string {
+
+	// Create unique dialog callback
+	uniqueCallback := crypto.RandomID()
+
+	// Subscribe to the respose channel
+	responseTopic := "dialog:fileselected:" + uniqueCallback
+	dialogResponseChannel, err := r.bus.Subscribe(responseTopic)
+	if err != nil {
+		fmt.Printf("ERROR: Cannot subscribe to bus topic: %+v\n", err.Error())
+	}
+
+	// Publish dialog request
+	// TODO: Add title to request
+	r.bus.Publish("dialog:select:file:"+title, responseTopic)
+
+	// Wait for result
+	result := <-dialogResponseChannel
+
+	// Delete subscription to response topic
+	r.bus.UnSubscribe(responseTopic)
+
+	return result.Data().(string)
+}
+
+// SaveFile prompts the user to select a file to save to
+func (r *dialog) SaveFile(title string) string {
+
+	// Create unique dialog callback
+	uniqueCallback := crypto.RandomID()
+
+	// Subscribe to the respose channel
+	responseTopic := "dialog:filesaveselected:" + uniqueCallback
+	dialogResponseChannel, err := r.bus.Subscribe(responseTopic)
+	if err != nil {
+		fmt.Printf("ERROR: Cannot subscribe to bus topic: %+v\n", err.Error())
+	}
+
+	// Publish dialog request
+	// TODO: Add title to request
+	r.bus.Publish("dialog:select:filesave:"+title, responseTopic)
+
+	// Wait for result
+	result := <-dialogResponseChannel
+
+	// Delete subscription to response topic
+	r.bus.UnSubscribe(responseTopic)
+
+	return result.Data().(string)
+}
+
+// SelectDirectory prompts the user to select a file
+func (r *dialog) SelectDirectory(title string) string {
+
+	// Create unique dialog callback
+	uniqueCallback := crypto.RandomID()
+
+	// Subscribe to the respose channel
+	responseTopic := "dialog:directoryselected:" + uniqueCallback
+	dialogResponseChannel, err := r.bus.Subscribe(responseTopic)
+	if err != nil {
+		fmt.Printf("ERROR: Cannot subscribe to bus topic: %+v\n", err.Error())
+	}
+
+	// Publish dialog request
+	// TODO: Add title to request
+	r.bus.Publish("dialog:select:directory:"+title, responseTopic)
+
+	// Wait for result
+	var result *servicebus.Message = <-dialogResponseChannel
+
+	// Delete subscription to response topic
+	r.bus.UnSubscribe(responseTopic)
+
+	return result.Data().(string)
+}

v2/internal/runtime/goruntime/events.go

@@ -0,0 +1,43 @@
+package goruntime
+
+import (
+	"github.com/wailsapp/wails/v2/internal/messagedispatcher/message"
+	"github.com/wailsapp/wails/v2/internal/servicebus"
+)
+
+// Events defines all events related operations
+type Events interface {
+	On(eventName string, callback func(optionalData ...interface{}))
+	Emit(eventName string, optionalData ...interface{})
+}
+
+// event exposes the events interface
+type event struct {
+	bus *servicebus.ServiceBus
+}
+
+// newEvents creates a new Events struct
+func newEvents(bus *servicebus.ServiceBus) Events {
+	return &event{
+		bus: bus,
+	}
+}
+
+// On pass through
+func (r *event) On(eventName string, callback func(optionalData ...interface{})) {
+	eventMessage := &message.OnEventMessage{
+		Name:     eventName,
+		Callback: callback,
+	}
+	r.bus.Publish("event:on", eventMessage)
+}
+
+// Emit pass through
+func (r *event) Emit(eventName string, optionalData ...interface{}) {
+	eventMessage := &message.EventMessage{
+		Name: eventName,
+		Data: optionalData,
+	}
+
+	r.bus.Publish("event:emit:from:g", eventMessage)
+}

v2/internal/runtime/goruntime/runtime.go

@@ -0,0 +1,28 @@
+package goruntime
+
+import "github.com/wailsapp/wails/v2/internal/servicebus"
+
+// Runtime is a means for the user to interact with the application at runtime
+type Runtime struct {
+	Browser Browser
+	Events  Events
+	Window  Window
+	Dialog  Dialog
+	bus     *servicebus.ServiceBus
+}
+
+// New creates a new runtime
+func New(serviceBus *servicebus.ServiceBus) *Runtime {
+	return &Runtime{
+		Browser: newBrowser(),
+		Events:  newEvents(serviceBus),
+		Window:  newWindow(serviceBus),
+		Dialog:  newDialog(serviceBus),
+		bus:     serviceBus,
+	}
+}
+
+// Quit the application
+func (r *Runtime) Quit() {
+	r.bus.Publish("quit", "runtime.Quit()")
+}

v2/internal/runtime/goruntime/window.go

@@ -0,0 +1,54 @@
+package goruntime
+
+import (
+	"github.com/wailsapp/wails/v2/internal/servicebus"
+)
+
+// Window defines all Window related operations
+type Window interface {
+	Close()
+	SetTitle(title string)
+	Fullscreen()
+	UnFullscreen()
+	SetColour(colour string)
+}
+
+// Window exposes the Windows interface
+type window struct {
+	bus *servicebus.ServiceBus
+}
+
+// newWindow creates a new window struct
+func newWindow(bus *servicebus.ServiceBus) Window {
+	return &window{
+		bus: bus,
+	}
+}
+
+// Close the Window
+// DISCUSSION:
+//   Should we even be doing this now we have a server build?
+//   Runtime.Quit() makes more sense than closing a window...
+func (w *window) Close() {
+	w.bus.Publish("quit", "runtime.Close()")
+}
+
+// SetTitle sets the title of the window
+func (w *window) SetTitle(title string) {
+	w.bus.Publish("window:settitle", title)
+}
+
+// Fullscreen makes the window fullscreen
+func (w *window) Fullscreen() {
+	w.bus.Publish("window:fullscreen", "")
+}
+
+// UnFullscreen makes the window UnFullscreen
+func (w *window) UnFullscreen() {
+	w.bus.Publish("window:unfullscreen", "")
+}
+
+// SetColour sets the window colour to the given string
+func (w *window) SetColour(colour string) {
+	w.bus.Publish("window:setcolour", colour)
+}

v2/internal/runtime/js/.eslintrc

@@ -3,12 +3,12 @@
         "browser": true,
         "es6": true,
         "amd": true,
-        "node": true
+        "node": true,
     },
     "extends": "eslint:recommended",
     "parserOptions": {
-        "ecmaVersion": 2020,
-        "sourceType": "module"
+        "ecmaVersion": 2016,
+        "sourceType": "module",
     },
     "rules": {
         "linebreak-style": 0,

v2/internal/runtime/js/core/bindings.js

@@ -65,7 +65,7 @@ export function SetBindings(bindingsMap) {
 				window.backend[packageName][structName][methodName] = function () {
 
 					// No timeout by default
-					let timeout = 0;
+					var timeout = 0;
 
 					// Actual function
 					function dynamic() {
@@ -89,3 +89,19 @@ export function SetBindings(bindingsMap) {
 		});
 	});
 }
+// /**
+//  * Determines if the given identifier is valid Javascript
+//  *
+//  * @param {boolean} name
+//  * @returns
+//  */
+// function isValidIdentifier(name) {
+// 	// Don't xss yourself :-)
+// 	try {
+// 		new Function('var ' + name);
+// 		return true;
+// 	} catch (e) {
+// 		return false;
+// 	}
+// }
+

v2/internal/runtime/js/core/browser.js

@@ -12,13 +12,23 @@ The lightweight framework for web-like apps
 import { SendMessage } from 'ipc';
 
 /**
- * Opens the given URL / filename in the system browser
+ * Opens the given URL in the system browser
  *
  * @export
- * @param {string} target
+ * @param {string} url
  * @returns
  */
-export function Open(target) {
-	return SendMessage('RBO' + target);
+export function OpenURL(url) {
+	return SendMessage('RBU' + url);
 }
 
+/**
+ * Opens the given filename using the system's default file handler
+ *
+ * @export
+ * @param {sting} filename
+ * @returns
+ */
+export function OpenFile(filename) {
+	return SendMessage('runtime:browser:openfile', filename);
+}

v2/internal/runtime/js/core/calls.js

@@ -151,7 +151,6 @@ export function Callback(incomingMessage) {
  * @param {any[]=} data
  * @returns
  */
-export function SystemCall(method) {
-	var data = [].slice.apply(arguments).slice(1);
+export function SystemCall(method, data) {
 	return Call('.wails.' + method, data);
 }

v2/internal/runtime/js/core/desktop.js

@@ -10,19 +10,16 @@ The lightweight framework for web-like apps
 /* jshint esversion: 6 */
 import { SetBindings } from './bindings';
 import { Init } from './main';
-import {RaiseError} from '../desktop/darwin';
 
 // Setup global error handler
-window.onerror = function (msg, url, lineNo, columnNo, error) {
-	const errorMessage = {
-		message: msg,
-		url: url,
-		line: lineNo,
-		column: columnNo,
-		error: JSON.stringify(error),
-		stack: function() { return JSON.stringify(new Error().stack); }(),
-	};
-	RaiseError(errorMessage);
+window.onerror = function (/*msg, url, lineNo, columnNo, error*/) {
+	// window.wails.Log.Error('**** Caught Unhandled Error ****');
+	// window.wails.Log.Error('Message: ' + msg);
+	// window.wails.Log.Error('URL: ' + url);
+	// window.wails.Log.Error('Line No: ' + lineNo);
+	// window.wails.Log.Error('Column No: ' + columnNo);
+	// window.wails.Log.Error('error: ' + error);
+	(function () { window.wails.Log.Error(new Error().stack); })();
 };
 
 // Initialise the Runtime

v2/internal/runtime/js/core/events.js

@@ -13,7 +13,6 @@ import { Error } from './log';
 import { SendMessage } from 'ipc';
 
 // Defines a single listener with a maximum number of times to callback
-
 /**
  * The Listener class defines a listener! :-)
  *
@@ -44,7 +43,7 @@ class Listener {
 	}
 }
 
-let eventListeners = {};
+var eventListeners = {};
 
 /**
  * Registers an event listener that will be invoked `maxCallbacks` times before being destroyed
@@ -72,17 +71,6 @@ export function On(eventName, callback) {
 	OnMultiple(eventName, callback);
 }
 
-/**
- * Registers listeners for when the system theme changes from light/dark. A bool is
- * sent to the listener, true if it is dark mode.
- *
- * @export
- * @param {function} callback
- */
-export function OnThemeChange(callback) {
-	On('wails:system:themechange', callback);
-}
-
 /**
  * Registers an event listener that will be invoked once then destroyed
  *
@@ -94,43 +82,11 @@ export function Once(eventName, callback) {
 	OnMultiple(eventName, callback, 1);
 }
 
-function notifyListeners(eventData) {
-
-	// Get the event name
-	let eventName = eventData.name;
-
-	// Check if we have any listeners for this event
-	if (eventListeners[eventName]) {
-
-		// Keep a list of listener indexes to destroy
-		const newEventListenerList = eventListeners[eventName].slice();
-
-		// Iterate listeners
-		for (let count = 0; count < eventListeners[eventName].length; count += 1) {
-
-			// Get next listener
-			const listener = eventListeners[eventName][count];
-
-			let data = eventData.data;
-
-			// Do the callback
-			const destroy = listener.Callback(data);
-			if (destroy) {
-				// if the listener indicated to destroy itself, add it to the destroy list
-				newEventListenerList.splice(count, 1);
-			}
-		}
-
-		// Update callbacks with new list of listeners
-		eventListeners[eventName] = newEventListenerList;
-	}
-}
-
 /**
  * Notify informs frontend listeners that an event was emitted with the given data
  *
  * @export
- * @param {string} notifyMessage - encoded notification message
+ * @param {string} encoded notification message
 
  */
 export function Notify(notifyMessage) {
@@ -144,7 +100,33 @@ export function Notify(notifyMessage) {
 		throw new Error(error);
 	}
 
-	notifyListeners(message);
+	var eventName = message.name;
+
+	// Check if we have any listeners for this event
+	if (eventListeners[eventName]) {
+
+		// Keep a list of listener indexes to destroy
+		const newEventListenerList = eventListeners[eventName].slice();
+
+		// Iterate listeners
+		for (let count = 0; count < eventListeners[eventName].length; count += 1) {
+
+			// Get next listener
+			const listener = eventListeners[eventName][count];
+
+			var data = message.data;
+
+			// Do the callback
+			const destroy = listener.Callback(data);
+			if (destroy) {
+				// if the listener indicated to destroy itself, add it to the destroy list
+				newEventListenerList.splice(count, 1);
+			}
+		}
+
+		// Update callbacks with new list of listners
+		eventListeners[eventName] = newEventListenerList;
+	}
 }
 
 /**
@@ -155,15 +137,66 @@ export function Notify(notifyMessage) {
  */
 export function Emit(eventName) {
 
-	const payload = {
-		name: eventName,
-		data: [].slice.apply(arguments).slice(1),
-	};
+	// Calculate the data
+	if (arguments.length > 1) {
+		// Notify backend
+		const payload = {
+			name: eventName,
+			data: [].slice.apply(arguments).slice(1),
+		};
+		SendMessage('Ej' + JSON.stringify(payload));
+	} else {
+		SendMessage('ej' + eventName);
+	}
 
-	// Notify JS listeners
-	notifyListeners(payload);
+}
 
-	// Notify Go listeners
-	SendMessage('Ej' + JSON.stringify(payload));
+// Callbacks for the heartbeat calls
+const heartbeatCallbacks = {};
 
-}
+/**
+ * Heartbeat emits the event `eventName`, every `timeInMilliseconds` milliseconds until
+ * the event is acknowledged via `Event.Acknowledge`. Once this happens, `callback` is invoked ONCE
+ *
+ * @export
+ * @param {string} eventName
+ * @param {number} timeInMilliseconds
+ * @param {function} callback
+ */
+export function Heartbeat(eventName, timeInMilliseconds, callback) {
+
+	// Declare interval variable
+	let interval = null;
+
+	// Setup callback
+	function dynamicCallback() {
+		// Kill interval
+		clearInterval(interval);
+		// Callback
+		callback();
+	}
+
+	// Register callback
+	heartbeatCallbacks[eventName] = dynamicCallback;
+
+	// Start emitting the event
+	interval = setInterval(function () {
+		Emit(eventName);
+	}, timeInMilliseconds);
+}
+
+/**
+ * Acknowledges a heartbeat event by name
+ *
+ * @export
+ * @param {string} eventName
+ */
+export function Acknowledge(eventName) {
+	// If we are waiting for acknowledgement for this event type
+	if (heartbeatCallbacks[eventName]) {
+		// Acknowledge!
+		heartbeatCallbacks[eventName]();
+	} else {
+		throw new Error(`Cannot acknowledge unknown heartbeat '${eventName}'`);
+	}
+}

v2/internal/runtime/js/core/log.js

@@ -25,26 +25,6 @@ function sendLogMessage(level, message) {
 	SendMessage('L' + level + message);
 }
 
-/**
- * Log the given trace message with the backend
- *
- * @export
- * @param {string} message
- */
-export function Trace(message) {
-	sendLogMessage('T', message);
-}
-
-/**
- * Log the given message with the backend
- *
- * @export
- * @param {string} message
- */
-export function Print(message) {
-	sendLogMessage('P', message);
-}
-
 /**
  * Log the given debug message with the backend
  *
@@ -94,22 +74,3 @@ export function Error(message) {
 export function Fatal(message) {
 	sendLogMessage('F', message);
 }
-
-/**
- * Sets the Log level to the given log level
- *
- * @export
- * @param {number} loglevel
- */
-export function SetLogLevel(loglevel) {
-	sendLogMessage('S', loglevel);
-}
-
-// Log levels
-export const Level = {
-	TRACE: 1,
-	DEBUG: 2,
-	INFO: 3,
-	WARNING: 4,
-	ERROR: 5,
-};