Run JS SDK in separate tabs rather than browsers #108
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kegsay
changed the title
kegsay
force-pushed
the
kegan/js-single-browser
branch
from
006381b
to
a41e33a
Compare
richvdh
requested changes
Jul 8, 2024
internal/api/js/chrome/browser.go
Outdated
Comment on lines
34
to
40
| type Browser struct { | ||
| BaseURL string | ||
| Cancel func() | ||
| Ctx context.Context // topmost chromedp context | ||
| ctxCancel func() | ||
| execAllocCancel func() | ||
| } |
| @@ -75,3 +75,34 @@ func (b *Browser) Close() { | |||
| b.ctxCancel() | |||
| b.execAllocCancel() | |||
| } | |||
|
|
|||
| func (b *Browser) NewTab(baseJSURL string, onConsoleLog func(s string)) (*Tab, error) { | |||
internal/api/js/chrome/chrome.go
Outdated
Comment on lines
56
to
60
| // make a Chrome browser | ||
| browser, err := GlobalBrowser() | ||
| if err != nil { | ||
| return nil, err | ||
| return nil, fmt.Errorf("GlobalBrowser: %s", err) | ||
| } |
There was a problem hiding this comment.
To confirm: these changes are nothing to do with the subject of the commit, right?
internal/api/js/chrome/chrome.go
Outdated
Comment on lines
84
to
112
| // strip /dist so /index.html loads correctly as does /assets/xxx.js | ||
| c, err := fs.Sub(jsSDKDistDirectory, "dist") | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to strip /dist off JS SDK files: %s", err) | ||
| return nil, fmt.Errorf("failed to create new js sdk instance: %s", err) | ||
| } | ||
|
|
||
| baseJSURL := "" | ||
| // run js-sdk (need to run this as a web server to avoid CORS errors you'd otherwise get with file: URLs) | ||
| var wg sync.WaitGroup | ||
| wg.Add(1) | ||
| mux := &http.ServeMux{} | ||
| mux.Handle("/", http.FileServer(http.FS(c))) | ||
| srv := &http.Server{ | ||
| Addr: fmt.Sprintf("127.0.0.1:%d", listenPort), | ||
| Handler: mux, | ||
| } | ||
| startServer := func() { | ||
| ln, err := net.Listen("tcp", srv.Addr) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| baseJSURL = "http://" + ln.Addr().String() | ||
| fmt.Println("JS SDK listening on", baseJSURL) | ||
| wg.Done() | ||
| srv.Serve(ln) | ||
| fmt.Println("JS SDK closing webserver") | ||
| } | ||
| go startServer() | ||
| wg.Wait() |
There was a problem hiding this comment.
ugh it may be my covid-addled brain but I'm still struggling to follow this a bit. It still feels like this is mixing up refactoring and functional changes. Can't you make this easier for the reviewer to follow?
Sorry, I'm going to abort reviewing this, for now at least
Co-authored-by: Richard van der Hoff <[email protected]>
Co-authored-by: Richard van der Hoff <[email protected]>
|
Closing on the basis this is causing test flakes. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #107 and should be faster to run. The main benefit here is that we aren't relying so much on extracting the WS URL as this happens on browser startup, which has proven to be flakey.
JS only runs:
Before: ~6m10s to run.
After: ~5m50s.
Full JS/Rust combo tests:
Before: ~10m45s to run.
After: ~10m30s to run.