appium-remote-debugger 11.5.9 → 12.0.1

package/CHANGELOG.md

@@ -1,3 +1,54 @@
+## [12.0.1](https://github.com/appium/appium-remote-debugger/compare/v12.0.0...v12.0.1) (2024-08-04)
+
+### Bug Fixes
+
+* Properly handle protected accessors from mixin methods ([#401](https://github.com/appium/appium-remote-debugger/issues/401)) ([f47f6af](https://github.com/appium/appium-remote-debugger/commit/f47f6af3d73ec0566fdca769d23bcac12f045607))
+
+## [12.0.0](https://github.com/appium/appium-remote-debugger/compare/v11.5.9...v12.0.0) (2024-08-04)
+
+### ⚠ BREAKING CHANGES
+
+* The following class properties have been renamed (got a leading underscore) and made protected:
+skippedApps
+clientEventListeners
+appDict
+appIdKey
+pageIdKey
+connectedDrivers
+currentState
+pageLoadDelay
+rpcClient
+pageLoading
+navigatingToPage
+pageLoadStrategy
+bundleId
+additionalBundleIds
+platformVersion
+isSafari
+includeSafari
+useNewSafari
+pageLoadMs
+garbageCollectOnExecute
+host
+port
+socketPath
+remoteDebugProxy
+pageReadyTimeout
+logAllCommunication
+logAllCommunicationHexDump
+socketChunkSize
+webInspectorMaxFrameLength
+fullPageInitialization
+udid
+* The following class methods have been made private:
+searchForApp
+searchForPage
+* Remove the unused RPC_RESPONSE_TIMEOUT_MS export
+
+### Features
+
+* Rewrite the RemoteDebugger class into typescript ([#400](https://github.com/appium/appium-remote-debugger/issues/400)) ([ef277b3](https://github.com/appium/appium-remote-debugger/commit/ef277b3991c57ed34740d946bab1c3505674adec))
+
 ## [11.5.9](https://github.com/appium/appium-remote-debugger/compare/v11.5.8...v11.5.9) (2024-08-02)
 
 ### Miscellaneous Chores

package/build/lib/mixins/connect.d.ts

@@ -8,9 +8,9 @@ export function setConnectionKey(this: import("../remote-debugger").RemoteDebugg
  *
  * @this {RemoteDebugger}
  * @param {number} [timeout=APP_CONNECT_TIMEOUT_MS]
- * @returns {Promise<import('@appium/types').StringRecord>}
+ * @returns {Promise<import('../types').AppDict>}
  */
-export function connect(this: import("../remote-debugger").RemoteDebugger, timeout?: number | undefined): Promise<import("@appium/types").StringRecord>;
+export function connect(this: import("../remote-debugger").RemoteDebugger, timeout?: number | undefined): Promise<import("../types").AppDict>;
 /**
  *
  * @this {RemoteDebugger}
@@ -26,36 +26,6 @@ export function disconnect(this: import("../remote-debugger").RemoteDebugger): P
  * @returns {Promise<import('../types').Page[]>}
  */
 export function selectApp(this: import("../remote-debugger").RemoteDebugger, currentUrl?: string | null | undefined, maxTries?: number | undefined, ignoreAboutBlankUrl?: boolean | undefined): Promise<import("../types").Page[]>;
-export class selectApp {
-    /**
-     *
-     * @this {RemoteDebugger}
-     * @param {string?} [currentUrl=null]
-     * @param {number} [maxTries=SELECT_APP_RETRIES]
-     * @param {boolean} [ignoreAboutBlankUrl=false]
-     * @returns {Promise<import('../types').Page[]>}
-     */
-    constructor(this: import("../remote-debugger").RemoteDebugger, currentUrl?: string | null | undefined, maxTries?: number | undefined, ignoreAboutBlankUrl?: boolean | undefined);
-    appIdKey: string | undefined;
-}
-/**
- *
- * @this {RemoteDebugger}
- * @param {string?} currentUrl
- * @param {number} maxTries
- * @param {boolean} ignoreAboutBlankUrl
- * @returns {Promise<import('../types').AppPage>}
- */
-export function searchForApp(this: import("../remote-debugger").RemoteDebugger, currentUrl: string | null, maxTries: number, ignoreAboutBlankUrl: boolean): Promise<import("../types").AppPage>;
-/**
- *
- * @this {RemoteDebugger}
- * @param {Record<string, import('../types').AppInfo>} appsDict
- * @param {string?} currentUrl
- * @param {boolean} [ignoreAboutBlankUrl]
- * @returns {import('../types').AppPage?}
- */
-export function searchForPage(this: import("../remote-debugger").RemoteDebugger, appsDict: Record<string, import("../types").AppInfo>, currentUrl?: string | null, ignoreAboutBlankUrl?: boolean | undefined): import("../types").AppPage | null;
 /**
  *
  * @this {RemoteDebugger}
@@ -65,19 +35,6 @@ export function searchForPage(this: import("../remote-debugger").RemoteDebugger,
  * @returns {Promise<void>}
  */
 export function selectPage(this: import("../remote-debugger").RemoteDebugger, appIdKey: string | number, pageIdKey: string | number, skipReadyCheck?: boolean | undefined): Promise<void>;
-export class selectPage {
-    /**
-     *
-     * @this {RemoteDebugger}
-     * @param {string|number} appIdKey
-     * @param {string|number} pageIdKey
-     * @param {boolean} [skipReadyCheck]
-     * @returns {Promise<void>}
-     */
-    constructor(this: import("../remote-debugger").RemoteDebugger, appIdKey: string | number, pageIdKey: string | number, skipReadyCheck?: boolean | undefined);
-    appIdKey: string;
-    pageIdKey: string | number;
-}
 /**
  * Find app keys based on assigned bundleIds from appDict
  * When bundleIds includes a wildcard ('*'), returns all appKeys in appDict.

package/build/lib/mixins/connect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../lib/mixins/connect.js"],"names":[],"mappings":"AAqBA;;;;GAIG;AACH,qFAFa,OAAO,CAAC,IAAI,CAAC,CAQzB;AAED;;;;;GAKG;AACH,0GAFa,OAAO,CAAC,OAAO,eAAe,EAAE,YAAY,CAAC,CAgDzD;AAED;;;;GAIG;AACH,+EAFa,OAAO,CAAC,IAAI,CAAC,CAQzB;AAED;;;;;;;GAOG;AACH,gMAFa,OAAO,CAAC,OAAO,UAAU,EAAE,IAAI,EAAE,CAAC,CA8C9C;;IApDD;;;;;;;OAOG;IACH,iLA4CC;IA5BK,6BAAwB;;AA8B9B;;;;;;;GAOG;AACH,4FALW,MAAM,OAAC,YACP,MAAM,uBACN,OAAO,GACL,OAAO,CAAC,OAAO,UAAU,EAAE,OAAO,CAAC,CAwD/C;AAED;;;;;;;GAOG;AACH,2FALW,MAAM,CAAC,MAAM,EAAE,OAAO,UAAU,EAAE,OAAO,CAAC,eAC1C,MAAM,OAAC,8CAEL,OAAO,UAAU,EAAE,OAAO,OAAC,CAmBvC;AAED;;;;;;;GAOG;AACH,wFALW,MAAM,GAAC,MAAM,aACb,MAAM,GAAC,MAAM,yCAEX,OAAO,CAAC,IAAI,CAAC,CAkBzB;;IAxBD;;;;;;;OAOG;IACH,yEALW,MAAM,GAAC,MAAM,aACb,MAAM,GAAC,MAAM,wCAoBvB;IAfC,iBAAuF;IACvF,2BAA0B;;AA0C5B;;;;;;;GAOG;AACH,yGAHW,MAAM,EAAE,GACN,MAAM,EAAE,CAsCpB;6BAGY,OAAO,oBAAoB,EAAE,cAAc"}
+{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../lib/mixins/connect.js"],"names":[],"mappings":"AAgCA;;;;GAIG;AACH,qFAFa,OAAO,CAAC,IAAI,CAAC,CAQzB;AAED;;;;;GAKG;AACH,0GAFa,OAAO,CAAC,OAAO,UAAU,EAAE,OAAO,CAAC,CAgD/C;AAED;;;;GAIG;AACH,+EAFa,OAAO,CAAC,IAAI,CAAC,CAMzB;AAED;;;;;;;GAOG;AACH,gMAFa,OAAO,CAAC,OAAO,UAAU,EAAE,IAAI,EAAE,CAAC,CA8C9C;AAED;;;;;;;GAOG;AACH,wFALW,MAAM,GAAC,MAAM,aACb,MAAM,GAAC,MAAM,yCAEX,OAAO,CAAC,IAAI,CAAC,CAkBzB;AA4HD;;;;;;;GAOG;AACH,yGAHW,MAAM,EAAE,GACN,MAAM,EAAE,CAsCpB;6BAGY,OAAO,oBAAoB,EAAE,cAAc"}

package/build/lib/mixins/connect.js

@@ -7,8 +7,6 @@ exports.setConnectionKey = setConnectionKey;
 exports.connect = connect;
 exports.disconnect = disconnect;
 exports.selectApp = selectApp;
-exports.searchForApp = searchForApp;
-exports.searchForPage = searchForPage;
 exports.selectPage = selectPage;
 exports.getPossibleDebuggerAppKeys = getPossibleDebuggerAppKeys;
 const utils_1 = require("../utils");
@@ -16,6 +14,7 @@ const events_1 = __importDefault(require("./events"));
 const support_1 = require("@appium/support");
 const asyncbox_1 = require("asyncbox");
 const lodash_1 = __importDefault(require("lodash"));
+const property_accessors_1 = require("./property-accessors");
 const APP_CONNECT_TIMEOUT_MS = 0;
 const APP_CONNECT_INTERVAL_MS = 100;
 const SELECT_APP_RETRIES = 20;
@@ -41,7 +40,7 @@ async function setConnectionKey() {
  *
  * @this {RemoteDebugger}
  * @param {number} [timeout=APP_CONNECT_TIMEOUT_MS]
- * @returns {Promise<import('@appium/types').StringRecord>}
+ * @returns {Promise<import('../types').AppDict>}
  */
 async function connect(timeout = APP_CONNECT_TIMEOUT_MS) {
     this.setup();
@@ -66,18 +65,18 @@ async function connect(timeout = APP_CONNECT_TIMEOUT_MS) {
             const timer = new support_1.timing.Timer().start();
             this.log.debug(`Waiting up to ${timeout}ms for applications to be reported`);
             try {
-                await (0, asyncbox_1.waitForCondition)(() => !lodash_1.default.isEmpty(this.appDict), {
+                await (0, asyncbox_1.waitForCondition)(() => !lodash_1.default.isEmpty((0, property_accessors_1.getAppDict)(this)), {
                     waitMs: timeout,
                     intervalMs: APP_CONNECT_INTERVAL_MS,
                 });
-                this.log.debug(`Retrieved ${support_1.util.pluralize('application', lodash_1.default.size(this.appDict), true)} ` +
+                this.log.debug(`Retrieved ${support_1.util.pluralize('application', lodash_1.default.size((0, property_accessors_1.getAppDict)(this)), true)} ` +
                     `within ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
             }
             catch (err) {
                 this.log.debug(`Timed out waiting for applications to be reported`);
             }
         }
-        return this.appDict || {};
+        return lodash_1.default.cloneDeep((0, property_accessors_1.getAppDict)(this));
     }
     catch (err) {
         this.log.error(`Error setting connection key: ${err.message}`);
@@ -91,9 +90,7 @@ async function connect(timeout = APP_CONNECT_TIMEOUT_MS) {
  * @returns {Promise<void>}
  */
 async function disconnect() {
-    if (this.rpcClient) {
-        await this.rpcClient.disconnect();
-    }
+    await (0, property_accessors_1.getRcpClient)(this)?.disconnect();
     this.emit(events_1.default.EVENT_DISCONNECT, true);
     this.teardown();
 }
@@ -112,21 +109,21 @@ async function selectApp(currentUrl = null, maxTries = SELECT_APP_RETRIES, ignor
     rpcClient.shouldCheckForTarget = false;
     try {
         const timer = new support_1.timing.Timer().start();
-        if (!this.appDict || lodash_1.default.isEmpty(this.appDict)) {
+        if (lodash_1.default.isEmpty((0, property_accessors_1.getAppDict)(this))) {
             this.log.debug('No applications currently connected.');
             return [];
         }
-        const { appIdKey } = await this.searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl);
-        if (this.appIdKey !== appIdKey) {
-            this.log.debug(`Received altered app id, updating from '${this.appIdKey}' to '${appIdKey}'`);
-            this.appIdKey = appIdKey;
+        const { appIdKey } = await searchForApp.bind(this)(currentUrl, maxTries, ignoreAboutBlankUrl);
+        if ((0, property_accessors_1.getAppIdKey)(this) !== appIdKey) {
+            this.log.debug(`Received altered app id, updating from '${(0, property_accessors_1.getAppIdKey)(this)}' to '${appIdKey}'`);
+            (0, property_accessors_1.setAppIdKey)(this, appIdKey);
         }
         logApplicationDictionary.bind(this)();
         // translate the dictionary into a useful form, and return to sender
-        this.log.debug(`Finally selecting app ${this.appIdKey}`);
+        this.log.debug(`Finally selecting app ${(0, property_accessors_1.getAppIdKey)(this)}`);
         /** @type {import('../types').Page[]} */
         const fullPageArray = [];
-        for (const [app, info] of lodash_1.default.toPairs(this.appDict)) {
+        for (const [app, info] of lodash_1.default.toPairs((0, property_accessors_1.getAppDict)(this))) {
             if (!lodash_1.default.isArray(info.pageArray) || !info.isActive) {
                 continue;
             }
@@ -147,6 +144,26 @@ async function selectApp(currentUrl = null, maxTries = SELECT_APP_RETRIES, ignor
         rpcClient.shouldCheckForTarget = shouldCheckForTarget;
     }
 }
+/**
+ *
+ * @this {RemoteDebugger}
+ * @param {string|number} appIdKey
+ * @param {string|number} pageIdKey
+ * @param {boolean} [skipReadyCheck]
+ * @returns {Promise<void>}
+ */
+async function selectPage(appIdKey, pageIdKey, skipReadyCheck = false) {
+    const fullAppIdKey = lodash_1.default.startsWith(`${appIdKey}`, 'PID:') ? `${appIdKey}` : `PID:${appIdKey}`;
+    (0, property_accessors_1.setAppIdKey)(this, fullAppIdKey);
+    (0, property_accessors_1.setPageIdKey)(this, pageIdKey);
+    this.log.debug(`Selecting page '${pageIdKey}' on app '${fullAppIdKey}' and forwarding socket setup`);
+    const timer = new support_1.timing.Timer().start();
+    await this.requireRpcClient().selectPage(fullAppIdKey, pageIdKey);
+    if (!skipReadyCheck && !await this.checkPageIsReady()) {
+        await this.waitForDom();
+    }
+    this.log.debug(`Selected page after ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
+}
 /**
  *
  * @this {RemoteDebugger}
@@ -156,9 +173,12 @@ async function selectApp(currentUrl = null, maxTries = SELECT_APP_RETRIES, ignor
  * @returns {Promise<import('../types').AppPage>}
  */
 async function searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) {
-    const bundleIds = this.includeSafari && !this.isSafari
-        ? [this.bundleId, ...this.additionalBundleIds, SAFARI_BUNDLE_ID]
-        : [this.bundleId, ...this.additionalBundleIds];
+    /** @type {string[]} */
+    const bundleIds = lodash_1.default.compact([
+        (0, property_accessors_1.getBundleId)(this),
+        ...((0, property_accessors_1.getAdditionalBundleIds)(this) ?? []),
+        ...((0, property_accessors_1.getIncludeSafari)(this) && !(0, property_accessors_1.getIsSafari)(this) ? [SAFARI_BUNDLE_ID] : []),
+    ]);
     let retryCount = 0;
     return /** @type {import('../types').AppPage} */ (await (0, asyncbox_1.retryInterval)(maxTries, SELECT_APP_RETRY_SLEEP_MS, async () => {
         logApplicationDictionary.bind(this)();
@@ -166,7 +186,7 @@ async function searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) {
         this.log.debug(`Trying out the possible app ids: ${possibleAppIds.join(', ')} (try #${retryCount + 1} of ${maxTries})`);
         for (const attemptedAppIdKey of possibleAppIds) {
             try {
-                if (!this.appDict[attemptedAppIdKey].isActive) {
+                if (!(0, property_accessors_1.getAppDict)(this)[attemptedAppIdKey].isActive) {
                     this.log.debug(`Skipping app '${attemptedAppIdKey}' because it is not active`);
                     continue;
                 }
@@ -183,11 +203,11 @@ async function searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) {
                     continue;
                 }
                 // save the page array for this app
-                this.appDict[appIdKey].pageArray = (0, utils_1.pageArrayFromDict)(pageDict);
+                (0, property_accessors_1.getAppDict)(this)[appIdKey].pageArray = (0, utils_1.pageArrayFromDict)(pageDict);
                 // if we are looking for a particular url, make sure we
                 // have the right page. Ignore empty or undefined urls.
                 // Ignore about:blank if requested.
-                const result = this.searchForPage(this.appDict, currentUrl, ignoreAboutBlankUrl);
+                const result = searchForPage.bind(this)((0, property_accessors_1.getAppDict)(this), currentUrl, ignoreAboutBlankUrl);
                 if (result) {
                     return result;
                 }
@@ -232,33 +252,13 @@ function searchForPage(appsDict, currentUrl = null, ignoreAboutBlankUrl = false)
     }
     return null;
 }
-/**
- *
- * @this {RemoteDebugger}
- * @param {string|number} appIdKey
- * @param {string|number} pageIdKey
- * @param {boolean} [skipReadyCheck]
- * @returns {Promise<void>}
- */
-async function selectPage(appIdKey, pageIdKey, skipReadyCheck = false) {
-    this.appIdKey = lodash_1.default.startsWith(`${appIdKey}`, 'PID:') ? `${appIdKey}` : `PID:${appIdKey}`;
-    this.pageIdKey = pageIdKey;
-    this.log.debug(`Selecting page '${pageIdKey}' on app '${this.appIdKey}' and forwarding socket setup`);
-    const timer = new support_1.timing.Timer().start();
-    await this.requireRpcClient().selectPage(this.appIdKey, pageIdKey);
-    // make sure everything is ready to go
-    if (!skipReadyCheck && !await this.checkPageIsReady()) {
-        await this.waitForDom();
-    }
-    this.log.debug(`Selected page after ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
-}
 /**
  * @this {RemoteDebugger}
  * @returns {void}
  */
 function logApplicationDictionary() {
     this.log.debug('Current applications available:');
-    for (const [app, info] of lodash_1.default.toPairs(this.appDict)) {
+    for (const [app, info] of lodash_1.default.toPairs((0, property_accessors_1.getAppDict)(this))) {
         this.log.debug(`    Application: "${app}"`);
         for (const [key, value] of lodash_1.default.toPairs(info)) {
             if (key === 'pageArray' && Array.isArray(value) && value.length) {
@@ -289,7 +289,7 @@ function logApplicationDictionary() {
 function getPossibleDebuggerAppKeys(bundleIds) {
     if (bundleIds.includes(WILDCARD_BUNDLE_ID)) {
         this.log.debug('Skip checking bundle identifiers because the bundleIds includes a wildcard');
-        return lodash_1.default.uniq(Object.keys(this.appDict));
+        return lodash_1.default.uniq(Object.keys((0, property_accessors_1.getAppDict)(this)));
     }
     // go through the possible bundle identifiers
     const possibleBundleIds = lodash_1.default.uniq([
@@ -305,10 +305,10 @@ function getPossibleDebuggerAppKeys(bundleIds) {
     const proxiedAppIds = new Set();
     for (const bundleId of possibleBundleIds) {
         // now we need to determine if we should pick a proxy for this instead
-        for (const appId of (0, utils_1.appIdsForBundle)(bundleId, this.appDict)) {
+        for (const appId of (0, utils_1.appIdsForBundle)(bundleId, (0, property_accessors_1.getAppDict)(this))) {
             proxiedAppIds.add(appId);
             this.log.debug(`Found app id key '${appId}' for bundle '${bundleId}'`);
-            for (const [key, data] of lodash_1.default.toPairs(this.appDict)) {
+            for (const [key, data] of lodash_1.default.toPairs((0, property_accessors_1.getAppDict)(this))) {
                 if (data.isProxy && data.hostId === appId) {
                     this.log.debug(`Found separate bundleId '${data.bundleId}' ` +
                         `acting as proxy for '${bundleId}', with app id '${key}'`);

package/build/lib/mixins/connect.js.map

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

package/build/lib/mixins/cookies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cookies.d.ts","sourceRoot":"","sources":["../../../lib/mixins/cookies.js"],"names":[],"mappings":"AACA;;;;GAIG;AACH,+EAFa,OAAO,CAAC,OAAO,eAAe,EAAE,YAAY,CAAC,CAQzD;AAED;;;;;GAKG;AACH,qFAHW,OAAO,eAAe,EAAE,YAAY,GAClC,OAAO,CAAC,GAAG,CAAC,CASxB;AAED;;;;;;GAMG;AACH,4FAJW,MAAM,OACN,MAAM,GACJ,OAAO,CAAC,GAAG,CAAC,CAUxB;6BAGY,OAAO,oBAAoB,EAAE,cAAc"}
+{"version":3,"file":"cookies.d.ts","sourceRoot":"","sources":["../../../lib/mixins/cookies.js"],"names":[],"mappings":"AAKA;;;;GAIG;AACH,+EAFa,OAAO,CAAC,OAAO,eAAe,EAAE,YAAY,CAAC,CAQzD;AAED;;;;;GAKG;AACH,qFAHW,OAAO,eAAe,EAAE,YAAY,GAClC,OAAO,CAAC,GAAG,CAAC,CASxB;AAED;;;;;;GAMG;AACH,4FAJW,MAAM,OACN,MAAM,GACJ,OAAO,CAAC,GAAG,CAAC,CAUxB;6BAGY,OAAO,oBAAoB,EAAE,cAAc"}

package/build/lib/mixins/cookies.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCookies = getCookies;
 exports.setCookie = setCookie;
 exports.deleteCookie = deleteCookie;
+const property_accessors_1 = require("./property-accessors");
 /**
  *
  * @this {RemoteDebugger}
@@ -11,8 +12,8 @@ exports.deleteCookie = deleteCookie;
 async function getCookies() {
     this.log.debug('Getting cookies');
     return await this.requireRpcClient().send('Page.getCookies', {
-        appIdKey: this.appIdKey,
-        pageIdKey: this.pageIdKey
+        appIdKey: (0, property_accessors_1.getAppIdKey)(this),
+        pageIdKey: (0, property_accessors_1.getPageIdKey)(this),
     });
 }
 /**
@@ -24,9 +25,9 @@ async function getCookies() {
 async function setCookie(cookie) {
     this.log.debug('Setting cookie');
     return await this.requireRpcClient().send('Page.setCookie', {
-        appIdKey: this.appIdKey,
-        pageIdKey: this.pageIdKey,
-        cookie
+        appIdKey: (0, property_accessors_1.getAppIdKey)(this),
+        pageIdKey: (0, property_accessors_1.getPageIdKey)(this),
+        cookie,
     });
 }
 /**
@@ -39,8 +40,8 @@ async function setCookie(cookie) {
 async function deleteCookie(cookieName, url) {
     this.log.debug(`Deleting cookie '${cookieName}' on '${url}'`);
     return await this.requireRpcClient().send('Page.deleteCookie', {
-        appIdKey: this.appIdKey,
-        pageIdKey: this.pageIdKey,
+        appIdKey: (0, property_accessors_1.getAppIdKey)(this),
+        pageIdKey: (0, property_accessors_1.getPageIdKey)(this),
         cookieName,
         url,
     });

package/build/lib/mixins/cookies.js.map

@@ -1 +1 @@
-{"version":3,"file":"cookies.js","sourceRoot":"","sources":["../../../lib/mixins/cookies.js"],"names":[],"mappings":";;AAMA,gCAMC;AAQD,8BAOC;AASD,oCAQC;AA3CD;;;;GAIG;AACI,KAAK,UAAU,UAAU;IAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAClC,OAAO,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE;QAC3D,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,SAAS,EAAE,IAAI,CAAC,SAAS;KAC1B,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,SAAS,CAAE,MAAM;IACrC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACjC,OAAO,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,gBAAgB,EAAE;QAC1D,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,MAAM;KACP,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,YAAY,CAAE,UAAU,EAAE,GAAG;IACjD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,UAAU,SAAS,GAAG,GAAG,CAAC,CAAC;IAC9D,OAAO,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,mBAAmB,EAAE;QAC7D,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,UAAU;QACV,GAAG;KACJ,CAAC,CAAC;AACL,CAAC;AAED;;GAEG"}
+{"version":3,"file":"cookies.js","sourceRoot":"","sources":["../../../lib/mixins/cookies.js"],"names":[],"mappings":";;AAUA,gCAMC;AAQD,8BAOC;AASD,oCAQC;AAhDD,6DAG8B;AAE9B;;;;GAIG;AACI,KAAK,UAAU,UAAU;IAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAClC,OAAO,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE;QAC3D,QAAQ,EAAE,IAAA,gCAAW,EAAC,IAAI,CAAC;QAC3B,SAAS,EAAE,IAAA,iCAAY,EAAC,IAAI,CAAC;KAC9B,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,SAAS,CAAE,MAAM;IACrC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACjC,OAAO,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,gBAAgB,EAAE;QAC1D,QAAQ,EAAE,IAAA,gCAAW,EAAC,IAAI,CAAC;QAC3B,SAAS,EAAE,IAAA,iCAAY,EAAC,IAAI,CAAC;QAC7B,MAAM;KACP,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,YAAY,CAAE,UAAU,EAAE,GAAG;IACjD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,UAAU,SAAS,GAAG,GAAG,CAAC,CAAC;IAC9D,OAAO,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,mBAAmB,EAAE;QAC7D,QAAQ,EAAE,IAAA,gCAAW,EAAC,IAAI,CAAC;QAC3B,SAAS,EAAE,IAAA,iCAAY,EAAC,IAAI,CAAC;QAC7B,UAAU;QACV,GAAG;KACJ,CAAC,CAAC;AACL,CAAC;AAED;;GAEG"}

package/build/lib/mixins/events.d.ts

@@ -3,20 +3,42 @@
  *
  * @this {RemoteDebugger}
  * @param {string} eventName
- * @param {(event: import('@appium/types').StringRecord) => any} listener
+ * @param {import('../types').EventListener} listener
  * @returns {void}
  */
-export function addClientEventListener(this: import("../remote-debugger").RemoteDebugger, eventName: string, listener: (event: import("@appium/types").StringRecord) => any): void;
+export function addClientEventListener(this: import("../remote-debugger").RemoteDebugger, eventName: string, listener: import("../types").EventListener): void;
 /**
  * @this {RemoteDebugger}
  * @param {string} eventName
  * @returns {void}
  */
 export function removeClientEventListener(this: import("../remote-debugger").RemoteDebugger, eventName: string): void;
+/**
+ * @this {RemoteDebugger}
+ * @param {import('../types').EventListener} listener
+ * @returns {void}
+ */
+export function startConsole(this: import("../remote-debugger").RemoteDebugger, listener: import("../types").EventListener): void;
+/**
+ * @this {RemoteDebugger}
+ * @returns {void}
+ */
+export function stopConsole(this: import("../remote-debugger").RemoteDebugger): void;
+/**
+ * @this {RemoteDebugger}
+ * @param {import('../types').EventListener} listener
+ * @returns {void}
+ */
+export function startNetwork(this: import("../remote-debugger").RemoteDebugger, listener: import("../types").EventListener): void;
+/**
+ * @this {RemoteDebugger}
+ * @returns {void}
+ */
+export function stopNetwork(this: import("../remote-debugger").RemoteDebugger): void;
 export namespace events {
-    let EVENT_PAGE_CHANGE: string;
-    let EVENT_FRAMES_DETACHED: string;
-    let EVENT_DISCONNECT: string;
+    let EVENT_PAGE_CHANGE: "remote_debugger_page_change";
+    let EVENT_FRAMES_DETACHED: "remote_debugger_frames_detached";
+    let EVENT_DISCONNECT: "remote_debugger_disconnect";
 }
 export default events;
 export type RemoteDebugger = import("../remote-debugger").RemoteDebugger;

package/build/lib/mixins/events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../lib/mixins/events.js"],"names":[],"mappings":"AAOA;;;;;;;GAOG;AACH,qGAJW,MAAM,YACN,CAAC,KAAK,EAAE,OAAO,eAAe,EAAE,YAAY,KAAK,GAAG,GAClD,IAAI,CAMhB;AAED;;;;GAIG;AACH,wGAHW,MAAM,GACJ,IAAI,CAMhB;;;;;;;6BAKY,OAAO,oBAAoB,EAAE,cAAc"}
+{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../lib/mixins/events.js"],"names":[],"mappings":"AAWA;;;;;;;GAOG;AACH,qGAJW,MAAM,YACN,OAAO,UAAU,EAAE,aAAa,GAC9B,IAAI,CAMhB;AAED;;;;GAIG;AACH,wGAHW,MAAM,GACJ,IAAI,CAMhB;AAED;;;;GAIG;AACH,0FAHW,OAAO,UAAU,EAAE,aAAa,GAC9B,IAAI,CAMhB;AAED;;;GAGG;AACH,gFAFa,IAAI,CAMhB;AAED;;;;GAIG;AACH,0FAHW,OAAO,UAAU,EAAE,aAAa,GAC9B,IAAI,CAKhB;AAED;;;GAGG;AACH,gFAFa,IAAI,CAKhB;;;;;;;6BAKY,OAAO,oBAAoB,EAAE,cAAc"}

package/build/lib/mixins/events.js

@@ -3,24 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.events = void 0;
 exports.addClientEventListener = addClientEventListener;
 exports.removeClientEventListener = removeClientEventListener;
+exports.startConsole = startConsole;
+exports.stopConsole = stopConsole;
+exports.startNetwork = startNetwork;
+exports.stopNetwork = stopNetwork;
+const property_accessors_1 = require("./property-accessors");
 // event emitted publically
-exports.events = {
+exports.events = ({
     EVENT_PAGE_CHANGE: 'remote_debugger_page_change',
     EVENT_FRAMES_DETACHED: 'remote_debugger_frames_detached',
     EVENT_DISCONNECT: 'remote_debugger_disconnect',
-};
+});
 /**
  * Keep track of the client event listeners so they can be removed
  *
  * @this {RemoteDebugger}
  * @param {string} eventName
- * @param {(event: import('@appium/types').StringRecord) => any} listener
+ * @param {import('../types').EventListener} listener
  * @returns {void}
  */
 function addClientEventListener(eventName, listener) {
     var _a;
-    (_a = this._clientEventListeners)[eventName] ?? (_a[eventName] = []);
-    this._clientEventListeners[eventName].push(listener);
+    (_a = (0, property_accessors_1.getClientEventListeners)(this))[eventName] ?? (_a[eventName] = []);
+    (0, property_accessors_1.getClientEventListeners)(this)[eventName].push(listener);
     this.requireRpcClient().on(eventName, listener);
 }
 /**
@@ -29,10 +34,46 @@ function addClientEventListener(eventName, listener) {
  * @returns {void}
  */
 function removeClientEventListener(eventName) {
-    for (const listener of (this._clientEventListeners[eventName] || [])) {
+    for (const listener of ((0, property_accessors_1.getClientEventListeners)(this)[eventName] || [])) {
         this.requireRpcClient().off(eventName, listener);
     }
 }
+/**
+ * @this {RemoteDebugger}
+ * @param {import('../types').EventListener} listener
+ * @returns {void}
+ */
+function startConsole(listener) {
+    this.log.debug('Starting to listen for JavaScript console');
+    this.addClientEventListener('Console.messageAdded', listener);
+    this.addClientEventListener('Console.messageRepeatCountUpdated', listener);
+}
+/**
+ * @this {RemoteDebugger}
+ * @returns {void}
+ */
+function stopConsole() {
+    this.log.debug('Stopping to listen for JavaScript console');
+    this.removeClientEventListener('Console.messageAdded');
+    this.removeClientEventListener('Console.messageRepeatCountUpdated');
+}
+/**
+ * @this {RemoteDebugger}
+ * @param {import('../types').EventListener} listener
+ * @returns {void}
+ */
+function startNetwork(listener) {
+    this.log.debug('Starting to listen for network events');
+    this.addClientEventListener('NetworkEvent', listener);
+}
+/**
+ * @this {RemoteDebugger}
+ * @returns {void}
+ */
+function stopNetwork() {
+    this.log.debug('Stopping to listen for network events');
+    this.removeClientEventListener('NetworkEvent');
+}
 exports.default = exports.events;
 /**
  * @typedef {import('../remote-debugger').RemoteDebugger} RemoteDebugger

package/build/lib/mixins/events.js.map

@@ -1 +1 @@
-{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../lib/mixins/events.js"],"names":[],"mappings":";;;AAeA,wDAIC;AAOD,8DAIC;AA9BD,2BAA2B;AACd,QAAA,MAAM,GAAG;IACpB,iBAAiB,EAAE,6BAA6B;IAChD,qBAAqB,EAAE,iCAAiC;IACxD,gBAAgB,EAAE,4BAA4B;CAC/C,CAAC;AAEF;;;;;;;GAOG;AACH,SAAgB,sBAAsB,CAAE,SAAS,EAAE,QAAQ;;IACzD,MAAA,IAAI,CAAC,qBAAqB,EAAC,SAAS,SAAT,SAAS,IAAM,EAAE,EAAC;IAC7C,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrD,IAAI,CAAC,gBAAgB,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AAClD,CAAC;AAED;;;;GAIG;AACH,SAAgB,yBAAyB,CAAE,SAAS;IAClD,KAAK,MAAM,QAAQ,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QACrE,IAAI,CAAC,gBAAgB,EAAE,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACnD,CAAC;AACH,CAAC;AAED,kBAAe,cAAM,CAAC;AAEtB;;GAEG"}
+{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../lib/mixins/events.js"],"names":[],"mappings":";;;AAmBA,wDAIC;AAOD,8DAIC;AAOD,oCAIC;AAMD,kCAIC;AAOD,oCAGC;AAMD,kCAGC;AA1ED,6DAE8B;AAE9B,2BAA2B;AACd,QAAA,MAAM,GAAwB,CAAC;IAC1C,iBAAiB,EAAE,6BAA6B;IAChD,qBAAqB,EAAE,iCAAiC;IACxD,gBAAgB,EAAE,4BAA4B;CAC/C,CAAC,CAAC;AAEH;;;;;;;GAOG;AACH,SAAgB,sBAAsB,CAAE,SAAS,EAAE,QAAQ;;IACzD,MAAA,IAAA,4CAAuB,EAAC,IAAI,CAAC,EAAC,SAAS,SAAT,SAAS,IAAM,EAAE,EAAC;IAChD,IAAA,4CAAuB,EAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxD,IAAI,CAAC,gBAAgB,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AAClD,CAAC;AAED;;;;GAIG;AACH,SAAgB,yBAAyB,CAAE,SAAS;IAClD,KAAK,MAAM,QAAQ,IAAI,CAAC,IAAA,4CAAuB,EAAC,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QACxE,IAAI,CAAC,gBAAgB,EAAE,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACnD,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,SAAgB,YAAY,CAAE,QAAQ;IACpC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC5D,IAAI,CAAC,sBAAsB,CAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAC;IAC9D,IAAI,CAAC,sBAAsB,CAAC,mCAAmC,EAAE,QAAQ,CAAC,CAAC;AAC7E,CAAC;AAED;;;GAGG;AACH,SAAgB,WAAW;IACzB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC5D,IAAI,CAAC,yBAAyB,CAAC,sBAAsB,CAAC,CAAC;IACvD,IAAI,CAAC,yBAAyB,CAAC,mCAAmC,CAAC,CAAC;AACtE,CAAC;AAED;;;;GAIG;AACH,SAAgB,YAAY,CAAE,QAAQ;IACpC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;IACxD,IAAI,CAAC,sBAAsB,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC;AAED;;;GAGG;AACH,SAAgB,WAAW;IACzB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;IACxD,IAAI,CAAC,yBAAyB,CAAC,cAAc,CAAC,CAAC;AACjD,CAAC;AAED,kBAAe,cAAM,CAAC;AAEtB;;GAEG"}

package/build/lib/mixins/execute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../lib/mixins/execute.js"],"names":[],"mappings":"AAWA;;;;;;;;GAQG;AACH,qFALW,MAAM,SACN,GAAG,EAAE,WACL,MAAM,EAAE,GACN,OAAO,CAAC,GAAG,CAAC,CAQxB;AAED;;;;;;GAMG;AACH,0FALW,MAAM,4DAGJ,OAAO,CAAC,GAAG,CAAC,CAoFxB;AAED;;;;;GAKG;AACH,oFAJW,MAAM,mCAEJ,OAAO,CAAC,GAAG,CAAC,CA4BxB;AAED;;;;;GAKG;AACH,0FAJW,MAAM,MACN,GAAG,0CAqBb;6BAGY,OAAO,oBAAoB,EAAE,cAAc"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../lib/mixins/execute.js"],"names":[],"mappings":"AAqBA;;;;;;;;GAQG;AACH,qFALW,MAAM,SACN,GAAG,EAAE,WACL,MAAM,EAAE,GACN,OAAO,CAAC,GAAG,CAAC,CAQxB;AAED;;;;;;GAMG;AACH,0FALW,MAAM,4DAGJ,OAAO,CAAC,GAAG,CAAC,CAoFxB;AAED;;;;;GAKG;AACH,oFAJW,MAAM,mCAEJ,OAAO,CAAC,GAAG,CAAC,CA4BxB;AAED;;;;;GAKG;AACH,0FAJW,MAAM,MACN,GAAG,0CAwBb;6BAGY,OAAO,oBAAoB,EAAE,cAAc"}