@bifold/remote-logs 2.11.3 → 2.11.4

package/build/logger.d.ts

@@ -1,4 +1,5 @@
 import { BifoldError, AbstractBifoldLogger } from '@bifold/core';
+import { LogLevel } from '@credo-ts/core';
 import { RemoteLoggerOptions } from './transports';
 export declare enum RemoteLoggerEventTypes {
     ENABLE_REMOTE_LOGGING = "RemoteLogging.Enable"
@@ -14,7 +15,6 @@ interface LogMethod {
     (message: string, data: Record<string, unknown>, error: Error): void;
 }
 export declare class RemoteLogger extends AbstractBifoldLogger {
-    private readonly baseLogger;
     private _remoteLoggingEnabled;
     private _sessionId;
     private _autoDisableRemoteLoggingIntervalInMinutes;
@@ -22,6 +22,7 @@ export declare class RemoteLogger extends AbstractBifoldLogger {
     private lokiLabels;
     private remoteLoggingAutoDisableTimer;
     private eventListener;
+    private _baseLogLevel;
     constructor(options: RemoteLoggerOptions);
     get sessionId(): number;
     set sessionId(value: number);
@@ -29,6 +30,8 @@ export declare class RemoteLogger extends AbstractBifoldLogger {
     get remoteLoggingEnabled(): boolean;
     set remoteLoggingEnabled(value: boolean);
     private configureLogger;
+    /** Update minimum log level and reconfigure underlying transport */
+    setLogLevel(level: LogLevel): void;
     startEventListeners(): void;
     stopEventListeners(): void;
     overrideCurrentAutoDisableExpiration(expirationInMinutes: number): void;
@@ -47,5 +50,7 @@ export declare class RemoteLogger extends AbstractBifoldLogger {
      * @returns Parsed data and error objects
      */
     private parseLogArguments;
+    /** Dispose of timers and listeners, disable remote logging */
+    dispose(): void;
 }
 export {};

package/build/logger.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RemoteLogger = exports.RemoteLoggerEventTypes = void 0;
 const core_1 = require("@bifold/core");
+const core_2 = require("@credo-ts/core");
 const react_native_1 = require("react-native");
 const react_native_logs_1 = require("react-native-logs");
 const transports_1 = require("./transports");
@@ -22,53 +23,70 @@ class RemoteLogger extends core_1.AbstractBifoldLogger {
         super();
         this._remoteLoggingEnabled = false;
         this._autoDisableRemoteLoggingIntervalInMinutes = 0;
+        this._baseLogLevel = core_2.LogLevel.debug;
         // Standardized logging methods with consistent overloads
         this.test = (message, dataOrError, error) => {
             var _a, _b;
+            if (!this.isEnabled(core_2.LogLevel.debug))
+                return;
             const { data, actualError } = this.parseLogArguments(dataOrError, error);
             (_b = (_a = this._log) === null || _a === void 0 ? void 0 : _a.test) === null || _b === void 0 ? void 0 : _b.call(_a, { message, data, error: actualError });
         };
         this.trace = (message, dataOrError, error) => {
             var _a, _b;
+            if (!this.isEnabled(core_2.LogLevel.debug))
+                return;
             const { data, actualError } = this.parseLogArguments(dataOrError, error);
             (_b = (_a = this._log) === null || _a === void 0 ? void 0 : _a.trace) === null || _b === void 0 ? void 0 : _b.call(_a, { message, data, error: actualError });
         };
         this.debug = (message, dataOrError, error) => {
             var _a, _b;
+            if (!this.isEnabled(core_2.LogLevel.debug))
+                return;
             const { data, actualError } = this.parseLogArguments(dataOrError, error);
             (_b = (_a = this._log) === null || _a === void 0 ? void 0 : _a.debug) === null || _b === void 0 ? void 0 : _b.call(_a, { message, data, error: actualError });
         };
         this.info = (message, dataOrError, error) => {
             var _a, _b;
+            if (!this.isEnabled(core_2.LogLevel.info))
+                return;
             const { data, actualError } = this.parseLogArguments(dataOrError, error);
             (_b = (_a = this._log) === null || _a === void 0 ? void 0 : _a.info) === null || _b === void 0 ? void 0 : _b.call(_a, { message, data, error: actualError });
         };
         this.warn = (message, dataOrError, error) => {
             var _a, _b;
+            if (!this.isEnabled(core_2.LogLevel.warn))
+                return;
             const { data, actualError } = this.parseLogArguments(dataOrError, error);
             (_b = (_a = this._log) === null || _a === void 0 ? void 0 : _a.warn) === null || _b === void 0 ? void 0 : _b.call(_a, { message, data, error: actualError });
         };
         this.error = (message, dataOrError, error) => {
             var _a, _b;
+            if (!this.isEnabled(core_2.LogLevel.error))
+                return;
             const { data, actualError } = this.parseLogArguments(dataOrError, error);
             (_b = (_a = this._log) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b.call(_a, { message, data, error: actualError });
         };
         this.fatal = (message, dataOrError, error) => {
             var _a, _b;
+            if (!this.isEnabled(core_2.LogLevel.fatal))
+                return;
             const { data, actualError } = this.parseLogArguments(dataOrError, error);
             (_b = (_a = this._log) === null || _a === void 0 ? void 0 : _a.fatal) === null || _b === void 0 ? void 0 : _b.call(_a, { message, data, error: actualError });
         };
-        this.baseLogger = new core_1.BifoldLogger();
         this.lokiUrl = (_a = options.lokiUrl) !== null && _a !== void 0 ? _a : undefined;
         this.lokiLabels = (_b = options.lokiLabels) !== null && _b !== void 0 ? _b : {};
         this._autoDisableRemoteLoggingIntervalInMinutes = (_c = options.autoDisableRemoteLoggingIntervalInMinutes) !== null && _c !== void 0 ? _c : 0;
+        if (options.logLevel !== undefined) {
+            this.logLevel = options.logLevel;
+        }
+        this._baseLogLevel = this.logLevel;
         this.configureLogger();
     }
     get sessionId() {
-        if (!this._sessionId) {
-            this._sessionId = Math.floor(SESSION_ID_RANGE.MIN + Math.random() * (SESSION_ID_RANGE.MAX - SESSION_ID_RANGE.MIN + 1));
-        }
-        return this._sessionId;
+        var _a;
+        // When remote logging is disabled this will be 0; enabled path guarantees initialization
+        return (_a = this._sessionId) !== null && _a !== void 0 ? _a : 0;
     }
     set sessionId(value) {
         this._sessionId = value;
@@ -82,16 +100,34 @@ class RemoteLogger extends core_1.AbstractBifoldLogger {
     }
     set remoteLoggingEnabled(value) {
         this._remoteLoggingEnabled = value;
-        if (value === false) {
+        if (value) {
+            // Generate a new session id on first enable
+            if (!this._sessionId) {
+                this._sessionId = Math.floor(SESSION_ID_RANGE.MIN + Math.random() * (SESSION_ID_RANGE.MAX - SESSION_ID_RANGE.MIN + 1));
+            }
+            // Override to most verbose when remote logging active
+            this.logLevel = core_2.LogLevel.debug;
+        }
+        else {
             this._sessionId = undefined;
+            if (this.remoteLoggingAutoDisableTimer) {
+                clearTimeout(this.remoteLoggingAutoDisableTimer);
+                this.remoteLoggingAutoDisableTimer = undefined;
+            }
+            // Restore base level after deactivation
+            this.logLevel = this._baseLogLevel;
         }
         this.configureLogger();
     }
     configureLogger() {
         const transportOptions = {};
         const transport = [transports_1.consoleTransport];
+        // We rely on per-method isEnabled() gating and keep transport severity at lowest (debug)
+        // so react-native-logs does not perform an additional filter layer.
+        const severity = 'debug';
         const config = Object.assign(Object.assign({}, this._config), { transport,
-            transportOptions });
+            transportOptions,
+            severity });
         if (this.remoteLoggingEnabled && this.lokiUrl) {
             transport.push(transports_1.lokiTransport);
             config['transportOptions'] = {
@@ -106,12 +142,24 @@ class RemoteLogger extends core_1.AbstractBifoldLogger {
         }
         this._log = react_native_logs_1.logger.createLogger(config);
     }
+    /** Update minimum log level and reconfigure underlying transport */
+    setLogLevel(level) {
+        this._baseLogLevel = level;
+        // Only apply immediately if remote logging isn't forcing
+        // debug
+        if (!this._remoteLoggingEnabled) {
+            this.logLevel = level;
+        }
+        this.configureLogger();
+    }
     startEventListeners() {
         this.eventListener = react_native_1.DeviceEventEmitter.addListener(RemoteLoggerEventTypes.ENABLE_REMOTE_LOGGING, (value) => {
             this.remoteLoggingEnabled = value;
         });
     }
     stopEventListeners() {
+        var _a;
+        (_a = this.eventListener) === null || _a === void 0 ? void 0 : _a.remove();
         this.eventListener = undefined;
     }
     overrideCurrentAutoDisableExpiration(expirationInMinutes) {
@@ -160,5 +208,14 @@ class RemoteLogger extends core_1.AbstractBifoldLogger {
         }
         return { data, actualError };
     }
+    /** Dispose of timers and listeners, disable remote logging */
+    dispose() {
+        this.stopEventListeners();
+        this.remoteLoggingEnabled = false;
+        if (this.remoteLoggingAutoDisableTimer) {
+            clearTimeout(this.remoteLoggingAutoDisableTimer);
+            this.remoteLoggingAutoDisableTimer = undefined;
+        }
+    }
 }
 exports.RemoteLogger = RemoteLogger;

package/build/transports/console.js

@@ -100,11 +100,46 @@ const consoleTransport = (props) => {
         const formattedData = messageDataFormatter(...Object.values(rest)).join(' ');
         logMessage = `${logMessage} ${formattedData}`;
     }
+    // Only prepend a tag for test logs.
+    const levelText = props.level.text.toLowerCase();
+    if (levelText === 'test') {
+        const levelTag = `[${props.level.text.toUpperCase()}]`;
+        logMessage = `${levelTag} ${logMessage}`;
+    }
     if ((_d = props.options) === null || _d === void 0 ? void 0 : _d.consoleFunc) {
         props.options.consoleFunc(logMessage);
     }
     else {
-        console.log(logMessage);
+        // Use appropriate console method based on log level
+        switch (props.level.text.toLowerCase()) {
+            case 'trace':
+                // console.trace prints a stack; we only want the message. Provide a wrapper.
+                // Some environments always include stack; if so this remains acceptable.
+                console.trace(logMessage);
+                break;
+            case 'debug':
+                // Prefer console.debug for debug level; fallback to console.log if unavailable
+                if (typeof console.debug === 'function') {
+                    console.debug(logMessage);
+                }
+                else {
+                    console.log(logMessage);
+                }
+                break;
+            case 'warn':
+                console.warn(logMessage);
+                break;
+            case 'error':
+            case 'fatal':
+                console.error(logMessage);
+                break;
+            case 'info':
+                console.info(logMessage);
+                break;
+            default:
+                console.log(logMessage);
+                break;
+        }
     }
 };
 exports.consoleTransport = consoleTransport;

package/build/transports/loki.d.ts

@@ -1,9 +1,11 @@
 import { transportFunctionType } from 'react-native-logs';
+import { LogLevel } from '@credo-ts/core';
 export interface RemoteLoggerOptions {
     lokiUrl?: string;
     lokiLabels?: Record<string, string>;
     autoDisableRemoteLoggingIntervalInMinutes?: number;
     job?: string;
+    logLevel?: LogLevel;
 }
 export type LokiTransportProps = {
     msg: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bifold/remote-logs",
-  "version": "2.11.3",
+  "version": "2.11.4",
   "description": "Remote logging for credo-ts agents",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -59,7 +59,7 @@
     "hoistingLimits": "workspaces"
   },
   "dependencies": {
-    "@bifold/core": "2.11.3",
+    "@bifold/core": "2.11.4",
     "@credo-ts/core": "0.5.17",
     "axios": "~1.4.0",
     "buffer": "~6.0.3",