ee-core 2.9.2-beta.1 → 2.10.0

package/main/index.js

@@ -1,57 +1,57 @@
-const { app } = require('electron');
-const path = require('path');
-const fs = require('fs');
-const Utils = require('../utils');
-const Ps = require('../ps');
-const EE = require('../ee');
-const UtilsCore = require('../core/lib/utils');
-const Loader = require('../loader');
-const UtilsPargv = require('../utils/pargv');
-
-class ElectronEgg {
-
-  constructor(mode) {
-    this.mode = mode || 'framework';
-    this._create();
-  }
-
-  /**
-   * create ElectronEgg app
-   */  
-  _create() {
-    if (!Ps.verifyMode(this.mode)) {
-      throw new Error(`The mode supports only (framework | module) !`);
-    }
-    Ps.initMode(this.mode);
-
-    // env 可能为空
-    const argsObj = UtilsPargv(process.argv);
-    let isDev = false;
-    if ( argsObj['env'] == 'development' || argsObj['env'] === 'dev' || argsObj['env'] === 'local' ) {
-      isDev = true;
-    }
-
-    // module mode
-    if (Ps.isModuleMode()) {
-      const { Application } = EE;
-      new Application();
-      return;
-    }
-
-    let baseDir = path.join(app.getAppPath(), 'electron');
-    if (!isDev && Utils.isEncrypt(app.getAppPath())) {
-      baseDir = Ps.getEncryptDir(app.getAppPath());
-    }
-
-    let indexFile = path.join(baseDir, 'index');
-    indexFile = Loader.resolveModule(indexFile);
-    if (!fs.existsSync(indexFile)) {
-      throw new Error(`The ${indexFile} file does not exist`);
-    }
-
-    const EEApp = UtilsCore.loadFile(indexFile);
-    EE.app = new EEApp();
-  }
-}
-
+const { app } = require('electron');
+const path = require('path');
+const fs = require('fs');
+const Utils = require('../utils');
+const Ps = require('../ps');
+const EE = require('../ee');
+const UtilsCore = require('../core/lib/utils');
+const Loader = require('../loader');
+const UtilsPargv = require('../utils/pargv');
+
+class ElectronEgg {
+
+  constructor(mode) {
+    this.mode = mode || 'framework';
+    this._create();
+  }
+
+  /**
+   * create ElectronEgg app
+   */  
+  _create() {
+    if (!Ps.verifyMode(this.mode)) {
+      throw new Error(`The mode supports only (framework | module) !`);
+    }
+    Ps.initMode(this.mode);
+
+    // env 可能为空
+    const argsObj = UtilsPargv(process.argv);
+    let isDev = false;
+    if ( argsObj['env'] == 'development' || argsObj['env'] === 'dev' || argsObj['env'] === 'local' ) {
+      isDev = true;
+    }
+
+    // module mode
+    if (Ps.isModuleMode()) {
+      const { Application } = EE;
+      new Application();
+      return;
+    }
+
+    let baseDir = path.join(app.getAppPath(), 'electron');
+    if (!isDev && Utils.isEncrypt(app.getAppPath())) {
+      baseDir = Ps.getEncryptDir(app.getAppPath());
+    }
+
+    let indexFile = path.join(baseDir, 'index');
+    indexFile = Loader.resolveModule(indexFile);
+    if (!fs.existsSync(indexFile)) {
+      throw new Error(`The ${indexFile} file does not exist`);
+    }
+
+    const EEApp = UtilsCore.loadFile(indexFile);
+    EE.app = new EEApp();
+  }
+}
+
 module.exports = ElectronEgg;

package/message/childMessage.js

@@ -1,54 +1,54 @@
-const Channel = require('../const/channel');
-
-class ChildMessage {
-  constructor() {
-    // ...
-  }
-
-  /**
-   * 向主进程发消息
-   */
-  sendToMain(eventName, params = {}) {
-    let receiver = Channel.receiver.childJob;
-    return this.send(eventName, params, receiver);
-  }
-
-  /**
-   * 向主进程发消息
-   */
-  send(eventName, params = {}, receiver) {
-    let eventReceiver = receiver || Channel.receiver.forkProcess;
-    let message = {
-      channel: Channel.process.sendToMain,
-      eventReceiver,
-      event: eventName,
-      data: params,
-    }
-
-    return process.send(message);
-  }
-
-  /**
-   * 进程退出
-   */
-  exit(code = 0) {
-    return process.exit(code);
-  }
-
-  /**
-   * 发送错误到控制台
-   */
-  sendErrorToTerminal(err) {
-    let errTips = (err && typeof err == 'object') ? err.toString() : '';
-    errTips += ' Error !!! Please See file ee-core.log or ee-error-xxx.log for details !'
-    let message = {
-      channel: Channel.process.showException,
-      data: errTips
-    }
-    process.send(message);
-  }
-}
-
-
-
-module.exports = ChildMessage;
+const Channel = require('../const/channel');
+
+class ChildMessage {
+  constructor() {
+    // ...
+  }
+
+  /**
+   * 向主进程发消息
+   */
+  sendToMain(eventName, params = {}) {
+    let receiver = Channel.receiver.childJob;
+    return this.send(eventName, params, receiver);
+  }
+
+  /**
+   * 向主进程发消息
+   */
+  send(eventName, params = {}, receiver) {
+    let eventReceiver = receiver || Channel.receiver.forkProcess;
+    let message = {
+      channel: Channel.process.sendToMain,
+      eventReceiver,
+      event: eventName,
+      data: params,
+    }
+
+    return process.send(message);
+  }
+
+  /**
+   * 进程退出
+   */
+  exit(code = 0) {
+    return process.exit(code);
+  }
+
+  /**
+   * 发送错误到控制台
+   */
+  sendErrorToTerminal(err) {
+    let errTips = (err && typeof err == 'object') ? err.toString() : '';
+    errTips += ' Error !!! Please See file ee-core.log or ee-error-xxx.log for details !'
+    let message = {
+      channel: Channel.process.showException,
+      data: errTips
+    }
+    process.send(message);
+  }
+}
+
+
+
+module.exports = ChildMessage;

package/message/index.js

@@ -1,19 +1,19 @@
-const ChildMessage = require('./childMessage');
-const EEChildMessage = Symbol('EeCore#Module#ChildMessage');
-
-const message = {
-
-  /**
-   * childMessage
-   */
-  get childMessage() {
-    if (!this[EEChildMessage]) {
-      this[EEChildMessage] = new ChildMessage();
-    }
-
-    return this[EEChildMessage] || null;
-  },
-
-};
-
+const ChildMessage = require('./childMessage');
+const EEChildMessage = Symbol('EeCore#Module#ChildMessage');
+
+const message = {
+
+  /**
+   * childMessage
+   */
+  get childMessage() {
+    if (!this[EEChildMessage]) {
+      this[EEChildMessage] = new ChildMessage();
+    }
+
+    return this[EEChildMessage] || null;
+  },
+
+};
+
 module.exports = message;

package/old-utils/index.js

@@ -1,91 +1,91 @@
-/**
- * 该模块不在增加新功能，请使用 /module/utils/index 模块
- */
-
-const path = require('path');
-const UtilsJson = require('../utils/json');
-const UtilsPs = require('../ps');
-const UtilsHelper = require('../utils/helper');
-const Copy = require('../utils/copyto');
-const Conf = require('../config');
-const Channel = require('../const/channel');
-
-/**
- * other module
- */
-Copy(UtilsPs)
-.and(UtilsHelper)
-.to(exports);
-
-/**
- * 获取项目根目录package.json
- */
-exports.getPackage = function() {
-  const json = UtilsJson.readSync(path.join(this.getHomeDir(), 'package.json'));
-  
-  return json;
-};
-
-/**
- * 获取 ee配置
- */
-exports.getEeConfig = function() {
-  const config = Conf.all();
-
-  return config;
-}
-
-/**
- * 获取 app version
- */
-exports.getAppVersion = function() {
-  const v = Conf.all().appVersion;
-  return v;
-}
-
-/**
- * 获取 插件配置
- */
-exports.getAddonConfig = function() {
-  const cfg = Conf.all().addons;
-  return cfg;
-}
-
-/**
- * 获取 mainServer配置
- */
-exports.getMainServerConfig = function() {
-  const cfg = Conf.all().mainServer;
-  return cfg;
-}
-
-/**
- * 获取 httpServer配置
- */
-exports.getHttpServerConfig = function() {
-  const cfg = Conf.all().httpServer;
-  return cfg;
-}
-
-/**
- * 获取 socketServer配置
- */
-exports.getSocketServerConfig = function() {
-  const cfg = Conf.all().socketServer;
-  return cfg;
-}
-
-/**
- * 获取 socketio port
- */
-exports.getSocketPort = function() {
-  const port = Conf.all().socketServer.port;
-  return parseInt(port);
-}
-
-/**
- * 获取 socket channel
- */
-exports.getSocketChannel = function() {
-  return Channel.socketIo.partySoftware;
-}
+/**
+ * 该模块不在增加新功能，请使用 /module/utils/index 模块
+ */
+
+const path = require('path');
+const UtilsJson = require('../utils/json');
+const UtilsPs = require('../ps');
+const UtilsHelper = require('../utils/helper');
+const Copy = require('../utils/copyto');
+const Conf = require('../config');
+const Channel = require('../const/channel');
+
+/**
+ * other module
+ */
+Copy(UtilsPs)
+.and(UtilsHelper)
+.to(exports);
+
+/**
+ * 获取项目根目录package.json
+ */
+exports.getPackage = function() {
+  const json = UtilsJson.readSync(path.join(this.getHomeDir(), 'package.json'));
+  
+  return json;
+};
+
+/**
+ * 获取 ee配置
+ */
+exports.getEeConfig = function() {
+  const config = Conf.all();
+
+  return config;
+}
+
+/**
+ * 获取 app version
+ */
+exports.getAppVersion = function() {
+  const v = Conf.all().appVersion;
+  return v;
+}
+
+/**
+ * 获取 插件配置
+ */
+exports.getAddonConfig = function() {
+  const cfg = Conf.all().addons;
+  return cfg;
+}
+
+/**
+ * 获取 mainServer配置
+ */
+exports.getMainServerConfig = function() {
+  const cfg = Conf.all().mainServer;
+  return cfg;
+}
+
+/**
+ * 获取 httpServer配置
+ */
+exports.getHttpServerConfig = function() {
+  const cfg = Conf.all().httpServer;
+  return cfg;
+}
+
+/**
+ * 获取 socketServer配置
+ */
+exports.getSocketServerConfig = function() {
+  const cfg = Conf.all().socketServer;
+  return cfg;
+}
+
+/**
+ * 获取 socketio port
+ */
+exports.getSocketPort = function() {
+  const port = Conf.all().socketServer.port;
+  return parseInt(port);
+}
+
+/**
+ * 获取 socket channel
+ */
+exports.getSocketChannel = function() {
+  return Channel.socketIo.partySoftware;
+}

package/package.json

@@ -1,38 +1,38 @@
-{
-  "name": "ee-core",
-  "version": "2.9.2-beta.1",
-  "description": "ee core",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
-  "bin": {
-    "ee-core": "./bin/tools.js"
-  },
-  "dependencies": {
-    "agentkeepalive": "^4.2.0",
-    "bytenode": "^1.3.6",
-    "chalk": "^4.1.2",
-    "cross-spawn": "^7.0.3",
-    "dayjs": "^1.11.7",
-    "debug": "^4.3.3",
-    "egg-errors": "^2.3.0",
-    "egg-logger": "^2.7.1",
-    "globby": "^10.0.0",
-    "is-type-of": "^1.2.1",
-    "koa": "^2.13.4",
-    "koa-body": "^5.0.0",
-    "koa-convert": "^2.0.0",
-    "koa-static": "^5.0.0",
-    "koa2-cors": "^2.0.6",
-    "lodash": "^4.17.21",
-    "mkdirp": "^2.1.3",
-    "semver": "^7.3.8",
-    "serialize-javascript": "^6.0.1",
-    "socket.io": "^4.6.1",
-    "socket.io-client": "^4.6.1",
-    "urllib": "^2.38.0"
-  }
-}
+{
+  "name": "ee-core",
+  "version": "2.10.0",
+  "description": "ee core",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "bin": {
+    "ee-core": "./bin/tools.js"
+  },
+  "dependencies": {
+    "agentkeepalive": "^4.2.0",
+    "bytenode": "^1.3.6",
+    "chalk": "^4.1.2",
+    "cross-spawn": "^7.0.3",
+    "dayjs": "^1.11.7",
+    "debug": "^4.3.3",
+    "egg-errors": "^2.3.0",
+    "egg-logger": "^2.7.1",
+    "globby": "^10.0.0",
+    "is-type-of": "^1.2.1",
+    "koa": "^2.13.4",
+    "koa-body": "^5.0.0",
+    "koa-convert": "^2.0.0",
+    "koa-static": "^5.0.0",
+    "koa2-cors": "^2.0.6",
+    "lodash": "^4.17.21",
+    "mkdirp": "^2.1.3",
+    "semver": "^7.3.8",
+    "serialize-javascript": "^6.0.1",
+    "socket.io": "^4.6.1",
+    "socket.io-client": "^4.6.1",
+    "urllib": "^2.38.0"
+  }
+}