@webex/plugin-logger 3.0.0-beta.42 → 3.0.0-beta.420
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config.js +1 -1
- package/dist/config.js.map +1 -1
- package/dist/logger.js +31 -5
- package/dist/logger.js.map +1 -1
- package/package.json +7 -7
- package/src/config.js +1 -1
- package/src/logger.js +29 -3
- package/test/unit/spec/logger.js +117 -0
package/dist/config.js
CHANGED
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["logger","level","process","env","WEBEX_LOG_LEVEL","historyLength"],"sources":["config.js"],"sourcesContent":["/*!\n * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.\n */\n\n/**\n * @typedef {Object} LoggerConfig\n * @property {string} [level=process.env.WEBEX_LOG_LEVEL] - Maximum log level that\n * should be printed to the console. One of\n * silent|error|warn|log|info|debug|trace\n * @property {number} [historyLength=1000] - Maximum number of entries to store in the log buffer.\n * @example\n * {\n * level: process.env.WEBEX_LOG_LEVEL,\n * historyLength: 1000\n * }\n */\n\nexport default {\n logger: {\n level: process.env.WEBEX_LOG_LEVEL,\n historyLength:
|
|
1
|
+
{"version":3,"names":["logger","level","process","env","WEBEX_LOG_LEVEL","historyLength"],"sources":["config.js"],"sourcesContent":["/*!\n * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.\n */\n\n/**\n * @typedef {Object} LoggerConfig\n * @property {string} [level=process.env.WEBEX_LOG_LEVEL] - Maximum log level that\n * should be printed to the console. One of\n * silent|error|warn|log|info|debug|trace\n * @property {number} [historyLength=1000] - Maximum number of entries to store in the log buffer.\n * @example\n * {\n * level: process.env.WEBEX_LOG_LEVEL,\n * historyLength: 1000\n * }\n */\n\nexport default {\n logger: {\n level: process.env.WEBEX_LOG_LEVEL,\n historyLength: 10000,\n },\n};\n"],"mappings":";;;;;;;AAAA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAXA,eAae;EACbA,MAAM,EAAE;IACNC,KAAK,EAAEC,OAAO,CAACC,GAAG,CAACC,eAAe;IAClCC,aAAa,EAAE;EACjB;AACF,CAAC;AAAA"}
|
package/dist/logger.js
CHANGED
|
@@ -9,6 +9,8 @@ exports.levels = exports.default = void 0;
|
|
|
9
9
|
var _keys = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/keys"));
|
|
10
10
|
var _entries = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/entries"));
|
|
11
11
|
var _deleteProperty = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/reflect/delete-property"));
|
|
12
|
+
var _stringify = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/json/stringify"));
|
|
13
|
+
var _typeof2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/typeof"));
|
|
12
14
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/toConsumableArray"));
|
|
13
15
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/slicedToArray"));
|
|
14
16
|
var _isString2 = _interopRequireDefault(require("lodash/isString"));
|
|
@@ -75,6 +77,9 @@ function walkAndFilter(object) {
|
|
|
75
77
|
if (_common.patterns.containsEmails.test(object)) {
|
|
76
78
|
return object.replace(_common.patterns.containsEmails, '[REDACTED]');
|
|
77
79
|
}
|
|
80
|
+
if (_common.patterns.containsMTID.test(object)) {
|
|
81
|
+
return object.replace(_common.patterns.containsMTID, '$1[REDACTED]');
|
|
82
|
+
}
|
|
78
83
|
}
|
|
79
84
|
return object;
|
|
80
85
|
}
|
|
@@ -146,8 +151,8 @@ var Logger = _webexCore.WebexPlugin.extend({
|
|
|
146
151
|
* @returns {Array<mixed>}
|
|
147
152
|
*/
|
|
148
153
|
filter: function filter() {
|
|
149
|
-
for (var _len = arguments.length, args = new Array(_len),
|
|
150
|
-
args[
|
|
154
|
+
for (var _len = arguments.length, args = new Array(_len), _key2 = 0; _key2 < _len; _key2++) {
|
|
155
|
+
args[_key2] = arguments[_key2];
|
|
151
156
|
}
|
|
152
157
|
return args.map(function (arg) {
|
|
153
158
|
// WebexHttpError already ensures auth tokens don't get printed, so, no
|
|
@@ -288,7 +293,7 @@ var Logger = _webexCore.WebexPlugin.extend({
|
|
|
288
293
|
}
|
|
289
294
|
return buffer.join('\n');
|
|
290
295
|
},
|
|
291
|
-
version: "3.0.0-beta.
|
|
296
|
+
version: "3.0.0-beta.420"
|
|
292
297
|
});
|
|
293
298
|
|
|
294
299
|
/**
|
|
@@ -334,9 +339,30 @@ function makeLoggerMethod(level, impl, type) {
|
|
|
334
339
|
}
|
|
335
340
|
var filtered = [clientName].concat((0, _toConsumableArray2.default)(this.filter.apply(this, arguments)));
|
|
336
341
|
var stringified = filtered.map(function (item) {
|
|
337
|
-
if (item instanceof
|
|
342
|
+
if (item instanceof Error) {
|
|
338
343
|
return item.toString();
|
|
339
344
|
}
|
|
345
|
+
if ((0, _typeof2.default)(item) === 'object') {
|
|
346
|
+
var cache = [];
|
|
347
|
+
var returnItem;
|
|
348
|
+
try {
|
|
349
|
+
returnItem = (0, _stringify.default)(item, function (_key, value) {
|
|
350
|
+
if ((0, _typeof2.default)(value) === 'object' && value !== null) {
|
|
351
|
+
if (cache.includes(value)) {
|
|
352
|
+
// Circular reference found, discard key
|
|
353
|
+
return undefined;
|
|
354
|
+
}
|
|
355
|
+
// Store value in our collection
|
|
356
|
+
cache.push(value);
|
|
357
|
+
}
|
|
358
|
+
return value;
|
|
359
|
+
});
|
|
360
|
+
} catch (e) {
|
|
361
|
+
returnItem = "Failed to stringify: ".concat(item);
|
|
362
|
+
}
|
|
363
|
+
cache = null;
|
|
364
|
+
return returnItem;
|
|
365
|
+
}
|
|
340
366
|
return item;
|
|
341
367
|
});
|
|
342
368
|
if (shouldPrint) {
|
|
@@ -360,7 +386,7 @@ function makeLoggerMethod(level, impl, type) {
|
|
|
360
386
|
stringified.unshift('| '.repeat(this.groupLevel));
|
|
361
387
|
buffer.push(stringified);
|
|
362
388
|
if (buffer.length > historyLength) {
|
|
363
|
-
buffer.
|
|
389
|
+
buffer.splice(0, buffer.length - historyLength);
|
|
364
390
|
}
|
|
365
391
|
if (level === 'group') this.groupLevel += 1;
|
|
366
392
|
if (level === 'groupEnd' && this.groupLevel > 0) this.groupLevel -= 1;
|
package/dist/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["precedence","silent","group","groupEnd","error","warn","log","info","debug","trace","levels","filter","level","fallbacks","LOG_TYPES","SDK","CLIENT","SDK_LOG_TYPE_NAME","authTokenKeyPattern","walkAndFilter","object","visited","includes","push","map","o","patterns","containsEmails","test","replace","key","value","Logger","WebexPlugin","extend","namespace","derived","cache","fn","getCurrentLevel","client_level","getCurrentClientLevel","session","buffer","type","default","groupLevel","sdkBuffer","clientBuffer","args","arg","Error","process","env","NODE_ENV","inBrowser","ret","toString","stack","shouldPrint","shouldBuffer","config","bufferLogLevel","WEBEX_LOG_LEVEL","webex","internal","device","features","developer","get","clientLevel","formatLogs","getDate","clientIndex","sdkIndex","separateLogBuffers","length","Date","join","makeLoggerMethod","impl","neverPrint","alwaysBuffer","wrappedConsoleMethod","logType","clientName","historyLength","clientHistoryLength","filtered","stringified","item","WebexHttpError","toPrint","unshift","url","slice","console","logDate","toISOString","repeat","shift","reason","forEach","impls","pop","prototype","client_logToBuffer","logToBuffer"],"sources":["logger.js"],"sourcesContent":["/*!\n * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.\n */\n\nimport {inBrowser, patterns} from '@webex/common';\nimport {WebexHttpError, WebexPlugin} from '@webex/webex-core';\nimport {cloneDeep, has, isArray, isObject, isString} from 'lodash';\n\nconst precedence = {\n silent: 0,\n group: 1,\n groupEnd: 2,\n error: 3,\n warn: 4,\n log: 5,\n info: 6,\n debug: 7,\n trace: 8,\n};\n\nexport const levels = Object.keys(precedence).filter((level) => level !== 'silent');\n\nconst fallbacks = {\n error: ['log'],\n warn: ['error', 'log'],\n info: ['log'],\n debug: ['info', 'log'],\n trace: ['debug', 'info', 'log'],\n};\n\nconst LOG_TYPES = {\n SDK: 'sdk',\n CLIENT: 'client',\n};\n\nconst SDK_LOG_TYPE_NAME = 'wx-js-sdk';\n\nconst authTokenKeyPattern = /[Aa]uthorization/;\n\n/**\n * Recursively strips \"authorization\" fields from the specified object\n * @param {Object} object\n * @param {Array<mixed>} [visited]\n * @private\n * @returns {Object}\n */\nfunction walkAndFilter(object, visited = []) {\n if (visited.includes(object)) {\n // Prevent circular references\n return object;\n }\n\n visited.push(object);\n\n if (isArray(object)) {\n return object.map((o) => walkAndFilter(o, visited));\n }\n if (!isObject(object)) {\n if (isString(object)) {\n if (patterns.containsEmails.test(object)) {\n return object.replace(patterns.containsEmails, '[REDACTED]');\n }\n }\n\n return object;\n }\n\n for (const [key, value] of Object.entries(object)) {\n if (authTokenKeyPattern.test(key)) {\n Reflect.deleteProperty(object, key);\n } else {\n object[key] = walkAndFilter(value, visited);\n }\n }\n\n return object;\n}\n\n/**\n * @class\n */\nconst Logger = WebexPlugin.extend({\n namespace: 'Logger',\n\n derived: {\n level: {\n cache: false,\n fn() {\n return this.getCurrentLevel();\n },\n },\n client_level: {\n cache: false,\n fn() {\n return this.getCurrentClientLevel();\n },\n },\n },\n session: {\n // for when configured to use single buffer\n buffer: {\n type: 'array',\n default() {\n return [];\n },\n },\n groupLevel: {\n type: 'number',\n default() {\n return 0;\n },\n },\n // for when configured to use separate buffers\n sdkBuffer: {\n type: 'array',\n default() {\n return [];\n },\n },\n clientBuffer: {\n type: 'array',\n default() {\n return [];\n },\n },\n },\n\n /**\n * Ensures auth headers don't get printed in logs\n * @param {Array<mixed>} args\n * @private\n * @memberof Logger\n * @returns {Array<mixed>}\n */\n filter(...args) {\n return args.map((arg) => {\n // WebexHttpError already ensures auth tokens don't get printed, so, no\n // need to alter it here.\n if (arg instanceof Error) {\n // karma logs won't print subclassed errors correctly, so we need\n // explicitly call their tostring methods.\n if (process.env.NODE_ENV === 'test' && inBrowser) {\n let ret = arg.toString();\n\n ret += 'BEGIN STACK';\n ret += arg.stack;\n ret += 'END STACK';\n\n return ret;\n }\n\n return arg;\n }\n\n arg = cloneDeep(arg);\n\n return walkAndFilter(arg);\n });\n },\n\n /**\n * Determines if the current level allows logs at the specified level to be\n * printed\n * @param {string} level\n * @param {string} type type of log, SDK or client\n * @private\n * @memberof Logger\n * @returns {boolean}\n */\n shouldPrint(level, type = LOG_TYPES.SDK) {\n return (\n precedence[level] <=\n precedence[type === LOG_TYPES.SDK ? this.getCurrentLevel() : this.getCurrentClientLevel()]\n );\n },\n\n /**\n * Determines if the current level allows logs at the specified level to be\n * put into the log buffer. We're configuring it omit trace and debug logs\n * because there are *a lot* of debug logs that really don't provide value at\n * runtime (they're helpful for debugging locally, but really just pollute the\n * uploaded logs and push useful info out).\n * @param {string} level\n * @param {string} type type of log, SDK or client\n * @private\n * @memberof Logger\n * @returns {boolean}\n */\n shouldBuffer(level) {\n return (\n precedence[level] <=\n (this.config.bufferLogLevel ? precedence[this.config.bufferLogLevel] : precedence.info)\n );\n },\n\n /**\n * Indicates the current SDK log level based on env vars, feature toggles, and\n * user type.\n * @instance\n * @memberof Logger\n * @private\n * @memberof Logger\n * @returns {string}\n */\n // eslint-disable-next-line complexity\n getCurrentLevel() {\n // If a level has been explicitly set via config, alway use it.\n if (this.config.level) {\n return this.config.level;\n }\n\n if (levels.includes(process.env.WEBEX_LOG_LEVEL)) {\n return process.env.WEBEX_LOG_LEVEL;\n }\n\n // Always use debug-level logging in test mode;\n if (process.env.NODE_ENV === 'test') {\n return 'trace';\n }\n\n // Use server-side-feature toggles to configure log levels\n const level =\n this.webex.internal.device && this.webex.internal.device.features.developer.get('log-level');\n\n if (level) {\n if (levels.includes(level)) {\n return level;\n }\n }\n\n return 'error';\n },\n\n /**\n * Indicates the current client log level based on config, defaults to SDK level\n * @instance\n * @memberof Logger\n * @private\n * @memberof Logger\n * @returns {string}\n */\n getCurrentClientLevel() {\n // If a client log level has been explicitly set via config, alway use it.\n if (this.config.clientLevel) {\n return this.config.clientLevel;\n }\n\n // otherwise default to SDK level\n return this.getCurrentLevel();\n },\n\n /**\n * Format logs (for upload)\n *\n * If separate client, SDK buffers is configured, merge the buffers, if configured\n *\n * @instance\n * @memberof Logger\n * @public\n * @memberof Logger\n * @returns {string} formatted buffer\n */\n formatLogs() {\n function getDate(log) {\n return log[1];\n }\n let buffer = [];\n let clientIndex = 0;\n let sdkIndex = 0;\n\n if (this.config.separateLogBuffers) {\n // merge the client and sdk buffers\n // while we have entries in either buffer\n while (clientIndex < this.clientBuffer.length || sdkIndex < this.sdkBuffer.length) {\n // if we have remaining entries in the SDK buffer\n if (\n sdkIndex < this.sdkBuffer.length &&\n // and we haven't exhausted all the client buffer entries, or SDK date is before client date\n (clientIndex >= this.clientBuffer.length ||\n new Date(getDate(this.sdkBuffer[sdkIndex])) <=\n new Date(getDate(this.clientBuffer[clientIndex])))\n ) {\n // then add to the SDK buffer\n buffer.push(this.sdkBuffer[sdkIndex]);\n sdkIndex += 1;\n }\n // otherwise if we haven't exhausted all the client buffer entries, add client entry, whether it was because\n // it was the only remaining entries or date was later (the above if)\n else if (clientIndex < this.clientBuffer.length) {\n buffer.push(this.clientBuffer[clientIndex]);\n clientIndex += 1;\n }\n }\n } else {\n buffer = this.buffer;\n }\n\n return buffer.join('\\n');\n },\n});\n\n/**\n * Creates a logger method\n *\n *\n * @param {string} level level to create (info, error, warn, etc.)\n * @param {string} impl the level to use when writing to console\n * @param {string} type type of log, SDK or client\n * @param {bool} neverPrint function never prints to console\n * @param {bool} alwaysBuffer function always logs to log buffer\n * @instance\n * @memberof Logger\n * @private\n * @memberof Logger\n * @returns {function} logger method with specified params\n */\nfunction makeLoggerMethod(level, impl, type, neverPrint = false, alwaysBuffer = false) {\n // Much of the complexity in the following function is due to a test-mode-only\n // helper\n return function wrappedConsoleMethod(...args) {\n // it would be easier to just pass in the name and buffer here, but the config isn't completely initialized\n // in Ampersand, even if the initialize method is used to set this up. so we keep the type to achieve\n // a sort of late binding to allow retrieving a name from config.\n const logType = type;\n const clientName =\n logType === LOG_TYPES.SDK ? SDK_LOG_TYPE_NAME : this.config.clientName || logType;\n\n let buffer;\n let historyLength;\n\n if (this.config.separateLogBuffers) {\n historyLength = this.config.clientHistoryLength\n ? this.config.clientHistoryLength\n : this.config.historyLength;\n buffer = logType === LOG_TYPES.SDK ? this.sdkBuffer : this.clientBuffer;\n } else {\n buffer = this.buffer;\n historyLength = this.config.historyLength;\n }\n\n try {\n const shouldPrint = !neverPrint && this.shouldPrint(level, logType);\n const shouldBuffer = alwaysBuffer || this.shouldBuffer(level);\n\n if (!shouldBuffer && !shouldPrint) {\n return;\n }\n\n const filtered = [clientName, ...this.filter(...args)];\n const stringified = filtered.map((item) => {\n if (item instanceof WebexHttpError) {\n return item.toString();\n }\n\n return item;\n });\n\n if (shouldPrint) {\n // when logging an object in browsers, we tend to get a dynamic\n // reference, thus going back to look at the logged value doesn't\n // necessarily show the state at log time, thus we print the stringified\n // value.\n const toPrint = inBrowser ? stringified : filtered;\n\n /* istanbul ignore if */\n if (process.env.NODE_ENV === 'test' && has(this, 'webex.internal.device.url')) {\n toPrint.unshift(this.webex.internal.device.url.slice(-3));\n }\n // eslint-disable-next-line no-console\n console[impl](...toPrint);\n }\n\n if (shouldBuffer) {\n const logDate = new Date();\n\n stringified.unshift(logDate.toISOString());\n stringified.unshift('| '.repeat(this.groupLevel));\n buffer.push(stringified);\n if (buffer.length > historyLength) {\n buffer.shift();\n }\n if (level === 'group') this.groupLevel += 1;\n if (level === 'groupEnd' && this.groupLevel > 0) this.groupLevel -= 1;\n }\n } catch (reason) {\n if (!neverPrint) {\n /* istanbul ignore next */\n // eslint-disable-next-line no-console\n console.warn(`failed to execute Logger#${level}`, reason);\n }\n }\n };\n}\n\nlevels.forEach((level) => {\n let impls = fallbacks[level];\n let impl = level;\n\n if (impls) {\n impls = impls.slice();\n // eslint-disable-next-line no-console\n while (!console[impl]) {\n impl = impls.pop();\n }\n }\n\n // eslint-disable-next-line complexity\n Logger.prototype[`client_${level}`] = makeLoggerMethod(level, impl, LOG_TYPES.CLIENT);\n Logger.prototype[level] = makeLoggerMethod(level, impl, LOG_TYPES.SDK);\n});\n\nLogger.prototype.client_logToBuffer = makeLoggerMethod(\n levels.info,\n levels.info,\n LOG_TYPES.CLIENT,\n true,\n true\n);\nLogger.prototype.logToBuffer = makeLoggerMethod(\n levels.info,\n levels.info,\n LOG_TYPES.SDK,\n true,\n true\n);\n\nexport default Logger;\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"names":["precedence","silent","group","groupEnd","error","warn","log","info","debug","trace","levels","filter","level","fallbacks","LOG_TYPES","SDK","CLIENT","SDK_LOG_TYPE_NAME","authTokenKeyPattern","walkAndFilter","object","visited","includes","push","map","o","patterns","containsEmails","test","replace","containsMTID","key","value","Logger","WebexPlugin","extend","namespace","derived","cache","fn","getCurrentLevel","client_level","getCurrentClientLevel","session","buffer","type","default","groupLevel","sdkBuffer","clientBuffer","args","arg","Error","process","env","NODE_ENV","inBrowser","ret","toString","stack","shouldPrint","shouldBuffer","config","bufferLogLevel","WEBEX_LOG_LEVEL","webex","internal","device","features","developer","get","clientLevel","formatLogs","getDate","clientIndex","sdkIndex","separateLogBuffers","length","Date","join","makeLoggerMethod","impl","neverPrint","alwaysBuffer","wrappedConsoleMethod","logType","clientName","historyLength","clientHistoryLength","filtered","stringified","item","returnItem","_key","undefined","e","toPrint","unshift","url","slice","console","logDate","toISOString","repeat","splice","reason","forEach","impls","pop","prototype","client_logToBuffer","logToBuffer"],"sources":["logger.js"],"sourcesContent":["/*!\n * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.\n */\n\nimport {inBrowser, patterns} from '@webex/common';\nimport {WebexPlugin} from '@webex/webex-core';\nimport {cloneDeep, has, isArray, isObject, isString} from 'lodash';\n\nconst precedence = {\n silent: 0,\n group: 1,\n groupEnd: 2,\n error: 3,\n warn: 4,\n log: 5,\n info: 6,\n debug: 7,\n trace: 8,\n};\n\nexport const levels = Object.keys(precedence).filter((level) => level !== 'silent');\n\nconst fallbacks = {\n error: ['log'],\n warn: ['error', 'log'],\n info: ['log'],\n debug: ['info', 'log'],\n trace: ['debug', 'info', 'log'],\n};\n\nconst LOG_TYPES = {\n SDK: 'sdk',\n CLIENT: 'client',\n};\n\nconst SDK_LOG_TYPE_NAME = 'wx-js-sdk';\n\nconst authTokenKeyPattern = /[Aa]uthorization/;\n\n/**\n * Recursively strips \"authorization\" fields from the specified object\n * @param {Object} object\n * @param {Array<mixed>} [visited]\n * @private\n * @returns {Object}\n */\nfunction walkAndFilter(object, visited = []) {\n if (visited.includes(object)) {\n // Prevent circular references\n return object;\n }\n\n visited.push(object);\n\n if (isArray(object)) {\n return object.map((o) => walkAndFilter(o, visited));\n }\n if (!isObject(object)) {\n if (isString(object)) {\n if (patterns.containsEmails.test(object)) {\n return object.replace(patterns.containsEmails, '[REDACTED]');\n }\n if (patterns.containsMTID.test(object)) {\n return object.replace(patterns.containsMTID, '$1[REDACTED]');\n }\n }\n\n return object;\n }\n\n for (const [key, value] of Object.entries(object)) {\n if (authTokenKeyPattern.test(key)) {\n Reflect.deleteProperty(object, key);\n } else {\n object[key] = walkAndFilter(value, visited);\n }\n }\n\n return object;\n}\n\n/**\n * @class\n */\nconst Logger = WebexPlugin.extend({\n namespace: 'Logger',\n\n derived: {\n level: {\n cache: false,\n fn() {\n return this.getCurrentLevel();\n },\n },\n client_level: {\n cache: false,\n fn() {\n return this.getCurrentClientLevel();\n },\n },\n },\n session: {\n // for when configured to use single buffer\n buffer: {\n type: 'array',\n default() {\n return [];\n },\n },\n groupLevel: {\n type: 'number',\n default() {\n return 0;\n },\n },\n // for when configured to use separate buffers\n sdkBuffer: {\n type: 'array',\n default() {\n return [];\n },\n },\n clientBuffer: {\n type: 'array',\n default() {\n return [];\n },\n },\n },\n\n /**\n * Ensures auth headers don't get printed in logs\n * @param {Array<mixed>} args\n * @private\n * @memberof Logger\n * @returns {Array<mixed>}\n */\n filter(...args) {\n return args.map((arg) => {\n // WebexHttpError already ensures auth tokens don't get printed, so, no\n // need to alter it here.\n if (arg instanceof Error) {\n // karma logs won't print subclassed errors correctly, so we need\n // explicitly call their tostring methods.\n if (process.env.NODE_ENV === 'test' && inBrowser) {\n let ret = arg.toString();\n\n ret += 'BEGIN STACK';\n ret += arg.stack;\n ret += 'END STACK';\n\n return ret;\n }\n\n return arg;\n }\n\n arg = cloneDeep(arg);\n\n return walkAndFilter(arg);\n });\n },\n\n /**\n * Determines if the current level allows logs at the specified level to be\n * printed\n * @param {string} level\n * @param {string} type type of log, SDK or client\n * @private\n * @memberof Logger\n * @returns {boolean}\n */\n shouldPrint(level, type = LOG_TYPES.SDK) {\n return (\n precedence[level] <=\n precedence[type === LOG_TYPES.SDK ? this.getCurrentLevel() : this.getCurrentClientLevel()]\n );\n },\n\n /**\n * Determines if the current level allows logs at the specified level to be\n * put into the log buffer. We're configuring it omit trace and debug logs\n * because there are *a lot* of debug logs that really don't provide value at\n * runtime (they're helpful for debugging locally, but really just pollute the\n * uploaded logs and push useful info out).\n * @param {string} level\n * @param {string} type type of log, SDK or client\n * @private\n * @memberof Logger\n * @returns {boolean}\n */\n shouldBuffer(level) {\n return (\n precedence[level] <=\n (this.config.bufferLogLevel ? precedence[this.config.bufferLogLevel] : precedence.info)\n );\n },\n\n /**\n * Indicates the current SDK log level based on env vars, feature toggles, and\n * user type.\n * @instance\n * @memberof Logger\n * @private\n * @memberof Logger\n * @returns {string}\n */\n // eslint-disable-next-line complexity\n getCurrentLevel() {\n // If a level has been explicitly set via config, alway use it.\n if (this.config.level) {\n return this.config.level;\n }\n\n if (levels.includes(process.env.WEBEX_LOG_LEVEL)) {\n return process.env.WEBEX_LOG_LEVEL;\n }\n\n // Always use debug-level logging in test mode;\n if (process.env.NODE_ENV === 'test') {\n return 'trace';\n }\n\n // Use server-side-feature toggles to configure log levels\n const level =\n this.webex.internal.device && this.webex.internal.device.features.developer.get('log-level');\n\n if (level) {\n if (levels.includes(level)) {\n return level;\n }\n }\n\n return 'error';\n },\n\n /**\n * Indicates the current client log level based on config, defaults to SDK level\n * @instance\n * @memberof Logger\n * @private\n * @memberof Logger\n * @returns {string}\n */\n getCurrentClientLevel() {\n // If a client log level has been explicitly set via config, alway use it.\n if (this.config.clientLevel) {\n return this.config.clientLevel;\n }\n\n // otherwise default to SDK level\n return this.getCurrentLevel();\n },\n\n /**\n * Format logs (for upload)\n *\n * If separate client, SDK buffers is configured, merge the buffers, if configured\n *\n * @instance\n * @memberof Logger\n * @public\n * @memberof Logger\n * @returns {string} formatted buffer\n */\n formatLogs() {\n function getDate(log) {\n return log[1];\n }\n let buffer = [];\n let clientIndex = 0;\n let sdkIndex = 0;\n\n if (this.config.separateLogBuffers) {\n // merge the client and sdk buffers\n // while we have entries in either buffer\n while (clientIndex < this.clientBuffer.length || sdkIndex < this.sdkBuffer.length) {\n // if we have remaining entries in the SDK buffer\n if (\n sdkIndex < this.sdkBuffer.length &&\n // and we haven't exhausted all the client buffer entries, or SDK date is before client date\n (clientIndex >= this.clientBuffer.length ||\n new Date(getDate(this.sdkBuffer[sdkIndex])) <=\n new Date(getDate(this.clientBuffer[clientIndex])))\n ) {\n // then add to the SDK buffer\n buffer.push(this.sdkBuffer[sdkIndex]);\n sdkIndex += 1;\n }\n // otherwise if we haven't exhausted all the client buffer entries, add client entry, whether it was because\n // it was the only remaining entries or date was later (the above if)\n else if (clientIndex < this.clientBuffer.length) {\n buffer.push(this.clientBuffer[clientIndex]);\n clientIndex += 1;\n }\n }\n } else {\n buffer = this.buffer;\n }\n\n return buffer.join('\\n');\n },\n});\n\n/**\n * Creates a logger method\n *\n *\n * @param {string} level level to create (info, error, warn, etc.)\n * @param {string} impl the level to use when writing to console\n * @param {string} type type of log, SDK or client\n * @param {bool} neverPrint function never prints to console\n * @param {bool} alwaysBuffer function always logs to log buffer\n * @instance\n * @memberof Logger\n * @private\n * @memberof Logger\n * @returns {function} logger method with specified params\n */\nfunction makeLoggerMethod(level, impl, type, neverPrint = false, alwaysBuffer = false) {\n // Much of the complexity in the following function is due to a test-mode-only\n // helper\n return function wrappedConsoleMethod(...args) {\n // it would be easier to just pass in the name and buffer here, but the config isn't completely initialized\n // in Ampersand, even if the initialize method is used to set this up. so we keep the type to achieve\n // a sort of late binding to allow retrieving a name from config.\n const logType = type;\n const clientName =\n logType === LOG_TYPES.SDK ? SDK_LOG_TYPE_NAME : this.config.clientName || logType;\n\n let buffer;\n let historyLength;\n\n if (this.config.separateLogBuffers) {\n historyLength = this.config.clientHistoryLength\n ? this.config.clientHistoryLength\n : this.config.historyLength;\n buffer = logType === LOG_TYPES.SDK ? this.sdkBuffer : this.clientBuffer;\n } else {\n buffer = this.buffer;\n historyLength = this.config.historyLength;\n }\n\n try {\n const shouldPrint = !neverPrint && this.shouldPrint(level, logType);\n const shouldBuffer = alwaysBuffer || this.shouldBuffer(level);\n\n if (!shouldBuffer && !shouldPrint) {\n return;\n }\n\n const filtered = [clientName, ...this.filter(...args)];\n const stringified = filtered.map((item) => {\n if (item instanceof Error) {\n return item.toString();\n }\n if (typeof item === 'object') {\n let cache = [];\n let returnItem;\n try {\n returnItem = JSON.stringify(item, (_key, value) => {\n if (typeof value === 'object' && value !== null) {\n if (cache.includes(value)) {\n // Circular reference found, discard key\n return undefined;\n }\n // Store value in our collection\n cache.push(value);\n }\n\n return value;\n });\n } catch (e) {\n returnItem = `Failed to stringify: ${item}`;\n }\n cache = null;\n\n return returnItem;\n }\n\n return item;\n });\n\n if (shouldPrint) {\n // when logging an object in browsers, we tend to get a dynamic\n // reference, thus going back to look at the logged value doesn't\n // necessarily show the state at log time, thus we print the stringified\n // value.\n const toPrint = inBrowser ? stringified : filtered;\n\n /* istanbul ignore if */\n if (process.env.NODE_ENV === 'test' && has(this, 'webex.internal.device.url')) {\n toPrint.unshift(this.webex.internal.device.url.slice(-3));\n }\n // eslint-disable-next-line no-console\n console[impl](...toPrint);\n }\n\n if (shouldBuffer) {\n const logDate = new Date();\n\n stringified.unshift(logDate.toISOString());\n stringified.unshift('| '.repeat(this.groupLevel));\n buffer.push(stringified);\n if (buffer.length > historyLength) {\n buffer.splice(0, buffer.length - historyLength);\n }\n if (level === 'group') this.groupLevel += 1;\n if (level === 'groupEnd' && this.groupLevel > 0) this.groupLevel -= 1;\n }\n } catch (reason) {\n if (!neverPrint) {\n /* istanbul ignore next */\n // eslint-disable-next-line no-console\n console.warn(`failed to execute Logger#${level}`, reason);\n }\n }\n };\n}\n\nlevels.forEach((level) => {\n let impls = fallbacks[level];\n let impl = level;\n\n if (impls) {\n impls = impls.slice();\n // eslint-disable-next-line no-console\n while (!console[impl]) {\n impl = impls.pop();\n }\n }\n\n // eslint-disable-next-line complexity\n Logger.prototype[`client_${level}`] = makeLoggerMethod(level, impl, LOG_TYPES.CLIENT);\n Logger.prototype[level] = makeLoggerMethod(level, impl, LOG_TYPES.SDK);\n});\n\nLogger.prototype.client_logToBuffer = makeLoggerMethod(\n levels.info,\n levels.info,\n LOG_TYPES.CLIENT,\n true,\n true\n);\nLogger.prototype.logToBuffer = makeLoggerMethod(\n levels.info,\n levels.info,\n LOG_TYPES.SDK,\n true,\n true\n);\n\nexport default Logger;\n"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@webex/plugin-logger",
|
|
3
|
-
"version": "3.0.0-beta.
|
|
3
|
+
"version": "3.0.0-beta.420",
|
|
4
4
|
"description": "",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -23,12 +23,12 @@
|
|
|
23
23
|
"sinon": "^9.2.4"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@webex/common": "3.0.0-beta.
|
|
27
|
-
"@webex/plugin-logger": "3.0.0-beta.
|
|
28
|
-
"@webex/test-helper-chai": "3.0.0-beta.
|
|
29
|
-
"@webex/test-helper-mocha": "3.0.0-beta.
|
|
30
|
-
"@webex/test-helper-mock-webex": "3.0.0-beta.
|
|
31
|
-
"@webex/webex-core": "3.0.0-beta.
|
|
26
|
+
"@webex/common": "3.0.0-beta.420",
|
|
27
|
+
"@webex/plugin-logger": "3.0.0-beta.420",
|
|
28
|
+
"@webex/test-helper-chai": "3.0.0-beta.420",
|
|
29
|
+
"@webex/test-helper-mocha": "3.0.0-beta.420",
|
|
30
|
+
"@webex/test-helper-mock-webex": "3.0.0-beta.420",
|
|
31
|
+
"@webex/webex-core": "3.0.0-beta.420",
|
|
32
32
|
"lodash": "^4.17.21"
|
|
33
33
|
}
|
|
34
34
|
}
|
package/src/config.js
CHANGED
package/src/logger.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
|
|
5
5
|
import {inBrowser, patterns} from '@webex/common';
|
|
6
|
-
import {
|
|
6
|
+
import {WebexPlugin} from '@webex/webex-core';
|
|
7
7
|
import {cloneDeep, has, isArray, isObject, isString} from 'lodash';
|
|
8
8
|
|
|
9
9
|
const precedence = {
|
|
@@ -60,6 +60,9 @@ function walkAndFilter(object, visited = []) {
|
|
|
60
60
|
if (patterns.containsEmails.test(object)) {
|
|
61
61
|
return object.replace(patterns.containsEmails, '[REDACTED]');
|
|
62
62
|
}
|
|
63
|
+
if (patterns.containsMTID.test(object)) {
|
|
64
|
+
return object.replace(patterns.containsMTID, '$1[REDACTED]');
|
|
65
|
+
}
|
|
63
66
|
}
|
|
64
67
|
|
|
65
68
|
return object;
|
|
@@ -348,9 +351,32 @@ function makeLoggerMethod(level, impl, type, neverPrint = false, alwaysBuffer =
|
|
|
348
351
|
|
|
349
352
|
const filtered = [clientName, ...this.filter(...args)];
|
|
350
353
|
const stringified = filtered.map((item) => {
|
|
351
|
-
if (item instanceof
|
|
354
|
+
if (item instanceof Error) {
|
|
352
355
|
return item.toString();
|
|
353
356
|
}
|
|
357
|
+
if (typeof item === 'object') {
|
|
358
|
+
let cache = [];
|
|
359
|
+
let returnItem;
|
|
360
|
+
try {
|
|
361
|
+
returnItem = JSON.stringify(item, (_key, value) => {
|
|
362
|
+
if (typeof value === 'object' && value !== null) {
|
|
363
|
+
if (cache.includes(value)) {
|
|
364
|
+
// Circular reference found, discard key
|
|
365
|
+
return undefined;
|
|
366
|
+
}
|
|
367
|
+
// Store value in our collection
|
|
368
|
+
cache.push(value);
|
|
369
|
+
}
|
|
370
|
+
|
|
371
|
+
return value;
|
|
372
|
+
});
|
|
373
|
+
} catch (e) {
|
|
374
|
+
returnItem = `Failed to stringify: ${item}`;
|
|
375
|
+
}
|
|
376
|
+
cache = null;
|
|
377
|
+
|
|
378
|
+
return returnItem;
|
|
379
|
+
}
|
|
354
380
|
|
|
355
381
|
return item;
|
|
356
382
|
});
|
|
@@ -377,7 +403,7 @@ function makeLoggerMethod(level, impl, type, neverPrint = false, alwaysBuffer =
|
|
|
377
403
|
stringified.unshift('| '.repeat(this.groupLevel));
|
|
378
404
|
buffer.push(stringified);
|
|
379
405
|
if (buffer.length > historyLength) {
|
|
380
|
-
buffer.
|
|
406
|
+
buffer.splice(0, buffer.length - historyLength);
|
|
381
407
|
}
|
|
382
408
|
if (level === 'group') this.groupLevel += 1;
|
|
383
409
|
if (level === 'groupEnd' && this.groupLevel > 0) this.groupLevel -= 1;
|
package/test/unit/spec/logger.js
CHANGED
|
@@ -48,6 +48,7 @@ describe('plugin-logger', () => {
|
|
|
48
48
|
logger: Logger,
|
|
49
49
|
},
|
|
50
50
|
});
|
|
51
|
+
webex.logger.config.historyLength = 10000;
|
|
51
52
|
});
|
|
52
53
|
|
|
53
54
|
const fallbacks = {
|
|
@@ -184,6 +185,64 @@ describe('plugin-logger', () => {
|
|
|
184
185
|
assert.lengthOf(webex.logger.buffer, 1);
|
|
185
186
|
assert.match(webex.logger.buffer[0][3], /WebexHttpError/g);
|
|
186
187
|
});
|
|
188
|
+
|
|
189
|
+
it('formats objects as strings passed to the logger for readability not [Object object]', async () => {
|
|
190
|
+
webex.config.logger.level = 'trace';
|
|
191
|
+
const obj = {
|
|
192
|
+
headers: {
|
|
193
|
+
authorization: 'Bearer',
|
|
194
|
+
trackingid: '123',
|
|
195
|
+
},
|
|
196
|
+
test: 'object',
|
|
197
|
+
nested: {
|
|
198
|
+
test2: 'object2',
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
webex.logger.log('foo', 'bar', obj);
|
|
203
|
+
assert.lengthOf(webex.logger.buffer, 1);
|
|
204
|
+
assert.lengthOf(webex.logger.buffer[0], 6);
|
|
205
|
+
assert.deepEqual(webex.logger.buffer[0][2], 'wx-js-sdk');
|
|
206
|
+
assert.deepEqual(webex.logger.buffer[0][3], 'foo');
|
|
207
|
+
assert.deepEqual(webex.logger.buffer[0][4], 'bar');
|
|
208
|
+
assert.deepEqual(webex.logger.buffer[0][5], '{"headers":{"trackingid":"123"},"test":"object","nested":{"test2":"object2"}}');
|
|
209
|
+
});
|
|
210
|
+
|
|
211
|
+
it('formats objects as strings passed to the logger for readability not [Object object] w/ circular reference', async () => {
|
|
212
|
+
webex.config.logger.level = 'trace';
|
|
213
|
+
const obj = {
|
|
214
|
+
headers: {
|
|
215
|
+
authorization: 'Bearer',
|
|
216
|
+
trackingid: '123',
|
|
217
|
+
},
|
|
218
|
+
test: 'object',
|
|
219
|
+
nested: {
|
|
220
|
+
test2: 'object2',
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
obj.selfReference = obj;
|
|
225
|
+
|
|
226
|
+
webex.logger.log('foo', 'bar', obj);
|
|
227
|
+
assert.lengthOf(webex.logger.buffer, 1);
|
|
228
|
+
assert.lengthOf(webex.logger.buffer[0], 6);
|
|
229
|
+
assert.deepEqual(webex.logger.buffer[0][2], 'wx-js-sdk');
|
|
230
|
+
assert.deepEqual(webex.logger.buffer[0][3], 'foo');
|
|
231
|
+
assert.deepEqual(webex.logger.buffer[0][4], 'bar');
|
|
232
|
+
assert.deepEqual(webex.logger.buffer[0][5], '{"headers":{"trackingid":"123"},"test":"object","nested":{"test2":"object2"}}');
|
|
233
|
+
});
|
|
234
|
+
|
|
235
|
+
it('formats Errors correctly', async () => {
|
|
236
|
+
webex.config.logger.level = 'trace';
|
|
237
|
+
const err = new Error('fake error for testing')
|
|
238
|
+
|
|
239
|
+
webex.logger.log('I got this error:', err);
|
|
240
|
+
assert.lengthOf(webex.logger.buffer, 1);
|
|
241
|
+
assert.deepEqual(webex.logger.buffer[0][2], 'wx-js-sdk');
|
|
242
|
+
assert.deepEqual(webex.logger.buffer[0][3], 'I got this error:');
|
|
243
|
+
assert.deepEqual(webex.logger.buffer[0][4], 'Error: fake error for testing');
|
|
244
|
+
|
|
245
|
+
});
|
|
187
246
|
});
|
|
188
247
|
|
|
189
248
|
// We can't manipulate NODE_ENV in karma, tests, so run this chunk only in
|
|
@@ -627,6 +686,26 @@ describe('plugin-logger', () => {
|
|
|
627
686
|
assert.calledWith(console.log, 'wx-js-sdk', '[REDACTED]');
|
|
628
687
|
});
|
|
629
688
|
|
|
689
|
+
it('redact MTID', () => {
|
|
690
|
+
webex.config.logger.level = 'trace';
|
|
691
|
+
|
|
692
|
+
const destination = 'https://example.com/example/j.php?MTID=m678957bc1eff989c2176b43ead9d46b5';
|
|
693
|
+
|
|
694
|
+
webex.logger.log(
|
|
695
|
+
`Info Unable to fetch meeting info for ${destination}.`
|
|
696
|
+
);
|
|
697
|
+
assert.calledWith(console.log, 'wx-js-sdk', 'Info Unable to fetch meeting info for https://example.com/example/j.php?MTID=[REDACTED]');
|
|
698
|
+
|
|
699
|
+
webex.logger.log('https://example.com/example/j.php?MTID=m678957bc1eff989c2176b43ead9d46b5&abcdefg');
|
|
700
|
+
assert.calledWith(console.log, 'wx-js-sdk', 'https://example.com/example/j.php?MTID=[REDACTED]&abcdefg');
|
|
701
|
+
|
|
702
|
+
webex.logger.log('https://example.com/example/j.php?MTID=m678957bc1eff989c2176b43ead9d46b5$abcdefg');
|
|
703
|
+
assert.calledWith(console.log, 'wx-js-sdk', 'https://example.com/example/j.php?MTID=[REDACTED]$abcdefg');
|
|
704
|
+
|
|
705
|
+
webex.logger.log('https://example.com/example/j.php?MTID=m678957bc1eff989c2176b43ead9d46b5#abcdefg');
|
|
706
|
+
assert.calledWith(console.log, 'wx-js-sdk', 'https://example.com/example/j.php?MTID=[REDACTED]#abcdefg');
|
|
707
|
+
});
|
|
708
|
+
|
|
630
709
|
it('handle circular references', () => {
|
|
631
710
|
webex.config.logger.level = 'trace';
|
|
632
711
|
|
|
@@ -802,4 +881,42 @@ describe('plugin-logger', () => {
|
|
|
802
881
|
});
|
|
803
882
|
});
|
|
804
883
|
});
|
|
884
|
+
describe('limit', () => {
|
|
885
|
+
function logMessages() {
|
|
886
|
+
return webex.logger.buffer.map((item) => item[3]);
|
|
887
|
+
}
|
|
888
|
+
|
|
889
|
+
it('can be increased in runtime', () => {
|
|
890
|
+
webex.logger.config.historyLength = 5;
|
|
891
|
+
for (let i = 0; i < 10; i += 1) {
|
|
892
|
+
webex.logger.log(i);
|
|
893
|
+
}
|
|
894
|
+
|
|
895
|
+
assert.deepEqual(logMessages(), [5, 6, 7, 8, 9]);
|
|
896
|
+
assert.lengthOf(webex.logger.buffer, 5);
|
|
897
|
+
|
|
898
|
+
webex.logger.config.historyLength = 10;
|
|
899
|
+
webex.logger.log(10);
|
|
900
|
+
assert.deepEqual(logMessages(), [5, 6, 7, 8, 9, 10]);
|
|
901
|
+
assert.lengthOf(webex.logger.buffer, 6);
|
|
902
|
+
});
|
|
903
|
+
|
|
904
|
+
it('can be decreased in runtime', () => {
|
|
905
|
+
for (let i = 0; i < 10; i += 1) {
|
|
906
|
+
webex.logger.log(i);
|
|
907
|
+
}
|
|
908
|
+
|
|
909
|
+
assert.deepEqual(logMessages(), [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]);
|
|
910
|
+
assert.lengthOf(webex.logger.buffer, 10);
|
|
911
|
+
|
|
912
|
+
webex.logger.config.historyLength = 5;
|
|
913
|
+
|
|
914
|
+
// Log buffer truncated when the next log added
|
|
915
|
+
assert.lengthOf(webex.logger.buffer, 10);
|
|
916
|
+
|
|
917
|
+
webex.logger.log(10);
|
|
918
|
+
assert.deepEqual(logMessages(), [6, 7, 8, 9, 10]);
|
|
919
|
+
assert.lengthOf(webex.logger.buffer, 5);
|
|
920
|
+
});
|
|
921
|
+
});
|
|
805
922
|
});
|