gf-packages-cli 1.0.3 → 1.0.5

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "gf-packages-cli",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "bin": {
     "gf-packages-cli": "./bin/cli.js"
   },
   "dependencies": {
     "adbkit-apkreader": "^3.2.0",
     "adm-zip": "^0.5.18",
+    "archiver": "^8.0.0",
     "chalk": "^5.6.2",
     "commander": "^15.0.0",
     "ejs": "^6.0.1",

package/src/exportPackage.js

@@ -5,7 +5,7 @@ const { execSync, spawn } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
-const AdmZip = require('adm-zip');
+const archiver = require('archiver');
 const { getDeviceList, selectDevice, runAdbSync } = require('../lib/tools/adb.js');
 const { getThirdPartyPackages, selectPackages } = require('../lib/common/appCommon.js');
 const REMOTE_APK_SUFFIX = '.apk';
@@ -88,14 +88,22 @@ async function pullApk(deviceId, remotePath, localSavePath, onProgress) {
 }
 
 function buildApks(tmpDir, targetApksPath) {
-  const zip = new AdmZip();
-  const apkFiles = fs.readdirSync(tmpDir)
-    .filter(f => f.endsWith(REMOTE_APK_SUFFIX))
-    .map(f => path.join(tmpDir, f));
-  if (apkFiles.length === 0) return false;
-  apkFiles.forEach(file => zip.addLocalFile(file));
-  zip.writeZip(targetApksPath);
-  return true;
+  return new Promise((resolve, reject) => {
+    const apkFiles = fs.readdirSync(tmpDir)
+      .filter(f => f.endsWith(REMOTE_APK_SUFFIX))
+      .map(f => path.join(tmpDir, f));
+    if (apkFiles.length === 0) return resolve(false);
+
+    const output = fs.createWriteStream(targetApksPath);
+    const archive = new archiver.ZipArchive();
+
+    output.on('close', () => resolve(true));
+    archive.on('error', reject);
+
+    archive.pipe(output);
+    apkFiles.forEach(file => archive.file(file, { name: path.basename(file) }));
+    archive.finalize();
+  });
 }
 
 // ===================== 单个包导出 =====================
@@ -139,7 +147,7 @@ async function exportSinglePackage(deviceId, pkg, tmpBase, outputRoot) {
 
   const apksFileName = `${pkg}_${version}.apks`;
   const targetApksPath = path.join(outputRoot, apksFileName);
-  const buildSuccess = buildApks(tmpDir, targetApksPath);
+  const buildSuccess = await buildApks(tmpDir, targetApksPath);
 
   if (buildSuccess) {
     console.log(chalk.green(`✅ 导出完成: ${apksFileName}`));