ee-bin 4.0.1 → 4.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-bin",
-  "version": "4.0.1",
+  "version": "4.1.1",
   "description": "ee bin",
   "main": "index.js",
   "scripts": {

package/tools/incrUpdater.js

@@ -2,9 +2,10 @@
 
 const path = require('path');
 const fs = require('fs');
+const fsPro = require('fs-extra');
 const crypto = require('crypto')
 const chalk = require('chalk');
-const { loadConfig, rm, getPackage, writeJsonSync } = require('../lib/utils');
+const { loadConfig, getPackage, writeJsonSync } = require('../lib/utils');
 const admZip = require('adm-zip')
 
 /**
@@ -14,6 +15,16 @@ const admZip = require('adm-zip')
 
 class IncrUpdater {
 
+  constructor() {
+    this.tmpAppDirs = [
+      'mac',
+      'mac-arm64',
+      'win-unpacked',
+      'win-ia32-unpacked',
+      'linux-unpacked'
+    ];
+  }
+
   /**
    * 执行
    */  
@@ -50,14 +61,6 @@ class IncrUpdater {
     let asarFilePath = "";
     if (asarFile) {
       asarFilePath = path.normalize(path.join(homeDir, asarFile));
-    } else if (Array.isArray(cfg.asarFile)) {  
-      // 检查文件列表，如果存在就跳出
-      for (const filep of cfg.asarFile) {
-        asarFilePath = path.normalize(path.join(homeDir, filep));
-        if (fs.existsSync(asarFilePath)) {
-          break;
-        }
-      }
     } else {
       asarFilePath = path.normalize(path.join(homeDir, cfg.asarFile));
     }
@@ -119,11 +122,10 @@ class IncrUpdater {
 
     // 删除缓存文件，防止生成的 zip 是旧版本
     if (cfg.cleanCache) {
-      rm(path.join(homeDir, cfg.output.directory, 'mac'));
-      rm(path.join(homeDir, cfg.output.directory, 'mac-arm64'));
-      rm(path.join(homeDir, cfg.output.directory, 'win-unpacked'));
-      rm(path.join(homeDir, cfg.output.directory, 'win-ia32-unpacked'));
-      rm(path.join(homeDir, cfg.output.directory, 'linux-unpacked'));
+      this.tmpAppDirs.forEach(dir => {
+        const dirPath = path.join(homeDir, cfg.output.directory, dir);
+        fsPro.removeSync(dirPath);
+      });
     }  
   }
   

package/tools/serve.js

@@ -47,34 +47,39 @@ class ServeProcess {
       // watche electron main code
       const electronConfig = binCmdConfig.electron;
       if (electronConfig.watch) {
+        let debounceTimer = null;
         const cmd = 'electron';
         const watcher = chokidar.watch([this.electronDir], {
           persistent: true
         });
         watcher.on('change', async (f) => {
           console.log(chalk.blue('[ee-bin] [dev] ') + `File ${f} has been changed`);
-          console.log(chalk.blue('[ee-bin] [dev] ') + `Restart ${cmd}`);
-
-          // rebuild code
-          this.bundle(binCfg.build.electron);
-          let subPorcess = this.execProcess[cmd];
-          kill(subPorcess.pid, 'SIGKILL', (err) => {
-            if (err) {
-              console.log(chalk.red('[ee-bin] [dev] ') + `Restart failed, error: ${err}`);
-              process.exit(-1);
-            }
-          })
-          delete this.execProcess[cmd];
-  
-          // restart electron command
-          setTimeout(() => {
-            let onlyElectronOpt = {
-              binCmd,
-              binCmdConfig,
-              command: cmd,
-            }
-            this.multiExec(onlyElectronOpt);
-          }, electronConfig.delay);
+
+          // 防抖
+          if (debounceTimer) {
+            clearTimeout(debounceTimer);
+          }
+          debounceTimer = setTimeout(async () => {
+            // rebuild code
+            console.log(chalk.blue('[ee-bin] [dev] ') + `Restart ${cmd}`);
+            this.bundle(binCfg.build.electron);
+            let subPorcess = this.execProcess[cmd];
+            kill(subPorcess.pid, 'SIGKILL', (err) => {
+              if (err) {
+                console.log(chalk.red('[ee-bin] [dev] ') + `Restart failed, error: ${err}`);
+                process.exit(-1);
+              }
+              delete this.execProcess[cmd];
+
+              // restart electron command
+              let onlyElectronOpt = {
+                binCmd,
+                binCmdConfig,
+                command: cmd,
+              }
+              this.multiExec(onlyElectronOpt);
+            })                     
+          }, electronConfig.delay);  
         });
       }