fix: remote logs base class (#1640)

Signed-off-by: Jason C. Leach <[email protected]>

Author: jleach

.changeset/tiny-llamas-try.md

@@ -0,0 +1,6 @@
+---
+'@bifold/remote-logs': patch
+'@bifold/core': patch
+---
+
+fix issues with class relations

packages/core/src/components/misc/ErrorBoundary.tsx

@@ -8,15 +8,15 @@ import Icon from 'react-native-vector-icons/MaterialIcons'
 import { getBuildNumber, getVersion } from 'react-native-device-info'
 import { testIdWithKey } from '../../utils/testable'
 import { BifoldError } from '../../types/error'
-import { BifoldLogger } from '../../services/logger'
+import { AbstractBifoldLogger } from '../../services/AbstractBifoldLogger'
 
 const iconSize = 30
 
 interface ErrorBoundaryProps {
   children: ReactNode
   styles: ReturnType<typeof StyleSheet.create>
   t: (key: string) => string
-  logger: BifoldLogger
+  logger: AbstractBifoldLogger
 }
 
 interface ErrorBoundaryState {
@@ -41,7 +41,7 @@ class ErrorBoundary extends React.Component<ErrorBoundaryProps, ErrorBoundarySta
     logger.error('ErrorBoundary caught an error:', error)
   }
 
-  reportError = (error: Error, logger: BifoldLogger) => {
+  reportError = (error: Error, logger: AbstractBifoldLogger) => {
     if (error) {
       this.setState({ reported: true })
       logger.report(error as BifoldError)
@@ -178,7 +178,7 @@ const ErrorBoundaryInfoBox: React.FC<ErrorBoundaryInfoBoxProps> = ({
 
 interface ErrorBoundaryWrapperProps {
   children: ReactNode
-  logger: BifoldLogger
+  logger: AbstractBifoldLogger
 }
 
 const ErrorBoundaryWrapper: React.FC<ErrorBoundaryWrapperProps> = ({ children, logger }) => {

packages/core/src/services/AbstractBifoldLogger.ts

@@ -1,8 +1,9 @@
-import { BaseLogger } from '@credo-ts/core'
+import { BaseLogger, LogLevel } from '@credo-ts/core'
 
 import { BifoldError } from '../types/error'
 
 export abstract class AbstractBifoldLogger extends BaseLogger {
+  public logLevel: LogLevel = LogLevel.debug
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   protected _log: any
   protected _config = {
@@ -21,6 +22,10 @@ export abstract class AbstractBifoldLogger extends BaseLogger {
     printDate: false,
   }
 
+  public isEnabled(logLevel: LogLevel): boolean {
+    return logLevel >= this.logLevel
+  }
+
   public test(message: string, data?: Record<string, unknown>): void {
     this._log?.test({ message, data })
   }

packages/remote-logs/src/__tests__/logger.comprehensive.test.ts

@@ -23,15 +23,55 @@ jest.mock('react-native-logs', () => ({
   },
 }))
 
+jest.mock('@credo-ts/core', () => ({
+  LogLevel: {
+    test: 0,
+    trace: 1,
+    debug: 2,
+    info: 3,
+    warn: 4,
+    error: 5,
+    fatal: 6,
+    off: 7,
+  },
+}))
+
 jest.mock('@bifold/core', () => ({
   BifoldLogger: class BifoldLogger {},
+  AbstractBifoldLogger: class AbstractBifoldLogger {
+    public logLevel = 2 // LogLevel.debug
+    protected _log: any
+    protected _config = {
+      levels: {
+        test: 0,
+        trace: 0,
+        debug: 0,
+        info: 1,
+        warn: 2,
+        error: 3,
+        fatal: 4,
+      },
+      severity: 'debug',
+      async: true,
+      dateFormat: 'time',
+      printDate: false,
+    }
+
+    public isEnabled(logLevel: number): boolean {
+      return logLevel >= this.logLevel
+    }
+
+    public report(bifoldError: any): void {
+      // Mock implementation
+    }
+  },
   BifoldError: class BifoldError {
     title: string
     description: string
-    code: string
+    code: number
     message: string
 
-    constructor(title: string, description: string, code: string, message: string) {
+    constructor(title: string, description: string, message: string, code: number) {
       this.title = title
       this.description = description
       this.code = code
@@ -407,7 +447,7 @@ describe('RemoteLogger', () => {
     })
 
     it('should send incident report to Loki', () => {
-      const bifoldError = new BifoldError('Error Title', 'Error Description', 'ERR001', 'Error Message')
+      const bifoldError = new BifoldError('Error Title', 'Error Description', 'Error Message', 1001)
 
       remoteLogger.report(bifoldError)
 
@@ -423,7 +463,7 @@ describe('RemoteLogger', () => {
             data: {
               title: 'Error Title',
               description: 'Error Description',
-              code: 'ERR001',
+              code: 1001,
               message: 'Error Message',
             },
           },

packages/remote-logs/src/logger.ts

@@ -1,4 +1,5 @@
-import { BifoldError, BifoldLogger } from '@bifold/core'
+import { BifoldError, AbstractBifoldLogger, BifoldLogger } from '@bifold/core'
+import { LogLevel } from '@credo-ts/core'
 import { DeviceEventEmitter, EmitterSubscription } from 'react-native'
 import { logger } from 'react-native-logs'
 
@@ -59,7 +60,7 @@ interface InternalLoggerInstance {
   fatal?: (props: { message: string; data?: Record<string, unknown>; error?: Error }) => void
 }
 
-export class RemoteLogger {
+export class RemoteLogger extends AbstractBifoldLogger {
   private readonly baseLogger: BifoldLogger
   private _remoteLoggingEnabled = false
   private _sessionId: number | undefined
@@ -68,10 +69,9 @@ export class RemoteLogger {
   private lokiLabels: Record<string, string>
   private remoteLoggingAutoDisableTimer: ReturnType<typeof setTimeout> | undefined
   private eventListener: EmitterSubscription | undefined
-  protected _log: InternalLoggerInstance | null = null
-  protected _config = DEFAULT_LOG_CONFIG
 
   constructor(options: RemoteLoggerOptions) {
+    super()
     this.baseLogger = new BifoldLogger()
 
     this.lokiUrl = options.lokiUrl ?? undefined