Refactor main process and add exception handler for Socket server

Author: Rokt33r

atom-lib/finder-window.js

@@ -6,7 +6,7 @@ const app = electron.app
 const ipcMain = electron.ipcMain
 const Tray = electron.Tray
 const path = require('path')
-const nodeIpc = require('node-ipc')
+const nodeIpc = require('@rokt33r/node-ipc')
 
 var isFinderLoaded = false
 
@@ -18,6 +18,13 @@ nodeIpc.connectTo(
   'main',
   path.join(app.getPath('userData'), 'boost.service'),
   function () {
+      nodeIpc.of.main.on(
+        'error',
+        function (err) {
+          nodeIpc.log('<< ## err ##'.rainbow, nodeIpc.config.delay)
+          nodeIpc.log(err)
+        }
+      )
       nodeIpc.of.main.on(
         'connect',
         function () {

atom-lib/main-window.js

@@ -1,4 +1,5 @@
 const electron = require('electron')
+const app = electron.app
 const BrowserWindow = electron.BrowserWindow
 const path = require('path')
 
@@ -20,4 +21,9 @@ mainWindow.webContents.on('new-window', function (e) {
   e.preventDefault()
 })
 
+app.on('activate', function () {
+  if (mainWindow == null) return null
+  mainWindow.show()
+})
+
 module.exports = mainWindow

hotkey.js

@@ -0,0 +1,62 @@
+const electron = require('electron')
+const app = electron.app
+const Menu = electron.Menu
+const ipc = electron.ipcMain
+const globalShortcut = electron.globalShortcut
+const jetpack = require('fs-jetpack')
+const path = require('path')
+const mainWindow = require('./atom-lib/main-window')
+const nodeIpc = require('@rokt33r/node-ipc')
+
+var userDataPath = app.getPath('userData')
+if (!jetpack.cwd(userDataPath).exists('keymap.json')) {
+  jetpack.cwd(userDataPath).file('keymap.json', {content: '{}'})
+}
+try {
+  global.keymap = JSON.parse(jetpack.cwd(userDataPath).read('keymap.json', 'utf-8'))
+} catch (err) {
+  jetpack.cwd(userDataPath).file('keymap.json', {content: '{}'})
+  global.keymap = {}
+}
+if (global.keymap.toggleFinder == null) global.keymap.toggleFinder = 'ctrl+tab+shift'
+var toggleFinderKey = global.keymap.toggleFinder
+
+try {
+  globalShortcut.register(toggleFinderKey, function () {
+    emitToFinder('open-finder')
+    mainWindow.webContents.send('open-finder', {})
+  })
+} catch (err) {
+  console.log(err.name)
+}
+
+ipc.on('hotkeyUpdated', function (event, newKeymap) {
+  console.log('got new keymap')
+  console.log(newKeymap)
+  globalShortcut.unregisterAll()
+  global.keymap = newKeymap
+  jetpack.cwd(userDataPath).file('keymap.json', {content: JSON.stringify(global.keymap)})
+
+  var toggleFinderKey = global.keymap.toggleFinder != null ? global.keymap.toggleFinder : 'ctrl+tab+shift'
+  try {
+    globalShortcut.register(toggleFinderKey, function () {
+      emitToFinder('open-finder')
+      mainWindow.webContents.send('open-finder', {})
+    })
+    mainWindow.webContents.send('APP_SETTING_DONE', {})
+  } catch (err) {
+    console.error(err)
+    mainWindow.webContents.send('APP_SETTING_ERROR', {
+      message: 'Failed to apply hotkey: Invalid format'
+    })
+  }
+})
+
+
+function emitToFinder (type, data) {
+  var payload = {
+    type: type,
+    data: data
+  }
+  nodeIpc.server.broadcast('message', payload)
+}