@ledgerhq/devices 8.0.3 → 8.0.4-next.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/lib/ble/receiveAPDU.d.ts.map +1 -1
- package/lib/ble/receiveAPDU.js +3 -3
- package/lib/ble/receiveAPDU.js.map +1 -1
- package/lib/ble/sendAPDU.d.ts.map +1 -1
- package/lib/ble/sendAPDU.js +3 -3
- package/lib/ble/sendAPDU.js.map +1 -1
- package/lib/helpers.d.ts.map +1 -1
- package/lib/helpers.js.map +1 -1
- package/lib/helpers.test.js.map +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +5 -10
- package/lib/index.js.map +1 -1
- package/lib-es/ble/receiveAPDU.d.ts.map +1 -1
- package/lib-es/ble/receiveAPDU.js +3 -3
- package/lib-es/ble/receiveAPDU.js.map +1 -1
- package/lib-es/ble/sendAPDU.d.ts.map +1 -1
- package/lib-es/ble/sendAPDU.js +3 -3
- package/lib-es/ble/sendAPDU.js.map +1 -1
- package/lib-es/helpers.d.ts.map +1 -1
- package/lib-es/helpers.js.map +1 -1
- package/lib-es/helpers.test.js.map +1 -1
- package/lib-es/index.d.ts.map +1 -1
- package/lib-es/index.js +5 -10
- package/lib-es/index.js.map +1 -1
- package/package.json +3 -3
- package/src/ble/receiveAPDU.ts +9 -13
- package/src/ble/sendAPDU.ts +15 -24
- package/src/helpers.test.ts +1 -3
- package/src/helpers.ts +2 -4
- package/src/index.ts +10 -19
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# @ledgerhq/devices
|
|
2
2
|
|
|
3
|
+
## 8.0.4-next.0
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [[`9adc1862dd`](https://github.com/LedgerHQ/ledger-live/commit/9adc1862dda605a722d19f3b6895bd324834c914)]:
|
|
8
|
+
- @ledgerhq/errors@6.12.7-next.0
|
|
9
|
+
|
|
3
10
|
## 8.0.3
|
|
4
11
|
|
|
5
12
|
### Patch Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"receiveAPDU.d.ts","sourceRoot":"","sources":["../../src/ble/receiveAPDU.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAIlC,eAAO,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"receiveAPDU.d.ts","sourceRoot":"","sources":["../../src/ble/receiveAPDU.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAIlC,eAAO,MAAM,WAAW,cAAe,WAAW,MAAM,CAAC,KAAG,WAAW,MAAM,CAqEzE,CAAC"}
|
package/lib/ble/receiveAPDU.js
CHANGED
|
@@ -6,7 +6,7 @@ const rxjs_1 = require("rxjs");
|
|
|
6
6
|
const logs_1 = require("@ledgerhq/logs");
|
|
7
7
|
const TagId = 0x05;
|
|
8
8
|
// operator that transform the input raw stream into one apdu response and finishes
|
|
9
|
-
const receiveAPDU = (rawStream) => rxjs_1.Observable.create(
|
|
9
|
+
const receiveAPDU = (rawStream) => rxjs_1.Observable.create(o => {
|
|
10
10
|
let notifiedIndex = 0;
|
|
11
11
|
let notifiedDataLength = 0;
|
|
12
12
|
let notifiedData = Buffer.alloc(0);
|
|
@@ -15,12 +15,12 @@ const receiveAPDU = (rawStream) => rxjs_1.Observable.create((o) => {
|
|
|
15
15
|
o.error(new errors_1.DisconnectedDevice());
|
|
16
16
|
sub.unsubscribe();
|
|
17
17
|
},
|
|
18
|
-
error:
|
|
18
|
+
error: e => {
|
|
19
19
|
(0, logs_1.log)("ble-error", "in receiveAPDU " + String(e));
|
|
20
20
|
o.error(e);
|
|
21
21
|
sub.unsubscribe();
|
|
22
22
|
},
|
|
23
|
-
next:
|
|
23
|
+
next: value => {
|
|
24
24
|
const tag = value.readUInt8(0);
|
|
25
25
|
const index = value.readUInt16BE(1);
|
|
26
26
|
let data = value.slice(3);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"receiveAPDU.js","sourceRoot":"","sources":["../../src/ble/receiveAPDU.ts"],"names":[],"mappings":";;;AAAA,6CAAsE;AACtE,+BAAkC;AAClC,yCAAqC;AACrC,MAAM,KAAK,GAAG,IAAI,CAAC;AACnB,mFAAmF;AAC5E,MAAM,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"receiveAPDU.js","sourceRoot":"","sources":["../../src/ble/receiveAPDU.ts"],"names":[],"mappings":";;;AAAA,6CAAsE;AACtE,+BAAkC;AAClC,yCAAqC;AACrC,MAAM,KAAK,GAAG,IAAI,CAAC;AACnB,mFAAmF;AAC5E,MAAM,WAAW,GAAG,CAAC,SAA6B,EAAsB,EAAE,CAC/E,iBAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;IACpB,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,kBAAkB,GAAG,CAAC,CAAC;IAC3B,IAAI,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,GAAG,GAAG,SAAS,CAAC,SAAS,CAAC;QAC9B,QAAQ,EAAE,GAAG,EAAE;YACb,CAAC,CAAC,KAAK,CAAC,IAAI,2BAAkB,EAAE,CAAC,CAAC;YAClC,GAAG,CAAC,WAAW,EAAE,CAAC;QACpB,CAAC;QACD,KAAK,EAAE,CAAC,CAAC,EAAE;YACT,IAAA,UAAG,EAAC,WAAW,EAAE,iBAAiB,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAChD,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACX,GAAG,CAAC,WAAW,EAAE,CAAC;QACpB,CAAC;QACD,IAAI,EAAE,KAAK,CAAC,EAAE;YACZ,MAAM,GAAG,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAC/B,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACpC,IAAI,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAE1B,IAAI,GAAG,KAAK,KAAK,EAAE;gBACjB,CAAC,CAAC,KAAK,CAAC,IAAI,uBAAc,CAAC,cAAc,GAAG,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;gBAC7E,OAAO;aACR;YAED,IAAI,aAAa,KAAK,KAAK,EAAE;gBAC3B,CAAC,CAAC,KAAK,CACL,IAAI,uBAAc,CAChB,6DAA6D;oBAC3D,KAAK;oBACL,gBAAgB;oBAChB,aAAa,EACf,iBAAiB,CAClB,CACF,CAAC;gBACF,OAAO;aACR;YAED,IAAI,KAAK,KAAK,CAAC,EAAE;gBACf,kBAAkB,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBAC1C,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aACtB;YAED,aAAa,EAAE,CAAC;YAChB,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;YAEnD,IAAI,YAAY,CAAC,MAAM,GAAG,kBAAkB,EAAE;gBAC5C,CAAC,CAAC,KAAK,CACL,IAAI,uBAAc,CAChB,4DAA4D;oBAC1D,YAAY,CAAC,MAAM;oBACnB,gBAAgB;oBAChB,kBAAkB,EACpB,gBAAgB,CACjB,CACF,CAAC;gBACF,OAAO;aACR;YAED,IAAI,YAAY,CAAC,MAAM,KAAK,kBAAkB,EAAE;gBAC9C,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACrB,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACb,GAAG,CAAC,WAAW,EAAE,CAAC;aACnB;QACH,CAAC;KACF,CAAC,CAAC;IACH,OAAO,GAAG,EAAE;QACV,GAAG,CAAC,WAAW,EAAE,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AArEQ,QAAA,WAAW,eAqEnB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sendAPDU.d.ts","sourceRoot":"","sources":["../../src/ble/sendAPDU.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"sendAPDU.d.ts","sourceRoot":"","sources":["../../src/ble/sendAPDU.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAclC,eAAO,MAAM,QAAQ,iBACL,MAAM,KAAK,QAAQ,IAAI,CAAC,QAChC,MAAM,WACH,MAAM,KACd,WAAW,MAAM,CA2CnB,CAAC"}
|
package/lib/ble/sendAPDU.js
CHANGED
|
@@ -21,7 +21,7 @@ function chunkBuffer(buffer, sizeForIndex) {
|
|
|
21
21
|
return chunks;
|
|
22
22
|
}
|
|
23
23
|
const sendAPDU = (write, apdu, mtuSize) => {
|
|
24
|
-
const chunks = chunkBuffer(apdu,
|
|
24
|
+
const chunks = chunkBuffer(apdu, i => mtuSize - (i === 0 ? 5 : 3)).map((buffer, i) => {
|
|
25
25
|
const head = Buffer.alloc(i === 0 ? 5 : 3);
|
|
26
26
|
head.writeUInt8(TagId, 0);
|
|
27
27
|
head.writeUInt16BE(i, 1);
|
|
@@ -30,7 +30,7 @@ const sendAPDU = (write, apdu, mtuSize) => {
|
|
|
30
30
|
}
|
|
31
31
|
return Buffer.concat([head, buffer]);
|
|
32
32
|
});
|
|
33
|
-
return new rxjs_1.Observable(
|
|
33
|
+
return new rxjs_1.Observable(o => {
|
|
34
34
|
let terminated = false;
|
|
35
35
|
function main() {
|
|
36
36
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -44,7 +44,7 @@ const sendAPDU = (write, apdu, mtuSize) => {
|
|
|
44
44
|
main().then(() => {
|
|
45
45
|
terminated = true;
|
|
46
46
|
o.complete();
|
|
47
|
-
},
|
|
47
|
+
}, e => {
|
|
48
48
|
terminated = true;
|
|
49
49
|
(0, logs_1.log)("ble-error", "sendAPDU failure " + String(e));
|
|
50
50
|
o.error(e);
|
package/lib/ble/sendAPDU.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sendAPDU.js","sourceRoot":"","sources":["../../src/ble/sendAPDU.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAkC;AAClC,yCAAqC;AACrC,MAAM,KAAK,GAAG,IAAI,CAAC;AAEnB,SAAS,WAAW,
|
|
1
|
+
{"version":3,"file":"sendAPDU.js","sourceRoot":"","sources":["../../src/ble/sendAPDU.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAkC;AAClC,yCAAqC;AACrC,MAAM,KAAK,GAAG,IAAI,CAAC;AAEnB,SAAS,WAAW,CAAC,MAAc,EAAE,YAAsC;IACzE,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,IAAI,EAAE,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE;QAC5F,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;KACxC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAEM,MAAM,QAAQ,GAAG,CACtB,KAAsC,EACtC,IAAY,EACZ,OAAe,EACK,EAAE;IACtB,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACnF,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEzB,IAAI,CAAC,KAAK,CAAC,EAAE;YACX,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;SACpC;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,iBAAU,CAAC,CAAC,CAAC,EAAE;QACxB,IAAI,UAAU,GAAG,KAAK,CAAC;QAEvB,SAAe,IAAI;;gBACjB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;oBAC1B,IAAI,UAAU;wBAAE,OAAO;oBACvB,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;iBACpB;YACH,CAAC;SAAA;QAED,IAAI,EAAE,CAAC,IAAI,CACT,GAAG,EAAE;YACH,UAAU,GAAG,IAAI,CAAC;YAClB,CAAC,CAAC,QAAQ,EAAE,CAAC;QACf,CAAC,EACD,CAAC,CAAC,EAAE;YACF,UAAU,GAAG,IAAI,CAAC;YAClB,IAAA,UAAG,EAAC,WAAW,EAAE,mBAAmB,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAClD,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACb,CAAC,CACF,CAAC;QAEF,MAAM,WAAW,GAAG,GAAG,EAAE;YACvB,IAAI,CAAC,UAAU,EAAE;gBACf,IAAA,UAAG,EAAC,aAAa,EAAE,uBAAuB,CAAC,CAAC;gBAC5C,UAAU,GAAG,IAAI,CAAC;aACnB;QACH,CAAC,CAAC;QAEF,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AA/CW,QAAA,QAAQ,YA+CnB"}
|
package/lib/helpers.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,CAAC;AAElC,eAAO,MAAM,qBAAqB,qBACd,MAAM,wBACF,aAAa,KAClC,
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,CAAC;AAElC,eAAO,MAAM,qBAAqB,qBACd,MAAM,wBACF,aAAa,KAClC,aAMF,CAAC"}
|
package/lib/helpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":";;;AAAA,wBAAkC;AAE3B,MAAM,qBAAqB,GAAG,CACnC,gBAAwB,EACxB,oBAAmC,EACpB,EAAE;;IACjB,
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":";;;AAAA,wBAAkC;AAE3B,MAAM,qBAAqB,GAAG,CACnC,gBAAwB,EACxB,oBAAmC,EACpB,EAAE;;IACjB,IAAI,MAAA,MAAM,CAAC,MAAM,CAAC,gBAAa,CAAC,0CAAE,QAAQ,CAAC,gBAAiC,CAAC,EAAE;QAC7E,OAAO,gBAAa,CAAC,gBAAiC,CAAC,CAAC;KACzD;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC,CAAC;AATW,QAAA,qBAAqB,yBAShC"}
|
package/lib/helpers.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.test.js","sourceRoot":"","sources":["../src/helpers.test.ts"],"names":[],"mappings":";;AAAA,wBAAkC;AAClC,uCAAkD;AAOlD,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,MAAM,KAAK,GAAW;QACpB;YACE,KAAK,EAAE,CAAC,MAAM,EAAE,gBAAa,CAAC,MAAM,CAAC;YACrC,cAAc,EAAE,gBAAa,CAAC,IAAI;SACnC;QACD;YACE,KAAK,EAAE,CAAC,gBAAgB,EAAE,gBAAa,CAAC,MAAM,CAAC;YAC/C,cAAc,EAAE,gBAAa,CAAC,MAAM;SACrC;KACF,CAAC;IAEF,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,EAAE;QAC1C,IAAI,CAAC,UAAU,IAAI,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"helpers.test.js","sourceRoot":"","sources":["../src/helpers.test.ts"],"names":[],"mappings":";;AAAA,wBAAkC;AAClC,uCAAkD;AAOlD,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,MAAM,KAAK,GAAW;QACpB;YACE,KAAK,EAAE,CAAC,MAAM,EAAE,gBAAa,CAAC,MAAM,CAAC;YACrC,cAAc,EAAE,gBAAa,CAAC,IAAI;SACnC;QACD;YACE,KAAK,EAAE,CAAC,gBAAgB,EAAE,gBAAa,CAAC,MAAM,CAAC;YAC/C,cAAc,EAAE,gBAAa,CAAC,MAAM;SACrC;KACF,CAAC;IAEF,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,EAAE;QAC1C,IAAI,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,wBAAwB,cAAc,EAAE,EAAE,GAAG,EAAE;YACjF,MAAM,MAAM,GAAG,IAAA,+BAAqB,EAAC,GAAG,KAAK,CAAC,CAAC;YAC/C,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,YAAY,IAAO,CAAC;AACjC,eAAO,MAAM,aAAa,IAAO,CAAC;AAClC,eAAO,MAAM,KAAK,IAAO,CAAC;AAC1B,eAAO,MAAM,MAAM,IAAO,CAAC;AAC3B,eAAO,MAAM,QAAQ,KAAO,CAAC;AAE7B,oBAAY,aAAa;IACvB,IAAI,SAAS;IACb,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,IAAI,SAAS;CACd;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,YAAY,IAAO,CAAC;AACjC,eAAO,MAAM,aAAa,IAAO,CAAC;AAClC,eAAO,MAAM,KAAK,IAAO,CAAC;AAC1B,eAAO,MAAM,MAAM,IAAO,CAAC;AAC3B,eAAO,MAAM,QAAQ,KAAO,CAAC;AAE7B,oBAAY,aAAa;IACvB,IAAI,SAAS;IACb,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,IAAI,SAAS;CACd;AAkFD;;GAEG;AACH,eAAO,MAAM,iBAAiB,QAAS,CAAC;AAExC;;GAEG;AACH,eAAO,MAAM,cAAc,OAAQ,aAAa,KAAG,WAIlD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,aAAc,MAAM,KAAG,WAAW,GAAG,IAAI,GAAG,SAMxE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,iBAAkB,MAAM,KAAG,WAAW,GAAG,IAAI,GAAG,SAMhF,CAAC;AAEF,eAAO,MAAM,mBAAmB,gBAAiB,MAAM,KAAG,WAAW,GAAG,IAAI,GAAG,SAG9E,CAAC;AAsBF;;GAEG;AACH,eAAO,MAAM,wBAAwB,QAAO,MAAM,EAAuB,CAAC;AAE1E;;GAEG;AACH,eAAO,MAAM,sBAAsB,SAAU,MAAM,KAAG,cAAc,GAAG,SAC/B,CAAC;AAEzC;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,aAAa,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,EAAE,CAAC;IAEhB,YAAY,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,MAAM,CAAC;IAClD,aAAa,CAAC,EAAE;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;KACpB,EAAE,CAAC;CACL;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB"}
|
package/lib/index.js
CHANGED
|
@@ -52,12 +52,7 @@ const devices = {
|
|
|
52
52
|
usbOnly: true,
|
|
53
53
|
memorySize: 320 * 1024,
|
|
54
54
|
masks: [0x31100000],
|
|
55
|
-
getBlockSize: (firmwareVersion) => {
|
|
56
|
-
var _a;
|
|
57
|
-
return semver_1.default.lt((_a = semver_1.default.coerce(firmwareVersion)) !== null && _a !== void 0 ? _a : "", "2.0.0")
|
|
58
|
-
? 4 * 1024
|
|
59
|
-
: 2 * 1024;
|
|
60
|
-
},
|
|
55
|
+
getBlockSize: (firmwareVersion) => { var _a; return semver_1.default.lt((_a = semver_1.default.coerce(firmwareVersion)) !== null && _a !== void 0 ? _a : "", "2.0.0") ? 4 * 1024 : 2 * 1024; },
|
|
61
56
|
},
|
|
62
57
|
[DeviceModelId.nanoSP]: {
|
|
63
58
|
id: DeviceModelId.nanoSP,
|
|
@@ -133,7 +128,7 @@ exports.getDeviceModel = getDeviceModel;
|
|
|
133
128
|
* based on the first two bytes.
|
|
134
129
|
*/
|
|
135
130
|
const identifyTargetId = (targetId) => {
|
|
136
|
-
const deviceModel = devicesList.find(({ masks }) => masks.find(
|
|
131
|
+
const deviceModel = devicesList.find(({ masks }) => masks.find(mask => (targetId & 0xffff0000) === mask));
|
|
137
132
|
return deviceModel;
|
|
138
133
|
};
|
|
139
134
|
exports.identifyTargetId = identifyTargetId;
|
|
@@ -141,16 +136,16 @@ exports.identifyTargetId = identifyTargetId;
|
|
|
141
136
|
*
|
|
142
137
|
*/
|
|
143
138
|
const identifyUSBProductId = (usbProductId) => {
|
|
144
|
-
const legacy = devicesList.find(
|
|
139
|
+
const legacy = devicesList.find(d => d.legacyUsbProductId === usbProductId);
|
|
145
140
|
if (legacy)
|
|
146
141
|
return legacy;
|
|
147
142
|
const mm = usbProductId >> 8;
|
|
148
|
-
const deviceModel = devicesList.find(
|
|
143
|
+
const deviceModel = devicesList.find(d => d.productIdMM === mm);
|
|
149
144
|
return deviceModel;
|
|
150
145
|
};
|
|
151
146
|
exports.identifyUSBProductId = identifyUSBProductId;
|
|
152
147
|
const identifyProductName = (productName) => {
|
|
153
|
-
const deviceModel = devicesList.find(
|
|
148
|
+
const deviceModel = devicesList.find(d => d.id === productMap[productName]);
|
|
154
149
|
return deviceModel;
|
|
155
150
|
};
|
|
156
151
|
exports.identifyProductName = identifyProductName;
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAE5B;;;;;;;;;;;;;;GAcG;AACU,QAAA,YAAY,GAAG,IAAI,CAAC;AACpB,QAAA,aAAa,GAAG,IAAI,CAAC;AACrB,QAAA,KAAK,GAAG,IAAI,CAAC;AACb,QAAA,MAAM,GAAG,IAAI,CAAC;AACd,QAAA,QAAQ,GAAG,IAAI,CAAC;AAE7B,IAAY,aAMX;AAND,WAAY,aAAa;IACvB,8BAAa,CAAA;IACb,gCAAe,CAAA;IACf,kCAAiB,CAAA;IACjB,gCAAe,CAAA;IACf,8BAAa,CAAA;AACf,CAAC,EANW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAMxB;AAED,MAAM,OAAO,GAA4C;IACvD,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE;QACpB,EAAE,EAAE,aAAa,CAAC,IAAI;QACtB,WAAW,EAAE,aAAa;QAC1B,WAAW,EAAE,IAAI;QACjB,kBAAkB,EAAE,MAAM;QAC1B,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,GAAG,GAAG,IAAI;QACtB,KAAK,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC;QAC/B,YAAY,EAAE,CAAC,eAAuB,EAAU,EAAE,CAAC,CAAC,GAAG,IAAI;KAC5D;IACD,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;QACrB,EAAE,EAAE,aAAa,CAAC,KAAK;QACvB,WAAW,EAAE,eAAe;QAC5B,WAAW,EAAE,IAAI;QACjB,kBAAkB,EAAE,MAAM;QAC1B,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,GAAG,GAAG,IAAI;QACtB,KAAK,EAAE,CAAC,UAAU,CAAC;QACnB,YAAY,EAAE,CAAC,eAAuB,EAAU,EAAE
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"receiveAPDU.d.ts","sourceRoot":"","sources":["../../src/ble/receiveAPDU.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAIlC,eAAO,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"receiveAPDU.d.ts","sourceRoot":"","sources":["../../src/ble/receiveAPDU.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAIlC,eAAO,MAAM,WAAW,cAAe,WAAW,MAAM,CAAC,KAAG,WAAW,MAAM,CAqEzE,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { Observable } from "rxjs";
|
|
|
3
3
|
import { log } from "@ledgerhq/logs";
|
|
4
4
|
const TagId = 0x05;
|
|
5
5
|
// operator that transform the input raw stream into one apdu response and finishes
|
|
6
|
-
export const receiveAPDU = (rawStream) => Observable.create(
|
|
6
|
+
export const receiveAPDU = (rawStream) => Observable.create(o => {
|
|
7
7
|
let notifiedIndex = 0;
|
|
8
8
|
let notifiedDataLength = 0;
|
|
9
9
|
let notifiedData = Buffer.alloc(0);
|
|
@@ -12,12 +12,12 @@ export const receiveAPDU = (rawStream) => Observable.create((o) => {
|
|
|
12
12
|
o.error(new DisconnectedDevice());
|
|
13
13
|
sub.unsubscribe();
|
|
14
14
|
},
|
|
15
|
-
error:
|
|
15
|
+
error: e => {
|
|
16
16
|
log("ble-error", "in receiveAPDU " + String(e));
|
|
17
17
|
o.error(e);
|
|
18
18
|
sub.unsubscribe();
|
|
19
19
|
},
|
|
20
|
-
next:
|
|
20
|
+
next: value => {
|
|
21
21
|
const tag = value.readUInt8(0);
|
|
22
22
|
const index = value.readUInt16BE(1);
|
|
23
23
|
let data = value.slice(3);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"receiveAPDU.js","sourceRoot":"","sources":["../../src/ble/receiveAPDU.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,MAAM,KAAK,GAAG,IAAI,CAAC;AACnB,mFAAmF;AACnF,MAAM,CAAC,MAAM,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"receiveAPDU.js","sourceRoot":"","sources":["../../src/ble/receiveAPDU.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,MAAM,KAAK,GAAG,IAAI,CAAC;AACnB,mFAAmF;AACnF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,SAA6B,EAAsB,EAAE,CAC/E,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;IACpB,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,kBAAkB,GAAG,CAAC,CAAC;IAC3B,IAAI,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,GAAG,GAAG,SAAS,CAAC,SAAS,CAAC;QAC9B,QAAQ,EAAE,GAAG,EAAE;YACb,CAAC,CAAC,KAAK,CAAC,IAAI,kBAAkB,EAAE,CAAC,CAAC;YAClC,GAAG,CAAC,WAAW,EAAE,CAAC;QACpB,CAAC;QACD,KAAK,EAAE,CAAC,CAAC,EAAE;YACT,GAAG,CAAC,WAAW,EAAE,iBAAiB,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAChD,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACX,GAAG,CAAC,WAAW,EAAE,CAAC;QACpB,CAAC;QACD,IAAI,EAAE,KAAK,CAAC,EAAE;YACZ,MAAM,GAAG,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAC/B,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACpC,IAAI,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAE1B,IAAI,GAAG,KAAK,KAAK,EAAE;gBACjB,CAAC,CAAC,KAAK,CAAC,IAAI,cAAc,CAAC,cAAc,GAAG,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;gBAC7E,OAAO;aACR;YAED,IAAI,aAAa,KAAK,KAAK,EAAE;gBAC3B,CAAC,CAAC,KAAK,CACL,IAAI,cAAc,CAChB,6DAA6D;oBAC3D,KAAK;oBACL,gBAAgB;oBAChB,aAAa,EACf,iBAAiB,CAClB,CACF,CAAC;gBACF,OAAO;aACR;YAED,IAAI,KAAK,KAAK,CAAC,EAAE;gBACf,kBAAkB,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBAC1C,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aACtB;YAED,aAAa,EAAE,CAAC;YAChB,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;YAEnD,IAAI,YAAY,CAAC,MAAM,GAAG,kBAAkB,EAAE;gBAC5C,CAAC,CAAC,KAAK,CACL,IAAI,cAAc,CAChB,4DAA4D;oBAC1D,YAAY,CAAC,MAAM;oBACnB,gBAAgB;oBAChB,kBAAkB,EACpB,gBAAgB,CACjB,CACF,CAAC;gBACF,OAAO;aACR;YAED,IAAI,YAAY,CAAC,MAAM,KAAK,kBAAkB,EAAE;gBAC9C,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACrB,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACb,GAAG,CAAC,WAAW,EAAE,CAAC;aACnB;QACH,CAAC;KACF,CAAC,CAAC;IACH,OAAO,GAAG,EAAE;QACV,GAAG,CAAC,WAAW,EAAE,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sendAPDU.d.ts","sourceRoot":"","sources":["../../src/ble/sendAPDU.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"sendAPDU.d.ts","sourceRoot":"","sources":["../../src/ble/sendAPDU.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAclC,eAAO,MAAM,QAAQ,iBACL,MAAM,KAAK,QAAQ,IAAI,CAAC,QAChC,MAAM,WACH,MAAM,KACd,WAAW,MAAM,CA2CnB,CAAC"}
|
package/lib-es/ble/sendAPDU.js
CHANGED
|
@@ -18,7 +18,7 @@ function chunkBuffer(buffer, sizeForIndex) {
|
|
|
18
18
|
return chunks;
|
|
19
19
|
}
|
|
20
20
|
export const sendAPDU = (write, apdu, mtuSize) => {
|
|
21
|
-
const chunks = chunkBuffer(apdu,
|
|
21
|
+
const chunks = chunkBuffer(apdu, i => mtuSize - (i === 0 ? 5 : 3)).map((buffer, i) => {
|
|
22
22
|
const head = Buffer.alloc(i === 0 ? 5 : 3);
|
|
23
23
|
head.writeUInt8(TagId, 0);
|
|
24
24
|
head.writeUInt16BE(i, 1);
|
|
@@ -27,7 +27,7 @@ export const sendAPDU = (write, apdu, mtuSize) => {
|
|
|
27
27
|
}
|
|
28
28
|
return Buffer.concat([head, buffer]);
|
|
29
29
|
});
|
|
30
|
-
return new Observable(
|
|
30
|
+
return new Observable(o => {
|
|
31
31
|
let terminated = false;
|
|
32
32
|
function main() {
|
|
33
33
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -41,7 +41,7 @@ export const sendAPDU = (write, apdu, mtuSize) => {
|
|
|
41
41
|
main().then(() => {
|
|
42
42
|
terminated = true;
|
|
43
43
|
o.complete();
|
|
44
|
-
},
|
|
44
|
+
}, e => {
|
|
45
45
|
terminated = true;
|
|
46
46
|
log("ble-error", "sendAPDU failure " + String(e));
|
|
47
47
|
o.error(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sendAPDU.js","sourceRoot":"","sources":["../../src/ble/sendAPDU.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,MAAM,KAAK,GAAG,IAAI,CAAC;AAEnB,SAAS,WAAW,
|
|
1
|
+
{"version":3,"file":"sendAPDU.js","sourceRoot":"","sources":["../../src/ble/sendAPDU.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,MAAM,KAAK,GAAG,IAAI,CAAC;AAEnB,SAAS,WAAW,CAAC,MAAc,EAAE,YAAsC;IACzE,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,IAAI,EAAE,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE;QAC5F,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;KACxC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,KAAsC,EACtC,IAAY,EACZ,OAAe,EACK,EAAE;IACtB,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACnF,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEzB,IAAI,CAAC,KAAK,CAAC,EAAE;YACX,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;SACpC;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE;QACxB,IAAI,UAAU,GAAG,KAAK,CAAC;QAEvB,SAAe,IAAI;;gBACjB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;oBAC1B,IAAI,UAAU;wBAAE,OAAO;oBACvB,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;iBACpB;YACH,CAAC;SAAA;QAED,IAAI,EAAE,CAAC,IAAI,CACT,GAAG,EAAE;YACH,UAAU,GAAG,IAAI,CAAC;YAClB,CAAC,CAAC,QAAQ,EAAE,CAAC;QACf,CAAC,EACD,CAAC,CAAC,EAAE;YACF,UAAU,GAAG,IAAI,CAAC;YAClB,GAAG,CAAC,WAAW,EAAE,mBAAmB,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAClD,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACb,CAAC,CACF,CAAC;QAEF,MAAM,WAAW,GAAG,GAAG,EAAE;YACvB,IAAI,CAAC,UAAU,EAAE;gBACf,GAAG,CAAC,aAAa,EAAE,uBAAuB,CAAC,CAAC;gBAC5C,UAAU,GAAG,IAAI,CAAC;aACnB;QACH,CAAC,CAAC;QAEF,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}
|
package/lib-es/helpers.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,CAAC;AAElC,eAAO,MAAM,qBAAqB,qBACd,MAAM,wBACF,aAAa,KAClC,
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,CAAC;AAElC,eAAO,MAAM,qBAAqB,qBACd,MAAM,wBACF,aAAa,KAClC,aAMF,CAAC"}
|
package/lib-es/helpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,CAAC;AAElC,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,gBAAwB,EACxB,oBAAmC,EACpB,EAAE;;IACjB,
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,CAAC;AAElC,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,gBAAwB,EACxB,oBAAmC,EACpB,EAAE;;IACjB,IAAI,MAAA,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,0CAAE,QAAQ,CAAC,gBAAiC,CAAC,EAAE;QAC7E,OAAO,aAAa,CAAC,gBAAiC,CAAC,CAAC;KACzD;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.test.js","sourceRoot":"","sources":["../src/helpers.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,CAAC;AAClC,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAOlD,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,MAAM,KAAK,GAAW;QACpB;YACE,KAAK,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC;YACrC,cAAc,EAAE,aAAa,CAAC,IAAI;SACnC;QACD;YACE,KAAK,EAAE,CAAC,gBAAgB,EAAE,aAAa,CAAC,MAAM,CAAC;YAC/C,cAAc,EAAE,aAAa,CAAC,MAAM;SACrC;KACF,CAAC;IAEF,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,EAAE;QAC1C,IAAI,CAAC,UAAU,IAAI,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"helpers.test.js","sourceRoot":"","sources":["../src/helpers.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,CAAC;AAClC,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAOlD,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,MAAM,KAAK,GAAW;QACpB;YACE,KAAK,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC;YACrC,cAAc,EAAE,aAAa,CAAC,IAAI;SACnC;QACD;YACE,KAAK,EAAE,CAAC,gBAAgB,EAAE,aAAa,CAAC,MAAM,CAAC;YAC/C,cAAc,EAAE,aAAa,CAAC,MAAM;SACrC;KACF,CAAC;IAEF,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,EAAE;QAC1C,IAAI,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,wBAAwB,cAAc,EAAE,EAAE,GAAG,EAAE;YACjF,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,KAAK,CAAC,CAAC;YAC/C,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/lib-es/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,YAAY,IAAO,CAAC;AACjC,eAAO,MAAM,aAAa,IAAO,CAAC;AAClC,eAAO,MAAM,KAAK,IAAO,CAAC;AAC1B,eAAO,MAAM,MAAM,IAAO,CAAC;AAC3B,eAAO,MAAM,QAAQ,KAAO,CAAC;AAE7B,oBAAY,aAAa;IACvB,IAAI,SAAS;IACb,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,IAAI,SAAS;CACd;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,YAAY,IAAO,CAAC;AACjC,eAAO,MAAM,aAAa,IAAO,CAAC;AAClC,eAAO,MAAM,KAAK,IAAO,CAAC;AAC1B,eAAO,MAAM,MAAM,IAAO,CAAC;AAC3B,eAAO,MAAM,QAAQ,KAAO,CAAC;AAE7B,oBAAY,aAAa;IACvB,IAAI,SAAS;IACb,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,IAAI,SAAS;CACd;AAkFD;;GAEG;AACH,eAAO,MAAM,iBAAiB,QAAS,CAAC;AAExC;;GAEG;AACH,eAAO,MAAM,cAAc,OAAQ,aAAa,KAAG,WAIlD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,aAAc,MAAM,KAAG,WAAW,GAAG,IAAI,GAAG,SAMxE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,iBAAkB,MAAM,KAAG,WAAW,GAAG,IAAI,GAAG,SAMhF,CAAC;AAEF,eAAO,MAAM,mBAAmB,gBAAiB,MAAM,KAAG,WAAW,GAAG,IAAI,GAAG,SAG9E,CAAC;AAsBF;;GAEG;AACH,eAAO,MAAM,wBAAwB,QAAO,MAAM,EAAuB,CAAC;AAE1E;;GAEG;AACH,eAAO,MAAM,sBAAsB,SAAU,MAAM,KAAG,cAAc,GAAG,SAC/B,CAAC;AAEzC;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,aAAa,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,EAAE,CAAC;IAEhB,YAAY,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,MAAM,CAAC;IAClD,aAAa,CAAC,EAAE;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;KACpB,EAAE,CAAC;CACL;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB"}
|
package/lib-es/index.js
CHANGED
|
@@ -46,12 +46,7 @@ const devices = {
|
|
|
46
46
|
usbOnly: true,
|
|
47
47
|
memorySize: 320 * 1024,
|
|
48
48
|
masks: [0x31100000],
|
|
49
|
-
getBlockSize: (firmwareVersion) => {
|
|
50
|
-
var _a;
|
|
51
|
-
return semver.lt((_a = semver.coerce(firmwareVersion)) !== null && _a !== void 0 ? _a : "", "2.0.0")
|
|
52
|
-
? 4 * 1024
|
|
53
|
-
: 2 * 1024;
|
|
54
|
-
},
|
|
49
|
+
getBlockSize: (firmwareVersion) => { var _a; return semver.lt((_a = semver.coerce(firmwareVersion)) !== null && _a !== void 0 ? _a : "", "2.0.0") ? 4 * 1024 : 2 * 1024; },
|
|
55
50
|
},
|
|
56
51
|
[DeviceModelId.nanoSP]: {
|
|
57
52
|
id: DeviceModelId.nanoSP,
|
|
@@ -126,22 +121,22 @@ export const getDeviceModel = (id) => {
|
|
|
126
121
|
* based on the first two bytes.
|
|
127
122
|
*/
|
|
128
123
|
export const identifyTargetId = (targetId) => {
|
|
129
|
-
const deviceModel = devicesList.find(({ masks }) => masks.find(
|
|
124
|
+
const deviceModel = devicesList.find(({ masks }) => masks.find(mask => (targetId & 0xffff0000) === mask));
|
|
130
125
|
return deviceModel;
|
|
131
126
|
};
|
|
132
127
|
/**
|
|
133
128
|
*
|
|
134
129
|
*/
|
|
135
130
|
export const identifyUSBProductId = (usbProductId) => {
|
|
136
|
-
const legacy = devicesList.find(
|
|
131
|
+
const legacy = devicesList.find(d => d.legacyUsbProductId === usbProductId);
|
|
137
132
|
if (legacy)
|
|
138
133
|
return legacy;
|
|
139
134
|
const mm = usbProductId >> 8;
|
|
140
|
-
const deviceModel = devicesList.find(
|
|
135
|
+
const deviceModel = devicesList.find(d => d.productIdMM === mm);
|
|
141
136
|
return deviceModel;
|
|
142
137
|
};
|
|
143
138
|
export const identifyProductName = (productName) => {
|
|
144
|
-
const deviceModel = devicesList.find(
|
|
139
|
+
const deviceModel = devicesList.find(d => d.id === productMap[productName]);
|
|
145
140
|
return deviceModel;
|
|
146
141
|
};
|
|
147
142
|
const bluetoothServices = [];
|
package/lib-es/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC;AACjC,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,CAAC;AAClC,MAAM,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC;AAC1B,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,CAAC;AAC3B,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,CAAC;AAE7B,MAAM,CAAN,IAAY,aAMX;AAND,WAAY,aAAa;IACvB,8BAAa,CAAA;IACb,gCAAe,CAAA;IACf,kCAAiB,CAAA;IACjB,gCAAe,CAAA;IACf,8BAAa,CAAA;AACf,CAAC,EANW,aAAa,KAAb,aAAa,QAMxB;AAED,MAAM,OAAO,GAA4C;IACvD,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE;QACpB,EAAE,EAAE,aAAa,CAAC,IAAI;QACtB,WAAW,EAAE,aAAa;QAC1B,WAAW,EAAE,IAAI;QACjB,kBAAkB,EAAE,MAAM;QAC1B,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,GAAG,GAAG,IAAI;QACtB,KAAK,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC;QAC/B,YAAY,EAAE,CAAC,eAAuB,EAAU,EAAE,CAAC,CAAC,GAAG,IAAI;KAC5D;IACD,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;QACrB,EAAE,EAAE,aAAa,CAAC,KAAK;QACvB,WAAW,EAAE,eAAe;QAC5B,WAAW,EAAE,IAAI;QACjB,kBAAkB,EAAE,MAAM;QAC1B,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,GAAG,GAAG,IAAI;QACtB,KAAK,EAAE,CAAC,UAAU,CAAC;QACnB,YAAY,EAAE,CAAC,eAAuB,EAAU,EAAE
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/devices",
|
|
3
|
-
"version": "8.0.
|
|
3
|
+
"version": "8.0.4-next.0",
|
|
4
4
|
"description": "Ledger devices",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Ledger"
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"dependencies": {
|
|
56
56
|
"rxjs": "6",
|
|
57
57
|
"semver": "^7.3.5",
|
|
58
|
-
"@ledgerhq/errors": "^6.12.
|
|
58
|
+
"@ledgerhq/errors": "^6.12.7-next.0",
|
|
59
59
|
"@ledgerhq/logs": "^6.10.1"
|
|
60
60
|
},
|
|
61
61
|
"devDependencies": {
|
|
@@ -76,7 +76,7 @@
|
|
|
76
76
|
"prewatch": "pnpm build",
|
|
77
77
|
"watch": "tsc --watch",
|
|
78
78
|
"doc": "documentation readme src/** --section=API --pe ts --re ts --re d.ts",
|
|
79
|
-
"lint": "eslint ./src --no-error-on-unmatched-pattern --ext .ts,.tsx",
|
|
79
|
+
"lint": "eslint ./src --no-error-on-unmatched-pattern --ext .ts,.tsx --cache",
|
|
80
80
|
"lint:fix": "pnpm lint --fix",
|
|
81
81
|
"test": "jest"
|
|
82
82
|
}
|
package/src/ble/receiveAPDU.ts
CHANGED
|
@@ -3,10 +3,8 @@ import { Observable } from "rxjs";
|
|
|
3
3
|
import { log } from "@ledgerhq/logs";
|
|
4
4
|
const TagId = 0x05;
|
|
5
5
|
// operator that transform the input raw stream into one apdu response and finishes
|
|
6
|
-
export const receiveAPDU = (
|
|
7
|
-
|
|
8
|
-
): Observable<Buffer> =>
|
|
9
|
-
Observable.create((o) => {
|
|
6
|
+
export const receiveAPDU = (rawStream: Observable<Buffer>): Observable<Buffer> =>
|
|
7
|
+
Observable.create(o => {
|
|
10
8
|
let notifiedIndex = 0;
|
|
11
9
|
let notifiedDataLength = 0;
|
|
12
10
|
let notifiedData = Buffer.alloc(0);
|
|
@@ -15,20 +13,18 @@ export const receiveAPDU = (
|
|
|
15
13
|
o.error(new DisconnectedDevice());
|
|
16
14
|
sub.unsubscribe();
|
|
17
15
|
},
|
|
18
|
-
error:
|
|
16
|
+
error: e => {
|
|
19
17
|
log("ble-error", "in receiveAPDU " + String(e));
|
|
20
18
|
o.error(e);
|
|
21
19
|
sub.unsubscribe();
|
|
22
20
|
},
|
|
23
|
-
next:
|
|
21
|
+
next: value => {
|
|
24
22
|
const tag = value.readUInt8(0);
|
|
25
23
|
const index = value.readUInt16BE(1);
|
|
26
24
|
let data = value.slice(3);
|
|
27
25
|
|
|
28
26
|
if (tag !== TagId) {
|
|
29
|
-
o.error(
|
|
30
|
-
new TransportError("Invalid tag " + tag.toString(16), "InvalidTag")
|
|
31
|
-
);
|
|
27
|
+
o.error(new TransportError("Invalid tag " + tag.toString(16), "InvalidTag"));
|
|
32
28
|
return;
|
|
33
29
|
}
|
|
34
30
|
|
|
@@ -39,8 +35,8 @@ export const receiveAPDU = (
|
|
|
39
35
|
index +
|
|
40
36
|
" but expected " +
|
|
41
37
|
notifiedIndex,
|
|
42
|
-
"InvalidSequence"
|
|
43
|
-
)
|
|
38
|
+
"InvalidSequence",
|
|
39
|
+
),
|
|
44
40
|
);
|
|
45
41
|
return;
|
|
46
42
|
}
|
|
@@ -60,8 +56,8 @@ export const receiveAPDU = (
|
|
|
60
56
|
notifiedData.length +
|
|
61
57
|
" but expected " +
|
|
62
58
|
notifiedDataLength,
|
|
63
|
-
"BLETooMuchData"
|
|
64
|
-
)
|
|
59
|
+
"BLETooMuchData",
|
|
60
|
+
),
|
|
65
61
|
);
|
|
66
62
|
return;
|
|
67
63
|
}
|
package/src/ble/sendAPDU.ts
CHANGED
|
@@ -2,17 +2,10 @@ import { Observable } from "rxjs";
|
|
|
2
2
|
import { log } from "@ledgerhq/logs";
|
|
3
3
|
const TagId = 0x05;
|
|
4
4
|
|
|
5
|
-
function chunkBuffer(
|
|
6
|
-
buffer: Buffer,
|
|
7
|
-
sizeForIndex: (arg0: number) => number
|
|
8
|
-
): Array<Buffer> {
|
|
5
|
+
function chunkBuffer(buffer: Buffer, sizeForIndex: (arg0: number) => number): Array<Buffer> {
|
|
9
6
|
const chunks: Buffer[] = [];
|
|
10
7
|
|
|
11
|
-
for (
|
|
12
|
-
let i = 0, size = sizeForIndex(0);
|
|
13
|
-
i < buffer.length;
|
|
14
|
-
i += size, size = sizeForIndex(i)
|
|
15
|
-
) {
|
|
8
|
+
for (let i = 0, size = sizeForIndex(0); i < buffer.length; i += size, size = sizeForIndex(i)) {
|
|
16
9
|
chunks.push(buffer.slice(i, i + size));
|
|
17
10
|
}
|
|
18
11
|
|
|
@@ -22,22 +15,20 @@ function chunkBuffer(
|
|
|
22
15
|
export const sendAPDU = (
|
|
23
16
|
write: (arg0: Buffer) => Promise<void>,
|
|
24
17
|
apdu: Buffer,
|
|
25
|
-
mtuSize: number
|
|
18
|
+
mtuSize: number,
|
|
26
19
|
): Observable<Buffer> => {
|
|
27
|
-
const chunks = chunkBuffer(apdu,
|
|
28
|
-
(
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
head.writeUInt16BE(i, 1);
|
|
20
|
+
const chunks = chunkBuffer(apdu, i => mtuSize - (i === 0 ? 5 : 3)).map((buffer, i) => {
|
|
21
|
+
const head = Buffer.alloc(i === 0 ? 5 : 3);
|
|
22
|
+
head.writeUInt8(TagId, 0);
|
|
23
|
+
head.writeUInt16BE(i, 1);
|
|
32
24
|
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
return Buffer.concat([head, buffer]);
|
|
25
|
+
if (i === 0) {
|
|
26
|
+
head.writeUInt16BE(apdu.length, 3);
|
|
38
27
|
}
|
|
39
|
-
|
|
40
|
-
|
|
28
|
+
|
|
29
|
+
return Buffer.concat([head, buffer]);
|
|
30
|
+
});
|
|
31
|
+
return new Observable(o => {
|
|
41
32
|
let terminated = false;
|
|
42
33
|
|
|
43
34
|
async function main() {
|
|
@@ -52,11 +43,11 @@ export const sendAPDU = (
|
|
|
52
43
|
terminated = true;
|
|
53
44
|
o.complete();
|
|
54
45
|
},
|
|
55
|
-
|
|
46
|
+
e => {
|
|
56
47
|
terminated = true;
|
|
57
48
|
log("ble-error", "sendAPDU failure " + String(e));
|
|
58
49
|
o.error(e);
|
|
59
|
-
}
|
|
50
|
+
},
|
|
60
51
|
);
|
|
61
52
|
|
|
62
53
|
const unsubscribe = () => {
|
package/src/helpers.test.ts
CHANGED
|
@@ -19,9 +19,7 @@ describe("stringToDeviceModelId", () => {
|
|
|
19
19
|
];
|
|
20
20
|
|
|
21
21
|
tests.forEach(({ input, expectedOutput }) => {
|
|
22
|
-
test(`Input: ${JSON.stringify(
|
|
23
|
-
input
|
|
24
|
-
)} -> Expected output: ${expectedOutput}`, () => {
|
|
22
|
+
test(`Input: ${JSON.stringify(input)} -> Expected output: ${expectedOutput}`, () => {
|
|
25
23
|
const result = stringToDeviceModelId(...input);
|
|
26
24
|
expect(result).toEqual(expectedOutput);
|
|
27
25
|
});
|
package/src/helpers.ts
CHANGED
|
@@ -2,11 +2,9 @@ import { DeviceModelId } from ".";
|
|
|
2
2
|
|
|
3
3
|
export const stringToDeviceModelId = (
|
|
4
4
|
strDeviceModelId: string,
|
|
5
|
-
defaultDeviceModelId: DeviceModelId
|
|
5
|
+
defaultDeviceModelId: DeviceModelId,
|
|
6
6
|
): DeviceModelId => {
|
|
7
|
-
if (
|
|
8
|
-
Object.values(DeviceModelId)?.includes(strDeviceModelId as DeviceModelId)
|
|
9
|
-
) {
|
|
7
|
+
if (Object.values(DeviceModelId)?.includes(strDeviceModelId as DeviceModelId)) {
|
|
10
8
|
return DeviceModelId[strDeviceModelId as DeviceModelId];
|
|
11
9
|
}
|
|
12
10
|
|
package/src/index.ts
CHANGED
|
@@ -49,9 +49,7 @@ const devices: { [key in DeviceModelId]: DeviceModel } = {
|
|
|
49
49
|
memorySize: 320 * 1024,
|
|
50
50
|
masks: [0x31100000],
|
|
51
51
|
getBlockSize: (firmwareVersion: string): number =>
|
|
52
|
-
semver.lt(semver.coerce(firmwareVersion) ?? "", "2.0.0")
|
|
53
|
-
? 4 * 1024
|
|
54
|
-
: 2 * 1024,
|
|
52
|
+
semver.lt(semver.coerce(firmwareVersion) ?? "", "2.0.0") ? 4 * 1024 : 2 * 1024,
|
|
55
53
|
},
|
|
56
54
|
[DeviceModelId.nanoSP]: {
|
|
57
55
|
id: DeviceModelId.nanoSP,
|
|
@@ -129,11 +127,9 @@ export const getDeviceModel = (id: DeviceModelId): DeviceModel => {
|
|
|
129
127
|
* Given a `targetId`, return the deviceModel associated to it,
|
|
130
128
|
* based on the first two bytes.
|
|
131
129
|
*/
|
|
132
|
-
export const identifyTargetId = (
|
|
133
|
-
targetId: number
|
|
134
|
-
): DeviceModel | null | undefined => {
|
|
130
|
+
export const identifyTargetId = (targetId: number): DeviceModel | null | undefined => {
|
|
135
131
|
const deviceModel = devicesList.find(({ masks }) =>
|
|
136
|
-
masks.find(
|
|
132
|
+
masks.find(mask => (targetId & 0xffff0000) === mask),
|
|
137
133
|
);
|
|
138
134
|
|
|
139
135
|
return deviceModel;
|
|
@@ -142,20 +138,16 @@ export const identifyTargetId = (
|
|
|
142
138
|
/**
|
|
143
139
|
*
|
|
144
140
|
*/
|
|
145
|
-
export const identifyUSBProductId = (
|
|
146
|
-
usbProductId
|
|
147
|
-
): DeviceModel | null | undefined => {
|
|
148
|
-
const legacy = devicesList.find((d) => d.legacyUsbProductId === usbProductId);
|
|
141
|
+
export const identifyUSBProductId = (usbProductId: number): DeviceModel | null | undefined => {
|
|
142
|
+
const legacy = devicesList.find(d => d.legacyUsbProductId === usbProductId);
|
|
149
143
|
if (legacy) return legacy;
|
|
150
144
|
const mm = usbProductId >> 8;
|
|
151
|
-
const deviceModel = devicesList.find(
|
|
145
|
+
const deviceModel = devicesList.find(d => d.productIdMM === mm);
|
|
152
146
|
return deviceModel;
|
|
153
147
|
};
|
|
154
148
|
|
|
155
|
-
export const identifyProductName = (
|
|
156
|
-
productName
|
|
157
|
-
): DeviceModel | null | undefined => {
|
|
158
|
-
const deviceModel = devicesList.find((d) => d.id === productMap[productName]);
|
|
149
|
+
export const identifyProductName = (productName: string): DeviceModel | null | undefined => {
|
|
150
|
+
const deviceModel = devicesList.find(d => d.id === productMap[productName]);
|
|
159
151
|
return deviceModel;
|
|
160
152
|
};
|
|
161
153
|
|
|
@@ -187,9 +179,8 @@ export const getBluetoothServiceUuids = (): string[] => bluetoothServices;
|
|
|
187
179
|
/**
|
|
188
180
|
*
|
|
189
181
|
*/
|
|
190
|
-
export const getInfosForServiceUuid = (
|
|
191
|
-
uuid
|
|
192
|
-
): BluetoothInfos | undefined => serviceUuidToInfos[uuid.toLowerCase()];
|
|
182
|
+
export const getInfosForServiceUuid = (uuid: string): BluetoothInfos | undefined =>
|
|
183
|
+
serviceUuidToInfos[uuid.toLowerCase()];
|
|
193
184
|
|
|
194
185
|
/**
|
|
195
186
|
*
|