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

package/module/jobs/childPool/forkProcess.js

@@ -0,0 +1,81 @@
+const path = require('path');
+const { fork } = require('child_process');
+const serialize = require('serialize-javascript');
+const Log = require('../../log');
+const Ps = require('../../ps');
+const Channel = require('../../const/channel');
+
+class ForkProcess {
+  constructor(host, opt = {}) {
+    
+    let options = Object.assign({
+      processOptions: { 
+        cwd: Ps.getHomeDir(),
+        env: Ps.allEnv(), 
+        stdio: 'pipe' 
+      }
+    }, opt);
+
+    this.host = host;
+    this.args = [];
+    this.sleeping = false;
+
+    // 传递给子进程的参数
+    //this.args.push(JSON.stringify(options.params));
+
+    const appPath = path.join(__dirname, 'app.js');
+    this.child = fork(appPath, this.args, options.processOptions);
+
+    this.pid = this.child.pid;
+    this._init();
+  }
+
+  /**
+   * 进程初始化
+   */
+  _init() {
+    this.child.on('message', (m) => {
+      Log.coreLogger.info(`[ee-core] [jobs/child/forkProcess] from childProcess event-message: ${serialize(m)}`);
+      if (m.channel == Channel.process.showException) {
+        Log.coreLogger.error(`${m.data}`);
+      }
+    });
+
+    this.child.on('disconnect', () => {
+      Log.coreLogger.info(`[ee-core] [jobs/child/forkProcess] from childProcess event-disconnect !`);
+    });
+
+    this.child.on('close', (code, signal) => {
+      Log.coreLogger.info(`[ee-core] [jobs/child/forkProcess] from childProcess event-close code:${code}, signal:${signal}`);
+    });
+
+    this.child.on('exit', (code, signal) => {
+      Log.coreLogger.info(`[ee-core] [jobs/child/forkProcess] from childProcess event-exit code:${code}, signal:${signal}`);
+    });
+
+    this.child.on('error', (err) => {
+      Log.coreLogger.error(`[ee-core] [jobs/child/forkProcess] from childProcess event-error: ${err} !`);
+    });
+  }
+
+  /**
+   * 进程挂起
+   */
+  sleep() {
+    if (this.sleeping) return;
+    process.kill(this.pid, 'SIGSTOP');
+    this.sleeping = true;
+  }
+
+  /**
+   * 进程唤醒
+   */
+  wakeup() {
+    if (!this.sleeping) return;
+    process.kill(this.pid, 'SIGCONT');
+    this.sleeping = false;
+  }
+
+}
+
+module.exports = ForkProcess;

package/module/jobs/childPool/index.js

@@ -0,0 +1,71 @@
+const EventEmitter = require('events');
+const path = require('path');
+const fs = require('fs');
+const ForkProcess = require('./forkProcess');
+const Ps = require('../../ps');
+const Loader = require('../../loader');
+const Helper = require('../../utils/helper');
+
+class ChildJob extends EventEmitter {
+
+  constructor() {
+    super();
+    this.jobList = new Map();
+  }
+
+  /**
+   * 执行一个job文件
+   */  
+  exec(filepath, opt = {}) {
+    const jobPath = this._getFullpath(filepath);
+    let options = Object.assign({
+      params: {},
+    }, opt);
+
+    // 消息对象
+    const mid = Helper.getRandomString();
+    let msg = {
+      mid,
+      jobPath,
+      params: options.params
+    }
+
+    let subProcess = new ForkProcess(this, options);
+
+    // todo 是否会发生监听未完成时，接收不到消息？
+    // 发消息到子进程，
+    subProcess.child.send(msg);
+  
+    return subProcess;
+  }
+
+  /**
+   * todo 运行job
+   */  
+  run(name, filepath, opt = {}) {
+    let times = opt.times || 1;
+
+    for (let i = 1; i <= times; i++) {
+      this.exec(filepath, opt);
+    }
+  
+    return;
+  }
+
+  _getFullpath(filepath) {
+    const isAbsolute = path.isAbsolute(filepath);
+    if (!isAbsolute) {
+      filepath = path.join(Ps.getBaseDir(), filepath);
+    }
+
+    const fullpath = Loader.resolveModule(filepath);
+    if (!fs.existsSync(fullpath)) {
+      throw new Error(`[ee-core] [jobs/child] file ${fullpath} not exists`);
+    }
+
+    return fullpath;
+  }
+
+}
+
+module.exports = ChildJob;

package/module/jobs/{child → childPool}/pool.js

@@ -2,7 +2,7 @@ const EventEmitter = require('events');
 const path = require('path');
 const fs = require('fs');
 const ForkProcess = require('./forkProcess');
-const Ps = require('../../utils/ps');
+const Ps = require('../../ps');
 const Loader = require('../../loader');
 const Log = require('../../log');
 
@@ -30,7 +30,7 @@ class ChildJob {
 
     const fullpath = Loader.resolveModule(filepath);
     if (!fs.existsSync(fullpath)) {
-      throw new Error(`[ee-core] [module/jobs/child] file ${fullpath} not exists`);
+      throw new Error(`[ee-core] [jobs/child] file ${fullpath} not exists`);
     }
 
     let options = Object.assign({
@@ -54,7 +54,7 @@ class ChildJob {
 
   sendToChild(pid, message, ...other) {
     if (!this.pools.has(pid)) {
-      Log.coreLogger.warn(`[ee-core] [module/jobs/child] process dose not exist  ${pid}`);
+      Log.coreLogger.warn(`[ee-core] [jobs/child] process dose not exist  ${pid}`);
       return;
     }
     const subProcess = this.pools.get(pid);

package/module/jobs/renderer/loadView.js

@@ -1,4 +1,4 @@
-const Ps = require('../../utils/ps');
+const Ps = require('../../ps');
 
 /**
   * loadView 生成BrowserWindow的html content

package/module/jobs/unification.js

@@ -2,7 +2,7 @@ const path = require('path');
 const fs = require('fs');
 const RendererJob = require('./renderer');
 const ChildJob = require('./child/pool');
-const Ps = require('../utils/ps');
+const Ps = require('../ps');
 const Loader = require('../loader');
 
 class Jobs  {

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] 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] 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

@@ -1,60 +1,28 @@
-const Log = require('../log');
+const Channel = require('../const/channel');
 
-/**
-  * ChildMessage
-  */
 class ChildMessage {
   constructor() {
     // ...
   }
 
-  /**
-   * 初始化事件监听
-   */
-  initEvents() {
-    process.on('disconnect', () => {
-      Log.coreLogger.info(`[ee-core] [module/message/childMessage] child process disconnected:${process.pid} !`);
-    });
-    process.on('exit', () => {
-      Log.coreLogger.info(`[ee-core] [module/message/childMessage] child process exited:${process.pid} !`);
-    });
-  }
-
-  /**
-   * 监听消息
-   */
-  onMessage(handle) {
-    Log.coreLogger.info(`[ee-core] [module/message/childMessage] Received a message ${params} from the mainProcess`);
-
-    process.on('message', handle.bind(this));
-  }
-
-  /**
-   * 消息处理
-   */
-  // _handleMessage(params = {}) {
-  //   Log.coreLogger.info(`[ee-core] [module/message/childMessage] Received a message ${params} from the mainProcess`);
-  // }
-
   /**
    * 向主进程发消息
    */
-  sendToMain(message, ...other) {
-    return process.send(message, ...other);
-  }
-
-  /**
-   * 断开连接
-   */
-  disconnect() {
-    process.disconnect();
+  sendToMain(eventName, params = {}) {
+    let message = {
+      channel: Channel.process.sendToMain,
+      event: eventName,
+      data: params,
+    }
+
+    return process.send(message);
   }
 
   /**
    * 进程退出
    */
-  exit() {
-    process.exit();
+  exit(code = 0) {
+    return process.exit(code);
   }
 }
 

package/module/message/index.js

@@ -1,21 +1,14 @@
-const Ps = require('../utils/ps');
+const ChildMessage = require('./childMessage');
 const EEChildMessage = Symbol('EeCore#Module#ChildMessage');
 
 const message = {
 
-  /**
-   * 
-   */
-  create () {
-
-  },
-
   /**
    * childMessage
    */
   get childMessage() {
     if (!this[EEChildMessage]) {
-      this[EEChildMessage] = Logger.create();
+      this[EEChildMessage] = new ChildMessage();
     }
 
     return this[EEChildMessage] || null;

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

@@ -3,12 +3,12 @@
  */
 
 const path = require('path');
-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

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

@@ -218,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

@@ -61,7 +61,7 @@ class HttpServer {
       })
       .use(this.dispatch);
 
-    let msg = '[ee-core] [module/socket/httpServer] 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;

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

@@ -4,7 +4,7 @@ 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');
 
@@ -15,7 +15,7 @@ class IpcServer {
   }
 
   register () {
-    console.log('[ee-core] [module/socket/IpcServer] register channels');
+    console.log('[ee-core] [socket/IpcServer] register channels');
 
     const self = this;
     // 遍历方法
@@ -75,7 +75,7 @@ class IpcServer {
             
             return fn;
           } catch (err) {
-            Log.coreLogger.error('[ee-core] [module/socket/IpcServer] throw error:', err);
+            Log.coreLogger.error('[ee-core] [socket/IpcServer] throw error:', err);
           }
           return null;
         }

package/module/socket/socketClient.js

@@ -11,8 +11,8 @@ class SocketClient {
 
     assert(typeof port === 'number', 'port required, and must be a number');
     
-    const url  = 'http://127.0.0.1:' + port;
-    console.log('[ee-core] [module/socket/socketClient] url:', url);
+    const url  = 'http://localhost:' + port;
+    console.log('[ee-core] [socket/socketClient] url:', url);
     this.client = IoClient(url);
   }
 

package/module/socket/socketServer.js

@@ -21,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] [module/socket/socketServer] port is:', port);
+    this.consoleLogger.info('[ee-core] [socket/socketServer] port is:', port);
 
     // let opt = Object.assign({}, options);
     // delete opt.enable;
@@ -34,7 +34,7 @@ class SocketServer {
     this.io.on('connection', (socket) => {
       const channel = Constants.socketIo.channel.partySoftware;
       socket.on(channel, async (message, callback) => {
-        console.log('[ee-core] [module/socket/socketServer] socket id:' + socket.id + ' message cmd: ' + message.cmd);
+        console.log('[ee-core] [socket/socketServer] socket id:' + socket.id + ' message cmd: ' + message.cmd);
 
         try {
           // 找函数
@@ -55,7 +55,7 @@ class SocketServer {
           const result = await fn.call(self.app, args);
           callback(result);
         } catch (err) {
-          Log.coreLogger.error('[ee-core] [module/socket/socketServer] 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() {

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,7 +1,7 @@
 const path = require('path');
 const Storage = require('../storage');
 const Constants = require('../const');
-const Ps = require('./ps');
+const Ps = require('../ps');
 const UtilsJson = require('./json');
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.4",
   "description": "ee core",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,7 @@
   "author": "",
   "license": "ISC",
   "bin": {
-    "ee-core": "./bin/tools.js"
+    "ee-core": "./module/bin/tools.js"
   },
   "dependencies": {
     "agentkeepalive": "^4.2.0",
@@ -36,6 +36,7 @@
     "lodash": "^4.17.21",
     "mkdirp": "^2.1.3",
     "path-to-regexp": "^6.2.0",
+    "serialize-javascript": "^6.0.1",
     "socket.io": "^4.4.1",
     "socket.io-client": "^4.4.1",
     "urllib": "^2.38.0"