appium-xcuitest-driver 12.1.1 → 12.1.2
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/commands/helpers/mjpeg.d.ts +15 -1
- package/build/lib/commands/helpers/mjpeg.d.ts.map +1 -1
- package/build/lib/commands/helpers/mjpeg.js +26 -6
- package/build/lib/commands/helpers/mjpeg.js.map +1 -1
- package/lib/commands/helpers/mjpeg.ts +27 -6
- package/npm-shrinkwrap.json +37 -28
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## [12.1.2](https://github.com/appium/appium-xcuitest-driver/compare/v12.1.1...v12.1.2) (2026-07-30)
|
|
2
|
+
|
|
3
|
+
### Miscellaneous Chores
|
|
4
|
+
|
|
5
|
+
* Harden MJPEG frame parsing and stream startup ([#2927](https://github.com/appium/appium-xcuitest-driver/issues/2927)) ([36bf6a0](https://github.com/appium/appium-xcuitest-driver/commit/36bf6a00f63265cd54b561e71ddc2bdae25da91e))
|
|
6
|
+
|
|
1
7
|
## [12.1.1](https://github.com/appium/appium-xcuitest-driver/compare/v12.1.0...v12.1.1) (2026-07-29)
|
|
2
8
|
|
|
3
9
|
### Miscellaneous Chores
|
|
@@ -1,5 +1,19 @@
|
|
|
1
|
-
import { Writable, type WritableOptions } from 'node:stream';
|
|
1
|
+
import { Transform, Writable, type TransformCallback, type WritableOptions } from 'node:stream';
|
|
2
2
|
import type { XCUITestDriver } from '../../driver.js';
|
|
3
|
+
/**
|
|
4
|
+
* Extracts individual JPEG frames out of a multipart MJPEG-over-HTTP byte stream by
|
|
5
|
+
* scanning for JPEG start/end-of-image markers and the multipart `Content-Length` header.
|
|
6
|
+
*/
|
|
7
|
+
export declare class MjpegFrameParser extends Transform {
|
|
8
|
+
private buffer;
|
|
9
|
+
private expectedLength;
|
|
10
|
+
private bytesWritten;
|
|
11
|
+
private isReading;
|
|
12
|
+
_transform(chunk: Buffer, _encoding: BufferEncoding, callback: TransformCallback): void;
|
|
13
|
+
private startFrame;
|
|
14
|
+
private appendChunk;
|
|
15
|
+
private emitFrame;
|
|
16
|
+
}
|
|
3
17
|
/**
|
|
4
18
|
* Connects to an MJPEG-over-HTTP stream and keeps track of the last JPEG frame received,
|
|
5
19
|
* so that it can be used as a cheap, low-latency screenshot source.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mjpeg.d.ts","sourceRoot":"","sources":["../../../../lib/commands/helpers/mjpeg.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"mjpeg.d.ts","sourceRoot":"","sources":["../../../../lib/commands/helpers/mjpeg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,QAAQ,EAAiB,KAAK,iBAAiB,EAAE,KAAK,eAAe,EAAC,MAAM,aAAa,CAAC;AAM7G,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAUpD;;;GAGG;AACH,qBAAa,gBAAiB,SAAQ,SAAS;IAC7C,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,YAAY,CAAK;IACzB,OAAO,CAAC,SAAS,CAAS;IAGjB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,iBAAiB,GAAG,IAAI;IAehG,OAAO,CAAC,UAAU;IAsBlB,OAAO,CAAC,WAAW;IAqBnB,OAAO,CAAC,SAAS;CAelB;AAwBD;;;GAGG;AACH,qBAAa,WAAY,SAAQ,QAAQ;IACvC,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAC;IAC5C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,oBAAoB,CAA6B;IACzD,OAAO,CAAC,oBAAoB,CAAuC;IACnE,OAAO,CAAC,cAAc,CAAyB;IAC/C,OAAO,CAAC,QAAQ,CAAiC;IAEjD;;;;OAIG;gBACS,QAAQ,EAAE,MAAM,EAAE,YAAY,GAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAW,EAAE,OAAO,GAAE,eAAoB;IAOtG,IAAI,eAAe,IAAI,MAAM,GAAG,IAAI,CAGnC;IAEK,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IActC,kBAAkB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAKlD,KAAK,IAAI,IAAI;IASP,KAAK,CAAC,aAAa,SAA4B,GAAG,OAAO,CAAC,IAAI,CAAC;IA8ErE,IAAI,IAAI,IAAI;IAcH,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI;CAUnH;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ9E;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA0BnF"}
|
|
@@ -11,7 +11,7 @@ const CONTENT_LENGTH_RE = /Content-Length:\s*(\d+)/i;
|
|
|
11
11
|
* Extracts individual JPEG frames out of a multipart MJPEG-over-HTTP byte stream by
|
|
12
12
|
* scanning for JPEG start/end-of-image markers and the multipart `Content-Length` header.
|
|
13
13
|
*/
|
|
14
|
-
class MjpegFrameParser extends Transform {
|
|
14
|
+
export class MjpegFrameParser extends Transform {
|
|
15
15
|
buffer = null;
|
|
16
16
|
expectedLength = 0;
|
|
17
17
|
bytesWritten = 0;
|
|
@@ -22,7 +22,7 @@ class MjpegFrameParser extends Transform {
|
|
|
22
22
|
const endIdx = chunk.indexOf(JPEG_EOI);
|
|
23
23
|
const lengthMatch = CONTENT_LENGTH_RE.exec(chunk.toString('latin1'));
|
|
24
24
|
if (this.buffer && (this.isReading || startIdx > -1)) {
|
|
25
|
-
this.appendChunk(chunk,
|
|
25
|
+
this.appendChunk(chunk, endIdx);
|
|
26
26
|
}
|
|
27
27
|
if (lengthMatch) {
|
|
28
28
|
this.startFrame(Number(lengthMatch[1]), chunk, startIdx, endIdx);
|
|
@@ -50,15 +50,19 @@ class MjpegFrameParser extends Transform {
|
|
|
50
50
|
this.isReading = true;
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
|
-
appendChunk(chunk,
|
|
53
|
+
appendChunk(chunk, end) {
|
|
54
54
|
if (!this.buffer) {
|
|
55
55
|
return;
|
|
56
56
|
}
|
|
57
|
-
|
|
57
|
+
// We are continuing a frame that is already open, so the whole chunk belongs to it
|
|
58
|
+
// and must be copied starting at offset 0. A JPEG SOI marker found anywhere in this
|
|
59
|
+
// chunk can only belong to the *next* frame (it necessarily comes after our own EOI),
|
|
60
|
+
// so it must never be used as the copy start here, or the current frame's tail bytes
|
|
61
|
+
// between offset 0 and that marker would be skipped, truncating it.
|
|
58
62
|
const copyEnd = end > -1 ? end + JPEG_EOI.length : chunk.length;
|
|
59
63
|
// Buffer.copy() silently truncates if the destination has less room than requested,
|
|
60
64
|
// so bytesWritten must track what was actually copied, not the requested range size.
|
|
61
|
-
this.bytesWritten += chunk.copy(this.buffer, this.bytesWritten,
|
|
65
|
+
this.bytesWritten += chunk.copy(this.buffer, this.bytesWritten, 0, copyEnd);
|
|
62
66
|
if (end > -1 || this.bytesWritten === this.expectedLength) {
|
|
63
67
|
this.emitFrame();
|
|
64
68
|
}
|
|
@@ -69,8 +73,17 @@ class MjpegFrameParser extends Transform {
|
|
|
69
73
|
emitFrame() {
|
|
70
74
|
this.isReading = false;
|
|
71
75
|
if (this.buffer) {
|
|
72
|
-
|
|
76
|
+
// Only push what was actually copied: the buffer is allocated to `expectedLength`
|
|
77
|
+
// up front, so pushing it as-is would leak trailing zero bytes whenever fewer
|
|
78
|
+
// bytes were actually written (e.g. a mismatched/truncated Content-Length).
|
|
79
|
+
this.push(this.buffer.subarray(0, this.bytesWritten));
|
|
73
80
|
}
|
|
81
|
+
// Clear the frame state so an unrelated later chunk (e.g. one with a JPEG SOI
|
|
82
|
+
// marker but no Content-Length header) cannot be appended onto a buffer that
|
|
83
|
+
// has already been pushed downstream.
|
|
84
|
+
this.buffer = null;
|
|
85
|
+
this.expectedLength = 0;
|
|
86
|
+
this.bytesWritten = 0;
|
|
74
87
|
}
|
|
75
88
|
}
|
|
76
89
|
let sharpModule = null;
|
|
@@ -189,6 +202,8 @@ export class MJpegStream extends Writable {
|
|
|
189
202
|
const onClose = () => {
|
|
190
203
|
log.debug(`The connection to MJPEG server at ${url} has been closed`);
|
|
191
204
|
this.lastChunk = null;
|
|
205
|
+
// No-op if start() has already resolved; only rejects a still-pending start().
|
|
206
|
+
this.registerStartFailure?.(new Error(`The connection to the MJPEG stream at ${url} has been closed before any frame was received`));
|
|
192
207
|
};
|
|
193
208
|
let timeoutId;
|
|
194
209
|
const startPromise = new Promise((resolve, reject) => {
|
|
@@ -204,6 +219,11 @@ export class MJpegStream extends Writable {
|
|
|
204
219
|
try {
|
|
205
220
|
await startPromise;
|
|
206
221
|
}
|
|
222
|
+
catch (err) {
|
|
223
|
+
// Do not leak the underlying HTTP connection/pipes if we never reached a usable state.
|
|
224
|
+
this.stop();
|
|
225
|
+
throw err;
|
|
226
|
+
}
|
|
207
227
|
finally {
|
|
208
228
|
clearTimeout(timeoutId);
|
|
209
229
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mjpeg.js","sourceRoot":"","sources":["../../../../lib/commands/helpers/mjpeg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,QAAQ,EAA8D,MAAM,aAAa,CAAC;AAE7G,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AACzC,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;AAEtC,MAAM,yBAAyB,GAAG,KAAK,CAAC;AACxC,MAAM,yBAAyB,GAAG,IAAI,CAAC;AACvC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AAC3C,MAAM,iBAAiB,GAAG,0BAA0B,CAAC;AAErD;;;GAGG;AACH,MAAM,gBAAiB,SAAQ,SAAS;
|
|
1
|
+
{"version":3,"file":"mjpeg.js","sourceRoot":"","sources":["../../../../lib/commands/helpers/mjpeg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,QAAQ,EAA8D,MAAM,aAAa,CAAC;AAE7G,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AACzC,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;AAEtC,MAAM,yBAAyB,GAAG,KAAK,CAAC;AACxC,MAAM,yBAAyB,GAAG,IAAI,CAAC;AACvC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AAC3C,MAAM,iBAAiB,GAAG,0BAA0B,CAAC;AAErD;;;GAGG;AACH,MAAM,OAAO,gBAAiB,SAAQ,SAAS;IACrC,MAAM,GAAkB,IAAI,CAAC;IAC7B,cAAc,GAAG,CAAC,CAAC;IACnB,YAAY,GAAG,CAAC,CAAC;IACjB,SAAS,GAAG,KAAK,CAAC;IAE1B,gGAAgG;IACvF,UAAU,CAAC,KAAa,EAAE,SAAyB,EAAE,QAA2B;QACvF,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACvC,MAAM,WAAW,GAAG,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;QAErE,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACrD,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACnE,CAAC;QACD,QAAQ,EAAE,CAAC;IACb,CAAC;IACD,qDAAqD;IAE7C,UAAU,CAAC,MAAc,EAAE,KAAa,EAAE,KAAa,EAAE,GAAW;QAC1E,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;QACtB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QAEvB,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACd,OAAO;QACT,CAAC;QACD,MAAM,MAAM,GAAG,GAAG,GAAG,KAAK,CAAC;QAC3B,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;QAC9D,oFAAoF;QACpF,qFAAqF;QACrF,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAE/D,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACxB,CAAC;IACH,CAAC;IAEO,WAAW,CAAC,KAAa,EAAE,GAAW;QAC5C,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QACD,mFAAmF;QACnF,oFAAoF;QACpF,sFAAsF;QACtF,qFAAqF;QACrF,oEAAoE;QACpE,MAAM,OAAO,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;QAChE,oFAAoF;QACpF,qFAAqF;QACrF,IAAI,CAAC,YAAY,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;QAE5E,IAAI,GAAG,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,cAAc,EAAE,CAAC;YAC1D,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACxB,CAAC;IACH,CAAC;IAEO,SAAS;QACf,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,kFAAkF;YAClF,8EAA8E;YAC9E,4EAA4E;YAC5E,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;QACxD,CAAC;QACD,8EAA8E;QAC9E,6EAA6E;QAC7E,sCAAsC;QACtC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;QACxB,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;IACxB,CAAC;CACF;AAED,IAAI,WAAW,GAAwB,IAAI,CAAC;AAE5C,KAAK,UAAU,YAAY;IACzB,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,IAAI,CAAC;QACH,WAAW,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;QAC9C,OAAO,WAAW,CAAC;IACrB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,MAAM,IAAI,KAAK,CACb,oEAAoE;YAClE,iFAAiF;YACjF,mBAAmB,OAAO,EAAE,EAC9B,EAAC,KAAK,EAAE,GAAG,EAAC,CACb,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,IAAI,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;AAEtB;;;GAGG;AACH,MAAM,OAAO,WAAY,SAAQ,QAAQ;IAC9B,YAAY,CAAuB;IACnC,GAAG,CAAS;IACb,WAAW,GAAG,CAAC,CAAC;IAChB,SAAS,GAAkB,IAAI,CAAC;IAChC,oBAAoB,GAAwB,IAAI,CAAC;IACjD,oBAAoB,GAAkC,IAAI,CAAC;IAC3D,cAAc,GAAoB,IAAI,CAAC;IACvC,QAAQ,GAA4B,IAAI,CAAC;IAEjD;;;;OAIG;IACH,YAAY,QAAgB,EAAE,eAAqC,IAAI,EAAE,UAA2B,EAAE;QACpG,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAC;QACpB,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,IAAI,eAAe;QACjB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACjC,OAAO,SAAS,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACjF,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC;QAC7B,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,YAAY,EAAE,CAAC;YACnC,OAAO,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;QAC7C,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,GAAG,CAAC,IAAI,CAAC,sCAAsC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAC9D,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QACtC,OAAO,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7C,CAAC;IAED,KAAK;QACH,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACjC,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACjC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,aAAa,GAAG,yBAAyB;QACnD,IAAI,CAAC,IAAI,EAAE,CAAC;QAEZ,IAAI,CAAC,QAAQ,GAAG,IAAI,gBAAgB,EAAE,CAAC;QACvC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,wFAAwF;QACxF,wFAAwF;QACxF,4DAA4D;QAC5D,MAAM,iBAAiB,GAAG,IAAI,eAAe,EAAE,CAAC;QAChD,MAAM,gBAAgB,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,KAAK,EAAE,EAAE,aAAa,CAAC,CAAC;QACpF,IAAI,CAAC;YACH,IAAI,CAAC;gBACH,IAAI,CAAC,cAAc,GAAG,CACpB,MAAM,KAAK,CAAC;oBACV,GAAG;oBACH,YAAY,EAAE,QAAQ;oBACtB,MAAM,EAAE,iBAAiB,CAAC,MAAM;iBACjC,CAAC,CACH,CAAC,IAAgB,CAAC;YACrB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,OAAe,CAAC;gBACpB,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,UAAU,IAAI,CAAC,EAAE,CAAC;oBAClD,OAAO,GAAG,IAAI,CAAC,SAAS,CAAE,CAAyB,CAAC,QAAQ,CAAC,CAAC;gBAChE,CAAC;qBAAM,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;oBAC9B,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;gBACtB,CAAC;qBAAM,CAAC;oBACN,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACtB,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,yCAAyC,GAAG,qBAAqB,OAAO,EAAE,EAAE;oBAC1F,KAAK,EAAE,CAAC;iBACT,CAAC,CAAC;YACL,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,YAAY,CAAC,gBAAgB,CAAC,CAAC;QACjC,CAAC;QAED,MAAM,KAAK,GAAG,CAAC,GAAU,EAAE,EAAE;YAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YACtB,GAAG,CAAC,KAAK,CAAC,yCAAyC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAClE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YACvB,IAAI,CAAC,oBAAoB,EAAE,CAAC,GAAG,CAAC,CAAC;QACnC,CAAC,CAAC;QACF,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,GAAG,CAAC,KAAK,CAAC,qCAAqC,GAAG,kBAAkB,CAAC,CAAC;YACtE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YACtB,+EAA+E;YAC/E,IAAI,CAAC,oBAAoB,EAAE,CACzB,IAAI,KAAK,CAAC,yCAAyC,GAAG,gDAAgD,CAAC,CACxG,CAAC;QACJ,CAAC,CAAC;QAEF,IAAI,SAAqC,CAAC;QAC1C,MAAM,YAAY,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACzD,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAC;YACpC,IAAI,CAAC,oBAAoB,GAAG,MAAM,CAAC;YACnC,SAAS,GAAG,UAAU,CACpB,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,UAAU,aAAa,+CAA+C,CAAC,CAAC,EAC/F,aAAa,CACd,CAAC;QACJ,CAAC,CAAC,CAAC;QAEF,IAAI,CAAC,cAAoE;aACvE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC;aACtB,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC;aAClB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;aACnB,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,IAAI,CAAC;YACH,MAAM,YAAY,CAAC;QACrB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,uFAAuF;YACvF,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,MAAM,GAAG,CAAC;QACZ,CAAC;gBAAS,CAAC;YACT,YAAY,CAAC,SAAS,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC;QACD,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC5C,CAAC;YACD,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,2FAA2F;IAClF,MAAM,CAAC,KAAsB,EAAE,SAAyB,EAAE,QAAwC;QACzG,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrE,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC9B,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACnC,CAAC;QACD,QAAQ,EAAE,CAAC;IACb,CAAC;CAEF;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,MAAsB;IAC7D,MAAM,uBAAuB,CAAC,MAAM,CAAC,CAAC;IACtC,4CAA4C;IAC5C,IAAI,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACnC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,uCAAuC,MAAM,CAAC,IAAI,CAAC,kBAAkB,GAAG,CAAC,CAAC;QAC1F,MAAM,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACrE,MAAM,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;IACnC,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,MAAsB;IAClE,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,IAAI,yBAAyB,CAAC,CAAC;IACzF,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,eAAe,kBAAkB,eAAe,EAAE,CAAC,CAAC;IACrG,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,EAAE;YACzF,UAAU,EAAE,eAAe;YAC3B,iBAAiB,EAAE,MAAM,CAAC,YAAY,EAAE;YACxC,eAAe,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI;SACvE,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;YAC9C,MAAM,CAAC,GAAG,CAAC,IAAI,CACb,kCAAkC,yBAAyB,sBAAsB,yBAAyB,IAAI;gBAC5G,gGAAgG;gBAChG,mFAAmF,CACtF,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,KAAK,CAAE,KAAe,CAAC,KAAK,CAAC,CAAC;YACzC,MAAM,IAAI,KAAK,CACb,4EAA4E,eAAe,GAAG;gBAC5F,oEAAoE,eAAe,IAAI;gBACvF,mBAAmB,KAAK,EAAE,EAC5B,EAAC,KAAK,EAAE,KAAK,EAAC,CACf,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -18,7 +18,7 @@ const CONTENT_LENGTH_RE = /Content-Length:\s*(\d+)/i;
|
|
|
18
18
|
* Extracts individual JPEG frames out of a multipart MJPEG-over-HTTP byte stream by
|
|
19
19
|
* scanning for JPEG start/end-of-image markers and the multipart `Content-Length` header.
|
|
20
20
|
*/
|
|
21
|
-
class MjpegFrameParser extends Transform {
|
|
21
|
+
export class MjpegFrameParser extends Transform {
|
|
22
22
|
private buffer: Buffer | null = null;
|
|
23
23
|
private expectedLength = 0;
|
|
24
24
|
private bytesWritten = 0;
|
|
@@ -31,7 +31,7 @@ class MjpegFrameParser extends Transform {
|
|
|
31
31
|
const lengthMatch = CONTENT_LENGTH_RE.exec(chunk.toString('latin1'));
|
|
32
32
|
|
|
33
33
|
if (this.buffer && (this.isReading || startIdx > -1)) {
|
|
34
|
-
this.appendChunk(chunk,
|
|
34
|
+
this.appendChunk(chunk, endIdx);
|
|
35
35
|
}
|
|
36
36
|
if (lengthMatch) {
|
|
37
37
|
this.startFrame(Number(lengthMatch[1]), chunk, startIdx, endIdx);
|
|
@@ -62,15 +62,19 @@ class MjpegFrameParser extends Transform {
|
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
64
|
|
|
65
|
-
private appendChunk(chunk: Buffer,
|
|
65
|
+
private appendChunk(chunk: Buffer, end: number): void {
|
|
66
66
|
if (!this.buffer) {
|
|
67
67
|
return;
|
|
68
68
|
}
|
|
69
|
-
|
|
69
|
+
// We are continuing a frame that is already open, so the whole chunk belongs to it
|
|
70
|
+
// and must be copied starting at offset 0. A JPEG SOI marker found anywhere in this
|
|
71
|
+
// chunk can only belong to the *next* frame (it necessarily comes after our own EOI),
|
|
72
|
+
// so it must never be used as the copy start here, or the current frame's tail bytes
|
|
73
|
+
// between offset 0 and that marker would be skipped, truncating it.
|
|
70
74
|
const copyEnd = end > -1 ? end + JPEG_EOI.length : chunk.length;
|
|
71
75
|
// Buffer.copy() silently truncates if the destination has less room than requested,
|
|
72
76
|
// so bytesWritten must track what was actually copied, not the requested range size.
|
|
73
|
-
this.bytesWritten += chunk.copy(this.buffer, this.bytesWritten,
|
|
77
|
+
this.bytesWritten += chunk.copy(this.buffer, this.bytesWritten, 0, copyEnd);
|
|
74
78
|
|
|
75
79
|
if (end > -1 || this.bytesWritten === this.expectedLength) {
|
|
76
80
|
this.emitFrame();
|
|
@@ -82,8 +86,17 @@ class MjpegFrameParser extends Transform {
|
|
|
82
86
|
private emitFrame(): void {
|
|
83
87
|
this.isReading = false;
|
|
84
88
|
if (this.buffer) {
|
|
85
|
-
|
|
89
|
+
// Only push what was actually copied: the buffer is allocated to `expectedLength`
|
|
90
|
+
// up front, so pushing it as-is would leak trailing zero bytes whenever fewer
|
|
91
|
+
// bytes were actually written (e.g. a mismatched/truncated Content-Length).
|
|
92
|
+
this.push(this.buffer.subarray(0, this.bytesWritten));
|
|
86
93
|
}
|
|
94
|
+
// Clear the frame state so an unrelated later chunk (e.g. one with a JPEG SOI
|
|
95
|
+
// marker but no Content-Length header) cannot be appended onto a buffer that
|
|
96
|
+
// has already been pushed downstream.
|
|
97
|
+
this.buffer = null;
|
|
98
|
+
this.expectedLength = 0;
|
|
99
|
+
this.bytesWritten = 0;
|
|
87
100
|
}
|
|
88
101
|
}
|
|
89
102
|
|
|
@@ -213,6 +226,10 @@ export class MJpegStream extends Writable {
|
|
|
213
226
|
const onClose = () => {
|
|
214
227
|
log.debug(`The connection to MJPEG server at ${url} has been closed`);
|
|
215
228
|
this.lastChunk = null;
|
|
229
|
+
// No-op if start() has already resolved; only rejects a still-pending start().
|
|
230
|
+
this.registerStartFailure?.(
|
|
231
|
+
new Error(`The connection to the MJPEG stream at ${url} has been closed before any frame was received`),
|
|
232
|
+
);
|
|
216
233
|
};
|
|
217
234
|
|
|
218
235
|
let timeoutId: NodeJS.Timeout | undefined;
|
|
@@ -233,6 +250,10 @@ export class MJpegStream extends Writable {
|
|
|
233
250
|
|
|
234
251
|
try {
|
|
235
252
|
await startPromise;
|
|
253
|
+
} catch (err) {
|
|
254
|
+
// Do not leak the underlying HTTP connection/pipes if we never reached a usable state.
|
|
255
|
+
this.stop();
|
|
256
|
+
throw err;
|
|
236
257
|
} finally {
|
|
237
258
|
clearTimeout(timeoutId);
|
|
238
259
|
}
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "appium-xcuitest-driver",
|
|
3
|
-
"version": "12.1.
|
|
3
|
+
"version": "12.1.2",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "appium-xcuitest-driver",
|
|
9
|
-
"version": "12.1.
|
|
9
|
+
"version": "12.1.2",
|
|
10
10
|
"license": "Apache-2.0",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@appium/css-locator-to-native": "^1.0.1",
|
|
@@ -109,6 +109,18 @@
|
|
|
109
109
|
"npm": ">=10"
|
|
110
110
|
}
|
|
111
111
|
},
|
|
112
|
+
"node_modules/@appium/base-driver/node_modules/axios": {
|
|
113
|
+
"version": "1.18.1",
|
|
114
|
+
"resolved": "https://registry.npmjs.org/axios/-/axios-1.18.1.tgz",
|
|
115
|
+
"integrity": "sha512-3nTvFlvpn9Zu/RkHUqtc7/+al4UpRW5az71ap5zccp6e8RAYEzhMTecX8Dz1wWDYrPpUoB1HAQEGEAEvUr7S9g==",
|
|
116
|
+
"license": "MIT",
|
|
117
|
+
"dependencies": {
|
|
118
|
+
"follow-redirects": "^1.16.0",
|
|
119
|
+
"form-data": "^4.0.5",
|
|
120
|
+
"https-proxy-agent": "^5.0.1",
|
|
121
|
+
"proxy-from-env": "^2.1.0"
|
|
122
|
+
}
|
|
123
|
+
},
|
|
112
124
|
"node_modules/@appium/css-locator-to-native": {
|
|
113
125
|
"version": "1.0.6",
|
|
114
126
|
"resolved": "https://registry.npmjs.org/@appium/css-locator-to-native/-/css-locator-to-native-1.0.6.tgz",
|
|
@@ -253,6 +265,18 @@
|
|
|
253
265
|
"npm": ">=10"
|
|
254
266
|
}
|
|
255
267
|
},
|
|
268
|
+
"node_modules/@appium/support/node_modules/axios": {
|
|
269
|
+
"version": "1.18.1",
|
|
270
|
+
"resolved": "https://registry.npmjs.org/axios/-/axios-1.18.1.tgz",
|
|
271
|
+
"integrity": "sha512-3nTvFlvpn9Zu/RkHUqtc7/+al4UpRW5az71ap5zccp6e8RAYEzhMTecX8Dz1wWDYrPpUoB1HAQEGEAEvUr7S9g==",
|
|
272
|
+
"license": "MIT",
|
|
273
|
+
"dependencies": {
|
|
274
|
+
"follow-redirects": "^1.16.0",
|
|
275
|
+
"form-data": "^4.0.5",
|
|
276
|
+
"https-proxy-agent": "^5.0.1",
|
|
277
|
+
"proxy-from-env": "^2.1.0"
|
|
278
|
+
}
|
|
279
|
+
},
|
|
256
280
|
"node_modules/@appium/support/node_modules/teen_process": {
|
|
257
281
|
"version": "4.1.9",
|
|
258
282
|
"resolved": "https://registry.npmjs.org/teen_process/-/teen_process-4.1.9.tgz",
|
|
@@ -549,17 +573,16 @@
|
|
|
549
573
|
}
|
|
550
574
|
},
|
|
551
575
|
"node_modules/appium-ios-tuntap": {
|
|
552
|
-
"version": "1.2.
|
|
553
|
-
"resolved": "https://registry.npmjs.org/appium-ios-tuntap/-/appium-ios-tuntap-1.2.
|
|
554
|
-
"integrity": "sha512-
|
|
576
|
+
"version": "1.2.2",
|
|
577
|
+
"resolved": "https://registry.npmjs.org/appium-ios-tuntap/-/appium-ios-tuntap-1.2.2.tgz",
|
|
578
|
+
"integrity": "sha512-h1T436MwEJ2Es++vg2ueCxpJfLIT53gYlnHtyiUFUWAdFPnWXEkeC0SexQzvinFaXpkdX0H8ytt0R1CiRdhc9Q==",
|
|
555
579
|
"hasInstallScript": true,
|
|
556
580
|
"license": "Apache-2.0",
|
|
557
581
|
"optional": true,
|
|
558
582
|
"dependencies": {
|
|
559
583
|
"@appium/support": "^7.2.0",
|
|
560
584
|
"node-addon-api": "^8.5.0",
|
|
561
|
-
"node-gyp-build": "^4.8.4"
|
|
562
|
-
"typescript": "^6.0.2"
|
|
585
|
+
"node-gyp-build": "^4.8.4"
|
|
563
586
|
},
|
|
564
587
|
"engines": {
|
|
565
588
|
"node": "^20.19.0 || ^22.12.0 || >=24.0.0",
|
|
@@ -675,13 +698,13 @@
|
|
|
675
698
|
"license": "MIT"
|
|
676
699
|
},
|
|
677
700
|
"node_modules/axios": {
|
|
678
|
-
"version": "1.
|
|
679
|
-
"resolved": "https://registry.npmjs.org/axios/-/axios-1.
|
|
680
|
-
"integrity": "sha512-
|
|
701
|
+
"version": "1.19.0",
|
|
702
|
+
"resolved": "https://registry.npmjs.org/axios/-/axios-1.19.0.tgz",
|
|
703
|
+
"integrity": "sha512-ht/iuYZXEjFxLH/Hkezgd7m6JKlHHXEUSneaDz8uZe1Gj5QZtCnpyDsckvAiEnT89OEbCLmnte4R4sn7P0EKFw==",
|
|
681
704
|
"license": "MIT",
|
|
682
705
|
"dependencies": {
|
|
683
706
|
"follow-redirects": "^1.16.0",
|
|
684
|
-
"form-data": "^4.0.
|
|
707
|
+
"form-data": "^4.0.6",
|
|
685
708
|
"https-proxy-agent": "^5.0.1",
|
|
686
709
|
"proxy-from-env": "^2.1.0"
|
|
687
710
|
}
|
|
@@ -882,9 +905,9 @@
|
|
|
882
905
|
}
|
|
883
906
|
},
|
|
884
907
|
"node_modules/brace-expansion": {
|
|
885
|
-
"version": "5.0.
|
|
886
|
-
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.
|
|
887
|
-
"integrity": "sha512-
|
|
908
|
+
"version": "5.0.9",
|
|
909
|
+
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz",
|
|
910
|
+
"integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==",
|
|
888
911
|
"license": "MIT",
|
|
889
912
|
"dependencies": {
|
|
890
913
|
"balanced-match": "^4.0.2"
|
|
@@ -3573,20 +3596,6 @@
|
|
|
3573
3596
|
"url": "https://opencollective.com/express"
|
|
3574
3597
|
}
|
|
3575
3598
|
},
|
|
3576
|
-
"node_modules/typescript": {
|
|
3577
|
-
"version": "6.0.3",
|
|
3578
|
-
"resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
|
|
3579
|
-
"integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
|
|
3580
|
-
"license": "Apache-2.0",
|
|
3581
|
-
"optional": true,
|
|
3582
|
-
"bin": {
|
|
3583
|
-
"tsc": "bin/tsc",
|
|
3584
|
-
"tsserver": "bin/tsserver"
|
|
3585
|
-
},
|
|
3586
|
-
"engines": {
|
|
3587
|
-
"node": ">=14.17"
|
|
3588
|
-
}
|
|
3589
|
-
},
|
|
3590
3599
|
"node_modules/unorm": {
|
|
3591
3600
|
"version": "1.6.0",
|
|
3592
3601
|
"resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz",
|