ee-bin 1.7.0 → 1.7.2

package/lib/utils.js

@@ -7,6 +7,7 @@ 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();
 
@@ -108,10 +109,30 @@ function compareVersion(v1, v2) {
   return 0
 }
 
-function isWindows(prop) {
+function isWindows() {
   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
  */
@@ -160,6 +181,32 @@ 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,
@@ -167,6 +214,12 @@ 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.0",
+  "version": "1.7.2",
   "description": "ee bin",
   "main": "index.js",
   "scripts": {

package/tools/incrUpdater.js

@@ -35,7 +35,7 @@ module.exports = {
   },
 
   generateFile(cfg, asarFile) {
-    const latestVersionInfo = {}
+    var latestVersionInfo = {}
     const homeDir = process.cwd();
 
     let asarFilePath = "";
@@ -58,8 +58,20 @@ module.exports = {
       return;
     }
 
+    const packageJson = Utils.getPackage();
+    const version = packageJson.version;
+    const platformForFilename = Utils.getPlatform("-");
+    const platformForKey = Utils.getPlatform("_");
+
     // 生成 zip
-    const asarZipPath = path.join(homeDir, cfg.output.directory, cfg.output.zip);
+    let zipName = "";
+    if (cfg.output.noPlatform === true) {
+      zipName = path.basename(cfg.output.zip, '.zip') + `-${version}.zip`;
+    } else {
+      zipName = path.basename(cfg.output.zip, '.zip') + `-${platformForFilename}-${version}.zip`;
+    }
+    
+    const asarZipPath = path.join(homeDir, cfg.output.directory, zipName);
     if (fs.existsSync(asarZipPath) && cfg.cleanCache) {
       Utils.rm(asarZipPath);
     }
@@ -72,28 +84,39 @@ module.exports = {
     });
 
     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 item = {
+      version: version,
+      file: zipName,
+      size: fileStat.size,
+      sha1: sha1,
+      releaseDate: date,
+    };
+    let jsonName = "";
+    if (cfg.output.noPlatform === true) {
+      jsonName = cfg.output.file;
+      latestVersionInfo = item;
+    } else {
+      // 生成与系统有关的文件
+      jsonName = path.basename(cfg.output.file, '.json') + `-${platformForFilename}.json`;
+      if (platformForKey !== "") {
+        latestVersionInfo[platformForKey] = item;
+      } else {
+        console.log(chalk.blue('[ee-bin] [updater] ') + chalk.red(`Error: ${platformForFilename} is not supported`));
+      }
     }
 
-    const updaterJsonFilePath = path.join(homeDir, cfg.output.directory, cfg.output.file);
+    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, 'linux-unpacked'));
     }  
   },