back

app/utils/utils.js

@@ -1,9 +1,8 @@
 'use strict';
-const util = require('util');
+
 const crypto = require('crypto');
 const fs = require('fs');
 const path = require('path');
-const _ = require('lodash');
 const readline = require('readline');
 const net = require('net');
 

electron/lib/api.js → electron/api.js

@@ -4,9 +4,9 @@ const fs = require('fs');
 const http = require('http');
 const path = require('path');
 const _ = require('lodash');
-const storage = require('./storage');
+const storage = require('./lib/storage');
 const socketIo = require('socket.io');
-const eLogger = require('./eLogger').get();
+const eLogger = require('./lib/eLogger').get();
 // const {app} = require('electron');
 
 const apis = {};
@@ -17,7 +17,7 @@ exports.setup = async function () {
 
   // use api server
   let port = await storage.setIpcDynamicPort();
-  eLogger.info('[api] [setup] dynamic port:', port);
+  eLogger.info('[api] [setup] dynamic ipc port:', port);
   const listen = 'localhost';
   port = port ? port : 7069;
 
@@ -86,32 +86,55 @@ exports.setup = async function () {
   server.listen(port, listen, function() {
     eLogger.info('[ api ] [setup] server is listening on', `${listen}:${port}`);
   });
+
+  return true;
 };
 
 function setApi() {
   // fs读文件的时候，用path正规化 [打包读文件问题]
-  const apiDir = path.normalize(__dirname + '/../apis/');
+  const apiDir = path.normalize(__dirname + '/apis');
   eLogger.info('[setApi] apiDir: ', apiDir);
-  // const baseDir = app.getAppPath();
-  // const apiDir = path.join(baseDir, 'electron/apis');
-  fs.readdirSync(apiDir).forEach(function(filename) {
-    eLogger.info('[setApi] filename: ', filename);
+  const fileArr = fs.readdirSync(apiDir);
+  eLogger.info('[setApi] fileArr: ', fileArr);
+  for (let i = 0; i < fileArr.length; i++) {
+    let filename = fileArr[i];
     if (path.extname(filename) === '.js' && filename !== 'index.js') {
       const name = path.basename(filename, '.js');
-      // require文件的时候，用相对路径并且不能path处理 [打包读文件问题]
-      //const fileObj = require(`../apis/${filename}`);
-      const filepath = '../apis/' + filename;
-      eLogger.info('[setApi] filepath: ', filepath);
-      const fileObj = require(`${filepath}`);
+      const fileObj = require(`./apis/${filename}`);
       _.map(fileObj, function(fn, method) {
         let methodName = getApiName(name, method);
         apis[methodName] = fn;
         eLogger.info('[setApi] method Name', methodName);
       });
     }
-  });
+  }
+  
+  return true;
 }
 
+// function setApi() {
+//   // fs读文件的时候，用path正规化 [打包读文件问题]
+//   const apiDir = path.normalize(__dirname + '/apis');
+//   eLogger.info('[setApi] apiDir: ', apiDir);
+//   // const baseDir = app.getAppPath();
+//   // const apiDir = path.join(baseDir, 'electron/apis');
+//   fs.readdirSync(apiDir).forEach(function(filename) {
+//     if (path.extname(filename) === '.js' && filename !== 'index.js') {
+//       const name = path.basename(filename, '.js');
+//       // require文件的时候，用相对路径并且不能path处理 [打包读文件问题]
+//       //const fileObj = require(`../apis/${filename}`);
+//       //const filepath = './apis/' + filename;
+//       //eLogger.info('[setApi] filepath: ', filepath);
+//       const fileObj = require(`./apis/${filepath}`);
+//       _.map(fileObj, function(fn, method) {
+//         let methodName = getApiName(name, method);
+//         apis[methodName] = fn;
+//         //eLogger.info('[setApi] method Name', methodName);
+//       });
+//     }
+//   });
+// }
+
 /**
  * get api method name
  * ex.) jsname='user' method='get' => 'user.get'

electron/setup.js

@@ -3,7 +3,7 @@
 const storage = require('./lib/storage');
 const config = require('./config');
 const is = require('electron-is');
-const api = require('./lib/api');
+const api = require('./api');
 const ipc = require('./ipc');
 const eLogger = require('./lib/eLogger');
 
@@ -21,7 +21,7 @@ module.exports = () => {
   api.setup();
 
   // ipc模块
-  ipc.setup();
+  //ipc.setup();
 }
 
 function loadUpdate () {
@@ -31,4 +31,6 @@ function loadUpdate () {
     const autoUpdater = require('./lib/autoUpdater');
     autoUpdater.setup();
   }
+
+  return true;
 }