From 8b15f2580be6673431b8887b22a6ec679e939682 Mon Sep 17 00:00:00 2001 From: Sam Carlton Date: Sat, 20 Aug 2022 21:34:29 -0500 Subject: [PATCH] Pass all message details through receivers --- helpers/scanner/client.mjs | 4 ++-- helpers/scanner/worker.mjs | 4 ++-- test/scanner/client.test.mjs | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/helpers/scanner/client.mjs b/helpers/scanner/client.mjs index e45bd61..7ade97b 100644 --- a/helpers/scanner/client.mjs +++ b/helpers/scanner/client.mjs @@ -14,9 +14,9 @@ export async function runScanWorker ( file, messageReceiver = noop ) { appScanWorker.onmessage = async (event) => { // console.log( 'Main received message', event ) - const { status, message } = event.data + const { status } = event.data - messageReceiver({ status, message }) + messageReceiver( event.data ) // Resolves promise on finished status if ( status === 'finished' ) { diff --git a/helpers/scanner/worker.mjs b/helpers/scanner/worker.mjs index fdd06d1..f4b9489 100644 --- a/helpers/scanner/worker.mjs +++ b/helpers/scanner/worker.mjs @@ -19,8 +19,8 @@ self.onmessage = async ( event ) => { const scan = new AppScan({ fileLoader: () => options.file, // Use self.postMessage as the message callback - messageReceiver: ( message ) => { - self.postMessage( message ) + messageReceiver: ( details ) => { + self.postMessage( details ) } }) diff --git a/test/scanner/client.test.mjs b/test/scanner/client.test.mjs index 26ed7a4..8304082 100644 --- a/test/scanner/client.test.mjs +++ b/test/scanner/client.test.mjs @@ -86,7 +86,9 @@ describe.concurrent('Apps', async () => { const file = await makeZipFromBundlePath( bundlePath ) // Scan the app - const { scan } = await runScanWorker( file ) + const { scan } = await runScanWorker( file, ( details ) => { + console.log( 'New message from runScanWorker:', details ) + } ) it( `Can read info.plist for ${ appName } bundle` , () => {