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

package/addon/index.js

@@ -0,0 +1,30 @@
+const EEAddon = Symbol('Ee#Addon');
+
+/**
+ * todo 插件模块
+ */ 
+const Addon = {
+
+  /**
+   * 设置插件对象
+   */  
+  setAddonObject(name, obj) {
+    if (!this[EEAddon]) {
+      this[EEAddon] = new Map();
+    }
+
+    if (!this[EEAddon].has(name)) {
+      this[EEAddon][name] = obj;
+    }
+  },
+
+  /**
+   * 获取插件对象
+   */  
+  get(name) {
+    let addon = this[EEAddon].has(name) ? this[EEAddon][name]: null;
+    return addon;
+  },  
+}  
+
+module.exports = Addon;

package/config/index.js

@@ -0,0 +1,54 @@
+const Storage = require('../storage');
+
+const Cfg = {
+
+  /**
+   * 获取 coredb
+   */
+  _getCoreDB() {
+    const coreDB = Storage.connection('system');
+    return coreDB;
+  },
+
+  /**
+   * all
+   */
+  all() {
+    const cdb = this._getCoreDB();
+    const config = cdb.getItem('config');
+  
+    return config;
+  },
+
+  /**
+   * setAll
+   */
+  setAll(value) {
+    const cdb = this._getCoreDB();
+    cdb.setItem('config', value);
+  
+    return;
+  },
+
+  /**
+   * setValue
+   */
+  setValue(key, value) {
+    const cdb = this._getCoreDB();
+    cdb.setConfigItem(key, value);
+  
+    return;
+  },
+
+  /**
+   * getValue
+   */
+  getValue(key) {
+    const cdb = this._getCoreDB();
+    let v = cdb.getConfigItem(key);
+  
+    return v;
+  },  
+};
+
+module.exports = Cfg;

package/{module/const → const}/channel.js

@@ -2,5 +2,8 @@ module.exports = {
   process: {
     showException: 'ee#showException',
     sendToMain: 'ee#sendToMain'
-  }
+  },
+  socketIo: {
+    partySoftware: 'c1',
+  },  
 };

package/{module/const → const}/index.js

@@ -1,11 +1,7 @@
 module.exports = {
   storageKey: {
     cache: 'cache',
-  },
-  socketIo: {
-    channel: {
-      partySoftware: 'c1',
-    }
+    cacheConfig: 'cache.config',
   },
   jobs: {
     inspectStartIndex: 5858

package/{module/core → core}/lib/loader/ee_loader.js

@@ -397,7 +397,7 @@ class EeLoader {
       }
       
       if (!fs.existsSync(filepath) && !fs.existsSync(fullpath)) {
-        this.options.logger.warn(`[ee-core] [core/lib/loader/ee_loader] resolveModule unknow filepath: ${filepath}`)
+        //this.options.logger.warn(`[ee-core] [core/lib/loader/ee_loader] resolveModule unknow filepath: ${filepath}`)
         return undefined;
       }
     }

package/{module/core → core}/lib/loader/file_loader.js

@@ -10,6 +10,7 @@ const deprecate = require('depd')('ee');
 const Utils = require('../utils');
 const FULLPATH = Symbol('EE_LOADER_ITEM_FULLPATH');
 const EXPORTS = Symbol('EE_LOADER_ITEM_EXPORTS');
+const Addon = require('../../../addon');
 
 const defaults = {
   directory: null,

package/{module/core → core}/lib/loader/mixin/addon.js

@@ -13,7 +13,7 @@ module.exports = {
 
     // 加载ee-core的插件 和 用户插件
     const directorys = [
-      path.join(this.options.framework, 'module', 'addon'),
+      path.join(this.options.framework, 'addon'),
       path.join(this.options.baseDir, 'addon'),
     ]
     opt = Object.assign({

package/{module/app → ee}/baseApp.js

@@ -8,6 +8,7 @@ const HTTPCLIENT = Symbol('EeApplication#httpclient');
 const LOGGERS = Symbol('EeApplication#loggers');
 const Log = require('../log');
 const Storage = require('../storage');
+const Conf = require('../config');
 
 class BaseApp extends EeAppCore {
   constructor (options = {}) {
@@ -17,7 +18,7 @@ class BaseApp extends EeAppCore {
     this.loader.loadConfig();
     
     // 缓存配置
-    this.getCoreDB().setItem('config', this.config);
+    Conf.setAll(this.config);
 
     this.loader.load();
 

package/{module/app → ee}/eeApp.js

@@ -2,25 +2,24 @@ const path = require('path');
 const fs = require('fs');
 const assert = require('assert');
 const getPort = require('get-port');
-const {app, BrowserWindow, Menu, protocol} = require('electron');
+const { app } = require('electron');
 const is = require('is-type-of');
 const Koa = require('koa');
 const koaServe = require('koa-static');
 const https = require('https');
 const BaseApp = require('./baseApp');
 const Log = require('../log');
+const Electron = require('../electron');
+const Conf = require('../config');
+const Ps = require('../ps');
+const Socket = require('../socket')
 
 class EeApp extends BaseApp {
   constructor(options = {}) {
     super(options);
 
-    this.electron = {
-      mainWindow: null,
-      tray: null,
-      extra: {
-        closeWindow: false,
-      },
-    };
+    this.electron = Electron;
+    this.mainWindow;
   }
 
   /**
@@ -44,15 +43,14 @@ class EeApp extends BaseApp {
     }
     
     // 更新db配置
-    this.getCoreDB().setItem('config', this.config);
+    Conf.setAll(this.config);
   }
 
   /**
    * 启动通信模块
    */
   async startSocket () {
-    const socket = require('../socket/start');
-    socket(this);
+    Socket.startAll(this);
   }
   
   /**
@@ -86,7 +84,7 @@ class EeApp extends BaseApp {
     })
 
     app.on('before-quit', () => {
-      self.electron.extra.closeWindow = true;
+      Electron.extra.closeWindow = true;
     })
 
     if (this.config.hardGpu.enable == false) {
@@ -101,27 +99,8 @@ class EeApp extends BaseApp {
    */
   async createWindow () {
 
-    // todo
-    const protocolName = 'eefile';
-    protocol.registerFileProtocol(protocolName, (request, callback) => {
-      const url = request.url.substring(protocolName.length + 3);
-      console.log('[ee-core] [lib/eeApp] registerFileProtocol ----url: ', url);
-      callback({ path: path.normalize(decodeURIComponent(url)) })
-    });
-
-    const winOptions = this.config.windowsOption;
-    this.electron.mainWindow = new BrowserWindow(winOptions);
-    let win = this.electron.mainWindow;
-
-    // 菜单显示/隐藏
-    if (this.config.openAppMenu === 'dev-show'
-      && this.config.env == 'prod') {
-      Menu.setApplicationMenu(null);
-    } else if (this.config.openAppMenu === false) {
-      Menu.setApplicationMenu(null);
-    } else {
-      // nothing 
-    }
+    // 初始化一个主窗口
+    this.mainWindow = Electron.getMainWindow();
 
     await this.windowReady();
   
@@ -130,22 +109,17 @@ class EeApp extends BaseApp {
     await this._loderPreload();
 
     this.selectAppType();
-
-    // DevTools
-    if (!app.isPackaged && this.config.openDevTools) {
-      win.webContents.openDevTools();
-    }
   }
 
   /**
    * 还原窗口
    */
   restoreMainWindow () {
-    if (this.electron.mainWindow) {
-      if (this.electron.mainWindow.isMinimized()) {
-        this.electron.mainWindow.restore();
+    if (this.mainWindow) {
+      if (this.mainWindow.isMinimized()) {
+        this.mainWindow.restore();
       }
-      this.electron.mainWindow.show()
+      this.mainWindow.show()
     }
   }
 
@@ -172,7 +146,7 @@ class EeApp extends BaseApp {
 
     // html模式
     if (selectMode == 'html') {
-      if (this.config.env !== 'prod') {
+      if (Ps.isDev()) {
         staticDir = path.join(this.config.homeDir, 'frontend', 'dist');
       }
       this.loadLocalWeb('html', staticDir, modeInfo);
@@ -182,7 +156,7 @@ class EeApp extends BaseApp {
     // 单页应用
     const protocol = modeInfo.protocol || 'http://';
     url = protocol + modeInfo.hostname + ':' + modeInfo.port;
-    if (this.config.env !== 'prod') {
+    if (Ps.isDev()) {
       this.loadMainUrl('spa', url);
     } else {
       this.loadLocalWeb('spa');
@@ -239,7 +213,7 @@ class EeApp extends BaseApp {
     const mainServer = this.config.mainServer;
     Log.coreLogger.info('[ee-core] [main] Env: %s, Type: %s', this.config.env, type);
     Log.coreLogger.info('[ee-core] [main] App running at: %s', url);
-    this.electron.mainWindow.loadURL(url, mainServer.options);
+    this.mainWindow.loadURL(url, mainServer.options);
   }
 
   /**
@@ -259,7 +233,7 @@ class EeApp extends BaseApp {
     // 注册主窗口Contents id
     const addonsCfg = this.config.addons;
     if (addonsCfg.window.enable) {
-      const win = this.electron.mainWindow;
+      const win = this.mainWindow;
       const addonWindow = this.addon.window;
       addonWindow.registerWCid('main', win.webContents.id);
     }

package/ee/index.js

@@ -0,0 +1,30 @@
+const EEApplication = Symbol('Ee#Application');
+
+const EE = {
+
+  /**
+   * 兼容1.x版本api
+   */
+  get Appliaction() {
+    const appClass = require('./application');
+    return appClass;
+  },
+
+  /**
+   * 设置app对象
+   */  
+  set app(appObject) {
+    if (!this[EEApplication]) {
+      this[EEApplication] = appObject;
+    }
+  },
+
+  /**
+   * 获取app对象
+   */  
+  get app() {
+    return this[EEApplication] || null;
+  },  
+}  
+
+module.exports = EE;

package/electron/index.js

@@ -0,0 +1,32 @@
+const Window = require('./window');
+const EEMainWindow = Symbol('Ee#electron#mainWindow');
+
+const Electron = {
+
+  /**
+   * 获取 mainWindow
+   */
+  getMainWindow() {
+    if (!this[EEMainWindow]) {
+      this[EEMainWindow] = Window.createWindow();
+    }
+
+    return this[EEMainWindow] || null;
+  },
+
+  /**
+   * 兼容1.x版本api
+   */
+  get mainWindow() {
+    return this.getMainWindow();
+  },
+
+  /**
+   * extra
+   */
+  extra: {
+    closeWindow: false,
+  },  
+};
+
+module.exports = Electron;

package/electron/window.js

@@ -0,0 +1,45 @@
+const {app, BrowserWindow, Menu} = require('electron');
+const Conf = require('../config');
+const Ps = require('../ps');
+
+const Window = {
+
+  /**
+   * 创建应用主窗口
+   */
+  createWindow () {
+
+    // todo
+    // const protocolName = 'eefile';
+    // protocol.registerFileProtocol(protocolName, (request, callback) => {
+    //   const url = request.url.substring(protocolName.length + 3);
+    //   console.log('[ee-core] [lib/eeApp] registerFileProtocol ----url: ', url);
+    //   callback({ path: path.normalize(decodeURIComponent(url)) })
+    // });
+
+    const config = Conf.all();
+    let win = new BrowserWindow(config.windowsOption);
+
+    // 菜单显示/隐藏
+    if (config.openAppMenu === 'dev-show' && Ps.isProd()) {
+      Menu.setApplicationMenu(null);
+    } else if (config.openAppMenu === false) {
+      Menu.setApplicationMenu(null);
+    } else {
+      // nothing 
+    }
+
+    // DevTools
+    if (!app.isPackaged && config.openDevTools) {
+      win.webContents.openDevTools({
+        mode: 'undocked'
+      });
+    }
+
+    return win;
+  }
+
+
+};
+
+module.exports = Window;

package/index.js

@@ -1,46 +1,45 @@
 /**
  * @namespace EeCore
  */
-let app;
+
+/**
+ * @member {app} EeCore#app
+ * @since 1.0.0
+ */
+const EE = require('./ee');
 
 /**
  * @member {Controller} EeCore#Controller
  * @since 1.0.0
  */
-const Controller = require('./module/controller');
+const Controller = require('./controller');
 
 /**
  * @member {Service} EeCore#Service
  * @since 1.0.0
  */
-const Service = require('./module/service');
+const Service = require('./service');
 
 /**
  * @member {Storage}
  * @since 1.0.0
  */
-const Storage = require('./module/storage');
+const Storage = require('./storage');
 
 /**
  * @member {Utils}
  * @since 1.0.0
  */
-const Utils = require('./module/oldUtils');
+const Utils = require('./oldUtils');
 
 /**
  * @member {Socket}
  * @since 1.0.0
  */
-const Socket = require('./module/socket/io');
+const Socket = require('./socket');
 
 module.exports = {
-  get Appliaction () {
-    if (app) {
-      return app;
-    }
-    app = require('./module/app/application');
-    return app;
-  },
+  Appliaction: EE.Appliaction,
   Controller,
   Service,
   Storage,

package/{module/jobs → jobs}/child/app.js

@@ -1,22 +1,16 @@
 
 const is = require('is-type-of');
-let Exception;
-let Loader;
-let Log;
-let UtilsCore;
+const Exception = require('ee-core/exception');
+const Loader = require('ee-core/loader');
+const Log = require('ee-core/log');
+const UtilsCore = require('../../core/lib/utils');
 
 // 开发环境下，ee-core是soft link
-if (__dirname.indexOf("node_modules") == -1) {
-  Exception = require('../../exception');
-  Loader = require('../../loader');
-  Log = require('../../log');
-  UtilsCore = require('../../core/lib/utils');
-} else {
-  Exception = require('ee-core/module/exception');
-  Loader = require('ee-core/module/loader');
-  Log = require('ee-core/module/log');
-  UtilsCore = require('../../core/lib/utils');
-}
+// /node_modules[\\/]electron[\\/]/.test(process.execPath)
+// const Exception = require('../../exception');
+// const Loader = require('../../loader');
+// const Log = require('../../log');
+// const UtilsCore = require('../../core/lib/utils');
 
 Exception.start();
 

package/{module/jobs → jobs}/childPool/app.js

@@ -1,22 +1,16 @@
 
 const is = require('is-type-of');
-let Exception;
-let Loader;
-let Log;
-let UtilsCore;
+const Exception = require('ee-core/exception');
+const Loader = require('ee-core/loader');
+const Log = require('ee-core/log');
+const UtilsCore = require('../../core/lib/utils');
 
 // 开发环境下，ee-core是soft link
-if (__dirname.indexOf("node_modules") == -1) {
-  Exception = require('../../exception');
-  Loader = require('../../loader');
-  Log = require('../../log');
-  UtilsCore = require('../../core/lib/utils');
-} else {
-  Exception = require('ee-core/module/exception');
-  Loader = require('ee-core/module/loader');
-  Log = require('ee-core/module/log');
-  UtilsCore = require('../../core/lib/utils');
-}
+// /node_modules[\\/]electron[\\/]/.test(process.execPath)
+// const Exception = require('../../exception');
+// const Loader = require('../../loader');
+// const Log = require('../../log');
+// const UtilsCore = require('../../core/lib/utils');
 
 Exception.start();
 

package/{module/message → message}/index.js

@@ -16,6 +16,4 @@ const message = {
 
 };
 
-
-
 module.exports = message;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.7",
   "description": "ee core",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,7 @@
   "author": "",
   "license": "ISC",
   "bin": {
-    "ee-core": "./module/bin/tools.js"
+    "ee-core": "./bin/tools.js"
   },
   "dependencies": {
     "agentkeepalive": "^4.2.0",
@@ -19,8 +19,6 @@
     "depd": "^2.0.0",
     "egg-errors": "^2.3.0",
     "egg-logger": "^2.7.1",
-    "electron-is": "^3.0.0",
-    "electron-updater": "^4.6.1",
     "extend2": "^1.0.1",
     "fs-extra": "^10.0.0",
     "get-port": "^5.1.1",
@@ -35,7 +33,7 @@
     "koa2-cors": "^2.0.6",
     "lodash": "^4.17.21",
     "mkdirp": "^2.1.3",
-    "path-to-regexp": "^6.2.0",
+    "semver": "^7.3.8",
     "serialize-javascript": "^6.0.1",
     "socket.io": "^4.4.1",
     "socket.io-client": "^4.4.1",

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

@@ -1,5 +1,5 @@
 const path = require('path');
-const eis = require('electron-is');
+const eis = require('../utils/is');
 
 /**
  * 当前进程的所有env
@@ -20,6 +20,13 @@ exports.env = function() {
  */
 exports.getEnv = this.env
 
+/**
+ * 是否生产环境
+ */
+exports.isProd = function() {
+  return (process.env.EE_SERVER_ENV === 'prod');
+}
+
 /**
  * 是否为开发环境
  */
@@ -182,21 +189,21 @@ exports.getUserHomeDir = function () {
  * 获取主进程端口
  */
 exports.getMainPort = function () {
-  return process.env.EE_MAIN_PORT;
+  return parseInt(process.env.EE_MAIN_PORT) || 0;
 }
 
 /**
  * 获取内置socket端口
  */
 exports.getSocketPort = function () {
-  return process.env.EE_SOCKET_PORT;
+  return parseInt(process.env.EE_SOCKET_PORT) || 0;
 }
 
 /**
  * 获取内置http端口
  */
 exports.getHttpPort = function () {
-  return process.env.EE_HTTP_PORT;
+  return parseInt(process.env.EE_HTTP_PORT) || 0;
 }
 
 /**