refactor(ipc): adapted IPC work to new project structure

Adapted IPC work to project layout defined in witnet#126

witnet#27

app/lib/api/ipc/common/methods.ts → app/common/methods.ts

@@ -59,14 +59,16 @@ export function getMethodDescs(rawMethods: { [id: string]: any }, type: MethodTy
   const filterFunc = (type === MethodType.Sync) ? isValidSyncMethodDesc : isValidAsyncMethodDesc
 
   // Reduce map of maps to map
-  return Object
+  const methods = Object
     .keys(rawMethods)
     .map(key => rawMethods[key])
     .filter(filterFunc)
     .reduce((acc: { [id: string]: Handler },
              desc: MethodDesc) => {
       return {...acc, [desc.id]: desc.handler}
     }, {})
+
+  return methods
 }
 
 /**

app/lib/api/handlers/backend/nop.ts → app/main/api/handlers/nop.ts

@@ -1,4 +1,4 @@
-import * as IPCMethods from "../../ipc/common/methods"
+import * as IPCMethods from "../../../../app/common/methods"
 
 /**
  * Handler of no response handler function

app/lib/api/handlers/backend/ping.ts → app/main/api/handlers/ping.ts

@@ -1,4 +1,4 @@
-import * as IPCMethods from "../../ipc/common/methods"
+import * as IPCMethods from "../../../../app/common/methods"
 
 /**
  * Handler of ping method

app/lib/api/ipc/backend/ipcBackend.ts → app/main/api/ipc/backend.ts

@@ -1,8 +1,8 @@
-import * as ImportedMethods from "../../handlers/backend/index"
-import * as IPCMessages from "../common/messages"
-import * as IPCMethods from "../common/methods"
-import GenericIpcMain from "./genericIpcMain"
-import {electronIpcMain} from "./electronIpcMain"
+import * as ImportedMethods from "../handlers/index"
+import * as IPCMessages from "../../../../app/common/messages"
+import * as IPCMethods from "../../../../app/common/methods"
+import GenericIpcMain from "./genericMain"
+import {electronIpcMain} from "./electronMain"
 
 /**
  * Raw imported methods from handlers directory

app/main.electron.ts → app/main/index.ts

@@ -1,21 +1,26 @@
 const { app, BrowserWindow, Menu, shell } = require("electron")
 
-import * as IPCBackend from "./lib/api/ipc/backend/ipcBackend"
+import * as IPCBackend from "./api/ipc/backend"
 
 let menu: any
 let template: any
 let mainWindow: any
 
 if (process.env.NODE_ENV === "production") {
-  const sourceMapSupport = require("source-map-support") // eslint-disable-line
+  // eslint-disable-line
+  const sourceMapSupport = require("source-map-support")
   sourceMapSupport.install()
 }
 
 if (process.env.NODE_ENV === "development") {
-  require("electron-debug")() // eslint-disable-line global-require
-  const path = require("path") // eslint-disable-line
-  const p = path.join(__dirname, "..", "app", "node_modules") // eslint-disable-line
-  require("module").globalPaths.push(p) // eslint-disable-line
+  // eslint-disable-line global-require
+  require("electron-debug")()
+  // eslint-disable-line
+  const path = require("path")
+  // eslint-disable-line
+  const p = path.join(__dirname, "..", "app", "node_modules")
+  // eslint-disable-line
+  require("module").globalPaths.push(p)
 }
 
 app.on("window-all-closed", () => {
@@ -24,7 +29,8 @@ app.on("window-all-closed", () => {
 
 const installExtensions = async () => {
   if (process.env.NODE_ENV === "development") {
-    const installer = require("electron-devtools-installer") // eslint-disable-line global-require
+    // eslint-disable-line global-require
+    const installer = require("electron-devtools-installer")
 
     const extensions = [
       "REACT_DEVELOPER_TOOLS",

app/lib/api/ipc/frontend/ipcFrontend.ts → app/renderer/api/ipc/frontend.ts

@@ -1,7 +1,7 @@
-import * as IPCMessages from "../common/messages"
-import * as IPCMethods from "../common/methods"
-import GenericIpcRenderer from "./genericIpcRenderer"
-import {electronIpcRenderer} from "./electronIpcRenderer"
+import * as IPCMessages from "../../../../app/common/messages"
+import * as IPCMethods from "../../../../app/common/methods"
+import GenericIpcRenderer from "./genericRenderer"
+import {electronIpcRenderer} from "./electronRenderer"
 
 /** Holds promises and timers for each pending request */
 const pendingRequests: {[method: string]: any} = {}

config/webpack.main.js

@@ -14,7 +14,7 @@ const baseConfig = {
   devtool: "source-map",
   target: "electron-main",
 
-  entry: [path.resolve(__dirname, "../app/main/index.js")],
+  entry: [path.resolve(__dirname, "../app/main/index.ts")],
 
   resolve: {
     extensions: [".js", ".ts", ".json"]

test/app/lib/api/ipc/common/messages.spec.ts → test/app/common/messages.spec.ts

@@ -1,4 +1,4 @@
-import * as IPCMessages from "app/lib/api/ipc/common/messages"
+import * as IPCMessages from "appCommon/messages"
 import * as fixtures from "./messagesFixtures"
 
 describe(`IPCMessages lib: validate valid channel messages" +