@ledgerhq/speculos-transport 0.1.8 → 0.1.9-nightly.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/index.d.ts +2 -2
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +12 -12
- package/lib/index.js.map +1 -1
- package/lib-es/index.d.ts +2 -2
- package/lib-es/index.d.ts.map +1 -1
- package/lib-es/index.js +12 -12
- package/lib-es/index.js.map +1 -1
- package/package.json +3 -2
- package/src/index.ts +11 -11
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# @ledgerhq/speculos-transport
|
|
2
2
|
|
|
3
|
+
## 0.1.9-nightly.0
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [[`d98a964`](https://github.com/LedgerHQ/ledger-live/commit/d98a96476c3d44eab1575f6c7c58ec03b5daf890)]:
|
|
8
|
+
- @ledgerhq/live-env@2.5.0-nightly.0
|
|
9
|
+
|
|
3
10
|
## 0.1.8
|
|
4
11
|
|
|
5
12
|
### Patch Changes
|
package/lib/index.d.ts
CHANGED
|
@@ -17,12 +17,12 @@ export type SpeculosDeviceInternal = {
|
|
|
17
17
|
buttonPort: number;
|
|
18
18
|
automationPort: number;
|
|
19
19
|
transport: SpeculosTransportWebsocket;
|
|
20
|
-
destroy: () =>
|
|
20
|
+
destroy: () => Promise<unknown>;
|
|
21
21
|
} | {
|
|
22
22
|
process: ChildProcessWithoutNullStreams;
|
|
23
23
|
apiPort: string | undefined;
|
|
24
24
|
transport: SpeculosTransportHttp;
|
|
25
|
-
destroy: () =>
|
|
25
|
+
destroy: () => Promise<unknown>;
|
|
26
26
|
};
|
|
27
27
|
export declare function getMemorySpeculosDeviceInternal(id: string): SpeculosDeviceInternal | undefined;
|
|
28
28
|
export declare const modelMap: Record<string, DeviceModelId>;
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAe,8BAA8B,EAAE,MAAM,eAAe,CAAC;AAE5E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,qBAAqB,MAAM,2CAA2C,CAAC;AAC9E,OAAO,0BAA0B,MAAM,sCAAsC,CAAC;AAI9E,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,iBAAiB,CAAC;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,qBAAqB,GAAG,0BAA0B,CAAC;AAEnF,OAAO,EAAE,aAAa,EAAE,CAAC;AAEzB,MAAM,MAAM,sBAAsB,GAC9B;IACE,OAAO,EAAE,8BAA8B,CAAC;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,0BAA0B,CAAC;IACtC,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAe,8BAA8B,EAAE,MAAM,eAAe,CAAC;AAE5E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,qBAAqB,MAAM,2CAA2C,CAAC;AAC9E,OAAO,0BAA0B,MAAM,sCAAsC,CAAC;AAI9E,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,iBAAiB,CAAC;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,qBAAqB,GAAG,0BAA0B,CAAC;AAEnF,OAAO,EAAE,aAAa,EAAE,CAAC;AAEzB,MAAM,MAAM,sBAAsB,GAC9B;IACE,OAAO,EAAE,8BAA8B,CAAC;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,0BAA0B,CAAC;IACtC,OAAO,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;CACjC,GACD;IACE,OAAO,EAAE,8BAA8B,CAAC;IACxC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,SAAS,EAAE,qBAAqB,CAAC;IACjC,OAAO,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;CACjC,CAAC;AAON,wBAAgB,+BAA+B,CAAC,EAAE,EAAE,MAAM,GAAG,sBAAsB,GAAG,SAAS,CAE9F;AAED,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAKlD,CAAC;AAMF;;GAEG;AACH,wBAAsB,qBAAqB,CAAC,EAAE,EAAE,MAAM,iBAOrD;AAED;;GAEG;AACH,wBAAgB,uBAAuB,oBAEtC;AAmBD,QAAA,MAAM,QAAQ,cAAe,MAAM,wBAAwB,OAAO;;;;;;;;;;;;CAcjE,CAAC;AAWF,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,GAAG,EAAE;IACH,KAAK,EAAE,aAAa,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,UAAU,EAAE,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,MAAM,CAAC;IAEjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uBAAuB,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrE,EACD,QAAQ,SAAI,GACX,OAAO,CAAC,cAAc,CAAC,CAuMzB"}
|
package/lib/index.js
CHANGED
|
@@ -178,13 +178,13 @@ function createSpeculosDevice(arg_1) {
|
|
|
178
178
|
rejectReady = reject;
|
|
179
179
|
});
|
|
180
180
|
let destroyed = false;
|
|
181
|
-
const destroy = () => {
|
|
181
|
+
const destroy = () => __awaiter(this, void 0, void 0, function* () {
|
|
182
182
|
if (destroyed)
|
|
183
|
-
return;
|
|
183
|
+
return Promise.resolve();
|
|
184
184
|
destroyed = true;
|
|
185
|
-
new Promise((resolve, reject) => {
|
|
185
|
+
return new Promise((resolve, reject) => {
|
|
186
186
|
if (!data[speculosID])
|
|
187
|
-
return;
|
|
187
|
+
return resolve(undefined);
|
|
188
188
|
delete data[speculosID];
|
|
189
189
|
(0, child_process_1.exec)(`docker rm -f ${speculosID}`, (error, stdout, stderr) => {
|
|
190
190
|
if (error) {
|
|
@@ -197,14 +197,14 @@ function createSpeculosDevice(arg_1) {
|
|
|
197
197
|
}
|
|
198
198
|
});
|
|
199
199
|
});
|
|
200
|
-
};
|
|
200
|
+
});
|
|
201
201
|
p.stdout.on("data", data => {
|
|
202
202
|
if (data) {
|
|
203
203
|
(0, logs_1.log)("speculos-stdout", `${speculosID}: ${String(data).trim()}`);
|
|
204
204
|
}
|
|
205
205
|
});
|
|
206
206
|
let latestStderr;
|
|
207
|
-
p.stderr.on("data", data => {
|
|
207
|
+
p.stderr.on("data", (data) => __awaiter(this, void 0, void 0, function* () {
|
|
208
208
|
if (!data)
|
|
209
209
|
return;
|
|
210
210
|
latestStderr = data;
|
|
@@ -214,24 +214,24 @@ function createSpeculosDevice(arg_1) {
|
|
|
214
214
|
if (/using\s(?:SDK|API_LEVEL)/.test(data)) {
|
|
215
215
|
setTimeout(() => resolveReady(true), 500);
|
|
216
216
|
}
|
|
217
|
-
else if (data.includes("is already in use by
|
|
217
|
+
else if (data.includes("is already in use by")) {
|
|
218
218
|
rejectReady(new Error("speculos already in use! Try `ledger-live cleanSpeculos` or check logs"));
|
|
219
219
|
}
|
|
220
220
|
else if (data.includes("address already in use")) {
|
|
221
221
|
if (maxRetry > 0) {
|
|
222
222
|
(0, logs_1.log)("speculos", "retrying speculos connection");
|
|
223
|
-
destroy();
|
|
223
|
+
yield destroy();
|
|
224
224
|
resolveReady(false);
|
|
225
225
|
}
|
|
226
226
|
}
|
|
227
|
-
});
|
|
228
|
-
p.on("close", () => {
|
|
227
|
+
}));
|
|
228
|
+
p.on("close", () => __awaiter(this, void 0, void 0, function* () {
|
|
229
229
|
(0, logs_1.log)("speculos", `${speculosID} closed`);
|
|
230
230
|
if (!destroyed) {
|
|
231
|
-
destroy();
|
|
231
|
+
yield destroy();
|
|
232
232
|
rejectReady(new Error(`speculos process failure. ${latestStderr || ""}`));
|
|
233
233
|
}
|
|
234
|
-
});
|
|
234
|
+
}));
|
|
235
235
|
const hasSucceed = yield ready;
|
|
236
236
|
if (!hasSucceed) {
|
|
237
237
|
yield (0, live_promise_1.delay)(1000);
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib-es/index.d.ts
CHANGED
|
@@ -17,12 +17,12 @@ export type SpeculosDeviceInternal = {
|
|
|
17
17
|
buttonPort: number;
|
|
18
18
|
automationPort: number;
|
|
19
19
|
transport: SpeculosTransportWebsocket;
|
|
20
|
-
destroy: () =>
|
|
20
|
+
destroy: () => Promise<unknown>;
|
|
21
21
|
} | {
|
|
22
22
|
process: ChildProcessWithoutNullStreams;
|
|
23
23
|
apiPort: string | undefined;
|
|
24
24
|
transport: SpeculosTransportHttp;
|
|
25
|
-
destroy: () =>
|
|
25
|
+
destroy: () => Promise<unknown>;
|
|
26
26
|
};
|
|
27
27
|
export declare function getMemorySpeculosDeviceInternal(id: string): SpeculosDeviceInternal | undefined;
|
|
28
28
|
export declare const modelMap: Record<string, DeviceModelId>;
|
package/lib-es/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAe,8BAA8B,EAAE,MAAM,eAAe,CAAC;AAE5E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,qBAAqB,MAAM,2CAA2C,CAAC;AAC9E,OAAO,0BAA0B,MAAM,sCAAsC,CAAC;AAI9E,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,iBAAiB,CAAC;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,qBAAqB,GAAG,0BAA0B,CAAC;AAEnF,OAAO,EAAE,aAAa,EAAE,CAAC;AAEzB,MAAM,MAAM,sBAAsB,GAC9B;IACE,OAAO,EAAE,8BAA8B,CAAC;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,0BAA0B,CAAC;IACtC,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAe,8BAA8B,EAAE,MAAM,eAAe,CAAC;AAE5E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,qBAAqB,MAAM,2CAA2C,CAAC;AAC9E,OAAO,0BAA0B,MAAM,sCAAsC,CAAC;AAI9E,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,iBAAiB,CAAC;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,qBAAqB,GAAG,0BAA0B,CAAC;AAEnF,OAAO,EAAE,aAAa,EAAE,CAAC;AAEzB,MAAM,MAAM,sBAAsB,GAC9B;IACE,OAAO,EAAE,8BAA8B,CAAC;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,0BAA0B,CAAC;IACtC,OAAO,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;CACjC,GACD;IACE,OAAO,EAAE,8BAA8B,CAAC;IACxC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,SAAS,EAAE,qBAAqB,CAAC;IACjC,OAAO,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;CACjC,CAAC;AAON,wBAAgB,+BAA+B,CAAC,EAAE,EAAE,MAAM,GAAG,sBAAsB,GAAG,SAAS,CAE9F;AAED,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAKlD,CAAC;AAMF;;GAEG;AACH,wBAAsB,qBAAqB,CAAC,EAAE,EAAE,MAAM,iBAOrD;AAED;;GAEG;AACH,wBAAgB,uBAAuB,oBAEtC;AAmBD,QAAA,MAAM,QAAQ,cAAe,MAAM,wBAAwB,OAAO;;;;;;;;;;;;CAcjE,CAAC;AAWF,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,GAAG,EAAE;IACH,KAAK,EAAE,aAAa,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,UAAU,EAAE,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,MAAM,CAAC;IAEjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uBAAuB,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrE,EACD,QAAQ,SAAI,GACX,OAAO,CAAC,cAAc,CAAC,CAuMzB"}
|
package/lib-es/index.js
CHANGED
|
@@ -169,13 +169,13 @@ export function createSpeculosDevice(arg_1) {
|
|
|
169
169
|
rejectReady = reject;
|
|
170
170
|
});
|
|
171
171
|
let destroyed = false;
|
|
172
|
-
const destroy = () => {
|
|
172
|
+
const destroy = () => __awaiter(this, void 0, void 0, function* () {
|
|
173
173
|
if (destroyed)
|
|
174
|
-
return;
|
|
174
|
+
return Promise.resolve();
|
|
175
175
|
destroyed = true;
|
|
176
|
-
new Promise((resolve, reject) => {
|
|
176
|
+
return new Promise((resolve, reject) => {
|
|
177
177
|
if (!data[speculosID])
|
|
178
|
-
return;
|
|
178
|
+
return resolve(undefined);
|
|
179
179
|
delete data[speculosID];
|
|
180
180
|
exec(`docker rm -f ${speculosID}`, (error, stdout, stderr) => {
|
|
181
181
|
if (error) {
|
|
@@ -188,14 +188,14 @@ export function createSpeculosDevice(arg_1) {
|
|
|
188
188
|
}
|
|
189
189
|
});
|
|
190
190
|
});
|
|
191
|
-
};
|
|
191
|
+
});
|
|
192
192
|
p.stdout.on("data", data => {
|
|
193
193
|
if (data) {
|
|
194
194
|
log("speculos-stdout", `${speculosID}: ${String(data).trim()}`);
|
|
195
195
|
}
|
|
196
196
|
});
|
|
197
197
|
let latestStderr;
|
|
198
|
-
p.stderr.on("data", data => {
|
|
198
|
+
p.stderr.on("data", (data) => __awaiter(this, void 0, void 0, function* () {
|
|
199
199
|
if (!data)
|
|
200
200
|
return;
|
|
201
201
|
latestStderr = data;
|
|
@@ -205,24 +205,24 @@ export function createSpeculosDevice(arg_1) {
|
|
|
205
205
|
if (/using\s(?:SDK|API_LEVEL)/.test(data)) {
|
|
206
206
|
setTimeout(() => resolveReady(true), 500);
|
|
207
207
|
}
|
|
208
|
-
else if (data.includes("is already in use by
|
|
208
|
+
else if (data.includes("is already in use by")) {
|
|
209
209
|
rejectReady(new Error("speculos already in use! Try `ledger-live cleanSpeculos` or check logs"));
|
|
210
210
|
}
|
|
211
211
|
else if (data.includes("address already in use")) {
|
|
212
212
|
if (maxRetry > 0) {
|
|
213
213
|
log("speculos", "retrying speculos connection");
|
|
214
|
-
destroy();
|
|
214
|
+
yield destroy();
|
|
215
215
|
resolveReady(false);
|
|
216
216
|
}
|
|
217
217
|
}
|
|
218
|
-
});
|
|
219
|
-
p.on("close", () => {
|
|
218
|
+
}));
|
|
219
|
+
p.on("close", () => __awaiter(this, void 0, void 0, function* () {
|
|
220
220
|
log("speculos", `${speculosID} closed`);
|
|
221
221
|
if (!destroyed) {
|
|
222
|
-
destroy();
|
|
222
|
+
yield destroy();
|
|
223
223
|
rejectReady(new Error(`speculos process failure. ${latestStderr || ""}`));
|
|
224
224
|
}
|
|
225
|
-
});
|
|
225
|
+
}));
|
|
226
226
|
const hasSucceed = yield ready;
|
|
227
227
|
if (!hasSucceed) {
|
|
228
228
|
yield delay(1000);
|
package/lib-es/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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
|
|
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/speculos-transport",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.9-nightly.0",
|
|
4
4
|
"description": "Ledger Live speculos transport test helper",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Ledger"
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"types": "lib/index.d.ts",
|
|
19
19
|
"license": "Apache-2.0",
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@ledgerhq/live-env": "2.
|
|
21
|
+
"@ledgerhq/live-env": "2.5.0-nightly.0",
|
|
22
22
|
"@ledgerhq/live-promise": "0.1.0",
|
|
23
23
|
"@ledgerhq/logs": "6.12.0",
|
|
24
24
|
"@ledgerhq/devices": "8.4.4",
|
|
@@ -50,6 +50,7 @@
|
|
|
50
50
|
"build": "tsc && tsc -m ES6 --outDir lib-es",
|
|
51
51
|
"prewatch": "pnpm build",
|
|
52
52
|
"watch": "tsc --watch",
|
|
53
|
+
"watch:es": "tsc --watch -m ES6 --outDir lib-es",
|
|
53
54
|
"lint": "eslint ./src --no-error-on-unmatched-pattern --ext .ts,.tsx --cache",
|
|
54
55
|
"lint:fix": "pnpm lint --fix",
|
|
55
56
|
"typecheck": "tsc --noEmit",
|
package/src/index.ts
CHANGED
|
@@ -24,13 +24,13 @@ export type SpeculosDeviceInternal =
|
|
|
24
24
|
buttonPort: number;
|
|
25
25
|
automationPort: number;
|
|
26
26
|
transport: SpeculosTransportWebsocket;
|
|
27
|
-
destroy: () =>
|
|
27
|
+
destroy: () => Promise<unknown>;
|
|
28
28
|
}
|
|
29
29
|
| {
|
|
30
30
|
process: ChildProcessWithoutNullStreams;
|
|
31
31
|
apiPort: string | undefined;
|
|
32
32
|
transport: SpeculosTransportHttp;
|
|
33
|
-
destroy: () =>
|
|
33
|
+
destroy: () => Promise<unknown>;
|
|
34
34
|
};
|
|
35
35
|
|
|
36
36
|
// FIXME we need to figure out a better system, using a filesystem file?
|
|
@@ -235,11 +235,11 @@ export async function createSpeculosDevice(
|
|
|
235
235
|
});
|
|
236
236
|
let destroyed = false;
|
|
237
237
|
|
|
238
|
-
const destroy = () => {
|
|
239
|
-
if (destroyed) return;
|
|
238
|
+
const destroy = async () => {
|
|
239
|
+
if (destroyed) return Promise.resolve();
|
|
240
240
|
destroyed = true;
|
|
241
|
-
new Promise((resolve, reject) => {
|
|
242
|
-
if (!data[speculosID]) return;
|
|
241
|
+
return new Promise((resolve, reject) => {
|
|
242
|
+
if (!data[speculosID]) return resolve(undefined);
|
|
243
243
|
delete data[speculosID];
|
|
244
244
|
exec(`docker rm -f ${speculosID}`, (error, stdout, stderr) => {
|
|
245
245
|
if (error) {
|
|
@@ -259,7 +259,7 @@ export async function createSpeculosDevice(
|
|
|
259
259
|
}
|
|
260
260
|
});
|
|
261
261
|
let latestStderr: string | undefined;
|
|
262
|
-
p.stderr.on("data", data => {
|
|
262
|
+
p.stderr.on("data", async data => {
|
|
263
263
|
if (!data) return;
|
|
264
264
|
latestStderr = data;
|
|
265
265
|
|
|
@@ -269,23 +269,23 @@ export async function createSpeculosDevice(
|
|
|
269
269
|
|
|
270
270
|
if (/using\s(?:SDK|API_LEVEL)/.test(data)) {
|
|
271
271
|
setTimeout(() => resolveReady(true), 500);
|
|
272
|
-
} else if (data.includes("is already in use by
|
|
272
|
+
} else if (data.includes("is already in use by")) {
|
|
273
273
|
rejectReady(
|
|
274
274
|
new Error("speculos already in use! Try `ledger-live cleanSpeculos` or check logs"),
|
|
275
275
|
);
|
|
276
276
|
} else if (data.includes("address already in use")) {
|
|
277
277
|
if (maxRetry > 0) {
|
|
278
278
|
log("speculos", "retrying speculos connection");
|
|
279
|
-
destroy();
|
|
279
|
+
await destroy();
|
|
280
280
|
resolveReady(false);
|
|
281
281
|
}
|
|
282
282
|
}
|
|
283
283
|
});
|
|
284
|
-
p.on("close", () => {
|
|
284
|
+
p.on("close", async () => {
|
|
285
285
|
log("speculos", `${speculosID} closed`);
|
|
286
286
|
|
|
287
287
|
if (!destroyed) {
|
|
288
|
-
destroy();
|
|
288
|
+
await destroy();
|
|
289
289
|
rejectReady(new Error(`speculos process failure. ${latestStderr || ""}`));
|
|
290
290
|
}
|
|
291
291
|
});
|