appium-mac2-driver 2.1.1 → 2.2.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.2.0](https://github.com/appium/appium-mac2-driver/compare/v2.1.1...v2.2.0) (2025-02-11)
+
+
+### Features
+
+* Publish native video chunks over bidi ([#333](https://github.com/appium/appium-mac2-driver/issues/333)) ([6cf4f6d](https://github.com/appium/appium-mac2-driver/commit/6cf4f6d341798290e8416120de2ac93e1263f051))
+
 ## [2.1.1](https://github.com/appium/appium-mac2-driver/compare/v2.1.0...v2.1.1) (2025-02-08)
 
 

package/README.md

@@ -617,6 +617,12 @@ then it would be stopped automatically upon the test session termination,
 and leftover videos would be deleted as well.
 Xcode must be at version 15+.
 
+> [!TIP]
+> Invocation of this API also triggers broadcasting of
+> [appium:mac2.nativeVideoRecordingChunkAdded](./docs/bidi.md#appiummac2nativevideorecordingchunkadded)
+> BiDi events. Make sure to subscribe to such events **before** this API is invoked to ensure
+> all video chunks are being properly consumed on the client side.
+
 #### Arguments
 
 Name | Type | Required | Description | Example
@@ -677,6 +683,7 @@ method | string | no | The http multipart upload method name. The 'PUT' one is u
 headers | map | no | Additional headers mapping for multipart http(s) uploads | `{"header": "value"}`
 fileFieldName | string | no | The name of the form field, where the file content BLOB should be stored for http(s) uploads. `file` by default | payload
 formFields | Map or `Array<Pair>` | no | Additional form fields for multipart http(s) uploads | `{"field1": "value1", "field2": "value2"}` or `[["field1", "value1"], ["field2", "value2"]]`
+ignorePayload | boolean | no | Whether to ignore the resulting video payload and return an empty string. Useful if you prefer to fetch video chunks via the [appium:mac2.nativeVideoRecordingChunkAdded](./docs/bidi.md#appiummac2nativevideorecordingchunkadded) BiDi event. false by default. | true
 
 #### Returns
 

package/build/lib/commands/bidi/constants.d.ts

@@ -0,0 +1,3 @@
+export declare const BIDI_EVENT_NAME = "bidiEvent";
+export declare const NATIVE_VIDEO_CHUNK_ADDED_EVENT = "appium:mac2.nativeVideoRecordingChunkAdded";
+//# sourceMappingURL=constants.d.ts.map

package/build/lib/commands/bidi/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../lib/commands/bidi/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,cAAc,CAAC;AAE3C,eAAO,MAAM,8BAA8B,+CAAoD,CAAC"}

package/build/lib/commands/bidi/constants.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NATIVE_VIDEO_CHUNK_ADDED_EVENT = exports.BIDI_EVENT_NAME = void 0;
+exports.BIDI_EVENT_NAME = 'bidiEvent';
+const DOMAIN = 'mac2';
+exports.NATIVE_VIDEO_CHUNK_ADDED_EVENT = `appium:${DOMAIN}.nativeVideoRecordingChunkAdded`;
+//# sourceMappingURL=constants.js.map

package/build/lib/commands/bidi/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../lib/commands/bidi/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,WAAW,CAAC;AAC3C,MAAM,MAAM,GAAG,MAAM,CAAC;AACT,QAAA,8BAA8B,GAAG,UAAU,MAAM,iCAAiC,CAAC"}

package/build/lib/commands/bidi/models.d.ts

@@ -0,0 +1,3 @@
+import type { NativeVideoChunkAddedEvent } from './types';
+export declare function toNativeVideoChunkAddedEvent(uuid: string, payload: Buffer): NativeVideoChunkAddedEvent;
+//# sourceMappingURL=models.d.ts.map

package/build/lib/commands/bidi/models.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../lib/commands/bidi/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,SAAS,CAAC;AAG1D,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GACd,0BAA0B,CAQ5B"}

package/build/lib/commands/bidi/models.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toNativeVideoChunkAddedEvent = toNativeVideoChunkAddedEvent;
+const constants_1 = require("./constants");
+function toNativeVideoChunkAddedEvent(uuid, payload) {
+    return {
+        method: constants_1.NATIVE_VIDEO_CHUNK_ADDED_EVENT,
+        params: {
+            uuid,
+            payload: payload.toString('base64'),
+        },
+    };
+}
+//# sourceMappingURL=models.js.map

package/build/lib/commands/bidi/models.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../lib/commands/bidi/models.ts"],"names":[],"mappings":";;AAGA,oEAWC;AAbD,2CAA6D;AAE7D,SAAgB,4BAA4B,CAC1C,IAAY,EACZ,OAAe;IAEf,OAAO;QACL,MAAM,EAAE,0CAA8B;QACtC,MAAM,EAAE;YACN,IAAI;YACJ,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;SACpC;KACF,CAAC;AACJ,CAAC"}

package/build/lib/commands/bidi/types.d.ts

@@ -0,0 +1,12 @@
+interface BiDiEvent<TParams> {
+    method: string;
+    params: TParams;
+}
+interface NativeVideoChunkAddedParams {
+    uuid: string;
+    payload: string;
+}
+export interface NativeVideoChunkAddedEvent extends BiDiEvent<NativeVideoChunkAddedParams> {
+}
+export {};
+//# sourceMappingURL=types.d.ts.map

package/build/lib/commands/bidi/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../lib/commands/bidi/types.ts"],"names":[],"mappings":"AAAA,UAAU,SAAS,CAAC,OAAO;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,UAAU,2BAA2B;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,0BAA2B,SAAQ,SAAS,CAAC,2BAA2B,CAAC;CAAG"}

package/build/lib/commands/bidi/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/build/lib/commands/bidi/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../lib/commands/bidi/types.ts"],"names":[],"mappings":""}

package/build/lib/commands/native-record-screen.d.ts

@@ -1,5 +1,20 @@
 import type { Mac2Driver } from '../driver';
-import type { StringRecord } from '@appium/types';
+import type { AppiumLogger, StringRecord } from '@appium/types';
+import type EventEmitter from 'node:events';
+export declare class NativeVideoChunksBroadcaster {
+    private _ee;
+    private _log;
+    private _publishers;
+    private _terminated;
+    constructor(ee: EventEmitter, log: AppiumLogger);
+    get hasPublishers(): boolean;
+    schedule(uuid: string): void;
+    waitFor(uuid: string): Promise<void>;
+    shutdown(timeoutMs: number): Promise<void>;
+    private _createPublisher;
+    private _wait;
+    private _cleanup;
+}
 /**
  * Initiates a new native screen recording session via XCTest.
  * If the screen recording is already running then this call results in noop.
@@ -40,20 +55,16 @@ export declare function macosGetNativeScreenRecordingInfo(this: Mac2Driver): Pro
  * @param fileFieldName The name of the form field, where the file content BLOB should
  *                                 be stored for http(s) uploads
  * @param formFields Additional form fields for multipart http(s) uploads
+ * @param ignorePayload Whether to ignore the resulting video payload
+ * and return an empty string. Useful if you prefer to fetch
+ * video chunks via a BiDi web socket.
  * @returns Base64-encoded content of the recorded media file if 'remotePath'
- * parameter is falsy or an empty string.
+ * parameter is falsy or an empty string or ignorePayload is set to `true`.
  * @throws {Error} If there was an error while getting the name of a media file
  * or the file content cannot be uploaded to the remote location
  * or screen recording is not supported on the device under test.
  */
-export declare function macosStopNativeScreenRecording(this: Mac2Driver, remotePath?: string, user?: string, pass?: string, method?: string, headers?: StringRecord | [string, any][], fileFieldName?: string, formFields?: StringRecord | [string, string][]): Promise<string>;
-/**
- * Deletes previously recorded videos with given ids.
- * This call is safe and does not raise any errors.
- *
- * @param uuids One or more video UUIDs to be deleted
- */
-export declare function cleanupNativeRecordedVideos(this: Mac2Driver, uuids: string | Set<string>): Promise<void>;
+export declare function macosStopNativeScreenRecording(this: Mac2Driver, remotePath?: string, user?: string, pass?: string, method?: string, headers?: StringRecord | [string, any][], fileFieldName?: string, formFields?: StringRecord | [string, string][], ignorePayload?: boolean): Promise<string>;
 /**
  * Fetches information about available displays
  *

package/build/lib/commands/native-record-screen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"native-record-screen.d.ts","sourceRoot":"","sources":["../../../lib/commands/native-record-screen.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,UAAU,EAChB,GAAG,CAAC,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,eAAe,CAAC,CAQ1B;AAED;;;;GAIG;AACH,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,UAAU,GACf,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAEjC;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,UAAU,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,YAAY,GAAC,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EACtC,aAAa,CAAC,EAAE,MAAM,EACtB,UAAU,CAAC,EAAE,YAAY,GAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAC3C,OAAO,CAAC,MAAM,CAAC,CAoCjB;AAED;;;;;GAKG;AACH,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAE5F;AAcD,UAAU,eAAe;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,WAAW;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,OAAO,CAAC;CACjB"}
+{"version":3,"file":"native-record-screen.d.ts","sourceRoot":"","sources":["../../../lib/commands/native-record-screen.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE5C,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,KAAK,YAAY,MAAM,aAAa,CAAC;AAW5C,qBAAa,4BAA4B;IACvC,OAAO,CAAC,GAAG,CAAe;IAC1B,OAAO,CAAC,IAAI,CAAe;IAC3B,OAAO,CAAC,WAAW,CAA6B;IAChD,OAAO,CAAC,WAAW,CAAU;gBAEhB,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY;IAOhD,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAMtB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOpC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAYlC,gBAAgB;YA2DhB,KAAK;YAuBL,QAAQ;CAyBvB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,UAAU,EAChB,GAAG,CAAC,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,eAAe,CAAC,CAQ1B;AAED;;;;GAIG;AACH,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,UAAU,GACf,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAEjC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,UAAU,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,YAAY,GAAC,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EACtC,aAAa,CAAC,EAAE,MAAM,EACtB,UAAU,CAAC,EAAE,YAAY,GAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EAC5C,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,MAAM,CAAC,CAkDjB;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAE5F;AAmBD,UAAU,eAAe;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,WAAW;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,OAAO,CAAC;CACjB"}

package/build/lib/commands/native-record-screen.js

@@ -1,17 +1,185 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.NativeVideoChunksBroadcaster = void 0;
 exports.macosStartNativeScreenRecording = macosStartNativeScreenRecording;
 exports.macosGetNativeScreenRecordingInfo = macosGetNativeScreenRecordingInfo;
 exports.macosStopNativeScreenRecording = macosStopNativeScreenRecording;
-exports.cleanupNativeRecordedVideos = cleanupNativeRecordedVideos;
 exports.macosListDisplays = macosListDisplays;
 const lodash_1 = __importDefault(require("lodash"));
+const bluebird_1 = __importStar(require("bluebird"));
 const node_path_1 = __importDefault(require("node:path"));
 const support_1 = require("appium/support");
 const helpers_1 = require("./helpers");
+const asyncbox_1 = require("asyncbox");
+const teen_process_1 = require("teen_process");
+const constants_1 = require("./bidi/constants");
+const models_1 = require("./bidi/models");
+const RECORDING_STARTUP_TIMEOUT_MS = 5000;
+const BUFFER_SIZE = 0xFFFF;
+const MONITORING_INTERVAL_DURATION_MS = 1000;
+const MAX_MONITORING_DURATION_MS = 24 * 60 * 60 * 1000; // 1 day
+class NativeVideoChunksBroadcaster {
+    constructor(ee, log) {
+        this._ee = ee;
+        this._log = log;
+        this._publishers = new Map();
+        this._terminated = false;
+    }
+    get hasPublishers() {
+        return this._publishers.size > 0;
+    }
+    schedule(uuid) {
+        if (!this._publishers.has(uuid)) {
+            this._publishers.set(uuid, this._createPublisher(uuid));
+        }
+    }
+    async waitFor(uuid) {
+        const publisher = this._publishers.get(uuid);
+        if (publisher) {
+            await publisher;
+        }
+    }
+    async shutdown(timeoutMs) {
+        try {
+            await this._wait(timeoutMs);
+        }
+        catch (e) {
+            this._log.warn(e.message);
+        }
+        await this._cleanup();
+        this._publishers = new Map();
+    }
+    async _createPublisher(uuid) {
+        let fullPath = '';
+        let bytesRead = 0n;
+        try {
+            await (0, asyncbox_1.waitForCondition)(async () => {
+                const paths = await listAttachments();
+                const result = paths.find((name) => name.endsWith(uuid));
+                if (result) {
+                    fullPath = result;
+                    return true;
+                }
+                return false;
+            }, {
+                waitMs: RECORDING_STARTUP_TIMEOUT_MS,
+                intervalMs: 300,
+            });
+        }
+        catch {
+            throw new Error(`The video recording identified by ${uuid} did not ` +
+                `start within ${RECORDING_STARTUP_TIMEOUT_MS}ms timeout`);
+        }
+        const startedMs = performance.now();
+        while (!this._terminated && performance.now() - startedMs < MAX_MONITORING_DURATION_MS) {
+            const isCompleted = !(await isFileUsed(fullPath, 'testman'));
+            const { size } = await support_1.fs.stat(fullPath, { bigint: true });
+            if (bytesRead < size) {
+                const handle = await support_1.fs.open(fullPath, 'r');
+                try {
+                    while (bytesRead < size) {
+                        const bufferSize = Number(size - bytesRead > BUFFER_SIZE ? BUFFER_SIZE : size - bytesRead);
+                        const buf = Buffer.alloc(bufferSize);
+                        await support_1.fs.read(handle, buf, 0, bufferSize, bytesRead);
+                        this._ee.emit(constants_1.BIDI_EVENT_NAME, (0, models_1.toNativeVideoChunkAddedEvent)(uuid, buf));
+                        bytesRead += BigInt(bufferSize);
+                    }
+                }
+                finally {
+                    await support_1.fs.close(handle);
+                }
+            }
+            if (isCompleted) {
+                this._log.debug(`The native video recording identified by ${uuid} has been detected as completed`);
+                return;
+            }
+            await bluebird_1.default.delay(MONITORING_INTERVAL_DURATION_MS);
+        }
+        this._log.warn(`Stopped monitoring of the native video recording identified by ${uuid} ` +
+            `because of the timeout`);
+    }
+    async _wait(timeoutMs) {
+        if (!this.hasPublishers) {
+            return;
+        }
+        const timer = setTimeout(() => {
+            this._terminated = true;
+        }, timeoutMs);
+        const publishingErrors = [];
+        for (const publisher of this._publishers.values()) {
+            try {
+                await publisher;
+            }
+            catch (e) {
+                publishingErrors.push(e.message);
+            }
+        }
+        clearTimeout(timer);
+        if (!lodash_1.default.isEmpty(publishingErrors)) {
+            throw new Error(publishingErrors.join('\n'));
+        }
+    }
+    async _cleanup() {
+        if (!this.hasPublishers) {
+            return;
+        }
+        const attachments = await listAttachments();
+        if (lodash_1.default.isEmpty(attachments)) {
+            return;
+        }
+        const tasks = attachments
+            .map((attachmentPath) => [node_path_1.default.basename(attachmentPath), attachmentPath])
+            .filter(([name,]) => this._publishers.has(name))
+            .map(([, attachmentPath]) => support_1.fs.rimraf(attachmentPath));
+        if (lodash_1.default.isEmpty(tasks)) {
+            return;
+        }
+        try {
+            await Promise.all(tasks);
+            this._log.debug(`Successfully deleted ${support_1.util.pluralize('leftover video recording', tasks.length, true)}`);
+        }
+        catch (e) {
+            this._log.warn(`Could not cleanup some leftover video recordings: ${e.message}`);
+        }
+    }
+}
+exports.NativeVideoChunksBroadcaster = NativeVideoChunksBroadcaster;
 /**
  * Initiates a new native screen recording session via XCTest.
  * If the screen recording is already running then this call results in noop.
@@ -33,7 +201,7 @@ async function macosStartNativeScreenRecording(fps, codec, displayId) {
         codec,
         displayId,
     });
-    this._recordedVideoIds.add(result.uuid);
+    this._videoChunksBroadcaster.schedule(result.uuid);
     return result;
 }
 /**
@@ -62,18 +230,36 @@ async function macosGetNativeScreenRecordingInfo() {
  * @param fileFieldName The name of the form field, where the file content BLOB should
  *                                 be stored for http(s) uploads
  * @param formFields Additional form fields for multipart http(s) uploads
+ * @param ignorePayload Whether to ignore the resulting video payload
+ * and return an empty string. Useful if you prefer to fetch
+ * video chunks via a BiDi web socket.
  * @returns Base64-encoded content of the recorded media file if 'remotePath'
- * parameter is falsy or an empty string.
+ * parameter is falsy or an empty string or ignorePayload is set to `true`.
  * @throws {Error} If there was an error while getting the name of a media file
  * or the file content cannot be uploaded to the remote location
  * or screen recording is not supported on the device under test.
  */
-async function macosStopNativeScreenRecording(remotePath, user, pass, method, headers, fileFieldName, formFields) {
+async function macosStopNativeScreenRecording(remotePath, user, pass, method, headers, fileFieldName, formFields, ignorePayload) {
     const response = (await this.wda.proxy.command('/wda/video/stop', 'POST', {}));
     if (!response || !lodash_1.default.isPlainObject(response)) {
         throw new Error('There is no active screen recording, thus nothing to stop. Did you start it before?');
     }
     const { uuid } = response;
+    try {
+        await bluebird_1.default.resolve(this._videoChunksBroadcaster.waitFor(uuid)).timeout(5000);
+    }
+    catch (e) {
+        if (e instanceof bluebird_1.TimeoutError) {
+            this.log.debug(`The BiDi chunks broadcaster for the native screen recording identified ` +
+                `by ${uuid} cannot complete within 5000ms timeout`);
+        }
+        else {
+            this.log.debug(e.stack);
+        }
+    }
+    if (ignorePayload) {
+        return '';
+    }
     const matchedVideoPath = lodash_1.default.first((await listAttachments()).filter((name) => name.endsWith(uuid)));
     if (!matchedVideoPath) {
         throw new Error(`The screen recording identified by ${uuid} cannot be retrieved. ` +
@@ -91,36 +277,7 @@ async function macosStopNativeScreenRecording(remotePath, user, pass, method, he
         fileFieldName,
         formFields
     };
-    const result = await helpers_1.uploadRecordedMedia.bind(this)(matchedVideoPath, remotePath, options);
-    await cleanupNativeRecordedVideos.bind(this)(uuid);
-    this._recordedVideoIds.delete(uuid);
-    return result;
-}
-/**
- * Deletes previously recorded videos with given ids.
- * This call is safe and does not raise any errors.
- *
- * @param uuids One or more video UUIDs to be deleted
- */
-async function cleanupNativeRecordedVideos(uuids) {
-    const attachments = await listAttachments();
-    if (lodash_1.default.isEmpty(attachments)) {
-        return;
-    }
-    const tasks = attachments
-        .map((attachmentPath) => [node_path_1.default.basename(attachmentPath), attachmentPath])
-        .filter(([name,]) => lodash_1.default.isString(uuids) ? uuids === name : uuids.has(name))
-        .map(([, attachmentPath]) => support_1.fs.rimraf(attachmentPath));
-    if (lodash_1.default.isEmpty(tasks)) {
-        return;
-    }
-    try {
-        await Promise.all(tasks);
-        this.log.debug(`Successfully deleted ${support_1.util.pluralize('leftover video recording', tasks.length, true)}`);
-    }
-    catch (e) {
-        this.log.warn(`Could not cleanup some leftover video recordings: ${e.message}`);
-    }
+    return await helpers_1.uploadRecordedMedia.bind(this)(matchedVideoPath, remotePath, options);
 }
 /**
  * Fetches information about available displays
@@ -140,5 +297,9 @@ async function listAttachments() {
         absolute: true,
     });
 }
+async function isFileUsed(fpath, userProcessName) {
+    const { stdout } = await (0, teen_process_1.exec)('lsof', [fpath]);
+    return stdout.includes(userProcessName);
+}
 // #endregion
 //# sourceMappingURL=native-record-screen.js.map

package/build/lib/commands/native-record-screen.js.map

@@ -1 +1 @@
-{"version":3,"file":"native-record-screen.js","sourceRoot":"","sources":["../../../lib/commands/native-record-screen.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"native-record-screen.js","sourceRoot":"","sources":["../../../lib/commands/native-record-screen.ts"],"names":[],"mappings":"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"}

package/build/lib/driver.d.ts

@@ -184,7 +184,7 @@ export class Mac2Driver extends BaseDriver<any, import("@appium/types").StringRe
         readonly 'macos: stopNativeScreenRecording': {
             readonly command: "macosStopNativeScreenRecording";
             readonly params: {
-                readonly optional: readonly ["remotePath", "user", "pass", "method", "headers", "fileFieldName", "formFields"];
+                readonly optional: readonly ["remotePath", "user", "pass", "method", "headers", "fileFieldName", "formFields", "ignorePayload"];
             };
         };
         readonly 'macos: listDisplays': {
@@ -196,8 +196,8 @@ export class Mac2Driver extends BaseDriver<any, import("@appium/types").StringRe
     isProxyActive: boolean;
     /** @type {import('./wda-mac').WDAMacServer} */
     wda: import("./wda-mac").WDAMacServer;
-    /** @type {Set<string>} */
-    _recordedVideoIds: Set<string>;
+    /** @type {nativeScreenRecordingCommands.NativeVideoChunksBroadcaster} */
+    _videoChunksBroadcaster: nativeScreenRecordingCommands.NativeVideoChunksBroadcaster;
     desiredCapConstraints: {
         systemPort: {
             isNumber: boolean;
@@ -298,6 +298,7 @@ export class Mac2Driver extends BaseDriver<any, import("@appium/types").StringRe
 }
 export default Mac2Driver;
 import { BaseDriver } from 'appium/driver';
+import * as nativeScreenRecordingCommands from './commands/native-record-screen';
 import { DeviceSettings } from 'appium/driver';
 import * as appManagemenetCommands from './commands/app-management';
 import * as appleScriptCommands from './commands/applescript';
@@ -306,7 +307,6 @@ import * as findCommands from './commands/find';
 import * as gesturesCommands from './commands/gestures';
 import * as navigationCommands from './commands/navigation';
 import * as recordScreenCommands from './commands/record-screen';
-import * as nativeScreenRecordingCommands from './commands/native-record-screen';
 import * as screenshotCommands from './commands/screenshots';
 import * as sourceCommands from './commands/source';
 //# sourceMappingURL=driver.d.ts.map

package/build/lib/driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.js"],"names":[],"mappings":"AA8BA;IAUE;;;;;;;;;;;;;;;;;MAAmC;IACnC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAA2C;IAE3C,uBAqBC;IAjCD,sBAAsB;IACtB,eADW,OAAO,CACJ;IAEd,+CAA+C;IAC/C,KADW,OAAO,WAAW,EAAE,YAAY,CACvC;IAEJ,0BAA0B;IAC1B,mBADW,GAAG,CAAC,MAAM,CAAC,CACJ;IAQhB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAkD;IAiBlD,6BAAwE;IAG1E,yDAIC;IAED,mBAOC;IAJC,iBAAuB;IAGvB,qBAA2B;IAI7B,qCAEC;IAGD,0EAEC;IAED,oBAEC;IAED,mEAEC;IAGD,8BAEC;IAGD,kCAEC;IAGD,6FAwBC;IAED,+BAgCC;IAED,6DAAuD;IACvD,iEAA2D;IAC3D,mEAA6D;IAC7D,qEAA+D;IAE/D,sEAAgE;IAEhE,wCAAkC;IAElC,6CAAuC;IAEvC,qDAA+C;IAC/C,+CAAyC;IACzC,iDAA2C;IAC3C,+CAAyC;IACzC,yDAAmD;IACnD,+CAAyC;IACzC,2DAAqD;IACrD,6DAAuD;IACvD,2EAAqE;IACrE,6CAAuC;IACvC,6DAAuD;IACvD,2CAAqC;IACrC,uDAAiD;IACjD,6DAAuD;IACvD,2EAAqE;IAErE,uDAAiD;IAEjD,uEAAiE;IACjE,qEAA+D;IAE/D,sGAAgG;IAChG,0GAAoG;IACpG,oGAA8F;IAC9F,0EAAoE;IAEpE,6DAAuD;IAEvD,+CAAyC;CAC1C;;2BAjN0C,eAAe;+BAAf,eAAe;wCAGlB,2BAA2B;qCAC9B,wBAAwB;iCAC5B,oBAAoB;8BACvB,iBAAiB;kCACb,qBAAqB;oCACnB,uBAAuB;sCACrB,0BAA0B;+CAMjB,iCAAiC;oCAL5C,wBAAwB;gCAC5B,mBAAmB"}
+{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.js"],"names":[],"mappings":"AA8BA;IAUE;;;;;;;;;;;;;;;;;MAAmC;IACnC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAA2C;IAE3C,uBAqBC;IAjCD,sBAAsB;IACtB,eADW,OAAO,CACJ;IAEd,+CAA+C;IAC/C,KADW,OAAO,WAAW,EAAE,YAAY,CACvC;IAEJ,yEAAyE;IACzE,yBADW,6BAA6B,CAAC,4BAA4B,CAC7C;IAQtB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAkD;IAiBlD,6BAAwE;IAG1E,yDAIC;IAED,mBASC;IANC,iBAAuB;IAKvB,qBAA2B;IAI7B,qCAEC;IAGD,0EAEC;IAED,oBAEC;IAED,mEAEC;IAGD,8BAEC;IAGD,kCAEC;IAGD,6FAwBC;IAED,+BA8BC;IAED,6DAAuD;IACvD,iEAA2D;IAC3D,mEAA6D;IAC7D,qEAA+D;IAE/D,sEAAgE;IAEhE,wCAAkC;IAElC,6CAAuC;IAEvC,qDAA+C;IAC/C,+CAAyC;IACzC,iDAA2C;IAC3C,+CAAyC;IACzC,yDAAmD;IACnD,+CAAyC;IACzC,2DAAqD;IACrD,6DAAuD;IACvD,2EAAqE;IACrE,6CAAuC;IACvC,6DAAuD;IACvD,2CAAqC;IACrC,uDAAiD;IACjD,6DAAuD;IACvD,2EAAqE;IAErE,uDAAiD;IAEjD,uEAAiE;IACjE,qEAA+D;IAE/D,sGAAgG;IAChG,0GAAoG;IACpG,oGAA8F;IAC9F,0EAAoE;IAEpE,6DAAuD;IAEvD,+CAAyC;CAC1C;;2BAjN0C,eAAe;+CAeX,iCAAiC;+BAfrC,eAAe;wCAGlB,2BAA2B;qCAC9B,wBAAwB;iCAC5B,oBAAoB;8BACvB,iBAAiB;kCACb,qBAAqB;oCACnB,uBAAuB;sCACrB,0BAA0B;oCAC5B,wBAAwB;gCAC5B,mBAAmB"}

package/build/lib/driver.js

@@ -125,7 +125,7 @@ class Mac2Driver extends driver_1.BaseDriver {
         this.wda = null;
         this.proxyReqRes = null;
         this.isProxyActive = false;
-        this._recordedVideoIds = new Set();
+        this._videoChunksBroadcaster = new nativeScreenRecordingCommands.NativeVideoChunksBroadcaster(this.eventEmitter, this.log);
         this._screenRecorder = null;
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -179,12 +179,12 @@ class Mac2Driver extends driver_1.BaseDriver {
     }
     async deleteSession() {
         await this._screenRecorder?.stop(true);
-        if (!lodash_1.default.isEmpty(this._recordedVideoIds)) {
+        if (this._videoChunksBroadcaster.hasPublishers) {
             try {
                 await this.wda.proxy.command('/wda/video/stop', 'POST', {});
             }
             catch { }
-            await nativeScreenRecordingCommands.cleanupNativeRecordedVideos.bind(this)(this._recordedVideoIds);
+            await this._videoChunksBroadcaster.shutdown(5000);
         }
         await this.wda.stopSession();
         if (this.opts.postrun) {

package/build/lib/driver.js.map

@@ -1 +1 @@
-{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.js"],"names":[],"mappings":"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"}

package/build/lib/execute-method-map.d.ts

@@ -165,7 +165,7 @@ export declare const executeMethodMap: {
     readonly 'macos: stopNativeScreenRecording': {
         readonly command: "macosStopNativeScreenRecording";
         readonly params: {
-            readonly optional: readonly ["remotePath", "user", "pass", "method", "headers", "fileFieldName", "formFields"];
+            readonly optional: readonly ["remotePath", "user", "pass", "method", "headers", "fileFieldName", "formFields", "ignorePayload"];
         };
     };
     readonly 'macos: listDisplays': {

package/build/lib/execute-method-map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute-method-map.d.ts","sourceRoot":"","sources":["../../lib/execute-method-map.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4Ua,CAAC"}
+{"version":3,"file":"execute-method-map.d.ts","sourceRoot":"","sources":["../../lib/execute-method-map.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6Ua,CAAC"}

package/build/lib/execute-method-map.js

@@ -326,7 +326,8 @@ exports.executeMethodMap = {
                 'method',
                 'headers',
                 'fileFieldName',
-                'formFields'
+                'formFields',
+                'ignorePayload',
             ],
         },
     },

package/build/lib/execute-method-map.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute-method-map.js","sourceRoot":"","sources":["../../lib/execute-method-map.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"execute-method-map.js","sourceRoot":"","sources":["../../lib/execute-method-map.ts"],"names":[],"mappings":"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"}

package/lib/commands/bidi/constants.ts

@@ -0,0 +1,3 @@
+export const BIDI_EVENT_NAME = 'bidiEvent';
+const DOMAIN = 'mac2';
+export const NATIVE_VIDEO_CHUNK_ADDED_EVENT = `appium:${DOMAIN}.nativeVideoRecordingChunkAdded`;

package/lib/commands/bidi/models.ts

@@ -0,0 +1,15 @@
+import type { NativeVideoChunkAddedEvent } from './types';
+import { NATIVE_VIDEO_CHUNK_ADDED_EVENT } from './constants';
+
+export function toNativeVideoChunkAddedEvent(
+  uuid: string,
+  payload: Buffer,
+): NativeVideoChunkAddedEvent {
+  return {
+    method: NATIVE_VIDEO_CHUNK_ADDED_EVENT,
+    params: {
+      uuid,
+      payload: payload.toString('base64'),
+    },
+  };
+}

package/lib/commands/bidi/types.ts

@@ -0,0 +1,11 @@
+interface BiDiEvent<TParams> {
+  method: string;
+  params: TParams;
+}
+
+interface NativeVideoChunkAddedParams {
+  uuid: string;
+  payload: string;
+}
+
+export interface NativeVideoChunkAddedEvent extends BiDiEvent<NativeVideoChunkAddedParams> {}

package/lib/commands/native-record-screen.ts

@@ -1,9 +1,171 @@
 import _ from 'lodash';
+import B, {TimeoutError} from 'bluebird';
 import path from 'node:path';
 import { fs, util } from 'appium/support';
 import type { Mac2Driver } from '../driver';
 import { uploadRecordedMedia } from './helpers';
-import type { StringRecord } from '@appium/types';
+import type { AppiumLogger, StringRecord } from '@appium/types';
+import type EventEmitter from 'node:events';
+import { waitForCondition } from 'asyncbox';
+import { exec } from 'teen_process';
+import { BIDI_EVENT_NAME } from './bidi/constants';
+import { toNativeVideoChunkAddedEvent } from './bidi/models';
+
+const RECORDING_STARTUP_TIMEOUT_MS = 5000;
+const BUFFER_SIZE = 0xFFFF;
+const MONITORING_INTERVAL_DURATION_MS = 1000;
+const MAX_MONITORING_DURATION_MS = 24 * 60 * 60 * 1000; // 1 day
+
+export class NativeVideoChunksBroadcaster {
+  private _ee: EventEmitter;
+  private _log: AppiumLogger;
+  private _publishers: Map<string, Promise<void>>;
+  private _terminated: boolean;
+
+  constructor (ee: EventEmitter, log: AppiumLogger) {
+    this._ee = ee;
+    this._log = log;
+    this._publishers = new Map();
+    this._terminated = false;
+  }
+
+  get hasPublishers(): boolean {
+    return this._publishers.size > 0;
+  }
+
+  schedule(uuid: string): void {
+    if (!this._publishers.has(uuid)) {
+      this._publishers.set(uuid, this._createPublisher(uuid));
+    }
+  }
+
+  async waitFor(uuid: string): Promise<void> {
+    const publisher = this._publishers.get(uuid);
+    if (publisher) {
+      await publisher;
+    }
+  }
+
+  async shutdown(timeoutMs: number): Promise<void> {
+    try {
+      await this._wait(timeoutMs);
+    } catch (e) {
+      this._log.warn(e.message);
+    }
+
+    await this._cleanup();
+
+    this._publishers = new Map();
+  }
+
+  private async _createPublisher(uuid: string): Promise<void> {
+    let fullPath = '';
+    let bytesRead = 0n;
+    try {
+      await waitForCondition(async () => {
+        const paths = await listAttachments();
+        const result = paths.find((name) => name.endsWith(uuid));
+        if (result) {
+          fullPath = result;
+          return true;
+        }
+        return false;
+      }, {
+        waitMs: RECORDING_STARTUP_TIMEOUT_MS,
+        intervalMs: 300,
+      });
+    } catch {
+      throw new Error(
+        `The video recording identified by ${uuid} did not ` +
+        `start within ${RECORDING_STARTUP_TIMEOUT_MS}ms timeout`
+      );
+    }
+
+    const startedMs = performance.now();
+    while (!this._terminated && performance.now() - startedMs < MAX_MONITORING_DURATION_MS) {
+      const isCompleted = !(await isFileUsed(fullPath, 'testman'));
+
+      const { size } = await fs.stat(fullPath, {bigint: true});
+      if (bytesRead < size) {
+        const handle = await fs.open(fullPath, 'r');
+        try {
+          while (bytesRead < size) {
+            const bufferSize = Number(size - bytesRead > BUFFER_SIZE ? BUFFER_SIZE : size - bytesRead);
+            const buf = Buffer.alloc(bufferSize);
+            await fs.read(handle, buf as any, 0, bufferSize, bytesRead as any);
+            this._ee.emit(BIDI_EVENT_NAME, toNativeVideoChunkAddedEvent(uuid, buf));
+            bytesRead += BigInt(bufferSize);
+          }
+        } finally {
+          await fs.close(handle);
+        }
+      }
+
+      if (isCompleted) {
+        this._log.debug(
+          `The native video recording identified by ${uuid} has been detected as completed`
+        );
+        return;
+      }
+
+      await B.delay(MONITORING_INTERVAL_DURATION_MS);
+    }
+
+    this._log.warn(
+      `Stopped monitoring of the native video recording identified by ${uuid} ` +
+      `because of the timeout`
+    );
+  }
+
+  private async _wait(timeoutMs: number): Promise<void> {
+    if (!this.hasPublishers) {
+      return;
+    }
+
+    const timer = setTimeout(() => {
+      this._terminated = true;
+    }, timeoutMs);
+    const publishingErrors: string[] = [];
+    for (const publisher of this._publishers.values()) {
+      try {
+        await publisher;
+      } catch (e) {
+        publishingErrors.push(e.message);
+      }
+    }
+    clearTimeout(timer);
+
+    if (!_.isEmpty(publishingErrors)) {
+      throw new Error(publishingErrors.join('\n'));
+    }
+  }
+
+  private async _cleanup(): Promise<void> {
+    if (!this.hasPublishers) {
+      return;
+    }
+
+    const attachments = await listAttachments();
+    if (_.isEmpty(attachments)) {
+      return;
+    }
+    const tasks: Promise<any>[] = attachments
+      .map((attachmentPath) => [path.basename(attachmentPath), attachmentPath])
+      .filter(([name,]) => this._publishers.has(name))
+      .map(([, attachmentPath]) => fs.rimraf(attachmentPath));
+    if (_.isEmpty(tasks)) {
+      return;
+    }
+    try {
+      await Promise.all(tasks);
+      this._log.debug(
+        `Successfully deleted ${util.pluralize('leftover video recording', tasks.length, true)}`
+      );
+    } catch (e) {
+      this._log.warn(`Could not cleanup some leftover video recordings: ${e.message}`);
+    }
+  }
+}
 
 /**
  * Initiates a new native screen recording session via XCTest.
@@ -31,7 +193,7 @@ export async function macosStartNativeScreenRecording(
     codec,
     displayId,
   }) as ActiveVideoInfo;
-  this._recordedVideoIds.add(result.uuid);
+  this._videoChunksBroadcaster.schedule(result.uuid);
   return result;
 }
 
@@ -64,8 +226,11 @@ export async function macosGetNativeScreenRecordingInfo(
  * @param fileFieldName The name of the form field, where the file content BLOB should
  *                                 be stored for http(s) uploads
  * @param formFields Additional form fields for multipart http(s) uploads
+ * @param ignorePayload Whether to ignore the resulting video payload
+ * and return an empty string. Useful if you prefer to fetch
+ * video chunks via a BiDi web socket.
  * @returns Base64-encoded content of the recorded media file if 'remotePath'
- * parameter is falsy or an empty string.
+ * parameter is falsy or an empty string or ignorePayload is set to `true`.
  * @throws {Error} If there was an error while getting the name of a media file
  * or the file content cannot be uploaded to the remote location
  * or screen recording is not supported on the device under test.
@@ -79,6 +244,7 @@ export async function macosStopNativeScreenRecording(
   headers?: StringRecord|[string, any][],
   fileFieldName?: string,
   formFields?: StringRecord|[string, string][],
+  ignorePayload?: boolean,
 ): Promise<string> {
   const response: ActiveVideoInfo | null = (
     await this.wda.proxy.command('/wda/video/stop', 'POST', {})
@@ -90,6 +256,23 @@ export async function macosStopNativeScreenRecording(
   }
 
   const { uuid } = response;
+  try {
+    await B.resolve(this._videoChunksBroadcaster.waitFor(uuid)).timeout(5000);
+  } catch (e) {
+    if (e instanceof TimeoutError) {
+      this.log.debug(
+        `The BiDi chunks broadcaster for the native screen recording identified ` +
+        `by ${uuid} cannot complete within 5000ms timeout`
+      );
+    } else {
+      this.log.debug(e.stack);
+    }
+  }
+
+  if (ignorePayload) {
+    return '';
+  }
+
   const matchedVideoPath = _.first(
     (await listAttachments()).filter((name) => name.endsWith(uuid))
   );
@@ -111,41 +294,7 @@ export async function macosStopNativeScreenRecording(
     fileFieldName,
     formFields
   };
-  const result = await uploadRecordedMedia.bind(this)(matchedVideoPath, remotePath, options);
-  await cleanupNativeRecordedVideos.bind(this)(uuid);
-  this._recordedVideoIds.delete(uuid);
-  return result;
-}
-
-/**
- * Deletes previously recorded videos with given ids.
- * This call is safe and does not raise any errors.
- *
- * @param uuids One or more video UUIDs to be deleted
- */
-export async function cleanupNativeRecordedVideos(
-  this: Mac2Driver,
-  uuids: string | Set<string>,
-): Promise<void> {
-  const attachments = await listAttachments();
-  if (_.isEmpty(attachments)) {
-    return;
-  }
-  const tasks: Promise<any>[] = attachments
-    .map((attachmentPath) => [path.basename(attachmentPath), attachmentPath])
-    .filter(([name,]) => _.isString(uuids) ? uuids === name : uuids.has(name))
-    .map(([, attachmentPath]) => fs.rimraf(attachmentPath));
-  if (_.isEmpty(tasks)) {
-    return;
-  }
-  try {
-    await Promise.all(tasks);
-    this.log.debug(
-      `Successfully deleted ${util.pluralize('leftover video recording', tasks.length, true)}`
-    );
-  } catch (e) {
-    this.log.warn(`Could not cleanup some leftover video recordings: ${e.message}`);
-  }
+  return await uploadRecordedMedia.bind(this)(matchedVideoPath, remotePath, options);
 }
 
 /**
@@ -169,6 +318,11 @@ async function listAttachments(): Promise<string[]> {
   });
 }
 
+async function isFileUsed(fpath: string, userProcessName: string): Promise<boolean> {
+  const { stdout } = await exec('lsof', [fpath]);
+  return stdout.includes(userProcessName);
+}
+
 interface ActiveVideoInfo {
   fps: number;
   codec: number;

package/lib/driver.js

@@ -35,8 +35,8 @@ export class Mac2Driver extends BaseDriver {
   /** @type {import('./wda-mac').WDAMacServer} */
   wda;
 
-  /** @type {Set<string>} */
-  _recordedVideoIds;
+  /** @type {nativeScreenRecordingCommands.NativeVideoChunksBroadcaster} */
+  _videoChunksBroadcaster;
 
   static newMethodMap = newMethodMap;
   static executeMethodMap = executeMethodMap;
@@ -75,7 +75,9 @@ export class Mac2Driver extends BaseDriver {
     this.wda = null;
     this.proxyReqRes = null;
     this.isProxyActive = false;
-    this._recordedVideoIds = new Set();
+    this._videoChunksBroadcaster = new nativeScreenRecordingCommands.NativeVideoChunksBroadcaster(
+      this.eventEmitter, this.log
+    );
     this._screenRecorder = null;
   }
 
@@ -136,13 +138,11 @@ export class Mac2Driver extends BaseDriver {
 
   async deleteSession () {
     await this._screenRecorder?.stop(true);
-    if (!_.isEmpty(this._recordedVideoIds)) {
+    if (this._videoChunksBroadcaster.hasPublishers) {
       try {
         await this.wda.proxy.command('/wda/video/stop', 'POST', {});
       } catch {}
-      await nativeScreenRecordingCommands.cleanupNativeRecordedVideos.bind(this)(
-        this._recordedVideoIds
-      );
+      await this._videoChunksBroadcaster.shutdown(5000);
     }
     await this.wda.stopSession();
 

package/lib/execute-method-map.ts

@@ -325,7 +325,8 @@ export const executeMethodMap = {
         'method',
         'headers',
         'fileFieldName',
-        'formFields'
+        'formFields',
+        'ignorePayload',
       ],
     },
   },

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "appium-mac2-driver",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-mac2-driver",
-      "version": "2.1.1",
+      "version": "2.2.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@appium/strongbox": "^0.x",

package/package.json

@@ -6,7 +6,7 @@
     "mac",
     "XCTest"
   ],
-  "version": "2.1.1",
+  "version": "2.2.0",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {