ee-core 2.0.0-beta.1 → 2.0.0-beta.3

package/module/storage/jsondb/adapters/FileSync.js

@@ -7,7 +7,7 @@ class FileSync extends Base {
     if (fs.existsSync(this.source)) {
       // Read database
       try {
-        const data = fs.readFileSync(this.source, {encoding: 'utf8'})
+        const data = fs.readFileSync(this.source, {encoding: 'utf8'}).trim()
 
         // Handle blank file
         return data ? this.deserialize(data) : this.defaultValue
@@ -19,13 +19,13 @@ class FileSync extends Base {
       }
     } else {
       // Initialize
-      fs.writeFileSync(this.source, this.serialize(this.defaultValue))
+      fs.writeFileSync(this.source, this.serialize(this.defaultValue), {flag:'w+'})
       return this.defaultValue
     }
   }
 
   write(data) {
-    return fs.writeFileSync(this.source, this.serialize(data))
+    return fs.writeFileSync(this.source, this.serialize(data), {flag:'w+'})
   }
 }
 

package/module/storage/jsondbStorage.js

@@ -20,7 +20,6 @@ class JsondbStorage {
     const storageDir = Ps.getStorageDir();
     if (!fs.existsSync(storageDir)) {
       Helper.mkdir(storageDir);
-      Helper.chmodPath(storageDir, '777');
     }
 
     this.db = this.table(name);

package/module/utils/helper.js

@@ -49,8 +49,8 @@ exports.getRandomString = function() {
 /**
  * 创建文件夹
  */
-exports.mkdir = function(filepath) {
-  mkdirp.sync(path.dirname(filepath));
+exports.mkdir = function(filepath, opt = {}) {
+  mkdirp.sync(filepath, opt);
   return
 }
 

package/module/utils/index.js

@@ -1,24 +1,14 @@
 const path = require('path');
-const eis = require('electron-is');
 const Storage = require('../storage');
 const Constants = require('../const');
 const Ps = require('./ps');
-const Helper = require('./helper');
 const UtilsJson = require('./json');
-const Copy = require('./copyto');
-
-/**
- * other module
- */
-Copy(Ps)
-.and(Helper)
-.to(exports);
 
 /**
  * 获取项目根目录package.json
  */
 exports.getPackage = function() {
-  const json = UtilsJson.readSync(path.join(this.getHomeDir(), 'package.json'));
+  const json = UtilsJson.readSync(path.join(Ps.getHomeDir(), 'package.json'));
   
   return json;
 };
@@ -93,28 +83,4 @@ exports.getSocketChannel = function() {
   return Constants.socketIo.channel;
 }
 
-/**
- * 获取 额外资源目录
- */
-exports.getExtraResourcesDir = function() {
-  const execDir = this.getExecDir();
-  const isPackaged = this.isPackaged();
-
-
-  // 资源路径不同
-  let dir = '';
-  if (isPackaged) {
-    // 打包后  execDir为 应用程序 exe\dmg\dep软件所在目录；打包前该值是项目根目录
-    // windows和MacOs不一样
-    dir = path.join(execDir, "resources", "extraResources");
-    if (eis.macOS()) {
-      dir = path.join(execDir, "..", "Resources", "extraResources");
-    }
-  } else {
-    // 打包前
-    dir = path.join(execDir, "build", "extraResources");
-  }
-  return dir;
-}
-
 

package/module/utils/ps.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const eis = require('electron-is');
 
 /**
  * 当前进程的所有env
@@ -112,12 +113,43 @@ exports.getRootDir = function () {
 }
 
 /**
- * 获取 base目录
+ * 获取base目录
  */
 exports.getBaseDir = function() {
   return process.env.EE_BASE_DIR;
 }
 
+/**
+ * 获取electron目录
+ */
+exports.getElectronDir = function() {
+  return process.env.EE_BASE_DIR;
+}
+
+/**
+ * 获取 额外资源目录
+ */
+exports.getExtraResourcesDir = function() {
+  const execDir = this.getExecDir();
+  const isPackaged = this.isPackaged();
+
+
+  // 资源路径不同
+  let dir = '';
+  if (isPackaged) {
+    // 打包后  execDir为 应用程序 exe\dmg\dep软件所在目录；打包前该值是项目根目录
+    // windows和MacOs不一样
+    dir = path.join(execDir, "resources", "extraResources");
+    if (eis.macOS()) {
+      dir = path.join(execDir, "..", "Resources", "extraResources");
+    }
+  } else {
+    // 打包前
+    dir = path.join(execDir, "build", "extraResources");
+  }
+  return dir;
+}
+
 /**
  * 获取 appUserData目录
  */
@@ -171,5 +203,19 @@ exports.getHttpPort = function () {
  * 是否打包
  */
 exports.isPackaged = function () {
-  return process.env.EE_IS_PACKAGED;
+  return process.env.EE_IS_PACKAGED === 'true';
+}
+
+/**
+ * 是否加密
+ */
+exports.isEncrypted = function () {
+  return process.env.EE_IS_ENCRYPTED === 'true';
+}
+
+/**
+ * 是否热重启
+ */
+exports.isHotReload = function () {
+  return process.env.HOT_RELOAD === 'true';
 }

package/package.json

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

package/tools/encrypt.js

@@ -7,7 +7,7 @@ const is = require('is-type-of');
 const bytenode = require('bytenode');
 const crypto = require('crypto');
 const JavaScriptObfuscator = require('javascript-obfuscator');
-const utilsJson = require('../module/utils/json');
+const UtilsJson = require('../module/utils/json');
 
 class Encrypt {
   constructor() {
@@ -41,20 +41,20 @@ class Encrypt {
         this.dirs.push(directory[i]);
       }
     }
-    console.log('[ee-core] [encrypt] dirs:', this.dirs);
+    console.log('[ee-core] [tools/encrypt] dirs:', this.dirs);
   }
 
   /**
    * 备份 electron 目录代码
    */
   backup () {
-    console.log('[ee-core] [encrypt] backup start');
+    console.log('[ee-core] [tools/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] ERROR: backup %s is not exist', codeDirPath);
+        console.log('[ee-core] [tools/encrypt] ERROR: backup %s is not exist', codeDirPath);
         return
       }
 
@@ -64,7 +64,7 @@ class Encrypt {
       this.rmBackup(targetDir);
 
       // copy
-      console.log('[ee-core] [encrypt] backup target Dir:', targetDir);
+      console.log('[ee-core] [tools/encrypt] backup target Dir:', targetDir);
       if (!fs.existsSync(targetDir)) {
         this.mkdir(targetDir);
         this.chmodPath(targetDir, '777');
@@ -72,7 +72,7 @@ class Encrypt {
 
       fsPro.copySync(codeDirPath, targetDir);
     }
-    console.log('[ee-core] [encrypt] backup end');
+    console.log('[ee-core] [tools/encrypt] backup end');
     return true;
   }
   
@@ -86,7 +86,7 @@ class Encrypt {
         const content = {
           nameMap: {}
         };
-        utilsJson.writeSync(this.tmpFile, content);
+        UtilsJson.writeSync(this.tmpFile, content);
       }
     }
 
@@ -97,13 +97,13 @@ class Encrypt {
    * 加密代码
    */
   encrypt () {
-    console.log('[ee-core] [encrypt] start ciphering');
+    console.log('[ee-core] [tools/encrypt] start ciphering');
     for (let i = 0; i < this.dirs.length; i++) {
       let codeDirPath = path.join(this.encryptCodeDir, this.dirs[i]);
       this.loop(codeDirPath);
     }
 
-    console.log('[ee-core] [encrypt] end ciphering');
+    console.log('[ee-core] [tools/encrypt] end ciphering');
   };
 
   /**
@@ -183,7 +183,7 @@ class Encrypt {
    */
   rmBackup (dir) {
     if (fs.existsSync(dir)) {
-      console.log('[ee-core] [encrypt] clean old directory:', dir);
+      console.log('[ee-core] [tools/encrypt] clean old directory:', dir);
       fsPro.removeSync(dir);
     }
     return;

package/tools/replaceDist.js

@@ -14,7 +14,7 @@ const fsPro = require('fs-extra');
    * 执行
    */  
   run () {
-    console.log('[ee-core] [replace_dist] 开始移动资源');
+    console.log('[ee-core] [tools/rd] 开始移动资源');
     const homeDir = process.cwd();
 
     // argv
@@ -30,7 +30,7 @@ const fsPro = require('fs-extra');
       try {
         return fs.statSync(filePath).isFile();
       } catch (err) {
-        console.error('[ee-core] [replace_dist] ERROR ', err);
+        console.error('[ee-core] [tools/rd] ERROR ', err);
         return false;
       }
     };
@@ -39,7 +39,7 @@ const fsPro = require('fs-extra');
     const sourceIndexFile = path.join(sourceDir, 'index.html');
     
     if (!fileExist(sourceIndexFile)) {
-      console.error('[ee-core] [replace_dist] ERROR 前端资源不存在，请构建!!!');
+      console.error('[ee-core] [tools/rd] ERROR 前端资源不存在，请构建!!!');
       return
     }
     
@@ -48,12 +48,12 @@ const fsPro = require('fs-extra');
 
     // 清空历史资源
     fs.rmdirSync(eeResourceDir, {recursive: true});
-    console.log('[ee-core] [replace_dist] 清空历史资源:', eeResourceDir);
+    console.log('[ee-core] [tools/rd] 清空历史资源:', eeResourceDir);
 
     fsPro.copySync(sourceDir, eeResourceDir);
-    console.log('[ee-core] [replace_dist] 复制资源到:', eeResourceDir);
+    console.log('[ee-core] [tools/rd] 复制资源到:', eeResourceDir);
 
-    console.log('[ee-core] [replace_dist] 结束');
+    console.log('[ee-core] [tools/rd] 结束');
   }
 }
 

package/utils/index.js

@@ -3,7 +3,6 @@
  */
 
 const path = require('path');
-const eis = require('electron-is');
 const UtilsJson = require('../module/utils/json');
 const UtilsPs = require('../module/utils/ps');
 const UtilsHelper = require('../module/utils/helper');
@@ -105,25 +104,3 @@ exports.getSocketPort = function() {
 exports.getSocketChannel = function() {
   return Constants.socketIo.channel;
 }
-
-/**
- * 获取 额外资源目录
- */
-exports.getExtraResourcesDir = function() {
-  const execDir = this.getExecDir();
-
-  // 资源路径不同
-  let dir = '';
-  if (config.isPackaged) {
-    // 打包后  execDir为 应用程序 exe\dmg\dep软件所在目录；打包前该值是项目根目录
-    // windows和MacOs不一样
-    dir = path.join(execDir, "resources", "extraResources");
-    if (eis.macOS()) {
-      dir = path.join(execDir, "..", "Resources", "extraResources");
-    }
-  } else {
-    // 打包前
-    dir = path.join(execDir, "build", "extraResources");
-  }
-  return dir;
-}