ee-core 2.2.0-beta.1 → 2.2.0-beta.3

package/addon/index.js

@@ -7,6 +7,10 @@ const Addon = {
    */  
   all() {
     const { CoreApp } = EE;
+    if (!CoreApp) {
+      throw new Error('An unknown error or Addons cannot be used by the jobs!');
+    }
+
     const instances = CoreApp.addon || null;
     if (!instances) {
       throw new Error('Addons not exists or do not call directly at the top!');

package/ee/application.js

@@ -1,5 +1,5 @@
 const Exception = require('../exception');
-const {app} = require('electron');
+const { app } = require('electron');
 const path = require('path');
 const debug = require('debug')('ee-core:Appliaction');
 const EeApp = require('./eeApp');
@@ -53,7 +53,7 @@ class Appliaction extends EeApp {
     }
 
     // normalize env
-    env.NODE_ENV = options.env;
+    //env.NODE_ENV = options.env;
     env.EE_HOME = options.homeDir;
     env.EE_BASE_DIR = options.baseDir;
     env.EE_SERVER_ENV = options.env;
@@ -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
@@ -172,9 +175,13 @@ class EeApp extends BaseApp {
    */
   loadMainUrl(type, url) {
     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.mainWindow.loadURL(url, mainServer.options);
+    Log.coreLogger.info('[ee-core] Env: %s, Type: %s', this.config.env, type);
+    Log.coreLogger.info('[ee-core] App running at: %s', url);
+    this.mainWindow.loadURL(url, mainServer.options)
+    .then()
+    .catch((err)=>{
+      Log.coreLogger.error(`[ee-core] Please check the ${url} are running OR modify config file !`);
+    });
   }
 
   /**
@@ -193,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);
@@ -214,6 +221,17 @@ class EeApp extends BaseApp {
     }
   }
 
+  /**
+   * module模式初始化
+   */
+  async InitModuleMode() {
+    if (!Ps.isModuleMode()) return;
+
+    await this._loderAddons();
+
+    await this._loderPreload();
+  }
+
   /**
    * electron app已经准备好，主窗口还未创建
    */

package/index.js

@@ -2,6 +2,12 @@
  * @namespace EeCore
  */
 
+/**
+ * @member {ElectronEgg} EeCore#Index
+ * @since 1.0.0
+ */
+const ElectronEgg = require('./main');
+
 /**
  * @member {app} EeCore#app
  * @since 1.0.0
@@ -39,6 +45,7 @@ const Utils = require('./old-utils');
 const Socket = require('./socket');
 
 module.exports = {
+  ElectronEgg,
   Application: EE.Application,
   Controller,
   Service,

package/main/index.js

@@ -0,0 +1,49 @@
+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');
+
+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) !`);
+    }
+    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());
+    }
+
+    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(this.env);
+  }
+}
+
+module.exports = ElectronEgg;

package/package.json

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

package/ps/index.js

@@ -1,6 +1,37 @@
 const path = require('path');
 const eis = require('../utils/is');
 
+/**
+ * 当前模式 - framework | module
+ */
+exports.mode = function() {
+  return process.env.EE_MODE;
+}
+
+/**
+ * 校验模式
+ */
+exports.verifyMode = function(mode) {
+  if (['framework', 'module'].includes(mode)) {
+    return true;
+  }
+  return false;
+}
+
+/**
+ * 是否为框架模式
+ */
+exports.isFrameworkMode = function() {
+  return (process.env.EE_MODE === 'framework');
+}
+
+/**
+ * 是否为模块模式
+ */
+exports.isModuleMode = function() {
+  return (process.env.EE_MODE === 'module');
+}
+
 /**
  * 当前进程的所有env
  */

package/services/index.js

@@ -7,6 +7,10 @@ const Services = {
    */  
   all() {
     const { CoreApp } = EE;
+    if (!CoreApp) {
+      throw new Error('An unknown error or Services cannot be used by the jobs!');
+    }
+
     const instances = CoreApp.service || null;
     if (!instances) {
       throw new Error('Services not exists or do not call directly at the top!');