Remove zip.js arraybuffer workarounds

Author: Scarabol

src/resource/fileparser/ZipFileParser.ts

@@ -1,5 +1,5 @@
 import { VirtualFileSystem } from './VirtualFileSystem'
-import { Uint8ArrayReader, Uint8ArrayWriter, ZipReader } from '@zip.js/zip.js'
+import { Entry, FileEntry, Uint8ArrayReader, ZipReader } from '@zip.js/zip.js'
 import { VirtualFile } from './VirtualFile'
 import { cachePutData } from '../AssetCacheHelper'
 import { SelectFilesProgress } from '../selectfiles/SelectFilesProgress'
@@ -17,23 +17,23 @@ export class ZipFileParser {
                     this.progress.setProgress(`Reading ZIP file entries...`, progress, total)
                 }
             })
-            const wadEntries = zipEntries.filter((e) => !e.directory && !!e.filename.match(/.+\.wad/i))
+            const wadEntries = zipEntries.filter(ZipFileParser.isWadFileEntry)
             await Promise.all(wadEntries.map(async (e) => {
                 const lFileName = e.filename.replace('Rock Raiders/', '').toLowerCase()
-                const buffer = (await e.getData?.(new Uint8ArrayWriter(), {
+                const buffer = await e.arrayBuffer({
                     onprogress: (progress: number, total: number): undefined => {
                         this.progress.setProgress(`Extracting "${e.filename}"...`, progress, total)
                     }
-                }))?.buffer as ArrayBuffer // Workaround for https://github.com/gildas-lormeau/zip.js/issues/549
+                })
                 if (!buffer) throw new Error(`Could not read file buffer for ${lFileName}`)
                 vfs.registerFile(VirtualFile.fromBuffer(lFileName, buffer))
                 await cachePutData(lFileName, buffer)
             }))
-            const dataEntries = zipEntries.filter((e) => !e.directory && !!e.filename.match(/Rock Raiders\/Data/i))
+            const dataEntries = zipEntries.filter(ZipFileParser.isDataFileEntry)
             let progress = 0
             await Promise.all(dataEntries.map(async (e) => {
                 const lFileName = e.filename.replace('Rock Raiders/', '').toLowerCase()
-                const buffer = (await e.getData?.(new Uint8ArrayWriter()))?.buffer as ArrayBuffer // Workaround for https://github.com/gildas-lormeau/zip.js/issues/549
+                const buffer = await e.arrayBuffer()
                 if (!buffer) throw new Error(`Could not read file buffer for ${lFileName}`)
                 vfs.registerFile(VirtualFile.fromBuffer(lFileName, buffer))
                 await cachePutData(lFileName, buffer)
@@ -46,4 +46,12 @@ export class ZipFileParser {
             await zipReader.close()
         }
     }
+
+    private static isWadFileEntry(entry: Entry): entry is FileEntry {
+        return !entry.directory && !!entry.filename.match(/.+\.wad/i)
+    }
+
+    private static isDataFileEntry(entry: Entry): entry is FileEntry {
+        return !entry.directory && !!entry.filename.match(/Rock Raiders\/Data/i)
+    }
 }