From e0a8953637f0d65f24162b6ba66f1ba6566b80e1 Mon Sep 17 00:00:00 2001
From: Philippe Coval
Date: Thu, 20 Dec 2018 16:19:27 +0100
Subject: [PATCH] npm: Update noble from abandonware org
Origin: https://github.com/noble/bleno/pull/423
Relate-to: https://github.com/abandonware/noble/issues/2
Cc: @petersaints
Change-Id: I72d4f9c553a2cd1387d82884d330a4aa35c28703
Signed-off-by: Philippe Coval
---
lib/hci-socket/hci.js | 2 +-
lib/hci-socket/mgmt.js | 2 +-
package-lock.json | 85 +++++++++++++++++++++++++-----------------
package.json | 2 +-
4 files changed, 53 insertions(+), 38 deletions(-)
diff --git a/lib/hci-socket/hci.js b/lib/hci-socket/hci.js
index 6a8a509b..83cbf6e4 100644
--- a/lib/hci-socket/hci.js
+++ b/lib/hci-socket/hci.js
@@ -3,7 +3,7 @@ var debug = require('debug')('hci');
var events = require('events');
var util = require('util');
-var BluetoothHciSocket = require('bluetooth-hci-socket');
+var BluetoothHciSocket = require('@abandonware/bluetooth-hci-socket');
var HCI_COMMAND_PKT = 0x01;
var HCI_ACLDATA_PKT = 0x02;
diff --git a/lib/hci-socket/mgmt.js b/lib/hci-socket/mgmt.js
index 1b7d5361..18fc9c52 100644
--- a/lib/hci-socket/mgmt.js
+++ b/lib/hci-socket/mgmt.js
@@ -3,7 +3,7 @@ var debug = require('debug')('mgmt');
var events = require('events');
var util = require('util');
-var BluetoothHciSocket = require('bluetooth-hci-socket');
+var BluetoothHciSocket = require('@abandonware/bluetooth-hci-socket');
var LTK_INFO_SIZE = 36;
diff --git a/package-lock.json b/package-lock.json
index a2ca47ae..c6bb59af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,18 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+ "@abandonware/bluetooth-hci-socket": {
+ "version": "0.5.3-1",
+ "resolved": "https://registry.npmjs.org/@abandonware/bluetooth-hci-socket/-/bluetooth-hci-socket-0.5.3-1.tgz",
+ "integrity": "sha512-NzLRq7mjAmvLDRA0E5hvCRtsuV0tq5fbUFxLxSmakRu9K4VM6u7P+3PvAkcylX3CEq0BY9Wwe3KXiMrQBjbMhg==",
+ "optional": true,
+ "requires": {
+ "debug": "^4.1.0",
+ "nan": "^2.10.0",
+ "node-pre-gyp": "^0.12.0",
+ "usb": "^1.1.0"
+ }
+ },
"abbrev": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -56,28 +68,6 @@
"safe-buffer": "^5.1.1"
}
},
- "bluetooth-hci-socket": {
- "version": "0.5.1",
- "resolved": "https://registry.npmjs.org/bluetooth-hci-socket/-/bluetooth-hci-socket-0.5.1.tgz",
- "integrity": "sha1-774hUk/Bz10/rl1RNl1WHUq77Qs=",
- "optional": true,
- "requires": {
- "debug": "^2.2.0",
- "nan": "^2.0.5",
- "usb": "^1.1.0"
- },
- "dependencies": {
- "debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
- "optional": true,
- "requires": {
- "ms": "2.0.0"
- }
- }
- }
- },
"bplist-parser": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
@@ -186,13 +176,6 @@
"integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
"requires": {
"ms": "^2.1.1"
- },
- "dependencies": {
- "ms": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
- "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
- }
}
},
"decompress-response": {
@@ -589,13 +572,19 @@
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
}
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+ "dev": true
}
}
},
"ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
},
"nan": {
"version": "2.12.1",
@@ -627,6 +616,12 @@
"requires": {
"ms": "2.0.0"
}
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+ "optional": true
}
}
},
@@ -660,9 +655,9 @@
}
},
"node-pre-gyp": {
- "version": "0.11.0",
- "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz",
- "integrity": "sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==",
+ "version": "0.12.0",
+ "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz",
+ "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
"optional": true,
"requires": {
"detect-libc": "^1.0.2",
@@ -1078,6 +1073,26 @@
"requires": {
"nan": "^2.8.0",
"node-pre-gyp": "^0.11.0"
+ },
+ "dependencies": {
+ "node-pre-gyp": {
+ "version": "0.11.0",
+ "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz",
+ "integrity": "sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==",
+ "optional": true,
+ "requires": {
+ "detect-libc": "^1.0.2",
+ "mkdirp": "^0.5.1",
+ "needle": "^2.2.1",
+ "nopt": "^4.0.1",
+ "npm-packlist": "^1.1.6",
+ "npmlog": "^4.0.2",
+ "rc": "^1.2.7",
+ "rimraf": "^2.6.1",
+ "semver": "^5.3.0",
+ "tar": "^4"
+ }
+ }
}
},
"util-deprecate": {
diff --git a/package.json b/package.json
index dd216b25..e5955ac5 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
"debug": "^4.1.0"
},
"optionalDependencies": {
- "bluetooth-hci-socket": "^0.5.1",
+ "@abandonware/bluetooth-hci-socket": "^0.5.3-1",
"bplist-parser": "0.1.1",
"xpc-connection": "~0.1.4"
}