Switch to use fflate instead of JSZip

lib.js: 106,360 => 17,079 (-84%)
nesemu.js: 211,357 => 96,476 (-54%)

nodejs/package.json

@@ -23,6 +23,6 @@
   },
   "dependencies": {
     "@kmamal/sdl": "~0.9.5",
-    "jszip": "~3.10.1"
+    "fflate": "~0.8.2"
   }
 }

nodejs/src/main.ts

@@ -1,13 +1,14 @@
 const fs = __non_webpack_require__('fs').promises
 
-import JSZip from 'jszip'
+import {unzip, AsyncUnzipOptions, Unzipped} from 'fflate'
 import {Nes, NesEvent} from '../../src/nes/nes'
 import {Cartridge} from '../../src/nes/cartridge'
 import {IDeltaModulationChannel, INoiseChannel, IPulseChannel, PadValue, WaveType} from '../../src/nes/apu'
 import {Util} from '../../src/util/util'
 import {AudioManager} from '../../src/util/audio_manager'
 
 import {AudioContext} from './audio_context'
+import util from 'util'
 
 const sdl = __non_webpack_require__('@kmamal/sdl')
 
@@ -277,12 +278,16 @@ async function loadNesRomData(fileName: string): Promise<Uint8Array> {
 
   case 'zip':
     {
-      const data = await fs.readFile(fileName)
-      const zip = new JSZip()
-      const loadedZip = await zip.loadAsync(data)
-      for (let fn of Object.keys(loadedZip.files)) {
-        if (Util.getExt(fn).toLowerCase() === 'nes')
-          return loadedZip.files[fn].async('uint8array')
+      const buffer = await fs.readFile(fileName)
+      const options = {
+        filter(file: any) {
+          return Util.getExt(file.name).toLowerCase() === 'nes'
+        }
+      }
+      const loadedZip = await util.promisify<Uint8Array, AsyncUnzipOptions, Unzipped>(unzip)(buffer, options)
+      for (let fn of Object.keys(loadedZip)) {
+        // if (Util.getExt(fn).toLowerCase() === 'nes')
+        return loadedZip[fn]
       }
       return Promise.reject(`No .nes file included in ${fileName}`)
     }

package.json

@@ -88,8 +88,8 @@
   "dependencies": {
     "core-js": "~3.30.1",
     "escape-html": "~1.0.3",
+    "fflate": "~0.8.2",
     "fscreen": "~1.2.0",
-    "jszip": "~3.10.1",
     "md5": "~2.3.0",
     "stats-js": "~1.0.1",
     "stream": "~0.0.2"

src/main.ts

@@ -13,7 +13,7 @@ import {Util} from './util/util'
 import {WindowManager} from './wnd/window_manager'
 import {Nes} from './nes/nes'
 import './util/polyfill'
-import JSZip from 'jszip'
+import {unzip, Unzipped} from 'fflate'
 
 import audioOnImg from './res/audio_on.png'
 import audioOffImg from './res/audio_off.png'
@@ -152,17 +152,34 @@ class Main {
         return false
       })
       .map(async ({file, ext}) => {
+        function promisify(f: Function) {
+          return (...args: any[]) =>  {
+            return new Promise<Unzipped>((resolve, reject) => {
+              f(...args, (err: any, result: any) => {
+                if (err != null)
+                  reject(err)
+                else
+                  resolve(result)
+              })
+            })
+          }
+        }
+
         if (ext === 'zip') {
           const binary = await DomUtil.loadFile(file)
-          const zip = new JSZip()
-          const loadedZip = await zip.loadAsync(binary)
-          for (const fileName2 of Object.keys(loadedZip.files)) {
-            const ext2 = Util.getExt(fileName2).toLowerCase()
-            if (kTargetExts.has(ext2)) {
-              const unzipped = await loadedZip.files[fileName2].async('uint8array')
-              return {type: ext2, binary: unzipped, fileName: fileName2}
+          const options = {
+            filter(file: any) {
+              const ext2 = Util.getExt(file.name).toLowerCase()
+              return kTargetExts.has(ext2)
             }
           }
+          const loadedZip = await promisify(unzip)(binary, options)
+          for (const fileName2 of Object.keys(loadedZip)) {
+            const ext2 = Util.getExt(fileName2).toLowerCase()
+            console.assert(kTargetExts.has(ext2))  // Already filtered.
+            const unzipped = loadedZip[fileName2]
+            return {type: ext2, binary: unzipped, fileName: fileName2}
+          }
           return Promise.reject(`No .nes file included: ${file.name}`)
         } else if (kTargetExts.has(ext)) {
           const binary = await DomUtil.loadFile(file)

tools/dmc2wav.ts

@@ -2,8 +2,9 @@ import fs from 'node:fs/promises'
 import * as fsNonPromise from 'fs'
 import path from 'path'
 import tty from 'tty'
-import JSZip from 'jszip'
+import {unzip, AsyncUnzipOptions, Unzipped} from 'fflate'
 import wav from 'node-wav'
+import util from 'util'
 
 import {Cartridge} from '../src/nes/cartridge'
 import {DeltaModulationSampler, kDmcRateTable} from '../src/util/audio/delta_modulation_sampler'
@@ -103,14 +104,16 @@ async function loadNesRomData(romFileName: string): Promise<Uint8Array> {
   case '.zip':
     {
       const buffer = await fs.readFile(romFileName)
-      const zip = new JSZip()
-      const loadedZip = await zip.loadAsync(buffer)
-      for (let fileName of Object.keys(loadedZip.files)) {
-        if (path.extname(fileName).toLowerCase() === '.nes') {
-          const unzipped = await loadedZip.files[fileName].async('uint8array')
-          return unzipped
+      const options = {
+        filter(file: any) {
+          return path.extname(file.name).toLowerCase() === '.nes'
         }
       }
+      const loadedZip = await util.promisify<Uint8Array, AsyncUnzipOptions, Unzipped>(unzip)(buffer, options)
+      for (let fileName of Object.keys(loadedZip)) {
+        const unzipped = loadedZip[fileName]
+        return unzipped
+      }
     }
     console.error(`${romFileName}: .nes not included`)
     break

tools/getmapperno.ts

@@ -1,6 +1,7 @@
 import fs from 'node:fs/promises'
 import path from 'path'
-import JSZip from 'jszip'
+import {unzip, AsyncUnzipOptions, Unzipped} from 'fflate'
+import util from 'util'
 
 import {Cartridge} from '../src/nes/cartridge'
 
@@ -22,15 +23,17 @@ async function dumpMapper(fn: string): Promise<void> {
   case '.zip':
     {
       const buffer = await fs.readFile(fn)
-      const zip = new JSZip()
-      const loadedZip = await zip.loadAsync(buffer)
-      for (let fileName of Object.keys(loadedZip.files)) {
-        if (path.extname(fileName).toLowerCase() === '.nes') {
-          const unzipped = await loadedZip.files[fileName].async('uint8array')
-          console.log(`"${path.basename(fn)}"\tmapper=${getMapperNo(unzipped)}`)
-          return
+      const options = {
+        filter(file: any) {
+          return path.extname(file.name).toLowerCase() === '.nes'
         }
       }
+      const loadedZip = await util.promisify<Uint8Array, AsyncUnzipOptions, Unzipped>(unzip)(buffer, options)
+      for (let fileName of Object.keys(loadedZip)) {
+        const unzipped = loadedZip[fileName]
+        console.log(`"${path.basename(fn)}"\tmapper=${getMapperNo(unzipped)}`)
+        return
+      }
     }
     console.error(`${fn}: .nes not included`)
     break