@justair/justair-library 4.8.11 → 4.8.13

package/src/config/logger.js

@@ -1,143 +1,143 @@
-import { createLogger, format, transports, config } from 'winston';
-const { combine, timestamp, json, errors, prettyPrint } = format;
-
-class CustomLogger {
-    constructor({ DATADOG_API_KEY, APPLICATION_NAME }) {
-        this.DATADOG_API_KEY = DATADOG_API_KEY;
-        this.APPLICATION_NAME = APPLICATION_NAME;
-        this.logger = this._createLogger();
-    }
-
-    _createLogger() {
-        const httpTransportOptions = {
-            host: 'http-intake.logs.us5.datadoghq.com',
-            path: `/api/v2/logs?dd-api-key=${this.DATADOG_API_KEY}&ddsource=nodejs&service=${this.APPLICATION_NAME}`,
-            ssl: true
-        };
-
-        return createLogger({
-            levels: config.syslog.levels,
-            exitOnError: false,
-            format: combine(
-                errors({ stack: true }),
-                timestamp({
-                    format: 'YYYY-MM-DD HH:mm:ss'
-                }),
-                json(),
-                prettyPrint()
-            ),
-            transports: [
-                new transports.Console(),
-                new transports.Http(httpTransportOptions),
-            ],
-            exceptionHandlers: [
-                new transports.Console(),
-                new transports.Http(httpTransportOptions)
-            ]
-        });
-    }
-
-    getLogger() {
-        return this.logger;
-    }
-
-    _getServiceMetadata() {
-        return {
-            service: this.APPLICATION_NAME,
-            env: process.env.NODE_ENV || 'production',
-            version: process.env.K_REVISION || process.env.npm_package_version || 'unknown',
-            k_service: process.env.K_SERVICE,
-            k_revision: process.env.K_REVISION,
-            k_configuration: process.env.K_CONFIGURATION,
-            pod: process.env.HOSTNAME || process.env.POD_NAME,
-            namespace: process.env.NAMESPACE,
-            node: process.env.NODE_NAME,
-            pid: process.pid,
-            nodeVersion: process.version,
-            platform: process.platform,
-            timestamp: new Date().toISOString()
-        };
-    }
-
-    logServiceStartup(metadata = {}) {
-        this.logger.info('Service startup', {
-            event: 'service.startup',
-            ...this._getServiceMetadata(),
-            ...metadata
-        });
-    }
-
-    logGracefulShutdown(signal, metadata = {}) {
-        this.logger.info('Graceful shutdown initiated', {
-            event: 'service.shutdown.graceful',
-            signal,
-            ...this._getServiceMetadata(),
-            ...metadata
-        });
-    }
-
-    logCrash(error, source, metadata = {}) {
-        this.logger.error('Service crash detected', {
-            event: 'service.crash',
-            source,
-            error: {
-                message: error.message,
-                stack: error.stack,
-                name: error.name
-            },
-            ...this._getServiceMetadata(),
-            ...metadata
-        });
-    }
-
-    logExit(code, metadata = {}) {
-        this.logger.info('Service exit', {
-            event: 'service.exit',
-            exitCode: code,
-            ...this._getServiceMetadata(),
-            ...metadata
-        });
-    }
-
-    setupLifecycleHooks() {
-        // Startup
-        this.logServiceStartup();
-
-        // Graceful shutdown signals
-        const shutdownHandler = (signal) => {
-            this.logGracefulShutdown(signal);
-            // Allow logs to flush before exiting
-            setTimeout(() => process.exit(0), 1000);
-        };
-
-        process.on('SIGTERM', () => shutdownHandler('SIGTERM'));
-        process.on('SIGINT', () => shutdownHandler('SIGINT'));
-
-        // Crash handlers
-        process.on('uncaughtException', (error) => {
-            this.logCrash(error, 'uncaughtException');
-            // Allow logs to flush before exiting
-            setTimeout(() => process.exit(1), 1000);
-        });
-
-        process.on('unhandledRejection', (reason, promise) => {
-            const error = reason instanceof Error ? reason : new Error(String(reason));
-            this.logCrash(error, 'unhandledRejection', { promise: String(promise) });
-        });
-
-        // Exit events
-        process.on('beforeExit', (code) => {
-            this.logger.info('Before exit', {
-                event: 'service.beforeExit',
-                exitCode: code,
-                ...this._getServiceMetadata()
-            });
-        });
-
-        process.on('exit', (code) => {
-            this.logExit(code);
-        });
-    }
-}
-
-export default CustomLogger;
+import { createLogger, format, transports, config } from 'winston';
+const { combine, timestamp, json, errors, prettyPrint } = format;
+
+class CustomLogger {
+  constructor({ DATADOG_API_KEY, APPLICATION_NAME }) {
+    this.DATADOG_API_KEY = DATADOG_API_KEY;
+    this.APPLICATION_NAME = APPLICATION_NAME;
+    this.logger = this._createLogger();
+  }
+
+  _createLogger() {
+    const httpTransportOptions = {
+      host: 'http-intake.logs.us5.datadoghq.com',
+      path: `/api/v2/logs?dd-api-key=${this.DATADOG_API_KEY}&ddsource=nodejs&service=${this.APPLICATION_NAME}`,
+      ssl: true
+    };
+
+  return createLogger({
+      levels: config.syslog.levels,
+      exitOnError: false,
+      format: combine(
+          errors({ stack: true }),
+          timestamp({
+              format: 'YYYY-MM-DD HH:mm:ss'
+          }),
+          json(),
+          prettyPrint()
+      ),
+      transports: [
+          new transports.Console(),
+          new transports.Http(httpTransportOptions),
+      ],
+      exceptionHandlers: [
+          new transports.Console(),
+          new transports.Http(httpTransportOptions)
+      ]
+  });
+  }
+
+  getLogger() {
+    return this.logger;
+  }
+
+  _getServiceMetadata() {
+    return {
+        service: this.APPLICATION_NAME,
+        env: process.env.NODE_ENV || 'production',
+        version: process.env.K_REVISION || process.env.npm_package_version || 'unknown',
+        k_service: process.env.K_SERVICE,
+        k_revision: process.env.K_REVISION,
+        k_configuration: process.env.K_CONFIGURATION,
+        pod: process.env.HOSTNAME || process.env.POD_NAME,
+        namespace: process.env.NAMESPACE,
+        node: process.env.NODE_NAME,
+        pid: process.pid,
+        nodeVersion: process.version,
+        platform: process.platform,
+        timestamp: new Date().toISOString()
+    };
+  }
+
+  logServiceStartup(metadata = {}) {
+    this.logger.info('Service startup', {
+        event: 'service.startup',
+        ...this._getServiceMetadata(),
+        ...metadata
+    });
+  }
+
+  logGracefulShutdown(signal, metadata = {}) {
+    this.logger.info('Graceful shutdown initiated', {
+      event: 'service.shutdown.graceful',
+      signal,
+      ...this._getServiceMetadata(),
+      ...metadata
+    });
+  }
+
+  logCrash(error, source, metadata = {}) {
+    this.logger.error('Service crash detected', {
+        event: 'service.crash',
+        source,
+        error: {
+            message: error.message,
+            stack: error.stack,
+            name: error.name
+        },
+        ...this._getServiceMetadata(),
+        ...metadata
+    });
+  }
+
+  logExit(code, metadata = {}) {
+    this.logger.info('Service exit', {
+        event: 'service.exit',
+        exitCode: code,
+        ...this._getServiceMetadata(),
+        ...metadata
+    });
+  }
+
+  setupLifecycleHooks() {
+    // Startup
+    this.logServiceStartup();
+
+    // Graceful shutdown signals
+    const shutdownHandler = (signal) => {
+        this.logGracefulShutdown(signal);
+        // Allow logs to flush before exiting
+        setTimeout(() => process.exit(0), 1000);
+    };
+
+    process.on('SIGTERM', () => shutdownHandler('SIGTERM'));
+    process.on('SIGINT', () => shutdownHandler('SIGINT'));
+
+    // Crash handlers
+    process.on('uncaughtException', (error) => {
+        this.logCrash(error, 'uncaughtException');
+        // Allow logs to flush before exiting
+        setTimeout(() => process.exit(1), 1000);
+    });
+
+    process.on('unhandledRejection', (reason, promise) => {
+        const error = reason instanceof Error ? reason : new Error(String(reason));
+        this.logCrash(error, 'unhandledRejection', { promise: String(promise) });
+    });
+
+    // Exit events
+    process.on('beforeExit', (code) => {
+        this.logger.info('Before exit', {
+            event: 'service.beforeExit',
+            exitCode: code,
+            ...this._getServiceMetadata()
+        });
+    });
+
+    process.on('exit', (code) => {
+        this.logExit(code);
+    });
+  }
+}
+
+export default CustomLogger;

package/src/index.js

@@ -1,116 +1,116 @@
-import { adminSchema, Admin } from "./models/admin.js";
-import {
-  configurationsSchema,
-  Configurations,
-} from "./models/configurations.js";
-import {
-  measurementsSchema,
-  Measurements,
-  Audit,
-  auditSchema,
-} from "./models/measurements.js";
-import {
-  monitorRequestsSchema,
-  MonitorRequests,
-} from "./models/monitorRequests.js";
-import {
-  monitorsSchema,
-  Monitors,
-  monitorAuditSchema,
-  MonitorAudit,
-} from "./models/monitors.js";
-import { organizationsSchema, Organizations } from "./models/organizations.js";
-import {
-  referenceMonitorInfoSchema,
-  ReferenceMonitorInfo,
-} from "./models/referenceMonitorInfo.js";
-import { lightMonitorSchema, LightMonitors } from "./models/lightmonitors.js";
-import {
-  monitorSuppliersSchema,
-  MonitorSuppliers,
-} from "./models/monitorSuppliers.js";
-import { contextsSchema, Contexts } from "./models/contexts.js";
-import { parametersSchema, Parameters } from "./models/parameters.js";
-import { usersSchema, Users } from "./models/users.js";
-import {
-  eventsSchema,
-  Events,
-  eventsAuditSchema,
-  EventsAudit,
-} from "./models/events.js";
-import { announcementSchema, Announcements } from "./models/announcements.js";
-import { jobsSchema, Jobs } from "./models/jobs.js";
-import { apiKeySchema, ApiKey } from "./models/apiKey.js";
-import { UsageMetrics, usageMetricsSchema } from "./models/usageMetrics.js";
-import {
-  AlertsAudit,
-  Alerts,
-  alertsSchema,
-  alertsAuditSchema,
-} from "./models/alerts.js";
-import { Features, featuresSchema } from "./models/features.js";
-import {
-  DataCompleteness,
-  dataCompletenessSchema,
-} from "./models/dataCompleteness.js";
-import { NetworkMetrics, networkMetricsSchema } from "./models/networkMetrics.js";
-import Database from "./config/db.js"; // Import the new Database class
-import CustomLogger from "./config/logger.js";
-
-export function createLoggerInstance({ DATADOG_API_KEY, APPLICATION_NAME }) {
-  return new CustomLogger({ DATADOG_API_KEY, APPLICATION_NAME });
-}
-
-export {
-  Database, // Export the Database class
-  adminSchema,
-  Admin,
-  configurationsSchema,
-  Configurations,
-  measurementsSchema,
-  Measurements,
-  monitorRequestsSchema,
-  MonitorRequests,
-  monitorsSchema,
-  Monitors,
-  organizationsSchema,
-  Organizations,
-  referenceMonitorInfoSchema,
-  ReferenceMonitorInfo,
-  usersSchema,
-  Users,
-  eventsSchema,
-  Events,
-  lightMonitorSchema,
-  LightMonitors,
-  monitorSuppliersSchema,
-  MonitorSuppliers,
-  contextsSchema,
-  Contexts,
-  parametersSchema,
-  Parameters,
-  announcementSchema,
-  Announcements,
-  jobsSchema,
-  Jobs,
-  apiKeySchema,
-  ApiKey,
-  UsageMetrics,
-  usageMetricsSchema,
-  Audit,
-  auditSchema,
-  EventsAudit,
-  eventsAuditSchema,
-  MonitorAudit,
-  monitorAuditSchema,
-  AlertsAudit,
-  Alerts,
-  alertsSchema,
-  alertsAuditSchema,
-  Features,
-  featuresSchema,
-  dataCompletenessSchema,
-  DataCompleteness,
-  networkMetricsSchema,
-  NetworkMetrics,
-};
+import { adminSchema, Admin } from "./models/admin.js";
+import {
+  configurationsSchema,
+  Configurations,
+} from "./models/configurations.js";
+import {
+  measurementsSchema,
+  Measurements,
+  Audit,
+  auditSchema,
+} from "./models/measurements.js";
+import {
+  monitorRequestsSchema,
+  MonitorRequests,
+} from "./models/monitorRequests.js";
+import {
+  monitorsSchema,
+  Monitors,
+  monitorAuditSchema,
+  MonitorAudit,
+} from "./models/monitors.js";
+import { organizationsSchema, Organizations } from "./models/organizations.js";
+import {
+  referenceMonitorInfoSchema,
+  ReferenceMonitorInfo,
+} from "./models/referenceMonitorInfo.js";
+import { lightMonitorSchema, LightMonitors } from "./models/lightmonitors.js";
+import {
+  monitorSuppliersSchema,
+  MonitorSuppliers,
+} from "./models/monitorSuppliers.js";
+import { contextsSchema, Contexts } from "./models/contexts.js";
+import { parametersSchema, Parameters } from "./models/parameters.js";
+import { usersSchema, Users } from "./models/users.js";
+import {
+  eventsSchema,
+  Events,
+  eventsAuditSchema,
+  EventsAudit,
+} from "./models/events.js";
+import { announcementSchema, Announcements } from "./models/announcements.js";
+import { jobsSchema, Jobs } from "./models/jobs.js";
+import { apiKeySchema, ApiKey } from "./models/apiKey.js";
+import { UsageMetrics, usageMetricsSchema } from "./models/usageMetrics.js";
+import {
+  AlertsAudit,
+  Alerts,
+  alertsSchema,
+  alertsAuditSchema,
+} from "./models/alerts.js";
+import { Features, featuresSchema } from "./models/features.js";
+import {
+  DataCompleteness,
+  dataCompletenessSchema,
+} from "./models/dataCompleteness.js";
+import { NetworkMetrics, networkMetricsSchema } from "./models/networkMetrics.js";
+import Database from "./config/db.js"; // Import the new Database class
+import CustomLogger from "./config/logger.js";
+
+export function createLoggerInstance({ DATADOG_API_KEY, APPLICATION_NAME }) {
+  return new CustomLogger({ DATADOG_API_KEY, APPLICATION_NAME });
+}
+
+export {
+  Database, // Export the Database class
+  adminSchema,
+  Admin,
+  configurationsSchema,
+  Configurations,
+  measurementsSchema,
+  Measurements,
+  monitorRequestsSchema,
+  MonitorRequests,
+  monitorsSchema,
+  Monitors,
+  organizationsSchema,
+  Organizations,
+  referenceMonitorInfoSchema,
+  ReferenceMonitorInfo,
+  usersSchema,
+  Users,
+  eventsSchema,
+  Events,
+  lightMonitorSchema,
+  LightMonitors,
+  monitorSuppliersSchema,
+  MonitorSuppliers,
+  contextsSchema,
+  Contexts,
+  parametersSchema,
+  Parameters,
+  announcementSchema,
+  Announcements,
+  jobsSchema,
+  Jobs,
+  apiKeySchema,
+  ApiKey,
+  UsageMetrics,
+  usageMetricsSchema,
+  Audit,
+  auditSchema,
+  EventsAudit,
+  eventsAuditSchema,
+  MonitorAudit,
+  monitorAuditSchema,
+  AlertsAudit,
+  Alerts,
+  alertsSchema,
+  alertsAuditSchema,
+  Features,
+  featuresSchema,
+  dataCompletenessSchema,
+  DataCompleteness,
+  networkMetricsSchema,
+  NetworkMetrics,
+};

package/src/models/admin.js

@@ -1,28 +1,28 @@
-import mongoose from 'mongoose';
-
-const adminSchema = mongoose.Schema({
-    name: String,
-    phone: String,
-    email: String,
-    password: String,
-    orgId: { type: mongoose.Types.ObjectId, ref: 'Organizations' },
-    permissionName: {type: String, enum: ['Super Admin', 'Admin', 'Member', 'Partner']},
-    permissions: [{type: String, enum: ['create', 'read', 'update', 'delete', 'communicate']}],
-    authorized: { type: Boolean, default: false },
-    isActive: { type: Boolean, default: false },
-},
-{
-    timestamps: true
-});
-
-// Organization-based admin queries
-adminSchema.index({ orgId: 1, isActive: 1 });
-// Email-based login with active status (case-insensitive handled in app)
-adminSchema.index({ email: 1, isActive: 1 });
-// Permission-based queries
-adminSchema.index({ orgId: 1, permissionName: 1 });
-
-
-const Admin = mongoose.model('Admin', adminSchema);
-
+import mongoose from 'mongoose';
+
+const adminSchema = mongoose.Schema({
+    name: String,
+    phone: String,
+    email: String,
+    password: String,
+    orgId: { type: mongoose.Types.ObjectId, ref: 'Organizations' },
+    permissionName: {type: String, enum: ['Super Admin', 'Admin', 'Member', 'Partner']},
+    permissions: [{type: String, enum: ['create', 'read', 'update', 'delete', 'communicate']}],
+    authorized: { type: Boolean, default: false },
+    isActive: { type: Boolean, default: false },
+},
+{
+    timestamps: true
+});
+
+// Organization-based admin queries
+adminSchema.index({ orgId: 1, isActive: 1 });
+// Email-based login with active status (case-insensitive handled in app)
+adminSchema.index({ email: 1, isActive: 1 });
+// Permission-based queries
+adminSchema.index({ orgId: 1, permissionName: 1 });
+
+
+const Admin = mongoose.model('Admin', adminSchema);
+
 export {adminSchema, Admin};