ee-core 2.8.0-beta.3 → 2.8.0

package/config/config.default.js

@@ -284,7 +284,7 @@ module.exports = appInfo => {
    * 硬件加速
    */
   config.hardGpu = {
-    enable: false
+    enable: true
   };
 
   /**

package/cross/index.js

@@ -74,13 +74,10 @@ const CrossLanguageService = {
 
     const allConfig = Conf.all();
     const defaultOpt = allConfig.cross[service] || {};
-    console.log("defaultOpt:", defaultOpt);
-    //const targetConf = Object.assign({}, defaultOpt, opt);
     const targetConf = extend(true, {}, defaultOpt, opt);
     if (Object.keys(targetConf).length == 0) {
       throw new Error(`[ee-core] [cross] The service [${service}] config does not exit`);
     }
-    console.log("targetConf:", targetConf);
 
     // eventEmitter
     this._initEventEmitter();
@@ -88,11 +85,9 @@ const CrossLanguageService = {
     // format params
     let tmpArgs = targetConf.args;
     let confPort = parseInt(Helper.getValueFromArgv(tmpArgs, 'port'));
-    console.log("confPort1:", confPort);
     if (confPort > 0) {
       // 动态生成port，传入的端口必须为int
       confPort = await GetPort({ port: confPort });
-      console.log("confPort2:", confPort);
       // 替换port
       targetConf.args = Helper.replaceArgsValue(tmpArgs, "port", String(confPort));
     }

package/cross/spawnProcess.js

@@ -34,7 +34,6 @@ class SpawnProcess {
     // Launch executable program
     let cmdPath = '';
     let cmdArgs = targetConf.args;
-    console.log("targetConf.args:", targetConf.args);
     let execDir = Ps.getExtraResourcesDir();
     let standardOutput = ['inherit', 'inherit', 'inherit', 'ipc'];
     if (Ps.isPackaged()) {
@@ -44,8 +43,6 @@ class SpawnProcess {
     const { cmd, directory } = targetConf;
     // use cmd first
     if (cmd) {
-      console.log("cmd:", cmd)
-      console.log("cmd isAbsolute :", path.isAbsolute(cmd))
       if (!directory) {
         throw new Error(`[ee-core] [cross] The config [directory] attribute does not exist`);
       }
@@ -62,15 +59,10 @@ class SpawnProcess {
       cmdPath += ".exe";
     }
 
-    console.log("cmdPath:", cmdPath)
-
     // executable program directory
-    console.log("directory:", directory)
     if (directory && path.isAbsolute(directory)) {
-      console.log("directory isAbsolute :", path.isAbsolute(directory))
       execDir = directory;
     } else if (directory && !path.isAbsolute(directory)) {
-      console.log("directory isAbsolute :", path.isAbsolute(directory))
       if (Ps.isDev()) {
         execDir = path.join(Ps.getHomeDir(), directory);
       } else {
@@ -79,7 +71,6 @@ class SpawnProcess {
     } else {
       execDir = Ps.getExtraResourcesDir();
     }
-    console.log("execDir:", execDir)
 
     Log.coreLogger.info(`[ee-core] [cross/run] cmd: ${cmdPath}, args: ${cmdArgs}`);
     const coreProcess = crossSpawn(cmdPath, cmdArgs, { 
@@ -121,25 +112,25 @@ class SpawnProcess {
     }, timeout)
   }
 
-  send(message) {
-    return this.sendByType(message, 'message');
-  }
-
-  close() {
-    return this.sendByType('close', 'close');
-  }
-
-  async sendByType(message, type) {
-    const msg = typeof message === 'string' ? message : JSON.stringify(message);
-    const id = this._generateId();
-
-    this.child.send({
-        id,
-        type,
-        data: msg,
-    });
-    return;
-  }
+  // send(message) {
+  //   return this.sendByType(message, 'message');
+  // }
+
+  // close() {
+  //   return this.sendByType('close', 'close');
+  // }
+
+  // async sendByType(message, type) {
+  //   const msg = typeof message === 'string' ? message : JSON.stringify(message);
+  //   const id = this._generateId();
+
+  //   this.child.send({
+  //       id,
+  //       type,
+  //       data: msg,
+  //   });
+  //   return;
+  // }
 
   getUrl() {
     const ssl = Helper.getValueFromArgv(this.config.args, 'ssl');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "2.8.0-beta.3",
+  "version": "2.8.0",
   "description": "ee core",
   "main": "index.js",
   "scripts": {

package/utils/helper.js

@@ -182,9 +182,7 @@ exports.replaceArgsValue = function(argv, key, value) {
     let pos = item.indexOf(key);
     if (pos !== -1) {
       pos = pos + key.length;
-      console.log("pos2:", pos)
       let tmpStr = item.substring(0, pos);
-      console.log("tmpStr:", tmpStr)
       argv[i] = tmpStr + value;
       break;
     }
@@ -193,18 +191,6 @@ exports.replaceArgsValue = function(argv, key, value) {
   return argv;
 };
 
-// exports.replaceValue = function(arr, key, value) {
-//   arr = arr.map(item => {
-//     if (item.startsWith(key)) {
-//         let newItem = key + value;
-//         return newItem;
-//     } else {
-//         return item;
-//     }
-//   });
-//   return arr;
-// };
-
 exports.getValueFromArgv = function(argv, key) {
   const argvObj = Pargv(argv);
   if (argvObj.hasOwnProperty(key)) {
@@ -219,9 +205,7 @@ exports.getValueFromArgv = function(argv, key) {
     let pos = item.indexOf(key);
     if (pos !== -1) {
       pos = pos + key.length;
-      console.log("pos2:", pos)
       value = item.substring(pos);
-      console.log("value:", value)
       break;
     }
   }