job

electron/jobs/example.js

@@ -1,11 +1,11 @@
 const Loader = require('ee-core/module/loader');
 const Log = require('ee-core/module/log');
-const Utils = require('ee-core/module/utils');
+const Ps = require('ee-core/module/utils/ps');
 const test = Loader.requireJobsModule('./test');
 
 // logger.info("[renderer] process: ", process);
-Log.info("[child-process] process type: ", Utils.processType());
+Log.info("[child-process] process type: ", Ps.processType());
 Log.info("[child-process] process cwd: ", process.cwd());
 
 test.hello();
-test.utilsMod();
+//test.utilsMod();

electron/jobs/test.js

@@ -1,5 +1,6 @@
-const Utils = require('ee-core/module/utils');
 const Log = require('ee-core/module/log');
+const Utils = require('ee-core/module/utils');
+const Ps = require('ee-core/module/utils/ps');
 
 exports.hello = function () {
   Log.info('[child-process] [jobs/test] hello -------- ');
@@ -7,24 +8,24 @@ exports.hello = function () {
 
 exports.utilsMod = function () {
   let utilsApis = {
-    getBaseDir: Utils.getBaseDir(),
-    getEnv: Utils.getEnv(),
-    isDev: Utils.isDev(),
-    isRenderer: Utils.isRenderer(),
-    isMain: Utils.isMain(),
-    isForkedChild: Utils.isForkedChild(),
-    getHomeDir: Utils.getHomeDir(),
-    getStorageDir: Utils.getStorageDir(),
-    getLogDir: Utils.getLogDir(),
-    getRootDir: Utils.getRootDir(),
-    getBaseDir: Utils.getBaseDir(),
-    getAppUserDataDir: Utils.getAppUserDataDir(),
-    getHomeDir: Utils.getHomeDir(),
-    getUserHomeDir: Utils.getUserHomeDir(),
-    getMainPort: Utils.getMainPort(),
-    getSocketPort: Utils.getSocketPort(),
-    getHttpPort: Utils.getHttpPort(),
-    getExecDir: Utils.getExecDir(),
+    getBaseDir: Ps.getBaseDir(),
+    getEnv: Ps.getEnv(),
+    isDev: Ps.isDev(),
+    isRenderer: Ps.isRenderer(),
+    isMain: Ps.isMain(),
+    isForkedChild: Ps.isForkedChild(),
+    getHomeDir: Ps.getHomeDir(),
+    getStorageDir: Ps.getStorageDir(),
+    getLogDir: Ps.getLogDir(),
+    getRootDir: Ps.getRootDir(),
+    getBaseDir: Ps.getBaseDir(),
+    getAppUserDataDir: Ps.getAppUserDataDir(),
+    getHomeDir: Ps.getHomeDir(),
+    getUserHomeDir: Ps.getUserHomeDir(),
+    getMainPort: Ps.getMainPort(),
+    getSocketPort: Ps.getSocketPort(),
+    getHttpPort: Ps.getHttpPort(),
+    getExecDir: Ps.getExecDir(),
     getPackage: Utils.getPackage(),
     getEeConfig: Utils.getEeConfig(),
     getAppVersion: Utils.getAppVersion(),
@@ -33,7 +34,7 @@ exports.utilsMod = function () {
     getHttpServerConfig: Utils.getHttpServerConfig(),
     getSocketServerConfig: Utils.getSocketServerConfig(),
     getSocketChannel: Utils.getSocketChannel(),
-    getExtraResourcesDir: Utils.getExtraResourcesDir(),
+    getExtraResourcesDir: Ps.getExtraResourcesDir(),
   }
   Log.info('[child-process] [jobs/test] Utils -------- ', utilsApis);
 }

electron/preload/index.js

@@ -2,8 +2,9 @@
  ** preload为预加载模块，该文件将会在程序启动时加载 **
  *************************************************/
 
-const Jobs = require('ee-core/module/jobs');
-const Utils = require('ee-core/module/utils');
+const ChildJob = require('ee-core/module/jobs/child');
+// const OriginJob = require('ee-core/module/jobs/unification');
+const UtilsPs = require('ee-core/module/utils/ps');
 const Log = require('ee-core/module/log');
 const test = require('./test');
 
@@ -24,28 +25,23 @@ module.exports = async (app) => {
   awakenAddon.create();
   autoUpdaterAddon.create();
 
-  Log.info("[main] process type: ", Utils.processType());
+  Log.info("[main] process type: ", UtilsPs.processType());
   Log.info("[main] process cwd: ", process.cwd());
 
   test();
 
-  let opt1 = {
-    dev: true,
-    type: 'child', // renderer 
-    path: './jobs/example.js',
-    childOptions: {}
-  }
-  let myJob = new Jobs();
-  myJob.create('exampleJob', opt1);
+  let myJob = new ChildJob();
+  myJob.run('exampleJob', './jobs/example.js');
 
   // let opt2 = {
   //   dev: true,
-  //   type: 'renderer', // renderer 
-  //   path: 'example.js',
+  //   type: 'child', // renderer 
+  //   path: './jobs/example.js',
   //   winOptions: {
   //     show: true
   //   },
   //   childOptions: {}
   // }
-  // myJob.create('exampleJob', opt2);
+  // let myJob2 = new OriginJob();
+  // myJob2.create('exampleJob2', opt2);
 }

electron/preload/test.js

@@ -1,32 +1,33 @@
 const Log = require('ee-core/module/log');
 const Utils = require('ee-core/module/utils');
+const Ps = require('ee-core/module/utils/ps');
 
 module.exports = async () => {
 
-  utilsMod();
+  //utilsMod();
 
 }
 
 function utilsMod() {
   let utilsApis = {
-    getBaseDir: Utils.getBaseDir(),
-    getEnv: Utils.getEnv(),
-    isDev: Utils.isDev(),
-    isRenderer: Utils.isRenderer(),
-    isMain: Utils.isMain(),
-    isForkedChild: Utils.isForkedChild(),
-    getHomeDir: Utils.getHomeDir(),
-    getStorageDir: Utils.getStorageDir(),
-    getLogDir: Utils.getLogDir(),
-    getRootDir: Utils.getRootDir(),
-    getBaseDir: Utils.getBaseDir(),
-    getAppUserDataDir: Utils.getAppUserDataDir(),
-    getHomeDir: Utils.getHomeDir(),
-    getUserHomeDir: Utils.getUserHomeDir(),
-    getMainPort: Utils.getMainPort(),
-    getSocketPort: Utils.getSocketPort(),
-    getHttpPort: Utils.getHttpPort(),
-    getExecDir: Utils.getExecDir(),
+    getBaseDir: Ps.getBaseDir(),
+    getEnv: Ps.getEnv(),
+    isDev: Ps.isDev(),
+    isRenderer: Ps.isRenderer(),
+    isMain: Ps.isMain(),
+    isForkedChild: Ps.isForkedChild(),
+    getHomeDir: Ps.getHomeDir(),
+    getStorageDir: Ps.getStorageDir(),
+    getLogDir: Ps.getLogDir(),
+    getRootDir: Ps.getRootDir(),
+    getBaseDir: Ps.getBaseDir(),
+    getAppUserDataDir: Ps.getAppUserDataDir(),
+    getHomeDir: Ps.getHomeDir(),
+    getUserHomeDir: Ps.getUserHomeDir(),
+    getMainPort: Ps.getMainPort(),
+    getSocketPort: Ps.getSocketPort(),
+    getHttpPort: Ps.getHttpPort(),
+    getExecDir: Ps.getExecDir(),
     getPackage: Utils.getPackage(),
     getEeConfig: Utils.getEeConfig(),
     getAppVersion: Utils.getAppVersion(),
@@ -35,7 +36,7 @@ function utilsMod() {
     getHttpServerConfig: Utils.getHttpServerConfig(),
     getSocketServerConfig: Utils.getSocketServerConfig(),
     getSocketChannel: Utils.getSocketChannel(),
-    getExtraResourcesDir: Utils.getExtraResourcesDir(),
+    getExtraResourcesDir: Ps.getExtraResourcesDir(),
   }
   Log.info('[main] [test] utilsApis -------- ', utilsApis);
 }