ee-core 2.11.1 → 4.0.0-beta.1

package/ee/eeApp.js

@@ -1,409 +0,0 @@
-const path = require('path');
-const fs = require('fs');
-const assert = require('assert');
-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 CoreElectron = require('../electron');
-const CoreElectronApp = require('../electron/app');
-const CoreElectronWindow = require('../electron/window');
-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');
-const Cross = require('../cross');
-const Html = require('../html');
-
-class EeApp extends BaseApp {
-  constructor(options = {}) {
-    super(options);
-
-    // 兼容旧的api
-    this.electron = CoreElectron;
-    this.mainWindow;
-  }
-
-  /**
-   * 生成端口
-   */
-  async createPorts() {
-    if (Ps.isFrameworkMode() && Conf.isWebProtocol(this.config.mainServer)) {
-      const mainPort = await GetPort({port: parseInt(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: parseInt(this.config.socketServer.port)});
-      process.env.EE_SOCKET_PORT = socketPort;
-      this.config.socketServer.port = socketPort;
-    }
-    
-    if (this.config.httpServer.enable) {
-      const httpPort = await GetPort({port: parseInt(this.config.httpServer.port)});
-      process.env.EE_HTTP_PORT = httpPort;
-      this.config.httpServer.port = httpPort;
-    }
-    
-    // [todo] 更新db配置 (system.json 不再主进程中使用了，后续可能在子进程中使用）
-    Conf.setAll(this.config);
-  }
-
-  /**
-   * 启动通信模块
-   */
-  async startSocket() {
-    Socket.startAll(this);
-  }
-  
-  /**
-   * 启动跨语言服务
-   */
-  async crossService() {
-    Cross.create();
-  }
-
-  /**
-   * 创建electron应用
-   */
-  async createElectronApp() {
-    if (!Ps.isFrameworkMode()) return;
-    const newApp = CoreElectronApp.create();
-    if (!newApp) {
-      return
-    }
-
-    await this.crossService();
-    
-    await this.electronAppReady();
-  }
-    
-  /**
-   * 创建应用主窗口
-   */
-  async createWindow() {
-
-    // 初始化一个主窗口
-    this.mainWindow = CoreElectronWindow.getMainWindow();
-
-    await this.windowReady();
-  
-    await this._loderAddons();
-
-    await this._loderPreload();
-
-    this.selectAppType();
-  }
-
-  /**
-   * 应用类型 （远程、html、单页应用）
-   */
-  async selectAppType() {
-    let type = '';
-    let url = '';
-
-    // 远程模式
-    const remoteConfig = this.config.remoteUrl;
-    if (remoteConfig.enable == true) {
-      type = 'remote_web';
-      url = remoteConfig.url;
-      this.loadMainUrl(type, url);
-      return;
-    }
-
-    const mainServer = this.config.mainServer;
-
-    // 开发环境
-    if (Ps.isDev()) {
-      let modeInfo;
-      let url;
-      let load = 'url';
-      const configFile = './electron/config/bin.js';
-      let electronCfg = {};
-
-      const isBin = UtilsHelper.checkConfig(configFile);
-      if (isBin) {
-        const binConfig = UtilsHelper.loadConfig(configFile);
-        modeInfo = binConfig.dev.frontend;
-        electronCfg = binConfig.dev.electron;
-      } 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') {
-        // loading page
-        let lp = Html.getFilepath('boot.html');
-        if (electronCfg.hasOwnProperty('loadingPage') && electronCfg.loadingPage != '') {
-          lp = path.join(this.config.homeDir, electronCfg.loadingPage);
-        }
-        this._loadingPage(lp);
-
-        const retryTimes = modeInfo.force === true ? 3 : 60;
-        let count = 0;
-        let frontendReady = false;
-        const hc = new HttpClient();
-        while(!frontendReady && count < retryTimes){
-          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++;
-        }
-
-        if (frontendReady == false && modeInfo.force !== true) {
-          const bootFailurePage = Html.getFilepath('failure.html');
-          this.mainWindow.loadFile(bootFailurePage);
-          Log.coreLogger.error(`[ee-core] Please check the ${url} !`);
-          return;
-        }
-      }
-
-      this.loadMainUrl('spa', url, load);
-      return;
-    }
-
-    // 生产环境
-    // cross service takeover web
-    if (mainServer.hasOwnProperty('takeover')) {
-      await this._crossTakeover(mainServer)
-      return
-    }
-
-    // 主进程
-    if (mainServer.protocol == "") {
-      return
-    }
-    if (Conf.isFileProtocol(mainServer)) {
-      url = path.join(this.config.homeDir, mainServer.indexPath);
-      this.loadMainUrl('spa', url, 'file');
-    } else {
-      this.loadLocalWeb('spa');
-    }
-  }
-
-  /**
-   * cross service takeover web
-   */
-  async _crossTakeover(mainCfg = {}) {
-    const crossConfig = this.config.cross;
-
-    // loading page
-    if (mainCfg.hasOwnProperty('loadingPage')) {
-      const lp = path.join(this.config.homeDir, mainCfg.loadingPage);
-      this._loadingPage(lp);
-    }
-
-    // cross service url
-    const service = mainCfg.takeover;
-    if (!crossConfig.hasOwnProperty(service)) {
-      throw new Error(`[ee-core] Please Check the value of mainServer.takeover in the config file !`);
-    }
-    // check service
-    if (crossConfig[service].enable != true) {
-      throw new Error(`[ee-core] Please Check the value of cross.${service} enable is true !`);
-    }
-
-    const entityName = crossConfig[service].name;
-    const url = Cross.getUrl(entityName);
-
-    let count = 0;
-    let serviceReady = false;
-    const hc = new HttpClient();
-
-    // 循环检查
-    const times = Ps.isDev() ? 20 : 100;
-    const sleeptime = Ps.isDev() ? 1000 : 100;
-    while(!serviceReady && count < times){
-      await UtilsHelper.sleep(sleeptime);
-      try {
-        await hc.request(url, {
-          method: 'GET',
-          timeout: 100,
-        });
-        serviceReady = true;
-      } catch(err) {
-        //console.log('The cross service is starting');
-      }
-      count++;
-    }
-    //console.log('count:', count)
-    if (serviceReady == false) {
-      const bootFailurePage = Html.getFilepath('cross-failure.html');
-      this.mainWindow.loadFile(bootFailurePage);
-      throw new Error(`[ee-core] Please check cross service [${service}] ${url} !`)
-    }
-
-    Log.coreLogger.info(`[ee-core] cross service [${service}] is started successfully`);
-    this.loadMainUrl('spa', url);
-  }  
-
-  /**
-   * 加载本地前端资源
-   */
-  loadLocalWeb(mode, staticDir) {
-    if (!staticDir) {
-      staticDir = path.join(this.config.homeDir, 'public', 'dist')
-    }
-
-    const koaApp = new Koa();	
-    koaApp.use(koaServe(staticDir));
-
-    const mainServer = this.config.mainServer;
-    let url = mainServer.protocol + mainServer.host + ':' + mainServer.port;
-
-    const isHttps = mainServer.protocol == 'https://' ? true : false;
-    if (isHttps) {
-      const keyFile = path.join(this.config.homeDir, mainServer.ssl.key);
-      const certFile = path.join(this.config.homeDir, mainServer.ssl.cert);
-      assert(fs.existsSync(keyFile), 'ssl key file is required');
-      assert(fs.existsSync(certFile), 'ssl cert file is required');
-
-      const sslOpt = {
-        key: fs.readFileSync(keyFile),
-        cert: fs.readFileSync(certFile)
-      };
-      https.createServer(sslOpt, koaApp.callback()).listen(mainServer.port, (err) => {
-        if (err) {
-          Log.coreLogger.info('[ee-core] [lib/eeApp] createServer error: ', err);
-          return
-        }
-        this.loadMainUrl(mode, url);
-      });
-    } else {
-      // 使用 host port 
-      const koaOpt = {
-        host: mainServer.open ? undefined : mainServer.host, // 根据配置是否开放0.0.0.0，默认关闭，避免绑定到0.0.0.0
-        port: mainServer.port
-      }
-      koaApp.listen(koaOpt, () => {
-        this.loadMainUrl(mode, url);
-      });
-    }
-  }
-
-  /**
-   * 主服务
-   * @params load <string> value: "url" 、 "file"
-   */
-  loadMainUrl(type, url, load  =  'url') {
-    const mainServer = this.config.mainServer;
-    Log.coreLogger.info('[ee-core] Env: %s, Type: %s', this.config.env, type);
-    Log.coreLogger.info('[ee-core] App running at: %s', url);
-    if (load ==  'file')  {
-      this.mainWindow.loadFile(url, mainServer.options)
-      .then()
-      .catch((err)=>{
-        Log.coreLogger.error(`[ee-core] Please check the ${url} !`);
-      });
-    } else {
-      this.mainWindow.loadURL(url, mainServer.options)
-      .then()
-      .catch((err)=>{
-        Log.coreLogger.error(`[ee-core] Please check the ${url} !`);
-      });
-    }
-  }
-
-  /**
-   * loading page
-   */  
-  _loadingPage(name) {
-    if (!UtilsHelper.fileIsExist(name)) {
-      return
-    }
-    this.mainWindow.loadFile(name);
-  }
-
-  /**
-   * electron app退出
-   */  
-  async appQuit() {
-    await this.beforeClose();
-    CoreElectronApp.quit();
-  }
-
-  /**
-   * 加载插件
-   */
-  async _loderAddons() {
-    this.loader.loadAddons();
-
-    // 注册主窗口Contents id
-    const addonsCfg = this.config.addons;
-    if (addonsCfg.window.enable && Ps.isFrameworkMode()) {
-      const win = this.mainWindow;
-      const addonWindow = this.addon.window;
-      addonWindow.registerWCid('main', win.webContents.id);
-    }
-  }
-
-  /**
-   * 预加载模块
-   */
-  async _loderPreload() {
-    let filepath = this.loader.resolveModule(path.join(this.config.baseDir, 'preload', 'index'));
-    if (!filepath) return; 
-    const fileObj = this.loader.loadFile(filepath);
-    if (is.function(fileObj) && !is.generatorFunction(fileObj) && !is.asyncFunction(fileObj)) {
-      fileObj();
-    } else if (is.asyncFunction(fileObj)) {
-      await fileObj();
-    }
-  }
-
-  /**
-   * module模式初始化
-   */
-  async InitModuleMode() {
-    if (!Ps.isModuleMode()) return;
-
-    await this._loderAddons();
-
-    await this._loderPreload();
-  }
-
-  /**
-   * electron app已经准备好，主窗口还未创建
-   */
-  async electronAppReady() {
-    // do some things
-  }
-
-  /**
-   * 主应用窗口已经创建
-   */
-  async windowReady() {
-    // do some things
-  }
-
-  /**
-   * app关闭之前
-   */  
-  async beforeClose() {
-    // do some things
-  }  
-}
-
-module.exports = EeApp;

package/ee/index.js

@@ -1,58 +0,0 @@
-const Utils = require('../utils');
-const EEApplication = Symbol('Ee#Application');
-const BuiltInApp = Symbol('Ee#BuiltInApp');
-
-/**
- * EE
- */
-const EE = {
-
-  /**
-   * 兼容1.x版本api
-   */
-  get Application() {
-    const appClass = require('./application');
-    return appClass;
-  },
-
-  /**
-   * 设置实例化app对象
-   */  
-  set app(appObject) {
-    if (!this[EEApplication]) {
-      this[EEApplication] = appObject;
-    }
-  },
-
-  /**
-   * 获取实例化app对象
-   */  
-  get app() {
-    return this[EEApplication] || null;
-  },
-
-  /**
-   * 设置全局this到CoreApp (eeApp)
-   */  
-  set CoreApp(obj) {
-    if (!this[BuiltInApp]) {
-      this[BuiltInApp] = obj;
-    }
-  },
-
-  /**
-   * 获取 CoreApp (eeApp)
-   */  
-  get CoreApp() {
-    return this[BuiltInApp] || null;
-  },
-
-  /**
-   * 是否加密
-   */  
-  isEncrypt(basePath) {
-    return Utils.isEncrypt(basePath);
-  },
-}  
-
-module.exports = EE;

package/electron/window/winState.js

@@ -1,186 +0,0 @@
-'use strict';
-
-const path = require('path');
-const electron = require('electron');
-const jsonfile = require('jsonfile');
-const mkdirp = require('mkdirp');
-
-module.exports = function (options) {
-  const app = electron.app || electron.remote.app;
-  const screen = electron.screen || electron.remote.screen;
-  let state;
-  let winRef;
-  let stateChangeTimer;
-  const eventHandlingDelay = 100;
-  const config = Object.assign({
-    file: 'window-state.json',
-    path: app.getPath('userData'),
-    maximize: true,
-    fullScreen: true
-  }, options);
-  const fullStoreFileName = path.join(config.path, config.file);
-
-  function isNormal(win) {
-    return !win.isMaximized() && !win.isMinimized() && !win.isFullScreen();
-  }
-
-  function hasBounds() {
-    return state &&
-      Number.isInteger(state.x) &&
-      Number.isInteger(state.y) &&
-      Number.isInteger(state.width) && state.width > 0 &&
-      Number.isInteger(state.height) && state.height > 0;
-  }
-
-  function resetStateToDefault() {
-    const displayBounds = screen.getPrimaryDisplay().bounds;
-
-    // Reset state to default values on the primary display
-    state = {
-      width: config.defaultWidth || 800,
-      height: config.defaultHeight || 600,
-      x: 0,
-      y: 0,
-      displayBounds
-    };
-  }
-
-  function windowWithinBounds(bounds) {
-    return (
-      state.x >= bounds.x &&
-      state.y >= bounds.y &&
-      state.x + state.width <= bounds.x + bounds.width &&
-      state.y + state.height <= bounds.y + bounds.height
-    );
-  }
-
-  function ensureWindowVisibleOnSomeDisplay() {
-    const visible = screen.getAllDisplays().some(display => {
-      return windowWithinBounds(display.bounds);
-    });
-
-    if (!visible) {
-      // Window is partially or fully not visible now.
-      // Reset it to safe defaults.
-      return resetStateToDefault();
-    }
-  }
-
-  function validateState() {
-    const isValid = state && (hasBounds() || state.isMaximized || state.isFullScreen);
-    if (!isValid) {
-      state = null;
-      return;
-    }
-
-    if (hasBounds() && state.displayBounds) {
-      ensureWindowVisibleOnSomeDisplay();
-    }
-  }
-
-  function updateState(win) {
-    win = win || winRef;
-    if (!win) {
-      return;
-    }
-    // Don't throw an error when window was closed
-    try {
-      const winBounds = win.getBounds();
-      if (isNormal(win)) {
-        state.x = winBounds.x;
-        state.y = winBounds.y;
-        state.width = winBounds.width;
-        state.height = winBounds.height;
-      }
-      state.isMaximized = win.isMaximized();
-      state.isFullScreen = win.isFullScreen();
-      state.displayBounds = screen.getDisplayMatching(winBounds).bounds;
-    } catch (err) {}
-  }
-
-  function saveState(win) {
-    // Update window state only if it was provided
-    if (win) {
-      updateState(win);
-    }
-
-    // Save state
-    try {
-      mkdirp.sync(path.dirname(fullStoreFileName));
-      jsonfile.writeFileSync(fullStoreFileName, state);
-    } catch (err) {
-      // Don't care
-    }
-  }
-
-  function stateChangeHandler() {
-    // Handles both 'resize' and 'move'
-    clearTimeout(stateChangeTimer);
-    stateChangeTimer = setTimeout(updateState, eventHandlingDelay);
-  }
-
-  function closeHandler() {
-    updateState();
-  }
-
-  function closedHandler() {
-    // Unregister listeners and save state
-    unmanage();
-    saveState();
-  }
-
-  function manage(win) {
-    if (config.maximize && state.isMaximized) {
-      win.maximize();
-    }
-    if (config.fullScreen && state.isFullScreen) {
-      win.setFullScreen(true);
-    }
-    win.on('resize', stateChangeHandler);
-    win.on('move', stateChangeHandler);
-    win.on('close', closeHandler);
-    win.on('closed', closedHandler);
-    winRef = win;
-  }
-
-  function unmanage() {
-    if (winRef) {
-      winRef.removeListener('resize', stateChangeHandler);
-      winRef.removeListener('move', stateChangeHandler);
-      clearTimeout(stateChangeTimer);
-      winRef.removeListener('close', closeHandler);
-      winRef.removeListener('closed', closedHandler);
-      winRef = null;
-    }
-  }
-
-  // Load previous state
-  try {
-    state = jsonfile.readFileSync(fullStoreFileName);
-  } catch (err) {
-    // Don't care
-  }
-
-  // Check state validity
-  validateState();
-
-  // Set state fallback values
-  state = Object.assign({
-    width: config.defaultWidth || 800,
-    height: config.defaultHeight || 600
-  }, state);
-
-  return {
-    get x() { return state.x; },
-    get y() { return state.y; },
-    get width() { return state.width; },
-    get height() { return state.height; },
-    get displayBounds() { return state.displayBounds; },
-    get isMaximized() { return state.isMaximized; },
-    get isFullScreen() { return state.isFullScreen; },
-    saveState,
-    unmanage,
-    manage,
-    resetStateToDefault
-  };
-};