appium-remote-debugger 11.5.9 → 12.0.1

package/build/lib/mixins/execute.js

@@ -13,6 +13,7 @@ const atoms_1 = require("../atoms");
 const support_1 = require("@appium/support");
 const asyncbox_1 = require("asyncbox");
 const lodash_1 = __importDefault(require("lodash"));
+const property_accessors_1 = require("./property-accessors");
 /* How many milliseconds to wait for webkit to return a response before timing out */
 const RPC_RESPONSE_TIMEOUT_MS = 5000;
 /**
@@ -41,8 +42,8 @@ async function executeAtom(atom, args = [], frames = []) {
 async function executeAtomAsync(atom, args = [], frames = []) {
     // helper to send directly to the web inspector
     const evaluate = async (method, opts) => await this.requireRpcClient(true).send(method, Object.assign({
-        appIdKey: this.appIdKey,
-        pageIdKey: this.pageIdKey,
+        appIdKey: (0, property_accessors_1.getAppIdKey)(this),
+        pageIdKey: (0, property_accessors_1.getPageIdKey)(this),
         returnByValue: false,
     }, opts));
     // first create a Promise on the page, saving the resolve/reject functions
@@ -125,25 +126,25 @@ async function executeAtomAsync(atom, args = [], frames = []) {
  */
 async function execute(command, override) {
     // if the page is not loaded yet, wait for it
-    if (this.pageLoading && !override) {
+    if ((0, property_accessors_1.getPageLoading)(this) && !override) {
         this.log.debug('Trying to execute but page is not loaded.');
         await this.waitForDom();
     }
-    if (lodash_1.default.isNil(this.appIdKey)) {
+    if (lodash_1.default.isNil((0, property_accessors_1.getAppIdKey)(this))) {
         throw new Error('Missing parameter: appIdKey. Is the target web application still alive?');
     }
-    if (lodash_1.default.isNil(this.pageIdKey)) {
+    if (lodash_1.default.isNil((0, property_accessors_1.getPageIdKey)(this))) {
         throw new Error('Missing parameter: pageIdKey. Is the target web page still alive?');
     }
-    if (this.garbageCollectOnExecute) {
+    if ((0, property_accessors_1.getGarbageCollectOnExecute)(this)) {
         await this.garbageCollect();
     }
     this.log.debug(`Sending javascript command: '${lodash_1.default.truncate(command, { length: 50 })}'`);
     const res = await this.requireRpcClient(true).send('Runtime.evaluate', {
         expression: command,
         returnByValue: true,
-        appIdKey: this.appIdKey,
-        pageIdKey: this.pageIdKey,
+        appIdKey: (0, property_accessors_1.getAppIdKey)(this),
+        pageIdKey: (0, property_accessors_1.getPageIdKey)(this),
     });
     return (0, utils_1.convertResult)(res);
 }
@@ -154,8 +155,11 @@ async function execute(command, override) {
  * @param {any[]} [args]
  */
 async function callFunction(objectId, fn, args) {
-    (0, utils_1.checkParams)({ appIdKey: this.appIdKey, pageIdKey: this.pageIdKey });
-    if (this.garbageCollectOnExecute) {
+    (0, utils_1.checkParams)({
+        appIdKey: (0, property_accessors_1.getAppIdKey)(this),
+        pageIdKey: (0, property_accessors_1.getPageIdKey)(this),
+    });
+    if ((0, property_accessors_1.getGarbageCollectOnExecute)(this)) {
         await this.garbageCollect();
     }
     this.log.debug('Calling javascript function');
@@ -164,8 +168,8 @@ async function callFunction(objectId, fn, args) {
         functionDeclaration: fn,
         arguments: args,
         returnByValue: true,
-        appIdKey: this.appIdKey,
-        pageIdKey: this.pageIdKey,
+        appIdKey: (0, property_accessors_1.getAppIdKey)(this),
+        pageIdKey: (0, property_accessors_1.getPageIdKey)(this),
     });
     return (0, utils_1.convertResult)(res);
 }

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

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

package/build/lib/mixins/message-handlers.d.ts

@@ -20,17 +20,6 @@ export function onAppConnect(this: import("../remote-debugger").RemoteDebugger,
  * @returns {void}
  */
 export function onAppDisconnect(this: import("../remote-debugger").RemoteDebugger, err: Error | null, dict: import("@appium/types").StringRecord): void;
-export class onAppDisconnect {
-    /**
-     * @this {RemoteDebugger}
-     * @param {Error?} err
-     * @param {import('@appium/types').StringRecord} dict
-     * @returns {void}
-     */
-    constructor(this: import("../remote-debugger").RemoteDebugger, err: Error | null, dict: import("@appium/types").StringRecord);
-    appIdKey: any;
-    connected: boolean | undefined;
-}
 /**
  * @this {RemoteDebugger}
  * @param {Error?} err
@@ -45,16 +34,6 @@ export function onAppUpdate(this: import("../remote-debugger").RemoteDebugger, e
  * @returns {void}
  */
 export function onConnectedDriverList(this: import("../remote-debugger").RemoteDebugger, err: Error | null, drivers: Record<string, any>): void;
-export class onConnectedDriverList {
-    /**
-     * @this {RemoteDebugger}
-     * @param {Error?} err
-     * @param {Record<string, any>} drivers
-     * @returns {void}
-     */
-    constructor(this: import("../remote-debugger").RemoteDebugger, err: Error | null, drivers: Record<string, any>);
-    connectedDrivers: any;
-}
 /**
  * @this {RemoteDebugger}
  * @param {Error?} err
@@ -62,16 +41,6 @@ export class onConnectedDriverList {
  * @returns {void}
  */
 export function onCurrentState(this: import("../remote-debugger").RemoteDebugger, err: Error | null, state: Record<string, any>): void;
-export class onCurrentState {
-    /**
-     * @this {RemoteDebugger}
-     * @param {Error?} err
-     * @param {Record<string, any>} state
-     * @returns {void}
-     */
-    constructor(this: import("../remote-debugger").RemoteDebugger, err: Error | null, state: Record<string, any>);
-    currentState: any;
-}
 /**
  * @this {RemoteDebugger}
  * @param {Error?} err

package/build/lib/mixins/message-handlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message-handlers.d.ts","sourceRoot":"","sources":["../../../lib/mixins/message-handlers.js"],"names":[],"mappings":"AAaA;;;;;;GAMG;AAEH,qFANW,KAAK,OAAC,YACN,MAAM,YACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjB,OAAO,CAAC,IAAI,CAAC,CAoCzB;AAED;;;;;GAKG;AAEH,qFALW,KAAK,OAAC,QACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjB,OAAO,CAAC,IAAI,CAAC,CAOzB;AAED;;;;;GAKG;AACH,wFAJW,KAAK,OAAC,QACN,OAAO,eAAe,EAAE,YAAY,GAClC,IAAI,CAuBhB;;IA3BD;;;;;OAKG;IACH,oEAJW,KAAK,OAAC,QACN,OAAO,eAAe,EAAE,YAAY,EAwB9C;IATG,cAAmF;IAMnF,+BAAsB;;AAK1B;;;;;GAKG;AAEH,oFALW,KAAK,OAAC,QACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjB,OAAO,CAAC,IAAI,CAAC,CAMzB;AAED;;;;;GAKG;AACH,8FAJW,KAAK,OAAC,WACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjB,IAAI,CAKhB;;IATD;;;;;OAKG;IACH,oEAJW,KAAK,OAAC,WACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAM7B;IAFC,sBAAsD;;AAIxD;;;;;GAKG;AACH,uFAJW,KAAK,OAAC,SACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjB,IAAI,CAOhB;;IAXD;;;;;OAKG;IACH,oEAJW,KAAK,OAAC,SACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAQ7B;IAJC,kBAAsD;;AAMxD;;;;;GAKG;AAEH,mGALW,KAAK,OAAC,QACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjB,OAAO,CAAC,IAAI,CAAC,CAkBzB;AAyBD;;;;;;;GAOG;AACH,+FAHW,MAAM,GACJ,MAAM,GAAC,SAAS,CA6B5B;6BAGY,OAAO,oBAAoB,EAAE,cAAc"}
+{"version":3,"file":"message-handlers.d.ts","sourceRoot":"","sources":["../../../lib/mixins/message-handlers.js"],"names":[],"mappings":"AAsBA;;;;;;GAMG;AAEH,qFANW,KAAK,OAAC,YACN,MAAM,YACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjB,OAAO,CAAC,IAAI,CAAC,CAoCzB;AAED;;;;;GAKG;AAEH,qFALW,KAAK,OAAC,QACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjB,OAAO,CAAC,IAAI,CAAC,CAOzB;AAED;;;;;GAKG;AACH,wFAJW,KAAK,OAAC,QACN,OAAO,eAAe,EAAE,YAAY,GAClC,IAAI,CAsBhB;AAED;;;;;GAKG;AAEH,oFALW,KAAK,OAAC,QACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjB,OAAO,CAAC,IAAI,CAAC,CAMzB;AAED;;;;;GAKG;AACH,8FAJW,KAAK,OAAC,WACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjB,IAAI,CAKhB;AAED;;;;;GAKG;AACH,uFAJW,KAAK,OAAC,SACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjB,IAAI,CAOhB;AAED;;;;;GAKG;AAEH,mGALW,KAAK,OAAC,QACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjB,OAAO,CAAC,IAAI,CAAC,CAkBzB;AAwBD;;;;;;;GAOG;AACH,+FAHW,MAAM,GACJ,MAAM,GAAC,SAAS,CA6B5B;6BAGY,OAAO,oBAAoB,EAAE,cAAc"}

package/build/lib/mixins/message-handlers.js

@@ -14,6 +14,7 @@ exports.getDebuggerAppKey = getDebuggerAppKey;
 const events_1 = __importDefault(require("./events"));
 const utils_1 = require("../utils");
 const lodash_1 = __importDefault(require("lodash"));
+const property_accessors_1 = require("./property-accessors");
 /*
  * Generic callbacks used throughout the lifecycle of the Remote Debugger.
  * These will be added to the prototype.
@@ -32,8 +33,8 @@ async function onPageChange(err, appIdKey, pageDict) {
     }
     const currentPages = (0, utils_1.pageArrayFromDict)(pageDict);
     // save the page dict for this app
-    if (this.appDict[appIdKey]) {
-        const previousPages = this.appDict[appIdKey].pageArray;
+    if ((0, property_accessors_1.getAppDict)(this)[appIdKey]) {
+        const previousPages = (0, property_accessors_1.getAppDict)(this)[appIdKey].pageArray;
         // we have a pre-existing pageDict
         if (previousPages && lodash_1.default.isEqual(previousPages, currentPages)) {
             this.log.debug(`Received page change notice for app '${appIdKey}' ` +
@@ -41,10 +42,10 @@ async function onPageChange(err, appIdKey, pageDict) {
             return;
         }
         // keep track of the page dictionary
-        this.appDict[appIdKey].pageArray = currentPages;
+        (0, property_accessors_1.getAppDict)(this)[appIdKey].pageArray = currentPages;
         this.log.debug(`Pages changed for ${appIdKey}: ${JSON.stringify(previousPages)} -> ${JSON.stringify(currentPages)}`);
     }
-    if (this._navigatingToPage) {
+    if ((0, property_accessors_1.getNavigatingToPage)(this)) {
         // in the middle of navigating, so reporting a page change will cause problems
         return;
     }
@@ -74,19 +75,18 @@ async function onAppConnect(err, dict) {
 function onAppDisconnect(err, dict) {
     const appIdKey = dict.WIRApplicationIdentifierKey;
     this.log.debug(`Application '${appIdKey}' disconnected. Removing from app dictionary.`);
-    this.log.debug(`Current app is '${this.appIdKey}'`);
+    this.log.debug(`Current app is '${(0, property_accessors_1.getAppIdKey)(this)}'`);
     // get rid of the entry in our app dictionary,
     // since it is no longer available
-    delete this.appDict[appIdKey];
+    delete (0, property_accessors_1.getAppDict)(this)[appIdKey];
     // if the disconnected app is the one we are connected to, try to find another
-    if (this.appIdKey === appIdKey) {
+    if ((0, property_accessors_1.getAppIdKey)(this) === appIdKey) {
         this.log.debug(`No longer have app id. Attempting to find new one.`);
-        this.appIdKey = getDebuggerAppKey.bind(this)(/** @type {string} */ (this.bundleId));
+        (0, property_accessors_1.setAppIdKey)(this, getDebuggerAppKey.bind(this)(/** @type {string} */ ((0, property_accessors_1.getBundleId)(this))));
     }
-    if (!this.appDict) {
+    if (lodash_1.default.isEmpty((0, property_accessors_1.getAppDict)(this))) {
         // this means we no longer have any apps. what the what?
         this.log.debug('Main app disconnected. Disconnecting altogether.');
-        this.connected = false;
         this.emit(events_1.default.EVENT_DISCONNECT, true);
     }
 }
@@ -108,7 +108,7 @@ async function onAppUpdate(err, dict) {
  * @returns {void}
  */
 function onConnectedDriverList(err, drivers) {
-    this.connectedDrivers = drivers.WIRDriverDictionaryKey;
+    (0, property_accessors_1.setConnectedDrivers)(this, drivers.WIRDriverDictionaryKey);
     this.log.debug(`Received connected driver list: ${JSON.stringify(this.connectedDrivers)}`);
 }
 /**
@@ -118,7 +118,7 @@ function onConnectedDriverList(err, drivers) {
  * @returns {void}
  */
 function onCurrentState(err, state) {
-    this.currentState = state.WIRAutomationAvailabilityKey;
+    (0, property_accessors_1.setCurrentState)(this, state.WIRAutomationAvailabilityKey);
     // This state changes when 'Remote Automation' in 'Settings app' > 'Safari' > 'Advanced' > 'Remote Automation' changes
     // WIRAutomationAvailabilityAvailable or WIRAutomationAvailabilityNotAvailable
     this.log.debug(`Received connected automation availability state: ${JSON.stringify(this.currentState)}`);
@@ -137,13 +137,13 @@ async function onConnectedApplicationList(err, apps) {
     let newDict = {};
     for (const dict of lodash_1.default.values(apps)) {
         const [id, entry] = (0, utils_1.appInfoFromDict)(dict);
-        if (this.skippedApps.includes(entry.name)) {
+        if ((0, property_accessors_1.getSkippedApps)(this).includes(entry.name)) {
             continue;
         }
         newDict[id] = entry;
     }
     // update the object's list of apps
-    lodash_1.default.defaults(this.appDict, newDict);
+    lodash_1.default.defaults((0, property_accessors_1.getAppDict)(this), newDict);
 }
 /**
  *
@@ -154,16 +154,15 @@ async function onConnectedApplicationList(err, apps) {
 function updateAppsWithDict(dict) {
     // get the dictionary entry into a nice form, and add it to the
     // application dictionary
-    this.appDict ?? (this.appDict = {});
     const [id, entry] = (0, utils_1.appInfoFromDict)(dict);
-    if (this.appDict[id]) {
+    if ((0, property_accessors_1.getAppDict)(this)[id]) {
         // preserve the page dictionary for this entry
-        entry.pageArray = this.appDict[id].pageArray;
+        entry.pageArray = (0, property_accessors_1.getAppDict)(this)[id].pageArray;
     }
-    this.appDict[id] = entry;
+    (0, property_accessors_1.getAppDict)(this)[id] = entry;
     // try to get the app id from our connected apps
-    if (!this.appIdKey) {
-        this.appIdKey = getDebuggerAppKey.bind(this)(/** @type {string} */ (this.bundleId));
+    if (!(0, property_accessors_1.getAppIdKey)(this)) {
+        (0, property_accessors_1.setAppIdKey)(this, getDebuggerAppKey.bind(this)(/** @type {string} */ ((0, property_accessors_1.getBundleId)(this))));
     }
 }
 /**
@@ -176,7 +175,7 @@ function updateAppsWithDict(dict) {
  */
 function getDebuggerAppKey(bundleId) {
     let appId;
-    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.bundleId === bundleId) {
             appId = key;
             break;
@@ -186,7 +185,7 @@ function getDebuggerAppKey(bundleId) {
     if (appId) {
         this.log.debug(`Found app id key '${appId}' for bundle '${bundleId}'`);
         let proxyAppId;
-        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/message-handlers.js.map

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

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

@@ -5,37 +5,15 @@
 export function launchSafari(this: import("../remote-debugger").RemoteDebugger): Promise<void>;
 /**
  * @this {RemoteDebugger}
- * @param {(event: import('@appium/types').StringRecord) => any} fn
+ * @param {import('../types').EventListener} fn
  * @returns {Promise<any>}
  */
-export function startTimeline(this: import("../remote-debugger").RemoteDebugger, fn: (event: import("@appium/types").StringRecord) => any): Promise<any>;
+export function startTimeline(this: import("../remote-debugger").RemoteDebugger, fn: import("../types").EventListener): Promise<any>;
 /**
  * @this {RemoteDebugger}
  * @returns {Promise<any>}
  */
 export function stopTimeline(this: import("../remote-debugger").RemoteDebugger): Promise<any>;
-/**
- * @this {RemoteDebugger}
- * @param {(event: import('@appium/types').StringRecord) => any} listener
- * @returns {void}
- */
-export function startConsole(this: import("../remote-debugger").RemoteDebugger, listener: (event: import("@appium/types").StringRecord) => any): void;
-/**
- * @this {RemoteDebugger}
- * @returns {void}
- */
-export function stopConsole(this: import("../remote-debugger").RemoteDebugger): void;
-/**
- * @this {RemoteDebugger}
- * @param {(event: import('@appium/types').StringRecord) => any} listener
- * @returns {void}
- */
-export function startNetwork(this: import("../remote-debugger").RemoteDebugger, listener: (event: import("@appium/types").StringRecord) => any): void;
-/**
- * @this {RemoteDebugger}
- * @returns {void}
- */
-export function stopNetwork(this: import("../remote-debugger").RemoteDebugger): void;
 /**
  * @this {RemoteDebugger}
  * @param {string} value

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

@@ -1 +1 @@
-{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../lib/mixins/misc.js"],"names":[],"mappings":"AAMA;;;GAGG;AACH,iFAFa,OAAO,CAAC,IAAI,CAAC,CAMzB;AAED;;;;GAIG;AACH,qFAHW,CAAC,KAAK,EAAE,OAAO,eAAe,EAAE,YAAY,KAAK,GAAG,GAClD,OAAO,CAAC,GAAG,CAAC,CASxB;AAED;;;GAGG;AACH,iFAFa,OAAO,CAAC,GAAG,CAAC,CAQxB;AAED;;;;GAIG;AACH,0FAHW,CAAC,KAAK,EAAE,OAAO,eAAe,EAAE,YAAY,KAAK,GAAG,GAClD,IAAI,CAMhB;AAED;;;GAGG;AACH,gFAFa,IAAI,CAMhB;AAED;;;;GAIG;AACH,0FAHW,CAAC,KAAK,EAAE,OAAO,eAAe,EAAE,YAAY,KAAK,GAAG,GAClD,IAAI,CAKhB;AAED;;;GAGG;AACH,gFAFa,IAAI,CAKhB;AAGD;;;;GAIG;AACH,4FAHW,MAAM,GACJ,OAAO,CAAC,GAAG,CAAC,CASxB;AAED;;;;GAIG;AACH,mHAFa,OAAO,CAAC,IAAI,CAAC,CA2BzB;6BAGY,OAAO,oBAAoB,EAAE,cAAc"}
+{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../lib/mixins/misc.js"],"names":[],"mappings":"AAUA;;;GAGG;AACH,iFAFa,OAAO,CAAC,IAAI,CAAC,CAMzB;AAED;;;;GAIG;AACH,qFAHW,OAAO,UAAU,EAAE,aAAa,GAC9B,OAAO,CAAC,GAAG,CAAC,CASxB;AAED;;;GAGG;AACH,iFAFa,OAAO,CAAC,GAAG,CAAC,CAQxB;AAGD;;;;GAIG;AACH,4FAHW,MAAM,GACJ,OAAO,CAAC,GAAG,CAAC,CASxB;AAED;;;;GAIG;AACH,mHAFa,OAAO,CAAC,IAAI,CAAC,CA8BzB;6BAGY,OAAO,oBAAoB,EAAE,cAAc"}

package/build/lib/mixins/misc.js

@@ -6,14 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.launchSafari = launchSafari;
 exports.startTimeline = startTimeline;
 exports.stopTimeline = stopTimeline;
-exports.startConsole = startConsole;
-exports.stopConsole = stopConsole;
-exports.startNetwork = startNetwork;
-exports.stopNetwork = stopNetwork;
 exports.overrideUserAgent = overrideUserAgent;
 exports.garbageCollect = garbageCollect;
 const utils_1 = require("../utils");
 const bluebird_1 = __importDefault(require("bluebird"));
+const property_accessors_1 = require("./property-accessors");
 const SAFARI_BUNDLE_ID = 'com.apple.mobilesafari';
 const GARBAGE_COLLECT_TIMEOUT_MS = 5000;
 /**
@@ -27,15 +24,15 @@ async function launchSafari() {
 }
 /**
  * @this {RemoteDebugger}
- * @param {(event: import('@appium/types').StringRecord) => any} fn
+ * @param {import('../types').EventListener} fn
  * @returns {Promise<any>}
  */
 async function startTimeline(fn) {
     this.log.debug('Starting to record the timeline');
     this.requireRpcClient().on('Timeline.eventRecorded', fn);
     return await this.requireRpcClient().send('Timeline.start', {
-        appIdKey: this.appIdKey,
-        pageIdKey: this.pageIdKey,
+        appIdKey: (0, property_accessors_1.getAppIdKey)(this),
+        pageIdKey: (0, property_accessors_1.getPageIdKey)(this),
     });
 }
 /**
@@ -45,46 +42,10 @@ async function startTimeline(fn) {
 async function stopTimeline() {
     this.log.debug('Stopping to record the timeline');
     await this.requireRpcClient().send('Timeline.stop', {
-        appIdKey: this.appIdKey,
-        pageIdKey: this.pageIdKey,
+        appIdKey: (0, property_accessors_1.getAppIdKey)(this),
+        pageIdKey: (0, property_accessors_1.getPageIdKey)(this),
     });
 }
-/**
- * @this {RemoteDebugger}
- * @param {(event: import('@appium/types').StringRecord) => any} 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 {(event: import('@appium/types').StringRecord) => any} 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');
-}
 // Potentially this does not work for mobile safari
 /**
  * @this {RemoteDebugger}
@@ -94,9 +55,9 @@ function stopNetwork() {
 async function overrideUserAgent(value) {
     this.log.debug('Setting overrideUserAgent');
     return await this.requireRpcClient().send('Page.overrideUserAgent', {
-        appIdKey: this.appIdKey,
-        pageIdKey: this.pageIdKey,
-        value
+        appIdKey: (0, property_accessors_1.getAppIdKey)(this),
+        pageIdKey: (0, property_accessors_1.getPageIdKey)(this),
+        value,
     });
 }
 /**
@@ -107,7 +68,10 @@ async function overrideUserAgent(value) {
 async function garbageCollect(timeoutMs = GARBAGE_COLLECT_TIMEOUT_MS) {
     this.log.debug(`Garbage collecting with ${timeoutMs}ms timeout`);
     try {
-        (0, utils_1.checkParams)({ appIdKey: this.appIdKey, pageIdKey: this.pageIdKey });
+        (0, utils_1.checkParams)({
+            appIdKey: (0, property_accessors_1.getAppIdKey)(this),
+            pageIdKey: (0, property_accessors_1.getPageIdKey)(this),
+        });
     }
     catch (err) {
         this.log.debug(`Unable to collect garbage at this time`);
@@ -115,8 +79,8 @@ async function garbageCollect(timeoutMs = GARBAGE_COLLECT_TIMEOUT_MS) {
     }
     try {
         await bluebird_1.default.resolve(this.requireRpcClient().send('Heap.gc', {
-            appIdKey: this.appIdKey,
-            pageIdKey: this.pageIdKey,
+            appIdKey: (0, property_accessors_1.getAppIdKey)(this),
+            pageIdKey: (0, property_accessors_1.getPageIdKey)(this),
         })).timeout(timeoutMs);
         this.log.debug(`Garbage collection successful`);
     }

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

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

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

@@ -8,9 +8,6 @@ export function frameDetached(this: import("../remote-debugger").RemoteDebugger)
  * @returns {void}
  */
 export function cancelPageLoad(this: import("../remote-debugger").RemoteDebugger): void;
-export class cancelPageLoad {
-    pageLoading: boolean;
-}
 /**
  * Return if current readState can be handles as page load completes
  * for the given page load strategy.
@@ -26,16 +23,6 @@ export function isPageLoadingCompleted(this: import("../remote-debugger").Remote
  * @returns {Promise<void>}
  */
 export function waitForDom(this: import("../remote-debugger").RemoteDebugger, startPageLoadTimer?: timing.Timer | null | undefined): Promise<void>;
-export class waitForDom {
-    /**
-     * @this {RemoteDebugger}
-     * @param {timing.Timer?} [startPageLoadTimer]
-     * @returns {Promise<void>}
-     */
-    constructor(this: import("../remote-debugger").RemoteDebugger, startPageLoadTimer?: timing.Timer | null | undefined);
-    pageLoading: boolean;
-    pageLoadDelay: B<void>;
-}
 /**
  * @this {RemoteDebugger}
  * @param {number} [timeoutMs]
@@ -48,18 +35,7 @@ export function checkPageIsReady(this: import("../remote-debugger").RemoteDebugg
  * @returns {Promise<void>}
  */
 export function navToUrl(this: import("../remote-debugger").RemoteDebugger, url: string): Promise<void>;
-export class navToUrl {
-    /**
-     * @this {RemoteDebugger}
-     * @param {string} url
-     * @returns {Promise<void>}
-     */
-    constructor(this: import("../remote-debugger").RemoteDebugger, url: string);
-    _navigatingToPage: boolean;
-    pageLoadDelay: B<void>;
-    pageLoading: boolean;
-}
+export const DEFAULT_PAGE_READINESS_TIMEOUT_MS: number;
 export type RemoteDebugger = import("../remote-debugger").RemoteDebugger;
 import { timing } from '@appium/support';
-import B from 'bluebird';
 //# sourceMappingURL=navigate.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"navigate.d.ts","sourceRoot":"","sources":["../../../lib/mixins/navigate.js"],"names":[],"mappings":"AAsBA;;;GAGG;AACH,kFAFa,IAAI,CAIhB;AAED;;;GAGG;AACH,mFAFa,IAAI,CAQhB;;IAJC,qBAAwB;;AAM1B;;;;;;;GAOG;AACH,sGAHW,MAAM,GACJ,OAAO,CAenB;AAED;;;;GAIG;AACH,qIAFa,OAAO,CAAC,IAAI,CAAC,CAgEzB;;IAnED;;;;OAIG;IACH,qHA8DC;IArDC,qBAAuB;IACvB,uBAA8D;;AAsDhE;;;;GAIG;AACH,qHAFa,OAAO,CAAC,OAAO,CAAC,CAmB5B;AAED;;;;GAIG;AACH,iFAHW,MAAM,GACJ,OAAO,CAAC,IAAI,CAAC,CAyHzB;;IA5HD;;;;OAIG;IACH,oEAHW,MAAM,EA0HhB;IA7GC,2BAA6B;IAS7B,uBAA8D;IAC9D,qBAAuB;;6BAsGZ,OAAO,oBAAoB,EAAE,cAAc;uBA3R3B,iBAAiB;cAEhC,UAAU"}
+{"version":3,"file":"navigate.d.ts","sourceRoot":"","sources":["../../../lib/mixins/navigate.js"],"names":[],"mappings":"AAgCA;;;GAGG;AACH,kFAFa,IAAI,CAIhB;AAED;;;GAGG;AACH,mFAFa,IAAI,CAMhB;AAED;;;;;;;GAOG;AACH,sGAHW,MAAM,GACJ,OAAO,CAenB;AAED;;;;GAIG;AACH,qIAFa,OAAO,CAAC,IAAI,CAAC,CAgEzB;AAED;;;;GAIG;AACH,qHAFa,OAAO,CAAC,OAAO,CAAC,CAsB5B;AAED;;;;GAIG;AACH,iFAHW,MAAM,GACJ,OAAO,CAAC,IAAI,CAAC,CA4HzB;AAtRD,uDAA2D;6BAyR9C,OAAO,oBAAoB,EAAE,cAAc;uBAzS3B,iBAAiB"}