[V3] Add origin to raw message handler

v3/examples/raw-message/main.go

@@ -3,8 +3,10 @@ package main
 import (
 	"embed"
 	_ "embed"
-	"github.com/wailsapp/wails/v3/pkg/application"
+	"fmt"
 	"log"
+
+	"github.com/wailsapp/wails/v3/pkg/application"
 )
 
 //go:embed assets
@@ -21,8 +23,8 @@ func main() {
 		Mac: application.MacOptions{
 			ApplicationShouldTerminateAfterLastWindowClosed: true,
 		},
-		RawMessageHandler: func(window application.Window, message string) {
-			println("Raw message received from Window '" + window.Name() + "' with message: " + message)
+		RawMessageHandler: func(window application.Window, message string, originInfo *application.OriginInfo) {
+			println(fmt.Sprintf("Raw message received from Window %s with message: %s, origin %s, topOrigin %s, isMainFrame %t", window.Name(), message, originInfo.Origin, originInfo.TopOrigin, originInfo.IsMainFrame))
 		},
 	})
 

v3/pkg/application/application.go

@@ -211,8 +211,15 @@ type (
 
 // Messages sent from javascript get routed here
 type windowMessage struct {
-	windowId uint
-	message  string
+	windowId   uint
+	message    string
+	originInfo *OriginInfo
+}
+
+type OriginInfo struct {
+	Origin      string
+	TopOrigin   string
+	IsMainFrame bool
 }
 
 var windowMessageBuffer = make(chan *windowMessage, 5)
@@ -708,7 +715,7 @@ func (a *App) handleWindowMessage(event *windowMessage) {
 		window.HandleMessage(event.message)
 	} else {
 		if a.options.RawMessageHandler != nil {
-			a.options.RawMessageHandler(window, event.message)
+			a.options.RawMessageHandler(window, event.message, event.originInfo)
 		}
 	}
 }

v3/pkg/application/application_darwin.go

@@ -344,10 +344,18 @@ func processWindowEvent(windowID C.uint, eventID C.uint) {
 }
 
 //export processMessage
-func processMessage(windowID C.uint, message *C.char) {
+func processMessage(windowID C.uint, message *C.char, origin *C.char, isMainFrame bool) {
+	o := ""
+	if origin != nil {
+		o = C.GoString(origin)
+	}
 	windowMessageBuffer <- &windowMessage{
 		windowId: uint(windowID),
 		message:  C.GoString(message),
+		originInfo: &OriginInfo{
+			Origin:      o,
+			IsMainFrame: isMainFrame,
+		},
 	}
 }
 

v3/pkg/application/application_options.go

@@ -88,7 +88,7 @@ type Options struct {
 
 	// RawMessageHandler is called when the frontend sends a raw message.
 	// This is useful for implementing custom frontend-to-backend communication.
-	RawMessageHandler func(window Window, message string)
+	RawMessageHandler func(window Window, message string, originInfo *OriginInfo)
 
 	// WarningHandler is called when a warning occurs
 	WarningHandler func(string)

v3/pkg/application/linux_cgo.go

@@ -62,6 +62,16 @@ static void save_window_id(void *object, uint value)
     g_object_set_data((GObject *)object, "windowid", GUINT_TO_POINTER((guint)value));
 }
 
+static void save_webview_to_content_manager(void *contentManager, void *webview)
+{
+    g_object_set_data(G_OBJECT((WebKitUserContentManager *)contentManager), "webview", webview);
+}
+
+static WebKitWebView* get_webview_from_content_manager(void *contentManager)
+{
+	return WEBKIT_WEB_VIEW(g_object_get_data(G_OBJECT(contentManager), "webview"));
+}
+
 static guint get_window_id(void *object)
 {
     return GPOINTER_TO_UINT(g_object_get_data((GObject *)object, "windowid"));
@@ -1109,6 +1119,8 @@ func windowNewWebview(parentId uint, gpuPolicy WebviewGpuPolicy) pointer {
 	C.webkit_user_content_manager_register_script_message_handler(manager, c.String("external"))
 	webView := C.webkit_web_view_new_with_user_content_manager(manager)
 
+	C.save_webview_to_content_manager(unsafe.Pointer(manager), unsafe.Pointer(webView))
+
 	// attach window id to both the webview and contentmanager
 	C.save_window_id(unsafe.Pointer(webView), C.uint(parentId))
 	C.save_window_id(unsafe.Pointer(manager), C.uint(parentId))
@@ -1646,6 +1658,17 @@ func sendMessageToBackend(contentManager *C.WebKitUserContentManager, result *C.
 	// Get the windowID from the contentManager
 	thisWindowID := uint(C.get_window_id(unsafe.Pointer(contentManager)))
 
+	webView := C.get_webview_from_content_manager(unsafe.Pointer(contentManager))
+	var origin string
+	if webView != nil {
+		currentUri := C.webkit_web_view_get_uri(webView)
+		if currentUri != nil {
+			uri := C.g_strdup(currentUri)
+			defer C.g_free(C.gpointer(uri))
+			origin = C.GoString(uri)
+		}
+	}
+
 	var msg string
 	value := C.webkit_javascript_result_get_js_value(result)
 	message := C.jsc_value_to_string(value)
@@ -1654,6 +1677,9 @@ func sendMessageToBackend(contentManager *C.WebKitUserContentManager, result *C.
 	windowMessageBuffer <- &windowMessage{
 		windowId: thisWindowID,
 		message:  msg,
+		originInfo: &OriginInfo{
+			Origin: origin,
+		},
 	}
 }