ee-core 1.2.9-bate.1 → 1.2.10-beta.1

package/bin/tools.js

@@ -2,6 +2,7 @@
 
 const codeCompress = require('../tools/codeCompress');
 const replaceDist = require('../tools/replaceDist');
+const encrypt = require('../tools/encrypt');
 
 // argv
 const args = process.argv;
@@ -20,3 +21,7 @@ if (cmd == 'compress') {
 if (cmd == 'restore') {
   codeCompress.restore();
 }
+
+if (cmd == 'encrypt') {
+  encrypt.run();
+}

package/config/config.default.js

@@ -246,6 +246,13 @@ module.exports = appInfo => {
     enable: false
   }; 
 
+  /**
+   * TODO storage
+   */
+  config.storage = {
+    dir: path.join(appInfo.root, 'data'),
+  };
+
   /**
    * loading页（废弃）
    */

package/core/lib/loader/ee_loader.js

@@ -196,11 +196,7 @@ class EeLoader {
       home: this.getHomedir(),
 
       /**
-       * The directory whether is baseDir or HOME depend on env.
-       * it's good for test when you want to write some file to HOME,
-       * but don't want to write to the real directory,
-       * so use root to write file to baseDir instead of HOME when unittest.
-       * keep root directory in baseDir when local and unittest
+       * The directory whether is homeDir or appUserData depend on env.
        * @member {String} AppInfo#root
        */
       root: env === 'local' || env === 'unittest' ? this.getHomedir() : this.options.appUserData,

package/lib/application.js

@@ -2,6 +2,7 @@ const {app} = require('electron');
 const path = require('path');
 const EeApp = require('./eeApp');
 const debug = require('debug')('ee-core:Appliaction');
+const fs = require('fs');
 
 class Appliaction extends EeApp {
   constructor() {
@@ -45,6 +46,13 @@ class Appliaction extends EeApp {
       options.execDir = path.dirname(app.getPath('exe'));
     }
 
+    // Use encryption, base directory is public/electron
+    const encryptDir = path.join(app.getAppPath(), 'public', 'electron');
+    let isEncrypted = fs.existsSync(encryptDir);
+    if (options.env == 'prod' && isEncrypted) {
+      options.baseDir = encryptDir;
+    }
+
     // normalize env
     env.NODE_ENV = 'production';
     env.EE_HOME = options.homeDir;
@@ -57,6 +65,8 @@ class Appliaction extends EeApp {
     env.EE_SOCKET_PORT = null;
     env.EE_HTTP_PORT = null;
     env.HOT_RELOAD = hotReload;
+    env.EE_EXEC_DIR = options.execDir;
+    env.EE_DATABASE_DIR = null;
     debug('options:%j', options)
 
     super(options);
@@ -67,8 +77,7 @@ class Appliaction extends EeApp {
 
     await this.createPorts();
 
-    this.startSocket();
-    //return;
+    await this.startSocket();
 
     await this.ready();
 

package/lib/baseApp.js

@@ -19,6 +19,9 @@ class BaseApp extends EeAppCore {
 
     this.loader.loadConfig();
     
+    // todo
+    //this.setDatabaseDir();
+
     // 缓存配置
     this.getCoreDB().setItem('config', this.config);
 
@@ -108,6 +111,18 @@ class BaseApp extends EeAppCore {
     return this[HTTPCLIENT];
   }
 
+  /**
+   * todo 设置db存储目录
+   */
+  setDatabaseDir (dirPath) {
+    if (dirPath) {
+      assert(typeof dirPath === 'string', ` ${dirPath} dirPath required, and must be a string`);
+      process.env.EE_DATABASE_DIR = dirPath;
+    } else {
+      process.env.EE_DATABASE_DIR = this.config.database.dir;
+    }
+  }
+
   /**
    * core app have been loaded
    */

package/lib/eeApp.js

@@ -47,7 +47,7 @@ class EeApp extends BaseApp {
   /**
    * 启动通信模块
    */
-  startSocket () {
+  async startSocket () {
     const socket = require('./socket/start');
     socket(this);
   }
@@ -100,11 +100,6 @@ class EeApp extends BaseApp {
     const winOptions = this.config.windowsOption;
     this.electron.mainWindow = new BrowserWindow(winOptions);
     let win = this.electron.mainWindow;
-    if (winOptions.show === false) {
-      win.once('ready-to-show', () => {
-        win.show();
-      })
-    }
 
     // 菜单显示/隐藏
     if (this.config.openAppMenu === 'dev-show'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "1.2.9-bate.1",
+  "version": "1.2.10-beta.1",
   "description": "ee core",
   "main": "index.js",
   "scripts": {

package/tools/encrypt.js

@@ -0,0 +1,182 @@
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const fsPro = require('fs-extra');
+const UglifyJS = require('uglify-js');
+
+class Encrypt {
+  constructor() {
+
+    // argv
+    this.type = '';
+    for (let i = 0; i < process.argv.length; i++) {
+      let tmpArgv = process.argv[i];
+      if (tmpArgv.indexOf('--type=') !== -1) {
+        this.type = tmpArgv.substring(7);
+      }
+    }
+
+    const directory = [
+      'electron',
+    ];
+    this.dirs = [];
+
+    this.basePath = process.cwd();
+    // if (this.type == 'uglify') {
+    //   this.encryptCodeDir = path.join(this.basePath, 'public');
+    // }
+    this.encryptCodeDir = path.join(this.basePath, 'public');
+
+    // 检查存在的目录
+    for (let i = 0; i < directory.length; i++) {
+      let codeDirPath = path.join(this.basePath, directory[i]);
+      if (fs.existsSync(codeDirPath)) {
+        this.dirs.push(directory[i]);
+      }
+    }
+    console.log('dirs:', this.dirs);
+  }
+
+  /**
+   * 备份 electron目录代码
+   */
+  backup () {
+    console.log('[ee-core] [encrypt] backup start');
+
+    for (let i = 0; i < this.dirs.length; i++) {
+      // check code dir
+      let codeDirPath = path.join(this.basePath, this.dirs[i]);
+      if (!fs.existsSync(codeDirPath)) {
+        console.log('[ee-core] [encrypt] backup ERROR: %s is not exist', codeDirPath);
+        return
+      }
+
+      let targetDir = path.join(this.encryptCodeDir, this.dirs[i]);
+
+      // remove old
+      this.rmBackup(targetDir);
+
+      // copy
+      console.log('[ee-core] [encrypt] backup targetDir:', targetDir);
+      if (!fs.existsSync(targetDir)) {
+        this.mkdir(targetDir);
+        this.chmodPath(targetDir, '777');
+      }
+
+      fsPro.copySync(codeDirPath, targetDir);
+    }
+    console.log('[ee-core] [encrypt] backup success');
+  }
+
+  /**
+   * 压缩代码
+   */
+  compress () {
+    console.log('[ee-core] [encrypt] compress start');
+    for (let i = 0; i < this.dirs.length; i++) {
+      let codeDirPath = path.join(this.encryptCodeDir, this.dirs[i]);
+      this.compressLoop(codeDirPath);
+    }
+    console.log('[ee-core] [encrypt] compress success');
+  };
+
+  compressLoop (dirPath) {
+    let files = [];
+    if (fs.existsSync(dirPath)) {
+      files = fs.readdirSync(dirPath);
+      files.forEach((file, index) => {
+        let curPath = dirPath + '/' + file;        
+        if (fs.statSync(curPath).isDirectory()) {
+          this.compressLoop(curPath);
+        } else {
+          if (path.extname(curPath) === '.js') {
+            this.miniFile(curPath);
+          }
+        }
+      });
+    }
+  }
+
+  miniFile (file) {
+    let code = fs.readFileSync(file, "utf8");
+    const options = {
+      mangle: {
+        toplevel: false,
+      },
+    };
+    
+    let result = UglifyJS.minify(code, options);
+    fs.writeFileSync(file, result.code, "utf8"); 
+  }
+
+  /**
+   * 移除备份
+   */
+  rmBackup (dir) {
+    if (fs.existsSync(dir)) {
+      console.log('[ee-core] [encrypt] clean old directory:', dir);
+      fs.rmSync(dir, {recursive: true, force: true});
+    }
+    return;
+  }
+
+  /**
+   * 检查文件是否存在
+   */
+  fileExist (filePath) {
+    try {
+      return fs.statSync(filePath).isFile();
+    } catch (err) {
+      return false;
+    }
+  };
+
+  mkdir (dirpath, dirname) {
+    // 判断是否是第一次调用
+    if (typeof dirname === 'undefined') {
+      if (fs.existsSync(dirpath)) {
+        return;
+      }
+      this.mkdir(dirpath, path.dirname(dirpath));
+    } else {
+      // 判断第二个参数是否正常，避免调用时传入错误参数
+      if (dirname !== path.dirname(dirpath)) {
+        this.mkdir(dirpath);
+        return;
+      }
+      if (fs.existsSync(dirname)) {
+        fs.mkdirSync(dirpath);
+      } else {
+        this.mkdir(dirname, path.dirname(dirname));
+        fs.mkdirSync(dirpath);
+      }
+    }
+  };
+
+  chmodPath (path, mode) {
+    let files = [];
+    if (fs.existsSync(path)) {
+      files = fs.readdirSync(path);
+      files.forEach((file, index) => {
+        const curPath = path + '/' + file;
+        if (fs.statSync(curPath).isDirectory()) {
+          this.chmodPath(curPath, mode); // 递归删除文件夹
+        } else {
+          fs.chmodSync(curPath, mode);
+        }
+      });
+      fs.chmodSync(path, mode);
+    }
+  };
+}
+
+const run = () => {
+  const e = new Encrypt();
+  e.backup();
+  e.compress();
+}
+
+module.exports = {
+  run
+};

package/utils/index.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const fs = require('fs');
 const path = require('path');
 const constant = require('../lib/constant');
 const convert = require('koa-convert');
@@ -8,51 +7,21 @@ const is = require('is-type-of');
 const co = require('co');
 const utility = require('utility');
 const eis = require('electron-is');
+const utilsCommon = require('./common');
 
 /**
  * 创建文件夹
  */
-exports.mkdir = function(dirpath, dirname) {
-  // 判断是否是第一次调用
-  if (typeof dirname === 'undefined') {
-    if (fs.existsSync(dirpath)) {
-      return;
-    }
-    this.mkdir(dirpath, path.dirname(dirpath));
-  } else {
-    // 判断第二个参数是否正常，避免调用时传入错误参数
-    if (dirname !== path.dirname(dirpath)) {
-      this.mkdir(dirpath);
-      return;
-    }
-    if (fs.existsSync(dirname)) {
-      fs.mkdirSync(dirpath);
-    } else {
-      this.mkdir(dirname, path.dirname(dirname));
-      fs.mkdirSync(dirpath);
-    }
-  }
-};
+exports.mkdir = function (dirpath, dirname) {
+  return utilsCommon.mkdir(dirpath, dirname);
+}
 
 /**
  * 修改文件权限
  */
-exports.chmodPath = function(path, mode) {
-  let files = [];
-  if (fs.existsSync(path)) {
-    files = fs.readdirSync(path);
-    files.forEach((file, index) => {
-      const curPath = path + '/' + file;
-      if (fs.statSync(curPath).isDirectory()) {
-        this.chmodPath(curPath, mode); // 递归删除文件夹
-      } else {
-        fs.chmodSync(curPath, mode);
-      }
-    });
-    fs.chmodSync(path, mode);
-  }
-};
-
+exports.chmodPath = function (path, mode) {
+  return utilsCommon.chmodPath(path, mode);
+}
 
 /**
  * 获取项目根目录package.json
@@ -97,10 +66,7 @@ exports.getEggConfig = function() {
  * 获取 数据库存储路径
  */
 exports.getStorageDir = function() {
-  const cdb = this.getCoreDB();
-  const dirPath = cdb.getStorageDir();
-
-  return dirPath;
+  return utilsCommon.getStorageDir();
 }
 
 /**
@@ -118,7 +84,8 @@ exports.getAppUserDataDir = function() {
  * 获取 日志目录
  */
 exports.getLogDir = function() {
-  const logPath = path.join(this.getAppUserDataDir(), 'logs');
+  const cdb = this.getCoreDB();
+  const logPath = cdb.getItem('config').logger.dir;
   return logPath;
 }
 
@@ -180,28 +147,5 @@ exports.middleware = function (fn) {
  * 版本号比较
  */
 exports.compareVersion = function (v1, v2) {
-  v1 = v1.split('.')
-  v2 = v2.split('.')
-  const len = Math.max(v1.length, v2.length)
-
-  while (v1.length < len) {
-    v1.push('0')
-  }
-  while (v2.length < len) {
-    v2.push('0')
-  }
-  
-  for (let i = 0; i < len; i++) {
-    const num1 = parseInt(v1[i])
-    const num2 = parseInt(v2[i])
-
-    if (num1 > num2) {
-      return 1
-    } else if (num1 < num2) {
-      return -1
-    }
-  }
-
-  return 0
-}
-
+  return utilsCommon.compareVersion(v1, v2);
+}

package/resource/loading.html

@@ -1,22 +0,0 @@
-<html>
- <head> 
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
-  <style type="text/css">
-    body{
-      margin:0px auto;
-    }
-    #picture1 {
-      position: absolute;
-      left: 50%;
-      top: 35%;
-      transform: translate(-50%, -50%);
-    }
-  </style> 
-  <title></title> 
- </head> 
- <body> 
-  <div id="picture1">
-   <img src="./images/loding.gif" />
-  </div>  
- </body>
-</html>

package/resource/view_example.html

@@ -1,22 +0,0 @@
-<html>
- <head> 
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
-  <style type="text/css">
-    body{
-      margin:0px auto;
-    }
-    #content {
-      position: absolute;
-      left: 50%;
-      top: 35%;
-      transform: translate(-50%, -50%);
-    }
-  </style> 
-  <title></title> 
- </head> 
- <body> 
-  <div id="content">
-    这是一个html页面
-  </div>  
- </body>
-</html>