ee-bin 2.0.0-beta.1 → 4.0.0-beta.1

package/config/bin_default.js

@@ -0,0 +1,112 @@
+/**
+ * ee-bin 配置
+ * 仅适用于开发环境
+ */
+module.exports = {
+  /**
+   * development serve ("frontend" "electron" )
+   * ee-bin dev
+   */
+  dev: {
+    frontend: {
+      directory: './frontend',
+      cmd: 'npm',
+      args: ['run', 'dev'],
+      protocol: 'http://',
+      hostname: 'localhost',
+      port: 8080,
+      indexPath: 'index.html',
+    },
+    electron: {
+      directory: './',
+      cmd: 'electron',
+      args: ['.', '--env=local'],
+      loadingPage: '/public/html/loading.html',
+    },
+  },
+
+  /**
+   * 构建
+   * ee-bin build
+   */
+  build: {
+    frontend: {
+      directory: './frontend',
+      cmd: 'npm',
+      args: ['run', 'build'],
+    },
+    electron: {
+      bundler: 'esbuild',
+      language: 'javascript',
+      javascript: {
+        entryPoints: ['./electron/**/*.js'],
+        platform: 'node',
+        bundle: false,
+        minify: false,
+        outdir: 'public/electron',
+        packages: 'external',
+        sourcemap:false,
+        sourcesContent: false
+      },
+      typescript: {
+        entryPoints: ['./electron/**/*.ts'],
+        tsconfig: './tsconfig.json',
+        platform: 'node',
+        format: 'cjs',
+        bundle: false,
+        minify: false,
+        outdir: 'public/electron',
+        packages: 'external',
+        sourcemap:false,
+        sourcesContent: false
+      }
+    }
+  },
+
+  /**
+   * 移动资源
+   * ee-bin move 
+   */
+  move: {
+    frontend_dist: {
+      src: './frontend/dist',
+      dest: './public/dist'
+    }
+  },  
+
+  /**
+   * 预发布模式（prod）
+   * ee-bin start
+   */
+  start: {
+    directory: './',
+    cmd: 'electron',
+    args: ['.', '--env=prod']
+  },
+
+  /**
+   * 加密
+   */  
+  encrypt: {
+    type: 'none',
+    files: [
+      './public/electron/**/*.(js|json)',
+    ],
+    fileExt: ['.js'],
+    cleanFiles: ['./public/electron'],
+    specificFiles: ['./public/electron/preload/bridge.js'],
+    encryptDir: './',
+    confusionOptions: {
+      compact: true,      
+      stringArray: true,
+      stringArrayEncoding: ['none'],
+      deadCodeInjection: false,
+    }
+  },
+
+  /**
+   * 执行自定义命令
+   * ee-bin exec
+   */
+  exec: {},  
+};

package/{index.cjs → index.js}

@@ -1,123 +1,104 @@
 #!/usr/bin/env node
 
 const { program } = require('commander');
+const { move } = require('./tools/move');
+const { encrypt, cleanEncrypt } = require('./tools/encrypt');
+const { serveProcess } = require('./tools/serve');
+const { incrUpdater } = require('./tools/incrUpdater');
 
 /**
- * move - Moves resources
- */
-program
-  .command('move')
-  .description('Move multip resources')
-  .option('--config <folder>', 'config file', './electron/config/bin.js')
-  .option('--flag <flag>', 'Custom flag')
-  .action(function() {
-    const moveScript = require('./tools/move');
-    moveScript.run(this.opts());
-  });
-
-/**
- * (deprecated) rd - Moves front-end resources to a specified directory
+ * dev
  */
 program
-  .command('rd')
-  .description('Move frontend resources to public/dist')
-  .option('--config <folder>', 'config file', './electron/config/bin.js')
-  .option('--dist <folder>', 'title to use before name')
-  .option('--target <folder>', 'title to use before name')
+  .command('dev')
+  .description('create frontend-serve and electron-serve')
+  .option('--config <folder>', 'config file')
+  .option('--serve <mode>', 'serve mode')
   .action(function() {
-    const replaceDist = require('./tools/replaceDist');
-    replaceDist.run(this.opts());
+    serveProcess.dev(this.opts());
   });
 
 /**
- * encrypt - Code encryption
+ * build
  */
 program
-  .command('encrypt')
-  .description('Code encryption')
+  .command('build')
+  .description('building multiple resources')
   .option('--config <folder>', 'config file')
-  .option('--out <folder>', 'output directory', './public')
+  .option('--cmds <flag>', 'custom commands')
   .action(function() {
-    const encrypt = require('./tools/encrypt');
-    encrypt.run(this.opts());
+    serveProcess.build(this.opts());
   });
 
 /**
- * clean - Clear the encrypted code
+ * start
  */
 program
-  .command('clean')
-  .description('Clear the encrypted code')
-  .option('-d, --dir <folder>', 'clean directory')
+  .command('start')
+  .description('preview effect')
+  .option('--config <folder>', 'config file')
   .action(function() {
-    const encrypt = require('./tools/encrypt');
-    encrypt.clean(this.opts());
+    serveProcess.start(this.opts());
   });
 
 /**
- * icon
+ * exec
  */
 program
-  .command('icon')
-  .description('Generate logo')
-  .option('-i, --input <file>', 'image file default /public/images/logo.png')
-  .option('-o, --output <folder>', 'output directory default /build/icons/')
+  .command('exec')
+  .description('create frontend-serve and electron-serve')
+  .option('--config <folder>', 'config file')
+  .option('--cmds <flag>', 'custom commands')
   .action(function() {
-    const iconGen = require('./tools/iconGen');
-    iconGen.run();
+    serveProcess.exec(this.opts());
   });
 
 /**
- * dev
+ * move - Moves resources
  */
 program
-  .command('dev')
-  .description('create frontend-serve and electron-serve')
-  .option('--config <folder>', 'config file', './electron/config/bin.js')
-  .option('--serve <mode>', 'serve mode')
+  .command('move')
+  .description('Move multip resources')
+  .option('--config <folder>', 'config file')
+  .option('--flag <flag>', 'Custom flag')
   .action(function() {
-    const serve = require('./tools/serve');
-    serve.dev(this.opts());
+    move(this.opts());
   });
 
 /**
- * build
+ * encrypt - Code encryption
  */
 program
-  .command('build')
-  .description('building multiple resources')
-  .option('--config <folder>', 'config file', './electron/config/bin.js')
-  .option('--cmds <flag>', 'custom commands')
+  .command('encrypt')
+  .description('Code encryption')
+  .option('--config <folder>', 'config file')
+  .option('--out <folder>', 'output directory')
   .action(function() {
-    const serve = require('./tools/serve');
-    serve.build(this.opts());
+    encrypt(this.opts());
   });
 
 /**
- * start
+ * clean - Clear the encrypted code
  */
 program
-  .command('start')
-  .description('preview effect')
-  .option('--config <folder>', 'config file', './electron/config/bin.js')
+  .command('clean')
+  .description('Clear the encrypted code')
+  .option('-d, --dir <folder>', 'clean directory')
   .action(function() {
-    const serve = require('./tools/serve');
-    serve.start(this.opts());
+    cleanEncrypt(this.opts());
   });
 
 /**
- * exec
+ * icon
  */
 program
-  .command('exec')
-  .description('create frontend-serve and electron-serve')
-  .option('--config <folder>', 'config file', './electron/config/bin.js')
-  .option('--command <command>', 'Custom command')
-  .option('--cmds <flag>', 'custom commands')
+  .command('icon')
+  .description('Generate logo')
+  .option('-i, --input <file>', 'image file default /public/images/logo.png')
+  .option('-o, --output <folder>', 'output directory default /build/icons/')
   .action(function() {
-    // command 选项是关键字，不再使用，改为 cmds
-    const serve = require('./tools/serve');
-    serve.exec(this.opts());
+    const iconGen = require('./tools/iconGen');
+    iconGen.run();
   });
 
 /**
@@ -126,12 +107,11 @@ program
 program
   .command('updater')
   .description('updater commands')
-  .option('--config <folder>', 'config file', './electron/config/bin.js')
+  .option('--config <folder>', 'config file')
   .option('--asar-file <file>', 'asar file path')
   .option('--platform <flag>', 'platform')
   .action(function() {
-    const updater = require('./tools/incrUpdater');
-    updater.run(this.opts());
+    incrUpdater.run(this.opts());
   });
 
 program.parse();

package/lib/extend.js

@@ -0,0 +1,78 @@
+'use strict';
+
+const hasOwn = Object.prototype.hasOwnProperty;
+const toStr = Object.prototype.toString;
+
+function isPlainObject(obj) {
+  if (!obj || toStr.call(obj) !== '[object Object]') {
+    return false;
+  }
+
+  var hasOwnConstructor = hasOwn.call(obj, 'constructor');
+  var hasIsPrototypeOf = obj.constructor && obj.constructor.prototype && hasOwn.call(obj.constructor.prototype, 'isPrototypeOf');
+  // Not own constructor property must be Object
+  if (obj.constructor && !hasOwnConstructor && !hasIsPrototypeOf) {
+    return false;
+  }
+
+  // Own properties are enumerated firstly, so to speed up,
+  // if last one is own, then all properties are own.
+  var key;
+  for (key in obj) { /**/ }
+
+  return typeof key === 'undefined' || hasOwn.call(obj, key);
+};
+
+function extend() {
+  var options, name, src, copy, clone;
+  var target = arguments[0];
+  var i = 1;
+  var length = arguments.length;
+  var deep = false;
+
+  // Handle a deep copy situation
+  if (typeof target === 'boolean') {
+    deep = target;
+    target = arguments[1] || {};
+    // skip the boolean and the target
+    i = 2;
+  } else if ((typeof target !== 'object' && typeof target !== 'function') || target == null) {
+    target = {};
+  }
+
+  for (; i < length; ++i) {
+    options = arguments[i];
+    // Only deal with non-null/undefined values
+    if (options == null) continue;
+
+    // Extend the base object
+    for (name in options) {
+      if (name === '__proto__') continue;
+
+      src = target[name];
+      copy = options[name];
+
+      // Prevent never-ending loop
+      if (target === copy) continue;
+
+      // Recurse if we're merging plain objects
+      if (deep && copy && isPlainObject(copy)) {
+        clone = src && isPlainObject(src) ? src : {};
+        // Never move original objects, clone them
+        target[name] = extend(deep, clone, copy);
+
+      // Don't bring in undefined values
+      } else if (typeof copy !== 'undefined') {
+        target[name] = copy;
+      }
+    }
+  }
+
+  // Return the modified object
+  return target;
+};
+
+module.exports = {
+  extend,
+  isPlainObject,
+};

package/lib/{utils.cjs → utils.js}

@@ -1,5 +1,6 @@
 'use strict';
 
+const debug = require('debug')('ee-bin:lib:utils');
 const path = require('path');
 const fs = require('fs');
 const chalk = require('chalk');
@@ -7,22 +8,26 @@ 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 defaultConfig = require('../config/bin_default');
+const { extend } = require('./extend');
 
 const _basePath = process.cwd();
+const userBin = './cmd/bin.js';
 
-function checkConfig(prop) {
-  const filepath = path.join(_basePath, prop);
-  if (fs.existsSync(filepath)) {
-    return true;
-  }
+function loadConfig(binFile) {
+  const binPath = binFile ? binFile : userBin;
+  const userConfig = loadFile(binPath);
+  const result = extend(true, defaultConfig, userConfig);
+  debug('[loadConfig] bin:%j', result)
 
-  return false;
-}
+  return result
+};
 
-function loadConfig(prop) {
-  const configFile = path.join(_basePath, prop);
+function loadFile(filepath) {
+  const configFile = path.join(_basePath, filepath);
   if (!fs.existsSync(configFile)) {
-    const errorTips = 'config file ' + chalk.blue(`${configFile}`) + ' does not exist !';
+    const errorTips = 'file ' + chalk.blue(`${configFile}`) + ' does not exist !';
     throw new Error(errorTips)
   }
 
@@ -45,24 +50,6 @@ function loadConfig(prop) {
   return result || {}
 };
 
-function loadEncryptConfig() {
-  const configFile = './electron/config/encrypt.js';
-  const filepath = path.join(_basePath, configFile);
-  if (!fs.existsSync(filepath)) {
-    const errorTips = 'config file ' + chalk.blue(`${filepath}`) + ' does not exist !';
-    throw new Error(errorTips)
-  }
-  const obj = require(filepath);
-  if (!obj) return obj;
-
-  let ret = obj;
-  if (is.function(obj) && !is.class(obj)) {
-    ret = obj();
-  }
-
-  return ret || {};
-};
-
 /**
  * get electron program
  */
@@ -108,10 +95,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
  */
@@ -133,9 +140,7 @@ function rm(name) {
  * 获取项目根目录package.json
  */
 function getPackage () {
-  const homeDir = process.cwd();
-  const content = readJsonSync(path.join(homeDir, 'package.json'));
-  
+  const content = readJsonSync(path.join(_basePath, 'package.json'));
   return content;
 }
 
@@ -160,13 +165,43 @@ 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,
-  loadEncryptConfig,
   getElectronProgram,
   compareVersion,
   isWindows,
+  isOSX,
+  isMacOS,
+  isLinux,
+  isx86,
+  isx64,
+  getPlatform,
   rm,
   getPackage,
   readJsonSync,

package/package.json

@@ -1,28 +1,30 @@
 {
   "name": "ee-bin",
-  "version": "2.0.0-beta.1",
+  "version": "4.0.0-beta.1",
   "description": "ee bin",
-  "main": "index.cjs",
+  "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",
   "license": "ISC",
   "bin": {
-    "ee-bin": "index.cjs"
+    "ee-bin": "index.js"
   },
   "dependencies": {
+    "adm-zip": "^0.4.11",
     "bytenode": "^1.3.6",
     "chalk": "^4.1.2",
     "commander": "^11.0.0",
     "config-file-ts": "^0.2.8-rc1",
     "cross-spawn": "^7.0.3",
+    "debug": "^4.4.0",
+    "esbuild": "0.24.2",
     "fs-extra": "^10.0.0",
     "globby": "^10.0.0",
     "is-type-of": "^1.2.1",
     "javascript-obfuscator": "^4.0.2",
-    "mkdirp": "^2.1.3",
-    "adm-zip": "^0.4.11",
-    "json5": "^2.2.3"
+    "json5": "^2.2.3",
+    "mkdirp": "^2.1.3"
   }
 }