Display app and binary size

helpers/app-files-scanner.js

@@ -2,7 +2,8 @@ import plist from 'plist'
 
 import parseMacho from './macho/index.js'
 
-// console.log('MachOParser', MachOParser)
+const prettyBytes = require('pretty-bytes')
+
 
 const knownArchiveExtensions = new Set([
     'app',
@@ -43,6 +44,16 @@ function isValidHttpUrl( string ) {
     return url.protocol === "http:" || url.protocol === "https:"
 }
 
+function callWithTimeout(timeout, func) {
+    return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => reject(new Error("timeout")), timeout)
+        func().then(
+            response => resolve(response),
+            err => reject(new Error(err))
+        ).finally(() => clearTimeout(timer))
+    })
+}
+
 let zip
 
 export default class AppFilesScanner {
@@ -270,28 +281,7 @@ export default class AppFilesScanner {
         // Each file scanned: Filename, Type(Drop or URL), File URL, Datetime, Architectures, Mach-o Meta
     }
 
-    async scan ( fileList ) {
+    async scanFile ( file, scanIndex ) {
-
-        // Push files to our files array
-        Array.from(fileList).forEach( (fileInstance, scanIndex) => {
-            this.files.unshift( {
-                status: 'loaded',
-                displayName: null,
-                statusMessage: '⏳ File Loaded and Queud',
-                details: [],
-                appVersion: null,
-
-                name: fileInstance.name,
-                size: fileInstance.size,
-                type: fileList.item( scanIndex ).type,
-                lastModifiedDate: fileInstance.lastModifiedDate,
-                instance: fileInstance,
-                item: fileList.item( scanIndex )
-            } )
-        })
-
-        // Scan for archives
-        await Promise.all( this.files.map( async (file, scanIndex) => {
 
         // If we've already scanned this
         // then skip
@@ -309,6 +299,7 @@ export default class AppFilesScanner {
         await new Promise(r => setTimeout(r, 1500 * scanIndex))
 
         file.statusMessage = '🗃 Decompressing file'
+        console.log(`Decompressing file at ${ file.size }`)
 
         let entries
 
@@ -325,6 +316,7 @@ export default class AppFilesScanner {
         }
 
         file.statusMessage = '👀 Scanning App Files'
+        console.log(`Searching entries`)
 
         const foundEntries = this.findEntries( entries, {
             macho: this.matchesMacho,
@@ -361,6 +353,7 @@ export default class AppFilesScanner {
         const [ rootInfoEntry ] = foundEntries.rootInfo
 
         // Get blob data from zip
+        // https://gildas-lormeau.github.io/zip.js/core-api.html#zip-entry
         const infoXml = await rootInfoEntry.getData(
             // writer
             // https://gildas-lormeau.github.io/zip.js/core-api.html#zip-writing
@@ -408,13 +401,19 @@ export default class AppFilesScanner {
         //     info
         // })
 
-            // const machOBlob = await file.machOEntries
 
+        console.log(`Parsing Macho ${ file.machOEntries.length } files`)
 
-            const parsedMachoEntries = await Promise.all( file.machOEntries.map( async machOEntry => {
+        const parsedMachoEntries = await Promise.all( file.machOEntries.map( async ( machOEntry, machEntryIndex ) => {
-                // console.log('Parsing ', machOEntry.filename)
+            console.log('Parsing ', machOEntry.filename, machOEntry.uncompressedSize / 1000 )
+
+            if ( machEntryIndex === 0 ) {
+                file.displayBinarySize = prettyBytes( machOEntry.uncompressedSize )
+                file.binarySize = machOEntry.uncompressedSize
+            }
 
             // Get blob data from zip
+            // https://gildas-lormeau.github.io/zip.js/core-api.html#zip-entry
             const machOBlob = await machOEntry.getData(
                 // writer
                 // https://gildas-lormeau.github.io/zip.js/core-api.html#zip-writing
@@ -437,7 +436,9 @@ export default class AppFilesScanner {
         // console.log('parsedMachoEntries', parsedMachoEntries)
 
         // file.statusMessage = `🏁 Scan Finished. ${file.machOEntries.length} Mach-o files`
-            file.statusMessage = `🏁 Scan Finished. `
+        // file.statusMessage = `🏁 Scan Finished. `
+        console.log(`Searching ${ parsedMachoEntries.length } binaries for architecture info`)
+
 
         let supportedBinaries = 0
         let unsupportedBinaries = 0
@@ -457,6 +458,7 @@ export default class AppFilesScanner {
             }
         } )
 
+        console.log(`Found ${ supportedBinaries } supportedBinaries and ${unsupportedBinaries} unsupportedBinaries`)
 
         // console.log('supportedBinaries', supportedBinaries)
         // console.log('unsupportedBinaries', unsupportedBinaries)
@@ -475,6 +477,49 @@ export default class AppFilesScanner {
         file.status = 'finished'
 
         return
+    }
+
+    async scan ( fileList ) {
+
+        // Push files to our files array
+        Array.from(fileList).forEach( (fileInstance, scanIndex) => {
+            this.files.unshift( {
+                status: 'loaded',
+                displayName: null,
+                statusMessage: '⏳ File Loaded and Queud',
+                details: [],
+                appVersion: null,
+                displayAppSize: prettyBytes( fileInstance.size ),
+                displayBinarySize: null,
+                binarySize: null,
+
+                name: fileInstance.name,
+                size: fileInstance.size,
+                type: fileList.item( scanIndex ).type,
+                lastModifiedDate: fileInstance.lastModifiedDate,
+                instance: fileInstance,
+                item: fileList.item( scanIndex )
+            } )
+        })
+
+        const scanTimeoutSeconds = 30
+
+        // Scan for archives
+        await Promise.all( this.files.map( ( file, scanIndex ) => {
+            return new Promise( (resolve, reject) => {
+
+                const timer = setTimeout(() => {
+                    file.statusMessage = '❔ Scan timed out'
+                    file.status = 'finished'
+
+                    reject(new Error('Scan timed out'))
+                }, scanTimeoutSeconds * 1000)
+
+                this.scanFile( file, scanIndex ).then(
+                    response => resolve(response),
+                    err => reject(new Error(err))
+                ).finally(() => clearTimeout(timer))
+            })
         }))
 
 

pages/apple-silicon-compatibility.vue

@@ -89,11 +89,23 @@
                                 <div class="absolute hidden left-0 h-12 w-12 rounded-full md:flex items-center justify-center bg-darker">
                                     {{ appScan.name.charAt(0) }}
                                 </div>
-                                {{ appScan.displayName || appScan.name }} {{ appScan.appVersion ? `- v${appScan.appVersion}` : '' }}
+                                {{ appScan.displayName || appScan.name }}
+                                {{ appScan.appVersion ? `- v${appScan.appVersion}` : '' }}
+                                {{ appScan.displayAppSize ? `- App ${appScan.displayAppSize}` : '' }}
+                                {{ appScan.displayBinarySize ? `- Binary ${appScan.displayBinarySize}` : '' }}
                                 <div class="text-sm leading-5 font-bold">
                                     {{ appScan.statusMessage }}
                                 </div>
 
+                                appScan.binarySize: {{ appScan.binarySize }}
+
+                                <div
+                                    v-if="appScan.binarySize && appScan.binarySize < (10 ^ 6)"
+                                    class="text-sm leading-5 font-bold"
+                                >
+                                    ⚠️ Large Binary - This scan may take a while an/or have issues
+                                </div>
+
                                 <details class="w-full pt-6">
                                     <summary class="cursor-pointer mb-3">Details</summary>
                                     <div>