admzip far faster than jszip. use that in node

Author: willwade

src/processors/touchchatProcessor.ts

@@ -22,6 +22,7 @@ import { ValidationResult } from '../validation/validationTypes';
 import {
   ProcessorInput,
   getFs,
+  getNodeRequire,
   getOs,
   getPath,
   isNodeRuntime,
@@ -38,30 +39,7 @@ import {
   requireBetterSqlite3,
   type SqliteDatabaseAdapter,
 } from '../utils/sqlite';
-import type JSZip from 'jszip';
-
-type JSZipStatic = typeof JSZip;
-let JSZipModuleTouchChat: JSZipStatic | undefined;
-async function getJSZipTouchChat(): Promise<JSZipStatic> {
-  if (!JSZipModuleTouchChat) {
-    try {
-      const module = await import('jszip');
-      JSZipModuleTouchChat = module.default || module;
-    } catch (error) {
-      try {
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const module = require('jszip');
-        JSZipModuleTouchChat = module.default || module;
-      } catch {
-        throw new Error('Zip handling requires JSZip in this environment.');
-      }
-    }
-  }
-  if (!JSZipModuleTouchChat) {
-    throw new Error('Zip handling requires JSZip in this environment.');
-  }
-  return JSZipModuleTouchChat;
-}
+import { openZipFromInput } from '../utils/zip';
 
 interface TouchChatButton {
   id: number;
@@ -175,17 +153,12 @@ class TouchChatProcessor extends BaseProcessor {
 
       // Step 1: Unzip
       const zipInput = readBinaryFromInput(filePathOrBuffer);
-      const JSZip = await getJSZipTouchChat();
-      const zip = await JSZip.loadAsync(zipInput);
-      const vocabEntry = Object.keys(zip.files).find((name) => name.endsWith('.c4v'));
+      const { zip } = await openZipFromInput(zipInput);
+      const vocabEntry = zip.listFiles().find((name) => name.endsWith('.c4v'));
       if (!vocabEntry) {
         throw new Error('No .c4v vocab DB found in TouchChat export');
       }
-      const vocabFile = zip.file(vocabEntry);
-      if (!vocabFile) {
-        throw new Error('Failed to read .c4v vocab DB from TouchChat export');
-      }
-      const dbBuffer = await vocabFile.async('uint8array');
+      const dbBuffer = await zip.readFile(vocabEntry);
       const dbResult = await openSqliteDatabase(dbBuffer, { readonly: true });
       db = dbResult.db;
       cleanup = dbResult.cleanup;
@@ -1123,11 +1096,10 @@ class TouchChatProcessor extends BaseProcessor {
       db.close();
 
       // Create zip file with the database
-      const JSZip = await getJSZipTouchChat();
-      const zip = new JSZip();
-      zip.file('vocab.c4v', fs.readFileSync(dbPath));
-      const zipBuffer = await zip.generateAsync({ type: 'nodebuffer' });
-      fs.writeFileSync(outputPath, zipBuffer);
+      const AdmZip = getNodeRequire()('adm-zip') as typeof import('adm-zip');
+      const zip = new AdmZip();
+      zip.addLocalFile(dbPath, '', 'vocab.c4v');
+      zip.writeZip(outputPath);
     } finally {
       // Clean up
       if (fs.existsSync(tmpDir)) {

src/utils/zip.ts

@@ -0,0 +1,65 @@
+import { isNodeRuntime, readBinaryFromInput, getNodeRequire } from './io';
+
+export interface ZipAdapter {
+  listFiles(): string[];
+  readFile(name: string): Promise<Uint8Array>;
+}
+
+export async function openZipFromInput(
+  input: string | Uint8Array | ArrayBuffer | Buffer
+): Promise<{ zip: ZipAdapter }> {
+  if (typeof input === 'string') {
+    if (!isNodeRuntime()) {
+      throw new Error('Zip file paths are not supported in browser environments.');
+    }
+    const AdmZip = getNodeRequire()('adm-zip') as typeof import('adm-zip');
+    const admZip = new AdmZip(input);
+    return {
+      zip: {
+        listFiles: (): string[] => admZip.getEntries().map((entry) => entry.entryName),
+        readFile: (name: string): Promise<Uint8Array> => {
+          const entry = admZip.getEntry(name);
+          if (!entry) {
+            throw new Error(`Zip entry not found: ${name}`);
+          }
+          return Promise.resolve(entry.getData());
+        },
+      },
+    };
+  }
+
+  const data = readBinaryFromInput(input);
+
+  if (isNodeRuntime()) {
+    const AdmZip = getNodeRequire()('adm-zip') as typeof import('adm-zip');
+    const admZip = new AdmZip(Buffer.from(data));
+    return {
+      zip: {
+        listFiles: (): string[] => admZip.getEntries().map((entry) => entry.entryName),
+        readFile: (name: string): Promise<Uint8Array> => {
+          const entry = admZip.getEntry(name);
+          if (!entry) {
+            throw new Error(`Zip entry not found: ${name}`);
+          }
+          return Promise.resolve(entry.getData());
+        },
+      },
+    };
+  }
+
+  const module = await import('jszip');
+  const init = module.default || module;
+  const zip = await init.loadAsync(data);
+  return {
+    zip: {
+      listFiles: (): string[] => Object.keys(zip.files),
+      readFile: async (name: string): Promise<Uint8Array> => {
+        const file = zip.file(name);
+        if (!file) {
+          throw new Error(`Zip entry not found: ${name}`);
+        }
+        return file.async('uint8array');
+      },
+    },
+  };
+}