ee-core 2.4.0 → 2.5.0-beta.3

package/addon/window/index.js

@@ -24,6 +24,7 @@ class WinAddon {
     //   throw new Error(`[addon] [window] Name: ${name} already exists!`);
     // }
 
+    // [todo] 使用 extend, 避免多维对象被覆盖 
     const options = Object.assign({
       x: 10,
       y: 10,

package/ee/eeApp.js

@@ -14,6 +14,8 @@ const Conf = require('../config');
 const Ps = require('../ps');
 const Socket = require('../socket');
 const GetPort = require('../utils/get-port');
+const UtilsHelper = require('../utils/helper');
+const HttpClient = require('../httpclient');
 
 class EeApp extends BaseApp {
   constructor(options = {}) {
@@ -90,7 +92,7 @@ class EeApp extends BaseApp {
   /**
    * 应用类型 （远程、html、单页应用）
    */
-  selectAppType() {
+  async selectAppType() {
     let type = '';
     let url = '';
 
@@ -103,27 +105,65 @@ class EeApp extends BaseApp {
       return;
     }
 
-    const developmentModeConfig = this.config.developmentMode;
-    const selectMode = developmentModeConfig.default;
-    const modeInfo = developmentModeConfig.mode[selectMode];
-    let staticDir = null;
+    // 开发环境
+    if (Ps.isDev()) {
+      let modeInfo;
+      let url;
+      let load = 'url';
+      const configFile = './electron/config/bin.js';
+
+      const isBin = UtilsHelper.checkConfig(configFile);
+      if (isBin) {
+        const binConfig = UtilsHelper.loadConfig(configFile);
+        const { frontend } = binConfig.dev;
+        modeInfo = frontend;
+      } else {
+        // 兼容旧的 developmentMode
+        const developmentModeConfig = this.config.developmentMode;
+        const selectMode = developmentModeConfig.default;
+        modeInfo = developmentModeConfig.mode[selectMode];
+      }
+
+      url = modeInfo.protocol + modeInfo.hostname + ':' + modeInfo.port;
+      if (Conf.isFileProtocol(modeInfo)) {
+        url = path.join(this.config.homeDir, modeInfo.directory, modeInfo.indexPath);
+        load = 'file';
+      }
+
+      // 检查 UI serve是否启动，先加载一个boot page
+      if (load == 'url') {
+        const bootPage = path.join(__dirname, '..', 'html', 'boot.html');
+        this.mainWindow.loadFile(bootPage);
+        let count = 0;
+        let frontendReady = false;
+        const hc = new HttpClient();
+        while(!frontendReady && count < 30){
+          await UtilsHelper.sleep(1 * 1000);
+          try {
+            await hc.request(url, {
+              method: 'GET',
+              timeout: 1000,
+            });
+            frontendReady = true;
+          } catch(err) {
+            // console.log('The frontend service is starting');
+          }
+
+          count++;
+        }
 
-    // html模式
-    if (selectMode == 'html') {
-      if (Ps.isDev()) {
-        staticDir = path.join(this.config.homeDir, 'frontend', 'dist');
+        if (frontendReady == false) {
+          const bootFailurePage = path.join(__dirname, '..', 'html', 'failure.html');
+          this.mainWindow.loadFile(bootFailurePage);
+          Log.coreLogger.error(`[ee-core] Please check the ${url} !`);
+          return;
+        }
       }
-      this.loadLocalWeb('html', staticDir, modeInfo);
+
+      this.loadMainUrl('spa', url, load);
       return;
     }
 
-    // 单页应用
-    // 开发环境
-    if (Ps.isDev()) {
-      url = modeInfo.protocol + modeInfo.hostname + ':' + modeInfo.port;
-      this.loadMainUrl('spa', url);
-      return;
-    } 
     // 生产环境
     const mainServer = this.config.mainServer;
     if (Conf.isFileProtocol(mainServer)) {
@@ -137,7 +177,7 @@ class EeApp extends BaseApp {
   /**
    * 加载本地前端资源
    */
-  loadLocalWeb(mode, staticDir, hostInfo) {
+  loadLocalWeb(mode, staticDir) {
     if (!staticDir) {
       staticDir = path.join(this.config.homeDir, 'public', 'dist')
     }
@@ -147,9 +187,6 @@ class EeApp extends BaseApp {
 
     const mainServer = this.config.mainServer;
     let url = mainServer.protocol + mainServer.host + ':' + mainServer.port;
-    if (mode == 'html') {
-      url += '/' + hostInfo.indexPage;
-    }
 
     const isHttps = mainServer.protocol == 'https://' ? true : false;
     if (isHttps) {
@@ -170,7 +207,12 @@ class EeApp extends BaseApp {
         this.loadMainUrl(mode, url);
       });
     } else {
-      koaApp.listen(mainServer.port, () => {
+      // 使用 host port 避免绑定到0.0.0.0
+      const koaOpt = {
+        host: mainServer.host,
+        port: mainServer.port
+      }
+      koaApp.listen(koaOpt, () => {
         this.loadMainUrl(mode, url);
       });
     }

package/electron/app/index.js

@@ -21,16 +21,9 @@ const CoreElectronApp = {
       app.quit();
       return;
     }
-
-    app.on('second-instance', (event) => {
-      Window.restoreMainWindow();
-    })
   
     app.whenReady().then(() => {
       CoreApp.createWindow();
-      app.on('activate', () => {
-        Window.restoreMainWindow();
-      })
     })
     
     app.on('window-all-closed', () => {

package/electron/window/index.js

@@ -1,4 +1,5 @@
-const { app, BrowserWindow, Menu } = require('electron');
+const is = require('is-type-of');
+const { BrowserWindow, Menu } = require('electron');
 const Conf = require('../../config');
 const Ps = require('../../ps');
 const EEMainWindow = Symbol('Ee#electron#mainWindow');
@@ -43,12 +44,16 @@ const Window = {
     }
 
     // DevTools
-    if (config.openDevTools) {
+    if (is.object(config.openDevTools)) {
+      win.webContents.openDevTools(config.openDevTools);
+    } else if (config.openDevTools === true) {
       win.webContents.openDevTools({
         mode: 'undocked'
       });
+    } else {
+      //
     }
-
+    
     return win;
   },
 

package/html/boot.html

@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1.0, minimum-scale=1.0" />
+    <style>
+      #loadingPage {
+        background-color: #dedede;
+        font-size: 12px;
+      }
+      .base {
+        left: 45%;
+        position: absolute;
+        top: 40%;
+      }
+      .desc {
+        margin: 0, 0, 20px, 0;
+      }
+      .loading,
+      .loading > div {
+        position: relative;
+        box-sizing: border-box;
+      }
+      .loading {
+        display: block;
+        font-size: 0;
+        color: #06b359;
+      }
+      .loading.la-dark {
+        color: #07C160;
+      }
+      .loading > div {
+        display: inline-block;
+        float: none;
+        background-color: currentColor;
+        border: 0 solid currentColor;
+      }
+      .loading {
+        width: 92px;
+        height: 92px;
+      }
+      .loading > div {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        background: transparent;
+        border-style: solid;
+        border-width: 2px;
+        border-radius: 100%;
+        animation: ball-clip-rotate-multiple-rotate 1s ease-in-out infinite;
+      }
+      .loading > div:first-child {
+        position: absolute;
+        width: 92px;
+        height: 92px;
+        border-right-color: transparent;
+        border-left-color: transparent;
+      }
+      .loading > div:last-child {
+        width: 16px;
+        height: 16px;
+        border-top-color: transparent;
+        border-bottom-color: transparent;
+        animation-duration: 0.5s;
+        animation-direction: reverse;
+      }
+      @keyframes ball-clip-rotate-multiple-rotate {
+        0% {
+          transform: translate(-50%, -50%) rotate(0deg);
+        }
+
+        50% {
+          transform: translate(-50%, -50%) rotate(180deg);
+        }
+
+        100% {
+          transform: translate(-50%, -50%) rotate(360deg);
+        }
+      }
+    </style>
+  </head>
+  <body>
+    <div id="boot">
+      <div class='base'>
+        <!-- Booting the frontend service ... -->
+        <!-- <div class='desc'>
+          Booting frontend
+        </div> -->
+        <div class="loading">
+          <div></div>
+          <div></div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>

package/html/failure.html

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1.0, minimum-scale=1.0" />
+    <title>Booting failure</title>
+    <style>
+      #failure {
+        background-color: #dedede;
+        font-size: 14px;
+      }
+      .base {
+        position: absolute;            
+        top: 50%;            
+        left: 50%;            
+        transform: translate(-50%, -50%);   
+      }
+    </style>
+  </head>
+  <body>
+    <div id="failure">
+      <div class='base'>
+        Booting failure, please check frontend serve is runing !
+      </div>
+    </div>
+  </body>
+</html>

package/package.json

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

package/ps/index.js

@@ -181,6 +181,14 @@ exports.getElectronDir = function() {
   return process.env.EE_BASE_DIR;
 }
 
+/**
+ * 获取public目录
+ */
+exports.getPublicDir = function() {
+  const dir = path.join(process.env.EE_HOME, "public");
+  return dir;
+}
+
 /**
  * 获取 额外资源目录
  */

package/socket/httpServer.js

@@ -65,13 +65,18 @@ class HttpServer {
       .use(this.dispatch);
 
     let msg = '[ee-core] [socket/http] server is: ' + url;
+
+    const listenOpt = {
+      host: httpServer.host,
+      port: httpServer.port
+    }
     if (isHttps) {
-      https.createServer(sslOptions, koaApp.callback()).listen(httpServer.port, (err) => {
+      https.createServer(sslOptions, koaApp.callback()).listen(listenOpt, (err) => {
         msg = err ? err : msg;
         Log.coreLogger.info(msg);
       });
     } else {
-      koaApp.listen(httpServer.port, (e) => {
+      koaApp.listen(listenOpt, (e) => {
         msg = e ? e : msg;
         Log.coreLogger.info(msg);
       });

package/storage/jsondbStorage.js

@@ -12,26 +12,22 @@ class JsondbStorage {
   constructor (name, opt = {}) {
     assert(name, `db name ${name} Cannot be empty`);
 
+    // 补全文件名
+    name = this._addExtname(name);
     this.name = name;
-
-    // 数据库key列表
+    this.mode = this.getMode(name);
+    this.storageDir = this._createStorageDir();
+    this.fileName = this._formatFileName(name);
     this.storageKey = Constants.storageKey;
 
-    const storageDir = Ps.getStorageDir();
-    if (!fs.existsSync(storageDir)) {
-      Helper.mkdir(storageDir);
-    }
-
-    this.db = this.table(name);
+    this.db = this.table();
   }
 
   /**
    * 创建 table
    */
-  table (name) {
-    assert(name, 'table name is required');
-
-    const dbFile = this.getFilePath(name);
+  table() {
+    const dbFile = this.getFilePath();
     const adapter = new FileSync(dbFile);
     const db = Jsondb(adapter);
 
@@ -41,21 +37,75 @@ class JsondbStorage {
   }
 
   /**
-   * 获取db文件名
+   * 补全扩展名
+   */
+  _addExtname(name) {
+    if (path.extname(name) != '.json') {
+      name += ".json";
+    }
+
+    return name;
+  }
+
+  /**
+   * 创建storage目录
+   */
+  _createStorageDir() {
+    let storageDir = Ps.getStorageDir();
+
+    if (this.mode == 'absolute') {
+      storageDir = path.dirname(this.name); 
+    }
+
+    if (!fs.existsSync(storageDir)) {
+      Helper.mkdir(storageDir);
+      Helper.chmodPath(storageDir, '777');
+    }
+
+    return storageDir;
+  }
+
+  /**
+   * 获取文件名
    */
-  getFileName (name) {
-    return name + ".json";
+  _formatFileName(name) {
+    let fileName = path.basename(name);
+    return fileName;
   }
 
   /**
    * 获取文件绝对路径
    */
-  getFilePath (name) {
-    const storageDir = Ps.getStorageDir();
-    const dbFile = path.join(storageDir, this.getFileName(name));
+  getFilePath() {
+    const dbFile = path.join(this.storageDir, this.fileName);
     return dbFile;
   }
 
+  /**
+   * 获取file path 模式
+   */
+  getMode(name) {
+    let mode = 'relative';
+
+    // 路径模式
+    name = name.replace(/[/\\]/g, '/');
+    if (name.indexOf('/') !== -1) {
+      const isAbsolute = path.isAbsolute(name);
+      if (isAbsolute) {
+        mode = 'absolute';
+      }
+    }
+
+    return mode;
+  }
+
+  /**
+   * 获取storage目录
+   */
+  getStorageDir() {
+    return this.storageDir;
+  }  
+
   /**
    * 为指定的 name 设置一个对应的值
    */

package/utils/get-port/index.js

@@ -1,5 +1,6 @@
 'use strict';
 const net = require('net');
+const os = require('os');
 
 class Locked extends Error {
 	constructor(port) {
@@ -20,17 +21,53 @@ const releaseOldLockedPortsIntervalMs = 1000 * 15;
 // Lazily create interval on first use
 let interval;
 
-const getAvailablePort = options => new Promise((resolve, reject) => {
-	const server = net.createServer();
-	server.unref();
-	server.on('error', reject);
-	server.listen(options, () => {
-		const {port} = server.address();
-		server.close(() => {
-			resolve(port);
+const getLocalHosts = () => {
+	const interfaces = os.networkInterfaces();
+
+	// Add undefined value for createServer function to use default host,
+	// and default IPv4 host in case createServer defaults to IPv6.
+	const results = new Set([undefined, '0.0.0.0']);
+
+	for (const _interface of Object.values(interfaces)) {
+		for (const config of _interface) {
+			results.add(config.address);
+		}
+	}
+
+	return results;
+};
+
+const checkAvailablePort = options =>
+	new Promise((resolve, reject) => {
+		const server = net.createServer();
+		server.unref();
+		server.on('error', reject);
+
+		server.listen(options, () => {
+			const {port} = server.address();
+			server.close(() => {
+				resolve(port);
+			});
 		});
 	});
-});
+
+const getAvailablePort = async (options, hosts) => {
+	if (options.host || options.port === 0) {
+		return checkAvailablePort(options);
+	}
+
+	for (const host of hosts) {
+		try {
+			await checkAvailablePort({port: options.port, host}); // eslint-disable-line no-await-in-loop
+		} catch (error) {
+			if (!['EADDRNOTAVAIL', 'EINVAL'].includes(error.code)) {
+				throw error;
+			}
+		}
+	}
+
+	return options.port;
+};
 
 const portCheckSequence = function * (ports) {
 	if (ports) {
@@ -59,15 +96,17 @@ module.exports = async options => {
 		}
 	}
 
+	const hosts = getLocalHosts();
+
 	for (const port of portCheckSequence(ports)) {
 		try {
-			let availablePort = await getAvailablePort({...options, port}); // eslint-disable-line no-await-in-loop
+			let availablePort = await getAvailablePort({...options, port}, hosts); // eslint-disable-line no-await-in-loop
 			while (lockedPorts.old.has(availablePort) || lockedPorts.young.has(availablePort)) {
 				if (port !== 0) {
 					throw new Locked(port);
 				}
 
-				availablePort = await getAvailablePort({...options, port}); // eslint-disable-line no-await-in-loop
+				availablePort = await getAvailablePort({...options, port}, hosts); // eslint-disable-line no-await-in-loop
 			}
 
 			lockedPorts.young.add(availablePort);

package/utils/helper.js

@@ -3,6 +3,10 @@ const mkdirp = require('mkdirp');
 const convert = require('koa-convert');
 const is = require('is-type-of');
 const co = require('./co');
+const path = require('path');
+const chalk = require('chalk');
+
+const _basePath = process.cwd();
 
 /**
  * fnDebounce
@@ -138,3 +142,34 @@ exports.validValue = function(value) {
     value !== ''
   );
 }
+
+exports.checkConfig = function(prop) {
+  const filepath = path.join(_basePath, prop);
+  if (fs.existsSync(filepath)) {
+    return true;
+  }
+  
+  return false;
+}
+
+exports.loadConfig = function(prop) {
+  const configFile = prop;
+  const filepath = path.join(_basePath, configFile);
+  if (!fs.existsSync(filepath)) {
+    const errorTips = 'config file ' + chalk.blue(`${filepath}`) + ' does not exist !';
+    throw new Error(errorTips)
+  }
+  const obj = require(filepath);
+  if (!obj) return obj;
+
+  let ret = obj;
+  if (is.function(obj) && !is.class(obj)) {
+    ret = obj();
+  }
+
+  return ret || {};
+};
+
+exports.sleep = function(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+};