ee-bin 4.1.3 → 4.1.5

package/package.json

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

package/tools/incrUpdater.js

@@ -3,10 +3,12 @@
 const path = require('path');
 const fs = require('fs');
 const fsPro = require('fs-extra');
-const crypto = require('crypto')
+const crypto = require('crypto');
 const chalk = require('chalk');
 const { loadConfig, getPackage, writeJsonSync } = require('../lib/utils');
-const admZip = require('adm-zip')
+const admZip = require('adm-zip');
+const globby = require('globby');
+
 
 /**
  * 增量升级
@@ -90,11 +92,16 @@ class IncrUpdater {
     zip.addLocalFile(asarFilePath); 
     // 添加 extraResources
     if (cfg.extraResources && cfg.extraResources.length > 0) {
-      for (const extraRes of cfg.extraResources) {
+      const files = globby.sync(cfg.extraResources, { cwd: homeDir });
+      for (const extraRes of files) {
         const extraResPath = path.normalize(path.join(homeDir, extraRes));
-        if (fs.existsSync(extraResPath)) {
-          zip.addLocalFile(extraResPath, "extraResources");
+        if (!fs.existsSync(extraResPath)) {
+          continue;
         }
+        const extraResDir = path.dirname(extraResPath);
+        const index = extraResDir.indexOf('extraResources');
+        const zipFileDir = extraResDir.substring(index);
+        zip.addLocalFile(extraResPath, zipFileDir);
       }
     }
 

package/tools/serve.js

@@ -3,13 +3,14 @@
 const debug = require('debug')('ee-bin:serve');
 const path = require('path');
 const fsPro = require('fs-extra');
-const { loadConfig } = require('../lib/utils');
+const { loadConfig, isWindows } = require('../lib/utils');
 const is = require('is-type-of');
 const chalk = require('chalk');
 const crossSpawn = require('cross-spawn');
 const { buildSync } = require('esbuild');
 const chokidar = require('chokidar');
 const kill = require('tree-kill');
+const process = require("process");
 
 class ServeProcess {
 
@@ -18,6 +19,48 @@ class ServeProcess {
     this.execProcess = {};
     this.electronDir = './electron';
     this.defaultBundleDir = './public/electron';
+    this._init();
+  }
+
+  /**
+   * init 
+   */  
+  _init() {
+    // process manager
+    // Monitor SIGINT signal（Ctrl + C）
+    process.on('SIGINT', () => {
+      console.log(chalk.blue('[ee-bin] ') + `Received SIGINT. Closing processes...`);
+      this._closeProcess();
+    });
+
+    // Monitor SIGTERM signal
+    process.on('SIGTERM', () => {
+      console.log(chalk.blue('[ee-bin] ') + `Received SIGTERM. Closing processes...`);
+      this._closeProcess();
+    });
+  }  
+
+  // Close process
+  async _closeProcess() {
+    const currentProcess = [];
+    const keys = Object.keys(this.execProcess);
+    const len = keys.length;
+    for (let i = 0; i < len; i++) {
+      const key = keys[i];
+      const p = this.execProcess[key];
+      currentProcess.push({
+        name: key,
+        pid: p.pid,
+      });
+    }
+
+    // Cleaning work before the end of the process
+    await this.sleep(1000);
+    currentProcess.forEach((p) => {
+      kill(p.pid);
+      debug(`Kill ${chalk.blue(p.name)} server, pid: ${p.pid}`);
+    });
+    process.exit(0);
   }
 
   /**
@@ -53,7 +96,8 @@ class ServeProcess {
           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] ') + 'File ' + chalk.cyan(`[${f}]`) + 'has been changed');
+          console.log(chalk.blue('[ee-bin] [dev] ') + `File [${chalk.cyan(f)}] has been changed`);
 
           // 防抖
           if (debounceTimer) {
@@ -172,7 +216,7 @@ class ServeProcess {
       const cfg = binCmdConfig[cmd];
 
       if (!cfg) {
-        console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.red(`Error: [${binCmd} ${cmd}] config does not exist` ));
+        console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.red(`Error: [${cmd}] config does not exist` ));
         continue;
       }
 
@@ -181,8 +225,8 @@ class ServeProcess {
         continue;
       }
 
-      console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + "Run " + chalk.green(`[${binCmd} ${cmd}]` + " command"));
-      console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.green('config:'), JSON.stringify(cfg));
+      console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + `Run ${chalk.green(cmd)} command`);
+      console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.magenta('Config:'), JSON.stringify(cfg));
 
       const execDir = path.join(process.cwd(), cfg.directory);
       const execArgs = is.string(cfg.args) ? [cfg.args] : cfg.args;
@@ -195,15 +239,18 @@ class ServeProcess {
         execArgs,
         { stdio: stdio, cwd: execDir, maxBuffer: 1024 * 1024 * 1024 },
       );
-      console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + 'The ' + chalk.green(`[${binCmd} ${cmd}]`) + ` command is ${cfg.sync ? 'run completed' : 'running'}`);
+      console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + 'The ' + chalk.green(`${cmd}`) + ` command is ${cfg.sync ? 'run completed' : 'running'}`);
 
       if(!cfg.sync) {
         this.execProcess[cmd].on('exit', () => {
-          if (cmd == 'electron') {
-            console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.green('Press "CTRL+C" to exit'));
+          if (binCmd == 'dev') {
+            console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + `The ${chalk.green(cmd)} process is exiting`);
+            if (isWindows() && cmd == 'electron') {
+              console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.green('Press "CTRL+C" to exit'));
+            }
             return
           }
-          console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + 'The ' + chalk.green(`[${binCmd} ${cmd}]`) + ' command has been executed and exited');
+          console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + `The ${chalk.green(cmd)} command has been executed and exited`);
         });
       }
     }