appium 2.0.0-beta.46 → 2.0.0-beta.48

package/build/lib/logsink.js

@@ -1,210 +1,216 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.clear = clear;
-exports.default = void 0;
-exports.init = init;
-
-require("source-map-support/register");
-
-var _npmlog = _interopRequireDefault(require("npmlog"));
-
-var _winston = require("winston");
-
-var _support = require("@appium/support");
-
-var _lodash = _interopRequireDefault(require("lodash"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-_support.logger.patchLogger(_npmlog.default);
-
-global._global_npmlog = _npmlog.default;
-_npmlog.default.level = 'info';
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.clear = exports.init = void 0;
+const npmlog_1 = __importDefault(require("npmlog"));
+const winston_1 = require("winston");
+const support_1 = require("@appium/support");
+const lodash_1 = __importDefault(require("lodash"));
+// set up distributed logging before everything else
+support_1.logger.patchLogger(npmlog_1.default);
+global._global_npmlog = npmlog_1.default;
+// npmlog is used only for emitting, we use winston for output
+npmlog_1.default.level = 'info';
 const levels = {
-  debug: 4,
-  info: 3,
-  warn: 2,
-  error: 1
+    debug: 4,
+    info: 3,
+    warn: 2,
+    error: 1,
 };
 const colors = {
-  info: 'cyan',
-  debug: 'grey',
-  warn: 'yellow',
-  error: 'red'
+    info: 'cyan',
+    debug: 'grey',
+    warn: 'yellow',
+    error: 'red',
 };
 const npmToWinstonLevels = {
-  silly: 'debug',
-  verbose: 'debug',
-  debug: 'debug',
-  info: 'info',
-  http: 'info',
-  warn: 'warn',
-  error: 'error'
+    silly: 'debug',
+    verbose: 'debug',
+    debug: 'debug',
+    info: 'info',
+    http: 'info',
+    warn: 'warn',
+    error: 'error',
 };
+const encounteredPrefixes = [];
 let log = null;
 let useLocalTimeZone = false;
-
-const timestampFormat = _winston.format.timestamp({
-  format() {
-    let date = new Date();
-
-    if (useLocalTimeZone) {
-      date = new Date(date.valueOf() - date.getTimezoneOffset() * 60000);
-    }
-
-    return date.toISOString().replace(/[TZ]/g, ' ').replace(/\./g, ':').trim();
-  }
-
+// add the timestamp in the correct format to the log info object
+const timestampFormat = winston_1.format.timestamp({
+    format() {
+        let date = new Date();
+        if (useLocalTimeZone) {
+            date = new Date(date.valueOf() - date.getTimezoneOffset() * 60000);
+        }
+        // '2012-11-04T14:51:06.157Z' -> '2012-11-04 14:51:06:157'
+        return date.toISOString().replace(/[TZ]/g, ' ').replace(/\./g, ':').trim();
+    },
 });
-
-const colorizeFormat = _winston.format.colorize({
-  colors
+// set the custom colors
+const colorizeFormat = winston_1.format.colorize({
+    colors,
 });
-
-const stripColorFormat = (0, _winston.format)(function stripColor(info) {
-  const code = /\u001b\[(\d+(;\d+)*)?m/g;
-  info.message = info.message.replace(code, '');
-  return info;
+// Strip the color marking within messages
+const stripColorFormat = (0, winston_1.format)(function stripColor(info) {
+    const code = /\u001b\[(\d+(;\d+)*)?m/g; // eslint-disable-line no-control-regex
+    info.message = info.message.replace(code, '');
+    return info;
 })();
-
 function createConsoleTransport(args, logLvl) {
-  return new _winston.transports.Console({
-    name: 'console',
-    handleExceptions: true,
-    exitOnError: false,
-    json: false,
-    level: logLvl,
-    stderrLevels: ['error'],
-    format: _winston.format.combine((0, _winston.format)(function adjustDebug(info) {
-      if (info.level === 'debug') {
-        info.level = 'info';
-        info.message = `[debug] ${info.message}`;
-      }
-
-      return info;
-    })(), timestampFormat, args.logNoColors ? stripColorFormat : colorizeFormat, _winston.format.printf(function printInfo(info) {
-      return `${args.logTimestamp ? `${info.timestamp} - ` : ''}${info.message}`;
-    }))
-  });
+    return new winston_1.transports.Console({
+        // `name` is unsupported per winston's type declarations
+        // @ts-expect-error
+        name: 'console',
+        handleExceptions: true,
+        exitOnError: false,
+        json: false,
+        level: logLvl,
+        stderrLevels: ['error'],
+        format: winston_1.format.combine((0, winston_1.format)(function adjustDebug(info) {
+            // prepend debug marker, and shift to `info` log level
+            if (info.level === 'debug') {
+                info.level = 'info';
+                info.message = `[debug] ${info.message}`;
+            }
+            return info;
+        })(), timestampFormat, args.logNoColors ? stripColorFormat : colorizeFormat, winston_1.format.printf(function printInfo(info) {
+            return `${args.logTimestamp ? `${info.timestamp} - ` : ''}${info.message}`;
+        })),
+    });
 }
-
 function createFileTransport(args, logLvl) {
-  return new _winston.transports.File({
-    name: 'file',
-    filename: args.logFile,
-    maxFiles: 1,
-    handleExceptions: true,
-    exitOnError: false,
-    json: false,
-    level: logLvl,
-    format: _winston.format.combine(stripColorFormat, timestampFormat, _winston.format.printf(function printInfo(info) {
-      return `${info.timestamp} ${info.message}`;
-    }))
-  });
+    return new winston_1.transports.File({
+        // @ts-expect-error
+        name: 'file',
+        filename: args.logFile,
+        maxFiles: 1,
+        handleExceptions: true,
+        exitOnError: false,
+        json: false,
+        level: logLvl,
+        format: winston_1.format.combine(stripColorFormat, timestampFormat, winston_1.format.printf(function printInfo(info) {
+            return `${info.timestamp} ${info.message}`;
+        })),
+    });
 }
-
 function createHttpTransport(args, logLvl) {
-  let host = '127.0.0.1';
-  let port = 9003;
-
-  if (args.webhook.match(':')) {
-    const hostAndPort = args.webhook.split(':');
-    host = hostAndPort[0];
-    port = parseInt(hostAndPort[1], 10);
-  }
-
-  return new _winston.transports.Http({
-    name: 'http',
-    host,
-    port,
-    path: '/',
-    handleExceptions: true,
-    exitOnError: false,
-    json: false,
-    level: logLvl,
-    format: _winston.format.combine(stripColorFormat, _winston.format.printf(function printInfo(info) {
-      return `${info.timestamp} ${info.message}`;
-    }))
-  });
+    let host = '127.0.0.1';
+    let port = 9003;
+    if (args.webhook.match(':')) {
+        const hostAndPort = args.webhook.split(':');
+        host = hostAndPort[0];
+        port = parseInt(hostAndPort[1], 10);
+    }
+    return new winston_1.transports.Http({
+        // @ts-expect-error
+        name: 'http',
+        host,
+        port,
+        path: '/',
+        handleExceptions: true,
+        exitOnError: false,
+        json: false,
+        level: logLvl,
+        format: winston_1.format.combine(stripColorFormat, winston_1.format.printf(function printInfo(info) {
+            return `${info.timestamp} ${info.message}`;
+        })),
+    });
 }
-
 async function createTransports(args) {
-  let transports = [];
-  let consoleLogLevel = null;
-  let fileLogLevel = null;
-
-  if (args.loglevel && args.loglevel.match(':')) {
-    const lvlPair = args.loglevel.split(':');
-    consoleLogLevel = lvlPair[0] || consoleLogLevel;
-    fileLogLevel = lvlPair[1] || fileLogLevel;
-  } else {
-    consoleLogLevel = fileLogLevel = args.loglevel;
-  }
-
-  transports.push(createConsoleTransport(args, consoleLogLevel));
-
-  if (args.logFile) {
-    try {
-      if (await _support.fs.exists(args.logFile)) {
-        await _support.fs.unlink(args.logFile);
-      }
-
-      transports.push(createFileTransport(args, fileLogLevel));
-    } catch (e) {
-      console.log(`Tried to attach logging to file '${args.logFile}' but an error ` + `occurred: ${e.message}`);
+    let transports = [];
+    let consoleLogLevel = null;
+    let fileLogLevel = null;
+    if (args.loglevel && args.loglevel.match(':')) {
+        // --log-level arg can optionally provide diff logging levels for console and file, separated by a colon
+        const lvlPair = args.loglevel.split(':');
+        consoleLogLevel = lvlPair[0] || consoleLogLevel;
+        fileLogLevel = lvlPair[1] || fileLogLevel;
     }
-  }
-
-  if (args.webhook) {
-    try {
-      transports.push(createHttpTransport(args, fileLogLevel));
-    } catch (e) {
-      console.log(`Tried to attach logging to Http at ${args.webhook} but ` + `an error occurred: ${e.message}`);
+    else {
+        consoleLogLevel = fileLogLevel = args.loglevel;
     }
-  }
-
-  return transports;
-}
-
-async function init(args) {
-  _npmlog.default.level = 'silent';
-  useLocalTimeZone = args.localTimezone;
-  clear();
-  log = (0, _winston.createLogger)({
-    transports: await createTransports(args),
-    levels
-  });
-
-  _npmlog.default.on('log', logObj => {
-    const winstonLevel = npmToWinstonLevels[logObj.level] || 'info';
-    let msg = logObj.message;
-
-    if (logObj.prefix) {
-      const prefix = `[${logObj.prefix}]`;
-      msg = `${args.logNoColors ? prefix : prefix.magenta} ${msg}`;
+    transports.push(createConsoleTransport(args, consoleLogLevel));
+    if (args.logFile) {
+        try {
+            // if we don't delete the log file, winston will always append and it will grow infinitely large;
+            // winston allows for limiting log file size, but as of 9.2.14 there's a serious bug when using
+            // maxFiles and maxSize together. https://github.com/flatiron/winston/issues/397
+            if (await support_1.fs.exists(args.logFile)) {
+                await support_1.fs.unlink(args.logFile);
+            }
+            transports.push(createFileTransport(args, fileLogLevel));
+        }
+        catch (e) {
+            // eslint-disable-next-line no-console
+            console.log(`Tried to attach logging to file '${args.logFile}' but an error ` + `occurred: ${e.message}`);
+        }
+    }
+    if (args.webhook) {
+        try {
+            transports.push(createHttpTransport(args, fileLogLevel));
+        }
+        catch (e) {
+            // eslint-disable-next-line no-console
+            console.log(`Tried to attach logging to Http at ${args.webhook} but ` +
+                `an error occurred: ${e.message}`);
+        }
     }
-
-    log[winstonLevel](msg);
-
-    if (args.logHandler && _lodash.default.isFunction(args.logHandler)) {
-      args.logHandler(logObj.level, msg);
+    return transports;
+}
+function getColorizedPrefix(prefix) {
+    let prefixId = prefix.split('@')[0].trim();
+    prefixId = prefixId.split(' (')[0].trim();
+    if (encounteredPrefixes.indexOf(prefixId) < 0) {
+        encounteredPrefixes.push(prefixId);
     }
-  });
+    // using a multiple of 16 should cause 16 colors to be created
+    const colorNumber = encounteredPrefixes.indexOf(prefixId) * 16;
+    // use the modulus to cycle around color wheel
+    return `\x1b[38;5;${colorNumber % 256}m${prefix}\x1b[0m`;
 }
-
+async function init(args) {
+    npmlog_1.default.level = 'silent';
+    // set de facto param passed to timestamp function
+    useLocalTimeZone = args.localTimezone;
+    // clean up in case we have initiated before since npmlog is a global object
+    clear();
+    log = (0, winston_1.createLogger)({
+        transports: await createTransports(args),
+        levels,
+    });
+    // Capture logs emitted via npmlog and pass them through winston
+    npmlog_1.default.on('log', (logObj) => {
+        const winstonLevel = npmToWinstonLevels[logObj.level] || 'info';
+        let msg = logObj.message;
+        if (logObj.prefix) {
+            const prefix = `[${logObj.prefix}]`;
+            if (args.logNoColors) {
+                msg = `${prefix} ${msg}`;
+            }
+            if (prefix === '[Appium]') {
+                msg = `${prefix.magenta} ${msg}`;
+            }
+            else {
+                msg = `${getColorizedPrefix(prefix)} ${msg}`;
+            }
+            log[winstonLevel](msg);
+            if (args.logHandler && lodash_1.default.isFunction(args.logHandler)) {
+                args.logHandler(logObj.level, msg);
+            }
+        }
+    });
+}
+exports.init = init;
 function clear() {
-  if (log) {
-    for (let transport of _lodash.default.keys(log.transports)) {
-      log.remove(transport);
+    if (log) {
+        for (let transport of lodash_1.default.keys(log.transports)) {
+            log.remove(transport);
+        }
     }
-  }
-
-  _npmlog.default.removeAllListeners('log');
+    npmlog_1.default.removeAllListeners('log');
 }
-
-var _default = init;
-exports.default = _default;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["logger","patchLogger","npmlog","global","_global_npmlog","level","levels","debug","info","warn","error","colors","npmToWinstonLevels","silly","verbose","http","log","useLocalTimeZone","timestampFormat","format","timestamp","date","Date","valueOf","getTimezoneOffset","toISOString","replace","trim","colorizeFormat","colorize","stripColorFormat","stripColor","code","message","createConsoleTransport","args","logLvl","transports","Console","name","handleExceptions","exitOnError","json","stderrLevels","combine","adjustDebug","logNoColors","printf","printInfo","logTimestamp","createFileTransport","File","filename","logFile","maxFiles","createHttpTransport","host","port","webhook","match","hostAndPort","split","parseInt","Http","path","createTransports","consoleLogLevel","fileLogLevel","loglevel","lvlPair","push","fs","exists","unlink","e","console","init","localTimezone","clear","createLogger","on","logObj","winstonLevel","msg","prefix","magenta","logHandler","_","isFunction","transport","keys","remove","removeAllListeners"],"sources":["../../lib/logsink.js"],"sourcesContent":["import npmlog from 'npmlog';\nimport {createLogger, format, transports} from 'winston';\nimport {fs, logger} from '@appium/support';\nimport _ from 'lodash';\n\n// set up distributed logging before everything else\nlogger.patchLogger(npmlog);\nglobal._global_npmlog = npmlog;\n\n// npmlog is used only for emitting, we use winston for output\nnpmlog.level = 'info';\nconst levels = {\n  debug: 4,\n  info: 3,\n  warn: 2,\n  error: 1,\n};\n\nconst colors = {\n  info: 'cyan',\n  debug: 'grey',\n  warn: 'yellow',\n  error: 'red',\n};\n\nconst npmToWinstonLevels = {\n  silly: 'debug',\n  verbose: 'debug',\n  debug: 'debug',\n  info: 'info',\n  http: 'info',\n  warn: 'warn',\n  error: 'error',\n};\n\nlet log = null;\nlet useLocalTimeZone = false;\n\n// add the timestamp in the correct format to the log info object\nconst timestampFormat = format.timestamp({\n  format() {\n    let date = new Date();\n    if (useLocalTimeZone) {\n      date = new Date(date.valueOf() - date.getTimezoneOffset() * 60000);\n    }\n    // '2012-11-04T14:51:06.157Z' -> '2012-11-04 14:51:06:157'\n    return date.toISOString().replace(/[TZ]/g, ' ').replace(/\\./g, ':').trim();\n  },\n});\n\n// set the custom colors\nconst colorizeFormat = format.colorize({\n  colors,\n});\n\n// Strip the color marking within messages\nconst stripColorFormat = format(function stripColor(info) {\n  const code = /\\u001b\\[(\\d+(;\\d+)*)?m/g; // eslint-disable-line no-control-regex\n  info.message = info.message.replace(code, '');\n  return info;\n})();\n\nfunction createConsoleTransport(args, logLvl) {\n  return new transports.Console({\n    // `name` is unsupported per winston's type declarations\n    // @ts-expect-error\n    name: 'console',\n    handleExceptions: true,\n    exitOnError: false,\n    json: false,\n    level: logLvl,\n    stderrLevels: ['error'],\n    format: format.combine(\n      format(function adjustDebug(info) {\n        // prepend debug marker, and shift to `info` log level\n        if (info.level === 'debug') {\n          info.level = 'info';\n          info.message = `[debug] ${info.message}`;\n        }\n        return info;\n      })(),\n      timestampFormat,\n      args.logNoColors ? stripColorFormat : colorizeFormat,\n      format.printf(function printInfo(info) {\n        return `${args.logTimestamp ? `${info.timestamp} - ` : ''}${info.message}`;\n      })\n    ),\n  });\n}\n\nfunction createFileTransport(args, logLvl) {\n  return new transports.File({\n    // @ts-expect-error\n    name: 'file',\n    filename: args.logFile,\n    maxFiles: 1,\n    handleExceptions: true,\n    exitOnError: false,\n    json: false,\n    level: logLvl,\n    format: format.combine(\n      stripColorFormat,\n      timestampFormat,\n      format.printf(function printInfo(info) {\n        return `${info.timestamp} ${info.message}`;\n      })\n    ),\n  });\n}\n\nfunction createHttpTransport(args, logLvl) {\n  let host = '127.0.0.1';\n  let port = 9003;\n\n  if (args.webhook.match(':')) {\n    const hostAndPort = args.webhook.split(':');\n    host = hostAndPort[0];\n    port = parseInt(hostAndPort[1], 10);\n  }\n\n  return new transports.Http({\n    // @ts-expect-error\n    name: 'http',\n    host,\n    port,\n    path: '/',\n    handleExceptions: true,\n    exitOnError: false,\n    json: false,\n    level: logLvl,\n    format: format.combine(\n      stripColorFormat,\n      format.printf(function printInfo(info) {\n        return `${info.timestamp} ${info.message}`;\n      })\n    ),\n  });\n}\n\nasync function createTransports(args) {\n  let transports = [];\n  let consoleLogLevel = null;\n  let fileLogLevel = null;\n\n  if (args.loglevel && args.loglevel.match(':')) {\n    // --log-level arg can optionally provide diff logging levels for console and file, separated by a colon\n    const lvlPair = args.loglevel.split(':');\n    consoleLogLevel = lvlPair[0] || consoleLogLevel;\n    fileLogLevel = lvlPair[1] || fileLogLevel;\n  } else {\n    consoleLogLevel = fileLogLevel = args.loglevel;\n  }\n\n  transports.push(createConsoleTransport(args, consoleLogLevel));\n\n  if (args.logFile) {\n    try {\n      // if we don't delete the log file, winston will always append and it will grow infinitely large;\n      // winston allows for limiting log file size, but as of 9.2.14 there's a serious bug when using\n      // maxFiles and maxSize together. https://github.com/flatiron/winston/issues/397\n      if (await fs.exists(args.logFile)) {\n        await fs.unlink(args.logFile);\n      }\n\n      transports.push(createFileTransport(args, fileLogLevel));\n    } catch (e) {\n      // eslint-disable-next-line no-console\n      console.log(\n        `Tried to attach logging to file '${args.logFile}' but an error ` + `occurred: ${e.message}`\n      );\n    }\n  }\n\n  if (args.webhook) {\n    try {\n      transports.push(createHttpTransport(args, fileLogLevel));\n    } catch (e) {\n      // eslint-disable-next-line no-console\n      console.log(\n        `Tried to attach logging to Http at ${args.webhook} but ` +\n          `an error occurred: ${e.message}`\n      );\n    }\n  }\n\n  return transports;\n}\n\nasync function init(args) {\n  npmlog.level = 'silent';\n  // set de facto param passed to timestamp function\n  useLocalTimeZone = args.localTimezone;\n\n  // clean up in case we have initiated before since npmlog is a global object\n  clear();\n\n  log = createLogger({\n    transports: await createTransports(args),\n    levels,\n  });\n\n  // Capture logs emitted via npmlog and pass them through winston\n  npmlog.on('log', (logObj) => {\n    const winstonLevel = npmToWinstonLevels[logObj.level] || 'info';\n    let msg = logObj.message;\n    if (logObj.prefix) {\n      const prefix = `[${logObj.prefix}]`;\n      msg = `${args.logNoColors ? prefix : prefix.magenta} ${msg}`;\n    }\n    log[winstonLevel](msg);\n    if (args.logHandler && _.isFunction(args.logHandler)) {\n      args.logHandler(logObj.level, msg);\n    }\n  });\n}\n\nfunction clear() {\n  if (log) {\n    for (let transport of _.keys(log.transports)) {\n      log.remove(transport);\n    }\n  }\n  npmlog.removeAllListeners('log');\n}\n\nexport {init, clear};\nexport default init;\n"],"mappings":"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"}
+exports.clear = clear;
+exports.default = init;
+//# sourceMappingURL=logsink.js.map

package/build/lib/logsink.js.map

@@ -1 +1 @@
-{"version":3,"file":"logsink.js","names":["logger","patchLogger","npmlog","global","_global_npmlog","level","levels","debug","info","warn","error","colors","npmToWinstonLevels","silly","verbose","http","log","useLocalTimeZone","timestampFormat","format","timestamp","date","Date","valueOf","getTimezoneOffset","toISOString","replace","trim","colorizeFormat","colorize","stripColorFormat","stripColor","code","message","createConsoleTransport","args","logLvl","transports","Console","name","handleExceptions","exitOnError","json","stderrLevels","combine","adjustDebug","logNoColors","printf","printInfo","logTimestamp","createFileTransport","File","filename","logFile","maxFiles","createHttpTransport","host","port","webhook","match","hostAndPort","split","parseInt","Http","path","createTransports","consoleLogLevel","fileLogLevel","loglevel","lvlPair","push","fs","exists","unlink","e","console","init","localTimezone","clear","createLogger","on","logObj","winstonLevel","msg","prefix","magenta","logHandler","_","isFunction","transport","keys","remove","removeAllListeners"],"sources":["../../lib/logsink.js"],"sourcesContent":["import npmlog from 'npmlog';\nimport {createLogger, format, transports} from 'winston';\nimport {fs, logger} from '@appium/support';\nimport _ from 'lodash';\n\n// set up distributed logging before everything else\nlogger.patchLogger(npmlog);\nglobal._global_npmlog = npmlog;\n\n// npmlog is used only for emitting, we use winston for output\nnpmlog.level = 'info';\nconst levels = {\n  debug: 4,\n  info: 3,\n  warn: 2,\n  error: 1,\n};\n\nconst colors = {\n  info: 'cyan',\n  debug: 'grey',\n  warn: 'yellow',\n  error: 'red',\n};\n\nconst npmToWinstonLevels = {\n  silly: 'debug',\n  verbose: 'debug',\n  debug: 'debug',\n  info: 'info',\n  http: 'info',\n  warn: 'warn',\n  error: 'error',\n};\n\nlet log = null;\nlet useLocalTimeZone = false;\n\n// add the timestamp in the correct format to the log info object\nconst timestampFormat = format.timestamp({\n  format() {\n    let date = new Date();\n    if (useLocalTimeZone) {\n      date = new Date(date.valueOf() - date.getTimezoneOffset() * 60000);\n    }\n    // '2012-11-04T14:51:06.157Z' -> '2012-11-04 14:51:06:157'\n    return date.toISOString().replace(/[TZ]/g, ' ').replace(/\\./g, ':').trim();\n  },\n});\n\n// set the custom colors\nconst colorizeFormat = format.colorize({\n  colors,\n});\n\n// Strip the color marking within messages\nconst stripColorFormat = format(function stripColor(info) {\n  const code = /\\u001b\\[(\\d+(;\\d+)*)?m/g; // eslint-disable-line no-control-regex\n  info.message = info.message.replace(code, '');\n  return info;\n})();\n\nfunction createConsoleTransport(args, logLvl) {\n  return new transports.Console({\n    // `name` is unsupported per winston's type declarations\n    // @ts-expect-error\n    name: 'console',\n    handleExceptions: true,\n    exitOnError: false,\n    json: false,\n    level: logLvl,\n    stderrLevels: ['error'],\n    format: format.combine(\n      format(function adjustDebug(info) {\n        // prepend debug marker, and shift to `info` log level\n        if (info.level === 'debug') {\n          info.level = 'info';\n          info.message = `[debug] ${info.message}`;\n        }\n        return info;\n      })(),\n      timestampFormat,\n      args.logNoColors ? stripColorFormat : colorizeFormat,\n      format.printf(function printInfo(info) {\n        return `${args.logTimestamp ? `${info.timestamp} - ` : ''}${info.message}`;\n      })\n    ),\n  });\n}\n\nfunction createFileTransport(args, logLvl) {\n  return new transports.File({\n    // @ts-expect-error\n    name: 'file',\n    filename: args.logFile,\n    maxFiles: 1,\n    handleExceptions: true,\n    exitOnError: false,\n    json: false,\n    level: logLvl,\n    format: format.combine(\n      stripColorFormat,\n      timestampFormat,\n      format.printf(function printInfo(info) {\n        return `${info.timestamp} ${info.message}`;\n      })\n    ),\n  });\n}\n\nfunction createHttpTransport(args, logLvl) {\n  let host = '127.0.0.1';\n  let port = 9003;\n\n  if (args.webhook.match(':')) {\n    const hostAndPort = args.webhook.split(':');\n    host = hostAndPort[0];\n    port = parseInt(hostAndPort[1], 10);\n  }\n\n  return new transports.Http({\n    // @ts-expect-error\n    name: 'http',\n    host,\n    port,\n    path: '/',\n    handleExceptions: true,\n    exitOnError: false,\n    json: false,\n    level: logLvl,\n    format: format.combine(\n      stripColorFormat,\n      format.printf(function printInfo(info) {\n        return `${info.timestamp} ${info.message}`;\n      })\n    ),\n  });\n}\n\nasync function createTransports(args) {\n  let transports = [];\n  let consoleLogLevel = null;\n  let fileLogLevel = null;\n\n  if (args.loglevel && args.loglevel.match(':')) {\n    // --log-level arg can optionally provide diff logging levels for console and file, separated by a colon\n    const lvlPair = args.loglevel.split(':');\n    consoleLogLevel = lvlPair[0] || consoleLogLevel;\n    fileLogLevel = lvlPair[1] || fileLogLevel;\n  } else {\n    consoleLogLevel = fileLogLevel = args.loglevel;\n  }\n\n  transports.push(createConsoleTransport(args, consoleLogLevel));\n\n  if (args.logFile) {\n    try {\n      // if we don't delete the log file, winston will always append and it will grow infinitely large;\n      // winston allows for limiting log file size, but as of 9.2.14 there's a serious bug when using\n      // maxFiles and maxSize together. https://github.com/flatiron/winston/issues/397\n      if (await fs.exists(args.logFile)) {\n        await fs.unlink(args.logFile);\n      }\n\n      transports.push(createFileTransport(args, fileLogLevel));\n    } catch (e) {\n      // eslint-disable-next-line no-console\n      console.log(\n        `Tried to attach logging to file '${args.logFile}' but an error ` + `occurred: ${e.message}`\n      );\n    }\n  }\n\n  if (args.webhook) {\n    try {\n      transports.push(createHttpTransport(args, fileLogLevel));\n    } catch (e) {\n      // eslint-disable-next-line no-console\n      console.log(\n        `Tried to attach logging to Http at ${args.webhook} but ` +\n          `an error occurred: ${e.message}`\n      );\n    }\n  }\n\n  return transports;\n}\n\nasync function init(args) {\n  npmlog.level = 'silent';\n  // set de facto param passed to timestamp function\n  useLocalTimeZone = args.localTimezone;\n\n  // clean up in case we have initiated before since npmlog is a global object\n  clear();\n\n  log = createLogger({\n    transports: await createTransports(args),\n    levels,\n  });\n\n  // Capture logs emitted via npmlog and pass them through winston\n  npmlog.on('log', (logObj) => {\n    const winstonLevel = npmToWinstonLevels[logObj.level] || 'info';\n    let msg = logObj.message;\n    if (logObj.prefix) {\n      const prefix = `[${logObj.prefix}]`;\n      msg = `${args.logNoColors ? prefix : prefix.magenta} ${msg}`;\n    }\n    log[winstonLevel](msg);\n    if (args.logHandler && _.isFunction(args.logHandler)) {\n      args.logHandler(logObj.level, msg);\n    }\n  });\n}\n\nfunction clear() {\n  if (log) {\n    for (let transport of _.keys(log.transports)) {\n      log.remove(transport);\n    }\n  }\n  npmlog.removeAllListeners('log');\n}\n\nexport {init, clear};\nexport default init;\n"],"mappings":"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"}
+{"version":3,"file":"logsink.js","sourceRoot":"","sources":["../../lib/logsink.js"],"names":[],"mappings":"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"}

package/build/lib/main.d.ts

@@ -4,7 +4,12 @@ export type DriverType = import('@appium/types').DriverType;
 export type PluginType = import('@appium/types').PluginType;
 export type DriverClass = import('@appium/types').DriverClass;
 export type PluginClass = import('@appium/types').PluginClass;
-export type WithServerSubcommand = import('appium/types').WithServerSubcommand;
+export type CliCommand = import('appium/types').CliCommand;
+export type CliExtensionSubcommand = import('appium/types').CliExtensionSubcommand;
+export type CliExtensionCommand = import('appium/types').CliExtensionCommand;
+export type ServerCommand = import('appium/types').ServerCommand;
+export type DriverCommand = import('appium/types').DriverCommand;
+export type PluginCommand = import('appium/types').PluginCommand;
 export type DriverNameMap = import('./extension').DriverNameMap;
 export type PluginNameMap = import('./extension').PluginNameMap;
 /**
@@ -21,17 +26,18 @@ export type ServerInitData = {
      */
     parsedArgs: import('appium/types').ParsedArgs;
 };
-export type ServerInitResult = ServerInitData & import('./extension').ExtensionConfigs;
-export type Args<T = import("appium/types").WithServerSubcommand> = import('appium/types').Args<T>;
-export type ParsedArgs<T = import("appium/types").WithServerSubcommand> = import('appium/types').ParsedArgs<T>;
+export type InitResult<Cmd extends import("appium/types").CliCommand> = Cmd extends ServerCommand ? ServerInitData & import('./extension').ExtensionConfigs : ExtCommandInitResult;
+export type Args<Cmd extends import("appium/types").CliCommand = "server", SubCmd extends void | import("appium/types").CliExtensionSubcommand = void> = import('appium/types').Args<Cmd, SubCmd>;
+export type ParsedArgs<Cmd extends import("appium/types").CliCommand = "server", SubCmd extends void | import("appium/types").CliExtensionSubcommand = void> = import('appium/types').ParsedArgs<Cmd, SubCmd>;
 /**
  * Initializes Appium's config.  Starts server if appropriate and resolves the
  * server instance if so; otherwise resolves w/ `undefined`.
- * @template [T=WithServerSubcommand]
- * @param {Args<T>} [args] - Arguments from CLI or otherwise
- * @returns {Promise<import('@appium/types').AppiumServer|undefined>}
+ * @template {CliCommand} [Cmd=ServerCommand]
+ * @template {CliExtensionSubcommand|void} [SubCmd=void]
+ * @param {Args<Cmd, SubCmd>} [args] - Arguments from CLI or otherwise
+ * @returns {Promise<Cmd extends ServerCommand ? import('@appium/types').AppiumServer : void>}
  */
-export function main<T = import("appium/types").WithServerSubcommand>(args?: Args<T> | undefined): Promise<import('@appium/types').AppiumServer | undefined>;
+export function main<Cmd extends import("appium/types").CliCommand = "server", SubCmd extends void | import("appium/types").CliExtensionSubcommand = void>(args?: import("appium/types").Args<Cmd, SubCmd> | undefined): Promise<Cmd extends "server" ? import("@appium/types").AppiumServer : void>;
 /**
  * Initializes Appium, but does not start the server.
  *
@@ -39,16 +45,17 @@ export function main<T = import("appium/types").WithServerSubcommand>(args?: Arg
  *
  * If `args` contains a non-empty `subcommand` which is not `server`, this function will return an empty object.
  *
- * @template [T=WithServerSubcommand]
- * @param {Args<T>} [args] - Partial args (progammatic usage only)
- * @returns {Promise<ServerInitResult | ExtCommandInitResult>}
+ * @template {CliCommand} [Cmd=ServerCommand]
+ * @template {CliExtensionSubcommand|void} [SubCmd=void]
+ * @param {Args<Cmd, SubCmd>} [args] - Partial args (progammatic usage only)
+ * @returns {Promise<InitResult<Cmd>>}
  * @example
  * import {init, getSchema} from 'appium';
  * const options = {}; // config object
  * await init(options);
  * const schema = getSchema(); // entire config schema including plugins and drivers
  */
-export function init<T = import("appium/types").WithServerSubcommand>(args?: Args<T> | undefined): Promise<ServerInitResult | ExtCommandInitResult>;
+export function init<Cmd extends import("appium/types").CliCommand = "server", SubCmd extends void | import("appium/types").CliExtensionSubcommand = void>(args?: import("appium/types").Args<Cmd, SubCmd> | undefined): Promise<InitResult<Cmd>>;
 export const resolveAppiumHome: ((cwd?: string | undefined) => Promise<string>) & _.MemoizedFunction;
 import _ from "lodash";
 export { finalizeSchema, getSchema, validate } from "./schema/schema";

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

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../lib/main.js"],"names":[],"mappings":";;yBA2Ya,OAAO,eAAe,EAAE,UAAU;yBAClC,OAAO,eAAe,EAAE,UAAU;0BAClC,OAAO,eAAe,EAAE,WAAW;0BACnC,OAAO,eAAe,EAAE,WAAW;mCACnC,OAAO,cAAc,EAAE,oBAAoB;4BAC3C,OAAO,aAAa,EAAE,aAAa;4BACnC,OAAO,aAAa,EAAE,aAAa;;;;mCAKlC,EAAE;;;;;kBAKF,OAAO,UAAU,EAAE,YAAY;;;;gBAC/B,OAAO,cAAc,EAAE,UAAU;;+BAIlC,cAAc,GAAG,OAAO,aAAa,EAAE,gBAAgB;oEAKvD,OAAO,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC;0EAK9B,OAAO,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC;AAnJjD;;;;;;GAMG;AACH,mGAFa,QAAQ,OAAO,eAAe,EAAE,YAAY,GAAC,SAAS,CAAC,CAgGnE;AAjOD;;;;;;;;;;;;;;;GAeG;AACH,mGAPa,QAAQ,gBAAgB,GAAG,oBAAoB,CAAC,CAiH5D"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../lib/main.js"],"names":[],"mappings":";;yBA2Ya,OAAO,eAAe,EAAE,UAAU;yBAClC,OAAO,eAAe,EAAE,UAAU;0BAClC,OAAO,eAAe,EAAE,WAAW;0BACnC,OAAO,eAAe,EAAE,WAAW;yBACnC,OAAO,cAAc,EAAE,UAAU;qCACjC,OAAO,cAAc,EAAE,sBAAsB;kCAC7C,OAAO,cAAc,EAAE,mBAAmB;4BAC1C,OAAO,cAAc,EAAE,aAAa;4BACpC,OAAO,cAAc,EAAE,aAAa;4BACpC,OAAO,cAAc,EAAE,aAAa;4BACpC,OAAO,aAAa,EAAE,aAAa;4BACnC,OAAO,aAAa,EAAE,aAAa;;;;mCAKlC,EAAE;;;;;kBAKF,OAAO,UAAU,EAAE,YAAY;;;;gBAC/B,OAAO,cAAc,EAAE,UAAU;;wEAKlC,GAAG,SAAS,aAAa,GAAG,cAAc,GAAG,OAAO,aAAa,EAAE,gBAAgB,GAAG,oBAAoB;yJAM1G,OAAO,cAAc,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC;+JAMxC,OAAO,cAAc,EAAE,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC;AAjK3D;;;;;;;GAOG;AACH,qSAmGC;AApOD;;;;;;;;;;;;;;;;GAgBG;AACH,kPAsGC"}