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

Switch back to imported buffer

Browse source 
# Conflicts:
#	helpers/scanner/client.js
This commit is contained in:
Sam Carlton 2022-07-21 19:52:32 -05:00
parent a51d3cd5ee
commit cc2f2355fc
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
helpers/scanner/client.js
View file

@ -1,4 +1,3 @@
import bufferApi from 'buffer'
// import prettyBytes from 'pretty-bytes'
import * as zip from '@zip.js/zip.js'
// import FileApi from 'file-api'
@ -8,12 +7,12 @@ import { isString, isNonEmptyString } from '~/helpers/check-types.js'
import { parsePlistBuffer } from '~/helpers/scanner/parsers/plist.js'
// import { extractMachoMeta } from '~/helpers/scanner/parsers/macho.js'
import { Buffer } from 'buffer/'
// For some reason inline 'import()' works better than 'import from'
// https://gildas-lormeau.github.io/zip.js/
// const zip = await import('@zip.js/zip.js')
// const bufferApi = await import('buffer')
// const FileApi = await import('file-api')
// const { parse: plistParse } = await import('simple-plist/dist/index.js')
@ -26,7 +25,7 @@ zip.configure({
function makeNodeFileBuffer ( buffer ) {
const fileBuffer = new bufferApi.Buffer.alloc( buffer.byteLength )
const fileBuffer = new Buffer.alloc( buffer.byteLength )
for (var i = 0; i < buffer.length; i++)
fileBuffer[i] = buffer[i];
@ -282,7 +281,7 @@ export class AppScan {
const machoFileInstance = new FileApi.File({
name: this.bundleExecutable.filename,
type: 'application/x-mach-binary',
buffer: bundleExecutableUint8Array,
buffer: Buffer.from( bundleExecutableUint8Array ),
})
this.machoMeta = await extractMachoMeta({ machoFileInstance, FileApi })