update deps

LedgerHQ · Jun 1, 2019 · ea5648f · ea5648f
1 parent 83a428b
commit ea5648f
Show file tree

Hide file tree

Showing 30 changed files with 110 additions and 137 deletions.
diff --git a/package.json b/package.json
@@ -35,14 +35,14 @@
     "documentation": "^11.0.0",
     "eslint": "^5.16.0",
     "eslint-config-prettier": "^4.3.0",
-    "eslint-plugin-flowtype": "^3.9.0",
+    "eslint-plugin-flowtype": "^3.9.1",
     "eslint-plugin-react": "^7.13.0",
-    "flow-bin": "^0.98.1",
+    "flow-bin": "^0.100.0",
     "flow-copy-source": "^2.0.6",
     "flow-mono-cli": "^1.5.0",
     "flow-typed": "^2.5.2",
     "lerna": "3.14.1",
     "prettier": "^1.17.1",
-    "uglify-js": "^3.5.13"
+    "uglify-js": "^3.6.0"
   }
 }
diff --git a/packages/create-dapp/package.json b/packages/create-dapp/package.json
@@ -16,6 +16,6 @@
   "license": "Apache-2.0",
   "bin": "scripts/create-dapp",
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   }
 }
diff --git a/packages/devices/package.json b/packages/devices/package.json
@@ -19,7 +19,7 @@
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "dependencies": {
     "@ledgerhq/errors": "^4.60.0",

diff --git a/packages/errors/package.json b/packages/errors/package.json
@@ -19,7 +19,7 @@
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "flow": "flow",

diff --git a/packages/hw-app-btc/package.json b/packages/hw-app-btc/package.json
@@ -29,7 +29,7 @@
     "create-hash": "^1.1.3"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "flow": "flow",

diff --git a/packages/hw-app-eth/package.json b/packages/hw-app-eth/package.json
@@ -29,7 +29,7 @@
     "@ledgerhq/hw-transport": "^4.60.3"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "flow": "flow",

diff --git a/packages/hw-app-str/package.json b/packages/hw-app-str/package.json
@@ -31,7 +31,7 @@
     "tweetnacl": "^1.0.0"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "flow": "flow",

diff --git a/packages/hw-app-xrp/package.json b/packages/hw-app-xrp/package.json
@@ -29,7 +29,7 @@
     "bip32-path": "0.4.2"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "flow": "flow",

diff --git a/packages/hw-hid-cli/package.json b/packages/hw-hid-cli/package.json
@@ -33,7 +33,7 @@
     "babel-polyfill": "^6.26.0"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "flow": "flow",

diff --git a/packages/hw-http-proxy-devserver/package.json b/packages/hw-http-proxy-devserver/package.json
@@ -35,11 +35,11 @@
     "body-parser": "^1.19.0",
     "command-line-args": "^5.1.1",
     "cors": "^2.8.5",
-    "express": "^4.17.0",
+    "express": "^4.17.1",
     "ws": "6"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "flow": "flow",

diff --git a/packages/hw-transport-http/package.json b/packages/hw-transport-http/package.json
@@ -32,7 +32,7 @@
     "ws": "6"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "flow": "flow",

diff --git a/packages/hw-transport-mocker/package.json b/packages/hw-transport-mocker/package.json
@@ -27,7 +27,7 @@
     "@ledgerhq/logs": "^4.60.3"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "flow": "flow",

diff --git a/packages/hw-transport-node-ble/README.md b/packages/hw-transport-node-ble/README.md
@@ -33,7 +33,7 @@
 
 **Extends Transport**
 
-react-native bluetooth BLE implementation
+TransportNodeBle bluetooth BLE implementation
 
 #### Parameters
 
@@ -45,7 +45,7 @@ react-native bluetooth BLE implementation
 #### Examples
 
 ```javascript
-import BluetoothTransport from "@ledgerhq/react-native-hw-transport-ble";
+import BluetoothTransport from "@ledgerhq/hw-transport-node-ble";
 ```
 
 #### exchange

diff --git a/packages/hw-transport-node-ble/package.json b/packages/hw-transport-node-ble/package.json
@@ -26,16 +26,16 @@
   "main": "lib/TransportNodeBle.js",
   "license": "Apache-2.0",
   "dependencies": {
+    "@abandonware/noble": "1.9.2-2",
     "@ledgerhq/devices": "^4.60.3",
     "@ledgerhq/errors": "^4.60.0",
     "@ledgerhq/hw-transport": "^4.60.3",
     "@ledgerhq/logs": "^4.60.3",
-    "noble-mac": "https://github.com/LedgerHQ/noble-mac.git",
     "invariant": "^2.2.4",
     "rxjs": "^6.5.2"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "flow": "flow",

diff --git a/packages/hw-transport-node-ble/src/TransportNodeBle.js b/packages/hw-transport-node-ble/src/TransportNodeBle.js
@@ -12,7 +12,6 @@ import {
   CantOpenDevice,
   DisconnectedDeviceDuringOperation
 } from "@ledgerhq/errors";
-import { remapError } from "./remapErrors";
 import {
   monitorCharacteristic,
   availability,
@@ -71,8 +70,6 @@ async function open(deviceOrId: Device | string, needsReconnect: boolean) {
     deviceModel
   } = await retrieveServiceAndCharacteristics(device);
 
-  log("ble-verbose", `device.mtu=${device.mtu}`);
-
   const [observable, monitoringReady] = monitorCharacteristic(notifyC);
 
   const notifyObservable = observable.pipe(
@@ -238,7 +235,7 @@ export default class BluetoothTransport extends Transport<Device | string> {
           // in such case we will always disconnect because something is bad.
           await disconnectDevice(this.device).catch(() => {}); // but we ignore if disconnect worked.
         }
-        throw remapError(e);
+        throw e;
       }
     });
 
@@ -260,7 +257,7 @@ export default class BluetoothTransport extends Transport<Device | string> {
       } catch (e) {
         log("ble-error", "inferMTU got " + String(e));
         await disconnectDevice(this.device).catch(() => {}); // but we ignore if disconnect worked.
-        throw remapError(e);
+        throw e;
       }
     });
 

diff --git a/packages/hw-transport-node-ble/src/platform.js b/packages/hw-transport-node-ble/src/platform.js
@@ -1,7 +1,7 @@
 // @flow
 /* eslint-disable prefer-template */
 
-import noble from "noble-mac";
+import noble from "@abandonware/noble";
 import { Observable } from "rxjs";
 import { log } from "@ledgerhq/logs";
 import {
@@ -10,6 +10,10 @@ import {
 } from "@ledgerhq/devices";
 import { TransportError } from "@ledgerhq/errors";
 
+noble.on("warning", message => {
+  log("ble-warning", message);
+});
+
 const POWERED_ON = "poweredOn";
 
 export const availability: Observable<boolean> = Observable.create(observer => {
@@ -79,11 +83,8 @@ export const listen = (): Observable<*> =>
       const { uuid: id } = peripheral;
       const { localName } = peripheral.advertisement;
       const name =
-        localName && localName !== "unknown"
-          ? localName
-          : discoveredDevices[id]
-          ? discoveredDevices[id].name
-          : null;
+        localName ||
+        (discoveredDevices[id] ? discoveredDevices[id].name : null);
       discoveredDevices[id] = { peripheral, name };
       log("ble-advertisement", id + " (" + String(name) + ")");
       observer.next({

diff --git a/packages/hw-transport-node-ble/src/remapErrors.js b/packages/hw-transport-node-ble/src/remapErrors.js
diff --git a/packages/hw-transport-node-hid-noevents/package.json b/packages/hw-transport-node-hid-noevents/package.json
@@ -29,10 +29,10 @@
     "@ledgerhq/errors": "^4.60.0",
     "@ledgerhq/hw-transport": "^4.60.3",
     "@ledgerhq/logs": "^4.60.3",
-    "node-hid": "^0.7.8"
+    "node-hid": "^0.7.9"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "flow": "flow",

diff --git a/packages/hw-transport-node-hid/package.json b/packages/hw-transport-node-hid/package.json
@@ -30,11 +30,11 @@
     "@ledgerhq/hw-transport": "^4.60.3",
     "@ledgerhq/logs": "^4.60.3",
     "lodash": "^4.17.11",
-    "node-hid": "^0.7.8",
+    "node-hid": "^0.7.9",
     "usb": "^1.6.0"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "flow": "flow",

diff --git a/packages/hw-transport-u2f/package.json b/packages/hw-transport-u2f/package.json
@@ -32,7 +32,7 @@
     "u2f-api": "0.2.7"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "flow": "flow",

diff --git a/packages/hw-transport-web-ble/package.json b/packages/hw-transport-web-ble/package.json
@@ -32,7 +32,7 @@
     "rxjs": "^6.5.2"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1",
+    "flow-bin": "^0.100.0",
     "flow-typed": "^2.5.2"
   },
   "scripts": {

diff --git a/packages/hw-transport-webauthn/package.json b/packages/hw-transport-webauthn/package.json
@@ -32,7 +32,7 @@
     "@ledgerhq/logs": "^4.60.3"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1",
+    "flow-bin": "^0.100.0",
     "flow-typed": "^2.5.2"
   },
   "scripts": {

diff --git a/packages/hw-transport-webusb/package.json b/packages/hw-transport-webusb/package.json
@@ -30,7 +30,7 @@
     "@ledgerhq/logs": "^4.60.3"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "flow": "flow",

diff --git a/packages/hw-transport/package.json b/packages/hw-transport/package.json
@@ -28,7 +28,7 @@
     "events": "^3.0.0"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "flow": "flow",

diff --git a/packages/logs/package.json b/packages/logs/package.json
@@ -19,7 +19,7 @@
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "flow": "flow",

diff --git a/packages/react-native-hid/package.json b/packages/react-native-hid/package.json
@@ -34,7 +34,7 @@
     "rxjs": "^6.5.2"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "flow": "flow",

diff --git a/packages/react-native-hw-transport-ble/package.json b/packages/react-native-hw-transport-ble/package.json
@@ -35,7 +35,7 @@
     "uuid": "^3.3.2"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "flow": "flow",

diff --git a/packages/test/package.json b/packages/test/package.json
@@ -16,7 +16,7 @@
     "budo": "^11.6.2"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "test-browser": "budo --ssl lib/index-browser.js",

diff --git a/packages/web3-subprovider/package.json b/packages/web3-subprovider/package.json
@@ -36,7 +36,7 @@
     "web3-provider-engine": "^14.1.0"
   },
   "devDependencies": {
-    "flow-bin": "^0.98.1"
+    "flow-bin": "^0.100.0"
   },
   "scripts": {
     "flow": "flow",