@justair/justair-library 3.1.39 → 3.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@justair/justair-library",
-  "version": "3.1.39",
+  "version": "3.2.0",
   "description": "JustAir Internal Library",
   "main": "src/index.js", 
   "type": "module",

package/src/config/db.js

@@ -1,22 +1,43 @@
-import { set, connect } from 'mongoose';
+import mongoose from "mongoose";
 
 class Database {
-    constructor({ CONNECTION_URL, database }) {
-        this.CONNECTION_URL = CONNECTION_URL;
-        this.database = database;
-        this._connect();
+  static instance = null;
+  constructor({ CONNECTION_URL, database }) {
+    this.CONNECTION_URL = CONNECTION_URL;
+    this.database = database;
+  }
+
+  async connect() {
+    if (mongoose.connection.readyState === 1) {
+      // If there's an active connection, close it first
+      await mongoose.disconnect();
+    }
+
+    mongoose.set("strictQuery", false);
+    try {
+      await mongoose.connect(this.CONNECTION_URL, {
+        authSource: "admin",
+        ssl: true,
+        dbName: this.database,
+      });
+      console.log("Database connection successful");
+    } catch (err) {
+      console.error("Database connection error " + err);
+      throw err;
     }
+  }
 
-    _connect() {
-        set('strictQuery', false);
-        connect(this.CONNECTION_URL, { authSource: "admin", ssl: true, dbName: this.database })
-            .then(() => {
-                console.log('Database connection successful');
-            })
-            .catch(err => {
-                console.error('Database connection error ' + err);
-            });
+  static async getInstance(config) {
+    if (
+      !Database.instance ||
+      Database.instance.CONNECTION_URL !== config.CONNECTION_URL ||
+      Database.instance.database !== config.database
+    ) {
+      Database.instance = new Database(config);
+      await Database.instance.connect();
     }
+    return Database.instance;
+  }
 }
 
-export default Database;
+export default Database;

package/src/index.js

@@ -29,6 +29,8 @@ import {
 } from "./models/qanotifications.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 dbConfig from "./config/db.js";
 import CustomLogger from "./config/logger.js";
 
@@ -73,4 +75,8 @@ export {
   Announcements,
   jobsSchema,
   Jobs,
+  apiKeySchema,
+  ApiKey,
+  UsageMetrics,
+  usageMetricsSchema,
 };

package/src/models/apiKey.js

@@ -0,0 +1,23 @@
+import mongoose from "mongoose";
+const apiKeySchema = mongoose.Schema(
+  {
+    adminId: { type: mongoose.Schema.Types.ObjectId, ref: "Admin" },
+    clientKey: { type: String, unique: true },
+    permissions: {
+      type: Object,
+      of: [{ type: mongoose.Schema.Types.ObjectId }],
+      default: new Map(),
+    },
+    accessToken: String,
+    refreshToken: String,
+    lastUsedAt: Date,
+    isActive: Boolean,
+  },
+  {
+    timestamps: true,
+  }
+);
+
+const ApiKey = mongoose.model("ApiKey", apiKeySchema);
+
+export { apiKeySchema, ApiKey };

package/src/models/usageMetrics.js

@@ -0,0 +1,28 @@
+import mongoose, { Schema } from "mongoose";
+
+const requestSchema = new Schema(
+  {
+    endpoint: String,
+    count: Number,
+  },
+  { timestamps: true }
+);
+
+const usageMetricsSchema = mongoose.Schema(
+  {
+    apiKeyId: { type: mongoose.Schema.Types.ObjectId, ref: "ApiKey" },
+    endpoint: String,
+    response: {
+      sizeInMB: Number,
+      sizeInKB: Number, 
+    }
+    
+  },
+  { timestamps: true }
+);
+
+const UsageMetrics = mongoose.model("UsageMetrics", usageMetricsSchema);
+
+export { usageMetricsSchema, UsageMetrics };
+
+

package/dist/config/db.d.ts

@@ -1,11 +0,0 @@
-export default Database;
-declare class Database {
-    constructor({ CONNECTION_URL, database }: {
-        CONNECTION_URL: any;
-        database: any;
-    });
-    CONNECTION_URL: any;
-    database: any;
-    _connect(): void;
-}
-//# sourceMappingURL=db.d.ts.map

package/dist/config/db.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/config/db.js"],"names":[],"mappings":";AAEA;IACI;;;OAIC;IAHG,oBAAoC;IACpC,cAAwB;IAI5B,iBASC;CACJ"}

package/dist/config/logger.d.ts

@@ -1,13 +0,0 @@
-export default CustomLogger;
-declare class CustomLogger {
-    constructor({ DATADOG_API_KEY, APPLICATION_NAME }: {
-        DATADOG_API_KEY: any;
-        APPLICATION_NAME: any;
-    });
-    DATADOG_API_KEY: any;
-    APPLICATION_NAME: any;
-    logger: import("winston").Logger;
-    _createLogger(): import("winston").Logger;
-    getLogger(): import("winston").Logger;
-}
-//# sourceMappingURL=logger.d.ts.map

package/dist/config/logger.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/config/logger.js"],"names":[],"mappings":";AAGA;IACI;;;OAIC;IAHG,qBAAsC;IACtC,sBAAwC;IACxC,iCAAkC;IAGtC,0CA2BC;IAED,sCAEC;CACJ"}

package/dist/index.d.ts

@@ -1,44 +0,0 @@
-export function createDatabaseInstance({ CONNECTION_URL, database }: {
-    CONNECTION_URL: any;
-    database: any;
-}): dbConfig;
-export function createLoggerInstance({ DATADOG_API_KEY, APPLICATION_NAME }: {
-    DATADOG_API_KEY: any;
-    APPLICATION_NAME: any;
-}): CustomLogger;
-import dbConfig from "./config/db.js";
-import CustomLogger from "./config/logger.js";
-import { adminSchema } from "./models/admin.js";
-import { Admin } from "./models/admin.js";
-import { configurationsSchema } from "./models/configurations.js";
-import { Configurations } from "./models/configurations.js";
-import { measurementsSchema } from "./models/measurements.js";
-import { Measurements } from "./models/measurements.js";
-import { monitorRequestsSchema } from "./models/monitorRequests.js";
-import { MonitorRequests } from "./models/monitorRequests.js";
-import { monitorsSchema } from "./models/monitors.js";
-import { Monitors } from "./models/monitors.js";
-import { organizationsSchema } from "./models/organizations.js";
-import { Organizations } from "./models/organizations.js";
-import { referenceMonitorInfoSchema } from "./models/referenceMonitorInfo.js";
-import { ReferenceMonitorInfo } from "./models/referenceMonitorInfo.js";
-import { usersSchema } from "./models/users.js";
-import { Users } from "./models/users.js";
-import { eventsSchema } from "./models/events.js";
-import { Events } from "./models/events.js";
-import { lightMonitorSchema } from "./models/lightmonitors.js";
-import { LightMonitors } from "./models/lightmonitors.js";
-import { monitorSuppliersSchema } from "./models/monitorSuppliers.js";
-import { MonitorSuppliers } from "./models/monitorSuppliers.js";
-import { contextsSchema } from "./models/contexts.js";
-import { Contexts } from "./models/contexts.js";
-import { parametersSchema } from "./models/parameters.js";
-import { Parameters } from "./models/parameters.js";
-import { qaNotificationsSchema } from "./models/qanotifications.js";
-import { QANotifications } from "./models/qanotifications.js";
-import { announcementSchema } from "./models/announcements.js";
-import { Announcements } from "./models/announcements.js";
-import { jobsSchema } from "./models/jobs.js";
-import { Jobs } from "./models/jobs.js";
-export { 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, qaNotificationsSchema, QANotifications, announcementSchema, Announcements, jobsSchema, Jobs };
-//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"AAkCA;;;aAEC;AAED;;;iBAEC;qBAToB,gBAAgB;yBACZ,oBAAoB;4BAhCV,mBAAmB;sBAAnB,mBAAmB;qCAI/C,4BAA4B;+BAA5B,4BAA4B;mCACc,0BAA0B;6BAA1B,0BAA0B;sCAIpE,6BAA6B;gCAA7B,6BAA6B;+BACK,sBAAsB;yBAAtB,sBAAsB;oCACZ,2BAA2B;8BAA3B,2BAA2B;2CAIvE,kCAAkC;qCAAlC,kCAAkC;4BAQN,mBAAmB;sBAAnB,mBAAmB;6BACjB,oBAAoB;uBAApB,oBAAoB;mCARP,2BAA2B;8BAA3B,2BAA2B;uCAItE,8BAA8B;iCAA9B,8BAA8B;+BACI,sBAAsB;yBAAtB,sBAAsB;iCAClB,wBAAwB;2BAAxB,wBAAwB;sCAM9D,6BAA6B;gCAA7B,6BAA6B;mCACc,2BAA2B;8BAA3B,2BAA2B;2BAC5C,kBAAkB;qBAAlB,kBAAkB"}

package/dist/models/admin.d.ts

@@ -1,3 +0,0 @@
-export const adminSchema: any;
-export const Admin: any;
-//# sourceMappingURL=admin.d.ts.map

package/dist/models/admin.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"admin.d.ts","sourceRoot":"","sources":["../../src/models/admin.js"],"names":[],"mappings":"AAEA,8BAaG;AAKH,wBAAmD"}

package/dist/models/announcements.d.ts

@@ -1,3 +0,0 @@
-export const announcementSchema: any;
-export const Announcements: any;
-//# sourceMappingURL=announcements.d.ts.map

package/dist/models/announcements.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"announcements.d.ts","sourceRoot":"","sources":["../../src/models/announcements.js"],"names":[],"mappings":"AAcA,qCAWE;AAEF,gCAA0E"}

package/dist/models/configurations.d.ts

@@ -1,3 +0,0 @@
-export const configurationsSchema: any;
-export const Configurations: any;
-//# sourceMappingURL=configurations.d.ts.map

package/dist/models/configurations.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"configurations.d.ts","sourceRoot":"","sources":["../../src/models/configurations.js"],"names":[],"mappings":"AAEA,uCAQG;AAIH,iCAA8E"}

package/dist/models/contexts.d.ts

@@ -1,3 +0,0 @@
-export const contextsSchema: any;
-export const Contexts: any;
-//# sourceMappingURL=contexts.d.ts.map

package/dist/models/contexts.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"contexts.d.ts","sourceRoot":"","sources":["../../src/models/contexts.js"],"names":[],"mappings":"AAEA,iCAOE;AAEF,2BAA4D"}

package/dist/models/events.d.ts

@@ -1,3 +0,0 @@
-export const eventsSchema: any;
-export const Events: any;
-//# sourceMappingURL=events.d.ts.map

package/dist/models/events.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../src/models/events.js"],"names":[],"mappings":"AAEA,+BAiBE;AAKF,yBAAsD"}

package/dist/models/jobs.d.ts

@@ -1,3 +0,0 @@
-export const jobsSchema: any;
-export const Jobs: any;
-//# sourceMappingURL=jobs.d.ts.map

package/dist/models/jobs.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"jobs.d.ts","sourceRoot":"","sources":["../../src/models/jobs.js"],"names":[],"mappings":"AAEA,6BA4BE;AAEF,uBAAgD"}

package/dist/models/lightmonitors.d.ts

@@ -1,3 +0,0 @@
-export const lightMonitorSchema: any;
-export const LightMonitors: any;
-//# sourceMappingURL=lightmonitors.d.ts.map

package/dist/models/lightmonitors.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"lightmonitors.d.ts","sourceRoot":"","sources":["../../src/models/lightmonitors.js"],"names":[],"mappings":"AAEA,qCAmBE;AAIF,gCAAyE"}

package/dist/models/measurements.d.ts

@@ -1,3 +0,0 @@
-export const measurementsSchema: any;
-export const Measurements: any;
-//# sourceMappingURL=measurements.d.ts.map

package/dist/models/measurements.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"measurements.d.ts","sourceRoot":"","sources":["../../src/models/measurements.js"],"names":[],"mappings":"AAEA,qCAQG;AAKH,+BAAwE"}

package/dist/models/monitorRequests.d.ts

@@ -1,3 +0,0 @@
-export const monitorRequestsSchema: any;
-export const MonitorRequests: any;
-//# sourceMappingURL=monitorRequests.d.ts.map

package/dist/models/monitorRequests.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"monitorRequests.d.ts","sourceRoot":"","sources":["../../src/models/monitorRequests.js"],"names":[],"mappings":"AAEA,wCASG;AAEH,kCAAiF"}

package/dist/models/monitorSuppliers.d.ts

@@ -1,3 +0,0 @@
-export const monitorSuppliersSchema: any;
-export const MonitorSuppliers: any;
-//# sourceMappingURL=monitorSuppliers.d.ts.map

package/dist/models/monitorSuppliers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"monitorSuppliers.d.ts","sourceRoot":"","sources":["../../src/models/monitorSuppliers.js"],"names":[],"mappings":"AAEA,yCAKG;AAEH,mCAAoF"}

package/dist/models/monitors.d.ts

@@ -1,3 +0,0 @@
-export const monitorsSchema: any;
-export const Monitors: any;
-//# sourceMappingURL=monitors.d.ts.map

package/dist/models/monitors.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"monitors.d.ts","sourceRoot":"","sources":["../../src/models/monitors.js"],"names":[],"mappings":"AAEA,iCA0FE;AAOF,2BAA4D"}

package/dist/models/organizations.d.ts

@@ -1,3 +0,0 @@
-export const organizationsSchema: any;
-export const Organizations: any;
-//# sourceMappingURL=organizations.d.ts.map

package/dist/models/organizations.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"organizations.d.ts","sourceRoot":"","sources":["../../src/models/organizations.js"],"names":[],"mappings":"AAEA,sCAiBO;AAEP,gCAA2E"}

package/dist/models/parameters.d.ts

@@ -1,3 +0,0 @@
-export const parametersSchema: any;
-export const Parameters: any;
-//# sourceMappingURL=parameters.d.ts.map

package/dist/models/parameters.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"parameters.d.ts","sourceRoot":"","sources":["../../src/models/parameters.js"],"names":[],"mappings":"AAEA,mCAKG;AAEH,6BAAkE"}

package/dist/models/qanotifications.d.ts

@@ -1,3 +0,0 @@
-export const qaNotificationsSchema: any;
-export const QANotifications: any;
-//# sourceMappingURL=qanotifications.d.ts.map

package/dist/models/qanotifications.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"qanotifications.d.ts","sourceRoot":"","sources":["../../src/models/qanotifications.js"],"names":[],"mappings":"AAEA,wCAmBE;AAEF,kCAGE"}

package/dist/models/referenceMonitorInfo.d.ts

@@ -1,3 +0,0 @@
-export const referenceMonitorInfoSchema: any;
-export const ReferenceMonitorInfo: any;
-//# sourceMappingURL=referenceMonitorInfo.d.ts.map

package/dist/models/referenceMonitorInfo.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"referenceMonitorInfo.d.ts","sourceRoot":"","sources":["../../src/models/referenceMonitorInfo.js"],"names":[],"mappings":"AAEA,6CAYG;AAEH,uCAAgG"}

package/dist/models/tests/admin.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=admin.test.d.ts.map

package/dist/models/tests/admin.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"admin.test.d.ts","sourceRoot":"","sources":["../../../src/models/tests/admin.test.js"],"names":[],"mappings":""}

package/dist/models/tests/configurations.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=configurations.test.d.ts.map

package/dist/models/tests/configurations.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"configurations.test.d.ts","sourceRoot":"","sources":["../../../src/models/tests/configurations.test.js"],"names":[],"mappings":""}

package/dist/models/tests/measurements.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=measurements.test.d.ts.map

package/dist/models/tests/measurements.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"measurements.test.d.ts","sourceRoot":"","sources":["../../../src/models/tests/measurements.test.js"],"names":[],"mappings":""}

package/dist/models/tests/monitorRequests.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=monitorRequests.test.d.ts.map

package/dist/models/tests/monitorRequests.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"monitorRequests.test.d.ts","sourceRoot":"","sources":["../../../src/models/tests/monitorRequests.test.js"],"names":[],"mappings":""}

package/dist/models/tests/monitors.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=monitors.test.d.ts.map

package/dist/models/tests/monitors.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"monitors.test.d.ts","sourceRoot":"","sources":["../../../src/models/tests/monitors.test.js"],"names":[],"mappings":""}

package/dist/models/tests/organizations.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=organizations.test.d.ts.map

package/dist/models/tests/organizations.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"organizations.test.d.ts","sourceRoot":"","sources":["../../../src/models/tests/organizations.test.js"],"names":[],"mappings":""}

package/dist/models/tests/users.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=users.test.d.ts.map

package/dist/models/tests/users.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"users.test.d.ts","sourceRoot":"","sources":["../../../src/models/tests/users.test.js"],"names":[],"mappings":""}

package/dist/models/users.d.ts

@@ -1,3 +0,0 @@
-export const usersSchema: any;
-export const Users: any;
-//# sourceMappingURL=users.d.ts.map

package/dist/models/users.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/models/users.js"],"names":[],"mappings":"AAEA,8BAsBG;AAIH,wBAAmD"}