@open-mercato/shared 0.6.6-develop.6460.1.f94c74174c → 0.6.6-develop.6471.1.9ab5bdd79a

package/src/lib/encryption/tenantDataEncryptionService.ts

@@ -3,6 +3,9 @@ import type { CacheStrategy } from '@open-mercato/cache'
 import { decryptWithAesGcm, encryptWithAesGcm, hashForLookup } from './aes'
 import { createKmsService, type KmsService, type TenantDek } from './kms'
 import { isTenantDataEncryptionEnabled, isEncryptionDebugEnabled } from './toggles'
+import { createLogger } from '../logger'
+
+const logger = createLogger('shared').child({ component: 'tenant-encryption' })
 
 export type EncryptedFieldRule = {
   field: string
@@ -42,8 +45,7 @@ function cacheKey(key: MapCacheKey): string {
 function debug(event: string, payload: Record<string, unknown>) {
   if (!isEncryptionDebugEnabled()) return
   try {
-    // eslint-disable-next-line no-console
-    console.debug(`${event} [tenant-encryption]`, payload)
+    logger.debug(event, payload)
   } catch {
     // ignore
   }

package/src/lib/indexers/__tests__/status-log.test.ts

@@ -1,4 +1,20 @@
 import { recordIndexerLog } from '../status-log'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+jest.mock('@open-mercato/shared/lib/logger', () => {
+  const mocked = {
+    debug: jest.fn(),
+    info: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+    child: jest.fn(),
+  }
+  mocked.child.mockImplementation(() => mocked)
+  return { createLogger: jest.fn(() => mocked) }
+})
+const loggerError = createLogger('shared').error as jest.Mock
+const loggerWarn = createLogger('shared').warn as jest.Mock
+
 
 type Behaviors = {
   insert?: () => unknown
@@ -29,17 +45,13 @@ function makeDb(behaviors: Behaviors): any {
 const INPUT = { source: 'vector' as const, handler: 'event:test', message: 'hi' }
 
 describe('recordIndexerLog — inactive-transaction de-noising', () => {
-  let errorSpy: jest.SpyInstance
-  let warnSpy: jest.SpyInstance
 
   beforeEach(() => {
-    errorSpy = jest.spyOn(console, 'error').mockImplementation(() => {})
-    warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {})
+    loggerError.mockClear()
+    loggerWarn.mockClear()
   })
 
   afterEach(() => {
-    errorSpy.mockRestore()
-    warnSpy.mockRestore()
   })
 
   it('skips quietly when the insert hits an already-committed transaction', async () => {
@@ -51,7 +63,7 @@ describe('recordIndexerLog — inactive-transaction de-noising', () => {
 
     await recordIndexerLog({ db }, INPUT)
 
-    expect(errorSpy).not.toHaveBeenCalled()
+    expect(loggerError).not.toHaveBeenCalled()
   })
 
   it('still logs an unexpected insert failure', async () => {
@@ -63,7 +75,7 @@ describe('recordIndexerLog — inactive-transaction de-noising', () => {
 
     await recordIndexerLog({ db }, INPUT)
 
-    expect(errorSpy).toHaveBeenCalledTimes(1)
+    expect(loggerError).toHaveBeenCalledTimes(1)
   })
 
   it('skips quietly when the prune hits a rolled-back transaction', async () => {
@@ -76,7 +88,7 @@ describe('recordIndexerLog — inactive-transaction de-noising', () => {
 
     await recordIndexerLog({ db }, INPUT)
 
-    expect(warnSpy).not.toHaveBeenCalled()
+    expect(loggerWarn).not.toHaveBeenCalled()
   })
 
   it('still warns on an unexpected prune failure', async () => {
@@ -89,6 +101,6 @@ describe('recordIndexerLog — inactive-transaction de-noising', () => {
 
     await recordIndexerLog({ db }, INPUT)
 
-    expect(warnSpy).toHaveBeenCalledTimes(1)
+    expect(loggerWarn).toHaveBeenCalledTimes(1)
   })
 })

package/src/lib/indexers/error-log.ts

@@ -1,5 +1,8 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { type Kysely, sql } from 'kysely'
+import { createLogger } from '../logger'
+
+const logger = createLogger('shared').child({ component: 'indexers' })
 
 export type IndexerErrorSource = 'query_index' | 'vector' | 'fulltext'
 
@@ -73,7 +76,7 @@ function pickDb(deps: RecordIndexerErrorDeps): Kysely<any> | null {
 export async function recordIndexerError(deps: RecordIndexerErrorDeps, input: RecordIndexerErrorInput): Promise<void> {
   const db = pickDb(deps)
   if (!db) {
-    console.error('[indexers] Unable to record indexer error (missing db connection)', {
+    logger.error('Unable to record indexer error (missing db connection)', {
       source: input.source,
       handler: input.handler,
     })
@@ -101,6 +104,6 @@ export async function recordIndexerError(deps: RecordIndexerErrorDeps, input: Re
       } as any)
       .execute()
   } catch (loggingError) {
-    console.error('[indexers] Failed to persist indexer error', loggingError)
+    logger.error('Failed to persist indexer error', { err: loggingError })
   }
 }

package/src/lib/indexers/status-log.ts

@@ -1,6 +1,9 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { type Kysely, sql } from 'kysely'
 import type { IndexerErrorSource } from './error-log'
+import { createLogger } from '../logger'
+
+const logger = createLogger('shared').child({ component: 'indexers' })
 
 export type IndexerLogLevel = 'info' | 'warn'
 
@@ -96,7 +99,7 @@ export async function recordIndexerLog(
 ): Promise<void> {
   const db = pickDb(deps)
   if (!db) {
-    console.warn('[indexers] Unable to record indexer log (missing db connection)', {
+    logger.warn('Unable to record indexer log (missing db connection)', {
       source: input.source,
       handler: input.handler,
     })
@@ -128,7 +131,7 @@ export async function recordIndexerLog(
     // A committed/rolled-back caller transaction is an expected, harmless
     // condition for best-effort logging — skip quietly instead of surfacing it.
     if (!isInactiveTransactionError(error)) {
-      console.error('[indexers] Failed to persist indexer log', error)
+      logger.error('Failed to persist indexer log', { err: error })
     }
     return
   }
@@ -137,7 +140,7 @@ export async function recordIndexerLog(
     await pruneExcessLogs(db, input.source)
   } catch (pruneError) {
     if (!isInactiveTransactionError(pruneError)) {
-      console.warn('[indexers] Failed to prune indexer logs', pruneError)
+      logger.warn('Failed to prune indexer logs', { err: pruneError })
     }
   }
 }