Buck9195/doesitarm
1
0
Fork 0
mirror of https://github.com/ThatGuySam/doesitarm.git synced 2026-05-15 06:35:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Enable new scan with version 2 query parameter

Browse source
This commit is contained in:
Sam Carlton 2022-07-21 21:48:21 -05:00
parent b7e2d8d3d2
commit 0073b1b624
1 changed files with 39 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

40
helpers/app-files-scanner.js
View file

@ -5,6 +5,17 @@ import { isString } from './check-types.js'
import parseMacho from './macho/index.js'
import prettyBytes from 'pretty-bytes'
import { AppScan } from '~/helpers/scanner/client'
const scannerVersion = (() => {
// If there's no window
// then use scanner V1
if ( typeof window === 'undefined' ) return '1'
const urlSearchParams = new URLSearchParams(window.location.search)
return String( urlSearchParams.get('version') || '1' )
})()
const knownArchiveExtensions = new Set([
'app',
@ -593,7 +604,7 @@ export default class AppFilesScanner {
// Scan for archives
await Promise.all( this.files.map( ( file, scanIndex ) => {
return new Promise( (resolve, reject) => {
return new Promise( async (resolve, reject) => {
const timer = setTimeout(() => {
file.statusMessage = '❔ Scan timed out'
@ -602,10 +613,37 @@ export default class AppFilesScanner {
reject(new Error('Scan timed out'))
}, scanTimeoutSeconds * 1000)
console.log( 'Scanning', file.name )
console.log( 'scannerVersion', scannerVersion )
if ( scannerVersion === '2' ) {
// Create a new AppScan instance
const scan = new AppScan({
fileLoader: async () => file.instance,
messageReceiver: ( details ) => {
console.log( 'Scan message:', details )
file.statusMessage = details.message
file.status = details.status
}
})
// Scan the archive
await scan.start()
clearTimeout(timer)
resolve()
return
}
this.scanFile( file, scanIndex ).then(
response => resolve(response),
err => reject(new Error(err))
).finally(() => clearTimeout(timer))
resolve()
})
}))