ee-core 2.1.0-beta.3 → 2.1.0-beta.4

package/ee/application.js

@@ -2,8 +2,9 @@ const Exception = require('../exception');
 const {app} = require('electron');
 const path = require('path');
 const debug = require('debug')('ee-core:Appliaction');
-const fs = require('fs');
 const EeApp = require('./eeApp');
+const Utils = require('../utils');
+const Ps = require('../ps');
 
 class Appliaction extends EeApp {
   constructor() {
@@ -43,10 +44,10 @@ class Appliaction extends EeApp {
       options.execDir = path.dirname(app.getPath('exe'));
     }
 
+    // Todo app.getAppPath() ??? process.cwd()
     // Use encryption, base directory is public/electron
-    const encryptDir = path.join(app.getAppPath(), 'public', 'electron');
-    if (options.env == 'prod' && fs.existsSync(encryptDir)) {
-      options.baseDir = encryptDir;
+    if (options.env == 'prod' && Utils.isEncrypt(app.getAppPath())) {
+      options.baseDir = Ps.getEncryptDir(app.getAppPath());
       options.isEncrypted = true;
     }
 

package/ee/index.js

@@ -1,3 +1,4 @@
+const Utils = require('../utils');
 const EEApplication = Symbol('Ee#Application');
 
 const EE = {
@@ -24,7 +25,14 @@ const EE = {
    */  
   get app() {
     return this[EEApplication] || null;
-  },  
+  },
+
+  /**
+   * 是否加密
+   */  
+  isEncrypt(basePath) {
+    return Utils.isEncrypt(basePath);
+  },
 }  
 
 module.exports = EE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "2.1.0-beta.3",
+  "version": "2.1.0-beta.4",
   "description": "ee core",
   "main": "index.js",
   "scripts": {

package/ps/index.js

@@ -1,6 +1,5 @@
 const path = require('path');
 const eis = require('../utils/is');
-const Log = require('../log');
 
 /**
  * 当前进程的所有env
@@ -112,6 +111,15 @@ exports.getLogDir = function () {
   return dir;
 }
 
+/**
+ * 获取加密文件路径
+ */
+exports.getEncryptDir = function (basePath) {
+  const base = basePath || process.cwd();
+  const dir = path.join(base, 'public', 'electron');
+  return dir;
+}
+
 /**
  * 获取root目录  (dev-项目根目录，pro-app user data目录)
  */

package/utils/index.js

@@ -2,6 +2,7 @@
 
 const os = require("os");
 const path = require('path');
+const fs = require('fs');
 const Ps = require('../ps');
 const UtilsJson = require('./json');
 
@@ -57,5 +58,15 @@ exports.isMAC = function(macAddress) {
   return macRegex.test(macAddress);
 }
 
+/**
+ * is encrypt
+ */
+exports.isEncrypt = function(basePath) {
+  const encryptDir = Ps.getEncryptDir(basePath);
+  if (fs.existsSync(encryptDir)) {
+    return true;
+  }
+  return false;
+}