@@ -7,25 +7,29 @@ import (
77 "log"
88 "os"
99 "strings"
10+ "sync"
11+
12+ "golang.org/x/exp/slices"
1013)
1114
1215type browserContextImpl struct {
1316 channelOwner
14- timeoutSettings * timeoutSettings
15- isClosedOrClosing bool
16- options * BrowserNewContextOptions
17- pages []Page
18- routes []* routeHandlerEntry
19- ownedPage Page
20- browser * browserImpl
21- serviceWorkers []Worker
22- backgroundPages []Page
23- bindings map [string ]BindingCallFunction
24- tracing * tracingImpl
25- request * apiRequestContextImpl
26- harRecorders map [string ]harRecordingMetadata
27- closed chan struct {}
28- closeReason * string
17+ timeoutSettings * timeoutSettings
18+ closeWasCalled bool
19+ options * BrowserNewContextOptions
20+ pages []Page
21+ routes []* routeHandlerEntry
22+ ownedPage Page
23+ browser * browserImpl
24+ serviceWorkers []Worker
25+ backgroundPages []Page
26+ bindings map [string ]BindingCallFunction
27+ tracing * tracingImpl
28+ request * apiRequestContextImpl
29+ harRecorders map [string ]harRecordingMetadata
30+ closed chan struct {}
31+ closeReason * string
32+ harRouters []* harRouter
2933}
3034
3135func (b * browserContextImpl ) SetDefaultNavigationTimeout (timeout float64 ) {
@@ -210,21 +214,56 @@ func (b *browserContextImpl) ExposeFunction(name string, binding ExposedFunction
210214}
211215
212216func (b * browserContextImpl ) Route (url interface {}, handler routeHandler , times ... int ) error {
213- b .routes = append (b .routes , newRouteHandlerEntry (newURLMatcher (url , b .options .BaseURL ), handler , times ... ))
217+ b .Lock ()
218+ defer b .Unlock ()
219+ b .routes = slices .Insert (b .routes , 0 , newRouteHandlerEntry (newURLMatcher (url , b .options .BaseURL ), handler , times ... ))
214220 return b .updateInterceptionPatterns ()
215221}
216222
217223func (b * browserContextImpl ) Unroute (url interface {}, handlers ... routeHandler ) error {
224+ removed , remaining , err := unroute (b .routes , url , handlers ... )
225+ if err != nil {
226+ return err
227+ }
228+ return b .unrouteInternal (removed , remaining , UnrouteBehaviorDefault )
229+ }
230+
231+ func (b * browserContextImpl ) unrouteInternal (removed []* routeHandlerEntry , remaining []* routeHandlerEntry , behavior * UnrouteBehavior ) error {
218232 b .Lock ()
219233 defer b .Unlock ()
220-
221- routes , err := unroute (b .routes , url , handlers ... )
222- if err != nil {
234+ b .routes = remaining
235+ if err := b .updateInterceptionPatterns (); err != nil {
223236 return err
224237 }
225- b .routes = routes
238+ if behavior == nil || behavior == UnrouteBehaviorDefault {
239+ return nil
240+ }
241+ wg := & sync.WaitGroup {}
242+ for _ , entry := range removed {
243+ wg .Add (1 )
244+ go func (entry * routeHandlerEntry ) {
245+ defer wg .Done ()
246+ entry .Stop (string (* behavior ))
247+ }(entry )
248+ }
249+ wg .Wait ()
250+ return nil
251+ }
226252
227- return b .updateInterceptionPatterns ()
253+ func (b * browserContextImpl ) UnrouteAll (options ... BrowserContextUnrouteAllOptions ) error {
254+ var behavior * UnrouteBehavior
255+ if len (options ) == 1 {
256+ behavior = options [0 ].Behavior
257+ }
258+ defer b .disposeHarRouters ()
259+ return b .unrouteInternal (b .routes , []* routeHandlerEntry {}, behavior )
260+ }
261+
262+ func (b * browserContextImpl ) disposeHarRouters () {
263+ for _ , router := range b .harRouters {
264+ router .dispose ()
265+ }
266+ b .harRouters = make ([]* harRouter , 0 )
228267}
229268
230269func (b * browserContextImpl ) Request () APIRequestContext {
@@ -255,6 +294,7 @@ func (b *browserContextImpl) RouteFromHAR(har string, options ...BrowserContextR
255294 notFound = HarNotFoundAbort
256295 }
257296 router := newHarRouter (b .connection .localUtils , har , * notFound , opt .URL )
297+ b .harRouters = append (b .harRouters , router )
258298 return router .addContextRoute (b )
259299}
260300
@@ -318,15 +358,13 @@ func (b *browserContextImpl) ExpectPage(cb func() error, options ...BrowserConte
318358}
319359
320360func (b * browserContextImpl ) Close (options ... BrowserContextCloseOptions ) error {
321- if b .isClosedOrClosing {
361+ if b .closeWasCalled {
322362 return nil
323363 }
324364 if len (options ) == 1 {
325365 b .closeReason = options [0 ].Reason
326366 }
327- b .Lock ()
328- b .isClosedOrClosing = true
329- b .Unlock ()
367+ b .closeWasCalled = true
330368 innerClose := func () (interface {}, error ) {
331369 for harId , harMetaData := range b .harRecorders {
332370 overrides := map [string ]interface {}{}
@@ -456,6 +494,7 @@ func (b *browserContextImpl) onClose() {
456494 b .browser .contexts = contexts
457495 b .browser .Unlock ()
458496 }
497+ b .disposeHarRouters ()
459498 b .Emit ("close" , b )
460499}
461500
@@ -473,20 +512,15 @@ func (b *browserContextImpl) onPage(page Page) {
473512func (b * browserContextImpl ) onRoute (route * routeImpl ) {
474513 go func () {
475514 b .Lock ()
476- defer b .Unlock ()
477515 route .context = b
516+ page := route .Request ().(* requestImpl ).safePage ()
478517 routes := make ([]* routeHandlerEntry , len (b .routes ))
479518 copy (routes , b .routes )
519+ b .Unlock ()
480520
481- url := route .Request ().URL ()
482- for i , handlerEntry := range routes {
483- if ! handlerEntry .Matches (url ) {
484- continue
485- }
486- if handlerEntry .WillExceed () {
487- b .routes = append (b .routes [:i ], b .routes [i + 1 :]... )
488- }
489- handled := handlerEntry .Handle (route )
521+ checkInterceptionIfNeeded := func () {
522+ b .Lock ()
523+ defer b .Unlock ()
490524 if len (b .routes ) == 0 {
491525 _ , err := b .connection .WrapAPICall (func () (interface {}, error ) {
492526 err := b .updateInterceptionPatterns ()
@@ -496,14 +530,37 @@ func (b *browserContextImpl) onRoute(route *routeImpl) {
496530 log .Printf ("could not update interception patterns: %v" , err )
497531 }
498532 }
533+ }
534+
535+ url := route .Request ().URL ()
536+ for _ , handlerEntry := range routes {
537+ // If the page or the context was closed we stall all requests right away.
538+ if (page != nil && page .closeWasCalled ) || b .closeWasCalled {
539+ return
540+ }
541+ if ! handlerEntry .Matches (url ) {
542+ continue
543+ }
544+ if ! slices .ContainsFunc (b .routes , func (entry * routeHandlerEntry ) bool {
545+ return entry == handlerEntry
546+ }) {
547+ continue
548+ }
549+ if handlerEntry .WillExceed () {
550+ b .routes = slices .DeleteFunc (b .routes , func (rhe * routeHandlerEntry ) bool {
551+ return rhe == handlerEntry
552+ })
553+ }
554+ handled := handlerEntry .Handle (route )
555+ checkInterceptionIfNeeded ()
499556 yes := <- handled
500557 if yes {
501558 return
502559 }
503560 }
504- if err := route . internalContinue ( true ); err != nil {
505- log . Printf ( "could not continue request: %v" , err )
506- }
561+ // If the page is closed or unrouteAll() was called without waiting and interception disabled,
562+ // the method will throw an error - silence it.
563+ _ = route . internalContinue ( true )
507564 }()
508565}
509566
@@ -624,6 +681,7 @@ func newBrowserContext(parent *channelOwner, objectType string, guid string, ini
624681 bindings : make (map [string ]BindingCallFunction ),
625682 harRecorders : make (map [string ]harRecordingMetadata ),
626683 closed : make (chan struct {}, 1 ),
684+ harRouters : make ([]* harRouter , 0 ),
627685 }
628686 bt .createChannelOwner (bt , parent , objectType , guid , initializer )
629687 if parent .objectType == "Browser" {
0 commit comments