@appium/support 7.0.5 → 7.0.6

package/build/lib/index.d.ts

@@ -23,36 +23,38 @@ declare const _default: {
     system: typeof system;
     util: typeof util;
     fs: {
-        hasAccess(path: PathLike): Promise<boolean>;
-        isExecutable(path: PathLike): Promise<boolean>;
-        exists(path: PathLike): Promise<boolean>;
-        rimraf(filepath: PathLike): Promise<void>;
-        rimrafSync(filepath: PathLike): void;
+        hasAccess(filePath: import("fs").PathLike): Promise<boolean>;
+        isExecutable(filePath: import("fs").PathLike): Promise<boolean>;
+        exists(filePath: import("fs").PathLike): Promise<boolean>;
+        rimraf(filepath: import("fs").PathLike): Promise<void>;
+        rimrafSync(filepath: import("fs").PathLike): void;
         mkdir(filepath: string | Buffer | URL, opts?: import("fs").MakeDirectoryOptions): Promise<string | undefined>;
         copyFile(source: string, destination: string, opts?: import("ncp").Options): Promise<void>;
-        md5(filePath: PathLike): Promise<string>;
-        mv(from: string, to: string, opts?: mv): Promise<void>;
+        md5(filePath: import("fs").PathLike): Promise<string>;
+        mv(from: string, to: string, opts?: import("./fs").MvOptions): Promise<void>;
         which: typeof import("which");
-        glob: (pattern: string, opts?: import("glob").GlobOptions) => import("bluebird")<string[]>;
+        glob(pattern: string, options?: import("glob/raw").GlobOptions): Promise<string[]>;
         sanitizeName: typeof import("sanitize-filename");
-        hash(filePath: PathLike, algorithm?: string): Promise<string>;
+        hash(filePath: import("fs").PathLike, algorithm?: string): Promise<string>;
         walk(dir: string, opts?: import("klaw").Options): import("klaw").Walker;
-        mkdirp(dir: PathLike): Promise<string | undefined>;
-        walkDir(dir: string, recursive: boolean, callback: WalkDirCallback): Promise<string | null>;
-        readPackageJsonFrom(dir: string, opts?: import("read-pkg").Options): import("read-pkg").NormalizedPackageJson;
+        mkdirp(dir: import("fs").PathLike): Promise<string | undefined>;
+        walkDir(dir: string, recursive: boolean, callback: import("./fs").WalkDirCallback): Promise<string | null>;
+        readPackageJsonFrom(dir: string, opts?: import("read-pkg", { with: { "resolution-mode": "import" } }).NormalizeOptions & {
+            cwd?: string;
+        }): import("read-pkg", { with: { "resolution-mode": "import" } }).NormalizedPackageJson;
         findRoot(dir: string): string;
         access: typeof import("fs/promises").access;
         appendFile: typeof import("fs/promises").appendFile;
         chmod: typeof import("fs/promises").chmod;
-        close: (arg1: number) => import("bluebird")<any>;
+        close: typeof import("fs").close.__promisify__;
         constants: typeof import("fs").constants;
         createWriteStream: typeof import("fs").createWriteStream;
         createReadStream: typeof import("fs").createReadStream;
         lstat: typeof import("fs/promises").lstat;
-        open: (path: import("./fs").PathLike, flags: import("fs").OpenMode, mode?: import("fs").Mode) => Promise<number>;
+        open: typeof import("fs").open.__promisify__;
         openFile: typeof import("fs/promises").open;
         readdir: typeof import("fs/promises").readdir;
-        read: import("./fs").ReadFn<NodeJS.ArrayBufferView>;
+        read: typeof import("fs").read.__promisify__;
         readFile: typeof import("fs/promises").readFile;
         readlink: typeof import("fs/promises").readlink;
         realpath: typeof import("fs/promises").realpath;
@@ -69,7 +71,7 @@ declare const _default: {
     };
     cancellableDelay: typeof util.cancellableDelay;
     plist: typeof plist;
-    mkdirp: (dir: PathLike) => Promise<string | undefined>;
+    mkdirp: (dir: import("fs").PathLike) => Promise<string | undefined>;
     logger: typeof logger;
     process: typeof process;
     zip: typeof zip;
@@ -85,7 +87,7 @@ declare const _default: {
 export default _default;
 export type { ConsoleOpts } from './console';
 export type { ReadFn, WalkDirCallback } from './fs';
-export type { NetOptions, DownloadOptions, AuthCredentials, NotHttpUploadOptions, HttpUploadOptions, } from './net';
+export type { NetOptions, DownloadOptions, AuthCredentials, FtpUploadOptions, NotHttpUploadOptions, HttpUploadOptions, } from './net';
 export type { InstallPackageOpts, ExecOpts, NpmInstallReceipt } from './npm';
 export type { Affixes, OpenedAffixes } from './tempdir';
 export type { PluralizeOptions, EncodingOptions, LockFileOptions, NonEmptyString } from './util';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAC,EAAE,EAAC,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,KAAK,MAAM,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,SAAS,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AAEnC,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAE1B,QAAA,MAAO,gBAAgB,8BAAQ,CAAC;AAEhC,OAAO,EACL,OAAO,EACP,MAAM,EACN,IAAI,EACJ,EAAE,EACF,gBAAgB,EAChB,KAAK,EACL,MAAM,EACN,MAAM,EACN,OAAO,EACP,GAAG,EACH,SAAS,EACT,GAAG,EACH,KAAK,EACL,IAAI,EACJ,MAAM,EACN,GAAG,EACH,OAAO,EACP,MAAM,GACP,CAAC;;;;;;;;;;;;;;;;oCAyCuwJ,CAAC;;;;;;;;;;;;;;;;gFAA2zM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAxCtkW,wBAmBE;AAEF,YAAY,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AAC3C,YAAY,EAAC,MAAM,EAAE,eAAe,EAAC,MAAM,MAAM,CAAC;AAClD,YAAY,EACV,UAAU,EACV,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,iBAAiB,GAClB,MAAM,OAAO,CAAC;AACf,YAAY,EAAC,kBAAkB,EAAE,QAAQ,EAAE,iBAAiB,EAAC,MAAM,OAAO,CAAC;AAC3E,YAAY,EAAC,OAAO,EAAE,aAAa,EAAC,MAAM,WAAW,CAAC;AACtD,YAAY,EAAC,gBAAgB,EAAE,eAAe,EAAE,eAAe,EAAE,cAAc,EAAC,MAAM,QAAQ,CAAC;AAC/F,YAAY,EACV,iBAAiB,EACjB,QAAQ,EACR,UAAU,EACV,qBAAqB,EACrB,gBAAgB,GACjB,MAAM,OAAO,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAC,EAAE,EAAC,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,KAAK,MAAM,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,SAAS,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AAEnC,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAE1B,QAAA,MAAO,gBAAgB,8BAAQ,CAAC;AAEhC,OAAO,EACL,OAAO,EACP,MAAM,EACN,IAAI,EACJ,EAAE,EACF,gBAAgB,EAChB,KAAK,EACL,MAAM,EACN,MAAM,EACN,OAAO,EACP,GAAG,EACH,SAAS,EACT,GAAG,EACH,KAAK,EACL,IAAI,EACJ,MAAM,EACN,GAAG,EACH,OAAO,EACP,MAAM,GACP,CAAC;;;;;;;;;;;;;;;;;;;;;;;eA0C8zT,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAzCj0T,wBAmBE;AAEF,YAAY,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AAC3C,YAAY,EAAC,MAAM,EAAE,eAAe,EAAC,MAAM,MAAM,CAAC;AAClD,YAAY,EACV,UAAU,EACV,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,oBAAoB,EACpB,iBAAiB,GAClB,MAAM,OAAO,CAAC;AACf,YAAY,EAAC,kBAAkB,EAAE,QAAQ,EAAE,iBAAiB,EAAC,MAAM,OAAO,CAAC;AAC3E,YAAY,EAAC,OAAO,EAAE,aAAa,EAAC,MAAM,WAAW,CAAC;AACtD,YAAY,EAAC,gBAAgB,EAAE,eAAe,EAAE,eAAe,EAAE,cAAc,EAAC,MAAM,QAAQ,CAAC;AAC/F,YAAY,EACV,iBAAiB,EACjB,QAAQ,EACR,UAAU,EACV,qBAAqB,EACrB,gBAAgB,GACjB,MAAM,OAAO,CAAC"}

package/build/lib/logger.d.ts

@@ -1,3 +1,3 @@
+declare const log: import("../../types/build/lib").AppiumLogger;
 export default log;
-declare let log: import("../../types/build/lib").AppiumLogger;
 //# sourceMappingURL=logger.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.js"],"names":[],"mappings":";AAEA,8DAA+B"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,GAAG,8CAAuB,CAAC;AAEjC,eAAe,GAAG,CAAC"}

package/build/lib/logger.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const logging_1 = require("./logging");
-let log = (0, logging_1.getLogger)('Support');
+const log = (0, logging_1.getLogger)('Support');
 exports.default = log;
 //# sourceMappingURL=logger.js.map

package/build/lib/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.js"],"names":[],"mappings":";;AAAA,uCAAoC;AAEpC,IAAI,GAAG,GAAG,IAAA,mBAAS,EAAC,SAAS,CAAC,CAAC;AAE/B,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":";;AAAA,uCAAoC;AAEpC,MAAM,GAAG,GAAG,IAAA,mBAAS,EAAC,SAAS,CAAC,CAAC;AAEjC,kBAAe,GAAG,CAAC"}

package/build/lib/logging.d.ts

@@ -1,9 +1,11 @@
+import type { AppiumLogger, AppiumLoggerLevel, AppiumLoggerPrefix } from '@appium/types';
+export declare const LEVELS: readonly AppiumLoggerLevel[];
+export declare const log: AppiumLogger;
 /**
- *
- * @param {AppiumLoggerPrefix?} [prefix=null]
- * @returns {AppiumLogger}
+ * @param prefix - Optional log prefix
+ * @returns A wrapped Appium logger instance
  */
-export function getLogger(prefix?: AppiumLoggerPrefix | null): AppiumLogger;
+export declare function getLogger(prefix?: AppiumLoggerPrefix | null): AppiumLogger;
 /**
  * Marks arbitrary log message as sensitive.
  * This message will then be replaced with the default replacer
@@ -12,19 +14,9 @@ export function getLogger(prefix?: AppiumLoggerPrefix | null): AppiumLogger;
  * The latter is enabled by the corresponding HTTP middleware
  * in response to the `X-Appium-Is-Sensitive` request header
  * being set to 'true'.
- *
- * @template {any} T
- * @param {T} logMessage
- * @returns {{[k: string]: T}}
  */
-export function markSensitive<T extends unknown>(logMessage: T): {
+export declare function markSensitive<T>(logMessage: T): {
     [k: string]: T;
 };
-/** @type {import('@appium/types').AppiumLoggerLevel[]} */
-export const LEVELS: import("@appium/types").AppiumLoggerLevel[];
-export const log: import("@appium/types").AppiumLogger;
 export default log;
-export type AppiumLoggerPrefix = import("@appium/types").AppiumLoggerPrefix;
-export type AppiumLogger = import("@appium/types").AppiumLogger;
-export type AppiumLoggerLevel = import("@appium/types").AppiumLoggerLevel;
 //# sourceMappingURL=logging.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../lib/logging.js"],"names":[],"mappings":"AAwBA;;;;GAIG;AACH,mCAHW,kBAAkB,OAAC,GACjB,YAAY,CAyDxB;AAED;;;;;;;;;;;;GAYG;AACH,8BAJmB,CAAC,8BACT,CAAC,GACC;IAAC,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,CAAA;CAAC,CAI5B;AAjGD,0DAA0D;AAC1D,qBADW,OAAO,eAAe,EAAE,iBAAiB,EAAE,CAC+B;AAiBrF,uDAA+B;;iCAuHlB,OAAO,eAAe,EAAE,kBAAkB;2BAC1C,OAAO,eAAe,EAAE,YAAY;gCACpC,OAAO,eAAe,EAAE,iBAAiB"}
+{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../lib/logging.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,YAAY,EAEZ,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,eAAe,CAAC;AAGvB,eAAO,MAAM,MAAM,EAAE,SAAS,iBAAiB,EAQ9C,CAAC;AAyBF,eAAO,MAAM,GAAG,cAAc,CAAC;AAE/B;;;GAGG;AACH,wBAAgB,SAAS,CAAC,MAAM,GAAE,kBAAkB,GAAG,IAAW,GAAG,YAAY,CA8DhF;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,GAAG;IAAC,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,CAAA;CAAC,CAEhE;AA8BD,eAAe,GAAG,CAAC"}

package/build/lib/logging.js

@@ -41,53 +41,49 @@ exports.getLogger = getLogger;
 exports.markSensitive = markSensitive;
 const logger_1 = __importStar(require("@appium/logger"));
 const lodash_1 = __importDefault(require("lodash"));
-const moment_1 = __importDefault(require("moment"));
-/** @type {import('@appium/types').AppiumLoggerLevel[]} */
-exports.LEVELS = ['silly', 'verbose', 'debug', 'info', 'http', 'warn', 'error'];
+exports.LEVELS = [
+    'silly',
+    'verbose',
+    'debug',
+    'info',
+    'http',
+    'warn',
+    'error',
+];
 const MAX_LOG_RECORDS_COUNT = 3000;
-const PREFIX_TIMESTAMP_FORMAT = 'HH-mm-ss:SSS';
+const globalWithNpmlog = globalThis;
 // mock log object is used in testing mode to silence the output
 const MOCK_LOG = {
     unwrap: () => ({
-        loadSecureValuesPreprocessingRules: () => ({
-            issues: [],
-            rules: [],
-        }),
+        loadSecureValuesPreprocessingRules: () => Promise.resolve({ issues: [], rules: [] }),
         level: 'verbose',
         prefix: '',
         log: lodash_1.default.noop,
     }),
-    ...(lodash_1.default.fromPairs(exports.LEVELS.map((l) => [l, lodash_1.default.noop]))),
+    ...lodash_1.default.fromPairs(exports.LEVELS.map((l) => [l, lodash_1.default.noop])),
 };
-// export a default logger with no prefix
 exports.log = getLogger();
 /**
- *
- * @param {AppiumLoggerPrefix?} [prefix=null]
- * @returns {AppiumLogger}
+ * @param prefix - Optional log prefix
+ * @returns A wrapped Appium logger instance
  */
 function getLogger(prefix = null) {
-    const [logger, usingGlobalLog] = _getLogger();
-    // wrap the logger so that we can catch and modify any logging
+    const { logger, defaultToVerbose } = _getLogger();
     const wrappedLogger = {
         unwrap: () => logger,
-        levels: exports.LEVELS,
-        prefix,
-        errorWithException(/** @type {any[]} */ ...args) {
+        levels: [...exports.LEVELS],
+        prefix: prefix ?? undefined,
+        errorWithException(...args) {
             this.error(...args);
-            // make sure we have an `Error` object. Wrap if necessary
             return lodash_1.default.isError(args[0]) ? args[0] : new Error(args.join('\n'));
         },
-        errorAndThrow(/** @type {any[]} */ ...args) {
-            throw this.errorWithException(args);
+        errorAndThrow(...args) {
+            throw this.errorWithException(...args);
         },
-        updateAsyncContext(
-        /** @type {import('@appium/types').AppiumLoggerContext} */ contextInfo, replace = false) {
-            // Older Appium dependencies may not have 'updateAsyncStorage'
+        updateAsyncContext(contextInfo, replace = false) {
             this.unwrap().updateAsyncStorage?.(contextInfo, replace);
         },
     };
-    // allow access to the level of the underlying logger
     Object.defineProperty(wrappedLogger, 'level', {
         get() {
             return logger.level;
@@ -99,12 +95,10 @@ function getLogger(prefix = null) {
         configurable: true,
     });
     const isDebugTimestampLoggingEnabled = process.env._LOG_TIMESTAMP === '1';
-    // add all the levels from `npmlog`, and map to the underlying logger
     for (const level of exports.LEVELS) {
-        wrappedLogger[level] = /** @param {any[]} args */ function (...args) {
+        wrappedLogger[level] = function (...args) {
             const finalPrefix = getFinalPrefix(this.prefix, isDebugTimestampLoggingEnabled);
             if (args.length) {
-                // @ts-ignore This is OK
                 logger[level](finalPrefix, ...args);
             }
             else {
@@ -112,13 +106,12 @@ function getLogger(prefix = null) {
             }
         };
     }
-    if (!usingGlobalLog) {
-        // if we're not using a global log specified from some top-level package,
-        // set the log level to a default of verbose. Otherwise, let the top-level
-        // package set the log level
+    // Default to verbose when the global was not already set (first use, or standalone);
+    // main server will override later.
+    if (defaultToVerbose) {
         wrappedLogger.level = 'verbose';
     }
-    return /** @type {AppiumLogger} */ (wrappedLogger);
+    return wrappedLogger;
 }
 /**
  * Marks arbitrary log message as sensitive.
@@ -128,51 +121,32 @@ function getLogger(prefix = null) {
  * The latter is enabled by the corresponding HTTP middleware
  * in response to the `X-Appium-Is-Sensitive` request header
  * being set to 'true'.
- *
- * @template {any} T
- * @param {T} logMessage
- * @returns {{[k: string]: T}}
  */
 function markSensitive(logMessage) {
     return (0, logger_1.markSensitive)(logMessage);
 }
-/**
- *
- * @returns {[import('@appium/logger').Logger, boolean]}
- */
 function _getLogger() {
-    // check if the user set the `_TESTING` or `_FORCE_LOGS` flag
     const testingMode = process.env._TESTING === '1';
     const forceLogMode = process.env._FORCE_LOGS === '1';
-    // if is possible that there is a logger instance that is already around,
-    // in which case we want t o use that
-    const useGlobalLog = !!global._global_npmlog;
+    const defaultToVerbose = !globalWithNpmlog._global_npmlog;
     const logger = testingMode && !forceLogMode
-        // in testing mode, use a mock logger object that we can query
         ? MOCK_LOG
-        // otherwise, either use the global, or a new `npmlog` object
-        : (global._global_npmlog || logger_1.default);
-    // The default value is 10000, which causes excessive memory usage
-    logger.maxRecordSize = MAX_LOG_RECORDS_COUNT;
-    return [logger, useGlobalLog];
+        : (globalWithNpmlog._global_npmlog ?? logger_1.default);
+    if (!testingMode && !globalWithNpmlog._global_npmlog && logger === logger_1.default) {
+        globalWithNpmlog._global_npmlog = logger_1.default;
+        logger.maxRecordSize = MAX_LOG_RECORDS_COUNT;
+    }
+    return { logger, defaultToVerbose };
 }
-/**
- * @param {AppiumLoggerPrefix?} prefix
- * @param {boolean} [shouldLogTimestamp=false] whether to include timestamps into log prefixes
- * @returns {string}
- */
 function getFinalPrefix(prefix, shouldLogTimestamp = false) {
     const result = (lodash_1.default.isFunction(prefix) ? prefix() : prefix) ?? '';
     if (!shouldLogTimestamp) {
         return result;
     }
-    const formattedTimestamp = `[${(0, moment_1.default)().format(PREFIX_TIMESTAMP_FORMAT)}]`;
+    const now = new Date();
+    const pad = (n, z = 2) => String(n).padStart(z, '0');
+    const formattedTimestamp = `[${pad(now.getHours())}-${pad(now.getMinutes())}-${pad(now.getSeconds())}:${pad(now.getMilliseconds(), 3)}]`;
     return result ? `${formattedTimestamp} ${result}` : formattedTimestamp;
 }
 exports.default = exports.log;
-/**
- * @typedef {import('@appium/types').AppiumLoggerPrefix} AppiumLoggerPrefix
- * @typedef {import('@appium/types').AppiumLogger} AppiumLogger
- * @typedef {import('@appium/types').AppiumLoggerLevel} AppiumLoggerLevel
- */
 //# sourceMappingURL=logging.js.map

package/build/lib/logging.js.map

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

package/build/lib/mjpeg.d.ts

@@ -1,65 +1,28 @@
+import { Writable, type WritableOptions } from 'node:stream';
 /** Class which stores the last bit of data streamed into it */
-export class MJpegStream extends Writable {
-    /**
-     * Create an MJpegStream
-     * @param {string} mJpegUrl - URL of MJPEG-over-HTTP stream
-     * @param {function} [errorHandler=noop] - additional function that will be
-     * called in the case of any errors.
-     * @param {object} [options={}] - Options to pass to the Writable constructor
-     */
-    constructor(mJpegUrl: string, errorHandler?: Function, options?: object);
-    /**
-     * @type {number}
-     */
-    updateCount: number;
-    errorHandler: Function;
-    url: string;
-    /**
-     * Get the base64-encoded version of the JPEG
-     *
-     * @returns {?string} base64-encoded JPEG image data
-     * or `null` if no image can be parsed
-     */
+export declare class MJpegStream extends Writable {
+    readonly errorHandler: (err: Error) => void;
+    readonly url: string;
+    /** Number of JPEG frames received so far (reset on {@linkcode clear}). Use stream['updateCount'] in tests if needed. */
+    private updateCount;
+    /** Last received JPEG chunk (base64 via {@linkcode lastChunkBase64}); `null` when no data yet or after {@linkcode clear}/stop. Use stream['lastChunk'] in tests if needed. */
+    private lastChunk;
+    private registerStartSuccess;
+    private registerStartFailure;
+    private responseStream;
+    private consumer;
+    /**
+     * @param mJpegUrl - URL of MJPEG-over-HTTP stream
+     * @param errorHandler - additional function that will be called in the case of any errors
+     * @param options - Options to pass to the Writable constructor
+     */
+    constructor(mJpegUrl: string, errorHandler?: (err: Error) => void, options?: WritableOptions);
     get lastChunkBase64(): string | null;
-    /**
-     * Get the PNG version of the JPEG buffer
-     *
-     * @returns {Promise<Buffer?>} PNG image data or `null` if no PNG
-     * image can be parsed
-     */
     lastChunkPNG(): Promise<Buffer | null>;
-    /**
-     * Get the base64-encoded version of the PNG
-     *
-     * @returns {Promise<string?>} base64-encoded PNG image data
-     * or `null` if no image can be parsed
-     */
     lastChunkPNGBase64(): Promise<string | null>;
-    /**
-     * Reset internal state
-     */
     clear(): void;
-    registerStartSuccess: ((thenableOrResult?: any) => void) | null | undefined;
-    registerStartFailure: ((error?: any) => void) | null | undefined;
-    responseStream: any;
-    consumer: any;
-    lastChunk: Buffer<ArrayBufferLike> | null | undefined;
-    /**
-     * Start reading the MJpeg stream and storing the last image
-     */
     start(serverTimeout?: number): Promise<void>;
-    /**
-     * Stop reading the MJpeg stream. Ensure we disconnect all the pipes and stop
-     * the HTTP request itself. Then reset the state.
-     */
     stop(): void;
-    /**
-     * Override the Writable write() method in order to save the last image and
-     * log the number of images we have received
-     * @override
-     * @param {Buffer} data - binary data streamed from the MJpeg consumer
-     */
-    override write(data: Buffer): boolean;
+    write(data: Buffer | string | Uint8Array, encoding?: BufferEncoding | ((error: Error | null) => void), callback?: (error: Error | null) => void): boolean;
 }
-import { Writable } from 'node:stream';
 //# sourceMappingURL=mjpeg.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"mjpeg.d.ts","sourceRoot":"","sources":["../../lib/mjpeg.js"],"names":[],"mappings":"AA+BA,+DAA+D;AAC/D;IAME;;;;;;OAMG;IACH,sBALW,MAAM,qCAGN,MAAM,EAQhB;IAlBD;;OAEG;IACH,aAFU,MAAM,CAEA;IAYd,uBAAgC;IAChC,YAAmB;IAIrB;;;;;OAKG;IACH,uBAHc,MAAM,OAAA,CAQnB;IAED;;;;;OAKG;IACH,gBAHa,OAAO,CAAC,MAAM,OAAC,CAAC,CAc5B;IAED;;;;;OAKG;IACH,sBAHa,OAAO,CAAC,MAAM,OAAC,CAAC,CAM5B;IAED;;OAEG;IACH,cAOC;IANC,4EAAgC;IAChC,iEAAgC;IAChC,oBAA0B;IAC1B,cAAoB;IACpB,sDAAqB;IAIvB;;OAEG;IACH,6CAyDC;IAED;;;OAGG;IACH,aAWC;IAED;;;;;OAKG;IACH,qBAFW,MAAM,WAYhB;CACF;yBAxMsB,aAAa"}
+{"version":3,"file":"mjpeg.d.ts","sourceRoot":"","sources":["../../lib/mjpeg.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,QAAQ,EAAE,KAAK,eAAe,EAAgB,MAAM,aAAa,CAAC;AA4B1E,+DAA+D;AAC/D,qBAAa,WAAY,SAAQ,QAAQ;IACvC,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAC;IAC5C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,wHAAwH;IACxH,OAAO,CAAC,WAAW,CAAK;IACxB,8KAA8K;IAC9K,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,oBAAoB,CAA6B;IACzD,OAAO,CAAC,oBAAoB,CAAuC;IACnE,OAAO,CAAC,cAAc,CAAyB;IAC/C,OAAO,CAAC,QAAQ,CAAuC;IAEvD;;;;OAIG;gBAED,QAAQ,EAAE,MAAM,EAChB,YAAY,GAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAa,EAC3C,OAAO,GAAE,eAAoB;IAQ/B,IAAI,eAAe,IAAI,MAAM,GAAG,IAAI,CAMnC;IAEK,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAatC,kBAAkB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAKlD,KAAK,IAAI,IAAI;IASP,KAAK,CAAC,aAAa,SAA0B,GAAG,OAAO,CAAC,IAAI,CAAC;IA2DnE,IAAI,IAAI,IAAI;IAeH,KAAK,CACZ,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,EAClC,QAAQ,CAAC,EAAE,cAAc,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,CAAC,EAC3D,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,GACvC,OAAO;CAWX"}