@appium/coresim 1.5.0 → 1.6.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 +6 -0
- package/README.md +14 -0
- package/binding.gyp +7 -0
- package/lib/src/commands/video-recording.d.ts +14 -7
- package/lib/src/commands/video-recording.d.ts.map +1 -1
- package/lib/src/commands/video-recording.js +36 -11
- package/lib/src/commands/video-recording.js.map +1 -1
- package/lib/src/commands/video-stream.d.ts +55 -7
- package/lib/src/commands/video-stream.d.ts.map +1 -1
- package/lib/src/commands/video-stream.js +37 -35
- package/lib/src/commands/video-stream.js.map +1 -1
- package/lib/src/native-simctl.js +12 -1
- package/lib/src/native-simctl.js.map +1 -1
- package/lib/src/types.d.ts +72 -10
- package/lib/src/types.d.ts.map +1 -1
- package/lib/src/utils/index.d.ts +1 -1
- package/lib/src/utils/index.d.ts.map +1 -1
- package/lib/src/utils/index.js +1 -1
- package/lib/src/utils/index.js.map +1 -1
- package/lib/src/utils/run-catching.d.ts +4 -0
- package/lib/src/utils/run-catching.d.ts.map +1 -1
- package/lib/src/utils/run-catching.js +11 -0
- package/lib/src/utils/run-catching.js.map +1 -1
- package/package.json +1 -1
- package/prebuilds/darwin-arm64/@appium+coresim.node +0 -0
- package/src/commands/video-recording.ts +49 -19
- package/src/commands/video-stream.ts +48 -39
- package/src/coresim.mm +547 -118
- package/src/native/audio_encoder.h +65 -0
- package/src/native/audio_encoder.mm +270 -0
- package/src/native/av_recording.h +52 -0
- package/src/native/av_recording.mm +424 -0
- package/src/native/av_stream.h +70 -0
- package/src/native/av_stream.mm +217 -0
- package/src/native/monotonic_clock.h +20 -0
- package/src/native/sim_audio_tap.h +67 -0
- package/src/native/sim_audio_tap.mm +350 -0
- package/src/native/sim_process.h +10 -0
- package/src/native/sim_process.mm +81 -18
- package/src/native/sim_video_stream.h +14 -11
- package/src/native/sim_video_stream.mm +27 -383
- package/src/native/video_encoder.h +76 -0
- package/src/native/video_encoder.mm +417 -0
- package/src/native-simctl.ts +12 -1
- package/src/types.ts +84 -11
- package/src/utils/index.ts +1 -1
- package/src/utils/run-catching.ts +11 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## [1.6.0](https://github.com/appium/coresim/compare/v1.5.0...v1.6.0) (2026-09-23)
|
|
2
|
+
|
|
3
|
+
### Features
|
|
4
|
+
|
|
5
|
+
* add optional audio capture to video recording and streaming ([#18](https://github.com/appium/coresim/issues/18)) ([e634078](https://github.com/appium/coresim/commit/e634078669db724a676bf95fa074a89d3ac5a9c8))
|
|
6
|
+
|
|
1
7
|
## [1.5.0](https://github.com/appium/coresim/compare/v1.4.0...v1.5.0) (2026-09-22)
|
|
2
8
|
|
|
3
9
|
### Features
|
package/README.md
CHANGED
|
@@ -54,6 +54,20 @@ await sim.deleteDevice(device.udid);
|
|
|
54
54
|
readiness with `getBootStatus()`/`waitForBoot()`.
|
|
55
55
|
- **Apps** — install, remove, launch, terminate, and inspect apps.
|
|
56
56
|
- **Processes** — spawn a process on the simulator and stream its stdout/stderr live.
|
|
57
|
+
- **Screen capture** — screenshots, video recording to a file, and a real-time encoded video
|
|
58
|
+
stream — optionally with the device's own audio, muxed into the recording or interleaved into
|
|
59
|
+
the stream (`audio: true` on `startVideoRecording`/`startVideoStream`). Audio capture requires:
|
|
60
|
+
- **macOS 14.2+** on the host (Core Audio process taps).
|
|
61
|
+
- The host's **"System Audio Recording Only"** privacy permission (System Settings > Privacy &
|
|
62
|
+
Security > Screen & System Audio Recording). This can't be granted programmatically, and a
|
|
63
|
+
denial isn't a thrown error — it silently produces an audio-less/near-silent track.
|
|
64
|
+
- A default audio output device on the host, and a booted simulator that has produced audio at
|
|
65
|
+
least once (e.g. a foreground app that plays sound) — an empty guest process set throws.
|
|
66
|
+
- Uses a host-side Core Audio API, not anything iOS-version-specific, so it's expected to work
|
|
67
|
+
on any simulator runtime; only Xcode 26.x has actually been exercised so far.
|
|
68
|
+
|
|
69
|
+
On some CI/headless hosts, starting an audio capture can block for a while before failing —
|
|
70
|
+
see [`CLAUDE.md`](./CLAUDE.md) for the known root cause and current workaround.
|
|
57
71
|
- **Simulator settings** — appearance (light/dark), accessibility (increase contrast, content
|
|
58
72
|
size), location, and permissions.
|
|
59
73
|
- **Extras** — keychain certificates, push notifications, and Darwin notifications.
|
package/binding.gyp
CHANGED
|
@@ -13,8 +13,13 @@
|
|
|
13
13
|
"src/native/tcc_privacy.mm",
|
|
14
14
|
"src/native/sim_pasteboard.mm",
|
|
15
15
|
"src/native/sim_process.mm",
|
|
16
|
+
"src/native/sim_audio_tap.mm",
|
|
17
|
+
"src/native/audio_encoder.mm",
|
|
18
|
+
"src/native/av_recording.mm",
|
|
19
|
+
"src/native/av_stream.mm",
|
|
16
20
|
"src/native/sim_screenshot.mm",
|
|
17
21
|
"src/native/sim_video_recording.mm",
|
|
22
|
+
"src/native/video_encoder.mm",
|
|
18
23
|
"src/native/sim_video_stream.mm"
|
|
19
24
|
],
|
|
20
25
|
"include_dirs": [
|
|
@@ -44,7 +49,9 @@
|
|
|
44
49
|
"OTHER_LDFLAGS": [
|
|
45
50
|
"-framework", "Foundation",
|
|
46
51
|
"-framework", "AppKit",
|
|
52
|
+
"-framework", "AudioToolbox",
|
|
47
53
|
"-framework", "AVFoundation",
|
|
54
|
+
"-framework", "CoreAudio",
|
|
48
55
|
"-framework", "CoreImage",
|
|
49
56
|
"-framework", "CoreMedia",
|
|
50
57
|
"-framework", "CoreVideo",
|
|
@@ -8,17 +8,24 @@ declare module '../native-simctl.js' {
|
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
10
|
/**
|
|
11
|
-
* Starts recording the device's display
|
|
12
|
-
*
|
|
13
|
-
*
|
|
14
|
-
*
|
|
15
|
-
*
|
|
16
|
-
*
|
|
11
|
+
* Starts recording the device's display (and, with `options.audio`, its audio too, muxed as a
|
|
12
|
+
* second track) to `outputFile` — the native equivalent of `simctl io <udid> recordVideo` when
|
|
13
|
+
* both `audio` and `fps` are unset. Resolves once the first frame has actually been recorded, so
|
|
14
|
+
* it's always safe to call {@link stopVideoRecording} immediately after. Only one recording may be
|
|
15
|
+
* active per device at a time; starting a second one while the first is still running rejects.
|
|
16
|
+
*
|
|
17
|
+
* Without `audio`/`fps`, rejects with `NativeSimUnavailableError` if this CoreSimulator predates
|
|
18
|
+
* the private capture API — confirmed missing on Xcode 16.4's, present on Xcode 26.5+ (Apple
|
|
19
|
+
* documents no exact version floor). With either set, see {@link VideoRecordingOptions.audio}'s
|
|
20
|
+
* own doc comment for the host-permission requirement that applies specifically to `audio`; a
|
|
21
|
+
* failure *after* this call has already resolved (e.g. the audio tap's guest process set vanishing
|
|
22
|
+
* mid-recording) doesn't reject it — it's logged here instead — call {@link stopVideoRecording} to
|
|
23
|
+
* observe it as a rejection and release the recording's resources.
|
|
17
24
|
*
|
|
18
25
|
* @param udid — UDID of the device to record; must be booted
|
|
19
26
|
* @param outputFile — filesystem path to write the video to; resolved against `process.cwd()` if
|
|
20
27
|
* relative, since the native layer requires an absolute path
|
|
21
|
-
* @param options — `displayId`, `codec`, `mask` — see {@link VideoRecordingOptions}
|
|
28
|
+
* @param options — `displayId`, `codec`, `mask`, `audio`, `fps`, `bitrate` — see {@link VideoRecordingOptions}
|
|
22
29
|
* @throws {Error} if a recording is already in progress for this device
|
|
23
30
|
*/
|
|
24
31
|
export declare function startVideoRecording(this: NativeSimctl, udid: string, outputFile: string, options?: VideoRecordingOptions): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"video-recording.d.ts","sourceRoot":"","sources":["../../../src/commands/video-recording.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"video-recording.d.ts","sourceRoot":"","sources":["../../../src/commands/video-recording.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAA6B,qBAAqB,EAAC,MAAM,aAAa,CAAC;AAGnF,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,YAAY;QACpB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACtG,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAChD,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;KAClD;CACF;AAqBD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,YAAY,EAClB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,IAAI,CAAC,CAqCf;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA8BxF;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAEzF"}
|
|
@@ -1,29 +1,51 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
|
-
import {
|
|
2
|
+
import { logger } from '@appium/support';
|
|
3
|
+
import { runCatchingAsync, toTypedError } from '../utils/index.js';
|
|
4
|
+
const log = logger.getLogger('CoreSim');
|
|
3
5
|
// Tracks which devices currently have an active recording — module-level since the constraint (at
|
|
4
6
|
// most one per device) is CoreSimulator's own, not per-NativeSimctl-instance.
|
|
5
7
|
const activeRecordings = new Map();
|
|
6
8
|
/**
|
|
7
|
-
* Starts recording the device's display
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
9
|
+
* Starts recording the device's display (and, with `options.audio`, its audio too, muxed as a
|
|
10
|
+
* second track) to `outputFile` — the native equivalent of `simctl io <udid> recordVideo` when
|
|
11
|
+
* both `audio` and `fps` are unset. Resolves once the first frame has actually been recorded, so
|
|
12
|
+
* it's always safe to call {@link stopVideoRecording} immediately after. Only one recording may be
|
|
13
|
+
* active per device at a time; starting a second one while the first is still running rejects.
|
|
14
|
+
*
|
|
15
|
+
* Without `audio`/`fps`, rejects with `NativeSimUnavailableError` if this CoreSimulator predates
|
|
16
|
+
* the private capture API — confirmed missing on Xcode 16.4's, present on Xcode 26.5+ (Apple
|
|
17
|
+
* documents no exact version floor). With either set, see {@link VideoRecordingOptions.audio}'s
|
|
18
|
+
* own doc comment for the host-permission requirement that applies specifically to `audio`; a
|
|
19
|
+
* failure *after* this call has already resolved (e.g. the audio tap's guest process set vanishing
|
|
20
|
+
* mid-recording) doesn't reject it — it's logged here instead — call {@link stopVideoRecording} to
|
|
21
|
+
* observe it as a rejection and release the recording's resources.
|
|
13
22
|
*
|
|
14
23
|
* @param udid — UDID of the device to record; must be booted
|
|
15
24
|
* @param outputFile — filesystem path to write the video to; resolved against `process.cwd()` if
|
|
16
25
|
* relative, since the native layer requires an absolute path
|
|
17
|
-
* @param options — `displayId`, `codec`, `mask` — see {@link VideoRecordingOptions}
|
|
26
|
+
* @param options — `displayId`, `codec`, `mask`, `audio`, `fps`, `bitrate` — see {@link VideoRecordingOptions}
|
|
18
27
|
* @throws {Error} if a recording is already in progress for this device
|
|
19
28
|
*/
|
|
20
29
|
export async function startVideoRecording(udid, outputFile, options = {}) {
|
|
30
|
+
// Mirrors startVideoStream's identical validation — both reach the same native encoder path,
|
|
31
|
+
// which otherwise silently truncates an out-of-range value instead of rejecting it.
|
|
32
|
+
if (options.fps !== undefined && (!Number.isFinite(options.fps) || options.fps < 1)) {
|
|
33
|
+
throw new RangeError(`fps must be a finite number >= 1, got ${options.fps}`);
|
|
34
|
+
}
|
|
35
|
+
if (options.bitrate !== undefined &&
|
|
36
|
+
(!Number.isFinite(options.bitrate) || options.bitrate <= 0 || options.bitrate > 2 ** 31 - 1)) {
|
|
37
|
+
throw new RangeError(`bitrate must be a positive number no greater than ${2 ** 31 - 1}, got ${options.bitrate}`);
|
|
38
|
+
}
|
|
21
39
|
const key = udid.toLowerCase();
|
|
22
40
|
if (activeRecordings.has(key)) {
|
|
23
41
|
throw new Error(`A video recording is already in progress for device '${udid}'`);
|
|
24
42
|
}
|
|
25
43
|
const absoluteOutputFile = path.resolve(outputFile);
|
|
26
|
-
const startPromise = runCatchingAsync(async () => (await this._findDevice(udid)).startVideoRecording(absoluteOutputFile, options)
|
|
44
|
+
const startPromise = runCatchingAsync(async () => (await this._findDevice(udid)).startVideoRecording(absoluteOutputFile, options, (err) => {
|
|
45
|
+
// Only ever invoked on the `audio`/`fps` (own-encoder) path — see its own doc comment above.
|
|
46
|
+
// No live consumer to report to (this call already resolved), so logged instead of lost.
|
|
47
|
+
log.error(`Unhandled video recording error for device '${udid}': ${toTypedError(err).stack ?? err}`);
|
|
48
|
+
}));
|
|
27
49
|
// Marked before the native call resolves, not after, so a concurrent startVideoRecording for the
|
|
28
50
|
// same device is rejected immediately instead of racing this one — rolled back below on failure.
|
|
29
51
|
const state = { start: startPromise };
|
|
@@ -62,14 +84,17 @@ export async function stopVideoRecording(udid) {
|
|
|
62
84
|
if (!state) {
|
|
63
85
|
throw new Error(`No video recording is in progress for device '${udid}'`);
|
|
64
86
|
}
|
|
87
|
+
let handle;
|
|
65
88
|
try {
|
|
66
|
-
await state.start;
|
|
89
|
+
handle = await state.start;
|
|
67
90
|
}
|
|
68
91
|
catch {
|
|
69
92
|
// start itself failed — its own catch already cleaned up activeRecordings; nothing to stop.
|
|
70
93
|
throw new Error(`No video recording is in progress for device '${udid}'`);
|
|
71
94
|
}
|
|
72
|
-
const stopPromise = (state.stop ??= runCatchingAsync(async () =>
|
|
95
|
+
const stopPromise = (state.stop ??= runCatchingAsync(async () => {
|
|
96
|
+
await handle.stop();
|
|
97
|
+
}));
|
|
73
98
|
try {
|
|
74
99
|
await stopPromise;
|
|
75
100
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"video-recording.js","sourceRoot":"","sources":["../../../src/commands/video-recording.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"video-recording.js","sourceRoot":"","sources":["../../../src/commands/video-recording.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,9 +6,56 @@ declare module '../native-simctl.js' {
|
|
|
6
6
|
startVideoStream(udid: string, options?: VideoStreamOptions): Promise<VideoStream>;
|
|
7
7
|
}
|
|
8
8
|
}
|
|
9
|
+
export declare const MAX_BUFFERED_UNITS = 60;
|
|
9
10
|
/**
|
|
10
|
-
*
|
|
11
|
-
*
|
|
11
|
+
* Single-consumer FIFO between native's per-frame callback and `accessUnits()`. Unlike routing
|
|
12
|
+
* through `EventEmitter`, a unit pushed before any consumer has started iterating is retained
|
|
13
|
+
* (fixing the encoder's own first-frame/keyframe otherwise being lost to a startup race) rather
|
|
14
|
+
* than silently dropped.
|
|
15
|
+
*
|
|
16
|
+
* Bounded at `MAX_BUFFERED_UNITS`, but resync-aware about *how* it sheds load once a slow consumer
|
|
17
|
+
* falls behind: since interframes only reference earlier frames they were encoded against (no
|
|
18
|
+
* `AllowFrameReordering`), dropping an arbitrary one would orphan every later one from its
|
|
19
|
+
* reference chain, corrupting decode from that point on even though delivery looks unbroken.
|
|
20
|
+
* Overflow instead clears the backlog entirely and enters a resync state — `dropsDuringResync`
|
|
21
|
+
* decides which further units to discard (not buffer) until `endsResync` sees a self-decodable
|
|
22
|
+
* point to resume clean delivery from. Generic (not hardcoded to video's own reference-chain
|
|
23
|
+
* concern) so `VideoStream` can reuse this same machinery when it's carrying interleaved audio
|
|
24
|
+
* too (`VideoStreamOptions.audio`) — an audio unit is always independently decodable, so it's
|
|
25
|
+
* configured to never be dropped and never itself end a resync; only video interframes are.
|
|
26
|
+
*/
|
|
27
|
+
export declare class AccessUnitQueue<T> {
|
|
28
|
+
private readonly opts;
|
|
29
|
+
private readonly buffer;
|
|
30
|
+
private waiter;
|
|
31
|
+
private ended;
|
|
32
|
+
private error;
|
|
33
|
+
private resyncing;
|
|
34
|
+
constructor(opts: {
|
|
35
|
+
/** Whether `unit` should be discarded (not buffered) while resyncing. */
|
|
36
|
+
dropsDuringResync: (unit: T) => boolean;
|
|
37
|
+
/** Whether `unit` is a self-decodable point resync can resume clean delivery from. */
|
|
38
|
+
endsResync: (unit: T) => boolean;
|
|
39
|
+
/** Called once when overflow first forces a resync, e.g. to request a fresh keyframe. */
|
|
40
|
+
onOverflow?: () => void;
|
|
41
|
+
});
|
|
42
|
+
push(unit: T): void;
|
|
43
|
+
/** Ends the queue with an error — any pending or future `next()` rejects with it. */
|
|
44
|
+
fail(err: unknown): void;
|
|
45
|
+
/** Ends the queue cleanly — any pending or future `next()` resolves `done`. */
|
|
46
|
+
end(): void;
|
|
47
|
+
/**
|
|
48
|
+
* Resolves `done` (not rejects) if `signal` aborts while waiting, mirroring `events.on()`.
|
|
49
|
+
* Checks cancellation/end *before* dequeuing, so an already-aborted signal or an already-ended
|
|
50
|
+
* queue never hands out a stale buffered unit — an aborted consumer, or a fresh iterator started
|
|
51
|
+
* after `stop()`, must see the boundary immediately rather than draining leftovers first.
|
|
52
|
+
*/
|
|
53
|
+
next(signal: AbortSignal): Promise<IteratorResult<T>>;
|
|
54
|
+
}
|
|
55
|
+
/**
|
|
56
|
+
* A live video stream from `NativeSimctl.startVideoStream` — encodes the device's display (and,
|
|
57
|
+
* with `options.audio`, its audio too — see {@link VideoStreamOptions}) in real time via
|
|
58
|
+
* VideoToolbox/Core Audio, unlike `startVideoRecording`, which drives CoreSimulator's own private,
|
|
12
59
|
* file-only recorder. Mirrors `appium-ios-remotexpc`'s `ScreenStreamCapture` shape
|
|
13
60
|
* (`accessUnits()`/`stop()`) for API consistency; the transport is otherwise unrelated.
|
|
14
61
|
*/
|
|
@@ -32,13 +79,14 @@ export declare class VideoStream extends EventEmitter {
|
|
|
32
79
|
stop(): Promise<void>;
|
|
33
80
|
}
|
|
34
81
|
/**
|
|
35
|
-
* Starts encoding the device's display
|
|
36
|
-
* started; the returned {@link VideoStream}'s
|
|
37
|
-
*
|
|
38
|
-
*
|
|
82
|
+
* Starts encoding the device's display (and, with `options.audio`, its audio) in real time.
|
|
83
|
+
* Resolves once the encoder(s) have actually started; the returned {@link VideoStream}'s
|
|
84
|
+
* `accessUnits()` then yields each unit as it arrives. Independent of
|
|
85
|
+
* `startVideoRecording`/`stopVideoRecording` — both, and any number of concurrent streams, can
|
|
86
|
+
* run on the same device at once.
|
|
39
87
|
*
|
|
40
88
|
* @param udid — UDID of the device to stream; must be booted
|
|
41
|
-
* @param options — `displayId`, `codec`, `fps`, `bitrate` — see {@link VideoStreamOptions}
|
|
89
|
+
* @param options — `displayId`, `codec`, `fps`, `bitrate`, `audio` — see {@link VideoStreamOptions}
|
|
42
90
|
*/
|
|
43
91
|
export declare function startVideoStream(this: NativeSimctl, udid: string, options?: VideoStreamOptions): Promise<VideoStream>;
|
|
44
92
|
//# sourceMappingURL=video-stream.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"video-stream.d.ts","sourceRoot":"","sources":["../../../src/commands/video-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"video-stream.d.ts","sourceRoot":"","sources":["../../../src/commands/video-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAIzC,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAA0B,eAAe,EAAE,kBAAkB,EAAC,MAAM,aAAa,CAAC;AAG9F,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,YAAY;QACpB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;KACpF;CACF;AASD,eAAO,MAAM,kBAAkB,KAAK,CAAC;AAKrC;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,eAAe,CAAC,CAAC;IAQ1B,OAAO,CAAC,QAAQ,CAAC,IAAI;IAPvB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAClC,OAAO,CAAC,MAAM,CAA6F;IAC3G,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,KAAK,CAAU;IACvB,OAAO,CAAC,SAAS,CAAS;gBAGP,IAAI,EAAE;QACrB,yEAAyE;QACzE,iBAAiB,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC;QACxC,sFAAsF;QACtF,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC;QACjC,yFAAyF;QACzF,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;KACzB;IAGH,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI;IA0BnB,qFAAqF;IACrF,IAAI,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAcxB,+EAA+E;IAC/E,GAAG,IAAI,IAAI;IAaX;;;;;OAKG;IACH,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;CA6BtD;AAED;;;;;;GAMG;AACH,qBAAa,WAAY,SAAQ,YAAY;aAiBf,KAAK,EAAE,MAAM,GAAG,MAAM;IAhBlD,OAAO,CAAC,MAAM,CAAsC;IACpD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAyB;IACxD,OAAO,CAAC,WAAW,CAA4B;IAM/C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAInB;IACH,OAAO,CAAC,eAAe,CAAK;IAiC5B;;;;;;;OAOG;IACI,WAAW,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,cAAc,CAAC,eAAe,CAAC;IAmBzE,gGAAgG;IAC1F,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ5B;AAED;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,YAAY,EAClB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,WAAW,CAAC,CAuBtB"}
|
|
@@ -1,58 +1,52 @@
|
|
|
1
1
|
import { EventEmitter } from 'node:events';
|
|
2
2
|
import { logger } from '@appium/support';
|
|
3
|
-
import {
|
|
4
|
-
import { runCatchingAsync } from '../utils/index.js';
|
|
3
|
+
import { runCatchingAsync, toTypedError } from '../utils/index.js';
|
|
5
4
|
const log = logger.getLogger('CoreSim');
|
|
6
5
|
// Matches the native side's own ThreadSafeFunction queue bound (see coresim.mm's
|
|
7
6
|
// kAccessUnitQueueSize) — kept here too since the native bound alone provides no real
|
|
8
7
|
// backpressure: _handleAccessUnit's emit-equivalent push always returns immediately, regardless of
|
|
9
8
|
// how slow the actual accessUnits() consumer is, so without a bound of its own this queue could
|
|
10
9
|
// otherwise grow without limit while a slow consumer falls behind.
|
|
11
|
-
const MAX_BUFFERED_UNITS = 60;
|
|
10
|
+
export const MAX_BUFFERED_UNITS = 60;
|
|
12
11
|
const SINGLE_CONSUMER_ERROR = 'VideoStream.accessUnits() supports only one active consumer at a time — a second concurrent call rejects.';
|
|
13
|
-
/** `wrapNativeError` always throws — this just gets its thrown value back as a plain return, to emit rather than raise it. */
|
|
14
|
-
function toTypedError(err) {
|
|
15
|
-
try {
|
|
16
|
-
wrapNativeError(err);
|
|
17
|
-
}
|
|
18
|
-
catch (wrapped) {
|
|
19
|
-
return wrapped;
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
12
|
/**
|
|
23
13
|
* Single-consumer FIFO between native's per-frame callback and `accessUnits()`. Unlike routing
|
|
24
14
|
* through `EventEmitter`, a unit pushed before any consumer has started iterating is retained
|
|
25
15
|
* (fixing the encoder's own first-frame/keyframe otherwise being lost to a startup race) rather
|
|
26
16
|
* than silently dropped.
|
|
27
17
|
*
|
|
28
|
-
* Bounded at `MAX_BUFFERED_UNITS`, but
|
|
29
|
-
* falls behind: since
|
|
30
|
-
* `AllowFrameReordering`), dropping an arbitrary
|
|
18
|
+
* Bounded at `MAX_BUFFERED_UNITS`, but resync-aware about *how* it sheds load once a slow consumer
|
|
19
|
+
* falls behind: since interframes only reference earlier frames they were encoded against (no
|
|
20
|
+
* `AllowFrameReordering`), dropping an arbitrary one would orphan every later one from its
|
|
31
21
|
* reference chain, corrupting decode from that point on even though delivery looks unbroken.
|
|
32
|
-
* Overflow instead clears the backlog entirely and enters a resync state
|
|
33
|
-
* further
|
|
34
|
-
*
|
|
22
|
+
* Overflow instead clears the backlog entirely and enters a resync state — `dropsDuringResync`
|
|
23
|
+
* decides which further units to discard (not buffer) until `endsResync` sees a self-decodable
|
|
24
|
+
* point to resume clean delivery from. Generic (not hardcoded to video's own reference-chain
|
|
25
|
+
* concern) so `VideoStream` can reuse this same machinery when it's carrying interleaved audio
|
|
26
|
+
* too (`VideoStreamOptions.audio`) — an audio unit is always independently decodable, so it's
|
|
27
|
+
* configured to never be dropped and never itself end a resync; only video interframes are.
|
|
35
28
|
*/
|
|
36
|
-
class AccessUnitQueue {
|
|
37
|
-
|
|
29
|
+
export class AccessUnitQueue {
|
|
30
|
+
opts;
|
|
38
31
|
buffer = [];
|
|
39
32
|
waiter;
|
|
40
33
|
ended = false;
|
|
41
34
|
error;
|
|
42
35
|
resyncing = false;
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
this.onOverflow = onOverflow;
|
|
36
|
+
constructor(opts) {
|
|
37
|
+
this.opts = opts;
|
|
46
38
|
}
|
|
47
39
|
push(unit) {
|
|
48
40
|
if (this.ended) {
|
|
49
41
|
return;
|
|
50
42
|
}
|
|
51
43
|
if (this.resyncing) {
|
|
52
|
-
if (
|
|
44
|
+
if (this.opts.dropsDuringResync(unit)) {
|
|
53
45
|
return; // still waiting for a self-decodable point to resume delivery from
|
|
54
46
|
}
|
|
55
|
-
this.
|
|
47
|
+
if (this.opts.endsResync(unit)) {
|
|
48
|
+
this.resyncing = false;
|
|
49
|
+
}
|
|
56
50
|
}
|
|
57
51
|
if (this.waiter) {
|
|
58
52
|
const { resolve } = this.waiter;
|
|
@@ -64,7 +58,7 @@ class AccessUnitQueue {
|
|
|
64
58
|
if (this.buffer.length > MAX_BUFFERED_UNITS) {
|
|
65
59
|
this.buffer.length = 0;
|
|
66
60
|
this.resyncing = true;
|
|
67
|
-
this.onOverflow?.();
|
|
61
|
+
this.opts.onOverflow?.();
|
|
68
62
|
}
|
|
69
63
|
}
|
|
70
64
|
/** Ends the queue with an error — any pending or future `next()` rejects with it. */
|
|
@@ -131,8 +125,9 @@ class AccessUnitQueue {
|
|
|
131
125
|
}
|
|
132
126
|
}
|
|
133
127
|
/**
|
|
134
|
-
* A live video stream from `NativeSimctl.startVideoStream` — encodes the device's display
|
|
135
|
-
*
|
|
128
|
+
* A live video stream from `NativeSimctl.startVideoStream` — encodes the device's display (and,
|
|
129
|
+
* with `options.audio`, its audio too — see {@link VideoStreamOptions}) in real time via
|
|
130
|
+
* VideoToolbox/Core Audio, unlike `startVideoRecording`, which drives CoreSimulator's own private,
|
|
136
131
|
* file-only recorder. Mirrors `appium-ios-remotexpc`'s `ScreenStreamCapture` shape
|
|
137
132
|
* (`accessUnits()`/`stop()`) for API consistency; the transport is otherwise unrelated.
|
|
138
133
|
*/
|
|
@@ -143,8 +138,14 @@ export class VideoStream extends EventEmitter {
|
|
|
143
138
|
stopPromise;
|
|
144
139
|
// Requests a fresh keyframe on resync so delivery can resume immediately rather than waiting
|
|
145
140
|
// for the next periodic one — `handle` may not be attached yet on a startup-time overflow
|
|
146
|
-
// (vanishingly unlikely given MAX_BUFFERED_UNITS), in which case this is just a no-op.
|
|
147
|
-
|
|
141
|
+
// (vanishingly unlikely given MAX_BUFFERED_UNITS), in which case this is just a no-op. Only a
|
|
142
|
+
// video keyframe ends/is exempt from resync — an audio unit (when present) is always
|
|
143
|
+
// independently decodable, so it's never dropped and never itself ends a resync.
|
|
144
|
+
queue = new AccessUnitQueue({
|
|
145
|
+
dropsDuringResync: (unit) => unit.track === 'video' && !unit.isKeyFrame,
|
|
146
|
+
endsResync: (unit) => unit.track === 'video' && unit.isKeyFrame,
|
|
147
|
+
onOverflow: () => this.handle?.requestKeyFrame(),
|
|
148
|
+
});
|
|
148
149
|
activeConsumers = 0;
|
|
149
150
|
/** @internal */
|
|
150
151
|
constructor(codec) {
|
|
@@ -213,13 +214,14 @@ export class VideoStream extends EventEmitter {
|
|
|
213
214
|
}
|
|
214
215
|
}
|
|
215
216
|
/**
|
|
216
|
-
* Starts encoding the device's display
|
|
217
|
-
* started; the returned {@link VideoStream}'s
|
|
218
|
-
*
|
|
219
|
-
*
|
|
217
|
+
* Starts encoding the device's display (and, with `options.audio`, its audio) in real time.
|
|
218
|
+
* Resolves once the encoder(s) have actually started; the returned {@link VideoStream}'s
|
|
219
|
+
* `accessUnits()` then yields each unit as it arrives. Independent of
|
|
220
|
+
* `startVideoRecording`/`stopVideoRecording` — both, and any number of concurrent streams, can
|
|
221
|
+
* run on the same device at once.
|
|
220
222
|
*
|
|
221
223
|
* @param udid — UDID of the device to stream; must be booted
|
|
222
|
-
* @param options — `displayId`, `codec`, `fps`, `bitrate` — see {@link VideoStreamOptions}
|
|
224
|
+
* @param options — `displayId`, `codec`, `fps`, `bitrate`, `audio` — see {@link VideoStreamOptions}
|
|
223
225
|
*/
|
|
224
226
|
export async function startVideoStream(udid, options = {}) {
|
|
225
227
|
// The native poller clamps below 1 fps to 1 fps rather than actually polling that slowly, so a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"video-stream.js","sourceRoot":"","sources":["../../../src/commands/video-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"video-stream.js","sourceRoot":"","sources":["../../../src/commands/video-stream.ts"],"names":[],"mappings":"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"}
|
package/lib/src/native-simctl.js
CHANGED
|
@@ -208,7 +208,18 @@ const loadNative = util.memoize(function loadNative() {
|
|
|
208
208
|
if (process.platform !== 'darwin') {
|
|
209
209
|
throw new NativeSimUnavailableError(`${PACKAGE_NAME} requires macOS — CoreSimulator.framework does not exist on ${process.platform}`, 'platform', process.platform, 'n/a');
|
|
210
210
|
}
|
|
211
|
-
|
|
211
|
+
const native = require('node-gyp-build')(getPkgRoot());
|
|
212
|
+
// A forgotten (never explicitly stopped) AV recording/stream otherwise silently loses data —
|
|
213
|
+
// or just leaks a live encoder — the instant a caller force-exits via `process.exit()`, since
|
|
214
|
+
// Node's own cleanup hooks (coresim.mm's CleanupActiveSessions, registered against the exact
|
|
215
|
+
// same condition) are confirmed to NOT run in that path, only on a natural empty-event-loop
|
|
216
|
+
// exit or a Worker's own termination. `process.on('exit', ...)` does fire for `process.exit()`
|
|
217
|
+
// too, and (per Node's own contract) may run synchronous code — flushActiveSessions() qualifies:
|
|
218
|
+
// it's a single blocking native call, not new async JS work. Registered once, lazily, here
|
|
219
|
+
// rather than at module import time, so merely importing this package on a non-macOS platform
|
|
220
|
+
// never touches `process` for something it'll never need.
|
|
221
|
+
process.on('exit', () => native.flushActiveSessions());
|
|
222
|
+
return native;
|
|
212
223
|
});
|
|
213
224
|
const DEFAULT_DEVELOPER_DIR_TIMEOUT_MS = 15_000;
|
|
214
225
|
function defaultDeveloperDir() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-simctl.js","sourceRoot":"","sources":["../../src/native-simctl.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"native-simctl.js","sourceRoot":"","sources":["../../src/native-simctl.ts"],"names":[],"mappings":"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"}
|