ee-core 4.1.0 → 4.1.2

package/app/boot.js

@@ -4,7 +4,7 @@ const debug = require('debug')('ee-core:app:boot');
 const path = require('path');
 const { loadException } = require('../exception');
 const { electronApp } = require('../electron/app');
-const { getArgumentByName, getBundleDir } = require('../ps');
+const { getArgumentByName, getBundleDir, getElectronCodeDir } = require('../ps');
 const { loadConfig } = require('../config');
 const { loadLog } = require('../log');
 const { app } = require('./application');
@@ -15,11 +15,18 @@ class ElectronEgg {
     const baseDir = electronApp.getAppPath();
     const { env } = process;
     const environmet = getArgumentByName('env') || 'prod';
+    const debugging = getArgumentByName('debuger') == 'true'? true : false;
+    
+    // Debugging source code
+    let electronDir = getBundleDir(baseDir);
+    if (debugging) {
+      electronDir = getElectronCodeDir(baseDir);
+    }
 
     const options = {
       env: environmet,
       baseDir,
-      electronDir: getBundleDir(baseDir),
+      electronDir,
       appName: electronApp.getName(),
       userHome: electronApp.getPath('home'),
       appData: electronApp.getPath('appData'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "4.1.0",
+  "version": "4.1.2",
   "description": "ee core",
   "main": "index.js",
   "scripts": {
@@ -8,9 +8,6 @@
   },
   "author": "",
   "license": "ISC",
-  "bin": {
-    "ee-core": "./bin/tools.js"
-  },
   "dependencies": {
     "agentkeepalive": "^4.2.0",
     "axios": "^1.7.9",

package/ps/index.d.ts

@@ -11,6 +11,8 @@ export declare function appVersion(): string;
 export declare function getDataDir(): string;
 export declare function getLogDir(): string;
 export declare function getBundleDir(basePath: string): string;
+export declare function getElectronCodeDir(basePath: string): string;
+export declare function getFrontendCodeDir(basePath: string): string;
 export declare function getRootDir(): string;
 export declare function getBaseDir(): string;
 export declare function getElectronDir(): string;
@@ -34,4 +36,4 @@ export declare function makeMessage(msg?: {}): {
 export declare function exitChildJob(code?: number): void;
 export declare function isChildJob(): boolean;
 export declare function isChildPoolJob(): boolean;
-export declare function getArgumentByName(name: string): string;
+export declare function getArgumentByName(name: string, args?: any): string;

package/ps/index.js

@@ -90,10 +90,18 @@ function getBundleDir(basePath) {
   return dir;
 }
 
-// 获取root目录  (dev-项目根目录，pro-app user data目录)
-function getRootDir() {
-  const appDir = isDev() ? getBaseDir() : getAppUserDataDir();
-  return appDir;
+// 获取electron 源码文件路径
+function getElectronCodeDir(basePath) {
+  const base = basePath || process.cwd();
+  const dir = path.join(base, 'electron');
+  return dir;
+}
+
+// 获取frontend 源码文件路径
+function getFrontendCodeDir(basePath) {
+  const base = basePath || process.cwd();
+  const dir = path.join(base, 'frontend');
+  return dir;
 }
 
 // 获取base目录
@@ -133,6 +141,12 @@ function getExtraResourcesDir() {
   return dir;
 }
 
+// 获取root目录  (dev-项目根目录，pro-app user data目录)
+function getRootDir() {
+  const appDir = isDev() ? getBaseDir() : getAppUserDataDir();
+  return appDir;
+}
+
 // 获取 appUserData目录
 function getAppUserDataDir() {
   return process.env.EE_APP_USER_DATA;
@@ -230,9 +244,12 @@ function isChildPoolJob() {
 }
 
 // Get cmd parameter by name
-function getArgumentByName(name) {
-  for (let i = 0; i < process.argv.length; i++) {
-    const item = process.argv[i]
+function getArgumentByName(name, args) {
+  if (!args) {
+    args = process.argv;
+  }
+  for (let i = 0; i < args.length; i++) {
+    const item = args[i];
     const prefixKey = `--${name}=`;
     if (item.indexOf(prefixKey) !== -1) {
       return item.substring(prefixKey.length);
@@ -254,6 +271,8 @@ module.exports = {
   getDataDir,
   getLogDir,
   getBundleDir,
+  getElectronCodeDir,
+  getFrontendCodeDir,
   getRootDir,
   getBaseDir,
   getElectronDir,

package/socket/httpServer.js

@@ -50,6 +50,9 @@ class HttpServer {
    */
   _create () {
     const config = this.config;
+    // config.default 增加koaConfig配置项
+    const koaConfig = config.koaConfig || {};
+    const { preMiddleware = [], postMiddleware = [], errorHandler = null } = koaConfig;
     const isHttps = config?.https?.enable ?? false;
     const sslOptions = {};
 
@@ -67,11 +70,22 @@ class HttpServer {
     const corsOptions = config.cors;
 
     const koaApp = new Koa();
+
+    // 设置错误处理器，便于统一错误代码处理
+    this._setupErrorHandler(koaApp, errorHandler);
+
+    // 加载前置中间件
+    this._loadMiddlewares(koaApp, preMiddleware);
+
+    // 核心中间件
     koaApp
       .use(cors(corsOptions))
       .use(koaBody(config.body))
       .use(this._dispatch);
 
+    // 加载后置中间件
+    this._loadMiddlewares(koaApp, postMiddleware, 'post');
+
     let msg = '[ee-core] [socket/http] server is: ' + url;
     const listenOpt = {
       host: config.host,
@@ -88,7 +102,7 @@ class HttpServer {
         coreLogger.info(msg);
       });
     }
-    
+
     this.httpApp = koaApp;
   }
 
@@ -150,6 +164,34 @@ class HttpServer {
   getHttpApp() {
     return this.httpApp;
   }
+
+  // 设置错误处理函数
+  _setupErrorHandler(app, errorHandler) {
+    if (is.function(errorHandler)) {
+      app.on('error', errorHandler)
+    }
+  }
+
+  /**
+   * 加载前置、后置中间件
+   * @param {*} app koaApp示例
+   * @param {*} middlewares 中间件数组
+   * @param {*} type 类型，pre/post
+   */
+  _loadMiddlewares(app, middlewares = [], type = 'pre') {
+    if (is.array(middlewares)) {
+      middlewares.forEach((middleware) => {
+        if (is.function(middleware)) {
+          // middleware是一个方法
+          // 返回值是中间件(ctx, next) => {}的异步函数
+          // 便于使用async/await进行同步编程
+          app.use(middleware());
+        } else {
+          coreLogger.warn(`[ee-core/httpServer] Invalid ${type} middleware detected, skipping.`);
+        }
+      })
+    }
+  }
 }
 
 module.exports = {