Skip to content

Commit a69ee49

Browse files
piratepirate
committed
Remove Go translate compatibility aliases
1 parent 816d2c3 commit a69ee49

3 files changed

Lines changed: 24 additions & 50 deletions

File tree

‎go/modcdp/client/CDPTypes.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"sync"
1212

1313
abxjsonschema "github.com/ArchiveBox/abxbus/abxbus-go/v2/jsonschema"
14-
"github.com/browserbase/modcdp/go/modcdp/translate"
1514
modtypes "github.com/browserbase/modcdp/go/modcdp/types"
1615
)
1716

@@ -680,7 +679,7 @@ func (types *CDPTypes) CustomMiddlewareRegistrations(phase string, name string)
680679
return middlewares
681680
}
682681

683-
func (types *CDPTypes) ServiceWorkerCommandStep(method string, params map[string]any, cdpSessionID string, executionContextID int) (translate.RawStep, error) {
682+
func (types *CDPTypes) ServiceWorkerCommandStep(method string, params map[string]any, cdpSessionID string, executionContextID int) (modtypes.TranslatedStep, error) {
684683
if params == nil {
685684
params = map[string]any{}
686685
}
@@ -706,11 +705,11 @@ func (types *CDPTypes) ServiceWorkerCommandStep(method string, params map[string
706705
if executionContextID != 0 {
707706
runtimeParams["contextId"] = executionContextID
708707
}
709-
return translate.RawStep{Method: "Runtime.evaluate", Params: runtimeParams, Unwrap: "runtime"}, nil
708+
return modtypes.TranslatedStep{Method: "Runtime.evaluate", Params: runtimeParams, Unwrap: "runtime"}, nil
710709
}
711710
paramsJSON, err := json.Marshal(params)
712711
if err != nil {
713-
return translate.RawStep{}, err
712+
return modtypes.TranslatedStep{}, err
714713
}
715714
runtimeParams := map[string]any{
716715
"functionDeclaration": `async function(method, paramsJson, cdpSessionId) { return JSON.stringify(await globalThis.ModCDP.handleCommand(method, JSON.parse(paramsJson), cdpSessionId)); }`,
@@ -724,7 +723,7 @@ func (types *CDPTypes) ServiceWorkerCommandStep(method string, params map[string
724723
if executionContextID != 0 {
725724
runtimeParams["executionContextId"] = executionContextID
726725
}
727-
return translate.RawStep{Method: "Runtime.callFunctionOn", Params: runtimeParams, Unwrap: "runtime_json"}, nil
726+
return modtypes.TranslatedStep{Method: "Runtime.callFunctionOn", Params: runtimeParams, Unwrap: "runtime_json"}, nil
728727
}
729728

730729
func (types *CDPTypes) serviceWorkerRuntimeExpression(method string, params map[string]any, cdpSessionID string, commandExpression string) string {

‎go/modcdp/translate/translate.go‎

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -48,31 +48,6 @@ func RouteFor(method string, routes map[string]string) string {
4848
return "direct_cdp"
4949
}
5050

51-
type rawStep struct {
52-
Method string
53-
Params map[string]any
54-
Unwrap string
55-
SessionID string
56-
}
57-
58-
type rawCommand struct {
59-
Route string
60-
Target string
61-
Steps []rawStep
62-
}
63-
64-
type RawStep = rawStep
65-
type RawCommand = rawCommand
66-
67-
var routeFor = RouteFor
68-
var wrapCommandIfNeeded = WrapCommandIfNeeded
69-
var unwrapResponseIfNeeded = UnwrapResponseIfNeeded
70-
var unwrapEventIfNeeded = UnwrapEventIfNeeded
71-
var encodeBindingPayload = EncodeBindingPayload
72-
73-
const upstreamEventBindingName = UpstreamEventBindingName
74-
const customEventBindingName = CustomEventBindingName
75-
7651
func stringValue(value any) string {
7752
if typed, ok := value.(string); ok {
7853
return typed
@@ -95,7 +70,7 @@ func wrapCustomCommand(method string, params map[string]any, sessionID any) map[
9570
return runtimeParams
9671
}
9772

98-
func wrapServiceWorkerCommand(method string, params map[string]any, sessionID string) []rawStep {
73+
func wrapServiceWorkerCommand(method string, params map[string]any, sessionID string) []types.TranslatedStep {
9974
if params == nil {
10075
params = map[string]any{}
10176
}
@@ -105,18 +80,18 @@ func wrapServiceWorkerCommand(method string, params map[string]any, sessionID st
10580
} else if sessionID != "" {
10681
cdpSessionID = sessionID
10782
}
108-
return []rawStep{{Method: "Runtime.callFunctionOn", Params: wrapCustomCommand(method, params, cdpSessionID), Unwrap: "runtime_json"}}
83+
return []types.TranslatedStep{{Method: "Runtime.callFunctionOn", Params: wrapCustomCommand(method, params, cdpSessionID), Unwrap: "runtime_json"}}
10984
}
11085

111-
func WrapCommandIfNeeded(method string, params map[string]any, routes map[string]string, sessionID string) (rawCommand, error) {
86+
func WrapCommandIfNeeded(method string, params map[string]any, routes map[string]string, sessionID string) (types.TranslatedCommand, error) {
11287
route := RouteFor(method, routes)
11388
if route == "direct_cdp" {
114-
return rawCommand{Route: route, Target: "direct_cdp", Steps: []rawStep{{Method: method, Params: params, SessionID: sessionID}}}, nil
89+
return types.TranslatedCommand{Route: route, Target: "direct_cdp", Steps: []types.TranslatedStep{{Method: method, Params: params, SessionID: sessionID}}}, nil
11590
}
11691
if route == "service_worker" {
117-
return rawCommand{Route: route, Target: "service_worker", Steps: wrapServiceWorkerCommand(method, params, sessionID)}, nil
92+
return types.TranslatedCommand{Route: route, Target: "service_worker", Steps: wrapServiceWorkerCommand(method, params, sessionID)}, nil
11893
}
119-
return rawCommand{}, fmt.Errorf("unsupported client route %q for %s", route, method)
94+
return types.TranslatedCommand{}, fmt.Errorf("unsupported client route %q for %s", route, method)
12095
}
12196

12297
func UnwrapResponseIfNeeded(result map[string]any, unwrap string) (any, error) {

‎go/modcdp/translate/translate_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@ import (
1515
)
1616

1717
func TestTranslateRoutesWrapsAndUnwrapsModCDPProtocolMessagesDeterministically(t *testing.T) {
18-
if routeFor("Browser.getVersion", map[string]string{"Browser.*": "direct_cdp", "*.*": "service_worker"}) != "direct_cdp" {
18+
if RouteFor("Browser.getVersion", map[string]string{"Browser.*": "direct_cdp", "*.*": "service_worker"}) != "direct_cdp" {
1919
t.Fatal("Browser.getVersion route mismatch")
2020
}
21-
if routeFor("Target.getTargets", map[string]string{"Browser.*": "direct_cdp", "*.*": "service_worker"}) != "service_worker" {
21+
if RouteFor("Target.getTargets", map[string]string{"Browser.*": "direct_cdp", "*.*": "service_worker"}) != "service_worker" {
2222
t.Fatal("Target.getTargets route mismatch")
2323
}
24-
if routeFor("Browser.getVersion", nil) != "direct_cdp" {
24+
if RouteFor("Browser.getVersion", nil) != "direct_cdp" {
2525
t.Fatal("Browser.getVersion default route mismatch")
2626
}
2727

28-
direct, err := wrapCommandIfNeeded("Browser.getVersion", map[string]any{}, map[string]string{"*.*": "direct_cdp"}, "")
28+
direct, err := WrapCommandIfNeeded("Browser.getVersion", map[string]any{}, map[string]string{"*.*": "direct_cdp"}, "")
2929
if err != nil {
3030
t.Fatal(err)
3131
}
3232
if direct.Target != "direct_cdp" || len(direct.Steps) != 1 || direct.Steps[0].Method != "Browser.getVersion" {
3333
t.Fatalf("direct = %#v", direct)
3434
}
3535

36-
wrapped, err := wrapCommandIfNeeded(
36+
wrapped, err := WrapCommandIfNeeded(
3737
"Mod.evaluate",
3838
map[string]any{"expression": "({ ok: true })", "params": map[string]any{"value": 1}},
3939
DefaultClientRoutes(),
@@ -66,15 +66,15 @@ func TestTranslateRoutesWrapsAndUnwrapsModCDPProtocolMessagesDeterministically(t
6666
t.Fatalf("unwrap = %q", wrapped.Steps[0].Unwrap)
6767
}
6868

69-
configured, err := wrapCommandIfNeeded("Mod.configure", map[string]any{"router": map[string]any{"router_routes": map[string]any{"*.*": "loopback_cdp"}}}, DefaultClientRoutes(), "session-1")
69+
configured, err := WrapCommandIfNeeded("Mod.configure", map[string]any{"router": map[string]any{"router_routes": map[string]any{"*.*": "loopback_cdp"}}}, DefaultClientRoutes(), "session-1")
7070
if err != nil {
7171
t.Fatal(err)
7272
}
7373
if configured.Steps[0].Unwrap != "runtime_json" {
7474
t.Fatalf("configure unwrap = %q", configured.Steps[0].Unwrap)
7575
}
7676

77-
ping, err := wrapCommandIfNeeded("Mod.ping", map[string]any{}, DefaultClientRoutes(), "")
77+
ping, err := WrapCommandIfNeeded("Mod.ping", map[string]any{}, DefaultClientRoutes(), "")
7878
if err != nil {
7979
t.Fatal(err)
8080
}
@@ -87,7 +87,7 @@ func TestTranslateRoutesWrapsAndUnwrapsModCDPProtocolMessagesDeterministically(t
8787
t.Fatalf("ping params = %#v", pingPayload)
8888
}
8989

90-
custom, err := wrapCommandIfNeeded(
90+
custom, err := WrapCommandIfNeeded(
9191
"Custom.echo",
9292
map[string]any{"secret": strings.Repeat("x", 100), "nested": map[string]any{"ok": true}},
9393
DefaultClientRoutes(),
@@ -118,7 +118,7 @@ func TestTranslateRoutesWrapsAndUnwrapsModCDPProtocolMessagesDeterministically(t
118118
t.Fatalf("session argument = %#v", customArguments[2])
119119
}
120120

121-
customWithSession, err := wrapCommandIfNeeded(
121+
customWithSession, err := WrapCommandIfNeeded(
122122
"Custom.echo",
123123
map[string]any{"secret": "targeted"},
124124
DefaultClientRoutes(),
@@ -132,14 +132,14 @@ func TestTranslateRoutesWrapsAndUnwrapsModCDPProtocolMessagesDeterministically(t
132132
t.Fatalf("target session argument = %#v", customWithSessionArguments[2])
133133
}
134134

135-
unwrapped, err := unwrapResponseIfNeeded(map[string]any{"result": map[string]any{"type": "object", "value": map[string]any{"ok": true}}}, "runtime")
135+
unwrapped, err := UnwrapResponseIfNeeded(map[string]any{"result": map[string]any{"type": "object", "value": map[string]any{"ok": true}}}, "runtime")
136136
if err != nil {
137137
t.Fatal(err)
138138
}
139139
if unwrapped.(map[string]any)["ok"] != true {
140140
t.Fatalf("unwrapped = %#v", unwrapped)
141141
}
142-
raw, err := unwrapResponseIfNeeded(map[string]any{"product": "Chrome/1"}, "")
142+
raw, err := UnwrapResponseIfNeeded(map[string]any{"product": "Chrome/1"}, "")
143143
if err != nil {
144144
t.Fatal(err)
145145
}
@@ -148,7 +148,7 @@ func TestTranslateRoutesWrapsAndUnwrapsModCDPProtocolMessagesDeterministically(t
148148
}
149149

150150
payloadSessionID := "session-2"
151-
payload, err := encodeBindingPayload(types.ModCDPBindingPayload{
151+
payload, err := EncodeBindingPayload(types.ModCDPBindingPayload{
152152
Event: "Custom.ready",
153153
Data: map[string]any{"ready": true},
154154
CDPSessionID: &payloadSessionID,
@@ -158,14 +158,14 @@ func TestTranslateRoutesWrapsAndUnwrapsModCDPProtocolMessagesDeterministically(t
158158
}
159159
unwrappedEvent, ok := UnwrapEventIfNeeded(
160160
"Runtime.bindingCalled",
161-
map[string]any{"name": customEventBindingName, "payload": payload},
161+
map[string]any{"name": CustomEventBindingName, "payload": payload},
162162
"session-1",
163163
"session-1",
164164
)
165165
if !ok || unwrappedEvent.Event != "Custom.ready" || unwrappedEvent.Data.(map[string]any)["ready"] != true || unwrappedEvent.SessionID == nil || *unwrappedEvent.SessionID != "session-2" {
166166
t.Fatalf("unwrappedEvent=%#v ok=%v", unwrappedEvent, ok)
167167
}
168-
if _, ok := UnwrapEventIfNeeded("Runtime.consoleAPICalled", map[string]any{"name": customEventBindingName, "payload": payload}, "", ""); ok {
168+
if _, ok := UnwrapEventIfNeeded("Runtime.consoleAPICalled", map[string]any{"name": CustomEventBindingName, "payload": payload}, "", ""); ok {
169169
t.Fatal("expected console event to ignore binding payload")
170170
}
171171
}

0 commit comments

Comments
 (0)