appium-ios-device 3.1.13 → 3.1.14
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 +6 -0
- package/build/lib/afc/index.d.ts +1 -2
- package/build/lib/afc/index.d.ts.map +1 -1
- package/build/lib/afc/index.js +17 -4
- package/build/lib/afc/index.js.map +1 -1
- package/build/lib/house-arrest/index.d.ts +1 -2
- package/build/lib/house-arrest/index.d.ts.map +1 -1
- package/build/lib/house-arrest/index.js +1 -5
- package/build/lib/house-arrest/index.js.map +1 -1
- package/build/lib/imagemounter/index.d.ts.map +1 -1
- package/build/lib/imagemounter/index.js +2 -6
- package/build/lib/imagemounter/index.js.map +1 -1
- package/build/lib/plist-service/index.d.ts.map +1 -1
- package/build/lib/plist-service/index.js +26 -9
- package/build/lib/plist-service/index.js.map +1 -1
- package/build/lib/ssl-helper.d.ts.map +1 -1
- package/build/lib/ssl-helper.js +33 -9
- package/build/lib/ssl-helper.js.map +1 -1
- package/build/lib/usbmux/index.d.ts +2 -3
- package/build/lib/usbmux/index.d.ts.map +1 -1
- package/build/lib/usbmux/index.js +44 -8
- package/build/lib/usbmux/index.js.map +1 -1
- package/build/lib/xctest.d.ts.map +1 -1
- package/build/lib/xctest.js +22 -7
- package/build/lib/xctest.js.map +1 -1
- package/lib/afc/index.js +17 -4
- package/lib/house-arrest/index.js +1 -2
- package/lib/imagemounter/index.js +2 -3
- package/lib/plist-service/index.js +26 -6
- package/lib/ssl-helper.js +37 -9
- package/lib/usbmux/index.js +49 -11
- package/lib/xctest.js +22 -4
- package/package.json +1 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## [3.1.14](https://github.com/appium/appium-ios-device/compare/v3.1.13...v3.1.14) (2026-05-09)
|
|
2
|
+
|
|
3
|
+
### Miscellaneous Chores
|
|
4
|
+
|
|
5
|
+
* Ditch bluebird ([#225](https://github.com/appium/appium-ios-device/issues/225)) ([e6fc649](https://github.com/appium/appium-ios-device/commit/e6fc6492f367488ea3597ffffacdbd0afe0ff40c))
|
|
6
|
+
|
|
1
7
|
## [3.1.13](https://github.com/appium/appium-ios-device/compare/v3.1.12...v3.1.13) (2026-05-08)
|
|
2
8
|
|
|
3
9
|
### Bug Fixes
|
package/build/lib/afc/index.d.ts
CHANGED
|
@@ -85,7 +85,7 @@ export class AfcService extends BaseServiceSocket {
|
|
|
85
85
|
_parseObject(buffer: any): {};
|
|
86
86
|
_createPacketPromise(message: any, timeout?: number): {
|
|
87
87
|
packetNumber: number;
|
|
88
|
-
response:
|
|
88
|
+
response: Promise<any>;
|
|
89
89
|
};
|
|
90
90
|
}
|
|
91
91
|
export default AfcService;
|
|
@@ -113,5 +113,4 @@ declare class FileInfo {
|
|
|
113
113
|
isDirectory(): boolean;
|
|
114
114
|
isFile(): boolean;
|
|
115
115
|
}
|
|
116
|
-
import B from 'bluebird';
|
|
117
116
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/afc/index.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/afc/index.js"],"names":[],"mappings":"AAWA,+BAAgC,eAAe,CAAC;AA2BhD;IACE,+BAsBC;IAnBC,+BAOE;IACF,qBAAgC;IAGhC,qBAAgC;IAIhC,uBAA4B;IAE5B,sBAAsB;IAIxB,6BAGC;IAED;;;OAGG;IACH,sBAFW,MAAM,iBAahB;IAED;;;OAGG;IACH,sBAFW,MAAM,iBAahB;IAED;;;;OAIG;IACH,oBAHW,MAAM,GACL,OAAO,CAAC,MAAM,EAAE,CAAC,CAiB5B;IAED;;;;;OAKG;IACH,eAJW,MAAM,QACN,MAAM,GACL,OAAO,CAAC,MAAM,CAAC,CAqB1B;IAED;;;;;OAKG;IACH,4BAJW,MAAM,cAEL,OAAO,CAAC,qBAAqB,CAAC,CAKzC;IAED;;;;;OAKG;IACH,2BAJW,MAAM,iBAEL,OAAO,CAAC,qBAAqB,CAAC,CAKzC;IAED;;;OAGG;IACH,4BAFW,MAAM,iBAgBhB;IAED;;;;OAIG;IACH,sBAHW,MAAM,UACN,MAAM,iBAmBhB;IAED;;;;;OAKG;IACH,qBAJW,MAAM,UACN,MAAM,GACL,OAAO,CAAC,MAAM,CAAC,CAsB1B;IAED;;;;OAIG;IACH,kBAHW,MAAM,GACL,OAAO,CAAC,QAAQ,CAAC,CAiB5B;IAED;;;;OAIG;IAEH;;;;;OAKG;IACH,aAJW,MAAM,aACN,OAAO,qBAPP,MAAM,eACN,OAAO,yBAsBjB;IAED,6BAUC;IAED,gCAaC;IAED,8BAsBC;IAED;;;MA2BC;CACF;;kCA7W+B,iBAAiB;oCARf,2CAA2C;2BAIpD,0BAA0B;2BAD1B,0BAA0B;sCADQ,WAAW;sCAAX,WAAW;AAetE;IACE;;;;;;;OASC;IARC,aAAiC;IACjC,eAAqC;IACrC,cAAmC;IACnC,UAAmB;IAEnB,gBAA+C;IAE/C,oBAAuD;IAGzD,uBAEC;IAED,kBAEC;CACF"}
|
package/build/lib/afc/index.js
CHANGED
|
@@ -10,7 +10,6 @@ const streams_1 = require("./streams");
|
|
|
10
10
|
const afcencoder_1 = require("./transformer/afcencoder");
|
|
11
11
|
const afcdecoder_1 = require("./transformer/afcdecoder");
|
|
12
12
|
const constants_1 = require("../constants");
|
|
13
|
-
const bluebird_1 = __importDefault(require("bluebird"));
|
|
14
13
|
const node_path_1 = __importDefault(require("node:path"));
|
|
15
14
|
const lodash_1 = __importDefault(require("lodash"));
|
|
16
15
|
const base_service_1 = require("../base-service");
|
|
@@ -308,11 +307,25 @@ class AfcService extends base_service_1.BaseServiceSocket {
|
|
|
308
307
|
}
|
|
309
308
|
_createPacketPromise(message, timeout = 10000) {
|
|
310
309
|
const packetNumber = this._packetNumber++;
|
|
311
|
-
const response = new
|
|
312
|
-
|
|
313
|
-
setTimeout(
|
|
310
|
+
const response = new Promise((resolve, reject) => {
|
|
311
|
+
let isSettled = false;
|
|
312
|
+
const timeoutHandler = setTimeout(() => {
|
|
313
|
+
if (isSettled) {
|
|
314
|
+
return;
|
|
315
|
+
}
|
|
316
|
+
isSettled = true;
|
|
317
|
+
delete this._responseCallbacks[packetNumber];
|
|
314
318
|
reject(new Error(`Could not finish the operation '${message}'. Failed to receive any data within the ${timeout}ms timeout`));
|
|
315
319
|
}, timeout);
|
|
320
|
+
this._responseCallbacks[packetNumber] = (data) => {
|
|
321
|
+
if (isSettled) {
|
|
322
|
+
return;
|
|
323
|
+
}
|
|
324
|
+
isSettled = true;
|
|
325
|
+
clearTimeout(timeoutHandler);
|
|
326
|
+
delete this._responseCallbacks[packetNumber];
|
|
327
|
+
resolve(data);
|
|
328
|
+
};
|
|
316
329
|
});
|
|
317
330
|
return { packetNumber, response };
|
|
318
331
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/afc/index.js"],"names":[],"mappings":";;;;;;AAAA,qFAA8E;AAC9E,yCAAmF;AACnF,uCAAuE;AACvE,yDAAoD;AACpD,yDAAoD;AACpD,4CAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/afc/index.js"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ export class HouseArrestService extends BaseServiceSocket {
|
|
|
18
18
|
* @returns {Promise<AfcService>}
|
|
19
19
|
*/
|
|
20
20
|
vendDocuments(bundleId: string): Promise<AfcService>;
|
|
21
|
-
_receivePlistPromise(timeout?: number):
|
|
21
|
+
_receivePlistPromise(timeout?: number): Promise<any>;
|
|
22
22
|
}
|
|
23
23
|
export default HouseArrestService;
|
|
24
24
|
import { BaseServiceSocket } from '../base-service';
|
|
@@ -26,5 +26,4 @@ import { PlistServiceDecoder } from '../plist-service/transformer/plist-service-
|
|
|
26
26
|
import { LengthBasedSplitter } from '../util/transformer/length-based-splitter';
|
|
27
27
|
import { PlistServiceEncoder } from '../plist-service/transformer/plist-service-encoder';
|
|
28
28
|
import { AfcService } from '../afc';
|
|
29
|
-
import B from 'bluebird';
|
|
30
29
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/house-arrest/index.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/house-arrest/index.js"],"names":[],"mappings":"AAQA,wCAAyC,+BAA+B,CAAC;AAGzE;IACE,+BAiBC;IAdC,8BAAyC;IACzC,+BAOE;IAGF,8BAAyC;IAK3C;;;;;OAKG;IACH,wBAJW,MAAM,GAEJ,OAAO,CAAC,UAAU,CAAC,CAe/B;IAED;;;;;OAKG;IACH,wBAJW,MAAM,GAEJ,OAAO,CAAC,UAAU,CAAC,CAe/B;IAED,qDAQC;CACF;;kCA7E+B,iBAAiB;oCALf,oDAAoD;oCAEpD,2CAA2C;oCAD3C,oDAAoD;2BAG7D,QAAQ"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.HouseArrestService = exports.HOUSE_ARREST_SERVICE_NAME = void 0;
|
|
7
4
|
const plist_service_decoder_1 = require("../plist-service/transformer/plist-service-decoder");
|
|
@@ -9,7 +6,6 @@ const plist_service_encoder_1 = require("../plist-service/transformer/plist-serv
|
|
|
9
6
|
const length_based_splitter_1 = require("../util/transformer/length-based-splitter");
|
|
10
7
|
const constants_1 = require("../constants");
|
|
11
8
|
const afc_1 = require("../afc");
|
|
12
|
-
const bluebird_1 = __importDefault(require("bluebird"));
|
|
13
9
|
const base_service_1 = require("../base-service");
|
|
14
10
|
const utilities_1 = require("../utilities");
|
|
15
11
|
exports.HOUSE_ARREST_SERVICE_NAME = 'com.apple.mobile.house_arrest';
|
|
@@ -72,7 +68,7 @@ class HouseArrestService extends base_service_1.BaseServiceSocket {
|
|
|
72
68
|
return new afc_1.AfcService(this._socketClient);
|
|
73
69
|
}
|
|
74
70
|
_receivePlistPromise(timeout = 10000) {
|
|
75
|
-
return new
|
|
71
|
+
return new Promise((resolve, reject) => {
|
|
76
72
|
this._decoder.once('data', resolve);
|
|
77
73
|
setTimeout(() => reject(new Error(`Failed to receive any data within the timeout: ${timeout}`)), timeout);
|
|
78
74
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/house-arrest/index.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/house-arrest/index.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/imagemounter/index.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/imagemounter/index.js"],"names":[],"mappings":"AAKA,gDAAiD,uCAAuC,CAAC;AAIzF;IACE;;;;OAIG;IACH,mBAHW,MAAM,GACJ,OAAO,CAAC,MAAM,EAAE,CAAC,CAQ7B;IAED;;OAEG;IACH,4CAEC;IAED;;;;;OAKG;IACH,qBAJW,MAAM,0BACN,MAAM,cACN,MAAM,iBA+DhB;CACF;iCAlG8B,iBAAiB"}
|
|
@@ -1,12 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.ImageMounter = exports.MOBILE_IMAGE_MOUNTER_SERVICE_NAME = void 0;
|
|
7
4
|
const base_service_1 = require("../base-service");
|
|
8
5
|
const support_1 = require("@appium/support");
|
|
9
|
-
const bluebird_1 = __importDefault(require("bluebird"));
|
|
10
6
|
const logger_1 = require("../logger");
|
|
11
7
|
const { lstat, readFile, createReadStream } = support_1.fs;
|
|
12
8
|
exports.MOBILE_IMAGE_MOUNTER_SERVICE_NAME = 'com.apple.mobile.mobile_image_mounter';
|
|
@@ -39,7 +35,7 @@ class ImageMounter extends base_service_1.BaseServicePlist {
|
|
|
39
35
|
*/
|
|
40
36
|
async mount(imageFilePath, imageSignatureFilePath, imageType = 'Developer') {
|
|
41
37
|
//check file stats
|
|
42
|
-
const [imageFileStat] = await
|
|
38
|
+
const [imageFileStat] = await Promise.all([
|
|
43
39
|
assertIsFile(imageFilePath, FILE_TYPE_IMAGE),
|
|
44
40
|
assertIsFile(imageSignatureFilePath, FILE_TYPE_SIGNATURE),
|
|
45
41
|
]);
|
|
@@ -65,7 +61,7 @@ class ImageMounter extends base_service_1.BaseServicePlist {
|
|
|
65
61
|
//push image to device
|
|
66
62
|
const stream = createReadStream(imageFilePath);
|
|
67
63
|
try {
|
|
68
|
-
await new
|
|
64
|
+
await new Promise((resolve, reject) => {
|
|
69
65
|
stream.on('end', resolve);
|
|
70
66
|
stream.on('error', reject);
|
|
71
67
|
stream.on('data', async (data) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/imagemounter/index.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/imagemounter/index.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/plist-service/index.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/plist-service/index.js"],"names":[],"mappings":"AAYA;IACE,+BAoBC;IAjBC,8BAAyC;IACzC,+BAOE;IAGF,8BAAyC;IAIzC,kBAAoB;IAItB,+DAGC;IAED,2BAKC;IAED,6CA0CC;IAED,kEAMC;CACF;;kCA9F+B,iBAAiB;oCAFf,qCAAqC;oCACrC,2CAA2C;oCAF3C,qCAAqC"}
|
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.PlistService = void 0;
|
|
7
|
-
const bluebird_1 = __importDefault(require("bluebird"));
|
|
8
4
|
const ssl_helper_1 = require("../ssl-helper");
|
|
9
5
|
const plist_service_encoder_1 = require("./transformer/plist-service-encoder");
|
|
10
6
|
const plist_service_decoder_1 = require("./transformer/plist-service-decoder");
|
|
@@ -44,23 +40,44 @@ class PlistService extends base_service_1.BaseServiceSocket {
|
|
|
44
40
|
this._encoder.write(json);
|
|
45
41
|
}
|
|
46
42
|
async receivePlist(timeout = 5000) {
|
|
47
|
-
return await new
|
|
43
|
+
return await new Promise((resolve, reject) => {
|
|
44
|
+
let isSettled = false;
|
|
48
45
|
const queue = this.replyQueue;
|
|
46
|
+
let checkExist;
|
|
47
|
+
let timeoutHandler;
|
|
48
|
+
const cleanup = () => {
|
|
49
|
+
if (checkExist) {
|
|
50
|
+
clearInterval(checkExist);
|
|
51
|
+
}
|
|
52
|
+
if (timeoutHandler) {
|
|
53
|
+
clearTimeout(timeoutHandler);
|
|
54
|
+
}
|
|
55
|
+
};
|
|
49
56
|
const data = queue.shift();
|
|
50
57
|
if (data) {
|
|
58
|
+
isSettled = true;
|
|
59
|
+
cleanup();
|
|
51
60
|
resolve(data);
|
|
52
61
|
return;
|
|
53
62
|
}
|
|
54
|
-
|
|
63
|
+
checkExist = setInterval(() => {
|
|
64
|
+
if (isSettled) {
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
55
67
|
const data = queue.shift();
|
|
56
68
|
if (!data) {
|
|
57
69
|
return;
|
|
58
70
|
}
|
|
59
|
-
|
|
71
|
+
isSettled = true;
|
|
72
|
+
cleanup();
|
|
60
73
|
resolve(data);
|
|
61
74
|
}, CHECK_FREQ_MS);
|
|
62
|
-
setTimeout(() => {
|
|
63
|
-
|
|
75
|
+
timeoutHandler = setTimeout(() => {
|
|
76
|
+
if (isSettled) {
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
isSettled = true;
|
|
80
|
+
cleanup();
|
|
64
81
|
reject(new Error(`Failed to receive any data within the timeout: ${timeout}`));
|
|
65
82
|
}, timeout);
|
|
66
83
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/plist-service/index.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/plist-service/index.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssl-helper.d.ts","sourceRoot":"","sources":["../../lib/ssl-helper.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ssl-helper.d.ts","sourceRoot":"","sources":["../../lib/ssl-helper.js"],"names":[],"mappings":"AAKA;;;;;;GAMG;AACH,qCALW,OAAO,KAAK,EAAE,MAAM,OACpB,MAAM,GAAC,MAAM,QACb,MAAM,GAAC,MAAM,GACX,OAAO,UAAU,EAAE,SAAS,CAUxC;AAED;;;;;;GAMG;AACH,0EAFa,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CA2DlC"}
|
package/build/lib/ssl-helper.js
CHANGED
|
@@ -7,7 +7,6 @@ exports.upgradeToSSL = upgradeToSSL;
|
|
|
7
7
|
exports.enableSSLHandshakeOnly = enableSSLHandshakeOnly;
|
|
8
8
|
const node_tls_1 = __importDefault(require("node:tls"));
|
|
9
9
|
const node_net_1 = __importDefault(require("node:net"));
|
|
10
|
-
const bluebird_1 = __importDefault(require("bluebird"));
|
|
11
10
|
const HANDSHAKE_TIMEOUT_MS = 10000;
|
|
12
11
|
/**
|
|
13
12
|
* Wraps an existing socket in a TLS socket.
|
|
@@ -42,19 +41,44 @@ async function enableSSLHandshakeOnly(socket, key, cert) {
|
|
|
42
41
|
rejectUnauthorized: false,
|
|
43
42
|
});
|
|
44
43
|
// stop receiving data after successful handshake
|
|
45
|
-
await new
|
|
44
|
+
await new Promise((resolve, reject) => {
|
|
45
|
+
let isSettled = false;
|
|
46
|
+
const cleanup = () => {
|
|
47
|
+
clearTimeout(timeoutHandler);
|
|
48
|
+
sslSocket.off('secureConnect', onSecureConnect);
|
|
49
|
+
sslSocket.off('error', onError);
|
|
50
|
+
};
|
|
51
|
+
const onError = (err) => {
|
|
52
|
+
if (isSettled) {
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
isSettled = true;
|
|
56
|
+
cleanup();
|
|
57
|
+
reject(err);
|
|
58
|
+
};
|
|
59
|
+
const onSecureConnect = () => {
|
|
60
|
+
if (isSettled) {
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
isSettled = true;
|
|
64
|
+
cleanup();
|
|
65
|
+
// @ts-ignore This is a hack
|
|
66
|
+
sslSocket._handle.readStop();
|
|
67
|
+
resolve(undefined);
|
|
68
|
+
};
|
|
46
69
|
const timeoutHandler = setTimeout(() => {
|
|
70
|
+
if (isSettled) {
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
isSettled = true;
|
|
74
|
+
cleanup();
|
|
47
75
|
if (!sslSocket.destroyed) {
|
|
48
76
|
sslSocket.end();
|
|
49
77
|
}
|
|
50
|
-
|
|
78
|
+
reject(new Error('ssl handshake error'));
|
|
51
79
|
}, HANDSHAKE_TIMEOUT_MS);
|
|
52
|
-
sslSocket.once('secureConnect',
|
|
53
|
-
|
|
54
|
-
// @ts-ignore This is a hack
|
|
55
|
-
sslSocket._handle.readStop();
|
|
56
|
-
return resolve();
|
|
57
|
-
});
|
|
80
|
+
sslSocket.once('secureConnect', onSecureConnect);
|
|
81
|
+
sslSocket.once('error', onError);
|
|
58
82
|
});
|
|
59
83
|
// Duplicate the socket. Return a new socket object connected to the same system resource
|
|
60
84
|
return new node_net_1.default.Socket({ fd: socket._handle.fd });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssl-helper.js","sourceRoot":"","sources":["../../lib/ssl-helper.js"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"ssl-helper.js","sourceRoot":"","sources":["../../lib/ssl-helper.js"],"names":[],"mappings":";;;;;AAYA,oCAQC;AASD,wDAyDC;AAtFD,wDAA2B;AAC3B,wDAA2B;AAE3B,MAAM,oBAAoB,GAAG,KAAK,CAAC;AAEnC;;;;;;GAMG;AACH,SAAgB,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI;IAC5C,OAAO,IAAI,kBAAG,CAAC,SAAS,CAAC,MAAM,EAAE;QAC/B,kBAAkB,EAAE,KAAK;QACzB,aAAa,EAAE,kBAAG,CAAC,mBAAmB,CAAC;YACrC,GAAG;YACH,IAAI;SACL,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,sBAAsB,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI;IAC5D,MAAM,SAAS,GAAG,kBAAG,CAAC,OAAO,CAAC;QAC5B,MAAM;QACN,aAAa,EAAE,kBAAG,CAAC,mBAAmB,CAAC;YACrC,GAAG;YACH,IAAI;SACL,CAAC;QACF,kBAAkB,EAAE,KAAK;KAC1B,CAAC,CAAC;IAEH,iDAAiD;IACjD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACpC,IAAI,SAAS,GAAG,KAAK,CAAC;QAEtB,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,YAAY,CAAC,cAAc,CAAC,CAAC;YAC7B,SAAS,CAAC,GAAG,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;YAChD,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAClC,CAAC,CAAC;QAEF,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,EAAE;YACtB,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO;YACT,CAAC;YACD,SAAS,GAAG,IAAI,CAAC;YACjB,OAAO,EAAE,CAAC;YACV,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC;QAEF,MAAM,eAAe,GAAG,GAAG,EAAE;YAC3B,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO;YACT,CAAC;YACD,SAAS,GAAG,IAAI,CAAC;YACjB,OAAO,EAAE,CAAC;YACV,4BAA4B;YAC5B,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YAC7B,OAAO,CAAC,SAAS,CAAC,CAAC;QACrB,CAAC,CAAC;QAEF,MAAM,cAAc,GAAG,UAAU,CAAC,GAAG,EAAE;YACrC,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO;YACT,CAAC;YACD,SAAS,GAAG,IAAI,CAAC;YACjB,OAAO,EAAE,CAAC;YACV,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;gBACzB,SAAS,CAAC,GAAG,EAAE,CAAC;YAClB,CAAC;YACD,MAAM,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;QAC3C,CAAC,EAAE,oBAAoB,CAAC,CAAC;QAEzB,SAAS,CAAC,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;QACjD,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IACH,yFAAyF;IACzF,OAAO,IAAI,kBAAG,CAAC,MAAM,CAAC,EAAC,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,EAAC,CAAC,CAAC;AACjD,CAAC"}
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
* @param {SocketOptions} opts
|
|
13
13
|
* @throws {Error} If there was an error while accessing the socket or
|
|
14
14
|
* a connection error happened
|
|
15
|
-
* @throws {
|
|
15
|
+
* @throws {Error} if connection timeout happened
|
|
16
16
|
* @returns {Promise<NodeJS.Socket>} Connected socket instance
|
|
17
17
|
*/
|
|
18
18
|
export function getDefaultSocket(opts?: SocketOptions): Promise<NodeJS.Socket>;
|
|
@@ -40,7 +40,7 @@ export class Usbmux extends BaseServiceSocket {
|
|
|
40
40
|
_sendPlist(json: any): void;
|
|
41
41
|
_receivePlistPromise(timeout: number | undefined, responseCallback: any): {
|
|
42
42
|
tag: number;
|
|
43
|
-
receivePromise:
|
|
43
|
+
receivePromise: Promise<any>;
|
|
44
44
|
};
|
|
45
45
|
/**
|
|
46
46
|
* Lists all devices connected to the host
|
|
@@ -95,7 +95,6 @@ import { BaseServiceSocket } from '../base-service';
|
|
|
95
95
|
import { UsbmuxDecoder } from './transformer/usbmux-decoder.js';
|
|
96
96
|
import { LengthBasedSplitter } from '../util/transformer/length-based-splitter';
|
|
97
97
|
import { UsbmuxEncoder } from './transformer/usbmux-encoder.js';
|
|
98
|
-
import B from 'bluebird';
|
|
99
98
|
import { Lockdown } from '../lockdown';
|
|
100
99
|
import net from 'node:net';
|
|
101
100
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/usbmux/index.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/usbmux/index.js"],"names":[],"mappings":"AAwPA;;;;;;;GAOG;AAEH;;;;;;;;GAQG;AACH,wCANW,aAAa,GAIX,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAuFlC;AAvTD;IACE,+BAqBC;IAlBC,wBAAmC;IACnC,+BAOE;IAGF,wBAAmC;IAInC,aAAa;IACb,uBAA4B;IAI9B,6BAGC;IAED;;;;OAIG;IACH,mBAHW,MAAM,GACJ,OAAO,CAAC,MAAM,CAAC,CAoB3B;IAED;;;;;OAKG;IACH,qBAJW,MAAM,YACN,MAAM,GACJ,OAAO,CAAC,GAAG,OAAC,CAAC,CAwBzB;IAED,4BAEC;IAED;;;MA4BC;IAED;;;;OAIG;IACH,sBAHW,MAAM,GACJ,OAAO,CAAC,GAAG,EAAE,CAAC,CAoB1B;IAED;;;;;OAKG;IACH,iBAJW,MAAM,YACN,MAAM,GACJ,OAAO,CAAC,GAAG,OAAC,CAAC,CAKzB;IAED;;;;;OAKG;IACH,sBAJW,MAAM,YACN,MAAM,GACJ,OAAO,CAAC,QAAQ,CAAC,CAS7B;IAED;;;;;;OAMG;IACH,kBALW,MAAM,QACN,MAAM,YACN,MAAM,GACJ,OAAO,CAAC,GAAG,CAAC,MAAM,MAAO,CAAC,CA+BtC;CACF;;;;;;;;;;;;;;;;;;;;;kCA3O+B,iBAAiB;8BALrB,iCAAiC;oCAD3B,2CAA2C;8BAEjD,iCAAiC;yBAGvB,aAAa;gBAVnC,UAAU"}
|
|
@@ -8,7 +8,7 @@ exports.getDefaultSocket = getDefaultSocket;
|
|
|
8
8
|
const node_net_1 = __importDefault(require("node:net"));
|
|
9
9
|
const node_os_1 = __importDefault(require("node:os"));
|
|
10
10
|
const lodash_1 = __importDefault(require("lodash"));
|
|
11
|
-
const
|
|
11
|
+
const asyncbox_1 = require("asyncbox");
|
|
12
12
|
const support_1 = require("@appium/support");
|
|
13
13
|
const length_based_splitter_1 = require("../util/transformer/length-based-splitter");
|
|
14
14
|
const usbmux_decoder_js_1 = require("./transformer/usbmux-decoder.js");
|
|
@@ -121,8 +121,23 @@ class Usbmux extends base_service_1.BaseServiceSocket {
|
|
|
121
121
|
}
|
|
122
122
|
_receivePlistPromise(timeout = 5000, responseCallback) {
|
|
123
123
|
const tag = this._tag++;
|
|
124
|
-
const receivePromise = new
|
|
124
|
+
const receivePromise = new Promise((resolve, reject) => {
|
|
125
|
+
let isSettled = false;
|
|
126
|
+
const timeoutHandler = setTimeout(() => {
|
|
127
|
+
if (isSettled) {
|
|
128
|
+
return;
|
|
129
|
+
}
|
|
130
|
+
isSettled = true;
|
|
131
|
+
delete this._responseCallbacks[tag];
|
|
132
|
+
reject(new Error(`Failed to receive any data within the timeout: ${timeout}`));
|
|
133
|
+
}, timeout);
|
|
125
134
|
this._responseCallbacks[tag] = (data) => {
|
|
135
|
+
if (isSettled) {
|
|
136
|
+
return;
|
|
137
|
+
}
|
|
138
|
+
isSettled = true;
|
|
139
|
+
clearTimeout(timeoutHandler);
|
|
140
|
+
delete this._responseCallbacks[tag];
|
|
126
141
|
try {
|
|
127
142
|
resolve(responseCallback(data));
|
|
128
143
|
}
|
|
@@ -130,7 +145,6 @@ class Usbmux extends base_service_1.BaseServiceSocket {
|
|
|
130
145
|
reject(e);
|
|
131
146
|
}
|
|
132
147
|
};
|
|
133
|
-
setTimeout(() => reject(new Error(`Failed to receive any data within the timeout: ${timeout}`)), timeout);
|
|
134
148
|
});
|
|
135
149
|
return { tag, receivePromise };
|
|
136
150
|
}
|
|
@@ -233,7 +247,7 @@ exports.Usbmux = Usbmux;
|
|
|
233
247
|
* @param {SocketOptions} opts
|
|
234
248
|
* @throws {Error} If there was an error while accessing the socket or
|
|
235
249
|
* a connection error happened
|
|
236
|
-
* @throws {
|
|
250
|
+
* @throws {Error} if connection timeout happened
|
|
237
251
|
* @returns {Promise<NodeJS.Socket>} Connected socket instance
|
|
238
252
|
*/
|
|
239
253
|
async function getDefaultSocket(opts = {}) {
|
|
@@ -280,10 +294,32 @@ async function getDefaultSocket(opts = {}) {
|
|
|
280
294
|
else {
|
|
281
295
|
socket = node_net_1.default.createConnection(socketPort, socketHost);
|
|
282
296
|
}
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
297
|
+
const timeoutMs = timeout ?? 5000;
|
|
298
|
+
/** @type {(err: Error) => void} */
|
|
299
|
+
let onError = lodash_1.default.noop;
|
|
300
|
+
/** @type {() => void} */
|
|
301
|
+
let onConnect = lodash_1.default.noop;
|
|
302
|
+
const connectPromise = new Promise((resolve, reject) => {
|
|
303
|
+
onError = (err) => reject(err);
|
|
304
|
+
onConnect = () => resolve(socket);
|
|
305
|
+
socket.once('error', onError);
|
|
306
|
+
socket.once('connect', onConnect);
|
|
307
|
+
});
|
|
308
|
+
try {
|
|
309
|
+
return await (0, asyncbox_1.withTimeout)(connectPromise, timeoutMs, new Error(`Failed to connect to usbmuxd within the ${timeoutMs}ms timeout`));
|
|
310
|
+
}
|
|
311
|
+
catch (err) {
|
|
312
|
+
if (!socket.destroyed) {
|
|
313
|
+
// Avoid an unhandled 'error' event if ECONNRESET is emitted during destroy
|
|
314
|
+
socket.once('error', lodash_1.default.noop);
|
|
315
|
+
socket.destroy();
|
|
316
|
+
}
|
|
317
|
+
throw err;
|
|
318
|
+
}
|
|
319
|
+
finally {
|
|
320
|
+
socket.off('error', onError);
|
|
321
|
+
socket.off('connect', onConnect);
|
|
322
|
+
}
|
|
287
323
|
}
|
|
288
324
|
function swap16(val) {
|
|
289
325
|
return ((val & 0xff) << 8) | ((val >> 8) & 0xff);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/usbmux/index.js"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/usbmux/index.js"],"names":[],"mappings":";;;;;;AA0QA,4CAqFC;AA/VD,wDAA2B;AAC3B,sDAAyB;AACzB,oDAAuB;AACvB,uCAAqC;AACrC,6CAA0C;AAC1C,qFAA8E;AAC9E,uEAA8D;AAC9D,uEAA8D;AAC9D,0DAA6B;AAC7B,oDAA8C;AAC9C,0CAAoD;AACpD,kDAAkD;AAClD,4CAA+C;AAC/C,4CAAgC;AAChC,sCAA8B;AAE9B,MAAM,cAAc,GAAG,CAAC,GAAG,cAAE,CAAC;AAE9B,MAAM,aAAa,GAAG;IACpB,EAAE,EAAE,CAAC;IACL,UAAU,EAAE,CAAC;IACb,MAAM,EAAE,CAAC;IACT,WAAW,EAAE,CAAC;CACf,CAAC;AAEF,IAAI,IAAI,EAAE,OAAO,CAAC;AAClB,IAAI,CAAC;IACH,mDAAmD;IACnD,CAAC,EAAC,IAAI,EAAE,OAAO,EAAC,GAAG,OAAO,CAAC,mBAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;AACzF,CAAC;AAAC,MAAM,CAAC;IACP,8BAA8B;IAC9B,CAAC,EAAC,IAAI,EAAE,OAAO,EAAC,GAAG,OAAO,CAAC,mBAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;AACnF,CAAC;AAED,MAAM,sBAAsB,GAAG,kBAAkB,CAAC;AAClD,MAAM,oBAAoB,GAAG,KAAK,CAAC;AACnC,MAAM,oBAAoB,GAAG,WAAW,CAAC;AACzC,MAAM,SAAS,GAAG,IAAI,CAAC;AACvB,MAAM,qBAAqB,GAAG,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC;AAEnD,MAAa,MAAO,SAAQ,gCAAiB;IAC3C,YAAY,YAAY;QACtB,KAAK,CAAC,YAAY,CAAC,CAAC;QAEpB,IAAI,CAAC,QAAQ,GAAG,IAAI,iCAAa,EAAE,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,IAAI,2CAAmB,CAAC;YACvC,cAAc,EAAE,YAAY;YAC5B,YAAY,EAAE,IAAI;YAClB,cAAc,EAAE,IAAA,6BAAiB,EAAC,cAAc,CAAC;YACjD,iBAAiB,EAAE,CAAC;YACpB,iBAAiB,EAAE,CAAC;YACpB,gBAAgB,EAAE,CAAC;SACpB,CAAC,CAAC;QACH,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE5D,IAAI,CAAC,QAAQ,GAAG,IAAI,iCAAa,EAAE,CAAC;QACpC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACvC,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEjD,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;QACd,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;QAC7B,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,WAAW,CAAC,IAAI;QACd,MAAM,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,gBAAC,CAAC,IAAI,CAAC;QAC9D,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,wDAAwD;IACpE,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,QAAQ,CAAC,OAAO,GAAG,IAAI;QAC3B,MAAM,EAAC,GAAG,EAAE,cAAc,EAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACxE,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBACtB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;YAC3B,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC;YACd,GAAG;YACH,OAAO,EAAE;gBACP,WAAW,EAAE,UAAU;gBACvB,QAAQ,EAAE,SAAS;gBACnB,mBAAmB,EAAE,qBAAqB;aAC3C;SACF,CAAC,CAAC;QAEH,OAAO,MAAM,cAAc,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;QACvC,MAAM,EAAC,GAAG,EAAE,cAAc,EAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACxE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;gBACjC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,IAAI,CAAC;gBACH,OAAO,eAAK,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YACvD,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC;YACd,GAAG;YACH,OAAO,EAAE;gBACP,WAAW,EAAE,gBAAgB;gBAC7B,YAAY,EAAE,IAAI;gBAClB,QAAQ,EAAE,SAAS;gBACnB,mBAAmB,EAAE,qBAAqB;aAC3C;SACF,CAAC,CAAC;QACH,OAAO,MAAM,cAAc,CAAC;IAC9B,CAAC;IAED,UAAU,CAAC,IAAI;QACb,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,oBAAoB,CAAC,OAAO,GAAG,IAAI,EAAE,gBAAgB;QACnD,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACxB,MAAM,cAAc,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrD,IAAI,SAAS,GAAG,KAAK,CAAC;YACtB,MAAM,cAAc,GAAG,UAAU,CAAC,GAAG,EAAE;gBACrC,IAAI,SAAS,EAAE,CAAC;oBACd,OAAO;gBACT,CAAC;gBACD,SAAS,GAAG,IAAI,CAAC;gBACjB,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;gBACpC,MAAM,CAAC,IAAI,KAAK,CAAC,kDAAkD,OAAO,EAAE,CAAC,CAAC,CAAC;YACjF,CAAC,EAAE,OAAO,CAAC,CAAC;YAEZ,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE;gBACtC,IAAI,SAAS,EAAE,CAAC;oBACd,OAAO;gBACT,CAAC;gBACD,SAAS,GAAG,IAAI,CAAC;gBACjB,YAAY,CAAC,cAAc,CAAC,CAAC;gBAC7B,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;gBACpC,IAAI,CAAC;oBACH,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;gBAClC,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,MAAM,CAAC,CAAC,CAAC,CAAC;gBACZ,CAAC;YACH,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,EAAC,GAAG,EAAE,cAAc,EAAC,CAAC;IAC/B,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,WAAW,CAAC,OAAO,GAAG,IAAI;QAC9B,MAAM,EAAC,GAAG,EAAE,cAAc,EAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACxE,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;gBAC5B,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YACjC,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC;YACd,GAAG;YACH,OAAO,EAAE;gBACP,WAAW,EAAE,aAAa;gBAC1B,QAAQ,EAAE,SAAS;gBACnB,mBAAmB,EAAE,qBAAqB;aAC3C;SACF,CAAC,CAAC;QAEH,OAAO,MAAM,cAAc,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;QACnC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAChD,OAAO,gBAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC;IAC9E,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;QACxC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,uCAAuC,IAAI,GAAG,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,wBAAa,EAAE,OAAO,CAAC,CAAC;QACtF,OAAO,IAAI,mBAAQ,CAAC,IAAI,4BAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IAChD,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI;QAC1C,MAAM,EAAC,GAAG,EAAE,cAAc,EAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACxE,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;gBAC1C,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC9D,CAAC;YACD,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,aAAa,CAAC,EAAE,EAAE,CAAC;gBAC7C,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;gBAC1B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC1C,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACrC,OAAO,IAAI,CAAC,aAAa,CAAC;YAC5B,CAAC;iBAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,aAAa,CAAC,WAAW,EAAE,CAAC;gBAC7D,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,EAAE,CAAC,CAAC;YAC5D,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC;YACd,GAAG;YACH,OAAO,EAAE;gBACP,WAAW,EAAE,SAAS;gBACtB,QAAQ,EAAE,SAAS;gBACnB,mBAAmB,EAAE,qBAAqB;gBAC1C,QAAQ,EAAE,QAAQ;gBAClB,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC;aACzB;SACF,CAAC,CAAC;QAEH,OAAO,MAAM,cAAc,CAAC;IAC9B,CAAC;CACF;AA9MD,wBA8MC;AAED;;;;;;;GAOG;AAEH;;;;;;;;GAQG;AACI,KAAK,UAAU,gBAAgB,CAAC,IAAI,GAAG,EAAE;IAC9C,MAAM,QAAQ,GAAG;QACf,UAAU,EAAE,sBAAsB;QAClC,UAAU,EAAE,oBAAoB;QAChC,UAAU,EAAE,oBAAoB;QAChC,OAAO,EAAE,IAAI;KACd,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,gBAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,uBAAuB,EAAE,CAAC;IAEzD;;;;;;;;;;OAUG;IACH,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAC;IAEtE,MAAM,UAAU,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;IAC3C,MAAM,UAAU,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;IAC3C,MAAM,UAAU,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC;IAEjD,MAAM,eAAe,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC;IAClE,MAAM,mBAAmB,GAAG,CAAC,CAAC,CAC5B,IAAI,CAAC,UAAU;QACf,IAAI,CAAC,UAAU;QACf,OAAO,CAAC,UAAU;QAClB,OAAO,CAAC,UAAU,CACnB,CAAC;IACF,MAAM,UAAU,GACd,OAAO,CAAC,QAAQ,KAAK,OAAO;QAC5B,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,iBAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACpE,MAAM,UAAU,GAAG,eAAe,IAAI,CAAC,CAAC,mBAAmB,IAAI,UAAU,CAAC,CAAC;IAE3E,IAAI,MAAM,CAAC;IAEX,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,UAAU,GAAG,MAAM,YAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC/C,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CACb,4BAA4B,UAAU,uCAAuC,CAC9E,CAAC;QACJ,CAAC;QACD,MAAM,GAAG,kBAAG,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAC5C,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,kBAAG,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,IAAI,IAAI,CAAC;IAClC,mCAAmC;IACnC,IAAI,OAAO,GAAG,gBAAC,CAAC,IAAI,CAAC;IACrB,yBAAyB;IACzB,IAAI,SAAS,GAAG,gBAAC,CAAC,IAAI,CAAC;IAEvB,MAAM,cAAc,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrD,OAAO,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC/B,SAAS,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,OAAO,MAAM,IAAA,sBAAW,EACtB,cAAc,EACd,SAAS,EACT,IAAI,KAAK,CAAC,2CAA2C,SAAS,YAAY,CAAC,CAC5E,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YACtB,2EAA2E;YAC3E,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAC,CAAC,IAAI,CAAC,CAAC;YAC7B,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACnC,CAAC;AACH,CAAC;AAED,SAAS,MAAM,CAAC,GAAG;IACjB,OAAO,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;AACnD,CAAC;AAED;;;;GAIG;AACH,SAAS,uBAAuB;IAC9B,IAAI,oBAAoB,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;IAC9D,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,YAAG,CAAC,KAAK,CACP,wEAAwE,oBAAoB,EAAE,CAC/F,CAAC;IACF,+DAA+D;IAC/D,oBAAoB,GAAG,oBAAoB,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACrE,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnD,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;QACf,OAAO;YACL,UAAU,EAAE,EAAE;YACd,UAAU,EAAE,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;SAC/B,CAAC;IACJ,CAAC;IACD,OAAO;QACL,UAAU,EAAE,oBAAoB;KACjC,CAAC;AACJ,CAAC;AAED,kBAAe,MAAM,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xctest.d.ts","sourceRoot":"","sources":["../../lib/xctest.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"xctest.d.ts","sourceRoot":"","sources":["../../lib/xctest.js"],"names":[],"mappings":"AAyBA;;;;;;GAMG;AAEH;;;;GAIG;AAEH;;;GAGG;AACH;IAOE;;;;;OAKG;IACH,kBALW,MAAM,kBACN,MAAM,mBACN,MAAM,OAAC,SACP,OAAO,CAAC,YAAY,CAAC,EAU/B;IApBD,sEAAsE;IACtE,wBADW,OAAO,gBAAgB,EAAE,mBAAmB,GAAC,SAAS,CAC1C;IAEvB,sEAAsE;IACtE,sBADW,OAAO,gBAAgB,EAAE,mBAAmB,GAAC,SAAS,CAC5C;IASnB,aAAgB;IAChB,iBAAoB;IACpB,oBAAuB;IACvB,uBAAoC;IACpC,8BAAoC;IACpC,UAA6B;IAC7B,UAA2B;IAG7B;;;OAGG;IACH,+BAHW,MAAM,qBACN,MAAM,mBAwFhB;IArDC,yEAAiE;IAuDnE;;;OAGG;IACH,iDAHW,mBAAmB,cACnB,MAAM,iBA8ChB;IAED,uDAaC;IAED,yDA0CC;IAED,sGA0BC;IAED;;;;OAIG;IACH,uBAwBC;IAED;;OAEG;IACH,aAmBC;CACF;;;uBAlUa,MAAM,OAAC;gCACP,MAAM,EAAE,OAAC;gBACT,MAAM,EAAE,OAAC;iBACT,MAAM,EAAE,OAAC;;;;;;UAKT,6BAA6B;;;;SAC7B,MAAM;;oCA5BsB,kCAAkC"}
|
package/build/lib/xctest.js
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.Xctest = void 0;
|
|
7
4
|
const services_1 = require("./services");
|
|
@@ -12,7 +9,6 @@ const testmanagerd_1 = require("./testmanagerd");
|
|
|
12
9
|
const support_1 = require("@appium/support");
|
|
13
10
|
const utilities_1 = require("./utilities");
|
|
14
11
|
const logger_1 = require("./logger");
|
|
15
|
-
const bluebird_1 = __importDefault(require("bluebird"));
|
|
16
12
|
const { DAEMON_CONNECTION_INTERFACE } = testmanagerd_1.TESTMANAGERD_CHANNEL;
|
|
17
13
|
const XCTEST_CONFIGURATION_EXTENSION = '.xctestconfiguration';
|
|
18
14
|
const TMP_FOLDER_PREFIX = '/tmp';
|
|
@@ -158,9 +154,28 @@ class Xctest {
|
|
|
158
154
|
}
|
|
159
155
|
}
|
|
160
156
|
stream = await vendContainer.createWriteStream(xctestPath, {});
|
|
161
|
-
await new
|
|
162
|
-
|
|
163
|
-
|
|
157
|
+
await new Promise((resolve, reject) => {
|
|
158
|
+
let isSettled = false;
|
|
159
|
+
const onError = (err) => {
|
|
160
|
+
if (isSettled) {
|
|
161
|
+
return;
|
|
162
|
+
}
|
|
163
|
+
isSettled = true;
|
|
164
|
+
reject(err);
|
|
165
|
+
};
|
|
166
|
+
stream.once('error', onError);
|
|
167
|
+
stream.write(xctestContent, (err) => {
|
|
168
|
+
if (isSettled) {
|
|
169
|
+
return;
|
|
170
|
+
}
|
|
171
|
+
isSettled = true;
|
|
172
|
+
stream.off('error', onError);
|
|
173
|
+
if (err) {
|
|
174
|
+
reject(err);
|
|
175
|
+
return;
|
|
176
|
+
}
|
|
177
|
+
resolve(undefined);
|
|
178
|
+
});
|
|
164
179
|
});
|
|
165
180
|
}
|
|
166
181
|
finally {
|
package/build/lib/xctest.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xctest.js","sourceRoot":"","sources":["../../lib/xctest.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"xctest.js","sourceRoot":"","sources":["../../lib/xctest.js"],"names":[],"mappings":"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"}
|
package/lib/afc/index.js
CHANGED
|
@@ -4,7 +4,6 @@ import {AfcWritableFileStream, AfcReadableFileStream} from './streams';
|
|
|
4
4
|
import {AfcEncoder} from './transformer/afcencoder';
|
|
5
5
|
import {AfcDecoder} from './transformer/afcdecoder';
|
|
6
6
|
import {MB} from '../constants';
|
|
7
|
-
import B from 'bluebird';
|
|
8
7
|
import path from 'node:path';
|
|
9
8
|
import _ from 'lodash';
|
|
10
9
|
import {BaseServiceSocket} from '../base-service';
|
|
@@ -346,15 +345,29 @@ export class AfcService extends BaseServiceSocket {
|
|
|
346
345
|
|
|
347
346
|
_createPacketPromise(message, timeout = 10000) {
|
|
348
347
|
const packetNumber = this._packetNumber++;
|
|
349
|
-
const response = new
|
|
350
|
-
|
|
351
|
-
setTimeout(
|
|
348
|
+
const response = new Promise((resolve, reject) => {
|
|
349
|
+
let isSettled = false;
|
|
350
|
+
const timeoutHandler = setTimeout(() => {
|
|
351
|
+
if (isSettled) {
|
|
352
|
+
return;
|
|
353
|
+
}
|
|
354
|
+
isSettled = true;
|
|
355
|
+
delete this._responseCallbacks[packetNumber];
|
|
352
356
|
reject(
|
|
353
357
|
new Error(
|
|
354
358
|
`Could not finish the operation '${message}'. Failed to receive any data within the ${timeout}ms timeout`,
|
|
355
359
|
),
|
|
356
360
|
);
|
|
357
361
|
}, timeout);
|
|
362
|
+
this._responseCallbacks[packetNumber] = (data) => {
|
|
363
|
+
if (isSettled) {
|
|
364
|
+
return;
|
|
365
|
+
}
|
|
366
|
+
isSettled = true;
|
|
367
|
+
clearTimeout(timeoutHandler);
|
|
368
|
+
delete this._responseCallbacks[packetNumber];
|
|
369
|
+
resolve(data);
|
|
370
|
+
};
|
|
358
371
|
});
|
|
359
372
|
return {packetNumber, response};
|
|
360
373
|
}
|
|
@@ -3,7 +3,6 @@ import {PlistServiceEncoder} from '../plist-service/transformer/plist-service-en
|
|
|
3
3
|
import {LengthBasedSplitter} from '../util/transformer/length-based-splitter';
|
|
4
4
|
import {KB} from '../constants';
|
|
5
5
|
import {AfcService} from '../afc';
|
|
6
|
-
import B from 'bluebird';
|
|
7
6
|
import {BaseServiceSocket} from '../base-service';
|
|
8
7
|
import {getMaxFrameLength} from '../utilities';
|
|
9
8
|
|
|
@@ -73,7 +72,7 @@ export class HouseArrestService extends BaseServiceSocket {
|
|
|
73
72
|
}
|
|
74
73
|
|
|
75
74
|
_receivePlistPromise(timeout = 10000) {
|
|
76
|
-
return new
|
|
75
|
+
return new Promise((resolve, reject) => {
|
|
77
76
|
this._decoder.once('data', resolve);
|
|
78
77
|
setTimeout(
|
|
79
78
|
() => reject(new Error(`Failed to receive any data within the timeout: ${timeout}`)),
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import {BaseServicePlist} from '../base-service';
|
|
2
2
|
import {fs} from '@appium/support';
|
|
3
|
-
import B from 'bluebird';
|
|
4
3
|
import {log} from '../logger';
|
|
5
4
|
const {lstat, readFile, createReadStream} = fs;
|
|
6
5
|
|
|
@@ -37,7 +36,7 @@ export class ImageMounter extends BaseServicePlist {
|
|
|
37
36
|
*/
|
|
38
37
|
async mount(imageFilePath, imageSignatureFilePath, imageType = 'Developer') {
|
|
39
38
|
//check file stats
|
|
40
|
-
const [imageFileStat] = await
|
|
39
|
+
const [imageFileStat] = await Promise.all([
|
|
41
40
|
assertIsFile(imageFilePath, FILE_TYPE_IMAGE),
|
|
42
41
|
assertIsFile(imageSignatureFilePath, FILE_TYPE_SIGNATURE),
|
|
43
42
|
]);
|
|
@@ -65,7 +64,7 @@ export class ImageMounter extends BaseServicePlist {
|
|
|
65
64
|
//push image to device
|
|
66
65
|
const stream = createReadStream(imageFilePath);
|
|
67
66
|
try {
|
|
68
|
-
await new
|
|
67
|
+
await new Promise((resolve, reject) => {
|
|
69
68
|
stream.on('end', resolve);
|
|
70
69
|
stream.on('error', reject);
|
|
71
70
|
stream.on('data', async (data) => {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import B from 'bluebird';
|
|
2
1
|
import {upgradeToSSL} from '../ssl-helper';
|
|
3
2
|
import {PlistServiceEncoder} from './transformer/plist-service-encoder';
|
|
4
3
|
import {PlistServiceDecoder} from './transformer/plist-service-decoder';
|
|
@@ -47,23 +46,44 @@ export class PlistService extends BaseServiceSocket {
|
|
|
47
46
|
}
|
|
48
47
|
|
|
49
48
|
async receivePlist(timeout = 5000) {
|
|
50
|
-
return await new
|
|
49
|
+
return await new Promise((resolve, reject) => {
|
|
50
|
+
let isSettled = false;
|
|
51
51
|
const queue = this.replyQueue;
|
|
52
|
+
let checkExist;
|
|
53
|
+
let timeoutHandler;
|
|
54
|
+
const cleanup = () => {
|
|
55
|
+
if (checkExist) {
|
|
56
|
+
clearInterval(checkExist);
|
|
57
|
+
}
|
|
58
|
+
if (timeoutHandler) {
|
|
59
|
+
clearTimeout(timeoutHandler);
|
|
60
|
+
}
|
|
61
|
+
};
|
|
52
62
|
const data = queue.shift();
|
|
53
63
|
if (data) {
|
|
64
|
+
isSettled = true;
|
|
65
|
+
cleanup();
|
|
54
66
|
resolve(data);
|
|
55
67
|
return;
|
|
56
68
|
}
|
|
57
|
-
|
|
69
|
+
checkExist = setInterval(() => {
|
|
70
|
+
if (isSettled) {
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
58
73
|
const data = queue.shift();
|
|
59
74
|
if (!data) {
|
|
60
75
|
return;
|
|
61
76
|
}
|
|
62
|
-
|
|
77
|
+
isSettled = true;
|
|
78
|
+
cleanup();
|
|
63
79
|
resolve(data);
|
|
64
80
|
}, CHECK_FREQ_MS);
|
|
65
|
-
setTimeout(() => {
|
|
66
|
-
|
|
81
|
+
timeoutHandler = setTimeout(() => {
|
|
82
|
+
if (isSettled) {
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
isSettled = true;
|
|
86
|
+
cleanup();
|
|
67
87
|
reject(new Error(`Failed to receive any data within the timeout: ${timeout}`));
|
|
68
88
|
}, timeout);
|
|
69
89
|
});
|
package/lib/ssl-helper.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import tls from 'node:tls';
|
|
2
2
|
import net from 'node:net';
|
|
3
|
-
import B from 'bluebird';
|
|
4
3
|
|
|
5
4
|
const HANDSHAKE_TIMEOUT_MS = 10000;
|
|
6
5
|
|
|
@@ -39,20 +38,49 @@ export async function enableSSLHandshakeOnly(socket, key, cert) {
|
|
|
39
38
|
});
|
|
40
39
|
|
|
41
40
|
// stop receiving data after successful handshake
|
|
42
|
-
await new
|
|
41
|
+
await new Promise((resolve, reject) => {
|
|
42
|
+
let isSettled = false;
|
|
43
|
+
|
|
44
|
+
const cleanup = () => {
|
|
45
|
+
clearTimeout(timeoutHandler);
|
|
46
|
+
sslSocket.off('secureConnect', onSecureConnect);
|
|
47
|
+
sslSocket.off('error', onError);
|
|
48
|
+
};
|
|
49
|
+
|
|
50
|
+
const onError = (err) => {
|
|
51
|
+
if (isSettled) {
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
isSettled = true;
|
|
55
|
+
cleanup();
|
|
56
|
+
reject(err);
|
|
57
|
+
};
|
|
58
|
+
|
|
59
|
+
const onSecureConnect = () => {
|
|
60
|
+
if (isSettled) {
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
isSettled = true;
|
|
64
|
+
cleanup();
|
|
65
|
+
// @ts-ignore This is a hack
|
|
66
|
+
sslSocket._handle.readStop();
|
|
67
|
+
resolve(undefined);
|
|
68
|
+
};
|
|
69
|
+
|
|
43
70
|
const timeoutHandler = setTimeout(() => {
|
|
71
|
+
if (isSettled) {
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
isSettled = true;
|
|
75
|
+
cleanup();
|
|
44
76
|
if (!sslSocket.destroyed) {
|
|
45
77
|
sslSocket.end();
|
|
46
78
|
}
|
|
47
|
-
|
|
79
|
+
reject(new Error('ssl handshake error'));
|
|
48
80
|
}, HANDSHAKE_TIMEOUT_MS);
|
|
49
81
|
|
|
50
|
-
sslSocket.once('secureConnect',
|
|
51
|
-
|
|
52
|
-
// @ts-ignore This is a hack
|
|
53
|
-
sslSocket._handle.readStop();
|
|
54
|
-
return resolve();
|
|
55
|
-
});
|
|
82
|
+
sslSocket.once('secureConnect', onSecureConnect);
|
|
83
|
+
sslSocket.once('error', onError);
|
|
56
84
|
});
|
|
57
85
|
// Duplicate the socket. Return a new socket object connected to the same system resource
|
|
58
86
|
return new net.Socket({fd: socket._handle.fd});
|
package/lib/usbmux/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import net from 'node:net';
|
|
2
2
|
import os from 'node:os';
|
|
3
3
|
import _ from 'lodash';
|
|
4
|
-
import
|
|
4
|
+
import {withTimeout} from 'asyncbox';
|
|
5
5
|
import {plist, fs} from '@appium/support';
|
|
6
6
|
import {LengthBasedSplitter} from '../util/transformer/length-based-splitter';
|
|
7
7
|
import {UsbmuxDecoder} from './transformer/usbmux-decoder.js';
|
|
@@ -128,18 +128,30 @@ export class Usbmux extends BaseServiceSocket {
|
|
|
128
128
|
|
|
129
129
|
_receivePlistPromise(timeout = 5000, responseCallback) {
|
|
130
130
|
const tag = this._tag++;
|
|
131
|
-
const receivePromise = new
|
|
131
|
+
const receivePromise = new Promise((resolve, reject) => {
|
|
132
|
+
let isSettled = false;
|
|
133
|
+
const timeoutHandler = setTimeout(() => {
|
|
134
|
+
if (isSettled) {
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
137
|
+
isSettled = true;
|
|
138
|
+
delete this._responseCallbacks[tag];
|
|
139
|
+
reject(new Error(`Failed to receive any data within the timeout: ${timeout}`));
|
|
140
|
+
}, timeout);
|
|
141
|
+
|
|
132
142
|
this._responseCallbacks[tag] = (data) => {
|
|
143
|
+
if (isSettled) {
|
|
144
|
+
return;
|
|
145
|
+
}
|
|
146
|
+
isSettled = true;
|
|
147
|
+
clearTimeout(timeoutHandler);
|
|
148
|
+
delete this._responseCallbacks[tag];
|
|
133
149
|
try {
|
|
134
150
|
resolve(responseCallback(data));
|
|
135
151
|
} catch (e) {
|
|
136
152
|
reject(e);
|
|
137
153
|
}
|
|
138
154
|
};
|
|
139
|
-
setTimeout(
|
|
140
|
-
() => reject(new Error(`Failed to receive any data within the timeout: ${timeout}`)),
|
|
141
|
-
timeout,
|
|
142
|
-
);
|
|
143
155
|
});
|
|
144
156
|
return {tag, receivePromise};
|
|
145
157
|
}
|
|
@@ -249,7 +261,7 @@ export class Usbmux extends BaseServiceSocket {
|
|
|
249
261
|
* @param {SocketOptions} opts
|
|
250
262
|
* @throws {Error} If there was an error while accessing the socket or
|
|
251
263
|
* a connection error happened
|
|
252
|
-
* @throws {
|
|
264
|
+
* @throws {Error} if connection timeout happened
|
|
253
265
|
* @returns {Promise<NodeJS.Socket>} Connected socket instance
|
|
254
266
|
*/
|
|
255
267
|
export async function getDefaultSocket(opts = {}) {
|
|
@@ -307,10 +319,36 @@ export async function getDefaultSocket(opts = {}) {
|
|
|
307
319
|
socket = net.createConnection(socketPort, socketHost);
|
|
308
320
|
}
|
|
309
321
|
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
322
|
+
const timeoutMs = timeout ?? 5000;
|
|
323
|
+
/** @type {(err: Error) => void} */
|
|
324
|
+
let onError = _.noop;
|
|
325
|
+
/** @type {() => void} */
|
|
326
|
+
let onConnect = _.noop;
|
|
327
|
+
|
|
328
|
+
const connectPromise = new Promise((resolve, reject) => {
|
|
329
|
+
onError = (err) => reject(err);
|
|
330
|
+
onConnect = () => resolve(socket);
|
|
331
|
+
socket.once('error', onError);
|
|
332
|
+
socket.once('connect', onConnect);
|
|
333
|
+
});
|
|
334
|
+
|
|
335
|
+
try {
|
|
336
|
+
return await withTimeout(
|
|
337
|
+
connectPromise,
|
|
338
|
+
timeoutMs,
|
|
339
|
+
new Error(`Failed to connect to usbmuxd within the ${timeoutMs}ms timeout`),
|
|
340
|
+
);
|
|
341
|
+
} catch (err) {
|
|
342
|
+
if (!socket.destroyed) {
|
|
343
|
+
// Avoid an unhandled 'error' event if ECONNRESET is emitted during destroy
|
|
344
|
+
socket.once('error', _.noop);
|
|
345
|
+
socket.destroy();
|
|
346
|
+
}
|
|
347
|
+
throw err;
|
|
348
|
+
} finally {
|
|
349
|
+
socket.off('error', onError);
|
|
350
|
+
socket.off('connect', onConnect);
|
|
351
|
+
}
|
|
314
352
|
}
|
|
315
353
|
|
|
316
354
|
function swap16(val) {
|
package/lib/xctest.js
CHANGED
|
@@ -11,7 +11,6 @@ import {TESTMANAGERD_CHANNEL} from './testmanagerd';
|
|
|
11
11
|
import {util} from '@appium/support';
|
|
12
12
|
import {getOSVersion} from './utilities';
|
|
13
13
|
import {log} from './logger';
|
|
14
|
-
import B from 'bluebird';
|
|
15
14
|
|
|
16
15
|
const {DAEMON_CONNECTION_INTERFACE} = TESTMANAGERD_CHANNEL;
|
|
17
16
|
const XCTEST_CONFIGURATION_EXTENSION = '.xctestconfiguration';
|
|
@@ -177,9 +176,28 @@ export class Xctest {
|
|
|
177
176
|
}
|
|
178
177
|
}
|
|
179
178
|
stream = await vendContainer.createWriteStream(xctestPath, {});
|
|
180
|
-
await new
|
|
181
|
-
|
|
182
|
-
|
|
179
|
+
await new Promise((resolve, reject) => {
|
|
180
|
+
let isSettled = false;
|
|
181
|
+
const onError = (err) => {
|
|
182
|
+
if (isSettled) {
|
|
183
|
+
return;
|
|
184
|
+
}
|
|
185
|
+
isSettled = true;
|
|
186
|
+
reject(err);
|
|
187
|
+
};
|
|
188
|
+
stream.once('error', onError);
|
|
189
|
+
stream.write(xctestContent, (err) => {
|
|
190
|
+
if (isSettled) {
|
|
191
|
+
return;
|
|
192
|
+
}
|
|
193
|
+
isSettled = true;
|
|
194
|
+
stream.off('error', onError);
|
|
195
|
+
if (err) {
|
|
196
|
+
reject(err);
|
|
197
|
+
return;
|
|
198
|
+
}
|
|
199
|
+
resolve(undefined);
|
|
200
|
+
});
|
|
183
201
|
});
|
|
184
202
|
} finally {
|
|
185
203
|
stream?.end();
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"keywords": [
|
|
5
5
|
"appium"
|
|
6
6
|
],
|
|
7
|
-
"version": "3.1.
|
|
7
|
+
"version": "3.1.14",
|
|
8
8
|
"author": "Appium Contributors",
|
|
9
9
|
"license": "Apache-2.0",
|
|
10
10
|
"repository": {
|
|
@@ -34,7 +34,6 @@
|
|
|
34
34
|
"@appium/support": "^7.2.2",
|
|
35
35
|
"asyncbox": "^6.0.1",
|
|
36
36
|
"axios": "^1.16.0",
|
|
37
|
-
"bluebird": "^3.1.1",
|
|
38
37
|
"bplist-creator": "^0.x",
|
|
39
38
|
"bplist-parser": "^0.x",
|
|
40
39
|
"lodash": "^4.17.15",
|
|
@@ -62,7 +61,6 @@
|
|
|
62
61
|
"@appium/types": "^1.0.0-rc.1",
|
|
63
62
|
"@semantic-release/changelog": "^6.0.1",
|
|
64
63
|
"@semantic-release/git": "^10.0.1",
|
|
65
|
-
"@types/bluebird": "^3.5.38",
|
|
66
64
|
"@types/lodash": "^4.14.196",
|
|
67
65
|
"@types/mocha": "^10.0.1",
|
|
68
66
|
"@types/node": "^25.0.0",
|