@@ -2,95 +2,147 @@ import { LogMessageWithStack } from '../../internal/logging/log_message.js';
22import { TransferredTestCaseResult , LiveTestCaseResult } from '../../internal/logging/result.js' ;
33import { TestCaseRecorder } from '../../internal/logging/test_case_recorder.js' ;
44import { TestQueryWithExpectation } from '../../internal/query/query.js' ;
5+ import { timeout } from '../../util/timeout.js' ;
6+ import { assert } from '../../util/util.js' ;
57
68import { CTSOptions , kDefaultCTSOptions } from './options.js' ;
9+ import { WorkerTestRunRequest } from './utils_worker.js' ;
710
8- export class TestDedicatedWorker {
9- private readonly ctsOptions : CTSOptions ;
10- private readonly worker : Worker ;
11- private readonly resolvers = new Map < string , ( result : LiveTestCaseResult ) => void > ( ) ;
11+ /** Query all currently-registered service workers, and unregister them. */
12+ function unregisterAllServiceWorkers ( ) {
13+ void navigator . serviceWorker . getRegistrations ( ) . then ( registrations => {
14+ for ( const registration of registrations ) {
15+ void registration . unregister ( ) ;
16+ }
17+ } ) ;
18+ }
1219
13- constructor ( ctsOptions ?: CTSOptions ) {
14- this . ctsOptions = { ...( ctsOptions || kDefaultCTSOptions ) , ...{ worker : 'dedicated' } } ;
15- const selfPath = import . meta. url ;
16- const selfPathDir = selfPath . substring ( 0 , selfPath . lastIndexOf ( '/' ) ) ;
17- const workerPath = selfPathDir + '/test_worker-worker.js' ;
18- this . worker = new Worker ( workerPath , { type : 'module' } ) ;
19- this . worker . onmessage = ev => {
20- const query : string = ev . data . query ;
21- const result : TransferredTestCaseResult = ev . data . result ;
22- if ( result . logs ) {
23- for ( const l of result . logs ) {
24- Object . setPrototypeOf ( l , LogMessageWithStack . prototype ) ;
25- }
20+ // NOTE: This code runs on startup for any runtime with worker support. Here, we use that chance to
21+ // delete any leaked service workers, and register to clean up after ourselves at shutdown.
22+ unregisterAllServiceWorkers ( ) ;
23+ window . addEventListener ( 'beforeunload' , ( ) => {
24+ unregisterAllServiceWorkers ( ) ;
25+ } ) ;
26+
27+ class TestBaseWorker {
28+ protected readonly ctsOptions : CTSOptions ;
29+ protected readonly resolvers = new Map < string , ( result : LiveTestCaseResult ) => void > ( ) ;
30+
31+ constructor ( worker : CTSOptions [ 'worker' ] , ctsOptions ?: CTSOptions ) {
32+ this . ctsOptions = { ...( ctsOptions || kDefaultCTSOptions ) , ...{ worker } } ;
33+ }
34+
35+ onmessage ( ev : MessageEvent ) {
36+ const query : string = ev . data . query ;
37+ const result : TransferredTestCaseResult = ev . data . result ;
38+ if ( result . logs ) {
39+ for ( const l of result . logs ) {
40+ Object . setPrototypeOf ( l , LogMessageWithStack . prototype ) ;
2641 }
27- this . resolvers . get ( query ) ! ( result as LiveTestCaseResult ) ;
42+ }
43+ this . resolvers . get ( query ) ! ( result as LiveTestCaseResult ) ;
44+ this . resolvers . delete ( query ) ;
2845
29- // MAINTENANCE_TODO(kainino0x): update the Logger with this result (or don't have a logger and
30- // update the entire results JSON somehow at some point).
31- } ;
46+ // MAINTENANCE_TODO(kainino0x): update the Logger with this result (or don't have a logger and
47+ // update the entire results JSON somehow at some point).
3248 }
3349
34- async run (
50+ async makeRequestAndRecordResult (
51+ target : MessagePort | Worker | ServiceWorker ,
3552 rec : TestCaseRecorder ,
3653 query : string ,
37- expectations : TestQueryWithExpectation [ ] = [ ]
38- ) : Promise < void > {
39- this . worker . postMessage ( {
54+ expectations : TestQueryWithExpectation [ ]
55+ ) {
56+ const request : WorkerTestRunRequest = {
4057 query,
4158 expectations,
4259 ctsOptions : this . ctsOptions ,
43- } ) ;
60+ } ;
61+ target . postMessage ( request ) ;
62+
4463 const workerResult = await new Promise < LiveTestCaseResult > ( resolve => {
64+ assert ( ! this . resolvers . has ( query ) , "can't request same query twice simultaneously" ) ;
4565 this . resolvers . set ( query , resolve ) ;
4666 } ) ;
4767 rec . injectResult ( workerResult ) ;
4868 }
4969}
5070
71+ export class TestDedicatedWorker extends TestBaseWorker {
72+ private readonly worker : Worker ;
73+
74+ constructor ( ctsOptions ?: CTSOptions ) {
75+ super ( 'dedicated' , ctsOptions ) ;
76+ const selfPath = import . meta. url ;
77+ const selfPathDir = selfPath . substring ( 0 , selfPath . lastIndexOf ( '/' ) ) ;
78+ const workerPath = selfPathDir + '/test_worker-worker.js' ;
79+ this . worker = new Worker ( workerPath , { type : 'module' } ) ;
80+ this . worker . onmessage = ev => this . onmessage ( ev ) ;
81+ }
82+
83+ async run (
84+ rec : TestCaseRecorder ,
85+ query : string ,
86+ expectations : TestQueryWithExpectation [ ] = [ ]
87+ ) : Promise < void > {
88+ await this . makeRequestAndRecordResult ( this . worker , rec , query , expectations ) ;
89+ }
90+ }
91+
5192export class TestWorker extends TestDedicatedWorker { }
5293
53- export class TestSharedWorker {
54- private readonly ctsOptions : CTSOptions ;
94+ export class TestSharedWorker extends TestBaseWorker {
5595 private readonly port : MessagePort ;
56- private readonly resolvers = new Map < string , ( result : LiveTestCaseResult ) => void > ( ) ;
5796
5897 constructor ( ctsOptions ?: CTSOptions ) {
59- this . ctsOptions = { ... ( ctsOptions || kDefaultCTSOptions ) , ... { worker : 'shared' } } ;
98+ super ( 'shared' , ctsOptions ) ;
6099 const selfPath = import . meta. url ;
61100 const selfPathDir = selfPath . substring ( 0 , selfPath . lastIndexOf ( '/' ) ) ;
62101 const workerPath = selfPathDir + '/test_worker-worker.js' ;
63102 const worker = new SharedWorker ( workerPath , { type : 'module' } ) ;
64103 this . port = worker . port ;
65104 this . port . start ( ) ;
66- this . port . onmessage = ev => {
67- const query : string = ev . data . query ;
68- const result : TransferredTestCaseResult = ev . data . result ;
69- if ( result . logs ) {
70- for ( const l of result . logs ) {
71- Object . setPrototypeOf ( l , LogMessageWithStack . prototype ) ;
72- }
73- }
74- this . resolvers . get ( query ) ! ( result as LiveTestCaseResult ) ;
105+ this . port . onmessage = ev => this . onmessage ( ev ) ;
106+ }
75107
76- // MAINTENANCE_TODO(kainino0x): update the Logger with this result (or don't have a logger and
77- // update the entire results JSON somehow at some point).
78- } ;
108+ async run (
109+ rec : TestCaseRecorder ,
110+ query : string ,
111+ expectations : TestQueryWithExpectation [ ] = [ ]
112+ ) : Promise < void > {
113+ await this . makeRequestAndRecordResult ( this . port , rec , query , expectations ) ;
114+ }
115+ }
116+
117+ export class TestServiceWorker extends TestBaseWorker {
118+ constructor ( ctsOptions ?: CTSOptions ) {
119+ super ( 'service' , ctsOptions ) ;
79120 }
80121
81122 async run (
82123 rec : TestCaseRecorder ,
83124 query : string ,
84125 expectations : TestQueryWithExpectation [ ] = [ ]
85126 ) : Promise < void > {
86- this . port . postMessage ( {
87- query,
88- expectations,
89- ctsOptions : this . ctsOptions ,
90- } ) ;
91- const workerResult = await new Promise < LiveTestCaseResult > ( resolve => {
92- this . resolvers . set ( query , resolve ) ;
127+ const [ suite , name ] = query . split ( ':' , 2 ) ;
128+ const fileName = name . split ( ',' ) . join ( '/' ) ;
129+ const serviceWorkerURL = new URL (
130+ `/out/${ suite } ${ fileName } ,
131+ window . location . href
132+ ) . toString ( ) ;
133+
134+ // If a registration already exists for this path, it will be ignored.
135+ const registration = await navigator . serviceWorker . register ( serviceWorkerURL , {
136+ type : 'module' ,
93137 } ) ;
94- rec . injectResult ( workerResult ) ;
138+ // Make sure the registration we just requested is active. (We don't worry about it being
139+ // outdated from a previous page load, because we wipe all service workers on shutdown/startup.)
140+ while ( ! registration . active || registration . active . scriptURL !== serviceWorkerURL ) {
141+ await new Promise ( resolve => timeout ( resolve , 0 ) ) ;
142+ }
143+ const serviceWorker = registration . active ;
144+
145+ navigator . serviceWorker . onmessage = ev => this . onmessage ( ev ) ;
146+ await this . makeRequestAndRecordResult ( serviceWorker , rec , query , expectations ) ;
95147 }
96148}
0 commit comments