appium-adb 14.1.2 → 14.1.3

package/build/lib/tools/logcat-commands.d.ts

@@ -1,58 +1,39 @@
+import type { ADB } from '../adb.js';
+import type { LogcatOpts, LogEntry, LogcatListener } from './types.js';
 /**
  * Start the logcat process to gather logs.
  *
- * @this {import('../adb.js').ADB}
- * @param {import('./types').LogcatOpts} [opts={}]
+ * @param opts - Logcat options
  * @throws {Error} If restart fails.
  */
-export function startLogcat(this: import("../adb.js").ADB, opts?: import("./types").LogcatOpts): Promise<void>;
-export class startLogcat {
-    /**
-     * Start the logcat process to gather logs.
-     *
-     * @this {import('../adb.js').ADB}
-     * @param {import('./types').LogcatOpts} [opts={}]
-     * @throws {Error} If restart fails.
-     */
-    constructor(this: import("../adb.js").ADB, opts?: import("./types").LogcatOpts);
-    logcat: Logcat;
-    _logcatStartupParams: import("./types").LogcatOpts;
-}
+export declare function startLogcat(this: ADB, opts?: LogcatOpts): Promise<void>;
 /**
  * Stop the active logcat process which gathers logs.
  * The call will be ignored if no logcat process is running.
- * @this {import('../adb.js').ADB}
  */
-export function stopLogcat(this: import("../adb.js").ADB): Promise<void>;
-export class stopLogcat {
-    logcat: any;
-}
+export declare function stopLogcat(this: ADB): Promise<void>;
 /**
  * Retrieve the output from the currently running logcat process.
  * The logcat process should be executed by {2link #startLogcat} method.
  *
- * @this {import('../adb.js').ADB}
- * @return {import('./types').LogEntry[]} The collected logcat output.
+ * @return The collected logcat output.
  * @throws {Error} If logcat process is not running.
  */
-export function getLogcatLogs(this: import("../adb.js").ADB): import("./types").LogEntry[];
+export declare function getLogcatLogs(this: ADB): LogEntry[];
 /**
  * Set the callback for the logcat output event.
  *
- * @this {import('../adb.js').ADB}
- * @param {import('./types').LogcatListener} listener - Listener function
+ * @param listener - Listener function
  * @throws {Error} If logcat process is not running.
  */
-export function setLogcatListener(this: import("../adb.js").ADB, listener: import("./types").LogcatListener): void;
+export declare function setLogcatListener(this: ADB, listener: LogcatListener): void;
 /**
  * Removes the previously set callback for the logcat output event.
  *
- * @this {import('../adb.js').ADB}
- * @param {import('./types').LogcatListener} listener
+ * @param listener
  * The listener function, which has been previously
  * passed to `setLogcatListener`
  * @throws {Error} If logcat process is not running.
  */
-export function removeLogcatListener(this: import("../adb.js").ADB, listener: import("./types").LogcatListener): void;
-import { Logcat } from '../logcat';
+export declare function removeLogcatListener(this: ADB, listener: LogcatListener): void;
 //# sourceMappingURL=logcat-commands.d.ts.map

package/build/lib/tools/logcat-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logcat-commands.d.ts","sourceRoot":"","sources":["../../../lib/tools/logcat-commands.js"],"names":[],"mappings":"AAGA;;;;;;GAMG;AACH,kEAHW,OAAO,SAAS,EAAE,UAAU,iBAgBtC;;IApBD;;;;;;OAMG;IACH,kDAHW,OAAO,SAAS,EAAE,UAAU,EAgBtC;IARC,eAKE;IAEF,mDAAgC;;AAGlC;;;;GAIG;AACH,yEASC;;IAFG,YAAuB;;AAI3B;;;;;;;GAOG;AACH,8DAHY,OAAO,SAAS,EAAE,QAAQ,EAAE,CAQvC;AAED;;;;;;GAMG;AACH,2EAHW,OAAO,SAAS,EAAE,cAAc,QAQ1C;AAED;;;;;;;;GAQG;AACH,8EALW,OAAO,SAAS,EAAE,cAAc,QAU1C;uBAnFoB,WAAW"}
+{"version":3,"file":"logcat-commands.d.ts","sourceRoot":"","sources":["../../../lib/tools/logcat-commands.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAC,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAC,MAAM,YAAY,CAAC;AAErE;;;;;GAKG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,GAAE,UAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAajF;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAUzD;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,GAAG,GAAG,QAAQ,EAAE,CAMnD;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,GAAG,IAAI,CAM3E;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,GAAG,IAAI,CAM9E"}

package/build/lib/tools/logcat-commands.js

@@ -13,8 +13,7 @@ const logcat_1 = require("../logcat");
 /**
  * Start the logcat process to gather logs.
  *
- * @this {import('../adb.js').ADB}
- * @param {import('./types').LogcatOpts} [opts={}]
+ * @param opts - Logcat options
  * @throws {Error} If restart fails.
  */
 async function startLogcat(opts = {}) {
@@ -33,14 +32,14 @@ async function startLogcat(opts = {}) {
 /**
  * Stop the active logcat process which gathers logs.
  * The call will be ignored if no logcat process is running.
- * @this {import('../adb.js').ADB}
  */
 async function stopLogcat() {
-    if (lodash_1.default.isEmpty(this.logcat)) {
+    const logcat = this.logcat;
+    if (!logcat || lodash_1.default.isEmpty(this.logcat)) {
         return;
     }
     try {
-        await this.logcat.stopCapture();
+        await logcat.stopCapture();
     }
     finally {
         this.logcat = undefined;
@@ -50,42 +49,42 @@ async function stopLogcat() {
  * Retrieve the output from the currently running logcat process.
  * The logcat process should be executed by {2link #startLogcat} method.
  *
- * @this {import('../adb.js').ADB}
- * @return {import('./types').LogEntry[]} The collected logcat output.
+ * @return The collected logcat output.
  * @throws {Error} If logcat process is not running.
  */
 function getLogcatLogs() {
-    if (lodash_1.default.isEmpty(this.logcat)) {
+    const logcat = this.logcat;
+    if (!logcat || lodash_1.default.isEmpty(this.logcat)) {
         throw new Error(`Can't get logcat logs since logcat hasn't started`);
     }
-    return this.logcat.getLogs();
+    return logcat.getLogs();
 }
 /**
  * Set the callback for the logcat output event.
  *
- * @this {import('../adb.js').ADB}
- * @param {import('./types').LogcatListener} listener - Listener function
+ * @param listener - Listener function
  * @throws {Error} If logcat process is not running.
  */
 function setLogcatListener(listener) {
-    if (lodash_1.default.isEmpty(this.logcat)) {
+    const logcat = this.logcat;
+    if (!logcat || lodash_1.default.isEmpty(this.logcat)) {
         throw new Error("Logcat process hasn't been started");
     }
-    this.logcat.on('output', listener);
+    logcat.on('output', listener);
 }
 /**
  * Removes the previously set callback for the logcat output event.
  *
- * @this {import('../adb.js').ADB}
- * @param {import('./types').LogcatListener} listener
+ * @param listener
  * The listener function, which has been previously
  * passed to `setLogcatListener`
  * @throws {Error} If logcat process is not running.
  */
 function removeLogcatListener(listener) {
-    if (lodash_1.default.isEmpty(this.logcat)) {
+    const logcat = this.logcat;
+    if (!logcat || lodash_1.default.isEmpty(this.logcat)) {
         throw new Error("Logcat process hasn't been started");
     }
-    this.logcat.removeListener('output', listener);
+    logcat.removeListener('output', listener);
 }
 //# sourceMappingURL=logcat-commands.js.map

package/build/lib/tools/logcat-commands.js.map

@@ -1 +1 @@
-{"version":3,"file":"logcat-commands.js","sourceRoot":"","sources":["../../../lib/tools/logcat-commands.js"],"names":[],"mappings":";;;;;AAUA,kCAaC;AAOD,gCASC;AAUD,sCAKC;AASD,8CAKC;AAWD,oDAKC;AApFD,oDAAuB;AACvB,sCAAiC;AAEjC;;;;;;GAMG;AACI,KAAK,UAAU,WAAW,CAAC,IAAI,GAAG,EAAE;IACzC,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAC9E,CAAC;IAED,IAAI,CAAC,MAAM,GAAG,IAAI,eAAM,CAAC;QACvB,GAAG,EAAE,IAAI,CAAC,UAAU;QACpB,KAAK,EAAE,KAAK;QACZ,UAAU,EAAE,KAAK;QACjB,sBAAsB,EAAE,CAAC,CAAC,IAAI,CAAC,sBAAsB;KACtD,CAAC,CAAC;IACH,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;AACnC,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,UAAU;IAC9B,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,OAAO;IACT,CAAC;IACD,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;IAClC,CAAC;YAAS,CAAC;QACT,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC1B,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,aAAa;IAC3B,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;AAC/B,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAAC,QAAQ;IACxC,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AACrC,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,oBAAoB,CAAC,QAAQ;IAC3C,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AACjD,CAAC"}
+{"version":3,"file":"logcat-commands.js","sourceRoot":"","sources":["../../../lib/tools/logcat-commands.ts"],"names":[],"mappings":";;;;;AAWA,kCAaC;AAMD,gCAUC;AASD,sCAMC;AAQD,8CAMC;AAUD,oDAMC;AArFD,oDAAuB;AACvB,sCAAiC;AAIjC;;;;;GAKG;AACI,KAAK,UAAU,WAAW,CAAY,OAAmB,EAAE;IAChE,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAC9E,CAAC;IAED,IAAI,CAAC,MAAM,GAAG,IAAI,eAAM,CAAC;QACvB,GAAG,EAAE,IAAI,CAAC,UAAU;QACpB,KAAK,EAAE,KAAK;QACZ,UAAU,EAAE,KAAK;QACjB,sBAAsB,EAAE,CAAC,CAAC,IAAI,CAAC,sBAAsB;KACtD,CAAC,CAAC;IACH,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;AACnC,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,UAAU;IAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,IAAI,CAAC,MAAM,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,OAAO;IACT,CAAC;IACD,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,WAAW,EAAE,CAAC;IAC7B,CAAC;YAAS,CAAC;QACT,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC1B,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,aAAa;IAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,IAAI,CAAC,MAAM,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC;AAC1B,CAAC;AAED;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAY,QAAwB;IACnE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,IAAI,CAAC,MAAM,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IACD,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAChC,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,oBAAoB,CAAY,QAAwB;IACtE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,IAAI,CAAC,MAAM,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IACD,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAC5C,CAAC"}

package/build/lib/tools/network-commands.d.ts

@@ -1,80 +1,73 @@
+import type { ADB } from '../adb.js';
+import type { PortFamily, PortInfo } from './types.js';
 /**
  * Get TCP port forwarding with adb on the device under test.
  *
- * @this {import('../adb.js').ADB}
- * @return {Promise<string[]>} The output of the corresponding adb command.
+ * @return The output of the corresponding adb command.
  * An array contains each forwarding line of output
  */
-export function getForwardList(this: import("../adb.js").ADB): Promise<string[]>;
+export declare function getForwardList(this: ADB): Promise<string[]>;
 /**
  * Setup TCP port forwarding with adb on the device under test.
  *
- * @this {import('../adb.js').ADB}
- * @param {string|number} systemPort - The number of the local system port.
- * @param {string|number} devicePort - The number of the remote device port.
+ * @param systemPort - The number of the local system port.
+ * @param devicePort - The number of the remote device port.
  */
-export function forwardPort(this: import("../adb.js").ADB, systemPort: string | number, devicePort: string | number): Promise<void>;
+export declare function forwardPort(this: ADB, systemPort: string | number, devicePort: string | number): Promise<void>;
 /**
  * Remove TCP port forwarding with adb on the device under test. The forwarding
  * for the given port should be setup with {@link #forwardPort} first.
  *
- * @this {import('../adb.js').ADB}
- * @param {string|number} systemPort - The number of the local system port
+ * @param systemPort - The number of the local system port
  *                                     to remove forwarding on.
  */
-export function removePortForward(this: import("../adb.js").ADB, systemPort: string | number): Promise<void>;
+export declare function removePortForward(this: ADB, systemPort: string | number): Promise<void>;
 /**
  * Get TCP port forwarding with adb on the device under test.
  *
- * @this {import('../adb.js').ADB}
- * @return {Promise<string[]>} The output of the corresponding adb command.
+ * @return The output of the corresponding adb command.
  * An array contains each forwarding line of output
  */
-export function getReverseList(this: import("../adb.js").ADB): Promise<string[]>;
+export declare function getReverseList(this: ADB): Promise<string[]>;
 /**
  * Setup TCP port forwarding with adb on the device under test.
  * Only available for API 21+.
  *
- * @this {import('../adb.js').ADB}
- * @param {string|number} devicePort - The number of the remote device port.
- * @param {string|number} systemPort - The number of the local system port.
+ * @param devicePort - The number of the remote device port.
+ * @param systemPort - The number of the local system port.
  */
-export function reversePort(this: import("../adb.js").ADB, devicePort: string | number, systemPort: string | number): Promise<void>;
+export declare function reversePort(this: ADB, devicePort: string | number, systemPort: string | number): Promise<void>;
 /**
  * Remove TCP port forwarding with adb on the device under test. The forwarding
  * for the given port should be setup with {@link #forwardPort} first.
  *
- * @this {import('../adb.js').ADB}
- * @param {string|number} devicePort - The number of the remote device port
+ * @param devicePort - The number of the remote device port
  *                                     to remove forwarding on.
  */
-export function removePortReverse(this: import("../adb.js").ADB, devicePort: string | number): Promise<void>;
+export declare function removePortReverse(this: ADB, devicePort: string | number): Promise<void>;
 /**
  * Setup TCP port forwarding with adb on the device under test. The difference
  * between {@link #forwardPort} is that this method does setup for an abstract
  * local port.
  *
- * @this {import('../adb.js').ADB}
- * @param {string|number} systemPort - The number of the local system port.
- * @param {string|number} devicePort - The number of the remote device port.
+ * @param systemPort - The number of the local system port.
+ * @param devicePort - The number of the remote device port.
  */
-export function forwardAbstractPort(this: import("../adb.js").ADB, systemPort: string | number, devicePort: string | number): Promise<void>;
+export declare function forwardAbstractPort(this: ADB, systemPort: string | number, devicePort: string | number): Promise<void>;
 /**
  * Execute ping shell command on the device under test.
  *
- * @this {import('../adb.js').ADB}
- * @return {Promise<boolean>} True if the command output contains 'ping' substring.
+ * @return True if the command output contains 'ping' substring.
  * @throws {Error} If there was an error while executing 'ping' command on the
  *                 device under test.
  */
-export function ping(this: import("../adb.js").ADB): Promise<boolean>;
+export declare function ping(this: ADB): Promise<boolean>;
 /**
  * Returns the list of TCP port states of the given family.
  * Could be empty if no ports are opened.
  *
- * @this {import('../adb.js').ADB}
- * @param {import('./types').PortFamily} [family='4']
- * @returns {Promise<import('./types').PortInfo[]>}
+ * @param family - Port family ('4' for IPv4, '6' for IPv6)
+ * @returns Array of port information
  */
-export function listPorts(this: import("../adb.js").ADB, family?: import("./types").PortFamily): Promise<import("./types").PortInfo[]>;
+export declare function listPorts(this: ADB, family?: PortFamily): Promise<PortInfo[]>;
 //# sourceMappingURL=network-commands.d.ts.map

package/build/lib/tools/network-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"network-commands.d.ts","sourceRoot":"","sources":["../../../lib/tools/network-commands.js"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,+DAHY,OAAO,CAAC,MAAM,EAAE,CAAC,CAO5B;AAED;;;;;;GAMG;AACH,uEAHW,MAAM,GAAC,MAAM,cACb,MAAM,GAAC,MAAM,iBAKvB;AAED;;;;;;;GAOG;AACH,6EAHW,MAAM,GAAC,MAAM,iBAMvB;AAED;;;;;;GAMG;AACH,+DAHY,OAAO,CAAC,MAAM,EAAE,CAAC,CAO5B;AAED;;;;;;;GAOG;AACH,uEAHW,MAAM,GAAC,MAAM,cACb,MAAM,GAAC,MAAM,iBAKvB;AAED;;;;;;;GAOG;AACH,6EAHW,MAAM,GAAC,MAAM,iBAMvB;AAED;;;;;;;;GAQG;AACH,+EAHW,MAAM,GAAC,MAAM,cACb,MAAM,GAAC,MAAM,iBAKvB;AAED;;;;;;;GAOG;AACH,qDAJY,OAAO,CAAC,OAAO,CAAC,CAU3B;AAED;;;;;;;GAOG;AACH,kEAHW,OAAO,SAAS,EAAE,UAAU,GAC1B,OAAO,CAAC,OAAO,SAAS,EAAE,QAAQ,EAAE,CAAC,CAmCjD"}
+{"version":3,"file":"network-commands.d.ts","sourceRoot":"","sources":["../../../lib/tools/network-commands.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAC,UAAU,EAAE,QAAQ,EAAC,MAAM,YAAY,CAAC;AAErD;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAIjE;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,MAAM,GAAG,MAAM,EAC3B,UAAU,EAAE,MAAM,GAAG,MAAM,GAC1B,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG7F;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAIjE;AAED;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,MAAM,GAAG,MAAM,EAC3B,UAAU,EAAE,MAAM,GAAG,MAAM,GAC1B,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,MAAM,GAAG,MAAM,GAC1B,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,MAAM,GAAG,MAAM,EAC3B,UAAU,EAAE,MAAM,GAAG,MAAM,GAC1B,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;;;;;GAMG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAMtD;AAED;;;;;;GAMG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,GAAE,UAAgB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAgCxF"}

package/build/lib/tools/network-commands.js

@@ -18,8 +18,7 @@ const logger_js_1 = require("../logger.js");
 /**
  * Get TCP port forwarding with adb on the device under test.
  *
- * @this {import('../adb.js').ADB}
- * @return {Promise<string[]>} The output of the corresponding adb command.
+ * @return The output of the corresponding adb command.
  * An array contains each forwarding line of output
  */
 async function getForwardList() {
@@ -30,9 +29,8 @@ async function getForwardList() {
 /**
  * Setup TCP port forwarding with adb on the device under test.
  *
- * @this {import('../adb.js').ADB}
- * @param {string|number} systemPort - The number of the local system port.
- * @param {string|number} devicePort - The number of the remote device port.
+ * @param systemPort - The number of the local system port.
+ * @param devicePort - The number of the remote device port.
  */
 async function forwardPort(systemPort, devicePort) {
     logger_js_1.log.debug(`Forwarding system: ${systemPort} to device: ${devicePort}`);
@@ -42,8 +40,7 @@ async function forwardPort(systemPort, devicePort) {
  * Remove TCP port forwarding with adb on the device under test. The forwarding
  * for the given port should be setup with {@link #forwardPort} first.
  *
- * @this {import('../adb.js').ADB}
- * @param {string|number} systemPort - The number of the local system port
+ * @param systemPort - The number of the local system port
  *                                     to remove forwarding on.
  */
 async function removePortForward(systemPort) {
@@ -53,8 +50,7 @@ async function removePortForward(systemPort) {
 /**
  * Get TCP port forwarding with adb on the device under test.
  *
- * @this {import('../adb.js').ADB}
- * @return {Promise<string[]>} The output of the corresponding adb command.
+ * @return The output of the corresponding adb command.
  * An array contains each forwarding line of output
  */
 async function getReverseList() {
@@ -66,9 +62,8 @@ async function getReverseList() {
  * Setup TCP port forwarding with adb on the device under test.
  * Only available for API 21+.
  *
- * @this {import('../adb.js').ADB}
- * @param {string|number} devicePort - The number of the remote device port.
- * @param {string|number} systemPort - The number of the local system port.
+ * @param devicePort - The number of the remote device port.
+ * @param systemPort - The number of the local system port.
  */
 async function reversePort(devicePort, systemPort) {
     logger_js_1.log.debug(`Forwarding device: ${devicePort} to system: ${systemPort}`);
@@ -78,8 +73,7 @@ async function reversePort(devicePort, systemPort) {
  * Remove TCP port forwarding with adb on the device under test. The forwarding
  * for the given port should be setup with {@link #forwardPort} first.
  *
- * @this {import('../adb.js').ADB}
- * @param {string|number} devicePort - The number of the remote device port
+ * @param devicePort - The number of the remote device port
  *                                     to remove forwarding on.
  */
 async function removePortReverse(devicePort) {
@@ -91,9 +85,8 @@ async function removePortReverse(devicePort) {
  * between {@link #forwardPort} is that this method does setup for an abstract
  * local port.
  *
- * @this {import('../adb.js').ADB}
- * @param {string|number} systemPort - The number of the local system port.
- * @param {string|number} devicePort - The number of the remote device port.
+ * @param systemPort - The number of the local system port.
+ * @param devicePort - The number of the remote device port.
  */
 async function forwardAbstractPort(systemPort, devicePort) {
     logger_js_1.log.debug(`Forwarding system: ${systemPort} to abstract device: ${devicePort}`);
@@ -102,13 +95,12 @@ async function forwardAbstractPort(systemPort, devicePort) {
 /**
  * Execute ping shell command on the device under test.
  *
- * @this {import('../adb.js').ADB}
- * @return {Promise<boolean>} True if the command output contains 'ping' substring.
+ * @return True if the command output contains 'ping' substring.
  * @throws {Error} If there was an error while executing 'ping' command on the
  *                 device under test.
  */
 async function ping() {
-    let stdout = await this.shell(['echo', 'ping']);
+    const stdout = await this.shell(['echo', 'ping']);
     if (stdout.indexOf('ping') === 0) {
         return true;
     }
@@ -118,9 +110,8 @@ async function ping() {
  * Returns the list of TCP port states of the given family.
  * Could be empty if no ports are opened.
  *
- * @this {import('../adb.js').ADB}
- * @param {import('./types').PortFamily} [family='4']
- * @returns {Promise<import('./types').PortInfo[]>}
+ * @param family - Port family ('4' for IPv4, '6' for IPv6)
+ * @returns Array of port information
  */
 async function listPorts(family = '4') {
     const sourceProcName = `/proc/net/tcp${family === '6' ? '6' : ''}`;
@@ -138,7 +129,6 @@ async function listPorts(family = '4') {
         logger_js_1.log.debug(lines[0]);
         throw new Error(`Cannot parse the header row of ${sourceProcName} payload`);
     }
-    /** @type {import('./types').PortInfo[]} */
     const result = [];
     // 2: 1002000A:D036 24CE3AD8:01BB 08 00000000:00000000 00:00000000 00000000 10132 0 49104 1 0000000000000000 21 4 20 10 -1
     for (const line of lines.slice(1)) {

package/build/lib/tools/network-commands.js.map

@@ -1 +1 @@
-{"version":3,"file":"network-commands.js","sourceRoot":"","sources":["../../../lib/tools/network-commands.js"],"names":[],"mappings":";;;;;AAWA,wCAIC;AASD,kCAGC;AAUD,8CAGC;AASD,wCAIC;AAUD,kCAGC;AAUD,8CAGC;AAWD,kDAGC;AAUD,oBAMC;AAUD,8BAiCC;AAxJD,2BAAuB;AACvB,oDAAuB;AACvB,4CAAiC;AAEjC;;;;;;GAMG;AACI,KAAK,UAAU,cAAc;IAClC,eAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACnC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC9D,OAAO,WAAW,CAAC,KAAK,CAAC,QAAG,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;AACvE,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,WAAW,CAAC,UAAU,EAAE,UAAU;IACtD,eAAG,CAAC,KAAK,CAAC,sBAAsB,UAAU,eAAe,UAAU,EAAE,CAAC,CAAC;IACvE,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,OAAO,UAAU,EAAE,EAAE,OAAO,UAAU,EAAE,CAAC,CAAC,CAAC;AAC5E,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,iBAAiB,CAAC,UAAU;IAChD,eAAG,CAAC,KAAK,CAAC,8CAA8C,UAAU,GAAG,CAAC,CAAC;IACvE,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,UAAU,EAAE,CAAC,CAAC,CAAC;AACnE,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,cAAc;IAClC,eAAG,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAC3C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC9D,OAAO,WAAW,CAAC,KAAK,CAAC,QAAG,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;AACvE,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,WAAW,CAAC,UAAU,EAAE,UAAU;IACtD,eAAG,CAAC,KAAK,CAAC,sBAAsB,UAAU,eAAe,UAAU,EAAE,CAAC,CAAC;IACvE,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,OAAO,UAAU,EAAE,EAAE,OAAO,UAAU,EAAE,CAAC,CAAC,CAAC;AAC5E,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,iBAAiB,CAAC,UAAU;IAChD,eAAG,CAAC,KAAK,CAAC,sDAAsD,UAAU,GAAG,CAAC,CAAC;IAC/E,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,UAAU,EAAE,CAAC,CAAC,CAAC;AACnE,CAAC;AAED;;;;;;;;GAQG;AACI,KAAK,UAAU,mBAAmB,CAAC,UAAU,EAAE,UAAU;IAC9D,eAAG,CAAC,KAAK,CAAC,sBAAsB,UAAU,wBAAwB,UAAU,EAAE,CAAC,CAAC;IAChF,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,OAAO,UAAU,EAAE,EAAE,iBAAiB,UAAU,EAAE,CAAC,CAAC,CAAC;AACtF,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,IAAI;IACxB,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAChD,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,6BAA6B,MAAM,EAAE,CAAC,CAAC;AACzD,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,SAAS,CAAC,MAAM,GAAG,GAAG;IAC1C,MAAM,cAAc,GAAG,gBAAgB,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IACnE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACjC,IAAI,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB,eAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,+BAA+B,cAAc,EAAE,CAAC,CAAC;IACnE,CAAC;IACD,kGAAkG;IAClG,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACzD,MAAM,eAAe,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,eAAe,CAAC,CAAC;IAC3E,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;IACzD,IAAI,eAAe,GAAG,CAAC,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;QACxC,eAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,kCAAkC,cAAc,UAAU,CAAC,CAAC;IAC9E,CAAC;IACD,2CAA2C;IAC3C,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,0HAA0H;IAC1H,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjD,MAAM,OAAO,GAAG,MAAM,CAAC,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1B,SAAS;QACX,CAAC;QACD,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;YAC3B,MAAM;YACN,KAAK,EAAE,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC;SAC9B,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"network-commands.js","sourceRoot":"","sources":["../../../lib/tools/network-commands.ts"],"names":[],"mappings":"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"}

package/lib/tools/{aab-utils.js → aab-utils.ts}

@@ -6,11 +6,12 @@ import {unzipFile} from '../helpers.js';
 import AsyncLock from 'async-lock';
 import B from 'bluebird';
 import crypto from 'crypto';
+import type {ADB} from '../adb.js';
+import type {ApkCreationOptions, StringRecord} from './types.js';
 
-/** @type {LRUCache<string, string>} */
-const AAB_CACHE = new LRUCache({
+const AAB_CACHE = new LRUCache<string, string>({
   max: 10,
-  dispose: (extractedFilesRoot) => fs.rimraf(/** @type {string} */ (extractedFilesRoot)),
+  dispose: (extractedFilesRoot) => fs.rimraf(extractedFilesRoot),
 });
 const AAB_CACHE_GUARD = new AsyncLock();
 const UNIVERSAL_APK = 'universal.apk';
@@ -20,7 +21,7 @@ process.on('exit', () => {
     return;
   }
 
-  const paths = /** @type {string[]} */ ([...AAB_CACHE.values()]);
+  const paths = [...AAB_CACHE.values()];
   log.debug(
     `Performing cleanup of ${paths.length} cached .aab ` + util.pluralize('package', paths.length),
   );
@@ -29,7 +30,7 @@ process.on('exit', () => {
       // Asynchronous calls are not supported in onExit handler
       fs.rimrafSync(appPath);
     } catch (e) {
-      log.warn(/** @type {Error} */ (e).message);
+      log.warn((e as Error).message);
     }
   }
 });
@@ -39,14 +40,17 @@ process.on('exit', () => {
  * https://developer.android.com/studio/command-line/bundletool#generate_apks
  * for more details.
  *
- * @this {import('../adb.js').ADB}
- * @param {string} aabPath Full path to the source .aab package
- * @param {import('./types').ApkCreationOptions} [opts={}]
+ * @param aabPath Full path to the source .aab package
+ * @param opts Options for APK creation
  * @returns The path to the resulting universal .apk. The .apk is stored in the internal cache
  * by default.
  * @throws {Error} If there was an error while creating the universal .apk
  */
-export async function extractUniversalApk(aabPath, opts = {}) {
+export async function extractUniversalApk(
+  this: ADB,
+  aabPath: string,
+  opts: ApkCreationOptions = {},
+): Promise<string> {
   if (!(await fs.exists(aabPath))) {
     throw new Error(`The file at '${aabPath}' either does not exist or is not accessible`);
   }
@@ -79,18 +83,22 @@ export async function extractUniversalApk(aabPath, opts = {}) {
       }
       log.debug(`Calculated the cache key for '${aabPath}': ${cacheHash}`);
       if (AAB_CACHE.has(cacheHash)) {
-        const resultPath = path.resolve(/** @type {string} */ (AAB_CACHE.get(cacheHash)), apkName);
-        if (await fs.exists(resultPath)) {
-          return resultPath;
+        const cachedRoot = AAB_CACHE.get(cacheHash);
+        if (cachedRoot) {
+          const resultPath = path.resolve(cachedRoot, apkName);
+          if (await fs.exists(resultPath)) {
+            return resultPath;
+          }
         }
         AAB_CACHE.delete(cacheHash);
       }
 
       await this.initAapt2();
+      const binaries = this.binaries as StringRecord;
       const args = [
         'build-apks',
         '--aapt2',
-        /** @type {import('./types').StringRecord} */ (this.binaries).aapt2,
+        binaries.aapt2,
         '--bundle',
         aabPath,
         '--output',
@@ -114,8 +122,8 @@ export async function extractUniversalApk(aabPath, opts = {}) {
 
       log.debug(`Unpacking universal application bundle at '${tmpApksPath}' to '${tmpRoot}'`);
       await unzipFile(tmpApksPath, tmpRoot);
-      let universalApkPath;
-      const fileDeletionPromises = [];
+      let universalApkPath: string | undefined;
+      const fileDeletionPromises: Promise<void>[] = [];
       const allFileNames = await fs.readdir(tmpRoot);
       for (const fileName of allFileNames) {
         const fullPath = path.join(tmpRoot, fileName);
@@ -146,3 +154,4 @@ export async function extractUniversalApk(aabPath, opts = {}) {
     throw e;
   }
 }
+