From 335de0966a478d5e9bb1a4e7d9d0c1f4cdcf8aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=ABck=20V=C3=A9zien?= <nainpuissant@gmail.com>
Date: Thu, 11 Jan 2018 09:18:32 +0100
Subject: [PATCH] Clean USB bridge

---
 package.json       |  4 ++--
 src/main/bridge.js |  4 ++--
 src/main/index.js  |  3 ---
 src/main/usb.js    | 12 ++++++------
 yarn.lock          | 17 +++++++++++------
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index 967ae22a..10113d6c 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
     "electron-builder": "^19.49.0",
-    "electron-rebuild": "^1.6.0",
+    "electron-rebuild": "^1.6.1",
     "electron-webpack": "1.11.0",
     "eslint": "^4.13.1",
     "eslint-config-airbnb": "^16.1.0",
@@ -69,7 +69,7 @@
     "eslint-plugin-react": "^7.5.1",
     "flow-bin": "^0.63.1",
     "flow-typed": "^2.2.3",
-    "prettier": "^1.10.1",
+    "prettier": "^1.10.2",
     "react-hot-loader": "^4.0.0-beta.12"
   }
 }
diff --git a/src/main/bridge.js b/src/main/bridge.js
index 31bcb0a2..d2be2236 100644
--- a/src/main/bridge.js
+++ b/src/main/bridge.js
@@ -18,9 +18,9 @@ ipcMain.on('msg', (event: any, payload) => {
     })
   }
 
-  compute.send([type, data])
+  compute.send({ type, data })
   compute.on('message', payload => {
-    const [type, data, options = {}] = payload
+    const { type, data, options = {} } = payload
     send(type, data)
     if (options.kill) {
       compute.kill()
diff --git a/src/main/index.js b/src/main/index.js
index 773bfdd0..9ad87886 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -1,8 +1,5 @@
 // @flow
 
-process.title = 'ledger-wallet-desktop'
-
 require('../globals')
-
 require('./bridge')
 require('./app')
diff --git a/src/main/usb.js b/src/main/usb.js
index 7459a8a3..194b61fb 100644
--- a/src/main/usb.js
+++ b/src/main/usb.js
@@ -6,7 +6,7 @@ const { isLedgerDevice } = require('ledgerco/lib/utils')
 const ledgerco = require('ledgerco')
 
 function send(type, data, options = { kill: true }) {
-  process.send([type, data, options])
+  process.send({ type, data, options })
 }
 
 async function getWalletInfos(path, wallet) {
@@ -30,13 +30,13 @@ const handlers = {
 
       isListenDevices = true
 
-      const handleChangeDevice = (device, event) =>
-        isLedgerDevice(device) && send(event, device, { kill: false })
+      const handleChangeDevice = eventName => device =>
+        isLedgerDevice(device) && send(eventName, device, { kill: false })
 
       HID.listenDevices.start()
 
-      HID.listenDevices.events.on('add', handleChangeDevice)
-      HID.listenDevices.events.on('remove', handleChangeDevice)
+      HID.listenDevices.events.on('add', handleChangeDevice('device.add'))
+      HID.listenDevices.events.on('remove', handleChangeDevice('device.remove'))
     },
     all: () => send('devices.update', HID.devices().filter(isLedgerDevice)),
   },
@@ -55,7 +55,7 @@ const handlers = {
 }
 
 process.on('message', payload => {
-  const [type, data] = payload
+  const { type, data } = payload
 
   const handler = objectPath.get(handlers, type)
   if (!handler) {
diff --git a/yarn.lock b/yarn.lock
index e86614d8..e4b8cdc2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2263,6 +2263,10 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
+detect-libc@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+
 detect-node@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
@@ -2518,12 +2522,13 @@ electron-publish@19.52.0:
     fs-extra-p "^4.5.0"
     mime "^2.1.0"
 
-electron-rebuild@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.6.0.tgz#e8d26f4d8e9fe5388df35864b3658e5cfd4dcb7e"
+electron-rebuild@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.6.1.tgz#3c7ab64db31e5e78ef76fedd7a53aec087b723c5"
   dependencies:
     colors "^1.1.2"
     debug "^2.6.3"
+    detect-libc "^1.0.3"
     fs-extra "^3.0.1"
     node-abi "^2.0.0"
     node-gyp "^3.6.0"
@@ -5487,9 +5492,9 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@^1.10.1:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.1.tgz#01423fea6957ea23618d37d339ef0e7f7c967fc6"
+prettier@^1.10.2:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93"
 
 pretty-bytes@^1.0.2:
   version "1.0.4"