ee-bin 1.7.2 → 1.8.0-beta.1

package/index.js

@@ -128,6 +128,7 @@ program
   .description('updater commands')
   .option('--config <folder>', 'config file', './electron/config/bin.js')
   .option('--asar-file <file>', 'asar file path')
+  .option('--platform <flag>', 'platform')
   .action(function() {
     const updater = require('./tools/incrUpdater');
     updater.run(this.opts());

package/lib/utils.js

@@ -7,7 +7,6 @@ const is = require('is-type-of');
 const { loadTsConfig } = require('config-file-ts');
 const JsonLib = require('json5');
 const mkdirp = require('mkdirp');
-const OS = require('os');
 
 const _basePath = process.cwd();
 
@@ -109,30 +108,10 @@ function compareVersion(v1, v2) {
   return 0
 }
 
-function isWindows() {
+function isWindows(prop) {
   return process.platform === 'win32'
 }
 
-function isOSX() {
-  return process.platform === 'darwin'
-}
-
-function isMacOS() {
-  return isOSX()
-}
-
-function isLinux() {
-  return process.platform === 'linux'
-}
-
-function isx86() {
-  return process.arch === 'ia32'
-}
-
-function isx64() {
-  return process.arch === 'x64'
-}
-
 /**
  * Delete a file or folder
  */
@@ -181,32 +160,6 @@ function writeJsonSync (filepath, str, options) {
   fs.writeFileSync(filepath, str);
 };
 
-function getPlatform(delimiter = "_", isDiffArch = false) {
-  let os = "";
-  if (isWindows()) {
-    os = "windows";
-    if (isDiffArch) {
-      const arch = isx64() ? "64" : "32";
-      os += delimiter + arch;
-    }
-  } else if (isMacOS()) {
-    let isAppleSilicon = false;
-    const cpus = OS.cpus();
-    for (let cpu of cpus) {
-      if (cpu.model.includes('Apple')) {
-        isAppleSilicon = true;
-        break;
-      }
-    }
-    const core = isAppleSilicon? "apple" : "intel";
-    os = "macos" + delimiter + core;
-  } else if (isLinux()) {
-    os = "linux";
-  }
-
-  return os;
-}
-
 module.exports = {
   loadConfig,
   checkConfig,
@@ -214,12 +167,6 @@ module.exports = {
   getElectronProgram,
   compareVersion,
   isWindows,
-  isOSX,
-  isMacOS,
-  isLinux,
-  isx86,
-  isx64,
-  getPlatform,
   rm,
   getPackage,
   readJsonSync,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-bin",
-  "version": "1.7.2",
+  "version": "1.8.0-beta.1",
   "description": "ee bin",
   "main": "index.js",
   "scripts": {

package/tools/incrUpdater.js

@@ -19,7 +19,7 @@ module.exports = {
    */  
   run(options = {}) {
     console.log('[ee-bin] [updater] Start');
-    const { config, asarFile } = options;
+    const { config, asarFile, platform } = options;
     const binCfg = Utils.loadConfig(config);
     const cfg = binCfg.updater;
 
@@ -27,16 +27,112 @@ module.exports = {
       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);
+    if (platform) {
+      this.generateFile(cfg, asarFile, platform);
+    } else {
+      this.generateFileOld(cfg, asarFile);
+    }
 
     console.log('[ee-bin] [updater] End');
   },
 
-  generateFile(cfg, asarFile) {
+  /**
+   * 生成增量升级文件
+   */ 
+  generateFile(config, asarFile, platform) {
+    const cfg = config[platform];
+    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 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;
+    }
+
+    const packageJson = Utils.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)) {
+      Utils.rm(asarZipPath);
+    }
+    const zip = new admZip();
+    // 添加 asar 文件
+    zip.addLocalFile(asarFilePath); 
+    // 添加 extraResources
+    if (cfg.extraResources.length > 0) {
+      for (const extraRes of cfg.extraResources) {
+        const extraResPath = path.normalize(path.join(homeDir, extraRes));
+        if (fs.existsSync(extraResPath)) {
+          zip.addLocalFile(extraResPath, "extraResources");
+        }
+      }
+    }
+
+    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);
+    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, 'mac-arm64'));
+      Utils.rm(path.join(homeDir, cfg.output.directory, 'win-unpacked'));
+      Utils.rm(path.join(homeDir, cfg.output.directory, 'win-ia32-unpacked'));
+      Utils.rm(path.join(homeDir, cfg.output.directory, 'linux-unpacked'));
+    }  
+  },
+
+  /**
+   * 将废弃
+   */ 
+  generateFileOld(cfg, asarFile) {
     var latestVersionInfo = {}
     const homeDir = process.cwd();
+    console.log(chalk.blue('[ee-bin] [updater] ') + chalk.green('config:'), cfg);
 
     let asarFilePath = "";
     if (asarFile) {