Remove redundant unzip dependency

Author: sunnylqm

bun.lock

@@ -74,7 +74,6 @@
     "gradle-to-js": "^2.0.1",
     "i18next": "^26.0.4",
     "isomorphic-git": "^1.37.5",
-    "isomorphic-unzip": "^1.1.5",
     "node-fetch": "^2.6.1",
     "plist": "^3.1.0",
     "progress": "^2.0.3",

package.json

@@ -1,17 +1,12 @@
 import path from 'path';
-import { decodeNullUnicode } from './utils';
-
-const Unzip = require('isomorphic-unzip');
-
 import { enumZipEntries, readEntry } from '../zip-entries';
+import { decodeNullUnicode } from './utils';
 
 export class Zip {
   file: string | File;
-  unzip: any;
 
   constructor(file: string | File) {
     this.file = typeof file === 'string' ? path.resolve(file) : file;
-    this.unzip = new Unzip(this.file);
   }
 
   /**
@@ -24,15 +19,7 @@ export class Zip {
     type: 'buffer' | 'blob' = 'buffer',
   ) {
     const decoded = regexps.map((regex) => decodeNullUnicode(regex));
-    return new Promise<Record<string, Buffer | Blob>>((resolve, reject) => {
-      this.unzip.getBuffer(
-        decoded,
-        { type },
-        (err: Error | null, buffers: Record<string, Buffer | Blob>) => {
-          err ? reject(err) : resolve(buffers);
-        },
-      );
-    });
+    return this.readEntries(decoded, type);
   }
 
   /**
@@ -42,15 +29,9 @@ export class Zip {
    */
   getEntry(regex: RegExp | string, type: 'buffer' | 'blob' = 'buffer') {
     const decoded = decodeNullUnicode(regex);
-    return new Promise<Buffer | Blob | undefined>((resolve, reject) => {
-      this.unzip.getBuffer(
-        [decoded],
-        { type },
-        (err: Error | null, buffers: Record<string, Buffer | Blob>) => {
-          err ? reject(err) : resolve(buffers[decoded as any]);
-        },
-      );
-    });
+    return this.readEntries([decoded], type).then(
+      (buffers) => buffers[decoded as any],
+    );
   }
 
   async getEntryFromHarmonyApp(
@@ -71,4 +52,40 @@ export class Zip {
       console.error('Error in getEntryFromHarmonyApp:', error);
     }
   }
+
+  private async readEntries(
+    decoded: Array<RegExp | string>,
+    type: 'buffer' | 'blob',
+  ): Promise<Record<string, Buffer | Blob>> {
+    if (typeof this.file !== 'string') {
+      throw new Error('Param error: [file] must be file path in Node.');
+    }
+
+    const buffers: Record<string, Buffer | Blob> = {};
+    await enumZipEntries(this.file, async (entry, zipFile) => {
+      if (entry.fileName.endsWith('/')) {
+        return;
+      }
+
+      const entryName = decodeNullUnicode(entry.fileName).toString();
+      const lowerEntryName = entryName.toLowerCase();
+      const matched = decoded.find((pattern) => {
+        if (typeof pattern === 'string') {
+          return pattern === entryName || pattern === lowerEntryName;
+        }
+        pattern.lastIndex = 0;
+        return pattern.test(lowerEntryName);
+      });
+
+      if (!matched) {
+        return;
+      }
+
+      const buffer = await readEntry(entry, zipFile);
+      buffers[matched as any] =
+        type === 'blob' ? new Blob([buffer as any]) : buffer;
+    });
+
+    return buffers;
+  }
 }

src/utils/app-info-parser/zip.ts

@@ -0,0 +1,61 @@
+import { afterEach, beforeEach, describe, expect, test } from 'bun:test';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import { ZipFile as YazlZipFile } from 'yazl';
+import { Zip } from '../src/utils/app-info-parser/zip';
+
+function mkTempDir(prefix: string): string {
+  return fs.mkdtempSync(path.join(os.tmpdir(), prefix));
+}
+
+async function writeZip(
+  zipPath: string,
+  entries: Record<string, string>,
+): Promise<void> {
+  await new Promise<void>((resolve, reject) => {
+    const zipFile = new YazlZipFile();
+    for (const [name, content] of Object.entries(entries)) {
+      zipFile.addBuffer(Buffer.from(content), name);
+    }
+    zipFile.outputStream.on('error', reject);
+    zipFile.outputStream.pipe(fs.createWriteStream(zipPath)).on('close', () => {
+      resolve();
+    });
+    zipFile.end();
+  });
+}
+
+describe('app-info-parser Zip', () => {
+  let tempRoot = '';
+
+  beforeEach(() => {
+    tempRoot = mkTempDir('rn-update-app-info-zip-');
+  });
+
+  afterEach(() => {
+    if (tempRoot && fs.existsSync(tempRoot)) {
+      fs.rmSync(tempRoot, { recursive: true, force: true });
+    }
+  });
+
+  test('reads entries by regex and string with compatible keys', async () => {
+    const zipPath = path.join(tempRoot, 'app.zip');
+    await writeZip(zipPath, {
+      'AndroidManifest.xml': 'manifest',
+      'res/icon.png': 'icon',
+    });
+
+    const manifestRegex = /^androidmanifest\.xml$/;
+    const buffers = await new Zip(zipPath).getEntries([
+      manifestRegex,
+      'res/icon.png',
+    ]);
+
+    expect(Buffer.isBuffer(buffers[manifestRegex as any])).toBe(true);
+    expect((buffers[manifestRegex as any] as Buffer).toString()).toBe(
+      'manifest',
+    );
+    expect((buffers['res/icon.png'] as Buffer).toString()).toBe('icon');
+  });
+});