feat: add local cdp startup and external association

2026-07-25 15:53:31 +08:00
parent 972c637716
commit 4063b851eb
17 changed files with 845 additions and 158 deletions
@@ -3,6 +3,7 @@ package main
 import (
 	"bytes"
 	"context"
+	"errors"
 	"strings"
 	"testing"

@@ -22,19 +23,60 @@ func TestRunCLIRejectsUnknownCommandWithStableCode(t *testing.T) {
 func TestInstanceStarterBuildsLaunchSpecFromInstanceAndSettings(t *testing.T) {
 	launcher := &fakeProcessLauncher{handle: fakeProcessHandle{pid: 4242}}
 	resolver := &fakeExecutableResolver{path: `C:\Browser\msedge.exe`}
-	starter := instanceStarter{launcher: launcher, resolver: resolver}
-	pid, err := starter.Start(context.Background(), ui.InstanceRow{ID: "edge-a", Browser: "Edge", UserDataDir: `C:\profiles\edge-a`}, ui.SettingsState{EdgePath: `C:\Configured\msedge.exe`})
-	if err != nil || pid != 4242 {
-		t.Fatalf("Start() = %d, %v", pid, err)
+	remote := &fakeRemoteDebugInspector{endpoint: browser.RemoteDebugEndpoint{Port: 9666}, inspectErr: browser.ErrRemoteDebugEndpointUnavailable}
+	starter := instanceStarter{launcher: launcher, resolver: resolver, managedProfiles: fakeManagedProfileInspector{}, externalProfiles: fakeExternalProfileInspector{}, remoteDebug: remote, portAllocator: remote}
+	outcome, err := starter.Start(context.Background(), ui.InstanceRow{ID: "edge-a", Browser: "Edge", UserDataDir: `C:\profiles\edge-a`}, ui.SettingsState{EdgePath: `C:\Configured\msedge.exe`, RemoteDebugStartPort: 9666})
+	if err != nil || outcome.PID != 4242 || outcome.RemoteDebugPort != 9666 {
+		t.Fatalf("Start() = %#v, %v", outcome, err)
 	}
 	if resolver.kind != domain.BrowserEdge || resolver.configured != `C:\Configured\msedge.exe` {
 		t.Fatalf("resolver input = %s, %q", resolver.kind, resolver.configured)
 	}
-	if launcher.spec.Kind != domain.BrowserEdge || launcher.spec.Executable != resolver.path || launcher.spec.TargetURL != "" {
+	if launcher.spec.Kind != domain.BrowserEdge || launcher.spec.Executable != resolver.path || launcher.spec.TargetURL != "" || launcher.spec.RemoteDebugPort != 9666 {
 		t.Fatalf("launch spec = %#v", launcher.spec)
 	}
 }

+func TestInstanceStarterAssociatesVerifiedExternalProfileWithoutLaunching(t *testing.T) {
+	launcher := &fakeProcessLauncher{handle: fakeProcessHandle{pid: 4242}}
+	remote := &fakeRemoteDebugInspector{endpoint: browser.RemoteDebugEndpoint{Port: 9668}}
+	starter := instanceStarter{
+		launcher:         launcher,
+		resolver:         &fakeExecutableResolver{path: `C:\Browser\chrome.exe`},
+		managedProfiles:  fakeManagedProfileInspector{},
+		externalProfiles: fakeExternalProfileInspector{use: browser.ProfileUse{Occupied: true, PID: 16108, Source: browser.ProfileSourceMessageWindow}},
+		remoteDebug:      remote,
+		portAllocator:    remote,
+	}
+	outcome, err := starter.Start(context.Background(), ui.InstanceRow{ID: "chrome-a", Browser: "Chrome", UserDataDir: `C:\profiles\chrome-a`}, ui.SettingsState{RemoteDebugStartPort: 9666})
+	if err != nil || !outcome.External || outcome.PID != 16108 || outcome.RemoteDebugPort != 9668 || outcome.Source != browser.ProfileSourceMessageWindow {
+		t.Fatalf("Start() = %#v, %v", outcome, err)
+	}
+	if launcher.calls != 0 {
+		t.Fatalf("external association launched %d processes", launcher.calls)
+	}
+}
+
+func TestInstanceStarterRejectsUnverifiedExternalProfile(t *testing.T) {
+	launcher := &fakeProcessLauncher{handle: fakeProcessHandle{pid: 4242}}
+	remote := &fakeRemoteDebugInspector{inspectErr: browser.ErrRemoteDebugEndpointUnavailable}
+	starter := instanceStarter{
+		launcher:         launcher,
+		resolver:         &fakeExecutableResolver{path: `C:\Browser\chrome.exe`},
+		managedProfiles:  fakeManagedProfileInspector{},
+		externalProfiles: fakeExternalProfileInspector{use: browser.ProfileUse{Occupied: true, PID: 16108, Source: browser.ProfileSourceLock}},
+		remoteDebug:      remote,
+		portAllocator:    remote,
+	}
+	_, err := starter.Start(context.Background(), ui.InstanceRow{ID: "chrome-a", Browser: "Chrome", UserDataDir: `C:\profiles\chrome-a`}, ui.SettingsState{RemoteDebugStartPort: 9666})
+	if !errors.Is(err, domain.ErrProfileOccupied) {
+		t.Fatalf("Start() error = %v", err)
+	}
+	if launcher.calls != 0 {
+		t.Fatalf("unverified external profile launched %d processes", launcher.calls)
+	}
+}
+
 func TestMergeInstanceConfigPreservesExistingLaunchOptions(t *testing.T) {
 	existing := []config.Instance{{ID: "one", Name: "旧名称", Launch: domain.LaunchSpec{Kind: domain.BrowserChrome, UserDataDir: `C:\profiles\old`, ProfileDirectory: "Default", ProxyServer: "https://proxy.local:8443", ExtraArgs: []string{"--window-size=1280,900"}}}}
 	updated := mergeInstanceConfig(existing, []ui.InstanceRow{{ID: "one", Name: "新名称", Browser: "Edge", UserDataDir: `C:\profiles\new`, TargetURL: "https://example.com"}})
@@ -65,10 +107,12 @@ func (r *fakeExecutableResolver) Resolve(_ context.Context, kind domain.BrowserK
 type fakeProcessLauncher struct {
 	spec   domain.LaunchSpec
 	handle browser.ProcessHandle
+	calls  int
 }

 func (l *fakeProcessLauncher) Start(_ context.Context, spec domain.LaunchSpec) (browser.ProcessHandle, error) {
 	l.spec = spec
+	l.calls++
 	return l.handle, nil
 }

@@ -77,3 +121,48 @@ type fakeProcessHandle struct{ pid int }
 func (p fakeProcessHandle) PID() int { return p.pid }

 func (fakeProcessHandle) Wait(context.Context) (int, error) { return 0, nil }
+
+type fakeManagedProfileInspector struct{ use browser.ProfileUse }
+
+func (i fakeManagedProfileInspector) InspectProfile(context.Context, string) (browser.ProfileUse, error) {
+	return i.use, nil
+}
+
+type fakeExternalProfileInspector struct {
+	use browser.ProfileUse
+	err error
+}
+
+func (i fakeExternalProfileInspector) InspectProfile(context.Context, domain.BrowserKind, string, int) (browser.ProfileUse, error) {
+	return i.use, i.err
+}
+
+type fakeRemoteDebugInspector struct {
+	endpoint   browser.RemoteDebugEndpoint
+	inspectErr error
+	waitErr    error
+	port       int
+}
+
+func (i *fakeRemoteDebugInspector) InspectRemoteDebugEndpoint(context.Context, domain.BrowserKind, string) (browser.RemoteDebugEndpoint, error) {
+	return i.endpoint, i.inspectErr
+}
+
+func (i *fakeRemoteDebugInspector) WaitForRemoteDebugEndpoint(context.Context, domain.BrowserKind, string) (browser.RemoteDebugEndpoint, error) {
+	return i.endpoint, i.waitErr
+}
+
+func (i *fakeRemoteDebugInspector) InspectRemoteDebugPort(context.Context, domain.BrowserKind, int) (browser.RemoteDebugEndpoint, error) {
+	return i.endpoint, i.inspectErr
+}
+
+func (i *fakeRemoteDebugInspector) WaitForRemoteDebugPort(context.Context, domain.BrowserKind, int) (browser.RemoteDebugEndpoint, error) {
+	return i.endpoint, i.waitErr
+}
+
+func (i *fakeRemoteDebugInspector) FindAvailableRemoteDebugPort(_ context.Context, start int) (int, error) {
+	if i.port != 0 {
+		return i.port, nil
+	}
+	return start, nil
+}