@appium/logger 2.0.6 → 2.0.8

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.
Files changed (17) hide show
  1. package/CHANGELOG.md +17 -0
  2. package/build/lib/log.d.ts +7 -2
  3. package/build/lib/log.d.ts.map +1 -1
  4. package/build/lib/log.js +18 -12
  5. package/build/lib/log.js.map +1 -1
  6. package/build/lib/secure-values-preprocessor.d.ts.map +1 -1
  7. package/build/lib/secure-values-preprocessor.js +24 -27
  8. package/build/lib/secure-values-preprocessor.js.map +1 -1
  9. package/build/lib/utils.d.ts +14 -0
  10. package/build/lib/utils.d.ts.map +1 -1
  11. package/build/lib/utils.js +24 -0
  12. package/build/lib/utils.js.map +1 -1
  13. package/lib/log.ts +31 -23
  14. package/lib/secure-values-preprocessor.ts +25 -25
  15. package/lib/utils.ts +24 -0
  16. package/package.json +3 -4
  17. package/tsconfig.json +2 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,23 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [2.0.8](https://github.com/appium/appium/compare/@appium/logger@2.0.7...@appium/logger@2.0.8) (2026-05-31)
7
+
8
+ **Note:** Version bump only for package @appium/logger
9
+
10
+
11
+
12
+
13
+
14
+ ## [2.0.7](https://github.com/appium/appium/compare/@appium/logger@2.0.6...@appium/logger@2.0.7) (2026-04-23)
15
+
16
+
17
+ ### Bug Fixes
18
+
19
+ * **logger:** linter errors ([#22182](https://github.com/appium/appium/issues/22182)) ([5484e9a](https://github.com/appium/appium/commit/5484e9a4ff9eccd6bd1bb5d22d6297ad1b343a3c))
20
+
21
+
22
+
6
23
  ## [2.0.6](https://github.com/appium/appium/compare/@appium/logger@2.0.5...@appium/logger@2.0.6) (2026-04-09)
7
24
 
8
25
  **Note:** Version bump only for package @appium/logger
package/build/lib/log.d.ts CHANGED
@@ -23,10 +23,9 @@ export declare class Log extends EventEmitter implements Logger {
23
23
  private _maxRecordSize;
24
24
  constructor();
25
25
  get record(): MessageObject[];
26
+ get asyncStorage(): AsyncLocalStorage<Record<string, any>>;
26
27
  get maxRecordSize(): number;
27
28
  set maxRecordSize(value: number);
28
- private useColor;
29
- get asyncStorage(): AsyncLocalStorage<Record<string, any>>;
30
29
  updateAsyncStorage(contextInfo: Record<string, any>, replace: boolean): void;
31
30
  enableColor(): void;
32
31
  disableColor(): void;
@@ -72,6 +71,7 @@ export declare class Log extends EventEmitter implements Logger {
72
71
  * @returns {Promise<PreprocessingRulesLoadResult>}
73
72
  */
74
73
  loadSecureValuesPreprocessingRules(rulesJsonPath: string | string[] | LogFiltersConfig): Promise<PreprocessingRulesLoadResult>;
74
+ private useColor;
75
75
  private emitLog;
76
76
  private _format;
77
77
  private write;
@@ -80,6 +80,11 @@ export declare class Log extends EventEmitter implements Logger {
80
80
  private clearProgress;
81
81
  private showProgress;
82
82
  }
83
+ /**
84
+ * Wraps a log message so it can be redacted when async storage marks the context as sensitive.
85
+ * @param logMessage - Value to log; may be wrapped for secure display.
86
+ * @returns An object keyed with an internal marker containing the message.
87
+ */
83
88
  export declare function markSensitive<T = any>(logMessage: T): {
84
89
  [SENSITIVE_MESSAGE_KEY]: T;
85
90
  };
package/build/lib/log.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../lib/log.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../lib/log.ts"],"names":[],"mappings":"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"}
package/build/lib/log.js CHANGED
@@ -38,7 +38,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
38
38
  Object.defineProperty(exports, "__esModule", { value: true });
39
39
  exports.GLOBAL_LOG = exports.Log = void 0;
40
40
  exports.markSensitive = markSensitive;
41
- const lodash_1 = __importDefault(require("lodash"));
42
41
  const node_events_1 = require("node:events");
43
42
  // @ts-ignore This module does not provide type definitions
44
43
  const set_blocking_1 = __importDefault(require("set-blocking"));
@@ -105,6 +104,9 @@ class Log extends node_events_1.EventEmitter {
105
104
  get record() {
106
105
  return [...this._history.rvalues()];
107
106
  }
107
+ get asyncStorage() {
108
+ return this._asyncStorage;
109
+ }
108
110
  get maxRecordSize() {
109
111
  return this._maxRecordSize;
110
112
  }
@@ -119,15 +121,8 @@ class Log extends node_events_1.EventEmitter {
119
121
  }
120
122
  this._history = newHistory;
121
123
  }
122
- useColor() {
123
- // by default, decide based on tty-ness.
124
- return (this._colorEnabled ?? Boolean(this.stream && 'isTTY' in this.stream && this.stream.isTTY));
125
- }
126
- get asyncStorage() {
127
- return this._asyncStorage;
128
- }
129
124
  updateAsyncStorage(contextInfo, replace) {
130
- if (!lodash_1.default.isPlainObject(contextInfo)) {
125
+ if (!(0, utils_1.isPlainObject)(contextInfo)) {
131
126
  return;
132
127
  }
133
128
  if (replace) {
@@ -270,9 +265,13 @@ class Log extends node_events_1.EventEmitter {
270
265
  const issues = await this._secureValuesPreprocessor.loadRules(rulesJsonPath);
271
266
  return {
272
267
  issues,
273
- rules: lodash_1.default.cloneDeep(this._secureValuesPreprocessor.rules),
268
+ rules: structuredClone(this._secureValuesPreprocessor.rules),
274
269
  };
275
270
  }
271
+ useColor() {
272
+ // by default, decide based on tty-ness.
273
+ return (this._colorEnabled ?? Boolean(this.stream && 'isTTY' in this.stream && this.stream.isTTY));
274
+ }
276
275
  emitLog(m) {
277
276
  if (this._paused) {
278
277
  this._buffer.push(m);
@@ -365,12 +364,14 @@ class Log extends node_events_1.EventEmitter {
365
364
  stack: undefined,
366
365
  };
367
366
  // mask sensitive data
368
- if (lodash_1.default.has(result.arg, SENSITIVE_MESSAGE_KEY)) {
367
+ if (result.arg != null &&
368
+ typeof result.arg === 'object' &&
369
+ Object.hasOwn(result.arg, SENSITIVE_MESSAGE_KEY)) {
369
370
  const { isSensitive } = this._asyncStorage.getStore() ?? {};
370
371
  result.arg = isSensitive ? secure_values_preprocessor_1.DEFAULT_SECURE_REPLACER : result.arg[SENSITIVE_MESSAGE_KEY];
371
372
  }
372
373
  // resolve stack traces to a plain string
373
- if (lodash_1.default.isError(result.arg) && result.arg.stack) {
374
+ if (result.arg instanceof Error && result.arg.stack) {
374
375
  result.stack = result.arg.stack + '';
375
376
  Object.defineProperty(result.arg, 'stack', {
376
377
  value: result.stack,
@@ -385,6 +386,11 @@ class Log extends node_events_1.EventEmitter {
385
386
  showProgress() { }
386
387
  }
387
388
  exports.Log = Log;
389
+ /**
390
+ * Wraps a log message so it can be redacted when async storage marks the context as sensitive.
391
+ * @param logMessage - Value to log; may be wrapped for secure display.
392
+ * @returns An object keyed with an internal marker containing the message.
393
+ */
388
394
  function markSensitive(logMessage) {
389
395
  return { [SENSITIVE_MESSAGE_KEY]: logMessage };
390
396
  }
package/build/lib/log.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"log.js","sourceRoot":"","sources":["../../lib/log.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"log.js","sourceRoot":"","sources":["../../lib/log.ts"],"names":[],"mappings":"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"}
package/build/lib/secure-values-preprocessor.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"secure-values-preprocessor.d.ts","sourceRoot":"","sources":["../../lib/secure-values-preprocessor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,4BAA4B,EAE5B,gBAAgB,EAChB,SAAS,EACV,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,uBAAuB,eAAe,CAAC;AAWpD,qBAAa,wBAAwB;IACnC,MAAM,EAAE,4BAA4B,EAAE,CAAC;;IAMvC;;;OAGG;IACH,IAAI,KAAK,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAE/C;IAED;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,4BAA4B;IAsDjE;;;;;;;;;OASG;IACG,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,gBAAgB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAuBjF;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAWhC"}
1
+ {"version":3,"file":"secure-values-preprocessor.d.ts","sourceRoot":"","sources":["../../lib/secure-values-preprocessor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,4BAA4B,EAE5B,gBAAgB,EAChB,SAAS,EACV,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,uBAAuB,eAAe,CAAC;AAEpD,qBAAa,wBAAwB;IACnC,MAAM,EAAE,4BAA4B,EAAE,CAAC;;IAMvC;;;OAGG;IACH,IAAI,KAAK,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAE/C;IAED;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,4BAA4B;IAsDjE;;;;;;;;;OASG;IACG,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,gBAAgB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAuBjF;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAWhC"}
package/build/lib/secure-values-preprocessor.js CHANGED
@@ -1,19 +1,8 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
3
  exports.SecureValuesPreprocessor = exports.DEFAULT_SECURE_REPLACER = void 0;
7
- const lodash_1 = __importDefault(require("lodash"));
4
+ const utils_1 = require("./utils");
8
5
  exports.DEFAULT_SECURE_REPLACER = '**SECURE**';
9
- /**
10
- * Type guard for log filter type
11
- * @param {object} value
12
- * @returns {value is LogFilterRegex}
13
- */
14
- function isLogFilterRegex(value) {
15
- return 'pattern' in value;
16
- }
17
6
  class SecureValuesPreprocessor {
18
7
  _rules;
19
8
  constructor() {
@@ -38,38 +27,38 @@ class SecureValuesPreprocessor {
38
27
  let pattern;
39
28
  let replacer = exports.DEFAULT_SECURE_REPLACER;
40
29
  let flags = ['g'];
41
- if (lodash_1.default.isString(rule)) {
30
+ if (typeof rule === 'string') {
42
31
  if (rule.length === 0) {
43
32
  throw new Error(`${JSON.stringify(rule)} -> The value must not be empty`);
44
33
  }
45
- pattern = `\\b${lodash_1.default.escapeRegExp(rule)}\\b`;
34
+ pattern = `\\b${(0, utils_1.escapeRegExp)(rule)}\\b`;
46
35
  }
47
- else if (lodash_1.default.isPlainObject(rule)) {
36
+ else if ((0, utils_1.isPlainObject)(rule)) {
48
37
  if (isLogFilterRegex(rule)) {
49
- if (!lodash_1.default.isString(rule.pattern) || rule.pattern.length === 0) {
38
+ if (typeof rule.pattern !== 'string' || rule.pattern.length === 0) {
50
39
  throw new Error(`${JSON.stringify(rule)} -> The value of 'pattern' must be a valid non-empty string`);
51
40
  }
52
41
  pattern = rule.pattern;
53
42
  }
54
- else if (lodash_1.default.has(rule, 'text')) {
55
- if (!lodash_1.default.isString(rule.text) || rule.text.length === 0) {
43
+ else if (Object.hasOwn(rule, 'text')) {
44
+ if (typeof rule.text !== 'string' || rule.text.length === 0) {
56
45
  throw new Error(`${JSON.stringify(rule)} -> The value of 'text' must be a valid non-empty string`);
57
46
  }
58
- pattern = `\\b${lodash_1.default.escapeRegExp(rule.text)}\\b`;
47
+ pattern = `\\b${(0, utils_1.escapeRegExp)(rule.text)}\\b`;
59
48
  }
60
49
  if (!pattern) {
61
50
  throw new Error(`${JSON.stringify(rule)} -> Must either have a field named 'pattern' or 'text'`);
62
51
  }
63
- if (lodash_1.default.has(rule, 'flags')) {
52
+ if (Object.hasOwn(rule, 'flags') && rule.flags != null) {
64
53
  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#Advanced_searching_with_flags_2
65
54
  for (const flag of ['i', 'g', 'm', 's', 'u', 'y']) {
66
- if (lodash_1.default.includes(rule.flags, flag)) {
55
+ if (rule.flags?.includes(flag)) {
67
56
  flags.push(flag);
68
57
  }
69
58
  }
70
- flags = lodash_1.default.uniq(flags);
59
+ flags = [...new Set(flags)];
71
60
  }
72
- if (lodash_1.default.isString(rule.replacer)) {
61
+ if (typeof rule.replacer === 'string') {
73
62
  replacer = rule.replacer;
74
63
  }
75
64
  }
@@ -94,11 +83,11 @@ class SecureValuesPreprocessor {
94
83
  async loadRules(filters) {
95
84
  const issues = [];
96
85
  const rawRules = [];
97
- for (const source of (lodash_1.default.isArray(filters) ? filters : [filters])) {
98
- if (lodash_1.default.isPlainObject(source)) {
86
+ for (const source of (Array.isArray(filters) ? filters : [filters])) {
87
+ if ((0, utils_1.isPlainObject)(source)) {
99
88
  rawRules.push(source);
100
89
  }
101
- else if (lodash_1.default.isString(source)) {
90
+ else if (typeof source === 'string') {
102
91
  rawRules.push(String(source));
103
92
  }
104
93
  else {
@@ -125,7 +114,7 @@ class SecureValuesPreprocessor {
125
114
  * @returns {string} The string with replacements made
126
115
  */
127
116
  preprocess(str) {
128
- if (this._rules.length === 0 || !str || !lodash_1.default.isString(str)) {
117
+ if (this._rules.length === 0 || !str || typeof str !== 'string') {
129
118
  return str;
130
119
  }
131
120
  let result = str;
@@ -136,4 +125,12 @@ class SecureValuesPreprocessor {
136
125
  }
137
126
  }
138
127
  exports.SecureValuesPreprocessor = SecureValuesPreprocessor;
128
+ /**
129
+ * Type guard for log filter type
130
+ * @param {object} value
131
+ * @returns {value is LogFilterRegex}
132
+ */
133
+ function isLogFilterRegex(value) {
134
+ return 'pattern' in value;
135
+ }
139
136
  //# sourceMappingURL=secure-values-preprocessor.js.map
package/build/lib/secure-values-preprocessor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"secure-values-preprocessor.js","sourceRoot":"","sources":["../../lib/secure-values-preprocessor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"secure-values-preprocessor.js","sourceRoot":"","sources":["../../lib/secure-values-preprocessor.ts"],"names":[],"mappings":"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"}
package/build/lib/utils.d.ts CHANGED
@@ -1,3 +1,17 @@
1
+ /**
2
+ * Returns true if the value is a plain object (Object prototype or null prototype).
3
+ *
4
+ * @param value - Value to check
5
+ * @returns `true` if the value is a plain object
6
+ */
7
+ export declare function isPlainObject(value: unknown): value is Record<string, unknown>;
8
+ /**
9
+ * Escapes RegExp special characters in a string.
10
+ *
11
+ * @param value - Input string
12
+ * @returns Escaped string safe for RegExp source
13
+ */
14
+ export declare function escapeRegExp(value: string): string;
1
15
  /**
2
16
  * This function is necessary to workaround unexpected memory leaks
3
17
  * caused by NodeJS string interning
package/build/lib/utils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,GAAG,GAAG,MAAM,CAE3C"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAM9E;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAElD;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,GAAG,GAAG,MAAM,CAE3C"}
package/build/lib/utils.js CHANGED
@@ -1,6 +1,30 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.isPlainObject = isPlainObject;
4
+ exports.escapeRegExp = escapeRegExp;
3
5
  exports.unleakString = unleakString;
6
+ /**
7
+ * Returns true if the value is a plain object (Object prototype or null prototype).
8
+ *
9
+ * @param value - Value to check
10
+ * @returns `true` if the value is a plain object
11
+ */
12
+ function isPlainObject(value) {
13
+ if (value === null || typeof value !== 'object') {
14
+ return false;
15
+ }
16
+ const prototype = Object.getPrototypeOf(value);
17
+ return prototype === null || prototype === Object.prototype;
18
+ }
19
+ /**
20
+ * Escapes RegExp special characters in a string.
21
+ *
22
+ * @param value - Input string
23
+ * @returns Escaped string safe for RegExp source
24
+ */
25
+ function escapeRegExp(value) {
26
+ return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
27
+ }
4
28
  /**
5
29
  * This function is necessary to workaround unexpected memory leaks
6
30
  * caused by NodeJS string interning
package/build/lib/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":";;AAQA,oCAEC;AAVD;;;;;;;GAOG;AACH,SAAgB,YAAY,CAAC,CAAM;IACjC,OAAO,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AAC9B,CAAC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":";;AAMA,sCAMC;AAQD,oCAEC;AAUD,oCAEC;AAlCD;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,KAAc;IAC1C,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC/C,OAAO,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,MAAM,CAAC,SAAS,CAAC;AAC9D,CAAC;AAED;;;;;GAKG;AACH,SAAgB,YAAY,CAAC,KAAa;IACxC,OAAO,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,YAAY,CAAC,CAAM;IACjC,OAAO,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AAC9B,CAAC"}
package/lib/log.ts CHANGED
@@ -1,4 +1,3 @@
1
- import _ from 'lodash';
2
1
  import {EventEmitter} from 'node:events';
3
2
  // @ts-ignore This module does not provide type definitions
4
3
  import setBlocking from 'set-blocking';
@@ -15,7 +14,7 @@ import type {
15
14
  } from './types';
16
15
  import type {Writable} from 'node:stream';
17
16
  import {AsyncLocalStorage} from 'node:async_hooks';
18
- import { unleakString } from './utils';
17
+ import {isPlainObject, unleakString} from './utils';
19
18
  import {
20
19
  DEFAULT_SECURE_REPLACER,
21
20
  SecureValuesPreprocessor
@@ -39,6 +38,11 @@ const SENSITIVE_MESSAGE_KEY = 'f2b06625-35a2-4ed3-939a-b0b0a4abc750';
39
38
 
40
39
  setBlocking(true);
41
40
 
41
+ interface ArgumentFormatResult {
42
+ arg: any;
43
+ stack: string | undefined;
44
+ }
45
+
42
46
  export class Log extends EventEmitter implements Logger {
43
47
  level: LogLevel | string;
44
48
  prefixStyle: StyleObject;
@@ -88,6 +92,10 @@ export class Log extends EventEmitter implements Logger {
88
92
  return [...this._history.rvalues()] as MessageObject[];
89
93
  }
90
94
 
95
+ get asyncStorage(): AsyncLocalStorage<Record<string, any>> {
96
+ return this._asyncStorage;
97
+ }
98
+
91
99
  get maxRecordSize(): number {
92
100
  return this._maxRecordSize;
93
101
  }
@@ -105,19 +113,8 @@ export class Log extends EventEmitter implements Logger {
105
113
  this._history = newHistory;
106
114
  }
107
115
 
108
- private useColor(): boolean {
109
- // by default, decide based on tty-ness.
110
- return (
111
- this._colorEnabled ?? Boolean(this.stream && 'isTTY' in this.stream && this.stream.isTTY)
112
- );
113
- }
114
-
115
- get asyncStorage(): AsyncLocalStorage<Record<string, any>> {
116
- return this._asyncStorage;
117
- }
118
-
119
116
  updateAsyncStorage(contextInfo: Record<string, any>, replace: boolean): void {
120
- if (!_.isPlainObject(contextInfo)) {
117
+ if (!isPlainObject(contextInfo)) {
121
118
  return;
122
119
  }
123
120
  if (replace) {
@@ -284,10 +281,17 @@ export class Log extends EventEmitter implements Logger {
284
281
  const issues = await this._secureValuesPreprocessor.loadRules(rulesJsonPath);
285
282
  return {
286
283
  issues,
287
- rules: _.cloneDeep(this._secureValuesPreprocessor.rules),
284
+ rules: structuredClone(this._secureValuesPreprocessor.rules),
288
285
  };
289
286
  }
290
287
 
288
+ private useColor(): boolean {
289
+ // by default, decide based on tty-ness.
290
+ return (
291
+ this._colorEnabled ?? Boolean(this.stream && 'isTTY' in this.stream && this.stream.isTTY)
292
+ );
293
+ }
294
+
291
295
  private emitLog(m: MessageObject): void {
292
296
  if (this._paused) {
293
297
  this._buffer.push(m);
@@ -390,13 +394,17 @@ export class Log extends EventEmitter implements Logger {
390
394
  };
391
395
 
392
396
  // mask sensitive data
393
- if (_.has(result.arg, SENSITIVE_MESSAGE_KEY)) {
397
+ if (
398
+ result.arg != null &&
399
+ typeof result.arg === 'object' &&
400
+ Object.hasOwn(result.arg, SENSITIVE_MESSAGE_KEY)
401
+ ) {
394
402
  const { isSensitive } = this._asyncStorage.getStore() ?? {};
395
403
  result.arg = isSensitive ? DEFAULT_SECURE_REPLACER : result.arg[SENSITIVE_MESSAGE_KEY];
396
404
  }
397
405
 
398
406
  // resolve stack traces to a plain string
399
- if (_.isError(result.arg) && result.arg.stack) {
407
+ if (result.arg instanceof Error && result.arg.stack) {
400
408
  result.stack = result.arg.stack + '';
401
409
  Object.defineProperty(result.arg, 'stack', {
402
410
  value: result.stack,
@@ -413,15 +421,15 @@ export class Log extends EventEmitter implements Logger {
413
421
  private showProgress(): void {}
414
422
  }
415
423
 
416
- export function markSensitive<T=any>(logMessage: T): {[SENSITIVE_MESSAGE_KEY]: T} {
424
+ /**
425
+ * Wraps a log message so it can be redacted when async storage marks the context as sensitive.
426
+ * @param logMessage - Value to log; may be wrapped for secure display.
427
+ * @returns An object keyed with an internal marker containing the message.
428
+ */
429
+ export function markSensitive<T = any>(logMessage: T): {[SENSITIVE_MESSAGE_KEY]: T} {
417
430
  return {[SENSITIVE_MESSAGE_KEY]: logMessage};
418
431
  }
419
432
 
420
- interface ArgumentFormatResult {
421
- arg: any,
422
- stack: string | undefined,
423
- }
424
-
425
433
  // Unique key for the process-wide logger on globalThis (avoids collisions with other globals).
426
434
  const GLOBAL_NPMLOG_KEY = 'appium-logger-global-8f4a1c2b-5e6d-4a9b-8c3f-7d2e1b0a9c6e';
427
435
 
package/lib/secure-values-preprocessor.ts CHANGED
@@ -1,4 +1,4 @@
1
- import _ from 'lodash';
1
+ import {escapeRegExp, isPlainObject} from './utils';
2
2
  import type {
3
3
  SecureValuePreprocessingRule,
4
4
  LogFilterRegex,
@@ -8,15 +8,6 @@ import type {
8
8
 
9
9
  export const DEFAULT_SECURE_REPLACER = '**SECURE**';
10
10
 
11
- /**
12
- * Type guard for log filter type
13
- * @param {object} value
14
- * @returns {value is LogFilterRegex}
15
- */
16
- function isLogFilterRegex(value: object): value is LogFilterRegex {
17
- return 'pattern' in value;
18
- }
19
-
20
11
  export class SecureValuesPreprocessor {
21
12
  _rules: SecureValuePreprocessingRule[];
22
13
 
@@ -44,26 +35,26 @@ export class SecureValuesPreprocessor {
44
35
  let pattern: string | undefined;
45
36
  let replacer = DEFAULT_SECURE_REPLACER;
46
37
  let flags = ['g'];
47
- if (_.isString(rule)) {
38
+ if (typeof rule === 'string') {
48
39
  if (rule.length === 0) {
49
40
  throw new Error(`${JSON.stringify(rule)} -> The value must not be empty`);
50
41
  }
51
- pattern = `\\b${_.escapeRegExp(rule)}\\b`;
52
- } else if (_.isPlainObject(rule)) {
42
+ pattern = `\\b${escapeRegExp(rule)}\\b`;
43
+ } else if (isPlainObject(rule)) {
53
44
  if (isLogFilterRegex(rule)) {
54
- if (!_.isString(rule.pattern) || rule.pattern.length === 0) {
45
+ if (typeof rule.pattern !== 'string' || rule.pattern.length === 0) {
55
46
  throw new Error(
56
47
  `${JSON.stringify(rule)} -> The value of 'pattern' must be a valid non-empty string`
57
48
  );
58
49
  }
59
50
  pattern = rule.pattern;
60
- } else if (_.has(rule, 'text')) {
61
- if (!_.isString(rule.text) || rule.text.length === 0) {
51
+ } else if (Object.hasOwn(rule, 'text')) {
52
+ if (typeof rule.text !== 'string' || rule.text.length === 0) {
62
53
  throw new Error(
63
54
  `${JSON.stringify(rule)} -> The value of 'text' must be a valid non-empty string`
64
55
  );
65
56
  }
66
- pattern = `\\b${_.escapeRegExp(rule.text)}\\b`;
57
+ pattern = `\\b${escapeRegExp(rule.text)}\\b`;
67
58
  }
68
59
  if (!pattern) {
69
60
  throw new Error(
@@ -71,17 +62,17 @@ export class SecureValuesPreprocessor {
71
62
  );
72
63
  }
73
64
 
74
- if (_.has(rule, 'flags')) {
65
+ if (Object.hasOwn(rule, 'flags') && rule.flags != null) {
75
66
  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#Advanced_searching_with_flags_2
76
67
  for (const flag of ['i', 'g', 'm', 's', 'u', 'y']) {
77
- if (_.includes(rule.flags, flag)) {
68
+ if (rule.flags?.includes(flag)) {
78
69
  flags.push(flag);
79
70
  }
80
71
  }
81
- flags = _.uniq(flags);
72
+ flags = [...new Set(flags)];
82
73
  }
83
74
 
84
- if (_.isString(rule.replacer)) {
75
+ if (typeof rule.replacer === 'string') {
85
76
  replacer = rule.replacer;
86
77
  }
87
78
  } else {
@@ -107,10 +98,10 @@ export class SecureValuesPreprocessor {
107
98
  async loadRules(filters: string | string[] | LogFiltersConfig): Promise<string[]> {
108
99
  const issues: string[] = [];
109
100
  const rawRules: (LogFilter | string)[] = [];
110
- for (const source of (_.isArray(filters) ? filters : [filters])) {
111
- if (_.isPlainObject(source)) {
101
+ for (const source of (Array.isArray(filters) ? filters : [filters])) {
102
+ if (isPlainObject(source)) {
112
103
  rawRules.push(source as LogFilter);
113
- } else if (_.isString(source)) {
104
+ } else if (typeof source === 'string') {
114
105
  rawRules.push(String(source));
115
106
  } else {
116
107
  issues.push(`'${source}' must be a valid log filtering rule`);
@@ -136,7 +127,7 @@ export class SecureValuesPreprocessor {
136
127
  * @returns {string} The string with replacements made
137
128
  */
138
129
  preprocess(str: string): string {
139
- if (this._rules.length === 0 || !str || !_.isString(str)) {
130
+ if (this._rules.length === 0 || !str || typeof str !== 'string') {
140
131
  return str;
141
132
  }
142
133
 
@@ -147,3 +138,12 @@ export class SecureValuesPreprocessor {
147
138
  return result;
148
139
  }
149
140
  }
141
+
142
+ /**
143
+ * Type guard for log filter type
144
+ * @param {object} value
145
+ * @returns {value is LogFilterRegex}
146
+ */
147
+ function isLogFilterRegex(value: object): value is LogFilterRegex {
148
+ return 'pattern' in value;
149
+ }
package/lib/utils.ts CHANGED
@@ -1,3 +1,27 @@
1
+ /**
2
+ * Returns true if the value is a plain object (Object prototype or null prototype).
3
+ *
4
+ * @param value - Value to check
5
+ * @returns `true` if the value is a plain object
6
+ */
7
+ export function isPlainObject(value: unknown): value is Record<string, unknown> {
8
+ if (value === null || typeof value !== 'object') {
9
+ return false;
10
+ }
11
+ const prototype = Object.getPrototypeOf(value);
12
+ return prototype === null || prototype === Object.prototype;
13
+ }
14
+
15
+ /**
16
+ * Escapes RegExp special characters in a string.
17
+ *
18
+ * @param value - Input string
19
+ * @returns Escaped string safe for RegExp source
20
+ */
21
+ export function escapeRegExp(value: string): string {
22
+ return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
23
+ }
24
+
1
25
  /**
2
26
  * This function is necessary to workaround unexpected memory leaks
3
27
  * caused by NodeJS string interning
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@appium/logger",
3
- "version": "2.0.6",
3
+ "version": "2.0.8",
4
4
  "author": "https://github.com/appium",
5
5
  "description": "A Universal Logger For The Appium Ecosystem",
6
6
  "repository": {
@@ -29,8 +29,7 @@
29
29
  },
30
30
  "dependencies": {
31
31
  "console-control-strings": "1.1.0",
32
- "lodash": "4.18.1",
33
- "lru-cache": "11.3.3",
32
+ "lru-cache": "11.5.0",
34
33
  "set-blocking": "2.0.0"
35
34
  },
36
35
  "license": "ISC",
@@ -45,7 +44,7 @@
45
44
  "publishConfig": {
46
45
  "access": "public"
47
46
  },
48
- "gitHead": "7a8965f5c30ffec2ad04ce75903b3960537cef06",
47
+ "gitHead": "8018f8b70ecc975fa115e19072ef337b8473865d",
49
48
  "keywords": [
50
49
  "automation",
51
50
  "javascript",
package/tsconfig.json CHANGED
@@ -1,8 +1,9 @@
1
1
  {
2
2
  "extends": "@appium/tsconfig/tsconfig.json",
3
3
  "compilerOptions": {
4
+ "rootDir": ".",
4
5
  "esModuleInterop": true,
5
- "strict": false,
6
+ "strict": true,
6
7
  "outDir": "build",
7
8
  "types": ["node", "mocha"],
8
9
  "checkJs": true