@@ -28,23 +28,15 @@ if (ENVIRONMENT_IS_NODE) {
28
28
29
29
Object . assign ( global , {
30
30
self : global ,
31
- require : require ,
32
- Module : Module ,
31
+ require,
32
+ Module,
33
33
location : {
34
34
href : __filename
35
35
} ,
36
36
Worker : nodeWorkerThreads . Worker ,
37
- importScripts : function ( f ) {
38
- ( 0 , eval ) ( fs . readFileSync ( f , 'utf8' ) + '//# sourceURL=' + f ) ;
39
- } ,
40
- postMessage : function ( msg ) {
41
- parentPort . postMessage ( msg ) ;
42
- } ,
43
- performance : global . performance || {
44
- now : function ( ) {
45
- return Date . now ( ) ;
46
- }
47
- } ,
37
+ importScripts : ( f ) => ( 0 , eval ) ( fs . readFileSync ( f , 'utf8' ) + '//# sourceURL=' + f ) ,
38
+ postMessage : ( msg ) => parentPort . postMessage ( msg ) ,
39
+ performance : global . performance || { now : Date . now } ,
48
40
} ) ;
49
41
}
50
42
#endif // ENVIRONMENT_MAY_BE_NODE
@@ -160,8 +152,11 @@ function handleMessage(e) {
160
152
// Use `const` here to ensure that the variable is scoped only to
161
153
// that iteration, allowing safe reference from a closure.
162
154
for ( const handler of e . data . handlers ) {
163
- Module [ handler ] = function ( ) {
164
- postMessage ( { cmd : 'callHandler' , handler, args : [ ...arguments ] } ) ;
155
+ Module [ handler ] = ( ...args ) => {
156
+ #if RUNTIME_DEBUG
157
+ dbg ( `calling handler on main thread: ${ handler } ` ) ;
158
+ #endif
159
+ postMessage ( { cmd : 'callHandler' , handler, args : args } ) ;
165
160
}
166
161
}
167
162
@@ -191,7 +186,7 @@ function handleMessage(e) {
191
186
if ( typeof e . data . urlOrBlob == 'string' ) {
192
187
#if TRUSTED_TYPES
193
188
if ( typeof self . trustedTypes != 'undefined' && self . trustedTypes . createPolicy ) {
194
- var p = self . trustedTypes . createPolicy ( 'emscripten#workerPolicy3' , { createScriptURL : function ( ignored ) { return e . data . urlOrBlob } } ) ;
189
+ var p = self . trustedTypes . createPolicy ( 'emscripten#workerPolicy3' , { createScriptURL : ( ignored ) => e . data . urlOrBlob } ) ;
195
190
importScripts ( p . createScriptURL ( 'ignored' ) ) ;
196
191
} else
197
192
#endif
@@ -200,7 +195,7 @@ function handleMessage(e) {
200
195
var objectUrl = URL . createObjectURL ( e . data . urlOrBlob ) ;
201
196
#if TRUSTED_TYPES
202
197
if ( typeof self . trustedTypes != 'undefined' && self . trustedTypes . createPolicy ) {
203
- var p = self . trustedTypes . createPolicy ( 'emscripten#workerPolicy3' , { createScriptURL : function ( ignored ) { return objectUrl } } ) ;
198
+ var p = self . trustedTypes . createPolicy ( 'emscripten#workerPolicy3' , { createScriptURL : ( ignored ) => objectUrl } ) ;
204
199
importScripts ( p . createScriptURL ( 'ignored' ) ) ;
205
200
} else
206
201
#endif
0 commit comments