core-services-sdk 1.3.27 → 1.3.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-services-sdk",
-  "version": "1.3.27",
+  "version": "1.3.29",
   "main": "src/index.js",
   "type": "module",
   "types": "types/index.d.ts",

package/src/rabbit-mq/rabbit-mq.js

@@ -1,6 +1,8 @@
 // @ts-nocheck
-import * as amqp from 'amqplib'
 import { ulid } from 'ulid'
+import * as amqp from 'amqplib'
+
+import { mask } from '../util/mask-sensitive.js'
 
 /**
  * @typedef {Object} Log
@@ -19,7 +21,7 @@ const generateMsgId = () => `rbt_${ulid()}`
  */
 export const connectQueueService = async ({ host, log }) => {
   const t0 = Date.now()
-  const logger = log.child({ op: 'connectQueueService', host })
+  const logger = log.child({ op: 'connectQueueService', host: mask(host) })
 
   try {
     logger.debug('start')
@@ -48,7 +50,7 @@ export const connectQueueService = async ({ host, log }) => {
  */
 export const createChannel = async ({ host, log }) => {
   const t0 = Date.now()
-  const logger = log.child({ op: 'createChannel', host })
+  const logger = log.child({ op: 'createChannel', host: mask(host) })
 
   try {
     logger.debug('start')
@@ -168,7 +170,7 @@ export const subscribeToQueue = async ({
  */
 export const initializeQueue = async ({ host, log }) => {
   const channel = await createChannel({ host, log })
-  const logger = log.child({ op: 'initializeQueue' })
+  const logger = log.child({ op: 'initializeQueue', host: mask(host) })
 
   /**
    * Publishes a message to a queue with a generated `rbt_<ulid>` ID.

package/src/util/mask-sensitive.js

@@ -1,18 +1,18 @@
 /**
  * Mask middle of a primitive value while keeping left/right edges.
  * @param {string|number|boolean|null|undefined} value
- * @param {string} [fill='•']
- * @param {number} [maskLen=3]
+ * @param {string} [fill='.']
+ * @param {number} [maskLen=2]
  * @param {number} [left=4]
  * @param {number} [right=4]
  * @returns {string}
  */
 export const maskSingle = (
   value,
-  fill = '•',
-  maskLen = 3,
-  left = 4,
-  right = 4,
+  fill = '.',
+  maskLen = null,
+  left = 2,
+  right = 2,
 ) => {
   if (value == null) {
     return ''
@@ -21,14 +21,19 @@ export const maskSingle = (
   if (str.length === 0) {
     return ''
   }
-  const m = Math.max(1, maskLen)
+
+  if (typeof value === 'boolean') {
+    return str
+  }
+  const m =
+    null === maskLen ? Math.max(1, str.length - (right + left)) : maskLen
 
   if (str.length <= left + right) {
     if (str.length === 1) {
       return fill
     }
     if (str.length === 2) {
-      return str[0] + fill.repeat(2) // "ab" -> "a••"
+      return str[0] + fill.repeat(1) // "ab" -> "a.."
     }
     return str.slice(0, 1) + fill.repeat(m) + str.slice(-1)
   }
@@ -39,13 +44,19 @@ export const maskSingle = (
 /**
  * Recursively mask values in strings, numbers, booleans, arrays, and objects.
  * @param {string|number|boolean|Array|Object|null|undefined} value
- * @param {string} [fill='•']
- * @param {number} [maskLen=3]
+ * @param {string} [fill='.']
+ * @param {number} [maskLen=2]
  * @param {number} [left=4]
  * @param {number} [right=4]
  * @returns {string|Array|Object}
  */
-export const mask = (value, fill = '•', maskLen = 3, left = 4, right = 4) => {
+export const mask = (
+  value,
+  fill = '.',
+  maskLen = null,
+  left = 2,
+  right = 2,
+) => {
   const type = typeof value
 
   if (value instanceof Date) {

package/tests/util/mask-sensitive.unit.test.js

@@ -4,30 +4,37 @@ import { mask, maskSingle } from '../../src/util/index.js'
 
 describe('maskSingle', () => {
   it('masks middle of a regular string (length == left+right)', () => {
-    expect(maskSingle('abcdefgh')).toBe('a•••h')
+    const value = maskSingle('abcdefgh')
+    expect(value).toBe('ab....gh')
   })
 
   it('masks numbers with default settings', () => {
-    expect(maskSingle(12345678)).toBe('1•••8')
+    expect(maskSingle(12345678)).toBe('12....78')
   })
 
   it('masks booleans', () => {
-    expect(maskSingle(true)).toBe('t•••e')
-    expect(maskSingle(false)).toBe('f•••e')
+    const trueValue = maskSingle(true)
+    expect(trueValue).toBe('true')
+    const falseValue = maskSingle(false)
+    expect(falseValue).toBe('false')
   })
 
   it('masks very short strings correctly', () => {
-    expect(maskSingle('ab')).toBe('a••b'.slice(0, 3)) // will produce 'a••'
-    expect(maskSingle('a')).toBe('•')
+    const value1 = maskSingle('ab')
+    expect(value1).toBe('a.') // will produce 'a.'
+    const value2 = maskSingle('a')
+    expect(value2).toBe('.')
     expect(maskSingle('')).toBe('')
   })
 
   it('respects custom fill and mask length', () => {
-    expect(maskSingle('abcdefgh', '*', 5)).toBe('a*****h')
+    const value = maskSingle('abcdefgh', '*', 5)
+    expect(value).toBe('ab*****gh')
   })
 
   it('ensures maskLen is at least 1', () => {
-    expect(maskSingle('abcdefgh', '*', 0)).toBe('a*h')
+    const value = maskSingle('abcdefgh', '*', 1, 1, 1)
+    expect(value).toBe('a*h')
   })
 
   it('returns empty string for null/undefined', () => {
@@ -38,9 +45,10 @@ describe('maskSingle', () => {
 
 describe('mask', () => {
   it('masks primitives (string, number, boolean)', () => {
-    expect(mask('abcdefgh')).toBe('a•••h')
-    expect(mask(12345678)).toBe('1•••8')
-    expect(mask(true)).toBe('true')
+    expect(mask('abcdefgh')).toBe('ab....gh')
+    expect(mask(12345678)).toBe('12....78')
+    const trueValue = mask(true)
+    expect(trueValue).toBe('true')
     expect(mask(false)).toBe('false')
   })
 
@@ -50,20 +58,22 @@ describe('mask', () => {
   })
 
   it('masks arrays recursively', () => {
-    expect(mask(['abcdefgh', 12345678])).toEqual(['a•••h', '1•••8'])
+    const value = mask(['abcdefgh', 12345678])
+    expect(value).toEqual(['ab....gh', '12....78'])
   })
 
   it('masks objects recursively', () => {
     expect(mask({ a: 'abcdefgh', b: 12345678 })).toEqual({
-      a: 'a•••h',
-      b: '1•••8',
+      a: 'ab....gh',
+      b: '12....78',
     })
   })
 
   it('masks nested objects/arrays recursively', () => {
     const input = { arr: ['abcdefgh', { num: 12345678 }] }
-    const expected = { arr: ['a•••h', { num: '1•••8' }] }
-    expect(mask(input)).toEqual(expected)
+    const expected = { arr: ['ab....gh', { num: '12....78' }] }
+    const value = mask(input)
+    expect(value).toEqual(expected)
   })
 
   it('handles Date instances by returning full ISO string', () => {
@@ -73,7 +83,8 @@ describe('mask', () => {
 
   it('respects custom fill and mask length in recursive calls', () => {
     const input = { val: 'abcdefgh' }
-    const expected = { val: 'a*****h' }
-    expect(mask(input, '*', 5)).toEqual(expected)
+    const expected = { val: 'ab*****gh' }
+    const value = mask(input, '*', 5)
+    expect(value).toEqual(expected)
   })
 })