ee-core 2.11.1 → 4.0.0-beta.1

package/httpclient/index.js

@@ -1,161 +0,0 @@
-const Agent = require('agentkeepalive');
-const HttpsAgent = require('agentkeepalive').HttpsAgent;
-const urllib = require('urllib');
-const { FrameworkBaseError } = require('egg-errors');
-const Conf = require('../config/cache');
-const Log = require('../log');
-const Time = require('../utils/time');
-
-class HttpClientError extends FrameworkBaseError {
-  get module() {
-    return 'httpclient';
-  }
-}
-
-class HttpClient extends urllib.HttpClient2 {
-  constructor(options = {}) {
-
-    if (Object.keys(options).length == 0) {
-      options = Conf.getValue('httpclient');
-    }
-
-    const config = Object.assign({
-      enableDNSCache: false,
-      dnsCacheLookupInterval: 10000,
-      dnsCacheMaxLength: 1000,
-      request: {
-        timeout: 5000,
-      },
-      httpAgent: {
-        keepAlive: true,
-        freeSocketTimeout: 4000,
-        maxSockets: Number.MAX_SAFE_INTEGER,
-        maxFreeSockets: 256,
-      },
-      httpsAgent: {
-        keepAlive: true,
-        freeSocketTimeout: 4000,
-        maxSockets: Number.MAX_SAFE_INTEGER,
-        maxFreeSockets: 256,
-      },
-    }, options);
-
-    normalizeConfig(config);
-
-    super({
-      defaultArgs: config.request,
-      agent: new Agent(config.httpAgent),
-      httpsAgent: new HttpsAgent(config.httpsAgent),
-    });
-    this.config = config;
-  }
-
-  request(url, args, callback) {
-    if (typeof args === 'function') {
-      callback = args;
-      args = null;
-    }
-
-    args = args || {};
-
-    // the callback style
-    if (callback) {
-      //this.app.deprecate('[httpclient] We now support async for this function, so callback isn\'t recommended.');
-      super.request(url, args)
-        .then(result => process.nextTick(() => callback(null, result.data, result.res)))
-        .catch(err => process.nextTick(() => callback(err)));
-      return;
-    }
-
-    // the Promise style
-    return super.request(url, args)
-      .catch(err => {
-        if (err.code === 'ENETUNREACH') {
-          throw HttpClientError.create(err.message, err.code);
-        }
-        throw err;
-      });
-  }
-
-  curl(url, args, callback) {
-    return this.request(url, args, callback);
-  }
-
-  requestThunk(url, args) {
-    //this.app.deprecate('[httpclient] Please use `request()` instead of `requestThunk()`');
-    return callback => {
-      this.request(url, args, (err, data, res) => {
-        if (err) {
-          return callback(err);
-        }
-        callback(null, {
-          data,
-          status: res.status,
-          headers: res.headers,
-          res,
-        });
-      });
-    };
-  }
-}
-
-function normalizeConfig(httpConfig) {
-  const config = httpConfig;
-
-  // compatibility
-  if (typeof config.keepAlive === 'boolean') {
-    config.httpAgent.keepAlive = config.keepAlive;
-    config.httpsAgent.keepAlive = config.keepAlive;
-  }
-  if (config.timeout) {
-    config.timeout = Time.ms(config.timeout);
-    config.httpAgent.timeout = config.timeout;
-    config.httpsAgent.timeout = config.timeout;
-  }
-  // compatibility httpclient.freeSocketKeepAliveTimeout => httpclient.freeSocketTimeout
-  if (config.freeSocketKeepAliveTimeout && !config.freeSocketTimeout) {
-    config.freeSocketTimeout = config.freeSocketKeepAliveTimeout;
-    delete config.freeSocketKeepAliveTimeout;
-  }
-  if (config.freeSocketTimeout) {
-    config.freeSocketTimeout = Time.ms(config.freeSocketTimeout);
-    config.httpAgent.freeSocketTimeout = config.freeSocketTimeout;
-    config.httpsAgent.freeSocketTimeout = config.freeSocketTimeout;
-  } else {
-    // compatibility agent.freeSocketKeepAliveTimeout
-    if (config.httpAgent.freeSocketKeepAliveTimeout && !config.httpAgent.freeSocketTimeout) {
-      config.httpAgent.freeSocketTimeout = config.httpAgent.freeSocketKeepAliveTimeout;
-      delete config.httpAgent.freeSocketKeepAliveTimeout;
-    }
-    if (config.httpsAgent.freeSocketKeepAliveTimeout && !config.httpsAgent.freeSocketTimeout) {
-      config.httpsAgent.freeSocketTimeout = config.httpsAgent.freeSocketKeepAliveTimeout;
-      delete config.httpsAgent.freeSocketKeepAliveTimeout;
-    }
-  }
-
-  if (typeof config.maxSockets === 'number') {
-    config.httpAgent.maxSockets = config.maxSockets;
-    config.httpsAgent.maxSockets = config.maxSockets;
-  }
-  if (typeof config.maxFreeSockets === 'number') {
-    config.httpAgent.maxFreeSockets = config.maxFreeSockets;
-    config.httpsAgent.maxFreeSockets = config.maxFreeSockets;
-  }
-
-  if (config.httpAgent.timeout < 30000) {
-    Log.coreLogger.warn('[ee-core] [httpclient] config.httpclient.httpAgent.timeout(%s) can\'t below 30000, auto reset to 30000',
-      config.httpAgent.timeout);
-    config.httpAgent.timeout = 30000;
-  }
-  if (config.httpsAgent.timeout < 30000) {
-    Log.coreLogger.warn('[ee-core] [httpclient] config.httpclient.httpsAgent.timeout(%s) can\'t below 30000, auto reset to 30000',
-      config.httpsAgent.timeout);
-    config.httpsAgent.timeout = 30000;
-  }
-
-  if (typeof config.request.timeout === 'string') {
-    config.request.timeout = Time.ms(config.request.timeout);
-  }
-}
-
-module.exports = HttpClient;

package/jobs/baseJobClass.js

@@ -1,16 +0,0 @@
-/**
- * BaseJobClass
- */
-class BaseJobClass {
-
-  /**
-   * @class
-   * @param {Object} params - job基础类
-   * @since 1.0.0
-   */
-  constructor(params = {}) {
-    // todo
-  }
-}
-
-module.exports = BaseJobClass;

package/jobs/renderer/index.js

@@ -1,141 +0,0 @@
-const { BrowserWindow } = require('electron');
-const fs = require('fs');
-const LoadView = require('./loadView');
-const Loader = require('../../loader');
-
-class RendererJob {
-
-  /**
-    * constructor
-    * @param  {String} name - job name
-    * @param  {String} filepath - filepath to file
-    * @param  {Object} options - options to create BrowserWindow
-    */
-  constructor(name, filepath, opt = {}) {
-    // TODO Object.assign 只能单层对象结构，多层的对象会直接覆盖
-    let options = Object.assign({
-      show: false,
-      webPreferences: {
-        webSecurity: true,
-        nodeIntegration: true,
-        contextIsolation: false,
-        //enableRemoteModule: true
-      }
-    }, opt);
-
-    this.subWin = new BrowserWindow(options);
-
-    this.jobReady = false;
-    this.exec = Loader.getFullpath(filepath);;
-    this.name = name;
-    this.listeners = [];
-    this.callbacks = [];
-    this.fails = [];
-    this.id = this.subWin.id;
-    this.webSecurity = options.webPreferences.webSecurity;
-
-    // this.callbacks.push(() => {
-    //   MessageChannel.registry(name, this.id, this.subWin.webContents.getOSProcessId());
-    // });
-
-    // job state listener
-    this.subWin.webContents.on('did-finish-load', this._didFinishLoad);
-    this.subWin.webContents.on('did-fail-load', this._didFailLoad);
-
-    // load job
-    this._loadJob(this.exec);
-  }
-
-  /**
-   * 显示开发者工具栏
-   */
-  openDevTools() {
-    this.subWin.webContents.openDevTools({
-      mode: 'undocked'
-    });
-  }
-
-  /**
-   * 窗口加载完成，即业务代码执行完毕
-   */
-  _didFinishLoad = () => {
-    this.jobReady = true;
-    this.callbacks.forEach(callback => {
-      callback(this.id);
-    });
-  }
-
-  /**
-   * 窗口加载失败，即业务运行失败
-   */
-  _didFailLoad = (error) => {
-    this.jobReady = false;
-    this.fails.forEach(handle => {
-      handle(error.toString());
-    });
-  }
-
-
-  /**
-   * 加载任务
-   */
-  _loadJob(filepath) {
-    if (!this.webSecurity) {
-      this._loadURLUnsafe(filepath);
-    } else {
-      this._loadURLSafe(filepath);
-    }
-  }
-
-  /**
-   * 安全的脚本注入
-   */
-  _loadURLSafe(filepath) {
-    return new Promise((resolve, reject) => {
-      fs.readFile(filepath, { encoding: 'utf-8' }, (err, buffer) => {
-        if (err) {
-          reject(err);
-          this._didFailLoad(err);
-          return console.error(err);
-        }
-
-        let param = {
-          webSecurity: true,
-          script: buffer.toString(),
-          title: `${this.name} job`,
-          base: filepath
-        }
-        const viewData = LoadView(param);
-
-        this.subWin.loadURL(viewData)
-        .then(resolve)
-        .catch(err => {
-          reject(err);
-          this._didFailLoad(err);
-          console.error(err);
-        });
-      })
-    })
-  }
-
-  /**
-   * 不安全的脚本注入
-   */
-  _loadURLUnsafe(filepath) {
-    let param = {
-      webSecurity: false,
-      src: this.exec,
-      title: `${this.name} job`,
-      base: filepath
-    }
-    const viewData = LoadView(param);
-
-    this.subWin.loadURL(viewData)
-    .catch(err => {
-      this._didFailLoad(err);
-      console.error(err);
-    });
-  }
-}
-
-module.exports = RendererJob;

package/jobs/renderer/loadView.js

@@ -1,41 +0,0 @@
-//require('bytenode');
-const Ps = require('../../ps');
-
-/**
-  * loadView 生成BrowserWindow的html content
-  */
-const loadView = function (opt = {}) {
-  const webSecurity = opt.webSecurity;
-  const src = opt.src;
-  const title = opt.title;
-  const script = opt.script;
-
-  //const scriptUrl = new URL('eefile://' + src);
-  const scriptUrl = 'eefile://' + src;
-  console.log('[ee-core:job] scriptUrl: ', scriptUrl);
-
-  // 脚本内容
-  //const scriptBytenode = Ps.isDev() ? '' : `<script> require('bytenode') </script>`;
-  const scriptContent = webSecurity ? `<script> ${ script } </script>` : `<script src='${scriptUrl}'></script>`;
-
-  // html内容
-  const htmlContent = (`
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <title>${title}</title>
-        <meta charset="UTF-8">
-      </head>
-      <body>
-        ${scriptContent}
-      </body>
-    </html>
-  `);
-
-  const DataURI = 'data:text/html;charset=UTF-8,';
-  const data = DataURI + encodeURIComponent(htmlContent);
-
-  return data;
-};
-
-module.exports = loadView;

package/jobs/unification.js

@@ -1,64 +0,0 @@
-const path = require('path');
-const fs = require('fs');
-const RendererJob = require('./renderer');
-const ChildJob = require('./child/pool');
-const Ps = require('../ps');
-const Loader = require('../loader');
-
-class Jobs  {
-  constructor() {
-    this.type;
-    this.dev;
-    this.path;
-    this.instance;
-    this.child;
-    this.childOptions;
-    this.renderer;
-    this.winOptions;
-  }
-
-  /**
-   * 创建 job
-   */
-  create (name, opt = {}) {
-    this.type = opt.type || 'child';
-    this.dev = opt.dev || false;
-    this.winOptions = opt.winOptions || {};
-    this.childOptions = opt.childOptions || {};
-    this.path = opt.path || null;
-
-    const isAbsolute = path.isAbsolute(this.path);
-    if (!isAbsolute) {
-      this.path = path.join(Ps.getBaseDir(), this.path);
-    }
-    const filepath = Loader.resolveModule(this.path);
-
-    if (!fs.existsSync(filepath)) {
-      throw new Error(`[ee-core] [jobs-create] file ${this.path} not exists`);
-    }
-    
-    this.path = filepath;
-    if (this.type == 'child') {
-      this.instance = new ChildJob(name, filepath, this.childOptions);
-      this.child = this.instance;
-    } else if (this.type == 'renderer') {
-      this.instance = new RendererJob(name, filepath, this.winOptions);
-      this.renderer = this.instance;
-
-      if (this.dev) {
-        this.openDevTools();
-      }
-    }
-    
-    return;
-  }
-
-  /**
-   * 显示开发者工具栏（仅支持 RendererJob)
-   */
-  openDevTools () {
-    this.instance.openDevTools();
-  }
-}
-
-module.exports = Jobs;

package/main/index.js

@@ -1,57 +0,0 @@
-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');
-const UtilsPargv = require('../utils/pargv');
-
-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) !`);
-    }
-    Ps.initMode(this.mode);
-
-    // env 可能为空
-    const argsObj = UtilsPargv(process.argv);
-    let isDev = false;
-    if ( argsObj['env'] == 'development' || argsObj['env'] === 'dev' || argsObj['env'] === 'local' ) {
-      isDev = true;
-    }
-
-    // module mode
-    if (Ps.isModuleMode()) {
-      const { Application } = EE;
-      new Application();
-      return;
-    }
-
-    let baseDir = path.join(app.getAppPath(), 'electron');
-    if (!isDev && Utils.isEncrypt(app.getAppPath())) {
-      baseDir = Ps.getEncryptDir(app.getAppPath());
-    }
-
-    const indexFile = path.join(baseDir, 'index');
-    const indexModulePath = Loader.resolveModule(indexFile);
-    if (!fs.existsSync(indexModulePath)) {
-      throw new Error(`The ${indexFile} file does not exist`);
-    }
-
-    const EEApp = UtilsCore.loadFile(indexModulePath);
-    EE.app = new EEApp();
-  }
-}
-
-module.exports = ElectronEgg;

package/old-utils/index.js

@@ -1,91 +0,0 @@
-/**
- * 该模块不在增加新功能，请使用 /module/utils/index 模块
- */
-
-const path = require('path');
-const UtilsJson = require('../utils/json');
-const UtilsPs = require('../ps');
-const UtilsHelper = require('../utils/helper');
-const Copy = require('../utils/copyto');
-const Conf = require('../config');
-const Channel = require('../const/channel');
-
-/**
- * other module
- */
-Copy(UtilsPs)
-.and(UtilsHelper)
-.to(exports);
-
-/**
- * 获取项目根目录package.json
- */
-exports.getPackage = function() {
-  const json = UtilsJson.readSync(path.join(this.getHomeDir(), 'package.json'));
-  
-  return json;
-};
-
-/**
- * 获取 ee配置
- */
-exports.getEeConfig = function() {
-  const config = Conf.all();
-
-  return config;
-}
-
-/**
- * 获取 app version
- */
-exports.getAppVersion = function() {
-  const v = Conf.all().appVersion;
-  return v;
-}
-
-/**
- * 获取 插件配置
- */
-exports.getAddonConfig = function() {
-  const cfg = Conf.all().addons;
-  return cfg;
-}
-
-/**
- * 获取 mainServer配置
- */
-exports.getMainServerConfig = function() {
-  const cfg = Conf.all().mainServer;
-  return cfg;
-}
-
-/**
- * 获取 httpServer配置
- */
-exports.getHttpServerConfig = function() {
-  const cfg = Conf.all().httpServer;
-  return cfg;
-}
-
-/**
- * 获取 socketServer配置
- */
-exports.getSocketServerConfig = function() {
-  const cfg = Conf.all().socketServer;
-  return cfg;
-}
-
-/**
- * 获取 socketio port
- */
-exports.getSocketPort = function() {
-  const port = Conf.all().socketServer.port;
-  return parseInt(port);
-}
-
-/**
- * 获取 socket channel
- */
-exports.getSocketChannel = function() {
-  return Channel.socketIo.partySoftware;
-}

package/services/baseContextClass.js

@@ -1,24 +0,0 @@
-'use strict';
-
-/**
- * BaseContextClass is a base class that can be extended,
- */
-class BaseContextClass {
-
-  /**
-   * @class
-   * @param {Context} ctx - context instance
-   * @since 1.1.0
-   */
-  constructor(ctx) {
-
-    // todo 兼容旧版本，后续废弃ctx
-    if (typeof ctx === 'object') {
-      this.app = ctx;
-      this.config = ctx.config;
-      this.service = ctx.service;
-    }
-  }
-}
-
-module.exports = BaseContextClass;

package/services/index.js

@@ -1,41 +0,0 @@
-const EE = require('../ee');
-
-const Services = {
-
-  /**
-   * 获取 all addon instances
-   */  
-  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!');
-    };
-    return instances;
-  },
-
-  /**
-   * 获取 addon instance
-   */  
-  get(name) {
-    const instances = this.all();
-
-    const actions = name.split('.');
-    let obj = instances;
-    actions.forEach(key => {
-      obj = obj[key];
-    });
-
-    if (!obj) {
-      throw new Error(`Service class '${name}' not exists or do not call directly at the top!`);
-    };
-    return obj;
-  },
-
-};
-
-module.exports = Services;

package/socket/io.js

@@ -1,28 +0,0 @@
-'use strict';
-
-/**
- * 该文件将废弃
- */
-
-const IoServer = require('socket.io');
-const IoClient = require('socket.io-client');
-//const socketServer = require('./socketServer');
-// const socketClient = require('./socketClient');
-const Koa = require('koa');
-
-const EeSocket = {
-  getServer: () => {
-    //return socketServer.getInstance();
-  },
-  getClient: () => {
-    //return socketClient.getInstance();
-  }
-}
-
-
-module.exports = {
-  IoServer,
-  IoClient,
-  EeSocket,
-  Koa
-};

package/storage/jsondb/adapters/Base.js

@@ -1,23 +0,0 @@
-class Base {
-  constructor(source) {
-    this.source = source
-    this.defaultValue = {}
-    this.serialize = this._stringify
-    this.deserialize = JSON.parse
-  }
-
-  _canDeserialized(obj) {
-    try {
-      this.deserialize(obj)
-      return true
-    } catch (e) {
-      return false
-    }
-  }
-
-  _stringify(obj) {
-    return JSON.stringify(obj, null, 2)
-  }
-}
-
-module.exports = Base