refactor(port): add WebUIMessageHandler/WebUIHandlerRouter interfaces

Add shared message handler interfaces to port so both WebKit and CEF
engines can use the same handler registration code:

- WebUIMessageHandler: Handle(ctx, WebViewID, json.RawMessage) (any, error)
- WebUIMessageHandlerFunc: function adapter
- WebUIHandlerRouter: RegisterHandler + RegisterHandlerWithCallbacks

Expand HandlerDependencies with SaveConfig and keybinding usecases
that were previously only available in webkit/handlers.Config.

Remove unused legacy MessageRouter interface.

commit: c693591537a7f19f493d4e4a8f360e794b75e815
author: brice · 7mo ago · 2026-03-21 21:40 UTC
committer: brice · 6mo ago · 2026-03-28 04:38 UTC
parent: 1455aeb
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

1 file · +36 -18

M internal/application/port/engine.go +36 -18


@@ -3,7 +3,10 @@
3	3		// remain independent of specific implementations (WebKit, GTK, etc.).
4	4		package port
5	5
6		-	import "context"
	6	+	import (
	7	+	"context"
	8	+	"encoding/json"
	9	+	)
7	10
8	11		// CookiePolicy controls cookie acceptance behavior for the engine's network session.
9	12		type CookiePolicy string

@@ -157,13 +160,40 @@ type EngineSettingsUpdate struct {
157	160		Raw any //nolint:iface // intentional: see type comment above
158	161		}
159	162
	163	+	// WebUIMessageHandler handles a decoded message payload from the JS bridge.
	164	+	// Used by both WebKit and CEF message routers via the shared handlers package.
	165	+	type WebUIMessageHandler interface {
	166	+	Handle(ctx context.Context, webviewID WebViewID, payload json.RawMessage) (any, error)
	167	+	}
	168	+
	169	+	// WebUIMessageHandlerFunc adapts a function to the WebUIMessageHandler interface.
	170	+	type WebUIMessageHandlerFunc func(ctx context.Context, webviewID WebViewID, payload json.RawMessage) (any, error)
	171	+
	172	+	// Handle calls f(ctx, webviewID, payload).
	173	+	func (f WebUIMessageHandlerFunc) Handle(ctx context.Context, webviewID WebViewID, payload json.RawMessage) (any, error) {
	174	+	return f(ctx, webviewID, payload)
	175	+	}
	176	+
	177	+	// WebUIHandlerRouter registers message handlers for the JS↔Go bridge.
	178	+	// Both WebKit's MessageRouter and CEF's MessageRouter implement this interface,
	179	+	// allowing shared handler registration code.
	180	+	type WebUIHandlerRouter interface {
	181	+	RegisterHandler(msgType string, handler WebUIMessageHandler) error
	182	+	RegisterHandlerWithCallbacks(msgType, callback, errorCallback, worldName string, handler WebUIMessageHandler) error
	183	+	}
	184	+
160	185		// HandlerDependencies holds use cases needed by WebUI message handlers.
161	186		type HandlerDependencies struct {
162		-	HistoryUC HomepageHistory
163		-	FavoritesUC HomepageFavorites
164		-	Clipboard Clipboard
165		-	AutoCopyConfig AutoCopyConfig
166		-	OnClipboardCopied func(textLen int)
	187	+	HistoryUC HomepageHistory
	188	+	FavoritesUC HomepageFavorites
	189	+	Clipboard Clipboard
	190	+	AutoCopyConfig AutoCopyConfig
	191	+	OnClipboardCopied func(textLen int)
	192	+	SaveConfig func(context.Context, WebUIConfig) error
	193	+	KeybindingsGetter KeybindingsGetter
	194	+	KeybindingSetter KeybindingSetter
	195	+	KeybindingResetter KeybindingResetter
	196	+	AllKeybindingsResetter AllKeybindingsResetter
167	197		}
168	198
169	199		// SchemeHandler defines the port interface for registering custom URI schemes.

@@ -176,18 +206,6 @@ type SchemeHandler interface {
176	206		RegisterScheme(scheme string, handler func(uri string) ([]byte, string, error))
177	207		}
178	208
179		-	// MessageRouter defines the port interface for bidirectional JS-to-Go messaging.
180		-	// It allows JavaScript running in a WebView to invoke named Go handlers,
181		-	// and allows Go code to post messages back to a specific WebView.
182		-	type MessageRouter interface {
183		-	// RegisterHandler registers a named message handler callable from JavaScript.
184		-	// The handler receives a JSON-encoded message string and returns a
185		-	// JSON-encoded response string.
186		-	RegisterHandler(name string, handler func(message string) (string, error))
187		-
188		-	// PostMessage sends a message to the JavaScript context of the given WebView.
189		-	PostMessage(webviewID WebViewID, message string) error
190		-	}
191	209
192	210		// SettingsApplier defines the port interface for applying browser settings to WebViews.
193	211		// Implementations apply engine-specific settings (security, features, etc.) uniformly

 // remain independent of specific implementations (WebKit, GTK, etc.).
 package port
-import "context"
+import (
+	"context"
+	"encoding/json"
+)
 // CookiePolicy controls cookie acceptance behavior for the engine's network session.
 type CookiePolicy string
 	Raw any //nolint:iface // intentional: see type comment above
 }
+// WebUIMessageHandler handles a decoded message payload from the JS bridge.
+// Used by both WebKit and CEF message routers via the shared handlers package.
+type WebUIMessageHandler interface {
+	Handle(ctx context.Context, webviewID WebViewID, payload json.RawMessage) (any, error)
+}
+// WebUIMessageHandlerFunc adapts a function to the WebUIMessageHandler interface.
+type WebUIMessageHandlerFunc func(ctx context.Context, webviewID WebViewID, payload json.RawMessage) (any, error)
+// Handle calls f(ctx, webviewID, payload).
+func (f WebUIMessageHandlerFunc) Handle(ctx context.Context, webviewID WebViewID, payload json.RawMessage) (any, error) {
+	return f(ctx, webviewID, payload)
+}
+// WebUIHandlerRouter registers message handlers for the JS↔Go bridge.
+// Both WebKit's MessageRouter and CEF's MessageRouter implement this interface,
+// allowing shared handler registration code.
+type WebUIHandlerRouter interface {
+	RegisterHandler(msgType string, handler WebUIMessageHandler) error
+	RegisterHandlerWithCallbacks(msgType, callback, errorCallback, worldName string, handler WebUIMessageHandler) error
+}
 // HandlerDependencies holds use cases needed by WebUI message handlers.
 type HandlerDependencies struct {
-	HistoryUC         HomepageHistory
+	HistoryUC              HomepageHistory
-	FavoritesUC       HomepageFavorites
+	FavoritesUC            HomepageFavorites
-	Clipboard         Clipboard
+	Clipboard              Clipboard
-	AutoCopyConfig    AutoCopyConfig
+	AutoCopyConfig         AutoCopyConfig
-	OnClipboardCopied func(textLen int)
+	OnClipboardCopied      func(textLen int)
+	SaveConfig             func(context.Context, WebUIConfig) error
+	KeybindingsGetter      KeybindingsGetter
+	KeybindingSetter       KeybindingSetter
+	KeybindingResetter     KeybindingResetter
+	AllKeybindingsResetter AllKeybindingsResetter
 }
 // SchemeHandler defines the port interface for registering custom URI schemes.
 	RegisterScheme(scheme string, handler func(uri string) ([]byte, string, error))
 }
-// MessageRouter defines the port interface for bidirectional JS-to-Go messaging.
-// It allows JavaScript running in a WebView to invoke named Go handlers,
-// and allows Go code to post messages back to a specific WebView.
-type MessageRouter interface {
-	// RegisterHandler registers a named message handler callable from JavaScript.
-	// The handler receives a JSON-encoded message string and returns a
-	// JSON-encoded response string.
-	RegisterHandler(name string, handler func(message string) (string, error))
-	// PostMessage sends a message to the JavaScript context of the given WebView.
-	PostMessage(webviewID WebViewID, message string) error
-}
 // SettingsApplier defines the port interface for applying browser settings to WebViews.
 // Implementations apply engine-specific settings (security, features, etc.) uniformly