v2.0.0-alpha.44

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

@@ -57,6 +57,11 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 	keepAssets := false
 	command.BoolFlag("k", "Keep generated assets", &keepAssets)
 
+	appleIdentity := ""
+	if runtime.GOOS == "darwin" {
+		command.StringFlag("sign", "Signs your app with the given identity.", &appleIdentity)
+	}
+
 	command.Action(func() error {
 
 		// Create logger
@@ -72,6 +77,11 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 			app.PrintBanner()
 		}
 
+		// Ensure package is used with apple identity
+		if appleIdentity != "" && pack == false {
+			return fmt.Errorf("must use `-package` flag when using `-sign`")
+		}
+
 		task := fmt.Sprintf("Building %s Application", strings.Title(outputType))
 		logger.Println(task)
 		logger.Println(strings.Repeat("-", len(task)))
@@ -84,14 +94,15 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 
 		// Create BuildOptions
 		buildOptions := &build.Options{
-			Logger:     logger,
-			OutputType: outputType,
-			Mode:       mode,
-			Pack:       pack,
-			Platform:   platform,
-			LDFlags:    ldflags,
-			Compiler:   compilerCommand,
-			KeepAssets: keepAssets,
+			Logger:        logger,
+			OutputType:    outputType,
+			Mode:          mode,
+			Pack:          pack,
+			Platform:      platform,
+			LDFlags:       ldflags,
+			Compiler:      compilerCommand,
+			KeepAssets:    keepAssets,
+			AppleIdentity: appleIdentity,
 		}
 
 		return doBuild(buildOptions)

v2/cmd/wails/version.go

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

v2/internal/app/desktop.go

@@ -35,6 +35,7 @@ type App struct {
 	//binding    *subsystem.Binding
 	call       *subsystem.Call
 	menu       *subsystem.Menu
+	url        *subsystem.URL
 	dispatcher *messagedispatcher.Dispatcher
 
 	menuManager *menumanager.Manager
@@ -160,6 +161,19 @@ func (a *App) Run() error {
 		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
+		}
+	}
+
 	// Start the eventing subsystem
 	eventsubsystem, err := subsystem.NewEvent(ctx, a.servicebus, a.logger)
 	if err != nil {

v2/internal/ffenestri/ffenestri_darwin.c

@@ -46,6 +46,15 @@ int hashmap_log(void *const context, struct hashmap_element_s *const e) {
   return 0;
 }
 
+void filelog(const char *message) {
+    FILE *fp = fopen("/tmp/wailslog.txt", "ab");
+    if (fp != NULL)
+    {
+        fputs(message, fp);
+        fclose(fp);
+    }
+}
+
 // Utility function to visualise a hashmap
 void dumpHashmap(const char *name, struct hashmap_s *hashmap) {
   printf("%s = { ", name);
@@ -113,6 +122,7 @@ struct Application {
 	int useToolBar;
 	int hideToolbarSeparator;
 	int windowBackgroundIsTranslucent;
+	int hasURLHandlers;
 
 	// Menu
 	Menu *applicationMenu;
@@ -1143,17 +1153,31 @@ void DarkModeEnabled(struct Application *app, const char *callbackID) {
 	);
 }
 
+void getURL(id self, SEL selector, id event, id replyEvent) {
+    id desc = msg(event, s("paramDescriptorForKeyword:"), keyDirectObject);
+    id url = msg(desc, s("stringValue"));
+    const char* curl = cstr(url);
+    const char* message = concat("UC", curl);
+    messageFromWindowCallback(message);
+    MEMFREE(message);
+}
+
+
 void createDelegate(struct Application *app) {
 		// Define delegate
 	Class delegateClass = objc_allocateClassPair((Class) c("NSObject"), "AppDelegate", 0);
 	bool resultAddProtoc = class_addProtocol(delegateClass, objc_getProtocol("NSApplicationDelegate"));
     class_addMethod(delegateClass, s("applicationShouldTerminateAfterLastWindowClosed:"), (IMP) no, "c@:@");
-//	class_addMethod(delegateClass, s("applicationWillTerminate:"), (IMP) closeWindow, "v@:@");
 	class_addMethod(delegateClass, s("applicationWillFinishLaunching:"), (IMP) willFinishLaunching, "v@:@");
 
 	// All Menu Items use a common callback
     class_addMethod(delegateClass, s("menuItemCallback:"), (IMP)menuItemCallback, "v@:@");
 
+    // If there are URL Handlers, register the callback method
+    if( app->hasURLHandlers ) {
+    	class_addMethod(delegateClass, s("getUrl:withReplyEvent:"), (IMP) getURL, "i@:@@");
+    }
+
 	// Script handler
 	class_addMethod(delegateClass, s("userContentController:didReceiveScriptMessage:"), (IMP) messageHandler, "v@:@@");
 	objc_registerClassPair(delegateClass);
@@ -1162,6 +1186,12 @@ void createDelegate(struct Application *app) {
 	id delegate = msg((id)delegateClass, s("new"));
 	objc_setAssociatedObject(delegate, "application", (id)app, OBJC_ASSOCIATION_ASSIGN);
 
+    // If there are URL Handlers, register a listener for them
+    if( app->hasURLHandlers ) {
+        id eventManager = msg(c("NSAppleEventManager"), s("sharedAppleEventManager"));
+        msg(eventManager, s("setEventHandler:andSelector:forEventClass:andEventID:"), delegate, s("getUrl:withReplyEvent:"), kInternetEventClass, kAEGetURL);
+    }
+
 	// Theme change listener
 	class_addMethod(delegateClass, s("themeChanged:"), (IMP) themeChanged, "v@:@@");
 
@@ -1177,13 +1207,19 @@ void createDelegate(struct Application *app) {
 bool windowShouldClose(id self, SEL cmd, id sender) {
     msg(sender, s("orderBack:"));
     return false;
-  }
+}
+
+bool windowShouldExit(id self, SEL cmd, id sender) {
+    msg(sender, s("orderBack:"));
+    messageFromWindowCallback("WC");
+    return false;
+}
 
 void createMainWindow(struct Application *app) {
 	// Create main window
 	id mainWindow = ALLOC("NSWindow");
 	mainWindow = msg(mainWindow, s("initWithContentRect:styleMask:backing:defer:"),
-		  CGRectMake(0, 0, app->width, app->height), app->decorations, NSBackingStoreBuffered, NO);
+    CGRectMake(0, 0, app->width, app->height), app->decorations, NSBackingStoreBuffered, NO);
 	msg(mainWindow, s("autorelease"));
 
 	// Set Appearance
@@ -1197,14 +1233,16 @@ void createMainWindow(struct Application *app) {
 	msg(mainWindow, s("setTitlebarAppearsTransparent:"), app->titlebarAppearsTransparent ? YES : NO);
 	msg(mainWindow, s("setTitleVisibility:"), app->hideTitle);
 
-	if( app->hideWindowOnClose ) {
-	    // Create window delegate to override windowShouldClose
-        Class delegateClass = objc_allocateClassPair((Class) c("NSObject"), "WindowDelegate", 0);
-        bool resultAddProtoc = class_addProtocol(delegateClass, objc_getProtocol("NSWindowDelegate"));
+    // Create window delegate to override windowShouldClose
+    Class delegateClass = objc_allocateClassPair((Class) c("NSObject"), "WindowDelegate", 0);
+    bool resultAddProtoc = class_addProtocol(delegateClass, objc_getProtocol("NSWindowDelegate"));
+    if( app->hideWindowOnClose ) {
         class_replaceMethod(delegateClass, s("windowShouldClose:"), (IMP) windowShouldClose, "v@:@");
-        app->windowDelegate = msg((id)delegateClass, s("new"));
-        msg(mainWindow, s("setDelegate:"), app->windowDelegate);
-	}
+    } else {
+        class_replaceMethod(delegateClass, s("windowShouldClose:"), (IMP) windowShouldExit, "v@:@");
+    }
+    app->windowDelegate = msg((id)delegateClass, s("new"));
+    msg(mainWindow, s("setDelegate:"), app->windowDelegate);
 
 	app->mainWindow = mainWindow;
 }
@@ -1823,6 +1861,10 @@ void SetActivationPolicy(struct Application* app, int policy) {
     app->activationPolicy = policy;
 }
 
+void HasURLHandlers(struct Application* app) {
+    app->hasURLHandlers = 1;
+}
+
 // Quit will stop the cocoa application and free up all the memory
 // used by the application
 void Quit(struct Application *app) {
@@ -1896,6 +1938,8 @@ void* NewApplication(const char *title, int width, int height, int resizable, in
 
 	result->activationPolicy = NSApplicationActivationPolicyRegular;
 
+	result->hasURLHandlers = 0;
+
     return (void*) result;
 }
 

v2/internal/ffenestri/ffenestri_darwin.go

@@ -90,5 +90,10 @@ func (a *Application) processPlatformSettings() error {
 		}
 	}
 
+	// Process URL Handlers
+	if a.config.Mac.URLHandlers != nil {
+		C.HasURLHandlers(a.app)
+	}
+
 	return nil
 }

v2/internal/ffenestri/ffenestri_darwin.h

@@ -14,6 +14,10 @@
 // Macros to make it slightly more sane
 #define msg objc_msgSend
 
+#define kInternetEventClass 'GURL'
+#define kAEGetURL 'GURL'
+#define keyDirectObject '----'
+
 #define c(str) (id)objc_getClass(str)
 #define s(str) sel_registerName(str)
 #define u(str) sel_getUid(str)
@@ -118,4 +122,6 @@ void SetActivationPolicy(struct Application* app, int policy);
 
 void* lookupStringConstant(id constantName);
 
+void HasURLHandlers(struct Application* app);
+
 #endif

v2/internal/ffenestri/menu_darwin.c

@@ -576,7 +576,7 @@ id processCheckboxMenuItem(Menu *menu, id parentmenu, const char *title, const c
     return item;
 }
 
-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) {
+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
@@ -585,9 +585,13 @@ id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char
     id wrappedId = msg(c("NSValue"), s("valueWithPointer:"), callback);
     msg(item, s("setRepresentedObject:"), wrappedId);
 
-    id key = processAcceleratorKey(acceleratorkey);
-    msg(item, s("initWithTitle:action:keyEquivalent:"), str(title),
-        s("menuItemCallback:"), key);
+    if( !alternate ) {
+        id key = processAcceleratorKey(acceleratorkey);
+        msg(item, s("initWithTitle:action:keyEquivalent:"), str(title),
+            s("menuItemCallback:"), key);
+    } else {
+        msg(item, s("initWithTitle:action:keyEquivalent:"), str(title), s("menuItemCallback:"), str(""));
+    }
 
     if( tooltip != NULL ) {
         msg(item, s("setToolTip:"), str(tooltip));
@@ -663,10 +667,16 @@ id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char
     msg(item, s("autorelease"));
 
     // Process modifiers
-    if( modifiers != NULL ) {
+    if( modifiers != NULL && !alternate) {
         unsigned long modifierFlags = parseModifiers(modifiers);
         msg(item, s("setKeyEquivalentModifierMask:"), modifierFlags);
     }
+
+    // alternate
+    if( alternate ) {
+        msg(item, s("setAlternate:"), true);
+        msg(item, s("setKeyEquivalentModifierMask:"), NSEventModifierFlagOption);
+    }
     msg(parentMenu, s("addItem:"), item);
 
     return item;
@@ -727,6 +737,11 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
         label = "(empty)";
     }
 
+
+    // Is this an alternate menu item?
+    bool alternate = false;
+    getJSONBool(item, "MacAlternate", &alternate);
+
     const char *menuid = getJSONString(item, "ID");
     if ( menuid == NULL) {
         menuid = "";
@@ -782,7 +797,7 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
     if( type != NULL ) {
 
         if( STREQ(type->string_, "Text")) {
-            processTextMenuItem(menu, parentMenu, label, menuid, disabled, acceleratorkey, modifiers, tooltip, image, fontName, fontSize, RGBA, templateImage);
+            processTextMenuItem(menu, parentMenu, label, menuid, disabled, acceleratorkey, modifiers, tooltip, image, fontName, fontSize, RGBA, templateImage, alternate);
         }
         else if ( STREQ(type->string_, "Separator")) {
             addSeparator(parentMenu);

v2/internal/ffenestri/menu_darwin.h

@@ -105,7 +105,7 @@ 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);
+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);
 

v2/internal/ffenestri/traymenustore_darwin.c

@@ -16,6 +16,11 @@ TrayMenuStore* NewTrayMenuStore() {
         ABORT("[NewTrayMenuStore] Not enough memory to allocate trayMenuMap!");
     }
 
+    if (pthread_mutex_init(&result->lock, NULL) != 0) {
+        printf("\n mutex init has failed\n");
+        exit(1);
+    }
+
     return result;
 }
 
@@ -25,15 +30,19 @@ int dumpTrayMenu(void *const context, struct hashmap_element_s *const e) {
 }
 
 void DumpTrayMenuStore(TrayMenuStore* store) {
+    pthread_mutex_lock(&store->lock);
     hashmap_iterate_pairs(&store->trayMenuMap, dumpTrayMenu, NULL);
+    pthread_mutex_unlock(&store->lock);
 }
 
 void AddTrayMenuToStore(TrayMenuStore* store, const char* menuJSON) {
+
     TrayMenu* newMenu = NewTrayMenu(menuJSON);
 
+    pthread_mutex_lock(&store->lock);
     //TODO: check if there is already an entry for this menu
     hashmap_put(&store->trayMenuMap, newMenu->ID, strlen(newMenu->ID), newMenu);
-
+    pthread_mutex_unlock(&store->lock);
 }
 
 int showTrayMenu(void *const context, struct hashmap_element_s *const e) {
@@ -43,9 +52,11 @@ int showTrayMenu(void *const context, struct hashmap_element_s *const e) {
 }
 
 void ShowTrayMenusInStore(TrayMenuStore* store) {
+    pthread_mutex_lock(&store->lock);
     if( hashmap_num_entries(&store->trayMenuMap) > 0 ) {
         hashmap_iterate_pairs(&store->trayMenuMap, showTrayMenu, NULL);
     }
+    pthread_mutex_unlock(&store->lock);
 }
 
 int freeTrayMenu(void *const context, struct hashmap_element_s *const e) {
@@ -64,16 +75,24 @@ void DeleteTrayMenuStore(TrayMenuStore *store) {
 
     // Destroy tray menu map
     hashmap_destroy(&store->trayMenuMap);
+
+    pthread_mutex_destroy(&store->lock);
 }
 
 TrayMenu* GetTrayMenuFromStore(TrayMenuStore* store, const char* menuID) {
     // Get the current menu
-    return hashmap_get(&store->trayMenuMap, menuID, strlen(menuID));
+    pthread_mutex_lock(&store->lock);
+    TrayMenu* result = hashmap_get(&store->trayMenuMap, menuID, strlen(menuID));
+    pthread_mutex_unlock(&store->lock);
+    return result;
 }
 
 TrayMenu* MustGetTrayMenuFromStore(TrayMenuStore* store, const char* menuID) {
     // Get the current menu
+    pthread_mutex_lock(&store->lock);
     TrayMenu* result = hashmap_get(&store->trayMenuMap, menuID, strlen(menuID));
+    pthread_mutex_unlock(&store->lock);
+
     if (result == NULL ) {
         ABORT("Unable to find TrayMenu with ID '%s' in the TrayMenuStore!", menuID);
     }
@@ -81,8 +100,11 @@ TrayMenu* MustGetTrayMenuFromStore(TrayMenuStore* store, const char* menuID) {
 }
 
 void DeleteTrayMenuInStore(TrayMenuStore* store, const char* ID) {
+
     TrayMenu *menu = MustGetTrayMenuFromStore(store, ID);
+    pthread_mutex_lock(&store->lock);
     hashmap_remove(&store->trayMenuMap, ID, strlen(ID));
+    pthread_mutex_unlock(&store->lock);
     DeleteTrayMenu(menu);
 }
 
@@ -110,7 +132,9 @@ void UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON) {
     // If we don't have a menu, we create one
     if ( currentMenu == NULL ) {
         // Store the new menu
+        pthread_mutex_lock(&store->lock);
         hashmap_put(&store->trayMenuMap, newMenu->ID, strlen(newMenu->ID), newMenu);
+        pthread_mutex_unlock(&store->lock);
 
         // Show it
         ShowTrayMenu(newMenu);
@@ -121,7 +145,9 @@ void UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON) {
     // Save the status bar reference
     newMenu->statusbaritem = currentMenu->statusbaritem;
 
+    pthread_mutex_lock(&store->lock);
     hashmap_remove(&store->trayMenuMap, newMenu->ID, strlen(newMenu->ID));
+    pthread_mutex_unlock(&store->lock);
 
     // Delete the current menu
     DeleteMenu(currentMenu->menu);
@@ -130,9 +156,10 @@ void UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON) {
     // Free the tray menu memory
     MEMFREE(currentMenu);
 
+    pthread_mutex_lock(&store->lock);
     hashmap_put(&store->trayMenuMap, newMenu->ID, strlen(newMenu->ID), newMenu);
+    pthread_mutex_unlock(&store->lock);
 
     // Show the updated menu
     ShowTrayMenu(newMenu);
-
 }

v2/internal/ffenestri/traymenustore_darwin.h

@@ -5,6 +5,8 @@
 #ifndef TRAYMENUSTORE_DARWIN_H
 #define TRAYMENUSTORE_DARWIN_H
 
+#include <pthread.h>
+
 typedef struct {
 
 	int dummy;
@@ -13,6 +15,8 @@ typedef struct {
     // It maps tray IDs to TrayMenu*
     struct hashmap_s trayMenuMap;
 
+    pthread_mutex_t lock;
+
 } TrayMenuStore;
 
 TrayMenuStore* NewTrayMenuStore();

v2/internal/fs/fs.go

@@ -40,7 +40,7 @@ func Mkdir(dirname string) error {
 // Returns error on failure
 func MkDirs(fullPath string, mode ...os.FileMode) error {
 	var perms os.FileMode
-	perms = 0700
+	perms = 0755
 	if len(mode) == 1 {
 		perms = mode[0]
 	}
@@ -243,7 +243,7 @@ func CopyDir(src string, dst string) (err error) {
 		return fmt.Errorf("destination already exists")
 	}
 
-	err = os.MkdirAll(dst, si.Mode())
+	err = MkDirs(dst)
 	if err != nil {
 		return
 	}

v2/internal/menumanager/processedMenu.go

@@ -37,6 +37,7 @@ type ProcessedMenuItem struct {
 	// Image - base64 image data
 	Image            string `json:",omitempty"`
 	MacTemplateImage bool   `json:", omitempty"`
+	MacAlternate     bool   `json:", omitempty"`
 
 	// Tooltip
 	Tooltip string `json:",omitempty"`
@@ -60,6 +61,7 @@ func NewProcessedMenuItem(menuItemMap *MenuItemMap, menuItem *menu.MenuItem) *Pr
 		FontName:         menuItem.FontName,
 		Image:            menuItem.Image,
 		MacTemplateImage: menuItem.MacTemplateImage,
+		MacAlternate:     menuItem.MacAlternate,
 		Tooltip:          menuItem.Tooltip,
 	}
 

v2/internal/messagedispatcher/message/messageparser.go

@@ -21,13 +21,14 @@ var messageParsers = map[byte]func(string) (*parsedMessage, error){
 	'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");
+		return nil, fmt.Errorf("MessageParser received blank message")
 	}
 
 	parseMethod := messageParsers[message[0]]

v2/internal/messagedispatcher/message/url.go

@@ -0,0 +1,20 @@
+package message
+
+import "fmt"
+
+// urlMessageParser does what it says on the tin!
+func urlMessageParser(message string) (*parsedMessage, error) {
+
+	// Sanity check: URL messages must be at least 2 bytes
+	if len(message) < 2 {
+		return nil, fmt.Errorf("log message was an invalid length")
+	}
+
+	// Switch on the log type
+	switch message[1] {
+	case 'C':
+		return &parsedMessage{Topic: "url:handler", Data: message[2:]}, nil
+	default:
+		return nil, fmt.Errorf("url message type '%c' invalid", message[1])
+	}
+}

v2/internal/subsystem/url.go

@@ -0,0 +1,94 @@
+package subsystem
+
+import (
+	"context"
+	"strings"
+	"sync"
+
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/servicebus"
+)
+
+// URL is the URL Handler subsystem. It handles messages with topics starting
+// with "url:"
+type URL struct {
+	urlChannel <-chan *servicebus.Message
+
+	// quit flag
+	shouldQuit bool
+
+	// Logger!
+	logger *logger.Logger
+
+	// Context for shutdown
+	ctx    context.Context
+	cancel context.CancelFunc
+
+	// internal waitgroup
+	wg sync.WaitGroup
+
+	// Handlers
+	handlers map[string]func(string)
+}
+
+// NewURL creates a new log subsystem
+func NewURL(bus *servicebus.ServiceBus, logger *logger.Logger, handlers map[string]func(string)) (*URL, error) {
+
+	// Subscribe to log messages
+	urlChannel, err := bus.Subscribe("url")
+	if err != nil {
+		return nil, err
+	}
+
+	ctx, cancel := context.WithCancel(context.Background())
+
+	result := &URL{
+		urlChannel: urlChannel,
+		logger:     logger,
+		ctx:        ctx,
+		cancel:     cancel,
+		handlers:   handlers,
+	}
+
+	return result, nil
+}
+
+// Start the subsystem
+func (u *URL) Start() error {
+
+	u.wg.Add(1)
+
+	// Spin off a go routine
+	go func() {
+		defer u.logger.Trace("URL Shutdown")
+
+		for u.shouldQuit == false {
+			select {
+			case <-u.ctx.Done():
+				u.wg.Done()
+				return
+			case urlMessage := <-u.urlChannel:
+				messageType := strings.TrimPrefix(urlMessage.Topic(), "url:")
+				switch messageType {
+				case "handler":
+					url := urlMessage.Data().(string)
+					splitURL := strings.Split(url, ":")
+					protocol := splitURL[0]
+					callback, ok := u.handlers[protocol]
+					if ok {
+						go callback(url)
+					}
+				default:
+					u.logger.Error("unknown url message: %+v", urlMessage)
+				}
+			}
+		}
+	}()
+
+	return nil
+}
+
+func (u *URL) Close() {
+	u.cancel()
+	u.wg.Wait()
+}

v2/internal/templates/templates/vanilla/basic.tmpl.go

@@ -12,20 +12,19 @@ type Basic struct {
 }
 
 // newBasic creates a new Basic application struct
-func newBasic() *Basic {
+func NewBasic() *Basic {
 	return &Basic{}
 }
 
-// WailsInit is called at application startup
-func (b *Basic) WailsInit(runtime *wails.Runtime) error {
+// startup is called at application startup
+func (b *Basic) startup(runtime *wails.Runtime) {
 	// Perform your setup here
 	b.runtime = runtime
 	runtime.Window.SetTitle("{{.ProjectName}}")
-	return nil
 }
 
-// WailsShutdown is called at application termination
-func (b *Basic) WailsShutdown() {
+// shutdown is called at application termination
+func (b *Basic) shutdown() {
 	// Perform your teardown here
 }
 

v2/internal/templates/templates/vanilla/frontend/index.html

@@ -4,7 +4,7 @@
   <link rel="stylesheet" href="/main.css">
 </head>
 
-<body>
+<body data-wails-drag>
   <div id="logo"></div>
   <div id="input">
     <input id="name" type="text"></input>

v2/internal/templates/templates/vanilla/main.tmpl.go

@@ -1,21 +1,38 @@
 package main
 
 import (
-	"github.com/wailsapp/wails/v2"
 	"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, err := wails.CreateApp("{{.ProjectName}}", 1024, 768)
-	if err != nil {
-		log.Fatal(err)
-	}
+	app := NewBasic()
 
-	app.Bind(newBasic())
-
-	err = app.Run()
+	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/pkg/commands/build/base.go

@@ -145,6 +145,13 @@ func (b *BaseBuilder) CleanUp() {
 // CompileProject compiles the project
 func (b *BaseBuilder) CompileProject(options *Options) error {
 
+	// Run go mod tidy first
+	cmd := exec.Command(options.Compiler, "mod", "tidy")
+	err := cmd.Run()
+	if err != nil {
+		return err
+	}
+
 	// Default go build command
 	commands := slicer.String([]string{"build"})
 
@@ -188,7 +195,7 @@ func (b *BaseBuilder) CompileProject(options *Options) error {
 
 	// Get application build directory
 	appDir := options.BuildDirectory
-	err := cleanBuildDirectory(options)
+	err = cleanBuildDirectory(options)
 	if err != nil {
 		return err
 	}
@@ -211,7 +218,7 @@ func (b *BaseBuilder) CompileProject(options *Options) error {
 	options.CompiledBinary = compiledBinary
 
 	// Create the command
-	cmd := exec.Command(options.Compiler, commands.AsSlice()...)
+	cmd = exec.Command(options.Compiler, commands.AsSlice()...)
 
 	// Set the directory
 	cmd.Dir = b.projectData.Path

v2/pkg/commands/build/build.go

@@ -38,6 +38,7 @@ type Options struct {
 	BuildDirectory string               // Directory to use for building the application
 	CompiledBinary string               // Fully qualified path to the compiled binary
 	KeepAssets     bool                 // /Keep the generated assets/files
+	AppleIdentity  string
 }
 
 // GetModeAsString returns the current mode as a string

v2/pkg/commands/build/packager_darwin.go

@@ -2,9 +2,11 @@ package build
 
 import (
 	"bytes"
+	"fmt"
 	"image"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"path"
 	"path/filepath"
 	"strings"
@@ -52,6 +54,14 @@ func packageApplication(options *Options) error {
 		return err
 	}
 
+	// Sign app if needed
+	if options.AppleIdentity != "" {
+		err = signApplication(options)
+		if err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 
@@ -176,3 +186,21 @@ func processApplicationIcon(resourceDir string, iconsDir string) (err error) {
 	}()
 	return icns.Encode(dest, srcImg)
 }
+
+func signApplication(options *Options) error {
+	bundlename := filepath.Join(options.BuildDirectory, options.ProjectData.Name+".app")
+	identity := fmt.Sprintf(`"%s"`, options.AppleIdentity)
+	cmd := exec.Command("codesign", "--sign", identity, "--deep", "--force", "--verbose", "--timestamp", "--options", "runtime", bundlename)
+	var stdo, stde bytes.Buffer
+	cmd.Stdout = &stdo
+	cmd.Stderr = &stde
+
+	// Run command
+	err := cmd.Run()
+
+	// Format error if we have one
+	if err != nil {
+		return fmt.Errorf("%s\n%s", err, string(stde.Bytes()))
+	}
+	return nil
+}

v2/pkg/menu/menuitem.go

@@ -39,9 +39,12 @@ type MenuItem struct {
 	// Image - base64 image data
 	Image string
 
-	// MacTemplateImage indicates that on a mac, this image is a template image
+	// MacTemplateImage indicates that on a Mac, this image is a template image
 	MacTemplateImage bool
 
+	// MacAlternate indicates that this item is an alternative to the previous menu item
+	MacAlternate bool
+
 	// Tooltip
 	Tooltip string
 

v2/pkg/options/mac/mac.go

@@ -20,4 +20,5 @@ type Options struct {
 	TrayMenus                     []*menu.TrayMenu
 	ContextMenus                  []*menu.ContextMenu
 	ActivationPolicy              ActivationPolicy
+	URLHandlers                   map[string]func(string)
 }