gf-packages-cli 1.0.4 → 1.0.6

package/bin/cli.js

@@ -5,15 +5,21 @@ const pkg = require('../package.json');
 const showMenu = require('../src/index.js');
 const exportCommand = require('../src/exportPackage.js');
 const deleteCommand = require('../src/deletePackage.js');
+const autoUpdate = require('../lib/common/updateCheck.js');
 
 program
   .version(pkg.version, '-v, --version', '查看版本')
   .helpOption('-h, --help', '查看帮助');
 
+// 每次执行前先检查更新（-v/-h 不触发，直接退出）
+program.hook('preAction', async () => {
+  await autoUpdate();
+});
+
 // 注册 export 子命令
 program.addCommand(exportCommand);
 // 注册 delete 子命令
-program.addCommand(deleteCommand);  
+program.addCommand(deleteCommand);
 // 无子命令时，显示菜单
 program
   .action(() => {

package/lib/common/appCommon.js

@@ -4,25 +4,49 @@ const { runAdbSync } = require('../tools/adb.js');
 
 // ===================== 业务逻辑 =====================
 
+// 白名单：这些包不会出现在列表中，避免误删
+const PACKAGE_WHITELIST = [
+    'com.google.android.verifier',
+    'com.google.android.contactkeys',
+    'com.google.android.safetycore',
+    'com.zggb.self.check',
+    'com.cloudcontrol'
+];
+
 async function getThirdPartyPackages(deviceId) {
     console.log(chalk.gray('[1] 读取手机第三方应用列表...'));
     const raw = await runAdbSync(deviceId, 'shell pm list packages -3');
     const pkgList = raw.split(/\r?\n/)
         .map(line => line.trim())
         .filter(line => line.startsWith('package:'))
-        .map(line => line.replace('package:', ''));
-    return [...new Set(pkgList)];
+        .map(line => line.replace('package:', ''))
+        .filter(pkg => !PACKAGE_WHITELIST.includes(pkg));
+    const result = [...new Set(pkgList)];
+    if (result.length === 0) {
+        console.log(chalk.yellow('当前无第三方应用'));
+        process.exit(0);
+    }
+    return result;
 }
 
 
 async function selectPackages(pkgList,message) {
+  const ALL_VALUE = '__ALL__';
   const { selectedPkgs } = await inquirer.prompt([{
     type: 'checkbox',
     name: 'selectedPkgs',
     message: message,
-    choices: pkgList.map(pkg => ({ name: pkg, value: pkg })),
+    choices: [
+      { name: chalk.green('全选'), value: ALL_VALUE },
+      new inquirer.Separator(),
+      ...pkgList.map(pkg => ({ name: pkg, value: pkg })),
+    ],
     pageSize: 15
   }]);
+  // 选中"全选"时返回全部包
+  if (selectedPkgs.includes(ALL_VALUE)) {
+    return pkgList;
+  }
   if (selectedPkgs.length === 0) {
     console.log(chalk.yellow('未选择任何应用，程序退出'));
     process.exit(0);

package/lib/common/updateCheck.js

@@ -0,0 +1,66 @@
+const { execSync } = require('child_process');
+const chalk = require('chalk').default;
+const inquirer = require('inquirer');
+const pkg = require('../../package.json');
+
+const PKG_NAME = pkg.name;
+const CURRENT_VERSION = pkg.version;
+const REGISTRY_URL = `https://registry.npmjs.org/${PKG_NAME}/latest`;
+
+// 请求 npm registry 获取最新版本号，失败返回 null（静默跳过，不阻塞工具使用）
+async function getLatestVersion() {
+  try {
+    const res = await fetch(REGISTRY_URL, { signal: AbortSignal.timeout(3000) });
+    if (!res.ok) return null;
+    const data = await res.json();
+    return data.version || null;
+  } catch {
+    return null;
+  }
+}
+
+// 判断 latest 是否比当前版本新
+function isNewer(latest) {
+  if (!latest) return false;
+  const cur = CURRENT_VERSION.split('.').map(Number);
+  const lat = latest.split('.').map(Number);
+  for (let i = 0; i < Math.max(cur.length, lat.length); i++) {
+    const a = cur[i] || 0;
+    const b = lat[i] || 0;
+    if (b > a) return true;
+    if (b < a) return false;
+  }
+  return false;
+}
+
+/**
+ * 启动时自更新检查：发现新版本则提示用户，确认后自动全局更新
+ */
+async function autoUpdate() {
+  const latest = await getLatestVersion();
+  if (!latest) return;
+  if (!isNewer(latest)) return;
+
+  console.log(chalk.yellow(`\n发现新版本: v${CURRENT_VERSION} -> v${latest}`));
+  const { shouldUpdate } = await inquirer.prompt([{
+    type: 'confirm',
+    name: 'shouldUpdate',
+    message: '是否现在自动更新？',
+    default: true
+  }]);
+
+  if (!shouldUpdate) {
+    console.log(chalk.gray(`已跳过更新，仍使用 v${CURRENT_VERSION}`));
+    return;
+  }
+
+  console.log(chalk.cyan(`正在自动更新 ${PKG_NAME}...`));
+  try {
+    execSync(`npm install -g ${PKG_NAME}@latest`, { stdio: 'inherit' });
+    console.log(chalk.green(`✅ 更新完成，请重启命令以使用 v${latest}`));
+  } catch (err) {
+    console.log(chalk.red(`更新失败: ${err.message}`));
+  }
+}
+
+module.exports = autoUpdate;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "gf-packages-cli",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "bin": {
-    "gf-packages-cli": "./bin/cli.js"
+    "gf-packages-cli": "bin/cli.js"
   },
   "dependencies": {
     "adbkit-apkreader": "^3.2.0",

package/src/deletePackage.js

@@ -23,6 +23,11 @@ async function runDelete(options = {}) {
     // 实现卸载应用的逻辑
     for (const pkg of selectedPkgs) {
         await runAdbSync(targetDevice, `shell pm uninstall ${pkg}`);
+        await runAdbSync(targetDevice, `shell rm -rf /sdcard/Download/${pkg}.zip`);
+        await runAdbSync(targetDevice, `shell rm -rf /sdcard/Download/${pkg}.apk`);
+        await runAdbSync(targetDevice, `shell rm -rf /sdcard/Download/${pkg}.apks`);
+        await runAdbSync(targetDevice, `shell rm -rf /sdcard/Download/${pkg}.xapk`);
+        await runAdbSync(targetDevice, `shell rm -rf /sdcard/Download/${pkg}`);
         console.log(chalk.green(`已卸载应用: ${pkg}`));
     }
     console.log(chalk.green('所有应用卸载完成'));

package/src/exportPackage.js

@@ -5,7 +5,6 @@ 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');
@@ -96,7 +95,7 @@ function buildApks(tmpDir, targetApksPath) {
     if (apkFiles.length === 0) return resolve(false);
 
     const output = fs.createWriteStream(targetApksPath);
-    const archive = archiver('zip', { zlib: { level: 0 } });
+    const archive = new archiver.ZipArchive();
 
     output.on('close', () => resolve(true));
     archive.on('error', reject);