diff --git a/package-lock.json b/package-lock.json index 153ec0e61fa7b..9015275e9b54d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2236,28 +2236,28 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "resolved": "", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true, "optional": true }, "ansi-regex": { "version": "2.1.1", - "resolved": "", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true, "optional": true }, "aproba": { "version": "1.2.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "dev": true, "optional": true }, "are-we-there-yet": { "version": "1.1.5", - "resolved": "", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "optional": true, @@ -2268,14 +2268,14 @@ }, "balanced-match": { "version": "1.0.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true, "optional": true }, "brace-expansion": { "version": "1.1.11", - "resolved": "", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "optional": true, @@ -2293,28 +2293,28 @@ }, "code-point-at": { "version": "1.1.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true, "optional": true }, "concat-map": { "version": "0.0.1", - "resolved": "", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true, "optional": true }, "console-control-strings": { "version": "1.1.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true, "optional": true }, "core-util-is": { "version": "1.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true, "optional": true @@ -2331,21 +2331,21 @@ }, "deep-extend": { "version": "0.6.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true, "optional": true }, "delegates": { "version": "1.0.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true, "optional": true }, "detect-libc": { "version": "1.0.3", - "resolved": "", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "dev": true, "optional": true @@ -2362,14 +2362,14 @@ }, "fs.realpath": { "version": "1.0.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true, "optional": true }, "gauge": { "version": "2.7.4", - "resolved": "", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "optional": true, @@ -2401,14 +2401,14 @@ }, "has-unicode": { "version": "2.0.1", - "resolved": "", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "dev": true, "optional": true }, "iconv-lite": { "version": "0.4.24", - "resolved": "", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "optional": true, @@ -2428,7 +2428,7 @@ }, "inflight": { "version": "1.0.6", - "resolved": "", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "optional": true, @@ -2446,14 +2446,14 @@ }, "ini": { "version": "1.3.5", - "resolved": "", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "optional": true, @@ -2463,14 +2463,14 @@ }, "isarray": { "version": "1.0.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true, "optional": true }, "minimatch": { "version": "3.0.4", - "resolved": "", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "optional": true, @@ -2596,7 +2596,7 @@ }, "npmlog": { "version": "4.1.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "optional": true, @@ -2609,21 +2609,21 @@ }, "number-is-nan": { "version": "1.0.1", - "resolved": "", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true, "optional": true }, "object-assign": { "version": "4.1.1", - "resolved": "", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true, "optional": true }, "once": { "version": "1.4.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "optional": true, @@ -2633,21 +2633,21 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true, "optional": true }, "osenv": { "version": "0.1.5", - "resolved": "", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "optional": true, @@ -2658,7 +2658,7 @@ }, "path-is-absolute": { "version": "1.0.1", - "resolved": "", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, "optional": true @@ -2672,7 +2672,7 @@ }, "rc": { "version": "1.2.8", - "resolved": "", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "optional": true, @@ -2711,21 +2711,21 @@ }, "safe-buffer": { "version": "5.1.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true, "optional": true }, "safer-buffer": { "version": "2.1.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true, "optional": true }, "sax": { "version": "1.2.4", - "resolved": "", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true, "optional": true @@ -2739,21 +2739,21 @@ }, "set-blocking": { "version": "2.0.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true, "optional": true }, "string-width": { "version": "1.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "optional": true, @@ -2765,7 +2765,7 @@ }, "string_decoder": { "version": "1.1.1", - "resolved": "", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "optional": true, @@ -2775,7 +2775,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "optional": true, @@ -2785,7 +2785,7 @@ }, "strip-json-comments": { "version": "2.0.1", - "resolved": "", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true, "optional": true @@ -2808,14 +2808,14 @@ }, "util-deprecate": { "version": "1.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true, "optional": true }, "wide-align": { "version": "1.1.3", - "resolved": "", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "optional": true, @@ -2825,7 +2825,7 @@ }, "wrappy": { "version": "1.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true, "optional": true diff --git a/package.json b/package.json index e3999d95d9289..4139ef76c7c42 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ }, "license": "Apache-2.0", "dependencies": { + "debug": "^4.1.1", "extract-zip": "^2.0.0", "https-proxy-agent": "^3.0.0", "jpeg-js": "^0.3.7", @@ -67,7 +68,6 @@ "colors": "^1.4.0", "commonmark": "^0.28.1", "cross-env": "^5.0.5", - "debug": "^4.1.0", "eslint": "^6.6.0", "esprima": "^4.0.0", "formidable": "^1.2.1", diff --git a/src/logger.ts b/src/logger.ts index ddcdb150aefb3..eecfdf4f85f89 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import * as util from 'util'; +import * as debug from 'debug'; export type LoggerSeverity = 'verbose' | 'info' | 'warning' | 'error'; @@ -40,70 +40,60 @@ export function logError(logger: Logger): (error: Error) => void { return error => logger._log(errorLog, error, []); } -const colorMap = new Map([ - ['black', 30], - ['red', 31], - ['green', 32], - ['yellow', 33], - ['blue', 34], - ['magenta', 35], - ['cyan', 36], - ['white', 37], - ['reset', 0], -]); - export class RootLogger implements Logger { private _userSink: LoggerSink | undefined; - private _consoleSink: ConsoleLoggerSink; + private _debugSink: DebugLoggerSink; constructor(userSink: LoggerSink | undefined) { this._userSink = userSink; - this._consoleSink = new ConsoleLoggerSink(); + this._debugSink = new DebugLoggerSink(); } _isLogEnabled(log: Log): boolean { return (this._userSink && this._userSink.isEnabled(log.name, log.severity || 'info')) || - this._consoleSink.isEnabled(log.name, log.severity || 'info'); + this._debugSink.isEnabled(log.name, log.severity || 'info'); } _log(log: Log, message: string | Error, ...args: any[]) { if (this._userSink && this._userSink.isEnabled(log.name, log.severity || 'info')) this._userSink.log(log.name, log.severity || 'info', message, args, log.color ? { color: log.color } : {}); - if (this._consoleSink.isEnabled(log.name, log.severity || 'info')) - this._consoleSink.log(log.name, log.severity || 'info', message, args, log.color ? { color: log.color } : {}); + if (this._debugSink.isEnabled(log.name, log.severity || 'info')) + this._debugSink.log(log.name, log.severity || 'info', message, args, log.color ? { color: log.color } : {}); } } -class ConsoleLoggerSink implements LoggerSink { - private _enabled: string[]; - private _enabledCache = new Map(); +const colorMap = new Map([ + ['red', 160], + ['green', 34], + ['yellow', 172], + ['blue', 33], + ['magenta', 207], + ['cyan', 45], + ['reset', 0], +]); - constructor() { - this._enabled = process.env.PWDEBUG ? process.env.PWDEBUG.split(',') : []; - } +class DebugLoggerSink implements LoggerSink { + private _debuggers = new Map(); isEnabled(name: string, severity: LoggerSeverity): boolean { - const result = this._enabledCache.get(name); - if (typeof result === 'boolean') - return result; - - for (const logger of this._enabled) { - if (name.includes(logger)) { - this._enabledCache.set(name, true); - return true; - } - } - this._enabledCache.set(name, false); - return false; + return debug.enabled('pw:' + name); } log(name: string, severity: LoggerSeverity, message: string | Error, args: any[], hints: { color?: string }) { - let color = hints.color || 'reset'; - switch (severity) { - case 'error': color = 'red'; break; - case 'warning': color = 'yellow'; break; + let cachedDebugger = this._debuggers.get(name); + if (!cachedDebugger) { + cachedDebugger = debug('pw:' + name); + this._debuggers.set(name, cachedDebugger); + + let color = hints.color || 'reset'; + switch (severity) { + case 'error': color = 'red'; break; + case 'warning': color = 'yellow'; break; + } + const escaped = colorMap.get(color) || 0; + if (escaped) + (cachedDebugger as any).color = String(escaped); } - const escape = colorMap.get(color) || 0; - console.log(`[${new Date().toISOString()}:\u001b[${escape}m${name}\u001b[0m] ${util.format(message, ...args)}`); // eslint-disable-line no-console + cachedDebugger(message, ...args); } }