a844552 refactor: extract shared WebUI message handlers, wire CEF RegisterHandlers · dumber

M internal/application/port/engine.go +0 -1


@@ -206,7 +206,6 @@ type SchemeHandler interface {
206	206		RegisterScheme(scheme string, handler func(uri string) ([]byte, string, error))
207	207		}
208	208
209		-
210	209		// SettingsApplier defines the port interface for applying browser settings to WebViews.
211	210		// Implementations apply engine-specific settings (security, features, etc.) uniformly
212	211		// across a set of WebView instances.


@@ -206,7 +206,6 @@ type SchemeHandler interface {
206		RegisterScheme(scheme string, handler func(uri string) ([]byte, string, error))	206	RegisterScheme(scheme string, handler func(uri string) ([]byte, string, error))
207		}	207	}
208			208
209	-
210		// SettingsApplier defines the port interface for applying browser settings to WebViews.	209	// SettingsApplier defines the port interface for applying browser settings to WebViews.
211		// Implementations apply engine-specific settings (security, features, etc.) uniformly	210	// Implementations apply engine-specific settings (security, features, etc.) uniformly
212		// across a set of WebView instances.	211	// across a set of WebView instances.

M internal/bootstrap/engine.go +31 -23


@@ -8,8 +8,8 @@ import (
8	8		"github.com/bnema/dumber/internal/application/usecase"
9	9		"github.com/bnema/dumber/internal/infrastructure/cef"
10	10		"github.com/bnema/dumber/internal/infrastructure/config"
	11	+	"github.com/bnema/dumber/internal/infrastructure/handlers"
11	12		"github.com/bnema/dumber/internal/infrastructure/webkit"
12		-	"github.com/bnema/dumber/internal/infrastructure/webkit/handlers"
13	13		"github.com/bnema/dumber/internal/ui/theme"
14	14		"github.com/rs/zerolog"
15	15		)

@@ -38,10 +38,10 @@ func BuildEngine(input EngineInput) (port.Engine, error) {
38	38		}
39	39		wkCfg := webkit.EngineConfigFromConfig(cfg.Engine.WebKit)
40	40
41		-	// Pre-build keybindings handler for handler registration.
42		-	keybindingsHandler, err := buildKeybindingsHandler()
	41	+	// Pre-build keybinding use cases for handler registration.
	42	+	keybindingDeps, err := buildKeybindingDeps()
43	43		if err != nil {
44		-	return nil, fmt.Errorf("failed to build keybindings handler: %w", err)
	44	+	return nil, fmt.Errorf("failed to build keybinding deps: %w", err)
45	45		}
46	46
47	47		// Pre-build config save function for handler registration.

@@ -53,18 +53,18 @@ func BuildEngine(input EngineInput) (port.Engine, error) {
53	53		return webkit.NewEngine(
54	54		input.Ctx, cfg, opts, wkCfg,
55	55		input.ThemeManager, input.ColorResolver, input.Logger,
56		-	func(ctx context.Context, router *webkit.MessageRouter, deps port.HandlerDependencies) error {
57		-	return handlers.RegisterAll(ctx, router, handlers.Config{
58		-	HistoryUC: deps.HistoryUC,
59		-	FavoritesUC: deps.FavoritesUC,
60		-	Clipboard: deps.Clipboard,
61		-	AutoCopyConfig: deps.AutoCopyConfig,
62		-	SaveConfig: saveConfigFunc,
63		-	KeybindingsHandler: keybindingsHandler,
64		-	OnClipboardCopied: deps.OnClipboardCopied,
65		-	})
	56	+	func(ctx context.Context, router port.WebUIHandlerRouter, deps port.HandlerDependencies) error {
	57	+	// Inject pre-built dependencies that come from bootstrap, not from the engine.
	58	+	deps.SaveConfig = saveConfigFunc
	59	+	deps.KeybindingsGetter = keybindingDeps.KeybindingsGetter
	60	+	deps.KeybindingSetter = keybindingDeps.KeybindingSetter
	61	+	deps.KeybindingResetter = keybindingDeps.KeybindingResetter
	62	+	deps.AllKeybindingsResetter = keybindingDeps.AllKeybindingsResetter
	63	+	return handlers.RegisterAll(ctx, router, deps)
	64	+	},
	65	+	func(ctx context.Context, router port.WebUIHandlerRouter, handler port.AccentKeyHandler) error {
	66	+	return handlers.RegisterAccentHandlers(ctx, router, handler)
66	67		},
67		-	handlers.RegisterAccentHandlers,
68	68		)
69	69		case "cef":
70	70		cefCfg := cfg.Engine.CEF

@@ -74,8 +74,16 @@ func BuildEngine(input EngineInput) (port.Engine, error) {
74	74		}
75	75		}
76	76
77		-	// buildKeybindingsHandler constructs the keybindings handler using the config manager.
78		-	func buildKeybindingsHandler() (*handlers.KeybindingsHandler, error) {
	77	+	// keybindingDeps holds keybinding use cases built at bootstrap time.
	78	+	type keybindingDeps struct {
	79	+	KeybindingsGetter port.KeybindingsGetter
	80	+	KeybindingSetter port.KeybindingSetter
	81	+	KeybindingResetter port.KeybindingResetter
	82	+	AllKeybindingsResetter port.AllKeybindingsResetter
	83	+	}
	84	+
	85	+	// buildKeybindingDeps constructs keybinding use cases using the config manager.
	86	+	func buildKeybindingDeps() (*keybindingDeps, error) {
79	87		mgr := config.GetManager()
80	88		if mgr == nil {
81	89		return nil, fmt.Errorf("config manager not initialized")

@@ -83,12 +91,12 @@ func buildKeybindingsHandler() (*handlers.KeybindingsHandler, error) {
83	91
84	92		gateway := config.NewKeybindingsGateway(mgr)
85	93
86		-	return handlers.NewKeybindingsHandler(
87		-	usecase.NewGetKeybindingsUseCase(gateway),
88		-	usecase.NewSetKeybindingUseCase(gateway, gateway),
89		-	usecase.NewResetKeybindingUseCase(gateway),
90		-	usecase.NewResetAllKeybindingsUseCase(gateway),
91		-	), nil
	94	+	return &keybindingDeps{
	95	+	KeybindingsGetter: usecase.NewGetKeybindingsUseCase(gateway),
	96	+	KeybindingSetter: usecase.NewSetKeybindingUseCase(gateway, gateway),
	97	+	KeybindingResetter: usecase.NewResetKeybindingUseCase(gateway),
	98	+	AllKeybindingsResetter: usecase.NewResetAllKeybindingsUseCase(gateway),
	99	+	}, nil
92	100		}
93	101
94	102		// buildSaveConfigFunc constructs the config save function using the config manager.

 	"github.com/bnema/dumber/internal/application/usecase"
 	"github.com/bnema/dumber/internal/infrastructure/cef"
 	"github.com/bnema/dumber/internal/infrastructure/config"
+	"github.com/bnema/dumber/internal/infrastructure/handlers"
 	"github.com/bnema/dumber/internal/infrastructure/webkit"
-	"github.com/bnema/dumber/internal/infrastructure/webkit/handlers"
 	"github.com/bnema/dumber/internal/ui/theme"
 	"github.com/rs/zerolog"
 )
 		}
 		wkCfg := webkit.EngineConfigFromConfig(cfg.Engine.WebKit)
-		// Pre-build keybindings handler for handler registration.
+		// Pre-build keybinding use cases for handler registration.
-		keybindingsHandler, err := buildKeybindingsHandler()
+		keybindingDeps, err := buildKeybindingDeps()
 		if err != nil {
-			return nil, fmt.Errorf("failed to build keybindings handler: %w", err)
+			return nil, fmt.Errorf("failed to build keybinding deps: %w", err)
 		}
 		// Pre-build config save function for handler registration.
 		return webkit.NewEngine(
 			input.Ctx, cfg, opts, wkCfg,
 			input.ThemeManager, input.ColorResolver, input.Logger,
-			func(ctx context.Context, router *webkit.MessageRouter, deps port.HandlerDependencies) error {
+			func(ctx context.Context, router port.WebUIHandlerRouter, deps port.HandlerDependencies) error {
-				return handlers.RegisterAll(ctx, router, handlers.Config{
+				// Inject pre-built dependencies that come from bootstrap, not from the engine.
-					HistoryUC:          deps.HistoryUC,
+				deps.SaveConfig = saveConfigFunc
-					FavoritesUC:        deps.FavoritesUC,
+				deps.KeybindingsGetter = keybindingDeps.KeybindingsGetter
-					Clipboard:          deps.Clipboard,
+				deps.KeybindingSetter = keybindingDeps.KeybindingSetter
-					AutoCopyConfig:     deps.AutoCopyConfig,
+				deps.KeybindingResetter = keybindingDeps.KeybindingResetter
-					SaveConfig:         saveConfigFunc,
+				deps.AllKeybindingsResetter = keybindingDeps.AllKeybindingsResetter
-					KeybindingsHandler: keybindingsHandler,
+				return handlers.RegisterAll(ctx, router, deps)
-					OnClipboardCopied:  deps.OnClipboardCopied,
+			},
-				})
+			func(ctx context.Context, router port.WebUIHandlerRouter, handler port.AccentKeyHandler) error {
+				return handlers.RegisterAccentHandlers(ctx, router, handler)
 			},
-			handlers.RegisterAccentHandlers,
 		)
 	case "cef":
 		cefCfg := cfg.Engine.CEF
 	}
 }
-// buildKeybindingsHandler constructs the keybindings handler using the config manager.
+// keybindingDeps holds keybinding use cases built at bootstrap time.
-func buildKeybindingsHandler() (*handlers.KeybindingsHandler, error) {
+type keybindingDeps struct {
+	KeybindingsGetter      port.KeybindingsGetter
+	KeybindingSetter       port.KeybindingSetter
+	KeybindingResetter     port.KeybindingResetter
+	AllKeybindingsResetter port.AllKeybindingsResetter
+}
+// buildKeybindingDeps constructs keybinding use cases using the config manager.
+func buildKeybindingDeps() (*keybindingDeps, error) {
 	mgr := config.GetManager()
 	if mgr == nil {
 		return nil, fmt.Errorf("config manager not initialized")
 	gateway := config.NewKeybindingsGateway(mgr)
-	return handlers.NewKeybindingsHandler(
+	return &keybindingDeps{
-		usecase.NewGetKeybindingsUseCase(gateway),
+		KeybindingsGetter:      usecase.NewGetKeybindingsUseCase(gateway),
-		usecase.NewSetKeybindingUseCase(gateway, gateway),
+		KeybindingSetter:       usecase.NewSetKeybindingUseCase(gateway, gateway),
-		usecase.NewResetKeybindingUseCase(gateway),
+		KeybindingResetter:     usecase.NewResetKeybindingUseCase(gateway),
-		usecase.NewResetAllKeybindingsUseCase(gateway),
+		AllKeybindingsResetter: usecase.NewResetAllKeybindingsUseCase(gateway),
-	), nil
+	}, nil
 }
 // buildSaveConfigFunc constructs the config save function using the config manager.

M internal/infrastructure/cef/engine.go +4 -11


@@ -12,6 +12,7 @@ import (
12	12		"github.com/bnema/puregotk/v4/glib"
13	13
14	14		"github.com/bnema/dumber/internal/application/port"
	15	+	"github.com/bnema/dumber/internal/infrastructure/handlers"
15	16		"github.com/bnema/dumber/internal/logging"
16	17		)
17	18

@@ -135,15 +136,7 @@ func (e *Engine) RegisterHandlers(ctx context.Context, deps port.HandlerDependen
135	136		if e.messageRouter == nil {
136	137		return nil
137	138		}
138		-	log := logging.FromContext(ctx)
139		-	// TODO: Wire homepage, config, keybindings, and clipboard handlers
140		-	// into e.messageRouter. Each handler implements MessageHandler and is
141		-	// registered by message type (e.g. "get_recent_history", "get_favorites").
142		-	// The CEF MessageRouter dispatches based on Message.Type from the JS bridge.
143		-	_ = deps
144		-
145		-	log.Warn().Msg("cef: RegisterHandlers stub — handler wiring not yet implemented")
146		-	return nil
	139	+	return handlers.RegisterAll(ctx, e.messageRouter, deps)
147	140		}
148	141
149	142		// RegisterAccentHandlers registers accent/dead-key input handlers with the message router.

@@ -153,7 +146,7 @@ func (e *Engine) RegisterAccentHandlers(ctx context.Context, handler port.Accent
153	146		}
154	147		log := logging.FromContext(ctx)
155	148
156		-	if err := e.messageRouter.RegisterHandler("accent_key_press", MessageHandlerFunc(
	149	+	if err := e.messageRouter.registerInternalHandler("accent_key_press", MessageHandlerFunc(
157	150		func(ctx context.Context, _ uint64, payload json.RawMessage) (any, error) {
158	151		var p struct {
159	152		Char string `json:"char"`

@@ -171,7 +164,7 @@ func (e *Engine) RegisterAccentHandlers(ctx context.Context, handler port.Accent
171	164		return err
172	165		}
173	166
174		-	if err := e.messageRouter.RegisterHandler("accent_key_release", MessageHandlerFunc(
	167	+	if err := e.messageRouter.registerInternalHandler("accent_key_release", MessageHandlerFunc(
175	168		func(ctx context.Context, _ uint64, payload json.RawMessage) (any, error) {
176	169		var p struct {
177	170		Char string `json:"char"`

 	"github.com/bnema/puregotk/v4/glib"
 	"github.com/bnema/dumber/internal/application/port"
+	"github.com/bnema/dumber/internal/infrastructure/handlers"
 	"github.com/bnema/dumber/internal/logging"
 )
 	if e.messageRouter == nil {
 		return nil
 	}
-	log := logging.FromContext(ctx)
+	return handlers.RegisterAll(ctx, e.messageRouter, deps)
-	// TODO: Wire homepage, config, keybindings, and clipboard handlers
-	// into e.messageRouter. Each handler implements MessageHandler and is
-	// registered by message type (e.g. "get_recent_history", "get_favorites").
-	// The CEF MessageRouter dispatches based on Message.Type from the JS bridge.
-	_ = deps
-	log.Warn().Msg("cef: RegisterHandlers stub — handler wiring not yet implemented")
-	return nil
 }
 // RegisterAccentHandlers registers accent/dead-key input handlers with the message router.
 	}
 	log := logging.FromContext(ctx)
-	if err := e.messageRouter.RegisterHandler("accent_key_press", MessageHandlerFunc(
+	if err := e.messageRouter.registerInternalHandler("accent_key_press", MessageHandlerFunc(
 		func(ctx context.Context, _ uint64, payload json.RawMessage) (any, error) {
 			var p struct {
 				Char  string `json:"char"`
 		return err
 	}
-	if err := e.messageRouter.RegisterHandler("accent_key_release", MessageHandlerFunc(
+	if err := e.messageRouter.registerInternalHandler("accent_key_release", MessageHandlerFunc(
 		func(ctx context.Context, _ uint64, payload json.RawMessage) (any, error) {
 			var p struct {
 				Char string `json:"char"`

M internal/infrastructure/cef/messaging.go +37 -4


@@ -7,9 +7,13 @@ import (
7	7		"fmt"
8	8		"sync"
9	9
	10	+	"github.com/bnema/dumber/internal/application/port"
10	11		"github.com/bnema/dumber/internal/logging"
11	12		)
12	13
	14	+	// Compile-time check: MessageRouter implements port.WebUIHandlerRouter.
	15	+	var _ port.WebUIHandlerRouter = (*MessageRouter)(nil)
	16	+
13	17		// Message represents a JS -> Go message envelope sent via fetch to /api/message.
14	18		type Message struct {
15	19		Type string `json:"type"`

@@ -70,7 +74,8 @@ func (r *MessageRouter) SetBaseContext(ctx context.Context) {
70	74		}
71	75
72	76		// RegisterHandler registers a handler for a message type.
73		-	func (r *MessageRouter) RegisterHandler(msgType string, handler MessageHandler) error {
	77	+	// Satisfies port.WebUIHandlerRouter.
	78	+	func (r *MessageRouter) RegisterHandler(msgType string, handler port.WebUIMessageHandler) error {
74	79		if msgType == "" {
75	80		return errors.New("message type cannot be empty")
76	81		}

@@ -79,14 +84,17 @@ func (r *MessageRouter) RegisterHandler(msgType string, handler MessageHandler)
79	84		}
80	85		r.mu.Lock()
81	86		defer r.mu.Unlock()
82		-	r.handlers[msgType] = handlerEntry{handler: handler}
	87	+	r.handlers[msgType] = handlerEntry{handler: portHandlerAdapter{handler}}
83	88		return nil
84	89		}
85	90
86	91		// RegisterHandlerWithCallbacks registers a handler with response callback names.
87	92		// callback is invoked on success, errorCallback (optional) on failure.
88	93		// worldName allows targeting a specific script world (unused in CEF fetch bridge).
89		-	func (r *MessageRouter) RegisterHandlerWithCallbacks(msgType, callback, errorCallback, worldName string, handler MessageHandler) error {
	94	+	// Satisfies port.WebUIHandlerRouter.
	95	+	func (r *MessageRouter) RegisterHandlerWithCallbacks(
	96	+	msgType, callback, errorCallback, worldName string, handler port.WebUIMessageHandler,
	97	+	) error {
90	98		if msgType == "" {
91	99		return errors.New("message type cannot be empty")
92	100		}

@@ -99,7 +107,7 @@ func (r *MessageRouter) RegisterHandlerWithCallbacks(msgType, callback, errorCal
99	107		r.mu.Lock()
100	108		defer r.mu.Unlock()
101	109		r.handlers[msgType] = handlerEntry{
102		-	handler: handler,
	110	+	handler: portHandlerAdapter{handler},
103	111		callback: callback,
104	112		errorCallback: errorCallback,
105	113		world: worldName,

@@ -107,6 +115,31 @@ func (r *MessageRouter) RegisterHandlerWithCallbacks(msgType, callback, errorCal
107	115		return nil
108	116		}
109	117
	118	+	// registerInternalHandler registers a CEF-internal handler for a message type.
	119	+	// Used for engine-internal handlers that work directly with uint64 webview IDs.
	120	+	func (r *MessageRouter) registerInternalHandler(msgType string, handler MessageHandler) error {
	121	+	if msgType == "" {
	122	+	return errors.New("message type cannot be empty")
	123	+	}
	124	+	if handler == nil {
	125	+	return errors.New("message handler cannot be nil")
	126	+	}
	127	+	r.mu.Lock()
	128	+	defer r.mu.Unlock()
	129	+	r.handlers[msgType] = handlerEntry{handler: handler}
	130	+	return nil
	131	+	}
	132	+
	133	+	// portHandlerAdapter wraps a port.WebUIMessageHandler as a cef.MessageHandler,
	134	+	// converting the WebViewID type.
	135	+	type portHandlerAdapter struct {
	136	+	inner port.WebUIMessageHandler
	137	+	}
	138	+
	139	+	func (a portHandlerAdapter) Handle(ctx context.Context, webviewID uint64, payload json.RawMessage) (any, error) {
	140	+	return a.inner.Handle(ctx, port.WebViewID(webviewID), payload)
	141	+	}
	142	+
110	143		// HandleMessage decodes a raw JSON message body and routes it to the correct handler.
111	144		// Returns the JSON-encoded response. Called by the scheme handler for /api/message POST.
112	145		func (r *MessageRouter) HandleMessage(ctx context.Context, webviewID uint64, body []byte) ([]byte, error) {

 	"fmt"
 	"sync"
+	"github.com/bnema/dumber/internal/application/port"
 	"github.com/bnema/dumber/internal/logging"
 )
+// Compile-time check: MessageRouter implements port.WebUIHandlerRouter.
+var _ port.WebUIHandlerRouter = (*MessageRouter)(nil)
 // Message represents a JS -> Go message envelope sent via fetch to /api/message.
 type Message struct {
 	Type         string          `json:"type"`
 }
 // RegisterHandler registers a handler for a message type.
-func (r *MessageRouter) RegisterHandler(msgType string, handler MessageHandler) error {
+// Satisfies port.WebUIHandlerRouter.
+func (r *MessageRouter) RegisterHandler(msgType string, handler port.WebUIMessageHandler) error {
 	if msgType == "" {
 		return errors.New("message type cannot be empty")
 	}
 	}
 	r.mu.Lock()
 	defer r.mu.Unlock()
-	r.handlers[msgType] = handlerEntry{handler: handler}
+	r.handlers[msgType] = handlerEntry{handler: portHandlerAdapter{handler}}
 	return nil
 }
 // RegisterHandlerWithCallbacks registers a handler with response callback names.
 // callback is invoked on success, errorCallback (optional) on failure.
 // worldName allows targeting a specific script world (unused in CEF fetch bridge).
-func (r *MessageRouter) RegisterHandlerWithCallbacks(msgType, callback, errorCallback, worldName string, handler MessageHandler) error {
+// Satisfies port.WebUIHandlerRouter.
+func (r *MessageRouter) RegisterHandlerWithCallbacks(
+	msgType, callback, errorCallback, worldName string, handler port.WebUIMessageHandler,
+) error {
 	if msgType == "" {
 		return errors.New("message type cannot be empty")
 	}
 	r.mu.Lock()
 	defer r.mu.Unlock()
 	r.handlers[msgType] = handlerEntry{
-		handler:       handler,
+		handler:       portHandlerAdapter{handler},
 		callback:      callback,
 		errorCallback: errorCallback,
 		world:         worldName,
 	return nil
 }
+// registerInternalHandler registers a CEF-internal handler for a message type.
+// Used for engine-internal handlers that work directly with uint64 webview IDs.
+func (r *MessageRouter) registerInternalHandler(msgType string, handler MessageHandler) error {
+	if msgType == "" {
+		return errors.New("message type cannot be empty")
+	}
+	if handler == nil {
+		return errors.New("message handler cannot be nil")
+	}
+	r.mu.Lock()
+	defer r.mu.Unlock()
+	r.handlers[msgType] = handlerEntry{handler: handler}
+	return nil
+}
+// portHandlerAdapter wraps a port.WebUIMessageHandler as a cef.MessageHandler,
+// converting the WebViewID type.
+type portHandlerAdapter struct {
+	inner port.WebUIMessageHandler
+}
+func (a portHandlerAdapter) Handle(ctx context.Context, webviewID uint64, payload json.RawMessage) (any, error) {
+	return a.inner.Handle(ctx, port.WebViewID(webviewID), payload)
+}
 // HandleMessage decodes a raw JSON message body and routes it to the correct handler.
 // Returns the JSON-encoded response. Called by the scheme handler for /api/message POST.
 func (r *MessageRouter) HandleMessage(ctx context.Context, webviewID uint64, body []byte) ([]byte, error) {

R internal/infrastructure/webkit/handlers/clipboard.go → internal/infrastructure/handlers/clipboard.go +3 -4 renamed, 89% similar


@@ -5,7 +5,6 @@ import (
5	5		"encoding/json"
6	6
7	7		"github.com/bnema/dumber/internal/application/port"
8		-	"github.com/bnema/dumber/internal/infrastructure/webkit"
9	8		"github.com/bnema/dumber/internal/logging"
10	9		)
11	10

@@ -32,8 +31,8 @@ type autoCopyRequest struct {
32	31
33	32		// HandleAutoCopySelection handles the auto_copy_selection message from JS.
34	33		// It copies the selected text to the clipboard if the feature is enabled.
35		-	func (h *ClipboardHandler) HandleAutoCopySelection() webkit.MessageHandler {
36		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	34	+	func (h *ClipboardHandler) HandleAutoCopySelection() port.WebUIMessageHandler {
	35	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
37	36		log := logging.FromContext(ctx)
38	37
39	38		// Check if feature is enabled

@@ -71,7 +70,7 @@ func (h *ClipboardHandler) HandleAutoCopySelection() webkit.MessageHandler {
71	70		// RegisterClipboardHandlers registers clipboard handlers with the router.
72	71		func RegisterClipboardHandlers(
73	72		ctx context.Context,
74		-	router *webkit.MessageRouter,
	73	+	router port.WebUIHandlerRouter,
75	74		clipboard port.Clipboard,
76	75		autoCopyConfig port.AutoCopyConfig,
77	76		onCopied func(textLen int),

 	"encoding/json"
 	"github.com/bnema/dumber/internal/application/port"
-	"github.com/bnema/dumber/internal/infrastructure/webkit"
 	"github.com/bnema/dumber/internal/logging"
 )
 // HandleAutoCopySelection handles the auto_copy_selection message from JS.
 // It copies the selected text to the clipboard if the feature is enabled.
-func (h *ClipboardHandler) HandleAutoCopySelection() webkit.MessageHandler {
+func (h *ClipboardHandler) HandleAutoCopySelection() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		// Check if feature is enabled
 // RegisterClipboardHandlers registers clipboard handlers with the router.
 func RegisterClipboardHandlers(
 	ctx context.Context,
-	router *webkit.MessageRouter,
+	router port.WebUIHandlerRouter,
 	clipboard port.Clipboard,
 	autoCopyConfig port.AutoCopyConfig,
 	onCopied func(textLen int),

R internal/infrastructure/webkit/handlers/config.go → internal/infrastructure/handlers/config.go +2 -3 renamed, 90% similar


@@ -6,7 +6,6 @@ import (
6	6		"fmt"
7	7
8	8		"github.com/bnema/dumber/internal/application/port"
9		-	"github.com/bnema/dumber/internal/infrastructure/webkit"
10	9		"github.com/bnema/dumber/internal/logging"
11	10		)
12	11

@@ -25,7 +24,7 @@ func NewConfigHandler(saveConfig func(context.Context, port.WebUIConfig) error)
25	24		}
26	25
27	26		// Handle processes the save_config message.
28		-	func (h *ConfigHandler) Handle(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	27	+	func (h *ConfigHandler) Handle(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
29	28		if h == nil {
30	29		return nil, fmt.Errorf("config handler is nil")
31	30		}

@@ -52,7 +51,7 @@ func (h *ConfigHandler) Handle(ctx context.Context, _ webkit.WebViewID, payload
52	51
53	52		// RegisterConfigHandlers registers configuration handlers with the router.
54	53		func RegisterConfigHandlers(
55		-	ctx context.Context, router *webkit.MessageRouter,
	54	+	ctx context.Context, router port.WebUIHandlerRouter,
56	55		saveConfig func(context.Context, port.WebUIConfig) error,
57	56		) error {
58	57		handler := NewConfigHandler(saveConfig)

 	"fmt"
 	"github.com/bnema/dumber/internal/application/port"
-	"github.com/bnema/dumber/internal/infrastructure/webkit"
 	"github.com/bnema/dumber/internal/logging"
 )
 }
 // Handle processes the save_config message.
-func (h *ConfigHandler) Handle(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+func (h *ConfigHandler) Handle(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 	if h == nil {
 		return nil, fmt.Errorf("config handler is nil")
 	}
 // RegisterConfigHandlers registers configuration handlers with the router.
 func RegisterConfigHandlers(
-	ctx context.Context, router *webkit.MessageRouter,
+	ctx context.Context, router port.WebUIHandlerRouter,
 	saveConfig func(context.Context, port.WebUIConfig) error,
 ) error {
 	handler := NewConfigHandler(saveConfig)

R internal/infrastructure/webkit/handlers/homepage/favorites.go → internal/infrastructure/handlers/homepage/favorites.go +8 -9 renamed, 80% similar


@@ -6,7 +6,6 @@ import (
6	6
7	7		"github.com/bnema/dumber/internal/application/port"
8	8		"github.com/bnema/dumber/internal/domain/entity"
9		-	"github.com/bnema/dumber/internal/infrastructure/webkit"
10	9		"github.com/bnema/dumber/internal/logging"
11	10		)
12	11

@@ -21,8 +20,8 @@ func NewFavoritesHandlers(favoritesUC port.HomepageFavorites) *FavoritesHandlers
21	20		}
22	21
23	22		// HandleList handles favorite_list messages.
24		-	func (h *FavoritesHandlers) HandleList() webkit.MessageHandler {
25		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	23	+	func (h *FavoritesHandlers) HandleList() port.WebUIMessageHandler {
	24	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
26	25		log := logging.FromContext(ctx)
27	26
28	27		requestID := ParseRequestID(payload)

@@ -48,8 +47,8 @@ type setShortcutRequest struct {
48	47		}
49	48
50	49		// HandleSetShortcut handles favorite_set_shortcut messages.
51		-	func (h *FavoritesHandlers) HandleSetShortcut() webkit.MessageHandler {
52		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	50	+	func (h *FavoritesHandlers) HandleSetShortcut() port.WebUIMessageHandler {
	51	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
53	52		log := logging.FromContext(ctx)
54	53
55	54		var req setShortcutRequest

@@ -77,8 +76,8 @@ type getByShortcutRequest struct {
77	76		}
78	77
79	78		// HandleGetByShortcut handles favorite_get_by_shortcut messages.
80		-	func (h *FavoritesHandlers) HandleGetByShortcut() webkit.MessageHandler {
81		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	79	+	func (h *FavoritesHandlers) HandleGetByShortcut() port.WebUIMessageHandler {
	80	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
82	81		log := logging.FromContext(ctx)
83	82
84	83		var req getByShortcutRequest

@@ -108,8 +107,8 @@ type setFolderRequest struct {
108	107		}
109	108
110	109		// HandleSetFolder handles favorite_set_folder messages.
111		-	func (h *FavoritesHandlers) HandleSetFolder() webkit.MessageHandler {
112		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	110	+	func (h *FavoritesHandlers) HandleSetFolder() port.WebUIMessageHandler {
	111	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
113	112		log := logging.FromContext(ctx)
114	113
115	114		var req setFolderRequest

 	"github.com/bnema/dumber/internal/application/port"
 	"github.com/bnema/dumber/internal/domain/entity"
-	"github.com/bnema/dumber/internal/infrastructure/webkit"
 	"github.com/bnema/dumber/internal/logging"
 )
 }
 // HandleList handles favorite_list messages.
-func (h *FavoritesHandlers) HandleList() webkit.MessageHandler {
+func (h *FavoritesHandlers) HandleList() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		requestID := ParseRequestID(payload)
 }
 // HandleSetShortcut handles favorite_set_shortcut messages.
-func (h *FavoritesHandlers) HandleSetShortcut() webkit.MessageHandler {
+func (h *FavoritesHandlers) HandleSetShortcut() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		var req setShortcutRequest
 }
 // HandleGetByShortcut handles favorite_get_by_shortcut messages.
-func (h *FavoritesHandlers) HandleGetByShortcut() webkit.MessageHandler {
+func (h *FavoritesHandlers) HandleGetByShortcut() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		var req getByShortcutRequest
 }
 // HandleSetFolder handles favorite_set_folder messages.
-func (h *FavoritesHandlers) HandleSetFolder() webkit.MessageHandler {
+func (h *FavoritesHandlers) HandleSetFolder() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		var req setFolderRequest

R internal/infrastructure/webkit/handlers/homepage/folders.go → internal/infrastructure/handlers/homepage/folders.go +8 -9 renamed, 81% similar


@@ -6,7 +6,6 @@ import (
6	6
7	7		"github.com/bnema/dumber/internal/application/port"
8	8		"github.com/bnema/dumber/internal/domain/entity"
9		-	"github.com/bnema/dumber/internal/infrastructure/webkit"
10	9		"github.com/bnema/dumber/internal/logging"
11	10		)
12	11

@@ -21,8 +20,8 @@ func NewFolderHandlers(favoritesUC port.HomepageFavorites) *FolderHandlers {
21	20		}
22	21
23	22		// HandleList handles folder_list messages.
24		-	func (h *FolderHandlers) HandleList() webkit.MessageHandler {
25		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	23	+	func (h *FolderHandlers) HandleList() port.WebUIMessageHandler {
	24	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
26	25		log := logging.FromContext(ctx)
27	26
28	27		requestID := ParseRequestID(payload)

@@ -48,8 +47,8 @@ type createFolderRequest struct {
48	47		}
49	48
50	49		// HandleCreate handles folder_create messages.
51		-	func (h *FolderHandlers) HandleCreate() webkit.MessageHandler {
52		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	50	+	func (h *FolderHandlers) HandleCreate() port.WebUIMessageHandler {
	51	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
53	52		log := logging.FromContext(ctx)
54	53
55	54		var req createFolderRequest

@@ -86,8 +85,8 @@ type deleteFolderRequest struct {
86	85		}
87	86
88	87		// HandleDelete handles folder_delete messages.
89		-	func (h *FolderHandlers) HandleDelete() webkit.MessageHandler {
90		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	88	+	func (h *FolderHandlers) HandleDelete() port.WebUIMessageHandler {
	89	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
91	90		log := logging.FromContext(ctx)
92	91
93	92		var req deleteFolderRequest

@@ -118,8 +117,8 @@ type updateFolderRequest struct {
118	117
119	118		// HandleUpdate handles folder_update messages.
120	119		// It delegates to the port.HomepageFavorites interface's UpdateFolder method.
121		-	func (h *FolderHandlers) HandleUpdate() webkit.MessageHandler {
122		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	120	+	func (h *FolderHandlers) HandleUpdate() port.WebUIMessageHandler {
	121	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
123	122		log := logging.FromContext(ctx)
124	123
125	124		var req updateFolderRequest

 	"github.com/bnema/dumber/internal/application/port"
 	"github.com/bnema/dumber/internal/domain/entity"
-	"github.com/bnema/dumber/internal/infrastructure/webkit"
 	"github.com/bnema/dumber/internal/logging"
 )
 }
 // HandleList handles folder_list messages.
-func (h *FolderHandlers) HandleList() webkit.MessageHandler {
+func (h *FolderHandlers) HandleList() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		requestID := ParseRequestID(payload)
 }
 // HandleCreate handles folder_create messages.
-func (h *FolderHandlers) HandleCreate() webkit.MessageHandler {
+func (h *FolderHandlers) HandleCreate() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		var req createFolderRequest
 }
 // HandleDelete handles folder_delete messages.
-func (h *FolderHandlers) HandleDelete() webkit.MessageHandler {
+func (h *FolderHandlers) HandleDelete() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		var req deleteFolderRequest
 // HandleUpdate handles folder_update messages.
 // It delegates to the port.HomepageFavorites interface's UpdateFolder method.
-func (h *FolderHandlers) HandleUpdate() webkit.MessageHandler {
+func (h *FolderHandlers) HandleUpdate() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		var req updateFolderRequest

R internal/infrastructure/webkit/handlers/homepage/history.go → internal/infrastructure/handlers/homepage/history.go +16 -17 renamed, 81% similar


@@ -7,7 +7,6 @@ import (
7	7
8	8		"github.com/bnema/dumber/internal/application/port"
9	9		"github.com/bnema/dumber/internal/domain/entity"
10		-	"github.com/bnema/dumber/internal/infrastructure/webkit"
11	10		"github.com/bnema/dumber/internal/logging"
12	11		)
13	12

@@ -29,8 +28,8 @@ type timelineRequest struct {
29	28		}
30	29
31	30		// HandleTimeline handles history_timeline messages.
32		-	func (h *HistoryHandlers) HandleTimeline() webkit.MessageHandler {
33		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	31	+	func (h *HistoryHandlers) HandleTimeline() port.WebUIMessageHandler {
	32	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
34	33		log := logging.FromContext(ctx)
35	34
36	35		var req timelineRequest

@@ -61,8 +60,8 @@ type searchRequest struct {
61	60		}
62	61
63	62		// HandleSearchFTS handles history_search_fts messages.
64		-	func (h *HistoryHandlers) HandleSearchFTS() webkit.MessageHandler {
65		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	63	+	func (h *HistoryHandlers) HandleSearchFTS() port.WebUIMessageHandler {
	64	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
66	65		log := logging.FromContext(ctx)
67	66
68	67		var req searchRequest

@@ -100,8 +99,8 @@ type deleteEntryRequest struct {
100	99		}
101	100
102	101		// HandleDeleteEntry handles history_delete_entry messages.
103		-	func (h *HistoryHandlers) HandleDeleteEntry() webkit.MessageHandler {
104		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	102	+	func (h *HistoryHandlers) HandleDeleteEntry() port.WebUIMessageHandler {
	103	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
105	104		log := logging.FromContext(ctx)
106	105
107	106		var req deleteEntryRequest

@@ -129,8 +128,8 @@ type deleteRangeRequest struct {
129	128		}
130	129
131	130		// HandleDeleteRange handles history_delete_range messages.
132		-	func (h *HistoryHandlers) HandleDeleteRange() webkit.MessageHandler {
133		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	131	+	func (h *HistoryHandlers) HandleDeleteRange() port.WebUIMessageHandler {
	132	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
134	133		log := logging.FromContext(ctx)
135	134
136	135		var req deleteRangeRequest

@@ -160,8 +159,8 @@ func (h *HistoryHandlers) HandleDeleteRange() webkit.MessageHandler {
160	159		}
161	160
162	161		// HandleClearAll handles history_clear_all messages.
163		-	func (h *HistoryHandlers) HandleClearAll() webkit.MessageHandler {
164		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	162	+	func (h *HistoryHandlers) HandleClearAll() port.WebUIMessageHandler {
	163	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
165	164		log := logging.FromContext(ctx)
166	165
167	166		requestID := ParseRequestID(payload)

@@ -199,8 +198,8 @@ func rangeToTime(r string) time.Time {
199	198		}
200	199
201	200		// HandleAnalytics handles history_analytics messages.
202		-	func (h *HistoryHandlers) HandleAnalytics() webkit.MessageHandler {
203		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	201	+	func (h *HistoryHandlers) HandleAnalytics() port.WebUIMessageHandler {
	202	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
204	203		log := logging.FromContext(ctx)
205	204
206	205		requestID := ParseRequestID(payload)

@@ -225,8 +224,8 @@ type domainStatsRequest struct {
225	224		}
226	225
227	226		// HandleDomainStats handles history_domain_stats messages.
228		-	func (h *HistoryHandlers) HandleDomainStats() webkit.MessageHandler {
229		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	227	+	func (h *HistoryHandlers) HandleDomainStats() port.WebUIMessageHandler {
	228	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
230	229		log := logging.FromContext(ctx)
231	230
232	231		var req domainStatsRequest

@@ -255,8 +254,8 @@ type deleteDomainRequest struct {
255	254		}
256	255
257	256		// HandleDeleteDomain handles history_delete_domain messages.
258		-	func (h *HistoryHandlers) HandleDeleteDomain() webkit.MessageHandler {
259		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	257	+	func (h *HistoryHandlers) HandleDeleteDomain() port.WebUIMessageHandler {
	258	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
260	259		log := logging.FromContext(ctx)
261	260
262	261		var req deleteDomainRequest

 	"github.com/bnema/dumber/internal/application/port"
 	"github.com/bnema/dumber/internal/domain/entity"
-	"github.com/bnema/dumber/internal/infrastructure/webkit"
 	"github.com/bnema/dumber/internal/logging"
 )
 }
 // HandleTimeline handles history_timeline messages.
-func (h *HistoryHandlers) HandleTimeline() webkit.MessageHandler {
+func (h *HistoryHandlers) HandleTimeline() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		var req timelineRequest
 }
 // HandleSearchFTS handles history_search_fts messages.
-func (h *HistoryHandlers) HandleSearchFTS() webkit.MessageHandler {
+func (h *HistoryHandlers) HandleSearchFTS() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		var req searchRequest
 }
 // HandleDeleteEntry handles history_delete_entry messages.
-func (h *HistoryHandlers) HandleDeleteEntry() webkit.MessageHandler {
+func (h *HistoryHandlers) HandleDeleteEntry() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		var req deleteEntryRequest
 }
 // HandleDeleteRange handles history_delete_range messages.
-func (h *HistoryHandlers) HandleDeleteRange() webkit.MessageHandler {
+func (h *HistoryHandlers) HandleDeleteRange() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		var req deleteRangeRequest
 }
 // HandleClearAll handles history_clear_all messages.
-func (h *HistoryHandlers) HandleClearAll() webkit.MessageHandler {
+func (h *HistoryHandlers) HandleClearAll() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		requestID := ParseRequestID(payload)
 }
 // HandleAnalytics handles history_analytics messages.
-func (h *HistoryHandlers) HandleAnalytics() webkit.MessageHandler {
+func (h *HistoryHandlers) HandleAnalytics() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		requestID := ParseRequestID(payload)
 }
 // HandleDomainStats handles history_domain_stats messages.
-func (h *HistoryHandlers) HandleDomainStats() webkit.MessageHandler {
+func (h *HistoryHandlers) HandleDomainStats() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		var req domainStatsRequest
 }
 // HandleDeleteDomain handles history_delete_domain messages.
-func (h *HistoryHandlers) HandleDeleteDomain() webkit.MessageHandler {
+func (h *HistoryHandlers) HandleDeleteDomain() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		var req deleteDomainRequest

R internal/infrastructure/webkit/handlers/homepage/registry.go → internal/infrastructure/handlers/homepage/registry.go +2 -3 renamed, 93% similar


@@ -5,7 +5,6 @@ import (
5	5		"fmt"
6	6
7	7		"github.com/bnema/dumber/internal/application/port"
8		-	"github.com/bnema/dumber/internal/infrastructure/webkit"
9	8		"github.com/bnema/dumber/internal/logging"
10	9		)
11	10

@@ -16,7 +15,7 @@ type Config struct {
16	15		}
17	16
18	17		// RegisterHandlers registers all homepage message handlers with the router.
19		-	func RegisterHandlers(ctx context.Context, router *webkit.MessageRouter, cfg Config) error {
	18	+	func RegisterHandlers(ctx context.Context, router port.WebUIHandlerRouter, cfg Config) error {
20	19		log := logging.FromContext(ctx)
21	20		log.Debug().Msg("registering homepage message handlers")
22	21

@@ -25,7 +24,7 @@ func RegisterHandlers(ctx context.Context, router *webkit.MessageRouter, cfg Con
25	24		const errorCallback = "__dumber_error"
26	25		const worldName = "" // main world
27	26
28		-	handlers := make(map[string]webkit.MessageHandler)
	27	+	handlers := make(map[string]port.WebUIMessageHandler)
29	28
30	29		// History handlers
31	30		historyHandlers := NewHistoryHandlers(cfg.HistoryUC)

 	"fmt"
 	"github.com/bnema/dumber/internal/application/port"
-	"github.com/bnema/dumber/internal/infrastructure/webkit"
 	"github.com/bnema/dumber/internal/logging"
 )
 }
 // RegisterHandlers registers all homepage message handlers with the router.
-func RegisterHandlers(ctx context.Context, router *webkit.MessageRouter, cfg Config) error {
+func RegisterHandlers(ctx context.Context, router port.WebUIHandlerRouter, cfg Config) error {
 	log := logging.FromContext(ctx)
 	log.Debug().Msg("registering homepage message handlers")
 	const errorCallback = "__dumber_error"
 	const worldName = "" // main world
-	handlers := make(map[string]webkit.MessageHandler)
+	handlers := make(map[string]port.WebUIMessageHandler)
 	// History handlers
 	historyHandlers := NewHistoryHandlers(cfg.HistoryUC)

R internal/infrastructure/webkit/handlers/homepage/response.go → internal/infrastructure/handlers/homepage/response.go +0 -0 renamed, 100% similar

renamed, 100% similar

R internal/infrastructure/webkit/handlers/homepage/tags.go → internal/infrastructure/handlers/homepage/tags.go +12 -13 renamed, 79% similar


@@ -6,7 +6,6 @@ import (
6	6
7	7		"github.com/bnema/dumber/internal/application/port"
8	8		"github.com/bnema/dumber/internal/domain/entity"
9		-	"github.com/bnema/dumber/internal/infrastructure/webkit"
10	9		"github.com/bnema/dumber/internal/logging"
11	10		)
12	11

@@ -21,8 +20,8 @@ func NewTagHandlers(favoritesUC port.HomepageFavorites) *TagHandlers {
21	20		}
22	21
23	22		// HandleList handles tag_list messages.
24		-	func (h *TagHandlers) HandleList() webkit.MessageHandler {
25		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	23	+	func (h *TagHandlers) HandleList() port.WebUIMessageHandler {
	24	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
26	25		log := logging.FromContext(ctx)
27	26
28	27		requestID := ParseRequestID(payload)

@@ -48,8 +47,8 @@ type createTagRequest struct {
48	47		}
49	48
50	49		// HandleCreate handles tag_create messages.
51		-	func (h *TagHandlers) HandleCreate() webkit.MessageHandler {
52		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	50	+	func (h *TagHandlers) HandleCreate() port.WebUIMessageHandler {
	51	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
53	52		log := logging.FromContext(ctx)
54	53
55	54		var req createTagRequest

@@ -83,8 +82,8 @@ type deleteTagRequest struct {
83	82		}
84	83
85	84		// HandleDelete handles tag_delete messages.
86		-	func (h *TagHandlers) HandleDelete() webkit.MessageHandler {
87		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	85	+	func (h *TagHandlers) HandleDelete() port.WebUIMessageHandler {
	86	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
88	87		log := logging.FromContext(ctx)
89	88
90	89		var req deleteTagRequest

@@ -115,8 +114,8 @@ type updateTagRequest struct {
115	114
116	115		// HandleUpdate handles tag_update messages.
117	116		// NOTE: This requires UpdateTag() method to be added to ManageFavoritesUseCase.
118		-	func (h *TagHandlers) HandleUpdate() webkit.MessageHandler {
119		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	117	+	func (h *TagHandlers) HandleUpdate() port.WebUIMessageHandler {
	118	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
120	119		log := logging.FromContext(ctx)
121	120
122	121		var req updateTagRequest

@@ -154,17 +153,17 @@ type tagAssignRequest struct {
154	153		}
155	154
156	155		// HandleAssign handles tag_assign messages.
157		-	func (h *TagHandlers) HandleAssign() webkit.MessageHandler {
	156	+	func (h *TagHandlers) HandleAssign() port.WebUIMessageHandler {
158	157		return handleTagAssign("tag_assign", h.favoritesUC.TagFavorite)
159	158		}
160	159
161	160		// HandleRemove handles tag_remove messages.
162		-	func (h *TagHandlers) HandleRemove() webkit.MessageHandler {
	161	+	func (h *TagHandlers) HandleRemove() port.WebUIMessageHandler {
163	162		return handleTagAssign("tag_remove", h.favoritesUC.UntagFavorite)
164	163		}
165	164
166		-	func handleTagAssign(action string, op func(context.Context, entity.FavoriteID, entity.TagID) error) webkit.MessageHandler {
167		-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	165	+	func handleTagAssign(action string, op func(context.Context, entity.FavoriteID, entity.TagID) error) port.WebUIMessageHandler {
	166	+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
168	167		log := logging.FromContext(ctx)
169	168
170	169		var req tagAssignRequest

 	"github.com/bnema/dumber/internal/application/port"
 	"github.com/bnema/dumber/internal/domain/entity"
-	"github.com/bnema/dumber/internal/infrastructure/webkit"
 	"github.com/bnema/dumber/internal/logging"
 )
 }
 // HandleList handles tag_list messages.
-func (h *TagHandlers) HandleList() webkit.MessageHandler {
+func (h *TagHandlers) HandleList() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		requestID := ParseRequestID(payload)
 }
 // HandleCreate handles tag_create messages.
-func (h *TagHandlers) HandleCreate() webkit.MessageHandler {
+func (h *TagHandlers) HandleCreate() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		var req createTagRequest
 }
 // HandleDelete handles tag_delete messages.
-func (h *TagHandlers) HandleDelete() webkit.MessageHandler {
+func (h *TagHandlers) HandleDelete() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		var req deleteTagRequest
 // HandleUpdate handles tag_update messages.
 // NOTE: This requires UpdateTag() method to be added to ManageFavoritesUseCase.
-func (h *TagHandlers) HandleUpdate() webkit.MessageHandler {
+func (h *TagHandlers) HandleUpdate() port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		var req updateTagRequest
 }
 // HandleAssign handles tag_assign messages.
-func (h *TagHandlers) HandleAssign() webkit.MessageHandler {
+func (h *TagHandlers) HandleAssign() port.WebUIMessageHandler {
 	return handleTagAssign("tag_assign", h.favoritesUC.TagFavorite)
 }
 // HandleRemove handles tag_remove messages.
-func (h *TagHandlers) HandleRemove() webkit.MessageHandler {
+func (h *TagHandlers) HandleRemove() port.WebUIMessageHandler {
 	return handleTagAssign("tag_remove", h.favoritesUC.UntagFavorite)
 }
-func handleTagAssign(action string, op func(context.Context, entity.FavoriteID, entity.TagID) error) webkit.MessageHandler {
+func handleTagAssign(action string, op func(context.Context, entity.FavoriteID, entity.TagID) error) port.WebUIMessageHandler {
-	return webkit.MessageHandlerFunc(func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+	return port.WebUIMessageHandlerFunc(func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 		log := logging.FromContext(ctx)
 		var req tagAssignRequest

R internal/infrastructure/webkit/handlers/keybindings.go → internal/infrastructure/handlers/keybindings.go +9 -10 renamed, 84% similar


@@ -6,7 +6,6 @@ import (
6	6		"fmt"
7	7
8	8		"github.com/bnema/dumber/internal/application/port"
9		-	"github.com/bnema/dumber/internal/infrastructure/webkit"
10	9		"github.com/bnema/dumber/internal/logging"
11	10		)
12	11

@@ -34,12 +33,12 @@ func NewKeybindingsHandler(
34	33		}
35	34
36	35		// HandleGetKeybindings returns all keybindings grouped by mode.
37		-	func (h *KeybindingsHandler) HandleGetKeybindings(ctx context.Context, _ webkit.WebViewID, _ json.RawMessage) (any, error) {
	36	+	func (h *KeybindingsHandler) HandleGetKeybindings(ctx context.Context, _ port.WebViewID, _ json.RawMessage) (any, error) {
38	37		return h.getUC.Execute(ctx)
39	38		}
40	39
41	40		// HandleSetKeybinding updates a single keybinding.
42		-	func (h *KeybindingsHandler) HandleSetKeybinding(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	41	+	func (h *KeybindingsHandler) HandleSetKeybinding(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
43	42		log := logging.FromContext(ctx).With().Str("handler", "keybindings").Logger()
44	43		log.Debug().RawJSON("payload", payload).Msg("HandleSetKeybinding called")
45	44

@@ -61,7 +60,7 @@ func (h *KeybindingsHandler) HandleSetKeybinding(ctx context.Context, _ webkit.W
61	60		}
62	61
63	62		// HandleResetKeybinding resets a keybinding to default.
64		-	func (h *KeybindingsHandler) HandleResetKeybinding(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	63	+	func (h *KeybindingsHandler) HandleResetKeybinding(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
65	64		log := logging.FromContext(ctx).With().Str("handler", "keybindings").Logger()
66	65
67	66		var req port.ResetKeybindingRequest

@@ -79,7 +78,7 @@ func (h *KeybindingsHandler) HandleResetKeybinding(ctx context.Context, _ webkit
79	78		}
80	79
81	80		// HandleResetAllKeybindings resets all keybindings to defaults.
82		-	func (h *KeybindingsHandler) HandleResetAllKeybindings(ctx context.Context, _ webkit.WebViewID, _ json.RawMessage) (any, error) {
	81	+	func (h *KeybindingsHandler) HandleResetAllKeybindings(ctx context.Context, _ port.WebViewID, _ json.RawMessage) (any, error) {
83	82		log := logging.FromContext(ctx).With().Str("handler", "keybindings").Logger()
84	83		log.Info().Msg("resetting all keybindings to defaults")
85	84

@@ -91,7 +90,7 @@ func (h *KeybindingsHandler) HandleResetAllKeybindings(ctx context.Context, _ we
91	90		}
92	91
93	92		// RegisterKeybindingsHandlers registers keybindings handlers with the router.
94		-	func RegisterKeybindingsHandlers(ctx context.Context, router webkit.MessageRouter, handler KeybindingsHandler) error {
	93	+	func RegisterKeybindingsHandlers(ctx context.Context, router port.WebUIHandlerRouter, handler *KeybindingsHandler) error {
95	94		log := logging.FromContext(ctx).With().Str("component", "handlers").Logger()
96	95
97	96		// Get all keybindings

@@ -100,7 +99,7 @@ func RegisterKeybindingsHandlers(ctx context.Context, router *webkit.MessageRout
100	99		"__dumber_keybindings_loaded",
101	100		"__dumber_keybindings_error",
102	101		"",
103		-	webkit.MessageHandlerFunc(handler.HandleGetKeybindings),
	102	+	port.WebUIMessageHandlerFunc(handler.HandleGetKeybindings),
104	103		); err != nil {
105	104		return err
106	105		}

@@ -111,7 +110,7 @@ func RegisterKeybindingsHandlers(ctx context.Context, router *webkit.MessageRout
111	110		"__dumber_keybinding_set",
112	111		"__dumber_keybinding_set_error",
113	112		"",
114		-	webkit.MessageHandlerFunc(handler.HandleSetKeybinding),
	113	+	port.WebUIMessageHandlerFunc(handler.HandleSetKeybinding),
115	114		); err != nil {
116	115		return err
117	116		}

@@ -122,7 +121,7 @@ func RegisterKeybindingsHandlers(ctx context.Context, router *webkit.MessageRout
122	121		"__dumber_keybinding_reset",
123	122		"__dumber_keybinding_reset_error",
124	123		"",
125		-	webkit.MessageHandlerFunc(handler.HandleResetKeybinding),
	124	+	port.WebUIMessageHandlerFunc(handler.HandleResetKeybinding),
126	125		); err != nil {
127	126		return err
128	127		}

@@ -133,7 +132,7 @@ func RegisterKeybindingsHandlers(ctx context.Context, router *webkit.MessageRout
133	132		"__dumber_keybindings_reset_all",
134	133		"__dumber_keybindings_reset_all_error",
135	134		"",
136		-	webkit.MessageHandlerFunc(handler.HandleResetAllKeybindings),
	135	+	port.WebUIMessageHandlerFunc(handler.HandleResetAllKeybindings),
137	136		); err != nil {
138	137		return err
139	138		}

 	"fmt"
 	"github.com/bnema/dumber/internal/application/port"
-	"github.com/bnema/dumber/internal/infrastructure/webkit"
 	"github.com/bnema/dumber/internal/logging"
 )
 }
 // HandleGetKeybindings returns all keybindings grouped by mode.
-func (h *KeybindingsHandler) HandleGetKeybindings(ctx context.Context, _ webkit.WebViewID, _ json.RawMessage) (any, error) {
+func (h *KeybindingsHandler) HandleGetKeybindings(ctx context.Context, _ port.WebViewID, _ json.RawMessage) (any, error) {
 	return h.getUC.Execute(ctx)
 }
 // HandleSetKeybinding updates a single keybinding.
-func (h *KeybindingsHandler) HandleSetKeybinding(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+func (h *KeybindingsHandler) HandleSetKeybinding(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 	log := logging.FromContext(ctx).With().Str("handler", "keybindings").Logger()
 	log.Debug().RawJSON("payload", payload).Msg("HandleSetKeybinding called")
 }
 // HandleResetKeybinding resets a keybinding to default.
-func (h *KeybindingsHandler) HandleResetKeybinding(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+func (h *KeybindingsHandler) HandleResetKeybinding(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 	log := logging.FromContext(ctx).With().Str("handler", "keybindings").Logger()
 	var req port.ResetKeybindingRequest
 }
 // HandleResetAllKeybindings resets all keybindings to defaults.
-func (h *KeybindingsHandler) HandleResetAllKeybindings(ctx context.Context, _ webkit.WebViewID, _ json.RawMessage) (any, error) {
+func (h *KeybindingsHandler) HandleResetAllKeybindings(ctx context.Context, _ port.WebViewID, _ json.RawMessage) (any, error) {
 	log := logging.FromContext(ctx).With().Str("handler", "keybindings").Logger()
 	log.Info().Msg("resetting all keybindings to defaults")
 }
 // RegisterKeybindingsHandlers registers keybindings handlers with the router.
-func RegisterKeybindingsHandlers(ctx context.Context, router *webkit.MessageRouter, handler *KeybindingsHandler) error {
+func RegisterKeybindingsHandlers(ctx context.Context, router port.WebUIHandlerRouter, handler *KeybindingsHandler) error {
 	log := logging.FromContext(ctx).With().Str("component", "handlers").Logger()
 	// Get all keybindings
 		"__dumber_keybindings_loaded",
 		"__dumber_keybindings_error",
 		"",
-		webkit.MessageHandlerFunc(handler.HandleGetKeybindings),
+		port.WebUIMessageHandlerFunc(handler.HandleGetKeybindings),
 	); err != nil {
 		return err
 	}
 		"__dumber_keybinding_set",
 		"__dumber_keybinding_set_error",
 		"",
-		webkit.MessageHandlerFunc(handler.HandleSetKeybinding),
+		port.WebUIMessageHandlerFunc(handler.HandleSetKeybinding),
 	); err != nil {
 		return err
 	}
 		"__dumber_keybinding_reset",
 		"__dumber_keybinding_reset_error",
 		"",
-		webkit.MessageHandlerFunc(handler.HandleResetKeybinding),
+		port.WebUIMessageHandlerFunc(handler.HandleResetKeybinding),
 	); err != nil {
 		return err
 	}
 		"__dumber_keybindings_reset_all",
 		"__dumber_keybindings_reset_all_error",
 		"",
-		webkit.MessageHandlerFunc(handler.HandleResetAllKeybindings),
+		port.WebUIMessageHandlerFunc(handler.HandleResetAllKeybindings),
 	); err != nil {
 		return err
 	}

R internal/infrastructure/webkit/handlers/register.go → internal/infrastructure/handlers/register.go +24 -31 renamed, 50% similar


@@ -7,8 +7,7 @@ import (
7	7		"unicode/utf8"
8	8
9	9		"github.com/bnema/dumber/internal/application/port"
10		-	"github.com/bnema/dumber/internal/infrastructure/webkit"
11		-	"github.com/bnema/dumber/internal/infrastructure/webkit/handlers/homepage"
	10	+	"github.com/bnema/dumber/internal/infrastructure/handlers/homepage"
12	11		)
13	12
14	13		// AccentKeyHandler is implemented by the InsertAccentUseCase to receive

@@ -17,49 +16,43 @@ import (
17	16		// Deprecated: use port.AccentKeyHandler instead. This alias is kept for compatibility.
18	17		type AccentKeyHandler = port.AccentKeyHandler
19	18
20		-	// Config holds all dependencies for message handlers.
21		-	type Config struct {
22		-	HistoryUC port.HomepageHistory
23		-	FavoritesUC port.HomepageFavorites
24		-	Clipboard port.Clipboard
25		-	AutoCopyConfig port.AutoCopyConfig
26		-	SaveConfig func(context.Context, port.WebUIConfig) error // Pre-built by bootstrap (usecase.SaveWebUIConfigUseCase.Execute)
27		-	// KeybindingsHandler is required (not optional like other handlers) because the WebUI
28		-	// always needs keybinding read/write support regardless of configuration.
29		-	KeybindingsHandler *KeybindingsHandler // Pre-built by bootstrap
30		-	OnClipboardCopied func(textLen int) // Called when auto-copy completes (for toast notification)
31		-	}
32		-
33	19		// RegisterAll registers all message handlers with the router.
34		-	func RegisterAll(ctx context.Context, router *webkit.MessageRouter, cfg Config) error {
	20	+	// The router can be any engine's message router that implements port.WebUIHandlerRouter.
	21	+	func RegisterAll(ctx context.Context, router port.WebUIHandlerRouter, deps port.HandlerDependencies) error {
35	22		// Homepage handlers (history, favorites, folders, tags)
36		-	if cfg.HistoryUC != nil && cfg.FavoritesUC != nil {
	23	+	if deps.HistoryUC != nil && deps.FavoritesUC != nil {
37	24		if err := homepage.RegisterHandlers(ctx, router, homepage.Config{
38		-	HistoryUC: cfg.HistoryUC,
39		-	FavoritesUC: cfg.FavoritesUC,
	25	+	HistoryUC: deps.HistoryUC,
	26	+	FavoritesUC: deps.FavoritesUC,
40	27		}); err != nil {
41	28		return err
42	29		}
43	30		}
44	31
45	32		// Configuration handlers
46		-	if cfg.SaveConfig != nil {
47		-	if err := RegisterConfigHandlers(ctx, router, cfg.SaveConfig); err != nil {
	33	+	if deps.SaveConfig != nil {
	34	+	if err := RegisterConfigHandlers(ctx, router, deps.SaveConfig); err != nil {
48	35		return err
49	36		}
50	37		}
51	38
52	39		// Keybindings handlers (always available)
53		-	if cfg.KeybindingsHandler == nil {
54		-	return fmt.Errorf("KeybindingsHandler is required")
	40	+	if deps.KeybindingsGetter == nil {
	41	+	return fmt.Errorf("KeybindingsGetter is required")
55	42		}
56		-	if err := RegisterKeybindingsHandlers(ctx, router, cfg.KeybindingsHandler); err != nil {
	43	+	kbHandler := NewKeybindingsHandler(
	44	+	deps.KeybindingsGetter,
	45	+	deps.KeybindingSetter,
	46	+	deps.KeybindingResetter,
	47	+	deps.AllKeybindingsResetter,
	48	+	)
	49	+	if err := RegisterKeybindingsHandlers(ctx, router, kbHandler); err != nil {
57	50		return err
58	51		}
59	52
60	53		// Clipboard handlers (for auto-copy on selection feature)
61		-	if cfg.Clipboard != nil && cfg.AutoCopyConfig != nil {
62		-	if err := RegisterClipboardHandlers(ctx, router, cfg.Clipboard, cfg.AutoCopyConfig, cfg.OnClipboardCopied); err != nil {
	54	+	if deps.Clipboard != nil && deps.AutoCopyConfig != nil {
	55	+	if err := RegisterClipboardHandlers(ctx, router, deps.Clipboard, deps.AutoCopyConfig, deps.OnClipboardCopied); err != nil {
63	56		return err
64	57		}
65	58		}

@@ -69,7 +62,7 @@ func RegisterAll(ctx context.Context, router *webkit.MessageRouter, cfg Config)
69	62
70	63		// RegisterAccentHandlers registers accent key press/release handlers with the router.
71	64		// Must be called after the AccentKeyHandler is initialized (i.e., after initAccentPicker).
72		-	func RegisterAccentHandlers(_ context.Context, router *webkit.MessageRouter, handler AccentKeyHandler) error {
	65	+	func RegisterAccentHandlers(_ context.Context, router port.WebUIHandlerRouter, handler AccentKeyHandler) error {
73	66		if router == nil {
74	67		return fmt.Errorf("RegisterAccentHandlers: router must not be nil")
75	68		}

@@ -77,8 +70,8 @@ func RegisterAccentHandlers(_ context.Context, router *webkit.MessageRouter, han
77	70		return fmt.Errorf("RegisterAccentHandlers: handler must not be nil")
78	71		}
79	72
80		-	if err := router.RegisterHandler("accent_key_press", webkit.MessageHandlerFunc(
81		-	func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	73	+	if err := router.RegisterHandler("accent_key_press", port.WebUIMessageHandlerFunc(
	74	+	func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
82	75		var p struct {
83	76		Char string `json:"char"`
84	77		Shift bool `json:"shift"`

@@ -95,8 +88,8 @@ func RegisterAccentHandlers(_ context.Context, router *webkit.MessageRouter, han
95	88		return err
96	89		}
97	90
98		-	if err := router.RegisterHandler("accent_key_release", webkit.MessageHandlerFunc(
99		-	func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
	91	+	if err := router.RegisterHandler("accent_key_release", port.WebUIMessageHandlerFunc(
	92	+	func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
100	93		var p struct {
101	94		Char string `json:"char"`
102	95		}

 	"unicode/utf8"
 	"github.com/bnema/dumber/internal/application/port"
-	"github.com/bnema/dumber/internal/infrastructure/webkit"
+	"github.com/bnema/dumber/internal/infrastructure/handlers/homepage"
-	"github.com/bnema/dumber/internal/infrastructure/webkit/handlers/homepage"
 )
 // AccentKeyHandler is implemented by the InsertAccentUseCase to receive
 // Deprecated: use port.AccentKeyHandler instead. This alias is kept for compatibility.
 type AccentKeyHandler = port.AccentKeyHandler
-// Config holds all dependencies for message handlers.
-type Config struct {
-	HistoryUC      port.HomepageHistory
-	FavoritesUC    port.HomepageFavorites
-	Clipboard      port.Clipboard
-	AutoCopyConfig port.AutoCopyConfig
-	SaveConfig     func(context.Context, port.WebUIConfig) error // Pre-built by bootstrap (usecase.SaveWebUIConfigUseCase.Execute)
-	// KeybindingsHandler is required (not optional like other handlers) because the WebUI
-	// always needs keybinding read/write support regardless of configuration.
-	KeybindingsHandler *KeybindingsHandler // Pre-built by bootstrap
-	OnClipboardCopied  func(textLen int)   // Called when auto-copy completes (for toast notification)
-}
 // RegisterAll registers all message handlers with the router.
-func RegisterAll(ctx context.Context, router *webkit.MessageRouter, cfg Config) error {
+// The router can be any engine's message router that implements port.WebUIHandlerRouter.
+func RegisterAll(ctx context.Context, router port.WebUIHandlerRouter, deps port.HandlerDependencies) error {
 	// Homepage handlers (history, favorites, folders, tags)
-	if cfg.HistoryUC != nil && cfg.FavoritesUC != nil {
+	if deps.HistoryUC != nil && deps.FavoritesUC != nil {
 		if err := homepage.RegisterHandlers(ctx, router, homepage.Config{
-			HistoryUC:   cfg.HistoryUC,
+			HistoryUC:   deps.HistoryUC,
-			FavoritesUC: cfg.FavoritesUC,
+			FavoritesUC: deps.FavoritesUC,
 		}); err != nil {
 			return err
 		}
 	}
 	// Configuration handlers
-	if cfg.SaveConfig != nil {
+	if deps.SaveConfig != nil {
-		if err := RegisterConfigHandlers(ctx, router, cfg.SaveConfig); err != nil {
+		if err := RegisterConfigHandlers(ctx, router, deps.SaveConfig); err != nil {
 			return err
 		}
 	}
 	// Keybindings handlers (always available)
-	if cfg.KeybindingsHandler == nil {
+	if deps.KeybindingsGetter == nil {
-		return fmt.Errorf("KeybindingsHandler is required")
+		return fmt.Errorf("KeybindingsGetter is required")
 	}
-	if err := RegisterKeybindingsHandlers(ctx, router, cfg.KeybindingsHandler); err != nil {
+	kbHandler := NewKeybindingsHandler(
+		deps.KeybindingsGetter,
+		deps.KeybindingSetter,
+		deps.KeybindingResetter,
+		deps.AllKeybindingsResetter,
+	)
+	if err := RegisterKeybindingsHandlers(ctx, router, kbHandler); err != nil {
 		return err
 	}
 	// Clipboard handlers (for auto-copy on selection feature)
-	if cfg.Clipboard != nil && cfg.AutoCopyConfig != nil {
+	if deps.Clipboard != nil && deps.AutoCopyConfig != nil {
-		if err := RegisterClipboardHandlers(ctx, router, cfg.Clipboard, cfg.AutoCopyConfig, cfg.OnClipboardCopied); err != nil {
+		if err := RegisterClipboardHandlers(ctx, router, deps.Clipboard, deps.AutoCopyConfig, deps.OnClipboardCopied); err != nil {
 			return err
 		}
 	}
 // RegisterAccentHandlers registers accent key press/release handlers with the router.
 // Must be called after the AccentKeyHandler is initialized (i.e., after initAccentPicker).
-func RegisterAccentHandlers(_ context.Context, router *webkit.MessageRouter, handler AccentKeyHandler) error {
+func RegisterAccentHandlers(_ context.Context, router port.WebUIHandlerRouter, handler AccentKeyHandler) error {
 	if router == nil {
 		return fmt.Errorf("RegisterAccentHandlers: router must not be nil")
 	}
 		return fmt.Errorf("RegisterAccentHandlers: handler must not be nil")
 	}
-	if err := router.RegisterHandler("accent_key_press", webkit.MessageHandlerFunc(
+	if err := router.RegisterHandler("accent_key_press", port.WebUIMessageHandlerFunc(
-		func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+		func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 			var p struct {
 				Char  string `json:"char"`
 				Shift bool   `json:"shift"`
 		return err
 	}
-	if err := router.RegisterHandler("accent_key_release", webkit.MessageHandlerFunc(
+	if err := router.RegisterHandler("accent_key_release", port.WebUIMessageHandlerFunc(
-		func(ctx context.Context, _ webkit.WebViewID, payload json.RawMessage) (any, error) {
+		func(ctx context.Context, _ port.WebViewID, payload json.RawMessage) (any, error) {
 			var p struct {
 				Char string `json:"char"`
 			}

A internal/infrastructure/handlers/register_test.go +86 -0

@@ -0,0 +1,86 @@
	1	+	package handlers
	2	+
	3	+	import (
	4	+	"context"
	5	+	"encoding/json"
	6	+	"testing"
	7	+
	8	+	"github.com/bnema/dumber/internal/application/port"
	9	+	"github.com/stretchr/testify/assert"
	10	+	"github.com/stretchr/testify/require"
	11	+	)
	12	+
	13	+	// stubRouter implements port.WebUIHandlerRouter for testing.
	14	+	type stubRouter struct {
	15	+	handlers map[string]port.WebUIMessageHandler
	16	+	}
	17	+
	18	+	func newStubRouter() *stubRouter {
	19	+	return &stubRouter{handlers: make(map[string]port.WebUIMessageHandler)}
	20	+	}
	21	+
	22	+	func (r *stubRouter) RegisterHandler(msgType string, handler port.WebUIMessageHandler) error {
	23	+	r.handlers[msgType] = handler
	24	+	return nil
	25	+	}
	26	+
	27	+	func (r *stubRouter) RegisterHandlerWithCallbacks(msgType, _, _, _ string, handler port.WebUIMessageHandler) error {
	28	+	r.handlers[msgType] = handler
	29	+	return nil
	30	+	}
	31	+
	32	+	func TestRegisterAccentHandlers_NilRouter(t *testing.T) {
	33	+	ctx := context.Background()
	34	+	handler := &stubAccentHandler{}
	35	+	err := RegisterAccentHandlers(ctx, nil, handler)
	36	+	require.Error(t, err)
	37	+	assert.Contains(t, err.Error(), "router")
	38	+	}
	39	+
	40	+	func TestRegisterAccentHandlers_NilHandler(t *testing.T) {
	41	+	ctx := context.Background()
	42	+	router := newStubRouter()
	43	+	err := RegisterAccentHandlers(ctx, router, nil)
	44	+	require.Error(t, err)
	45	+	assert.Contains(t, err.Error(), "handler")
	46	+	}
	47	+
	48	+	func TestRegisterAccentHandlers_Success(t *testing.T) {
	49	+	ctx := context.Background()
	50	+	router := newStubRouter()
	51	+	handler := &stubAccentHandler{}
	52	+	err := RegisterAccentHandlers(ctx, router, handler)
	53	+	require.NoError(t, err)
	54	+	assert.Contains(t, router.handlers, "accent_key_press")
	55	+	assert.Contains(t, router.handlers, "accent_key_release")
	56	+	}
	57	+
	58	+	func TestRegisterAccentHandlers_KeyPress(t *testing.T) {
	59	+	ctx := context.Background()
	60	+	router := newStubRouter()
	61	+	handler := &stubAccentHandler{}
	62	+	err := RegisterAccentHandlers(ctx, router, handler)
	63	+	require.NoError(t, err)
	64	+
	65	+	h := router.handlers["accent_key_press"]
	66	+	require.NotNil(t, h)
	67	+
	68	+	payload := json.RawMessage(`{"char":"e","shift":true}`)
	69	+	_, err = h.Handle(ctx, 0, payload)
	70	+	require.NoError(t, err)
	71	+	assert.Equal(t, 'e', handler.lastPressed)
	72	+	assert.True(t, handler.lastShift)
	73	+	}
	74	+
	75	+	// stubAccentHandler satisfies port.AccentKeyHandler for tests.
	76	+	type stubAccentHandler struct {
	77	+	lastPressed rune
	78	+	lastShift bool
	79	+	}
	80	+
	81	+	func (h *stubAccentHandler) OnKeyPressed(_ context.Context, r rune, shift bool) bool {
	82	+	h.lastPressed = r
	83	+	h.lastShift = shift
	84	+	return false
	85	+	}
	86	+	func (*stubAccentHandler) OnKeyReleased(_ context.Context, _ rune) {}

@@ -0,0 +1,86 @@
	1	+	package handlers
	2	+
	3	+	import (
	4	+	"context"
	5	+	"encoding/json"
	6	+	"testing"
	7	+
	8	+	"github.com/bnema/dumber/internal/application/port"
	9	+	"github.com/stretchr/testify/assert"
	10	+	"github.com/stretchr/testify/require"
	11	+	)
	12	+
	13	+	// stubRouter implements port.WebUIHandlerRouter for testing.
	14	+	type stubRouter struct {
	15	+	handlers map[string]port.WebUIMessageHandler
	16	+	}
	17	+
	18	+	func newStubRouter() *stubRouter {
	19	+	return &stubRouter{handlers: make(map[string]port.WebUIMessageHandler)}
	20	+	}
	21	+
	22	+	func (r *stubRouter) RegisterHandler(msgType string, handler port.WebUIMessageHandler) error {
	23	+	r.handlers[msgType] = handler
	24	+	return nil
	25	+	}
	26	+
	27	+	func (r *stubRouter) RegisterHandlerWithCallbacks(msgType, _, _, _ string, handler port.WebUIMessageHandler) error {
	28	+	r.handlers[msgType] = handler
	29	+	return nil
	30	+	}
	31	+
	32	+	func TestRegisterAccentHandlers_NilRouter(t *testing.T) {
	33	+	ctx := context.Background()
	34	+	handler := &stubAccentHandler{}
	35	+	err := RegisterAccentHandlers(ctx, nil, handler)
	36	+	require.Error(t, err)
	37	+	assert.Contains(t, err.Error(), "router")
	38	+	}
	39	+
	40	+	func TestRegisterAccentHandlers_NilHandler(t *testing.T) {
	41	+	ctx := context.Background()
	42	+	router := newStubRouter()
	43	+	err := RegisterAccentHandlers(ctx, router, nil)
	44	+	require.Error(t, err)
	45	+	assert.Contains(t, err.Error(), "handler")
	46	+	}
	47	+
	48	+	func TestRegisterAccentHandlers_Success(t *testing.T) {
	49	+	ctx := context.Background()
	50	+	router := newStubRouter()
	51	+	handler := &stubAccentHandler{}
	52	+	err := RegisterAccentHandlers(ctx, router, handler)
	53	+	require.NoError(t, err)
	54	+	assert.Contains(t, router.handlers, "accent_key_press")
	55	+	assert.Contains(t, router.handlers, "accent_key_release")
	56	+	}
	57	+
	58	+	func TestRegisterAccentHandlers_KeyPress(t *testing.T) {
	59	+	ctx := context.Background()
	60	+	router := newStubRouter()
	61	+	handler := &stubAccentHandler{}
	62	+	err := RegisterAccentHandlers(ctx, router, handler)
	63	+	require.NoError(t, err)
	64	+
	65	+	h := router.handlers["accent_key_press"]
	66	+	require.NotNil(t, h)
	67	+
	68	+	payload := json.RawMessage(`{"char":"e","shift":true}`)
	69	+	_, err = h.Handle(ctx, 0, payload)
	70	+	require.NoError(t, err)
	71	+	assert.Equal(t, 'e', handler.lastPressed)
	72	+	assert.True(t, handler.lastShift)
	73	+	}
	74	+
	75	+	// stubAccentHandler satisfies port.AccentKeyHandler for tests.
	76	+	type stubAccentHandler struct {
	77	+	lastPressed rune
	78	+	lastShift bool
	79	+	}
	80	+
	81	+	func (h *stubAccentHandler) OnKeyPressed(_ context.Context, r rune, shift bool) bool {
	82	+	h.lastPressed = r
	83	+	h.lastShift = shift
	84	+	return false
	85	+	}
	86	+	func (*stubAccentHandler) OnKeyReleased(_ context.Context, _ rune) {}

M internal/infrastructure/webkit/engine.go +2 -2


@@ -25,8 +25,8 @@ type Engine struct {
25	25		logger zerolog.Logger
26	26
27	27		// Handler registrars - injected at construction to avoid import cycles.
28		-	handlerRegistrar func(ctx context.Context, router *MessageRouter, deps port.HandlerDependencies) error
29		-	accentHandlerRegistrar func(ctx context.Context, router *MessageRouter, handler port.AccentKeyHandler) error
	28	+	handlerRegistrar func(ctx context.Context, router port.WebUIHandlerRouter, deps port.HandlerDependencies) error
	29	+	accentHandlerRegistrar func(ctx context.Context, router port.WebUIHandlerRouter, handler port.AccentKeyHandler) error
30	30		}
31	31
32	32		// Compile-time check that Engine implements port.Engine.


@@ -25,8 +25,8 @@ type Engine struct {
25		logger zerolog.Logger	25		logger zerolog.Logger
26			26
27		// Handler registrars - injected at construction to avoid import cycles.	27		// Handler registrars - injected at construction to avoid import cycles.
28	-	handlerRegistrar func(ctx context.Context, router *MessageRouter, deps port.HandlerDependencies) error	28	+	handlerRegistrar func(ctx context.Context, router port.WebUIHandlerRouter, deps port.HandlerDependencies) error
29	-	accentHandlerRegistrar func(ctx context.Context, router *MessageRouter, handler port.AccentKeyHandler) error	29	+	accentHandlerRegistrar func(ctx context.Context, router port.WebUIHandlerRouter, handler port.AccentKeyHandler) error
30		}	30		}
31			31
32		// Compile-time check that Engine implements port.Engine.	32		// Compile-time check that Engine implements port.Engine.

M internal/infrastructure/webkit/engine_init.go +2 -2


@@ -26,8 +26,8 @@ func NewEngine(
26	26		themeManager *theme.Manager,
27	27		colorResolver port.ColorSchemeResolver,
28	28		logger zerolog.Logger,
29		-	handlerRegistrar func(ctx context.Context, router *MessageRouter, deps port.HandlerDependencies) error,
30		-	accentHandlerRegistrar func(ctx context.Context, router *MessageRouter, handler port.AccentKeyHandler) error,
	29	+	handlerRegistrar func(ctx context.Context, router port.WebUIHandlerRouter, deps port.HandlerDependencies) error,
	30	+	accentHandlerRegistrar func(ctx context.Context, router port.WebUIHandlerRouter, handler port.AccentKeyHandler) error,
31	31		) (*Engine, error) {
32	32		// --- Hardware survey and performance profile resolution ---
33	33		perfSettings := engineSurveyHardwareAndResolveProfile(ctx, cfg, logger)


@@ -26,8 +26,8 @@ func NewEngine(
26		themeManager *theme.Manager,	26		themeManager *theme.Manager,
27		colorResolver port.ColorSchemeResolver,	27		colorResolver port.ColorSchemeResolver,
28		logger zerolog.Logger,	28		logger zerolog.Logger,
29	-	handlerRegistrar func(ctx context.Context, router *MessageRouter, deps port.HandlerDependencies) error,	29	+	handlerRegistrar func(ctx context.Context, router port.WebUIHandlerRouter, deps port.HandlerDependencies) error,
30	-	accentHandlerRegistrar func(ctx context.Context, router *MessageRouter, handler port.AccentKeyHandler) error,	30	+	accentHandlerRegistrar func(ctx context.Context, router port.WebUIHandlerRouter, handler port.AccentKeyHandler) error,
31		) (*Engine, error) {	31		) (*Engine, error) {
32		// --- Hardware survey and performance profile resolution ---	32		// --- Hardware survey and performance profile resolution ---
33		perfSettings := engineSurveyHardwareAndResolveProfile(ctx, cfg, logger)	33		perfSettings := engineSurveyHardwareAndResolveProfile(ctx, cfg, logger)

D internal/infrastructure/webkit/handlers/register_test.go +0 -40

@@ -1,40 +0,0 @@
1	-	package handlers
2	-
3	-	import (
4	-	"context"
5	-	"testing"
6	-
7	-	"github.com/bnema/dumber/internal/infrastructure/webkit"
8	-	"github.com/stretchr/testify/assert"
9	-	"github.com/stretchr/testify/require"
10	-	)
11	-
12	-	func TestRegisterAccentHandlers_NilRouter(t *testing.T) {
13	-	ctx := context.Background()
14	-	handler := &stubAccentHandler{}
15	-	err := RegisterAccentHandlers(ctx, nil, handler)
16	-	require.Error(t, err)
17	-	assert.Contains(t, err.Error(), "router")
18	-	}
19	-
20	-	func TestRegisterAccentHandlers_NilHandler(t *testing.T) {
21	-	ctx := context.Background()
22	-	router := webkit.NewMessageRouter(ctx)
23	-	err := RegisterAccentHandlers(ctx, router, nil)
24	-	require.Error(t, err)
25	-	assert.Contains(t, err.Error(), "handler")
26	-	}
27	-
28	-	func TestRegisterAccentHandlers_Success(t *testing.T) {
29	-	ctx := context.Background()
30	-	router := webkit.NewMessageRouter(ctx)
31	-	handler := &stubAccentHandler{}
32	-	err := RegisterAccentHandlers(ctx, router, handler)
33	-	require.NoError(t, err)
34	-	}
35	-
36	-	// stubAccentHandler satisfies AccentKeyHandler for tests.
37	-	type stubAccentHandler struct{}
38	-
39	-	func (*stubAccentHandler) OnKeyPressed(_ context.Context, _ rune, _ bool) bool { return false }
40	-	func (*stubAccentHandler) OnKeyReleased(_ context.Context, _ rune) {}

@@ -1,40 +0,0 @@
1	-	package handlers
2	-
3	-	import (
4	-	"context"
5	-	"testing"
6	-
7	-	"github.com/bnema/dumber/internal/infrastructure/webkit"
8	-	"github.com/stretchr/testify/assert"
9	-	"github.com/stretchr/testify/require"
10	-	)
11	-
12	-	func TestRegisterAccentHandlers_NilRouter(t *testing.T) {
13	-	ctx := context.Background()
14	-	handler := &stubAccentHandler{}
15	-	err := RegisterAccentHandlers(ctx, nil, handler)
16	-	require.Error(t, err)
17	-	assert.Contains(t, err.Error(), "router")
18	-	}
19	-
20	-	func TestRegisterAccentHandlers_NilHandler(t *testing.T) {
21	-	ctx := context.Background()
22	-	router := webkit.NewMessageRouter(ctx)
23	-	err := RegisterAccentHandlers(ctx, router, nil)
24	-	require.Error(t, err)
25	-	assert.Contains(t, err.Error(), "handler")
26	-	}
27	-
28	-	func TestRegisterAccentHandlers_Success(t *testing.T) {
29	-	ctx := context.Background()
30	-	router := webkit.NewMessageRouter(ctx)
31	-	handler := &stubAccentHandler{}
32	-	err := RegisterAccentHandlers(ctx, router, handler)
33	-	require.NoError(t, err)
34	-	}
35	-
36	-	// stubAccentHandler satisfies AccentKeyHandler for tests.
37	-	type stubAccentHandler struct{}
38	-
39	-	func (*stubAccentHandler) OnKeyPressed(_ context.Context, _ rune, _ bool) bool { return false }
40	-	func (*stubAccentHandler) OnKeyReleased(_ context.Context, _ rune) {}

M internal/infrastructure/webkit/messaging.go +10 -11


@@ -7,6 +7,7 @@ import (
7	7		"fmt"
8	8		"sync"
9	9
	10	+	"github.com/bnema/dumber/internal/application/port"
10	11		"github.com/bnema/dumber/internal/logging"
11	12		"github.com/bnema/puregotk-webkit/javascriptcore"
12	13		"github.com/bnema/puregotk-webkit/webkit"

@@ -20,18 +21,13 @@ type Message struct {
20	21		WebViewIDAlt uint64 `json:"webviewId,omitempty"`
21	22		}
22	23
23		-	// MessageHandler handles a decoded message payload.
24		-	type MessageHandler interface {
25		-	Handle(ctx context.Context, webviewID WebViewID, payload json.RawMessage) (any, error)
26		-	}
27		-
28		-	// MessageHandlerFunc adapts a function to the MessageHandler interface.
29		-	type MessageHandlerFunc func(ctx context.Context, webviewID WebViewID, payload json.RawMessage) (any, error)
	24	+	// MessageHandler is an alias for port.WebUIMessageHandler.
	25	+	// Kept for backward compatibility within the webkit package.
	26	+	type MessageHandler = port.WebUIMessageHandler
30	27
31		-	// Handle calls f(ctx, webviewID, payload).
32		-	func (f MessageHandlerFunc) Handle(ctx context.Context, webviewID WebViewID, payload json.RawMessage) (any, error) {
33		-	return f(ctx, webviewID, payload)
34		-	}
	28	+	// MessageHandlerFunc is an alias for port.WebUIMessageHandlerFunc.
	29	+	// Kept for backward compatibility within the webkit package.
	30	+	type MessageHandlerFunc = port.WebUIMessageHandlerFunc
35	31
36	32		type handlerEntry struct {
37	33		handler MessageHandler

@@ -40,6 +36,9 @@ type handlerEntry struct {
40	36		world string
41	37		}
42	38
	39	+	// Compile-time check that MessageRouter implements port.WebUIHandlerRouter.
	40	+	var _ port.WebUIHandlerRouter = (*MessageRouter)(nil)
	41	+
43	42		// MessageRouter dispatches script-message events to registered handlers.
44	43		type MessageRouter struct {
45	44		handlers map[string]handlerEntry

 	"fmt"
 	"sync"
+	"github.com/bnema/dumber/internal/application/port"
 	"github.com/bnema/dumber/internal/logging"
 	"github.com/bnema/puregotk-webkit/javascriptcore"
 	"github.com/bnema/puregotk-webkit/webkit"
 	WebViewIDAlt uint64          `json:"webviewId,omitempty"`
 }
-// MessageHandler handles a decoded message payload.
+// MessageHandler is an alias for port.WebUIMessageHandler.
-type MessageHandler interface {
+// Kept for backward compatibility within the webkit package.
-	Handle(ctx context.Context, webviewID WebViewID, payload json.RawMessage) (any, error)
+type MessageHandler = port.WebUIMessageHandler
-}
-// MessageHandlerFunc adapts a function to the MessageHandler interface.
-type MessageHandlerFunc func(ctx context.Context, webviewID WebViewID, payload json.RawMessage) (any, error)
-// Handle calls f(ctx, webviewID, payload).
+// MessageHandlerFunc is an alias for port.WebUIMessageHandlerFunc.
-func (f MessageHandlerFunc) Handle(ctx context.Context, webviewID WebViewID, payload json.RawMessage) (any, error) {
+// Kept for backward compatibility within the webkit package.
-	return f(ctx, webviewID, payload)
+type MessageHandlerFunc = port.WebUIMessageHandlerFunc
-}
 type handlerEntry struct {
 	handler       MessageHandler
 	world         string
 }
+// Compile-time check that MessageRouter implements port.WebUIHandlerRouter.
+var _ port.WebUIHandlerRouter = (*MessageRouter)(nil)
 // MessageRouter dispatches script-message events to registered handlers.
 type MessageRouter struct {
 	handlers map[string]handlerEntry