appium-adb 14.0.1 → 14.0.3

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [14.0.3](https://github.com/appium/appium-adb/compare/v14.0.2...v14.0.3) (2025-11-15)
+
+### Miscellaneous Chores
+
+* publish via trusted publisher ([#829](https://github.com/appium/appium-adb/issues/829)) ([967943a](https://github.com/appium/appium-adb/commit/967943adf24031111d5a7cefc088a457050d2861))
+
+## [14.0.2](https://github.com/appium/appium-adb/compare/v14.0.1...v14.0.2) (2025-11-10)
+
+### Miscellaneous Chores
+
+* Migrate logcat.js to logcat.ts ([#828](https://github.com/appium/appium-adb/issues/828)) ([7148a42](https://github.com/appium/appium-adb/commit/7148a428706588e8278ea78a97cbc2773ea14bcf))
+
 ## [14.0.1](https://github.com/appium/appium-adb/compare/v14.0.0...v14.0.1) (2025-11-07)
 
 ### Miscellaneous Chores

package/build/lib/logcat.d.ts

@@ -1,43 +1,29 @@
-export class Logcat extends EventEmitter<[never]> {
-    constructor(opts?: {});
-    adb: any;
-    clearLogs: any;
-    debug: any;
-    debugTrace: any;
-    maxBufferSize: any;
-    /** @type {LRUCache<number, [string, number]>} */
-    logs: LRUCache<number, [string, number]>;
-    /** @type {number?} */
-    logIndexSinceLastRequest: number | null;
-    startCapture(opts?: {}): Promise<any>;
-    proc: SubProcess | null | undefined;
-    /**
-     *
-     * @param {string} logLine
-     * @param {string} [prefix='']
-     * @returns {void}
-     */
-    outputHandler(logLine: string, prefix?: string): void;
-    /**
-     *
-     * @returns {Promise<void>}
-     */
+import { EventEmitter } from 'node:events';
+import type { ADBExecutable } from './types';
+import type { LogEntry, LogcatOpts as StartCaptureOptions } from './tools/types';
+export interface LogcatOptions {
+    adb: ADBExecutable;
+    clearDeviceLogsOnStart?: boolean;
+    debug?: boolean;
+    debugTrace?: boolean;
+    maxBufferSize?: number;
+}
+export declare class Logcat extends EventEmitter {
+    private readonly adb;
+    private readonly clearLogs;
+    private readonly debug?;
+    private readonly debugTrace?;
+    private readonly maxBufferSize;
+    private readonly logs;
+    private logIndexSinceLastRequest;
+    private proc;
+    constructor(opts: LogcatOptions);
+    startCapture(opts?: StartCaptureOptions): Promise<void>;
     stopCapture(): Promise<void>;
-    /**
-     * @returns {import('./tools/types').LogEntry[]}
-     */
-    getLogs(): import("./tools/types").LogEntry[];
-    /**
-     * @returns {import('./tools/types').LogEntry[]}
-     */
-    getAllLogs(): import("./tools/types").LogEntry[];
-    /**
-     * @returns {Promise<void>}
-     */
+    getLogs(): LogEntry[];
+    getAllLogs(): LogEntry[];
     clear(): Promise<void>;
+    private outputHandler;
 }
 export default Logcat;
-import { EventEmitter } from 'node:events';
-import { LRUCache } from 'lru-cache';
-import { SubProcess } from 'teen_process';
 //# sourceMappingURL=logcat.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"logcat.d.ts","sourceRoot":"","sources":["../../lib/logcat.js"],"names":[],"mappings":"AAiFA;IACE,uBAaC;IAXC,SAAmB;IACnB,eAAqD;IACrD,WAAuB;IACvB,gBAAiC;IACjC,mBAA0D;IAC1D,iDAAiD;IACjD,MADW,QAAQ,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAG3C;IACF,sBAAsB;IACtB,0BADW,MAAM,OAAC,CACkB;IAGtC,sCAoDC;IAzBG,oCAA8C;IA2BlD;;;;;OAKG;IACH,uBAJW,MAAM,WACN,MAAM,GACJ,IAAI,CAgBhB;IAED;;;OAGG;IACH,eAFa,OAAO,CAAC,IAAI,CAAC,CAYzB;IAED;;OAEG;IACH,WAFa,OAAO,eAAe,EAAE,QAAQ,EAAE,CAkB9C;IAED;;OAEG;IACH,cAFa,OAAO,eAAe,EAAE,QAAQ,EAAE,CAS9C;IAED;;OAEG;IACH,SAFa,OAAO,CAAC,IAAI,CAAC,CAUzB;CACF;;6BAvO4B,aAAa;yBAEjB,WAAW;2BADH,cAAc"}
+{"version":3,"file":"logcat.d.ts","sourceRoot":"","sources":["../../lib/logcat.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI3C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,KAAK,EACV,QAAQ,EACR,UAAU,IAAI,mBAAmB,EAClC,MAAM,eAAe,CAAC;AAavB,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,aAAa,CAAC;IACnB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,qBAAa,MAAO,SAAQ,YAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgB;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAU;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAU;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAU;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAqC;IAC1D,OAAO,CAAC,wBAAwB,CAAgB;IAChD,OAAO,CAAC,IAAI,CAAoB;gBAEpB,IAAI,EAAE,aAAa;IAczB,YAAY,CAAC,IAAI,GAAE,mBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsD3D,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAYlC,OAAO,IAAI,QAAQ,EAAE;IAqBrB,UAAU,IAAI,QAAQ,EAAE;IAYlB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAW5B,OAAO,CAAC,aAAa;CAetB;AAED,eAAe,MAAM,CAAC"}

package/build/lib/logcat.js

@@ -20,78 +20,27 @@ const DEFAULT_TAG = '*';
 const DEFAULT_FORMAT = 'threadtime';
 const TRACE_PATTERN = /W\/Trace/;
 const EXECVP_ERR_PATTERN = /execvp\(\)/;
-function requireFormat(format) {
-    if (!SUPPORTED_FORMATS.includes(format)) {
-        log.info(`The format value '${format}' is unknown. Supported values are: ${SUPPORTED_FORMATS}`);
-        log.info(`Defaulting to '${DEFAULT_FORMAT}'`);
-        return DEFAULT_FORMAT;
-    }
-    return format;
-}
-/**
- *
- * @param {string} message
- * @param {number} timestamp
- * @returns {import('./tools/types').LogEntry}
- */
-function toLogEntry(message, timestamp) {
-    return {
-        timestamp,
-        level: 'ALL',
-        message,
-    };
-}
-/**
- *
- * @param {string} spec
- * @returns {string}
- */
-function requireSpec(spec) {
-    const [tag, priority] = spec.split(':');
-    let resultTag = tag;
-    if (!resultTag) {
-        log.info(`The tag value in spec '${spec}' cannot be empty`);
-        log.info(`Defaulting to '${DEFAULT_TAG}'`);
-        resultTag = DEFAULT_TAG;
-    }
-    if (!priority) {
-        log.info(`The priority value in spec '${spec}' is empty. Defaulting to Verbose (${DEFAULT_PRIORITY})`);
-        return `${resultTag}:${DEFAULT_PRIORITY}`;
-    }
-    if (!SUPPORTED_PRIORITIES.some((p) => lodash_1.default.toLower(priority) === lodash_1.default.toLower(p))) {
-        log.info(`The priority value in spec '${spec}' is unknown. Supported values are: ${SUPPORTED_PRIORITIES}`);
-        log.info(`Defaulting to Verbose (${DEFAULT_PRIORITY})`);
-        return `${resultTag}:${DEFAULT_PRIORITY}`;
-    }
-    return spec;
-}
-/**
- *
- * @param {string|string[]} filterSpecs
- * @returns {string[]}
- */
-function formatFilterSpecs(filterSpecs) {
-    if (!lodash_1.default.isArray(filterSpecs)) {
-        filterSpecs = [filterSpecs];
-    }
-    return filterSpecs
-        .filter((spec) => spec && lodash_1.default.isString(spec) && !spec.startsWith('-'))
-        .map((spec) => spec.includes(':') ? requireSpec(spec) : spec);
-}
 class Logcat extends node_events_1.EventEmitter {
-    constructor(opts = {}) {
+    adb;
+    clearLogs;
+    debug;
+    debugTrace;
+    maxBufferSize;
+    logs;
+    logIndexSinceLastRequest;
+    proc;
+    constructor(opts) {
         super();
         this.adb = opts.adb;
         this.clearLogs = opts.clearDeviceLogsOnStart || false;
         this.debug = opts.debug;
         this.debugTrace = opts.debugTrace;
         this.maxBufferSize = opts.maxBufferSize || MAX_BUFFER_SIZE;
-        /** @type {LRUCache<number, [string, number]>} */
         this.logs = new lru_cache_1.LRUCache({
             max: this.maxBufferSize,
         });
-        /** @type {number?} */
         this.logIndexSinceLastRequest = null;
+        this.proc = null;
     }
     async startCapture(opts = {}) {
         let started = false;
@@ -141,31 +90,6 @@ class Logcat extends node_events_1.EventEmitter {
             setTimeout(resolve, LOGCAT_PROC_STARTUP_TIMEOUT);
         });
     }
-    /**
-     *
-     * @param {string} logLine
-     * @param {string} [prefix='']
-     * @returns {void}
-     */
-    outputHandler(logLine, prefix = '') {
-        const timestamp = Date.now();
-        let recentIndex = -1;
-        for (const key of this.logs.keys()) {
-            recentIndex = key;
-            break;
-        }
-        this.logs.set(++recentIndex, [logLine, timestamp]);
-        if (this.listenerCount('output')) {
-            this.emit('output', toLogEntry(logLine, timestamp));
-        }
-        if (this.debug && (this.debugTrace || !TRACE_PATTERN.test(logLine))) {
-            log.debug(prefix + logLine);
-        }
-    }
-    /**
-     *
-     * @returns {Promise<void>}
-     */
     async stopCapture() {
         log.debug('Stopping logcat capture');
         if (!this.proc?.isRunning) {
@@ -177,15 +101,15 @@ class Logcat extends node_events_1.EventEmitter {
         await this.proc.stop();
         this.proc = null;
     }
-    /**
-     * @returns {import('./tools/types').LogEntry[]}
-     */
     getLogs() {
-        /** @type {import('./tools/types').LogEntry[]} */
         const result = [];
-        /** @type {number?} */
         let recentLogIndex = null;
-        for (const [index, [message, timestamp]] of /** @type {Generator} */ (this.logs.rentries())) {
+        for (const entry of this.logs.rentries()) {
+            const [index, value] = entry;
+            if (typeof index !== 'number' || !Array.isArray(value)) {
+                continue;
+            }
+            const [message, timestamp] = value;
             if (this.logIndexSinceLastRequest && index > this.logIndexSinceLastRequest
                 || !this.logIndexSinceLastRequest) {
                 recentLogIndex = index;
@@ -197,20 +121,17 @@ class Logcat extends node_events_1.EventEmitter {
         }
         return result;
     }
-    /**
-     * @returns {import('./tools/types').LogEntry[]}
-     */
     getAllLogs() {
-        /** @type {import('./tools/types').LogEntry[]} */
         const result = [];
-        for (const [message, timestamp] of /** @type {Generator} */ (this.logs.rvalues())) {
+        for (const value of this.logs.rvalues()) {
+            if (!Array.isArray(value)) {
+                continue;
+            }
+            const [message, timestamp] = value;
             result.push(toLogEntry(message, timestamp));
         }
         return result;
     }
-    /**
-     * @returns {Promise<void>}
-     */
     async clear() {
         log.debug('Clearing logcat logs from device');
         try {
@@ -218,10 +139,68 @@ class Logcat extends node_events_1.EventEmitter {
             await (0, teen_process_1.exec)(this.adb.path, args);
         }
         catch (err) {
-            log.warn(`Failed to clear logcat logs: ${err.stderr || err.message}`);
+            const execErr = err;
+            log.warn(`Failed to clear logcat logs: ${execErr.stderr || execErr.message}`);
+        }
+    }
+    outputHandler(logLine, prefix = '') {
+        const timestamp = Date.now();
+        let recentIndex = -1;
+        for (const key of this.logs.keys()) {
+            recentIndex = key;
+            break;
+        }
+        this.logs.set(++recentIndex, [logLine, timestamp]);
+        if (this.listenerCount('output')) {
+            this.emit('output', toLogEntry(logLine, timestamp));
+        }
+        if (this.debug && (this.debugTrace || !TRACE_PATTERN.test(logLine))) {
+            log.debug(prefix + logLine);
         }
     }
 }
 exports.Logcat = Logcat;
 exports.default = Logcat;
+function requireFormat(format) {
+    if (!SUPPORTED_FORMATS.includes(format)) {
+        log.info(`The format value '${format}' is unknown. Supported values are: ${SUPPORTED_FORMATS}`);
+        log.info(`Defaulting to '${DEFAULT_FORMAT}'`);
+        return DEFAULT_FORMAT;
+    }
+    return format;
+}
+function toLogEntry(message, timestamp) {
+    return {
+        timestamp,
+        level: 'ALL',
+        message,
+    };
+}
+function requireSpec(spec) {
+    const [tag, priority] = spec.split(':');
+    let resultTag = tag;
+    if (!resultTag) {
+        log.info(`The tag value in spec '${spec}' cannot be empty`);
+        log.info(`Defaulting to '${DEFAULT_TAG}'`);
+        resultTag = DEFAULT_TAG;
+    }
+    if (!priority) {
+        log.info(`The priority value in spec '${spec}' is empty. Defaulting to Verbose (${DEFAULT_PRIORITY})`);
+        return `${resultTag}:${DEFAULT_PRIORITY}`;
+    }
+    if (!SUPPORTED_PRIORITIES.some((p) => lodash_1.default.toLower(priority) === lodash_1.default.toLower(p))) {
+        log.info(`The priority value in spec '${spec}' is unknown. Supported values are: ${SUPPORTED_PRIORITIES}`);
+        log.info(`Defaulting to Verbose (${DEFAULT_PRIORITY})`);
+        return `${resultTag}:${DEFAULT_PRIORITY}`;
+    }
+    return spec;
+}
+function formatFilterSpecs(filterSpecs) {
+    if (!lodash_1.default.isArray(filterSpecs)) {
+        filterSpecs = [filterSpecs];
+    }
+    return filterSpecs
+        .filter((spec) => spec && lodash_1.default.isString(spec) && !spec.startsWith('-'))
+        .map((spec) => spec.includes(':') ? requireSpec(spec) : spec);
+}
 //# sourceMappingURL=logcat.js.map

package/build/lib/logcat.js.map

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

package/lib/{logcat.js → logcat.ts}

@@ -4,105 +4,64 @@ import _ from 'lodash';
 import { EventEmitter } from 'node:events';
 import { SubProcess, exec } from 'teen_process';
 import { LRUCache } from 'lru-cache';
+import type { ExecError } from 'teen_process';
+import type { ADBExecutable } from './types';
+import type {
+  LogEntry,
+  LogcatOpts as StartCaptureOptions,
+} from './tools/types';
 
 const log = logger.getLogger('Logcat');
 const MAX_BUFFER_SIZE = 10000;
 const LOGCAT_PROC_STARTUP_TIMEOUT = 10000;
-const SUPPORTED_FORMATS = ['brief', 'process', 'tag', 'thread', 'raw', 'time', 'threadtime', 'long'];
-const SUPPORTED_PRIORITIES = ['v', 'd', 'i', 'w', 'e', 'f', 's'];
+const SUPPORTED_FORMATS = ['brief', 'process', 'tag', 'thread', 'raw', 'time', 'threadtime', 'long'] as const;
+const SUPPORTED_PRIORITIES = ['v', 'd', 'i', 'w', 'e', 'f', 's'] as const;
 const DEFAULT_PRIORITY = 'v';
 const DEFAULT_TAG = '*';
 const DEFAULT_FORMAT = 'threadtime';
 const TRACE_PATTERN = /W\/Trace/;
 const EXECVP_ERR_PATTERN = /execvp\(\)/;
 
-function requireFormat (format) {
-  if (!SUPPORTED_FORMATS.includes(format)) {
-    log.info(`The format value '${format}' is unknown. Supported values are: ${SUPPORTED_FORMATS}`);
-    log.info(`Defaulting to '${DEFAULT_FORMAT}'`);
-    return DEFAULT_FORMAT;
-  }
-  return format;
+export interface LogcatOptions {
+  adb: ADBExecutable;
+  clearDeviceLogsOnStart?: boolean;
+  debug?: boolean;
+  debugTrace?: boolean;
+  maxBufferSize?: number;
 }
 
-/**
- *
- * @param {string} message
- * @param {number} timestamp
- * @returns {import('./tools/types').LogEntry}
- */
-function toLogEntry(message, timestamp) {
-  return {
-    timestamp,
-    level: 'ALL',
-    message,
-  };
-}
-
-/**
- *
- * @param {string} spec
- * @returns {string}
- */
-function requireSpec (spec) {
-  const [tag, priority] = spec.split(':');
-  let resultTag = tag;
-  if (!resultTag) {
-    log.info(`The tag value in spec '${spec}' cannot be empty`);
-    log.info(`Defaulting to '${DEFAULT_TAG}'`);
-    resultTag = DEFAULT_TAG;
-  }
-  if (!priority) {
-    log.info(`The priority value in spec '${spec}' is empty. Defaulting to Verbose (${DEFAULT_PRIORITY})`);
-    return `${resultTag}:${DEFAULT_PRIORITY}`;
-  }
-  if (!SUPPORTED_PRIORITIES.some((p) => _.toLower(priority) === _.toLower(p))) {
-    log.info(`The priority value in spec '${spec}' is unknown. Supported values are: ${SUPPORTED_PRIORITIES}`);
-    log.info(`Defaulting to Verbose (${DEFAULT_PRIORITY})`);
-    return `${resultTag}:${DEFAULT_PRIORITY}`;
-  }
-  return spec;
-}
-
-/**
- *
- * @param {string|string[]} filterSpecs
- * @returns {string[]}
- */
-function formatFilterSpecs (filterSpecs) {
-  if (!_.isArray(filterSpecs)) {
-    filterSpecs = [filterSpecs];
-  }
-  return filterSpecs
-    .filter((spec) => spec && _.isString(spec) && !spec.startsWith('-'))
-    .map((spec) => spec.includes(':') ? requireSpec(spec) : spec);
-}
-
-
 export class Logcat extends EventEmitter {
-  constructor (opts = {}) {
+  private readonly adb: ADBExecutable;
+  private readonly clearLogs: boolean;
+  private readonly debug?: boolean;
+  private readonly debugTrace?: boolean;
+  private readonly maxBufferSize: number;
+  private readonly logs: LRUCache<number, [string, number]>;
+  private logIndexSinceLastRequest: number | null;
+  private proc: SubProcess | null;
+
+  constructor(opts: LogcatOptions) {
     super();
     this.adb = opts.adb;
     this.clearLogs = opts.clearDeviceLogsOnStart || false;
     this.debug = opts.debug;
     this.debugTrace = opts.debugTrace;
     this.maxBufferSize = opts.maxBufferSize || MAX_BUFFER_SIZE;
-    /** @type {LRUCache<number, [string, number]>} */
     this.logs = new LRUCache({
       max: this.maxBufferSize,
     });
-    /** @type {number?} */
     this.logIndexSinceLastRequest = null;
+    this.proc = null;
   }
 
-  async startCapture (opts = {}) {
+  async startCapture(opts: StartCaptureOptions = {}): Promise<void> {
     let started = false;
     return await new B(async (_resolve, _reject) => {
-      const resolve = function (...args) {
+      const resolve = function (...args: any[]) {
         started = true;
         _resolve(...args);
       };
-      const reject = function (...args) {
+      const reject = function (...args: any[]) {
         started = true;
         _reject(...args);
       };
@@ -149,33 +108,7 @@ export class Logcat extends EventEmitter {
     });
   }
 
-  /**
-   *
-   * @param {string} logLine
-   * @param {string} [prefix='']
-   * @returns {void}
-   */
-  outputHandler (logLine, prefix = '') {
-    const timestamp = Date.now();
-    let recentIndex = -1;
-    for (const key of this.logs.keys()) {
-      recentIndex = key;
-      break;
-    }
-    this.logs.set(++recentIndex, [logLine, timestamp]);
-    if (this.listenerCount('output')) {
-      this.emit('output', toLogEntry(logLine, timestamp));
-    }
-    if (this.debug && (this.debugTrace || !TRACE_PATTERN.test(logLine))) {
-      log.debug(prefix + logLine);
-    }
-  }
-
-  /**
-   *
-   * @returns {Promise<void>}
-   */
-  async stopCapture () {
+  async stopCapture(): Promise<void> {
     log.debug('Stopping logcat capture');
     if (!this.proc?.isRunning) {
       log.debug('Logcat already stopped');
@@ -187,15 +120,15 @@ export class Logcat extends EventEmitter {
     this.proc = null;
   }
 
-  /**
-   * @returns {import('./tools/types').LogEntry[]}
-   */
-  getLogs () {
-    /** @type {import('./tools/types').LogEntry[]} */
-    const result = [];
-    /** @type {number?} */
-    let recentLogIndex = null;
-    for (const [index, [message, timestamp]] of /** @type {Generator} */ (this.logs.rentries())) {
+  getLogs(): LogEntry[] {
+    const result: LogEntry[] = [];
+    let recentLogIndex: number | null = null;
+    for (const entry of this.logs.rentries()) {
+      const [index, value] = entry;
+      if (typeof index !== 'number' || !Array.isArray(value)) {
+        continue;
+      }
+      const [message, timestamp] = value;
       if (this.logIndexSinceLastRequest && index > this.logIndexSinceLastRequest
           || !this.logIndexSinceLastRequest) {
         recentLogIndex = index;
@@ -208,30 +141,94 @@ export class Logcat extends EventEmitter {
     return result;
   }
 
-  /**
-   * @returns {import('./tools/types').LogEntry[]}
-   */
-  getAllLogs () {
-    /** @type {import('./tools/types').LogEntry[]} */
-    const result = [];
-    for (const [message, timestamp] of /** @type {Generator} */ (this.logs.rvalues())) {
+  getAllLogs(): LogEntry[] {
+    const result: LogEntry[] = [];
+    for (const value of this.logs.rvalues()) {
+      if (!Array.isArray(value)) {
+        continue;
+      }
+      const [message, timestamp] = value;
       result.push(toLogEntry(message, timestamp));
     }
     return result;
   }
 
-  /**
-   * @returns {Promise<void>}
-   */
-  async clear () {
+  async clear(): Promise<void> {
     log.debug('Clearing logcat logs from device');
     try {
       const args = [...this.adb.defaultArgs, 'logcat', '-c'];
       await exec(this.adb.path, args);
     } catch (err) {
-      log.warn(`Failed to clear logcat logs: ${err.stderr || err.message}`);
+      const execErr = err as ExecError;
+      log.warn(`Failed to clear logcat logs: ${execErr.stderr || execErr.message}`);
+    }
+  }
+
+  private outputHandler(logLine: string, prefix: string = ''): void {
+    const timestamp = Date.now();
+    let recentIndex = -1;
+    for (const key of this.logs.keys()) {
+      recentIndex = key;
+      break;
+    }
+    this.logs.set(++recentIndex, [logLine, timestamp]);
+    if (this.listenerCount('output')) {
+      this.emit('output', toLogEntry(logLine, timestamp));
+    }
+    if (this.debug && (this.debugTrace || !TRACE_PATTERN.test(logLine))) {
+      log.debug(prefix + logLine);
     }
   }
 }
 
 export default Logcat;
+
+// Private entities
+
+type LogFormat = typeof SUPPORTED_FORMATS[number];
+
+function requireFormat(format: string): LogFormat {
+  if (!SUPPORTED_FORMATS.includes(format as LogFormat)) {
+    log.info(`The format value '${format}' is unknown. Supported values are: ${SUPPORTED_FORMATS}`);
+    log.info(`Defaulting to '${DEFAULT_FORMAT}'`);
+    return DEFAULT_FORMAT;
+  }
+  return format as LogFormat;
+}
+
+function toLogEntry(message: string, timestamp: number): LogEntry {
+  return {
+    timestamp,
+    level: 'ALL',
+    message,
+  };
+}
+
+function requireSpec(spec: string): string {
+  const [tag, priority] = spec.split(':');
+  let resultTag = tag;
+  if (!resultTag) {
+    log.info(`The tag value in spec '${spec}' cannot be empty`);
+    log.info(`Defaulting to '${DEFAULT_TAG}'`);
+    resultTag = DEFAULT_TAG;
+  }
+  if (!priority) {
+    log.info(`The priority value in spec '${spec}' is empty. Defaulting to Verbose (${DEFAULT_PRIORITY})`);
+    return `${resultTag}:${DEFAULT_PRIORITY}`;
+  }
+  if (!SUPPORTED_PRIORITIES.some((p) => _.toLower(priority) === _.toLower(p))) {
+    log.info(`The priority value in spec '${spec}' is unknown. Supported values are: ${SUPPORTED_PRIORITIES}`);
+    log.info(`Defaulting to Verbose (${DEFAULT_PRIORITY})`);
+    return `${resultTag}:${DEFAULT_PRIORITY}`;
+  }
+  return spec;
+}
+
+function formatFilterSpecs(filterSpecs: string | string[]): string[] {
+  if (!_.isArray(filterSpecs)) {
+    filterSpecs = [filterSpecs];
+  }
+  return filterSpecs
+    .filter((spec) => spec && _.isString(spec) && !spec.startsWith('-'))
+    .map((spec) => spec.includes(':') ? requireSpec(spec) : spec);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-adb",
-  "version": "14.0.1",
+  "version": "14.0.3",
   "description": "Android Debug Bridge interface",
   "main": "./build/index.js",
   "scripts": {
@@ -79,7 +79,7 @@
     "conventional-changelog-conventionalcommits": "^9.0.0",
     "mocha": "^11.0.1",
     "prettier": "^3.0.0",
-    "semantic-release": "^25.0.1",
+    "semantic-release": "^25.0.2",
     "ts-node": "^10.9.1",
     "typescript": "^5.4.2"
   },