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

package/core/lib/ee.js

@@ -21,8 +21,8 @@ class EeCore extends KoaApplication {
     options.type = options.type || 'application';
 
     assert(typeof options.baseDir === 'string', 'options.baseDir required, and must be a string');
-    assert(fs.existsSync(options.baseDir), `Directory ${options.baseDir} not exists`);
-    assert(fs.statSync(options.baseDir).isDirectory(), `Directory ${options.baseDir} is not a directory`);
+    // assert(fs.existsSync(options.baseDir), `Directory ${options.baseDir} not exists`);
+    // assert(fs.statSync(options.baseDir).isDirectory(), `Directory ${options.baseDir} is not a directory`);
 
     super();
 

package/core/lib/loader/ee_loader.js

@@ -25,7 +25,7 @@ class EeLoader {
    */
   constructor(options) {
     this.options = options;
-    assert(fs.existsSync(this.options.baseDir), `${this.options.baseDir} not exists`);
+    // assert(fs.existsSync(this.options.baseDir), `${this.options.baseDir} not exists`);
     assert(this.options.app, 'options.app is required');
     assert(this.options.logger, 'options.logger is required');
 

package/core/lib/loader/mixin/controller.js

@@ -47,7 +47,7 @@ module.exports = {
     const controllerBase = opt.directory;
 
     this.loadToApp(controllerBase, 'controller', opt);
-    this.options.logger.info('[ee-core] [core/.../controller] loaded: %s', controllerBase);
+    //this.options.logger.info('[ee-core] [core/.../controller] loaded: %s', controllerBase);
     this.timing.end('Load Controller');
   },
 

package/ee/application.js

@@ -88,6 +88,8 @@ class Appliaction extends EeApp {
     await this.ready();
 
     await this.createElectronApp();
+
+    await this.InitModuleMode();
   } 
 }
 

package/ee/eeApp.js

@@ -28,9 +28,11 @@ class EeApp extends BaseApp {
    * 生成端口
    */
   async createPorts() {
-    const mainPort = await GetPort({port: this.config.mainServer.port});
-    process.env.EE_MAIN_PORT = mainPort;
-    this.config.mainServer.port = mainPort;
+    if (Ps.isFrameworkMode()) {
+      const mainPort = await GetPort({port: this.config.mainServer.port});
+      process.env.EE_MAIN_PORT = mainPort;
+      this.config.mainServer.port = mainPort;
+    }
 
     if (this.config.socketServer.enable) {
       const socketPort = await GetPort({port: this.config.socketServer.port});
@@ -59,6 +61,7 @@ class EeApp extends BaseApp {
    * 创建electron应用
    */
   async createElectronApp() {
+    if (!Ps.isFrameworkMode()) return;
     const newApp = CoreElectronApp.create();
     if (!newApp) {
       return
@@ -197,7 +200,7 @@ class EeApp extends BaseApp {
 
     // 注册主窗口Contents id
     const addonsCfg = this.config.addons;
-    if (addonsCfg.window.enable) {
+    if (addonsCfg.window.enable && Ps.isFrameworkMode()) {
       const win = this.mainWindow;
       const addonWindow = this.addon.window;
       addonWindow.registerWCid('main', win.webContents.id);
@@ -218,6 +221,17 @@ class EeApp extends BaseApp {
     }
   }
 
+  /**
+   * module模式初始化
+   */
+  async InitModuleMode() {
+    if (!Ps.isModuleMode()) return;
+
+    await this._loderAddons();
+
+    await this._loderPreload();
+  }
+
   /**
    * electron app已经准备好，主窗口还未创建
    */

package/main/index.js

@@ -23,6 +23,13 @@ class ElectronEgg {
     }
     process.env.EE_MODE = this.mode;
 
+    // module mode
+    if (Ps.isModuleMode()) {
+      const { Application } = EE;
+      new Application();
+      return;
+    }
+
     let baseDir = path.join(app.getAppPath(), 'electron');
     if (Utils.isEncrypt(app.getAppPath())) {
       baseDir = Ps.getEncryptDir(app.getAppPath());

package/package.json

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

package/ps/index.js

@@ -18,6 +18,20 @@ exports.verifyMode = function(mode) {
   return false;
 }
 
+/**
+ * 是否为框架模式
+ */
+exports.isFrameworkMode = function() {
+  return (process.env.EE_MODE === 'framework');
+}
+
+/**
+ * 是否为模块模式
+ */
+exports.isModuleMode = function() {
+  return (process.env.EE_MODE === 'module');
+}
+
 /**
  * 当前进程的所有env
  */