ee-bin 4.1.11 → 4.2.0

package/index.js

@@ -114,6 +114,7 @@ program
   .option('--config <folder>', 'config file')
   .option('--asar-file <file>', 'asar file path')
   .option('--platform <flag>', 'platform')
+  .option('--force <flag>', 'force update full')
   .action(function() {
     incrUpdater.run(this.opts());
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-bin",
-  "version": "4.1.11",
+  "version": "4.2.0",
   "description": "ee bin",
   "main": "index.js",
   "scripts": {
@@ -27,6 +27,7 @@
     "javascript-obfuscator": "^4.0.2",
     "json5": "^2.2.3",
     "mkdirp": "^2.1.3",
+    "js-yaml": "^4.1.0",
     "tree-kill": "^1.2.2"
   }
 }

package/tools/incrUpdater.js

@@ -5,13 +5,13 @@ const fs = require('fs');
 const fsPro = require('fs-extra');
 const crypto = require('crypto');
 const chalk = require('chalk');
-const { loadConfig, getPackage, writeJsonSync } = require('../lib/utils');
 const admZip = require('adm-zip');
 const globby = require('globby');
-
+const yaml = require('js-yaml');
+const { loadConfig, writeJsonSync } = require('../lib/utils');
 
 /**
- * 增量升级
+ * Updater
  * @class
  */
 
@@ -25,43 +25,57 @@ class IncrUpdater {
       'win-ia32-unpacked',
       'linux-unpacked'
     ];
+    this.windows32Platform = 'windows_32';
+    this.windows64Platform = 'windows_64';
+    this.macosIntelPlatform = 'macos_intel';
+    this.macosApplePlatform = 'macos_apple';
+    this.linuxPlatform = 'linux';
     this.nodeModulesString = 'node_modules';
     this.asarUnpackedString = 'app.asar.unpacked';
   }
 
   /**
-   * 执行
+   * run
    */  
   run(options = {}) {
     console.log('[ee-bin] [updater] Start');
-    const { config, asarFile, platform } = options;
+    const { config, asarFile, platform, force } = options;
     const binCfg = loadConfig(config);
     const cfg = binCfg.updater;
+    const forceUpdate = force == 'true' ? true : false;
 
     if (!cfg) {
       console.log(chalk.blue('[ee-bin] [updater] ') + chalk.red(`Error: ${cfg} config does not exist`));
       return;
     }
 
-    this.generateFile(cfg, asarFile, platform);
+    this.generateFile(cfg, asarFile, platform, forceUpdate);
 
     console.log('[ee-bin] [updater] End');
   }
 
   /**
-   * 生成增量升级文件
+   * generate json file
    */ 
-  generateFile(config, asarFile, platform) {
+  generateFile(config, asarFile, platform, force = false) {
     const cfg = config[platform];
     if (!cfg) {
       console.log(chalk.blue('[ee-bin] [updater] ') + chalk.red(`Error: ${platform} config does not exist`));
       return;
     }
 
+
     let latestVersionInfo = {}
     const homeDir = process.cwd();
     console.log(chalk.blue('[ee-bin] [updater] ') + chalk.green(`${platform} config:`), cfg);
 
+    const metadataPath = path.join(homeDir, cfg.metadata);
+    if (!fs.existsSync(metadataPath)) {
+      console.log(chalk.blue('[ee-bin] [updater] ') + chalk.red(`Error: ${metadataPath} does not exist!`));
+      return;
+    }    
+    const metadataObj = yaml.load(fs.readFileSync(metadataPath, 'utf8')); 
+
     let asarFilePath = "";
     if (asarFile) {
       asarFilePath = path.normalize(path.join(homeDir, asarFile));
@@ -74,25 +88,26 @@ class IncrUpdater {
       return;
     }
 
-    const packageJson = getPackage();
-    const version = packageJson.version;
+    const version = metadataObj.version;
     let platformForFilename = platform;
     if (platform.indexOf("_") !== -1) {
       const platformArr = platform.split("_");
+      // windows_32 -> windows-32
       platformForFilename = platformArr.join("-");
     }
     
-    // 生成 zip
+    // zip
     let zipName = "";
-    zipName = path.basename(cfg.output.zip, '.zip') + `-${platformForFilename}-${version}.zip`;
+    const extZip = '.zip';
+    zipName = path.basename(cfg.output.zip, extZip) + `-${platformForFilename}-${version}${extZip}`;
     const asarZipPath = path.join(homeDir, cfg.output.directory, zipName);
     if (fs.existsSync(asarZipPath)) {
       fsPro.removeSync(asarZipPath);
     }
     const zip = new admZip();
-    // 添加 asar 文件
+    // add asar
     zip.addLocalFile(asarFilePath); 
-    // 添加 extraResources
+    // add extraResources
     if (cfg.extraResources && cfg.extraResources.length > 0) {
       const files = globby.sync(cfg.extraResources, { cwd: homeDir });
       for (const extraRes of files) {
@@ -108,7 +123,7 @@ class IncrUpdater {
         zip.addLocalFile(extraResPath, zipFileDir);
       }
     }
-    // 添加 asarUnpacked
+    // add asarUnpacked
     if (cfg.asarUnpacked && cfg.asarUnpacked.length > 0) {
       const modules = cfg.asarUnpacked;
       for (const moduleItem of modules) {
@@ -130,23 +145,48 @@ class IncrUpdater {
       }
     });
 
-    // 生成 latest.json
-    const sha1 = this.generateSha1(asarZipPath);
-    const date = this._getFormattedDate();
+    // generate latest.json
+    // incr file
+    const zipSha1 = this.generateHash(asarZipPath, 'sha1', 'hex');
     const fileStat = fs.statSync(asarZipPath);
+    // full file
+    let fullFileInfo;
+    for (const item of metadataObj.files) {
+      if (item.url.indexOf('.zip') !== -1) {
+        continue;
+      }
+      fullFileInfo = item;
+    }
+    const fullFileName = fullFileInfo.url;
+    const fullFilePath = path.normalize(path.join(homeDir, cfg.output.directory, fullFileName));
+    const generateSha512 = this.generateHash(fullFilePath, 'sha512');
+    if (fullFileInfo.sha512 != generateSha512) {
+      console.log(chalk.blue('[ee-bin] [updater] ') + chalk.red(`Error: metadata sha512 is not equal to generateSha512 !
+      at metadata sha512: ${fullFileInfo.sha512}
+      at generate Sha512: ${generateSha512}`));
+      return;
+    }
+    
     const item = {
       version: version,
       file: zipName,
       size: fileStat.size,
-      sha1: sha1,
-      releaseDate: date,
+      sha1: zipSha1,
+      fullFile: {
+        fileName: fullFileInfo.url,
+        size: fullFileInfo.size,
+        sha512: generateSha512,
+      },
+      force,
+      releaseDate: metadataObj.releaseDate,
     };
-    const jsonName = path.basename(cfg.output.file, '.json') + `-${platformForFilename}.json`;
+    const extJson = '.json';
+    const jsonName = path.basename(cfg.output.file, extJson) + `-${platformForFilename}${extJson}`;
     latestVersionInfo = item;
     const updaterJsonFilePath = path.join(homeDir, cfg.output.directory, jsonName);
     writeJsonSync(updaterJsonFilePath, latestVersionInfo);
 
-    // 删除缓存文件，防止生成的 zip 是旧版本
+    // Delete cache files to prevent generated zip files from being outdated versions
     if (cfg.cleanCache) {
       this.tmpAppDirs.forEach(dir => {
         const dirPath = path.join(homeDir, cfg.output.directory, dir);
@@ -155,38 +195,28 @@ class IncrUpdater {
     }  
   }
   
-  generateSha1(filepath = "") {
-    let sha1 = '';
+  generateHash(filepath = "", algorithm = "sha512", encoding = "base64") {
+    let data = '';
     if (filepath.length == 0) {
-      return sha1;
+      return data;
     }
 
     if (!fs.existsSync(filepath)) {
-      return sha1;
+      return data;
     }
 
-    console.log(chalk.blue('[ee-bin] [updater] ') + `generate sha1 for filepath:${filepath}`);
+    console.log(chalk.blue('[ee-bin] [updater] ') + `generate ${algorithm} for filepath:${filepath}`);
     try {
       const buffer = fs.readFileSync(filepath);
-      const fsHash = crypto.createHash('sha1');
+      const fsHash = crypto.createHash(algorithm);
       fsHash.update(buffer);
-      sha1 = fsHash.digest('hex');
-      return sha1;
-
+      data = fsHash.digest(encoding);
+      return data;
     } 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: generate ${algorithm} 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}`; 
+    return data;
   }  
 }