ee-core 1.4.0 → 1.4.1-beta.2

package/bin/tools.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 const replaceDist = require('../tools/replaceDist');
 const encrypt = require('../tools/encrypt');

package/core/lib/loader/mixin/config.js

@@ -107,7 +107,7 @@ module.exports = {
       this._setConfigMeta(envConfig, '<process.env.EE_APP_CONFIG>');
       return envConfig;
     } catch (err) {
-      this.options.logger.warn('[egg-loader] process.env.EE_APP_CONFIG is not invalid JSON: %s', envConfigStr);
+      this.options.logger.warn('[ee-loader] process.env.EE_APP_CONFIG is not invalid JSON: %s', envConfigStr);
     }
   },
 

package/core/lib/loader/mixin/controller.js

@@ -47,7 +47,7 @@ module.exports = {
     const controllerBase = opt.directory;
 
     this.loadToApp(controllerBase, 'controller', opt);
-    this.options.logger.info('[egg:loader] Controller loaded: %s', controllerBase);
+    this.options.logger.info('[ee:loader] Controller loaded: %s', controllerBase);
     this.timing.end('Load Controller');
   },
 

package/core/lib/utils/index.js

@@ -32,7 +32,7 @@ module.exports = {
       if (obj.__esModule) return 'default' in obj ? obj.default : obj;
       return obj;
     } catch (err) {
-      err.message = `[egg-core] load file: ${filepath}, error: ${err.message}`;
+      err.message = `[ee-core] load file: ${filepath}, error: ${err.message}`;
       throw err;
     }
   },
@@ -65,8 +65,6 @@ module.exports = {
     let fileName;
     /* istanbul ignore else */
     if (callSite) {
-      // egg-mock will create a proxy
-      // https://github.com/eggjs/egg-mock/blob/master/lib/app.js#L174
       fileName = callSite.getFileName();
       /* istanbul ignore if */
       if (fileName && fileName.endsWith('egg-mock/lib/app.js')) {

package/core/lib/utils/sequencify.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const debug = require('debug')('egg-core#sequencify');
+const debug = require('debug')('ee-core#sequencify');
 
 function sequence(tasks, names, results, missing, recursive, nest, optional, parent) {
   names.forEach(function(name) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "1.4.0",
+  "version": "1.4.1-beta.2",
   "description": "ee core",
   "main": "index.js",
   "scripts": {

package/tools/encrypt.js

@@ -17,9 +17,12 @@ class Encrypt {
     this.config = this.loadConfig('encrypt.js');
     this.filesExt = this.config.fileExt || ['.js'];
     this.type = this.config.type || 'bytecode';
+    this.bOpt = this.config.bytecodeOptions || {};
+    this.cOpt = this.config.confusionOptions || {};
+
     const directory = this.config.directory || ['electron'];
-    this.tmpFile = '';
-    this.mapFile = '';
+    this.tmpFile = ''; // todo
+    this.mapFile = ''; // todo
 
     // cli
     if (Object.keys(this.config).length == 0) {
@@ -142,45 +145,17 @@ class Encrypt {
    * 使用 javascript-obfuscator 生成压缩/混淆文件
    */  
   generateJSConfuseFile (file) {
-    let defaultOpt = {
+    let opt = Object.assign({
       compact: true,
       stringArray: true,
-      rotateStringArray: true,
-      stringArrayEncoding: ['base64'],
       stringArrayThreshold: 1,
-      disableConsoleOutput: true,
-    }
+    }, this.cOpt);
+    
     let code = fs.readFileSync(file, "utf8");
-    let result = JavaScriptObfuscator.obfuscate(code, defaultOpt);
+    let result = JavaScriptObfuscator.obfuscate(code, opt);
     fs.writeFileSync(file, result.getObfuscatedCode(), "utf8"); 
   }
 
-  /**
-   * (废弃) 使用 uglify 生成压缩/混淆文件
-   */  
-  generateConfuseFile (file) {
-    let defaultOpt = {
-      mangle: {
-        toplevel: false,
-      },
-      compress: {
-        drop_console: true,
-        passes: 2
-      },
-      output: {
-        beautify: false
-      },
-    }
-    let options = defaultOpt;
-    if (is.object(this.config.uglifyOpt)) {
-      options = Object.assign(defaultOpt, this.config.uglifyOpt);
-    }
-
-    let code = fs.readFileSync(file, "utf8");
-    let result = UglifyJS.minify(code, options);
-    fs.writeFileSync(file, result.code, "utf8"); 
-  }
-
   /**
    * 生成字节码文件
    */
@@ -190,11 +165,13 @@ class Encrypt {
     }
     //let jscFile = curPath.replace(/.js/g, '.jsc');
     let jscFile = curPath + 'c';
-    bytenode.compileFile({
+    let opt = Object.assign({
       filename: curPath,
       output: jscFile,
       electron: true
-    });
+    }, this.bOpt);
+
+    bytenode.compileFile(opt);
 
     //fs.writeFileSync(curPath, 'require("bytenode");module.exports = require("./'+path.basename(jscFile)+'");', 'utf8');
 

package/tools/replaceDist.js

@@ -36,9 +36,7 @@ const fsPro = require('fs-extra');
     };
     
     const sourceDir = path.join(homeDir, distDir);
-    const targetDir = path.join(homeDir, 'app', 'public');
     const sourceIndexFile = path.join(sourceDir, 'index.html');
-    const targetIndexFile = path.join(homeDir, 'app', 'view', 'index.ejs');
     
     if (!fileExist(sourceIndexFile)) {
       console.error('[ee-core] [replace_dist] ERROR 前端资源不存在，请构建!!!');
@@ -55,19 +53,6 @@ const fsPro = require('fs-extra');
     fsPro.copySync(sourceDir, eeResourceDir);
     console.log('[ee-core] [replace_dist] 复制资源到:', eeResourceDir);
 
-    // 复制到egg资源目录
-    if (fs.existsSync(targetDir)) {
-      console.log('[ee-core] [replace_dist] 重置egg资源：', targetDir);
-      fs.rmdirSync(targetDir, {recursive: true});
-      
-      console.log('[ee-core] [replace_dist] 复制资源到egg:', sourceDir);
-      fsPro.copySync(sourceDir, targetDir);
-      
-      // replace ejs
-      fsPro.copySync(sourceIndexFile, targetIndexFile);
-      console.log('[ee-core] [replace_dist] 替换 egg index.ejs');
-    }
-
     console.log('[ee-core] [replace_dist] 结束');
   }
 }

package/utils/index.js

@@ -43,30 +43,36 @@ exports.getCoreDB = function() {
 }
 
 /**
- * 获取 ee配置
+ * 获取 当前环境
  */
-exports.getEeConfig = function() {
+exports.getEnv = function() {
   const cdb = this.getCoreDB();
-  const config = cdb.getItem('config');
+  const env = cdb.getItem('config').env;
 
-  return config;
+  return env;
 }
 
 /**
- * 获取 egg配置
+ * 获取 ee配置
  */
-exports.getEggConfig = function() {
+exports.getEeConfig = function() {
   const cdb = this.getCoreDB();
   const config = cdb.getItem('config');
 
-  return config.egg;
+  return config;
 }
 
 /**
  * 获取 数据库存储路径
  */
 exports.getStorageDir = function() {
-  return utilsCommon.getStorageDir();
+  const cdb = this.getCoreDB();
+  const env = cdb.getItem('config').env;
+
+  const appDir = env === 'local' || env === 'unittest' ? this.getHomeDir() : this.getAppUserDataDir();
+  const storageDir = path.join(appDir, 'data');
+
+  return storageDir;
 }
 
 /**
@@ -89,6 +95,96 @@ exports.getLogDir = function() {
   return logPath;
 }
 
+/**
+ * 获取 home目录
+ */
+exports.getHomeDir = function() {
+  const cdb = this.getCoreDB();
+  const homePath = cdb.getItem('config').homeDir;
+  return homePath;
+}
+
+/**
+ * 获取 base目录
+ */
+exports.getBaseDir = function() {
+  const cdb = this.getCoreDB();
+  const basePath = cdb.getItem('config').baseDir;
+  return basePath;
+}
+
+/**
+ * 获取 root目录
+ */
+exports.getRootDir = function() {
+  const cdb = this.getCoreDB();
+  const rootPath = cdb.getItem('config').root;
+  return rootPath;
+}
+
+/**
+ * 获取 appUserData目录
+ */
+exports.getAppUserDataDir = function() {
+  const cdb = this.getCoreDB();
+  const dataPath = cdb.getItem('config').appUserDataDir;
+  return dataPath;
+}
+
+/**
+ * 获取 app version
+ */
+exports.getAppVersion = function() {
+  const cdb = this.getCoreDB();
+  const v = cdb.getItem('config').appVersion;
+  return v;
+}
+
+/**
+ * 获取 exec目录
+ */
+exports.getExecDir = function() {
+  const cdb = this.getCoreDB();
+  const execPath = cdb.getItem('config').execDir;
+  return execPath;
+}
+
+/**
+ * 获取 插件配置
+ */
+exports.getAddonConfig = function() {
+  const cdb = this.getCoreDB();
+  const cfg = cdb.getItem('config').addons;
+  return cfg;
+}
+
+/**
+ * 获取 mainServer配置
+ */
+exports.getMainServerConfig = function() {
+  const cdb = this.getCoreDB();
+  const cfg = cdb.getItem('config').mainServer;
+  return cfg;
+}
+
+/**
+ * 获取 httpServer配置
+ */
+exports.getHttpServerConfig = function() {
+  const cdb = this.getCoreDB();
+  const cfg = cdb.getItem('config').httpServer;
+  return cfg;
+}
+
+/**
+ * 获取 socketServer配置
+ */
+exports.getSocketServerConfig = function() {
+  const cdb = this.getCoreDB();
+  const cfg = cdb.getItem('config').socketServer;
+  return cfg;
+}
+
 /**
  * 获取 socketio port
  */

package/lib/helper.js

@@ -1,52 +0,0 @@
-'use strict';
-
-const is = require('electron-is');
-const { app } = require('electron');
-
-/**
- * application quit
- * 
- * @return {undefined}
- */
-exports.appQuit = function () {
-	MAIN_WINDOW.destroy();
-	app.quit();
-}
-
-/**
- * get Platform
- * 
- * @return {Object}
- */
-exports.getPlatform = function () {
-	let platform = null;
-	let arch = null;
-	if (is.windows()) {
-		platform = 'windows';
-	} else if (is.macOS()) {
-		platform = 'macOS';
-	} else if (is.linux()) {
-		platform = 'linux';
-	} else {
-		platform = 'other';
-	}
-
-	if (is.x86()) {
-		arch = '32';
-	} else if (is.x64()) {
-		arch = '64';
-	} else if (process.arch == 'arm') {
-		arch = 'arm32';
-	} else if (process.arch == 'arm64') {
-		arch = 'arm64';
-	} else {
-		arch = 'other';
-	}
-
-	const platfromObj = {
-		platform: platform,
-		arch: arch
-	};
-
-	return platfromObj;
-}