ee-core 4.0.1 → 4.1.1

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/jobs/child/app.js

@@ -47,15 +47,20 @@ class ChildApp {
     const {jobPath, jobParams, jobFunc, jobFuncParams} = msg;
     let mod = requireFile(jobPath);
     if (is.class(mod) || isBytecodeClass(mod)) {
+      let instance;
       if (!this.jobMap.has(jobPath)) {
-        const instance = new mod(...jobParams);
-        instance.handle(...jobParams);
+        instance = new mod(...jobParams);
         this.jobMap.set(jobPath, instance);
       } else {
-        const instance = this.jobMap.get(jobPath);
-        instance[jobFunc](...jobFuncParams);
+        instance = this.jobMap.get(jobPath);
       }
 
+      // 如果指定了函数名，则调用指定的函数
+      if (jobFunc) {
+        instance[jobFunc](...jobFuncParams);
+      } else {
+        instance.handle(...jobParams);
+      }
     } else if (is.function(mod)) {
       mod(jobParams);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "4.0.1",
+  "version": "4.1.1",
   "description": "ee core",
   "main": "index.js",
   "scripts": {

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,