哆啦好梦 2 years ago
parent
commit
f6a0770e05
4 changed files with 98 additions and 52 deletions
  1. 6 9
      electron/jobs/example.js
  2. 34 14
      electron/jobs/test.js
  3. 17 29
      electron/preload/index.js
  4. 41 0
      electron/preload/test.js

+ 6 - 9
electron/jobs/example.js

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

+ 34 - 14
electron/jobs/test.js

@@ -1,19 +1,39 @@
-const path = require('path');
+const Utils = require('ee-core/module/utils');
 const Log = require('ee-core/module/log');
 
 exports.hello = function () {
-  Log.info('[test]  hello--------');
-
-  return 'hello';
+  Log.info('[child-process] [jobs/test] hello -------- ');
 }
 
-// exports.getDir = function (name) {
-
-//   let baseDir = Utils.getBaseDir();
-//   console.log('[test] baseDir -------- ', baseDir);
-
-//   let tp = path.join(__dirname, name);
-//   console.log('[test] jobs file -------- ', tp);
-
-//   return baseDir;
-// }
+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(),
+    getPackage: Utils.getPackage(),
+    getEeConfig: Utils.getEeConfig(),
+    getAppVersion: Utils.getAppVersion(),
+    getAddonConfig: Utils.getAddonConfig(),
+    getMainServerConfig: Utils.getMainServerConfig(),
+    getHttpServerConfig: Utils.getHttpServerConfig(),
+    getSocketServerConfig: Utils.getSocketServerConfig(),
+    getSocketChannel: Utils.getSocketChannel(),
+    getExtraResourcesDir: Utils.getExtraResourcesDir(),
+  }
+  Log.info('[child-process] [jobs/test] Utils -------- ', utilsApis);
+}

+ 17 - 29
electron/preload/index.js

@@ -1,15 +1,11 @@
 /*************************************************
  ** preload为预加载模块,该文件将会在程序启动时加载 **
  *************************************************/
-// const {
-//   MessageChannel,
-//   ProcessManager,
-//   BrowserService
-// } = require('electron-re');
-const path = require('path');
+
 const Jobs = require('ee-core/module/jobs');
-const Utils = require('ee-core/module/Utils');
+const Utils = require('ee-core/module/utils');
 const Log = require('ee-core/module/log');
+const test = require('./test');
 
 /**
  * 预加载模块入口
@@ -28,36 +24,28 @@ module.exports = async (app) => {
   awakenAddon.create();
   autoUpdaterAddon.create();
 
-  // Object.keys(Log.logger)
-  // let personKeys3 = []
-  // for (var prop in Log.logger) {
-  //   personKeys3.push(prop)
-  // }
-  // console.log('logger:', personKeys3);
-  Log.info('dddddddddd')
+  Log.info("[main] process type: ", Utils.processType());
+  Log.info("[main] process cwd: ", process.cwd());
 
-  // pm
-  // ProcessManager.openWindow();
-  // const exampleFile = path.join(app.config.baseDir, 'jobs', 'example.js');
-  // const myService = new BrowserService('exampleJob', exampleFile);
-  // await myService.connected();
+  test();
 
-  // logger.info("[main] process: ", process);
-  // console.log("isRenderer: ", Utils.isRenderer());
-  // console.log("isMain: ", Utils.isMain());
-  // console.log("isForkedChild: ", Utils.isForkedChild());
-  // let res = require('../jobs/example') 
-  // console.log('res:', res);
+  let opt1 = {
+    dev: true,
+    type: 'child', // renderer 
+    path: './jobs/example.js',
+    childOptions: {}
+  }
+  let myJob = new Jobs();
+  myJob.create('exampleJob', opt1);
 
-  // let opt = {
+  // let opt2 = {
   //   dev: true,
-  //   type: 'child', // renderer 
+  //   type: 'renderer', // renderer 
   //   path: 'example.js',
   //   winOptions: {
   //     show: true
   //   },
   //   childOptions: {}
   // }
-  // let myJob = new Jobs();
-  // myJob.create('exampleJob', opt);
+  // myJob.create('exampleJob', opt2);
 }

+ 41 - 0
electron/preload/test.js

@@ -0,0 +1,41 @@
+const Log = require('ee-core/module/log');
+const Utils = require('ee-core/module/utils');
+
+module.exports = async () => {
+
+  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(),
+    getPackage: Utils.getPackage(),
+    getEeConfig: Utils.getEeConfig(),
+    getAppVersion: Utils.getAppVersion(),
+    getAddonConfig: Utils.getAddonConfig(),
+    getMainServerConfig: Utils.getMainServerConfig(),
+    getHttpServerConfig: Utils.getHttpServerConfig(),
+    getSocketServerConfig: Utils.getSocketServerConfig(),
+    getSocketChannel: Utils.getSocketChannel(),
+    getExtraResourcesDir: Utils.getExtraResourcesDir(),
+  }
+  Log.info('[main] [test] utilsApis -------- ', utilsApis);
+}