ee-bin 4.1.10 → 4.2.0

package/tools/incrUpdater.js

@@ -1,196 +1,226 @@
-'use strict';
-
-const path = require('path');
-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');
-
-
-/**
- * 增量升级
- * @class
- */
-
-class IncrUpdater {
-
-  constructor() {
-    this.tmpAppDirs = [
-      'mac',
-      'mac-arm64',
-      'win-unpacked',
-      'win-ia32-unpacked',
-      'linux-unpacked'
-    ];
-    this.nodeModulesString = 'node_modules';
-    this.asarUnpackedString = 'app.asar.unpacked';
-  }
-
-  /**
-   * 执行
-   */  
-  run(options = {}) {
-    console.log('[ee-bin] [updater] Start');
-    const { config, asarFile, platform } = options;
-    const binCfg = loadConfig(config);
-    const cfg = binCfg.updater;
-
-    if (!cfg) {
-      console.log(chalk.blue('[ee-bin] [updater] ') + chalk.red(`Error: ${cfg} config does not exist`));
-      return;
-    }
-
-    this.generateFile(cfg, asarFile, platform);
-
-    console.log('[ee-bin] [updater] End');
-  }
-
-  /**
-   * 生成增量升级文件
-   */ 
-  generateFile(config, asarFile, platform) {
-    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);
-
-    let asarFilePath = "";
-    if (asarFile) {
-      asarFilePath = path.normalize(path.join(homeDir, asarFile));
-    } 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;
-    }
-
-    const packageJson = getPackage();
-    const version = packageJson.version;
-    let platformForFilename = platform;
-    if (platform.indexOf("_") !== -1) {
-      const platformArr = platform.split("_");
-      platformForFilename = platformArr.join("-");
-    }
-    
-    // 生成 zip
-    let zipName = "";
-    zipName = path.basename(cfg.output.zip, '.zip') + `-${platformForFilename}-${version}.zip`;
-    const asarZipPath = path.join(homeDir, cfg.output.directory, zipName);
-    if (fs.existsSync(asarZipPath)) {
-      fsPro.removeSync(asarZipPath);
-    }
-    const zip = new admZip();
-    // 添加 asar 文件
-    zip.addLocalFile(asarFilePath); 
-    // 添加 extraResources
-    if (cfg.extraResources && cfg.extraResources.length > 0) {
-      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)) {
-          continue;
-        }
-        const extraResDir = path.dirname(extraResPath);
-        const index = extraResDir.indexOf('extraResources');
-        const zipFileDir = extraResDir.substring(index);
-        // 资源路径 extraResPath: D:\www\gofile\src\ee\ee-demo\build\extraResources\hello\c.txt
-        // 文件在zip中的路径 zipFileDir: extraResources/hello
-        zip.addLocalFile(extraResPath, zipFileDir);
-      }
-    }
-    // 添加 asarUnpacked
-    if (cfg.asarUnpacked && cfg.asarUnpacked.length > 0) {
-      const modules = cfg.asarUnpacked;
-      for (const moduleItem of modules) {
-        const modulePath = path.normalize(path.join(homeDir, moduleItem));
-        if (!fs.existsSync(modulePath)) {
-          throw new Error(`${modulePath} is not exists!`);
-        }
-      
-        const zipDir = path.join(this.asarUnpackedString, moduleItem);
-        // console.log('modulePath', modulePath);
-        // console.log('zipDir', zipDir);
-        zip.addLocalFolder(modulePath, zipDir);
-      }
-    }
-
-    zip.writeZip(asarZipPath, (err) => {
-      if (err) {
-        console.log(chalk.blue('[ee-bin] [updater] create zip ') + chalk.red(`Error: ${err}`));
-      }
-    });
-
-    // 生成 latest.json
-    const sha1 = this.generateSha1(asarFilePath);
-    const date = this._getFormattedDate();
-    const fileStat = fs.statSync(asarFilePath);
-    const item = {
-      version: version,
-      file: zipName,
-      size: fileStat.size,
-      sha1: sha1,
-      releaseDate: date,
-    };
-    const jsonName = path.basename(cfg.output.file, '.json') + `-${platformForFilename}.json`;
-    latestVersionInfo = item;
-    const updaterJsonFilePath = path.join(homeDir, cfg.output.directory, jsonName);
-    writeJsonSync(updaterJsonFilePath, latestVersionInfo);
-
-    // 删除缓存文件，防止生成的 zip 是旧版本
-    if (cfg.cleanCache) {
-      this.tmpAppDirs.forEach(dir => {
-        const dirPath = path.join(homeDir, cfg.output.directory, dir);
-        fsPro.removeSync(dirPath);
-      });
-    }  
-  }
-  
-  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}`; 
-  }  
-}
-
-module.exports = {
-  IncrUpdater,
-  incrUpdater: new IncrUpdater()
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const fsPro = require('fs-extra');
+const crypto = require('crypto');
+const chalk = require('chalk');
+const admZip = require('adm-zip');
+const globby = require('globby');
+const yaml = require('js-yaml');
+const { loadConfig, writeJsonSync } = require('../lib/utils');
+
+/**
+ * Updater
+ * @class
+ */
+
+class IncrUpdater {
+
+  constructor() {
+    this.tmpAppDirs = [
+      'mac',
+      'mac-arm64',
+      'win-unpacked',
+      '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, 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, forceUpdate);
+
+    console.log('[ee-bin] [updater] End');
+  }
+
+  /**
+   * generate json file
+   */ 
+  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));
+    } 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;
+    }
+
+    const version = metadataObj.version;
+    let platformForFilename = platform;
+    if (platform.indexOf("_") !== -1) {
+      const platformArr = platform.split("_");
+      // windows_32 -> windows-32
+      platformForFilename = platformArr.join("-");
+    }
+    
+    // zip
+    let zipName = "";
+    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();
+    // add asar
+    zip.addLocalFile(asarFilePath); 
+    // add extraResources
+    if (cfg.extraResources && cfg.extraResources.length > 0) {
+      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)) {
+          continue;
+        }
+        const extraResDir = path.dirname(extraResPath);
+        const index = extraResDir.indexOf('extraResources');
+        const zipFileDir = extraResDir.substring(index);
+        // 资源路径 extraResPath: D:\www\gofile\src\ee\ee-demo\build\extraResources\hello\c.txt
+        // 文件在zip中的路径 zipFileDir: extraResources/hello
+        zip.addLocalFile(extraResPath, zipFileDir);
+      }
+    }
+    // add asarUnpacked
+    if (cfg.asarUnpacked && cfg.asarUnpacked.length > 0) {
+      const modules = cfg.asarUnpacked;
+      for (const moduleItem of modules) {
+        const modulePath = path.normalize(path.join(homeDir, moduleItem));
+        if (!fs.existsSync(modulePath)) {
+          throw new Error(`${modulePath} is not exists!`);
+        }
+      
+        const zipDir = path.join(this.asarUnpackedString, moduleItem);
+        // console.log('modulePath', modulePath);
+        // console.log('zipDir', zipDir);
+        zip.addLocalFolder(modulePath, zipDir);
+      }
+    }
+
+    zip.writeZip(asarZipPath, (err) => {
+      if (err) {
+        console.log(chalk.blue('[ee-bin] [updater] create zip ') + chalk.red(`Error: ${err}`));
+      }
+    });
+
+    // 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: zipSha1,
+      fullFile: {
+        fileName: fullFileInfo.url,
+        size: fullFileInfo.size,
+        sha512: generateSha512,
+      },
+      force,
+      releaseDate: metadataObj.releaseDate,
+    };
+    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);
+
+    // 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);
+        fsPro.removeSync(dirPath);
+      });
+    }  
+  }
+  
+  generateHash(filepath = "", algorithm = "sha512", encoding = "base64") {
+    let data = '';
+    if (filepath.length == 0) {
+      return data;
+    }
+
+    if (!fs.existsSync(filepath)) {
+      return data;
+    }
+
+    console.log(chalk.blue('[ee-bin] [updater] ') + `generate ${algorithm} for filepath:${filepath}`);
+    try {
+      const buffer = fs.readFileSync(filepath);
+      const fsHash = crypto.createHash(algorithm);
+      fsHash.update(buffer);
+      data = fsHash.digest(encoding);
+      return data;
+    } catch (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 data;
+  }  
+}
+
+module.exports = {
+  IncrUpdater,
+  incrUpdater: new IncrUpdater()
 }

package/tools/move.js

@@ -1,69 +1,69 @@
-'use strict';
-
-const path = require('path');
-const fs = require('fs');
-const fsPro = require('fs-extra');
-const chalk = require('chalk');
-const { loadConfig, rm } = require('../lib/utils');
-
-const homeDir = process.cwd();
-
-// 移动资源
-function move(options = {}) {
-  console.log('[ee-bin] [move] Start moving resources');
-  const { config, flag } = options;
-  const binCfg = loadConfig(config);
-  const moveConfig = binCfg.move;
-  
-  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 = moveConfig[f];
-
-    if (!cfg) {
-      console.log(chalk.blue('[ee-bin] [move] ') + chalk.red(`Error: ${f} config does not exist` ));
-      return;
-    }
-
-    const { src, dest, dist, target } = cfg;
-    const source = dist ? dist : src;
-    const destination = target ? target : dest;
-
-    console.log(chalk.blue('[ee-bin] [move] ') + chalk.green(`Move flag: ${f}`));
-    console.log(chalk.blue('[ee-bin] [move] ') + chalk.green('config:'), cfg);
-
-    const srcResource = path.join(homeDir, source);
-    if (!fs.existsSync(srcResource)) {
-      const errorTips = chalk.bgRed('Error') + ` ${source} resource does not exist !`;
-      console.error(errorTips);
-      return
-    }
-
-    // clear the historical resource and copy it to the ee resource directory
-    const destResource = path.join(homeDir, destination);
-    if (fs.statSync(srcResource).isDirectory() && !fs.existsSync(destResource)) {
-      fs.mkdirSync(destResource, {recursive: true, mode: 0o777});
-    } else {
-      rm(destResource);
-      console.log('[ee-bin] [move] Clear history resources:', destResource);
-    }
-
-    fsPro.copySync(srcResource, destResource);
-
-    // [todo] go project, special treatment of package.json, reserved only necessary
-    console.log(`[ee-bin] [move] Copy ${srcResource} to ${destResource}`);
-  }
-
-  console.log('[ee-bin] [move] End');
-}
-
-module.exports = {
-  move
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const fsPro = require('fs-extra');
+const chalk = require('chalk');
+const { loadConfig, rm } = require('../lib/utils');
+
+const homeDir = process.cwd();
+
+// 移动资源
+function move(options = {}) {
+  console.log('[ee-bin] [move] Start moving resources');
+  const { config, flag } = options;
+  const binCfg = loadConfig(config);
+  const moveConfig = binCfg.move;
+  
+  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 = moveConfig[f];
+
+    if (!cfg) {
+      console.log(chalk.blue('[ee-bin] [move] ') + chalk.red(`Error: ${f} config does not exist` ));
+      return;
+    }
+
+    const { src, dest, dist, target } = cfg;
+    const source = dist ? dist : src;
+    const destination = target ? target : dest;
+
+    console.log(chalk.blue('[ee-bin] [move] ') + chalk.green(`Move flag: ${f}`));
+    console.log(chalk.blue('[ee-bin] [move] ') + chalk.green('config:'), cfg);
+
+    const srcResource = path.join(homeDir, source);
+    if (!fs.existsSync(srcResource)) {
+      const errorTips = chalk.bgRed('Error') + ` ${source} resource does not exist !`;
+      console.error(errorTips);
+      return
+    }
+
+    // clear the historical resource and copy it to the ee resource directory
+    const destResource = path.join(homeDir, destination);
+    if (fs.statSync(srcResource).isDirectory() && !fs.existsSync(destResource)) {
+      fs.mkdirSync(destResource, {recursive: true, mode: 0o777});
+    } else {
+      rm(destResource);
+      console.log('[ee-bin] [move] Clear history resources:', destResource);
+    }
+
+    fsPro.copySync(srcResource, destResource);
+
+    // [todo] go project, special treatment of package.json, reserved only necessary
+    console.log(`[ee-bin] [move] Copy ${srcResource} to ${destResource}`);
+  }
+
+  console.log('[ee-bin] [move] End');
+}
+
+module.exports = {
+  move
 }