ee-bin 1.5.0 → 1.7.0-beta.1

package/tools/iconGen.js

@@ -1,183 +1,183 @@
-'use strict';
-
-const fs = require("fs");
-const path = require("path");
-const icongen = require("icon-gen");
-
-class IconGen {
-  constructor() {
-    this._init();
-  }
-
-  /**
-   * _init
-   */
-  _init() {
-    // ---> 处理参数
-    const args = process.argv.splice(3);
-    let params = {
-      input: "/public/images/logo.png",
-      output: "/build/icons/",
-      size: "16,32,64,256,512",
-      clear: false,
-      imagesDir: "/public/images/",
-    };
-    try {
-      const len = args.length;
-      for (let i = 0; i < len; i++) {
-        const arg = args[i];
-        if (arg.match(/^-i/) || arg.match(/^-input/)) {
-          params["input"] = args[i + 1];
-          i++;
-          continue;
-        }
-        if (arg.match(/^-o/) || arg.match(/^-output/)) {
-          params["output"] = args[i + 1];
-          i++;
-          continue;
-        }
-        if (arg.match(/^-s/) || arg.match(/^-size/)) {
-          params["size"] = args[i + 1];
-          i++;
-          continue;
-        }
-        if (arg.match(/^-c/) || arg.match(/^-clear/)) {
-          params["clear"] = true;
-          continue;
-        }
-        if (arg.match(/^-img/) || arg.match(/^-images/)) {
-          params["imagesDir"] = args[i + 1];
-          i++;
-          continue;
-        }
-      }
-    } catch (e) {
-      console.error("[ee-bin] [icon-gen] args: ", args);
-      console.error("[ee-bin] [icon-gen] ERROR: ", e);
-      throw new Error("参数错误!!");
-    }
-    this.params = params;
-
-    // ---> 组装参数
-    console.log("[ee-bin] [icon-gen] icon 当前路径: ", process.cwd());
-    this.input = path.join(process.cwd(), params.input);
-    this.output = path.join(process.cwd(), params.output);
-    this.imagesDir = path.join(process.cwd(), params.imagesDir);
-
-    const sizeList = params.size.split(",").map((item) => parseInt(item));
-    this.iconOptions = {
-      report: false,
-      ico: {
-        name: "icon",
-        sizes: [256],
-      },
-      favicon: {
-        name: "logo-",
-        pngSizes: sizeList,
-      },
-    };
-  }
-
-  /**
-   * 生成图标
-   */
-  generateIcons() {
-    console.log("[ee-bin] [icon-gen] iconGen 开始处理生成logo图片");
-    if (!fs.existsSync(this.input)) {
-      console.error("[ee-bin] [icon-gen] input: ", this.input);
-      throw new Error("输入的图片不存在或路径错误");
-    }
-    if (!fs.existsSync(this.output)) {
-      fs.mkdirSync(this.output, { recursive: true });
-    } else {
-      // 清空目录
-      this.params.clear && this.deleteGenFile(this.output);
-    }
-    if (!fs.existsSync(this.imagesDir)) {
-      fs.mkdirSync(this.imagesDir, { recursive: true });
-    }
-    icongen(this.input, this.output, this.iconOptions)
-      .then((results) => {
-        console.log("[ee-bin] [icon-gen] iconGen 已生成下方图片资源");
-        console.log(results);
-        this._renameForEE(results);
-      })
-      .catch((err) => {
-        console.error(err);
-        throw new Error("[ee-bin] [icon-gen] iconGen 生成失败!");
-      });
-  }
-
-  /**
-   * 删除生成的文件(.ico .png)
-   */  
-  deleteGenFile(dirPath) {
-    if (fs.existsSync(dirPath)) {
-      // 读取文件夹下的文件目录
-      const files = fs.readdirSync(dirPath);
-      files.forEach((file) => {
-        const curPath = path.join(dirPath, file);
-        // 判断是不是文件夹，如果是，继续递归
-        if (fs.lstatSync(curPath).isDirectory()) {
-          this.deleteGenFile(curPath);
-        } else {
-          // 删除文件
-          if ([".ico", ".png"].includes(path.extname(curPath))) {
-            fs.unlinkSync(curPath);
-          }
-        }
-      });
-    }
-  }
-
-  /**
-   * 为生成的资源重命名 (logo-32.png -> 32x32.png)
-   */    
-  _renameForEE(filesPath) {
-    console.log("[ee-bin] [icon-gen] iconGen 开始重新命名logo图片资源");
-    try {
-      const len = filesPath.length;
-      for (let i = 0; i < len; i++) {
-        const filePath = filesPath[i];
-        const extname = path.extname(filePath);
-        if ([".png"].includes(extname)) {
-          const filename = path.basename(filePath, extname);
-          const basename = filename.split("-")[1];
-          const dirname = path.dirname(filePath);
-          // 处理 tray 图标 --> 复制到 public/images 目录下
-          if ("16" === basename) {
-            const newName = "tray" + extname;
-            fs.copyFileSync(filePath, path.join(this.imagesDir, newName));
-            console.log(`${filename}${extname} --> ${this.params.imagesDir}/${newName} 复制成功!`);
-            fs.unlinkSync(filePath);
-            continue;
-          }
-          // 处理 win 窗口图标 --> 复制到 public/images 目录下
-          if ("32" === basename) {
-            const newName = filename + extname;
-            fs.copyFileSync(filePath, path.join(this.imagesDir, newName));
-            console.log(`${filename}${extname} --> ${this.params.imagesDir}/${newName} 复制成功!`);
-          }
-          // 重命名 --> 32x32.png
-          const newName = basename + "x" + basename + extname;
-          const newPath = path.join(dirname, newName);
-          fs.renameSync(filePath, newPath);
-          console.log(`${filename}${extname} --> ${newName} 重命名成功!`);
-        }
-      }
-      console.log("[ee-bin] [icon-gen] iconGen 资源处理完成!");
-    } catch (e) {
-      console.error("[ee-bin] [icon-gen] ERROR: ", e);
-      throw new Error("重命名logo图片资源失败!!");
-    }
-  }
-}
-
-const run = () => {
-  const i = new IconGen();
-  i.generateIcons();
-}
-
-module.exports = {
-  run,
+'use strict';
+
+const fs = require("fs");
+const path = require("path");
+const icongen = require("icon-gen");
+
+class IconGen {
+  constructor() {
+    this._init();
+  }
+
+  /**
+   * _init
+   */
+  _init() {
+    // ---> 处理参数
+    const args = process.argv.splice(3);
+    let params = {
+      input: "/public/images/logo.png",
+      output: "/build/icons/",
+      size: "16,32,64,256,512",
+      clear: false,
+      imagesDir: "/public/images/",
+    };
+    try {
+      const len = args.length;
+      for (let i = 0; i < len; i++) {
+        const arg = args[i];
+        if (arg.match(/^-i/) || arg.match(/^-input/)) {
+          params["input"] = args[i + 1];
+          i++;
+          continue;
+        }
+        if (arg.match(/^-o/) || arg.match(/^-output/)) {
+          params["output"] = args[i + 1];
+          i++;
+          continue;
+        }
+        if (arg.match(/^-s/) || arg.match(/^-size/)) {
+          params["size"] = args[i + 1];
+          i++;
+          continue;
+        }
+        if (arg.match(/^-c/) || arg.match(/^-clear/)) {
+          params["clear"] = true;
+          continue;
+        }
+        if (arg.match(/^-img/) || arg.match(/^-images/)) {
+          params["imagesDir"] = args[i + 1];
+          i++;
+          continue;
+        }
+      }
+    } catch (e) {
+      console.error("[ee-bin] [icon-gen] args: ", args);
+      console.error("[ee-bin] [icon-gen] ERROR: ", e);
+      throw new Error("参数错误!!");
+    }
+    this.params = params;
+
+    // ---> 组装参数
+    console.log("[ee-bin] [icon-gen] icon 当前路径: ", process.cwd());
+    this.input = path.join(process.cwd(), params.input);
+    this.output = path.join(process.cwd(), params.output);
+    this.imagesDir = path.join(process.cwd(), params.imagesDir);
+
+    const sizeList = params.size.split(",").map((item) => parseInt(item));
+    this.iconOptions = {
+      report: false,
+      ico: {
+        name: "icon",
+        sizes: [256],
+      },
+      favicon: {
+        name: "logo-",
+        pngSizes: sizeList,
+      },
+    };
+  }
+
+  /**
+   * 生成图标
+   */
+  generateIcons() {
+    console.log("[ee-bin] [icon-gen] iconGen 开始处理生成logo图片");
+    if (!fs.existsSync(this.input)) {
+      console.error("[ee-bin] [icon-gen] input: ", this.input);
+      throw new Error("输入的图片不存在或路径错误");
+    }
+    if (!fs.existsSync(this.output)) {
+      fs.mkdirSync(this.output, { recursive: true });
+    } else {
+      // 清空目录
+      this.params.clear && this.deleteGenFile(this.output);
+    }
+    if (!fs.existsSync(this.imagesDir)) {
+      fs.mkdirSync(this.imagesDir, { recursive: true });
+    }
+    icongen(this.input, this.output, this.iconOptions)
+      .then((results) => {
+        console.log("[ee-bin] [icon-gen] iconGen 已生成下方图片资源");
+        console.log(results);
+        this._renameForEE(results);
+      })
+      .catch((err) => {
+        console.error(err);
+        throw new Error("[ee-bin] [icon-gen] iconGen 生成失败!");
+      });
+  }
+
+  /**
+   * 删除生成的文件(.ico .png)
+   */  
+  deleteGenFile(dirPath) {
+    if (fs.existsSync(dirPath)) {
+      // 读取文件夹下的文件目录
+      const files = fs.readdirSync(dirPath);
+      files.forEach((file) => {
+        const curPath = path.join(dirPath, file);
+        // 判断是不是文件夹，如果是，继续递归
+        if (fs.lstatSync(curPath).isDirectory()) {
+          this.deleteGenFile(curPath);
+        } else {
+          // 删除文件
+          if ([".ico", ".png"].includes(path.extname(curPath))) {
+            fs.unlinkSync(curPath);
+          }
+        }
+      });
+    }
+  }
+
+  /**
+   * 为生成的资源重命名 (logo-32.png -> 32x32.png)
+   */    
+  _renameForEE(filesPath) {
+    console.log("[ee-bin] [icon-gen] iconGen 开始重新命名logo图片资源");
+    try {
+      const len = filesPath.length;
+      for (let i = 0; i < len; i++) {
+        const filePath = filesPath[i];
+        const extname = path.extname(filePath);
+        if ([".png"].includes(extname)) {
+          const filename = path.basename(filePath, extname);
+          const basename = filename.split("-")[1];
+          const dirname = path.dirname(filePath);
+          // 处理 tray 图标 --> 复制到 public/images 目录下
+          if ("16" === basename) {
+            const newName = "tray" + extname;
+            fs.copyFileSync(filePath, path.join(this.imagesDir, newName));
+            console.log(`${filename}${extname} --> ${this.params.imagesDir}/${newName} 复制成功!`);
+            fs.unlinkSync(filePath);
+            continue;
+          }
+          // 处理 win 窗口图标 --> 复制到 public/images 目录下
+          if ("32" === basename) {
+            const newName = filename + extname;
+            fs.copyFileSync(filePath, path.join(this.imagesDir, newName));
+            console.log(`${filename}${extname} --> ${this.params.imagesDir}/${newName} 复制成功!`);
+          }
+          // 重命名 --> 32x32.png
+          const newName = basename + "x" + basename + extname;
+          const newPath = path.join(dirname, newName);
+          fs.renameSync(filePath, newPath);
+          console.log(`${filename}${extname} --> ${newName} 重命名成功!`);
+        }
+      }
+      console.log("[ee-bin] [icon-gen] iconGen 资源处理完成!");
+    } catch (e) {
+      console.error("[ee-bin] [icon-gen] ERROR: ", e);
+      throw new Error("重命名logo图片资源失败!!");
+    }
+  }
+}
+
+const run = () => {
+  const i = new IconGen();
+  i.generateIcons();
+}
+
+module.exports = {
+  run,
 };

package/tools/incrUpdater.js

@@ -0,0 +1,133 @@
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const crypto = require('crypto')
+const chalk = require('chalk');
+const Utils = require('../lib/utils');
+const admZip = require('adm-zip')
+
+/**
+ * 增量升级
+ * @class
+ */
+
+module.exports = {
+  
+  /**
+   * 执行
+   */  
+  run(options = {}) {
+    console.log('[ee-bin] [updater] Start');
+    const { config, asarFile } = options;
+    const binCfg = Utils.loadConfig(config);
+    const cfg = binCfg.updater;
+
+    if (!cfg) {
+      console.log(chalk.blue('[ee-bin] [updater] ') + chalk.red(`Error: ${cfg} config does not exist`));
+      return;
+    }
+    console.log(chalk.blue('[ee-bin] [updater] ') + chalk.green('config:'), cfg);
+
+    this.generateFile(cfg, asarFile);
+
+    console.log('[ee-bin] [updater] End');
+  },
+
+  generateFile(cfg, asarFile) {
+    const latestVersionInfo = {}
+    const homeDir = process.cwd();
+
+    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));
+    }
+
+    if (!fs.existsSync(asarFilePath)) {
+      console.log(chalk.blue('[ee-bin] [updater] ') + chalk.red(`Error: ${asarFilePath} does not exist`));
+      return;
+    }
+
+    // 生成 zip
+    const asarZipPath = path.join(homeDir, cfg.output.directory, cfg.output.zip);
+    if (fs.existsSync(asarZipPath) && cfg.cleanCache) {
+      Utils.rm(asarZipPath);
+    }
+    const zip = new admZip();
+    zip.addLocalFile(asarFilePath); 
+    zip.writeZip(asarZipPath, (err) => {
+      if (err) {
+        console.log(chalk.blue('[ee-bin] [updater] create zip ') + chalk.red(`Error: ${err}`));
+      }
+    });
+
+    const sha1 = this.generateSha1(asarFilePath);
+    const packageJson = Utils.getPackage();
+    const version = packageJson.version;
+    const date = this._getFormattedDate();
+    const fileStat = fs.statSync(asarFilePath);
+
+    for (const item of cfg.platform) {
+      latestVersionInfo[item] = {
+        version: version,
+        file: cfg.output.zip,
+        size: fileStat.size,
+        sha1: sha1,
+        releaseDate: date,
+      };
+    }
+
+    const updaterJsonFilePath = path.join(homeDir, cfg.output.directory, cfg.output.file);
+    Utils.writeJsonSync(updaterJsonFilePath, latestVersionInfo);
+
+    // 删除缓存文件，防止生成的 zip 是旧版本
+    if (cfg.cleanCache) {
+      Utils.rm(path.join(homeDir, cfg.output.directory, 'mac'));
+      Utils.rm(path.join(homeDir, cfg.output.directory, 'win-unpacked'));
+    }  
+  },
+  
+  generateSha1(filepath = "") {
+    let sha1 = '';
+    if (filepath.length == 0) {
+      return sha1;
+    }
+
+    if (!fs.existsSync(filepath)) {
+      return sha1;
+    }
+
+    console.log(chalk.blue('[ee-bin] [updater] ') + `generate sha1 for filepath:${filepath}`);
+    try {
+      const buffer = fs.readFileSync(filepath);
+      const fsHash = crypto.createHash('sha1');
+      fsHash.update(buffer);
+      sha1 = fsHash.digest('hex');
+      return sha1;
+
+    } catch (error) {
+      console.log(chalk.blue('[ee-bin] [updater] ') + chalk.red(`Error: generate sha1 error!`));
+      console.log(chalk.blue('[ee-bin] [updater] ') + chalk.red(`Error: ${error}`));
+    }
+    return sha1;
+  },
+
+  _getFormattedDate() {
+    const date = new Date(); // 获取当前日期
+    const year = date.getFullYear(); // 获取年份
+    const month = (date.getMonth() + 1).toString().padStart(2, '0'); // 获取月份，月份从0开始计数
+    const day = date.getDate().toString().padStart(2, '0'); // 获取日
+  
+    return `${year}-${month}-${day}`; 
+  }
+}

package/tools/move.js

@@ -1,85 +1,85 @@
-'use strict';
-
-const path = require('path');
-const fs = require('fs');
-const fsPro = require('fs-extra');
-const chalk = require('chalk');
-const Utils = require('../lib/utils');
-
-/**
- * 移动资源
- */
-
- module.exports = {
-  
-  /**
-   * 执行
-   */  
-  run(options = {}) {
-    console.log('[ee-bin] [move] Start moving resources');
-    const homeDir = process.cwd();
-    const { config, flag } = options;
-    const binCfg = Utils.loadConfig(config);
-    
-    let flags;
-    const flagString = flag.trim();
-    if (flagString.indexOf(',') !== -1) {
-      flags = flagString.split(',');
-    } else {
-      flags = [flagString];
-    }
-
-    for (let i = 0; i < flags.length; i++) {
-      let f = flags[i];
-      let cfg = binCfg.move[f];
-
-      if (!cfg) {
-        console.log(chalk.blue('[ee-bin] [move] ') + chalk.red(`Error: ${f} config does not exist` ));
-        return;
-      }
-  
-      console.log(chalk.blue('[ee-bin] [move] ') + chalk.green(`Move flag: ${f}`));
-      console.log(chalk.blue('[ee-bin] [move] ') + chalk.green('config:'), cfg);
-
-      const distResource = path.join(homeDir, cfg.dist);
-      if (!fs.existsSync(distResource)) {
-        const errorTips = chalk.bgRed('Error') + ` ${cfg.dist} resource does not exist !`;
-        console.error(errorTips);
-        return
-      }
-
-      // clear the historical resource and copy it to the ee resource directory
-      const targetResource = path.join(homeDir, cfg.target);
-      if (fs.statSync(distResource).isDirectory() && !fs.existsSync(targetResource)) {
-        fs.mkdirSync(targetResource, {recursive: true, mode: 0o777});
-      } else {
-        this._rm(targetResource);
-        console.log('[ee-bin] [move] Clear history resources:', targetResource);
-      }
-
-      fsPro.copySync(distResource, targetResource);
-
-      // [todo] go project, special treatment of package.json, reserved only necessary
-      console.log(`[ee-bin] [move] Copy ${distResource} to ${targetResource}`);
-    }
-
-    console.log('[ee-bin] [move] End');
-  },
-
-  /**
-   * Delete a file or folder
-   */
-  _rm(name) {
-    // check
-    if (!fs.existsSync(name)) {
-      return
-    }
-
-    const nodeVersion = (process.versions && process.versions.node) || null;
-    if (nodeVersion && Utils.compareVersion(nodeVersion, '14.14.0') == 1) {
-      fs.rmSync(name, {recursive: true});
-    } else {
-      fs.rmdirSync(name, {recursive: true});
-    }
-  },
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const fsPro = require('fs-extra');
+const chalk = require('chalk');
+const Utils = require('../lib/utils');
+
+/**
+ * 移动资源
+ */
+
+ module.exports = {
+  
+  /**
+   * 执行
+   */  
+  run(options = {}) {
+    console.log('[ee-bin] [move] Start moving resources');
+    const homeDir = process.cwd();
+    const { config, flag } = options;
+    const binCfg = Utils.loadConfig(config);
+    
+    let flags;
+    const flagString = flag.trim();
+    if (flagString.indexOf(',') !== -1) {
+      flags = flagString.split(',');
+    } else {
+      flags = [flagString];
+    }
+
+    for (let i = 0; i < flags.length; i++) {
+      let f = flags[i];
+      let cfg = binCfg.move[f];
+
+      if (!cfg) {
+        console.log(chalk.blue('[ee-bin] [move] ') + chalk.red(`Error: ${f} config does not exist` ));
+        return;
+      }
+  
+      console.log(chalk.blue('[ee-bin] [move] ') + chalk.green(`Move flag: ${f}`));
+      console.log(chalk.blue('[ee-bin] [move] ') + chalk.green('config:'), cfg);
+
+      const distResource = path.join(homeDir, cfg.dist);
+      if (!fs.existsSync(distResource)) {
+        const errorTips = chalk.bgRed('Error') + ` ${cfg.dist} resource does not exist !`;
+        console.error(errorTips);
+        return
+      }
+
+      // clear the historical resource and copy it to the ee resource directory
+      const targetResource = path.join(homeDir, cfg.target);
+      if (fs.statSync(distResource).isDirectory() && !fs.existsSync(targetResource)) {
+        fs.mkdirSync(targetResource, {recursive: true, mode: 0o777});
+      } else {
+        this._rm(targetResource);
+        console.log('[ee-bin] [move] Clear history resources:', targetResource);
+      }
+
+      fsPro.copySync(distResource, targetResource);
+
+      // [todo] go project, special treatment of package.json, reserved only necessary
+      console.log(`[ee-bin] [move] Copy ${distResource} to ${targetResource}`);
+    }
+
+    console.log('[ee-bin] [move] End');
+  },
+
+  /**
+   * Delete a file or folder
+   */
+  _rm(name) {
+    // check
+    if (!fs.existsSync(name)) {
+      return
+    }
+
+    const nodeVersion = (process.versions && process.versions.node) || null;
+    if (nodeVersion && Utils.compareVersion(nodeVersion, '14.14.0') == 1) {
+      fs.rmSync(name, {recursive: true});
+    } else {
+      fs.rmdirSync(name, {recursive: true});
+    }
+  },
 }