ee-core 2.11.1 → 4.0.0-beta.1

package/ps/index.js

@@ -1,216 +1,131 @@
-const path = require('path');
-const eis = require('../utils/is');
-
-/**
- * 初始化模式
- */
-exports.initMode = function(mode) {
-  if(process.env.EE_MODE !== undefined)return
-  return process.env.EE_MODE = mode ? mode : 'framework';
-}
-
-/**
- * 当前模式 - framework | module
- */
-exports.mode = function() {
-  return process.env.EE_MODE;
-}
+'use strict';
 
-/**
- * 校验模式
- */
-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');
-}
+const path = require('path');
+const is = require('../utils/is');
 
-/**
- * 当前进程的所有env
- */
-exports.allEnv = function() {
+// 当前进程的所有env
+function allEnv() {
   return process.env;
 }
 
-/**
- * 当前环境 - local | prod
- */
-exports.env = function() {
-  return process.env.EE_SERVER_ENV;
+// 当前环境 - local | prod
+function env() {
+  return process.env.EE_ENV;
 }
 
-/**
- * 获取 当前环境
- */
-exports.getEnv = this.env
-
-/**
- * 是否生产环境
- */
-exports.isProd = function() {
-  return (process.env.EE_SERVER_ENV === 'prod');
+// 是否生产环境
+function isProd() {
+  return (process.env.EE_ENV === 'prod');
 }
 
 /**
  * 是否为开发环境
  */
-exports.isDev = function() {
-  if ( process.env.EE_SERVER_ENV === 'development' ||
-    process.env.EE_SERVER_ENV === 'dev' ||
-    process.env.EE_SERVER_ENV === 'local'
-  ) {
-    return true;
-  }
-  
-  if ( process.env.NODE_ENV === 'development' ||
-    process.env.NODE_ENV === 'dev' ||
-    process.env.NODE_ENV === 'local'
-  ) {
+function isDev() {
+  if (process.env.EE_ENV === 'dev' || process.env.EE_ENV === 'local') {
     return true;
   }
 
   return false;
 };
 
-/**
- * 是否为渲染进程
- */
-exports.isRenderer = function() {
+// 是否为渲染进程
+function isRenderer() {
   return (typeof process === 'undefined' ||
     !process ||
     process.type === 'renderer');
 };
 
-/**
- * 是否为主进程
- */
-exports.isMain = function() {
+// 是否为主进程
+function isMain() {
   return ( typeof process !== 'undefined' &&
     process.type === 'browser');
 };
 
-/**
- * 是否为node子进程
- */
-exports.isForkedChild = function() {
+// 是否为node子进程
+function isForkedChild() {
   return (Number(process.env.ELECTRON_RUN_AS_NODE) === 1);
 };
 
-/**
- * 当前进程类型
- */
-exports.processType = function() {
+// 当前进程类型
+function processType() {
   let type = '';
-  if (this.isMain()) {
+  if (isMain()) {
     type = 'browser';
-  } else if (this.isRenderer()) {
+  } else if (isRenderer()) {
     type = 'renderer';
-  } else if (this.isForkedChild()) {
+  } else if (isForkedChild()) {
     type = 'child';
   }
 
   return type;
 };
 
-/**
- * app name
- */
-exports.appName = function() {
+// app name
+function appName() {
   return process.env.EE_APP_NAME;
 }
 
-/**
- * 获取home路径
- */
-exports.getHomeDir = function () {
-  return process.env.EE_HOME;
+// app version
+function appVersion() {
+  return process.env.EE_APP_VERSION;
 }
 
-/**
- * 获取数据存储路径
- */
-exports.getStorageDir = function () {
-  const storageDir = path.join(this.getRootDir(), 'data');
-  return storageDir;
+// 获取数据存储路径
+function getDataDir() {
+  const base = isDev() ? getBaseDir() : getUserHomeHiddenAppDir();
+  const dataDir = path.join(base, 'data');
+  return dataDir;
 }
 
-/**
- * 获取日志存储路径 
- */
-exports.getLogDir = function () {
-  const dir = path.join(this.getRootDir(), 'logs');
+// 获取日志存储路径 
+function getLogDir() {
+  const base = isDev() ? getBaseDir() : getUserHomeHiddenAppDir();
+  const dir = path.join(base, 'logs');
   return dir;
 }
 
-/**
- * 获取加密文件路径
- */
-exports.getEncryptDir = function (basePath) {
+// 获取bundle文件路径
+function getBundleDir(basePath) {
   const base = basePath || process.cwd();
   const dir = path.join(base, 'public', 'electron');
   return dir;
 }
 
-/**
- * 获取root目录  (dev-项目根目录，pro-app user data目录)
- */
-exports.getRootDir = function () {
-  const appDir = this.isDev() ? process.env.EE_HOME : process.env.EE_APP_USER_DATA;
+// 获取root目录  (dev-项目根目录，pro-app user data目录)
+function getRootDir() {
+  const appDir = isDev() ? getBaseDir() : getAppUserDataDir();
   return appDir;
 }
 
-/**
- * 获取base目录
- */
-exports.getBaseDir = function() {
+// 获取base目录
+function getBaseDir() {
   return process.env.EE_BASE_DIR;
 }
 
-/**
- * 获取electron目录
- */
-exports.getElectronDir = function() {
-  return process.env.EE_BASE_DIR;
+// 获取electron目录
+function getElectronDir() {
+  return process.env.EE_ELECTRON_DIR;
 }
 
-/**
- * 获取public目录
- */
-exports.getPublicDir = function() {
-  const dir = path.join(process.env.EE_HOME, "public");
+// 获取public目录
+function getPublicDir() {
+  const dir = path.join(getBaseDir(), "public");
   return dir;
 }
 
-/**
- * 获取 额外资源目录
- */
-exports.getExtraResourcesDir = function() {
-  const execDir = this.getExecDir();
-  const isPackaged = this.isPackaged();
-
+// 获取 额外资源目录
+function getExtraResourcesDir() {
+  const execDir = getExecDir();
+  const packaged = isPackaged();
 
   // 资源路径不同
   let dir = '';
-  if (isPackaged) {
+  if (packaged) {
     // 打包后  execDir为 应用程序 exe\dmg\dep软件所在目录；打包前该值是项目根目录
     // windows和MacOs不一样
     dir = path.join(execDir, "resources", "extraResources");
-    if (eis.macOS()) {
+    if (is.macOS()) {
       dir = path.join(execDir, "..", "Resources", "extraResources");
     }
   } else {
@@ -220,105 +135,64 @@ exports.getExtraResourcesDir = function() {
   return dir;
 }
 
-/**
- * 获取 appUserData目录
- */
-exports.getAppUserDataDir = function() {
+// 获取 appUserData目录
+function getAppUserDataDir() {
   return process.env.EE_APP_USER_DATA;
 }
 
-/**
- * 获取 exec目录
- */
-exports.getExecDir = function() {
+// 获取 exec目录
+function getExecDir() {
   return process.env.EE_EXEC_DIR;
 }
 
-/**
- * 获取操作系统用户目录
- */
-exports.getUserHomeDir = function() {
+// 获取操作系统用户目录
+function getUserHomeDir() {
   return process.env.EE_USER_HOME;
 }
 
-/**
- * 获取用户配置数据目录
- */
-exports.getUserHomeConfigDir = function() {
-  // const filePath = path.join(this.getHomeDir(), 'package.json');
-  // if (!fs.existsSync(filePath)) {
-  //   throw new Error(filePath + ' is not found');
-  // }
-  // const pkg = JSON.parse(fs.readFileSync(filePath));
-  // if (!pkg.name || pkg.name == "") {
-  //   throw new Error(`name is required from ${filePath}`);
-  // }
-  const appname = this.appName();
-  const cfgDir = path.join(this.getUserHomeDir(), ".config", appname);
-  return cfgDir;
-}
-
-/**
- * 获取基础数据路径
- */
-exports.getUserHomeAppFilePath = function() {
-  const p = path.join(this.getUserHomeConfigDir(), "app.json");
-  return p;
+// 获取用户家目录中的隐藏的app目录
+function getUserHomeHiddenAppDir() {
+  const appnameDir = "." + appName();
+  const dir = path.join(getUserHomeDir(), appnameDir);
+  return dir;
 }
 
-/**
- * 获取主进程端口
- */
-exports.getMainPort = function () {
-  return parseInt(process.env.EE_MAIN_PORT) || 0;
+// 获取用户家目录中的app目录
+function getUserHomeAppDir() {
+  const appnameDir = appName();
+  const dir = path.join(getUserHomeDir(), appnameDir);
+  return dir;
 }
 
-/**
- * 获取内置socket端口
- */
-exports.getSocketPort = function () {
+// 获取内置socket端口
+function getSocketPort() {
   return parseInt(process.env.EE_SOCKET_PORT) || 0;
 }
 
-/**
- * 获取内置http端口
- */
-exports.getHttpPort = function () {
+// 获取内置http端口
+function getHttpPort() {
   return parseInt(process.env.EE_HTTP_PORT) || 0;
 }
 
 /**
  * 是否打包
  */
-exports.isPackaged = function () {
+function isPackaged() {
   return process.env.EE_IS_PACKAGED === 'true';
 }
 
-/**
- * 是否加密
- */
-exports.isEncrypted = function () {
-  return process.env.EE_IS_ENCRYPTED === 'true';
-}
-
-/**
- * 是否热重启
- */
-exports.isHotReload = function () {
+// 是否热重启
+function isHotReload() {
   return process.env.HOT_RELOAD === 'true';
 }
 
-/**
- * 进程退出
- */
-exports.exit = function(code = 0) {
+// 进程退出
+function exit(code = 0) {
   return process.exit(code);
 }
 
-/**
- * 格式化message
- */
-exports.makeMessage = function(msg = {}) {
+// 格式化message
+function makeMessage(msg = {}) {
   let message = Object.assign({
     channel: '',
     event: '', 
@@ -328,10 +202,8 @@ exports.makeMessage = function(msg = {}) {
   return message;
 }
 
-/**
- * 退出ChildJob进程
- */
-exports.exitChildJob = function(code = 0) {
+// 退出ChildJob进程
+function exitChildJob(code = 0) {
   try {
     let args = JSON.parse(process.argv[2]);
     if (args.type == 'childJob') {
@@ -342,11 +214,8 @@ exports.exitChildJob = function(code = 0) {
   }
 }
 
-
-/**
- * 任务类型 ChildJob
- */
-exports.isChildJob = function() {
+// 任务类型 ChildJob
+function isChildJob() {
   try {
     let args = JSON.parse(process.argv[2]);
     if (args.type == 'childJob') {
@@ -357,10 +226,8 @@ exports.isChildJob = function() {
   }
 }
 
-/**
- * 任务类型 ChildPoolJob
- */
-exports.isChildPoolJob = function() {
+// 任务类型 ChildPoolJob
+function isChildPoolJob() {
   try {
     let args = JSON.parse(process.argv[2]);
     if (args.type == 'childPoolJob') {
@@ -369,4 +236,51 @@ exports.isChildPoolJob = function() {
   } catch (e) {
     return false;
   }
+}
+
+// Get cmd parameter by name
+function getArgumentByName(name) {
+  for (let i = 0; i < process.argv.length; i++) {
+    const item = process.argv[i]
+    const prefixKey = `--${name}=`;
+    if (item.indexOf(prefixKey) !== -1) {
+      return item.substring(prefixKey.length);
+    }
+  }
+}
+
+module.exports = {
+  allEnv,
+  env,
+  isProd,
+  isDev,
+  isRenderer,
+  isMain,
+  isForkedChild,
+  processType,
+  appName,
+  appVersion,
+  getDataDir,
+  getLogDir,
+  getBundleDir,
+  getRootDir,
+  getBaseDir,
+  getElectronDir,
+  getPublicDir,
+  getExtraResourcesDir,
+  getAppUserDataDir,
+  getExecDir,
+  getUserHomeDir,
+  getUserHomeAppDir,
+  getUserHomeHiddenAppDir,
+  getSocketPort,
+  getHttpPort,
+  isPackaged,
+  isHotReload,
+  exit,
+  makeMessage,
+  exitChildJob,
+  isChildJob,
+  isChildPoolJob,
+  getArgumentByName
 }

package/socket/httpServer.js

@@ -9,25 +9,33 @@ const https = require('https');
 const fs = require('fs');
 const path = require('path');
 const _ = require('lodash');
-const Log = require('../log');
-const Ps = require('../ps');
+const { coreLogger } = require('../log');
+const { getBaseDir } = require('../ps');
+const { getController } = require('../controller');
+const { getConfig } = require('../config');
+const { getPort } = require('../utils/port');
 
 /**
  * http server
  */
 class HttpServer {
-  constructor (app) {
-    this.app = app;
-    this.options = this.app.config.httpServer;
+  constructor () {
+    this.config = getConfig().httpServer;
+    this.httpApp = undefined;
+    this.init();
+  }
 
-    if (this.options.enable == false) {
+  async init() {
+    if (this.config.enable == false) {
       return;
     }
 
-    let port = Ps.getHttpPort();
+    const port = await getPort({port: parseInt(this.config.port)});
     if (!port) {
       throw new Error('[ee-core] [socket/HttpServer] http port required, and must be a number !');
     }
+    process.env.EE_HTTP_PORT = port;
+    this.config.port = port;
 
     this._create();
   }
@@ -36,72 +44,64 @@ class HttpServer {
    * 创建服务
    */
   _create () {
-    const app = this.app;
-    const httpServer = this.options;
-    const isHttps = httpServer?.https?.enable ?? false;
-    let sslOptions = {};
+    const config = this.config;
+    const isHttps = config?.https?.enable ?? false;
+    const sslOptions = {};
 
     if (isHttps === true) {
-      httpServer.protocol = 'https://';
-      const keyFile = path.join(app.config.homeDir, httpServer.https.key);
-      const certFile = path.join(app.config.homeDir, httpServer.https.cert);
+      config.protocol = 'https://';
+      const keyFile = path.join(getBaseDir(), config.https.key);
+      const certFile = path.join(getBaseDir(), config.https.cert);
       assert(fs.existsSync(keyFile), 'ssl key file is required');
       assert(fs.existsSync(certFile), 'ssl cert file is required');
 
       sslOptions.key = fs.readFileSync(keyFile);
       sslOptions.cert = fs.readFileSync(certFile);
     }
-    const url = httpServer.protocol + httpServer.host + ':' + httpServer.port;
-    const corsOptions = httpServer.cors;
+    const url = config.protocol + config.host + ':' + config.port;
+    const corsOptions = config.cors;
 
     const koaApp = new Koa();
     koaApp
       .use(cors(corsOptions))
-      .use(koaBody(httpServer.body))
-      .use(async (ctx, next) => {
-        ctx.eeApp = app;
-        await next();
-      })
+      .use(koaBody(config.body))
       .use(this._dispatch);
 
     let msg = '[ee-core] [socket/http] server is: ' + url;
-
     const listenOpt = {
-      host: httpServer.host,
-      port: httpServer.port
+      host: config.host,
+      port: config.port
     }
     if (isHttps) {
       https.createServer(sslOptions, koaApp.callback()).listen(listenOpt, (err) => {
         msg = err ? err : msg;
-        Log.coreLogger.info(msg);
+        coreLogger.info(msg);
       });
     } else {
       koaApp.listen(listenOpt, (e) => {
         msg = e ? e : msg;
-        Log.coreLogger.info(msg);
+        coreLogger.info(msg);
       });
-    }  
+    }
+    
+    this.httpApp = koaApp;
   }
 
   /**
    * 路由分发
    */
   async _dispatch (ctx, next) {
-    const config = ctx.eeApp.config.httpServer;
+    const controller = getController();
+    const { filterRequest } = getConfig().httpServer;
     let uriPath = ctx.request.path;
     const method = ctx.request.method;
     let params = ctx.request.query;
     params = is.object(params) ? JSON.parse(JSON.stringify(params)) : {};
     const body = ctx.request.body;
-    const files = ctx.request.files;
 
     // 默认
     ctx.response.status = 200;
 
-    // 添加到全局属性
-    ctx.eeApp.request = ctx.request;
-    ctx.eeApp.response = ctx.response;
-
     try {
       // 找函数
       // 去除开头的 '/'
@@ -109,8 +109,8 @@ class HttpServer {
         uriPath = uriPath.substring(1);
       }
       // 过滤
-      if (_.includes(config.filterRequest.uris, uriPath)) {
-        ctx.response.body = config.filterRequest.returnData;
+      if (_.includes(filterRequest.uris, uriPath)) {
+        ctx.response.body = filterRequest.returnData;
         await next();
         return
       }
@@ -118,14 +118,11 @@ class HttpServer {
         uriPath = 'controller/' + uriPath;
       }
       const cmd = uriPath.split('/').join('.');
-      const args = (method == 'POST') ? (ctx.request.header['content-type'] && ctx.request.header['content-type'].startsWith('multipart/form-data;') ? files : body) : params;
-      args.files = ctx.request.files;
-      args.body = ctx.request.body;
-      args.query = ctx.request.query;
+      const args = (method == 'POST') ? body: params;
       let fn = null;
       if (is.string(cmd)) {
         const actions = cmd.split('.');
-        let obj = ctx.eeApp;
+        let obj = { controller };
         actions.forEach(key => {
           obj = obj[key];
           if (!obj) throw new Error(`class or function '${key}' not exists`);
@@ -134,14 +131,20 @@ class HttpServer {
       }
       if (!fn) throw new Error('function not exists');
 
-      const result = await fn.call(ctx.eeApp, args);
+      const result = await fn.call(controller, args, ctx);
       ctx.response.body = result;
     } catch (err) {
-      Log.coreLogger.error('[ee-core/httpServer] throw error:', err);
+      coreLogger.error('[ee-core/httpServer] throw error:', err);
     }
 
     await next();
   }
+
+  getHttpApp() {
+    return this.httpApp;
+  }
 }
 
-module.exports = HttpServer;
+module.exports = {
+  HttpServer
+};