ee-core 2.0.0-beta.2 → 2.0.0-beta.4

package/module/loader/index.js

@@ -1,8 +1,8 @@
 const is = require('is-type-of');
 const fs = require('fs');
 const path = require('path');
-const UtilsCore = require('../../core/lib/utils');
-const Ps = require('../utils/ps');
+const UtilsCore = require('../core/lib/utils');
+const Ps = require('../ps');
 const Log = require('../log');
 
 module.exports = {
@@ -23,7 +23,7 @@ module.exports = {
 
     filepath = filepath && this.resolveModule(filepath);
     if (!fs.existsSync(filepath)) {
-      let errorMsg = `[ee-core] [module/loader/index] loadOneFile ${filepath} does not exist`;
+      let errorMsg = `[ee-core] [loader/index] loadOneFile ${filepath} does not exist`;
       Log.coreLogger.error(errorMsg);
       throw new Error(errorMsg);
     }
@@ -36,26 +36,48 @@ module.exports = {
   },
 
   /**
-   * 加载job文件
+   * 加载js文件
    *
    * @param {String} filepath - fullpath
-   * @param {Array} inject - pass rest arguments into the function when invoke
-   * @return {Object} exports
+   * @return {Any} exports
    * @since 1.0.0
    */
-  loadJobFile (filepath, ...inject) {
+  loadJsFile (filepath) {
     if (!fs.existsSync(filepath)) {
-      let warnMsg = `[ee-core] [module/loader/index] loadJobFile ${filepath} does not exist`;
-      Log.coreLogger.error(warnMsg);
+      let errMsg = `[ee-core] [loader] loadJobFile ${filepath} does not exist`;
+      Log.coreLogger.error(errMsg);
+      return;
     }
 
     const ret = UtilsCore.loadFile(filepath);
-    if (is.function(ret) && !is.class(ret) && !UtilsCore.isBytecodeClass(ret)) {
-      ret = ret(...inject);
-    }
     return ret;
   },  
 
+  /**
+   * 加载并运行js文件
+   *
+   * @param {String} filepath - fullpath
+   * @param {Array} inject - pass rest arguments into the function when invoke
+   * @return {Any}
+   * @since 1.0.0
+   */
+  execJsFile (filepath, ...inject) {
+    if (!fs.existsSync(filepath)) {
+      let errMsg = `[ee-core] [loader] loadJobFile ${filepath} does not exist`;
+      Log.coreLogger.error(errMsg);
+      return;
+    }
+
+    let ret = UtilsCore.loadFile(filepath);
+    if (is.class(ret) || UtilsCore.isBytecodeClass(ret)) {
+      ret = new ret(inject);
+    } else if (is.function(ret)) {
+      ret = ret(inject);
+    }
+
+    return ret;
+  }, 
+
   /**
    * 模块的绝对路径
    * @param {String} filepath - fullpath
@@ -75,7 +97,7 @@ module.exports = {
 
       if (!fs.existsSync(filepath) && !fs.existsSync(fullpath)) {
         let files = { filepath, fullpath }
-        Log.coreLogger.warn(`[ee-core] [module-loader-resolveModule] unknow filepath: ${files}`)
+        Log.coreLogger.warn(`[ee-core] [loader] resolveModule unknow filepath: ${files}`)
         return undefined;
       }
     }
@@ -99,7 +121,7 @@ module.exports = {
 
     fullpath = this.resolveModule(filepath);
     if (!fs.existsSync(fullpath)) {
-      let errorMsg = `[ee-core] [module-loader-index] requireModule filepath: ${filepath} does not exist`;
+      let errorMsg = `[ee-core] [loader] requireModule filepath: ${filepath} does not exist`;
       Log.coreLogger.error(errorMsg);
     }
     const ret = UtilsCore.loadFile(fullpath);

package/module/log/logger.js

@@ -1,6 +1,6 @@
 const Loggers = require('egg-logger').EggLoggers;
 const assert = require('assert');
-const Ps = require('../utils/ps');
+const Ps = require('../ps');
 const Storage = require('../storage');
 
 module.exports = {

package/module/message/childMessage.js

@@ -0,0 +1,31 @@
+const Channel = require('../const/channel');
+
+class ChildMessage {
+  constructor() {
+    // ...
+  }
+
+  /**
+   * 向主进程发消息
+   */
+  sendToMain(eventName, params = {}) {
+    let message = {
+      channel: Channel.process.sendToMain,
+      event: eventName,
+      data: params,
+    }
+
+    return process.send(message);
+  }
+
+  /**
+   * 进程退出
+   */
+  exit(code = 0) {
+    return process.exit(code);
+  }
+}
+
+
+
+module.exports = ChildMessage;

package/module/message/index.js

@@ -1,13 +1,21 @@
-const { isDev, isRenderer, isMain } = require('../utils/ps');
+const ChildMessage = require('./childMessage');
+const EEChildMessage = Symbol('EeCore#Module#ChildMessage');
 
-const m = {};
+const message = {
 
-if (isMain) {
-  m.d = require();
-}
+  /**
+   * childMessage
+   */
+  get childMessage() {
+    if (!this[EEChildMessage]) {
+      this[EEChildMessage] = new ChildMessage();
+    }
 
-if (isRenderer) {
-  m.d = require();
-}
+    return this[EEChildMessage] || null;
+  },
 
-module.exports = m;
+};
+
+
+
+module.exports = message;

package/{utils → module/oldUtils}/index.js

@@ -3,13 +3,12 @@
  */
 
 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');
-const Copy = require('../module/utils/copyto');
-const Storage = require('../module/storage');
-const Constants = require('../module/const');
+const UtilsJson = require('../utils/json');
+const UtilsPs = require('../ps');
+const UtilsHelper = require('../utils/helper');
+const Copy = require('../utils/copyto');
+const Storage = require('../storage');
+const Constants = require('../const');
 
 /**
  * other module
@@ -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;
-}

package/module/{utils/ps.js → ps/index.js}

@@ -1,4 +1,5 @@
 const path = require('path');
+const eis = require('electron-is');
 
 /**
  * 当前进程的所有env
@@ -125,6 +126,30 @@ 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目录
  */
@@ -193,4 +218,24 @@ exports.isEncrypted = function () {
  */
 exports.isHotReload = function () {
   return process.env.HOT_RELOAD === 'true';
+}
+
+/**
+ * 进程退出
+ */
+exports.exit = function(code = 0) {
+  return process.exit(code);
+}
+
+/**
+ * 格式化message
+ */
+exports.makeMessage = function(msg = {}) {
+  let message = Object.assign({
+    channel: '',
+    event: '', 
+    data: {}
+  }, msg);
+
+  return message;
 }

package/module/service/index.js

@@ -0,0 +1,34 @@
+'use strict';
+
+/**
+ * BaseContextClass is a base class that can be extended,
+ * it's instantiated in context level,
+ * {@link Helper}, {@link Service} is extending it.
+ */
+class BaseContextClass {
+
+  /**
+   * @class
+   * @param {Context} ctx - context instance
+   * @since 1.0.0
+   */
+  constructor(ctx) {
+    /**
+     * @member {Application} BaseContextClass#app
+     * @since 1.0.0
+     */
+    this.app = ctx;
+    /**
+     * @member {Config} BaseContextClass#config
+     * @since 1.0.0
+     */
+    this.config = ctx.config;
+    /**
+     * @member {Service} BaseContextClass#service
+     * @since 1.0.0
+     */
+    this.service = ctx.service;
+  }
+}
+
+module.exports = BaseContextClass;

package/module/socket/httpServer.js

@@ -9,6 +9,7 @@ const https = require('https');
 const fs = require('fs');
 const path = require('path');
 const _ = require('lodash');
+const Log = require('../log');
 
 /**
  * http server
@@ -60,16 +61,16 @@ class HttpServer {
       })
       .use(this.dispatch);
 
-    let msg = '[ee-core:http:server] server is: ' + url;
+    let msg = '[ee-core] [socket/httpServer] server is: ' + url;
     if (isHttps) {
       https.createServer(sslOptions, koaApp.callback()).listen(httpServer.port, (err) => {
         msg = err ? err : msg;
-        self.app.coreLogger.info(msg);
+        Log.coreLogger.info(msg);
       });
     } else {
       koaApp.listen(httpServer.port, (e) => {
         msg = e ? e : msg;
-        self.app.coreLogger.info(msg);
+        Log.coreLogger.info(msg);
       });
     }  
   }

package/module/socket/io.js

@@ -3,7 +3,7 @@
 const IoServer = require('socket.io');
 const IoClient = require('socket.io-client');
 //const socketServer = require('./socketServer');
-const socketClient = require('./socketClient');
+// const socketClient = require('./socketClient');
 const Koa = require('koa');
 
 const EeSocket = {
@@ -11,7 +11,7 @@ const EeSocket = {
     //return socketServer.getInstance();
   },
   getClient: () => {
-    return socketClient.getInstance();
+    //return socketClient.getInstance();
   }
 }
 

package/module/socket/ipcServer.js

@@ -1,24 +1,21 @@
 const debug = require('debug')('ee-core:ipcServer');
-const EggConsoleLogger = require('egg-logger').EggConsoleLogger;
 const is = require('is-type-of');
 const { ipcMain } = require('electron');
 const path = require('path');
 const fs = require('fs');
 const globby = require('globby');
-const Utils = require('../../core/lib/utils');
+const Utils = require('../core/lib/utils');
 const Wrap = require('../utils/wrap');
+const Log = require('../log');
 
 class IpcServer {
   constructor (app) {
-
     this.app = app;
-    this.consoleLogger = new EggConsoleLogger();
-    this.consoleLogger.info('[ee-core:socket:ipcMain] start ipcMain');
     this.register();
   }
 
   register () {
-    this.consoleLogger.info('[ee-core:socket:ipcMain] register channels');
+    console.log('[ee-core] [socket/IpcServer] register channels');
 
     const self = this;
     // 遍历方法
@@ -78,7 +75,7 @@ class IpcServer {
             
             return fn;
           } catch (err) {
-            app.logger.error('[ee:socket:ipcMain] throw error:', err);
+            Log.coreLogger.error('[ee-core] [socket/IpcServer] throw error:', err);
           }
           return null;
         }

package/module/socket/socketClient.js

@@ -3,19 +3,16 @@
 const assert = require('assert');
 const IoClient = require('socket.io-client');
 const Constants = require('../const');
-const EggConsoleLogger = require('egg-logger').EggConsoleLogger;
 const Storage = require('../storage');
 
 class SocketClient {
   constructor (port) {
-    this.consoleLogger = new EggConsoleLogger();
     port = port ? parseInt(port) : this.getSocketcPort();
 
     assert(typeof port === 'number', 'port required, and must be a number');
-    this.consoleLogger.info('[ee-core:socket:client] start client');
     
-    const url  = 'http://127.0.0.1:' + port;
-    this.consoleLogger.info('[ee-core:socket:client] url:', url);
+    const url  = 'http://localhost:' + port;
+    console.log('[ee-core] [socket/socketClient] url:', url);
     this.client = IoClient(url);
   }
 

package/module/socket/socketServer.js

@@ -2,10 +2,10 @@
 
 const assert = require('assert');
 const { Server } = require('socket.io');
-const EggConsoleLogger = require('egg-logger').EggConsoleLogger;
 const is = require('is-type-of');
 const Storage = require('../storage');
 const Constants = require('../const');
+const Log = require('../log');
 
 /**
  * socket server
@@ -14,7 +14,6 @@ class SocketServer {
   constructor (app) {
     this.app = app;
     const options = this.app.config.socketServer;
-    this.consoleLogger = new EggConsoleLogger();
 
     if (!options.enable) {
       return;
@@ -22,7 +21,7 @@ class SocketServer {
 
     let port = process.env.EE_SOCKET_PORT ? parseInt(process.env.EE_SOCKET_PORT) : parseInt(this.getSocketPort());
     assert(typeof port === 'number', 'socekt port required, and must be a number');
-    this.consoleLogger.info('[ee-core:socket:server] socket server port is:', port);
+    this.consoleLogger.info('[ee-core] [socket/socketServer] port is:', port);
 
     // let opt = Object.assign({}, options);
     // delete opt.enable;
@@ -32,11 +31,10 @@ class SocketServer {
 
   connec () {
     const self = this;
-    this.consoleLogger.info('[ee-core:socket:server] connection .....');
     this.io.on('connection', (socket) => {
       const channel = Constants.socketIo.channel.partySoftware;
       socket.on(channel, async (message, callback) => {
-        self.consoleLogger.info('[ee-core:socket:server] socket id:' + socket.id + ' message cmd: ' + message.cmd);
+        console.log('[ee-core] [socket/socketServer] socket id:' + socket.id + ' message cmd: ' + message.cmd);
 
         try {
           // 找函数
@@ -57,7 +55,7 @@ class SocketServer {
           const result = await fn.call(self.app, args);
           callback(result);
         } catch (err) {
-          self.app.console.error('[ee-core:socket:server] throw error:', err);
+          Log.coreLogger.error('[ee-core] [socket/socketServer] throw error:', err);
         }
       });
     });

package/module/storage/jsondbStorage.js

@@ -6,7 +6,7 @@ const FileSync = require('./jsondb/adapters/FileSync');
 const _ = require('lodash');
 const Constants = require('../const');
 const Helper = require('../utils/helper');
-const Ps = require('../utils/ps');
+const Ps = require('../ps');
 
 class JsondbStorage {
   constructor (name, opt = {}) {

package/module/storage/sqliteStorage.js

@@ -5,7 +5,7 @@ const fs = require('fs');
 const path = require('path');
 const Database = require('better-sqlite3');
 const Helper = require('../utils/helper');
-const Ps = require('../utils/ps');
+const Ps = require('../ps');
 
 class SqliteStorage {
   constructor (name, opt = {}) {

package/{tools → module/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('../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 → module/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/module/utils/helper.js

@@ -1,5 +1,4 @@
 const fs = require('fs');
-const path = require('path');
 const mkdirp = require('mkdirp');
 const convert = require('koa-convert');
 const is = require('is-type-of');

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 Ps = require('../ps');
 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;
-}
-