mirror of
https://github.com/ThatGuySam/doesitarm.git
synced 2026-05-18 06:44:46 -07:00
refactor(scanner): type the worker path and align app-test results
Move the worker scanner surface into TypeScript, add a direct worker regression, and make the version=2 app-test path populate the same visible result data and final status as the legacy scanner. This keeps the refactor bounded while making the worker route safe to exercise. Constraint: Must preserve the existing Apple Silicon app-test behavior while changing the worker internals Rejected: Flip production to the worker path immediately | still needs the normal deploy path and broader production soak Confidence: medium Scope-risk: moderate Reversibility: clean Directive: Keep the version=2 adapter using the shared finishFileScan path until the legacy scanner can be removed entirely Tested: pnpm run typecheck; pnpm exec vitest run test/scanner/client.test.ts; pnpm run test:browser (original workspace); netlify build --context deploy-preview (original workspace) Not-tested: Browser suite from the clean clone environment (local Astro dev server startup timed out there)
This commit is contained in:
parent
0480c47bbb
commit
689fc0d13d
10 changed files with 869 additions and 657 deletions
124
helpers/scanner/client.ts
Normal file
124
helpers/scanner/client.ts
Normal file
|
|
@ -0,0 +1,124 @@
|
|||
import AppScanWorker from './worker?worker'
|
||||
|
||||
import type {
|
||||
AppScanSnapshot,
|
||||
ScanFileLike,
|
||||
ScanMessage
|
||||
} from './scan'
|
||||
|
||||
const noop = () => {}
|
||||
|
||||
type ScanMessageReceiver = ( details: ScanMessage ) => void
|
||||
|
||||
interface WorkerScanFile extends ScanFileLike {
|
||||
arrayBuffer: ArrayBuffer
|
||||
}
|
||||
|
||||
interface WorkerFinishedMessage extends ScanMessage {
|
||||
error?: {
|
||||
message?: string
|
||||
}
|
||||
scan?: AppScanSnapshot
|
||||
status: 'finished'
|
||||
}
|
||||
|
||||
function toArrayBuffer ( value: ArrayBuffer | ArrayBufferView ) {
|
||||
if ( value instanceof ArrayBuffer ) {
|
||||
return value
|
||||
}
|
||||
|
||||
return new Uint8Array(
|
||||
value.buffer,
|
||||
value.byteOffset,
|
||||
value.byteLength
|
||||
).slice().buffer
|
||||
}
|
||||
|
||||
function isWorkerFinishedMessage ( details: ScanMessage | WorkerFinishedMessage ): details is WorkerFinishedMessage {
|
||||
return details.status === 'finished'
|
||||
}
|
||||
|
||||
async function getArrayBufferFromFileData ( file: ScanFileLike ) {
|
||||
if ( typeof file.arrayBuffer === 'function' ) {
|
||||
return await file.arrayBuffer()
|
||||
}
|
||||
|
||||
if ( file.arrayBuffer instanceof ArrayBuffer ) {
|
||||
return file.arrayBuffer
|
||||
}
|
||||
|
||||
if ( file.buffer instanceof ArrayBuffer ) {
|
||||
return file.buffer
|
||||
}
|
||||
|
||||
if ( ArrayBuffer.isView( file.buffer ) ) {
|
||||
return toArrayBuffer( file.buffer )
|
||||
}
|
||||
|
||||
throw new Error( 'No fileArrayBuffer' )
|
||||
}
|
||||
|
||||
function makeWorkerFile ( file: ScanFileLike, arrayBuffer: ArrayBuffer ): WorkerScanFile {
|
||||
return {
|
||||
arrayBuffer,
|
||||
name: file.name,
|
||||
size: file.size ?? arrayBuffer.byteLength,
|
||||
type: file.type ?? file.mimeType ?? ''
|
||||
}
|
||||
}
|
||||
|
||||
export async function runScanWorker (
|
||||
file: ScanFileLike,
|
||||
messageReceiver: ScanMessageReceiver = noop
|
||||
) {
|
||||
const AppScanWorkerConstructor = AppScanWorker as unknown as { new (): Worker }
|
||||
const appScanWorker = new AppScanWorkerConstructor()
|
||||
const fileArrayBuffer = await getArrayBufferFromFileData( file )
|
||||
const workerFile = makeWorkerFile( file, fileArrayBuffer )
|
||||
|
||||
const scan = await new Promise<AppScanSnapshot>( ( resolve, reject ) => {
|
||||
const cleanup = () => {
|
||||
appScanWorker.onmessage = null
|
||||
appScanWorker.onerror = null
|
||||
appScanWorker.terminate()
|
||||
}
|
||||
|
||||
appScanWorker.onmessage = ( event: MessageEvent<ScanMessage | WorkerFinishedMessage> ) => {
|
||||
const details = event.data
|
||||
|
||||
messageReceiver( details )
|
||||
|
||||
if ( !isWorkerFinishedMessage( details ) ) {
|
||||
return
|
||||
}
|
||||
|
||||
cleanup()
|
||||
|
||||
if ( details.scan ) {
|
||||
resolve( details.scan )
|
||||
return
|
||||
}
|
||||
|
||||
reject( new Error( details.error?.message || details.message || 'Worker finished without a scan result.' ) )
|
||||
}
|
||||
|
||||
appScanWorker.onerror = ( errorEvent: ErrorEvent ) => {
|
||||
cleanup()
|
||||
reject( new Error( errorEvent.message || 'Error received from App Scan Worker' ) )
|
||||
}
|
||||
|
||||
appScanWorker.postMessage( {
|
||||
status: 'start',
|
||||
options: {
|
||||
file: workerFile
|
||||
}
|
||||
}, [
|
||||
fileArrayBuffer
|
||||
] )
|
||||
} )
|
||||
|
||||
return {
|
||||
appScanWorker,
|
||||
scan
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue