@etainabl/nodejs-sdk 1.2.26 → 1.2.28

package/dist/cjs/api.d.ts

@@ -1,4 +1,5 @@
 import type { AxiosRequestConfig, AxiosInstance, CreateAxiosDefaults } from 'axios';
+import type { Account, Asset, Company, Invoice, Log, Reading, Report } from './types/index.js';
 export interface ETNPagedResponse<T = any> {
     data: T[];
     total: number;

package/dist/cjs/db.d.ts

@@ -1,5 +1,5 @@
 import { Db } from 'mongodb';
-declare function connectToDatabase(): Promise<Db>;
+declare function connectToDatabase(retryAttempt?: number): Promise<Db>;
 declare const _default: {
     connectToDatabase: typeof connectToDatabase;
 };

package/dist/cjs/db.js

@@ -16,7 +16,7 @@ const mongodb_1 = require("mongodb");
 const logger_js_1 = __importDefault(require("./logger.js"));
 const log = (0, logger_js_1.default)('dbHelpers');
 let cachedDb;
-function connectToDatabase() {
+function connectToDatabase(retryAttempt = 1) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!process.env.ETAINABL_DB_URL)
             throw new Error("ETAINABL_DB_URL is not set");
@@ -29,27 +29,39 @@ function connectToDatabase() {
             return Promise.resolve(cachedDb);
         }
         const uri = `mongodb+srv://${process.env.ETAINABL_DB_URL}`;
-        if (process.env.DB_BASIC_AUTH === 'true') {
-            log.debug('Connecting to MongoDB server... (Auth: Basic)');
-            const client = new mongodb_1.MongoClient(uri);
+        try {
+            if (process.env.DB_BASIC_AUTH === 'true') {
+                log.debug('Connecting to MongoDB server... (Auth: Basic)');
+                const client = new mongodb_1.MongoClient(uri);
+                yield client.connect();
+                log.debug('Connected successfully to MongoDB server! (Auth: Basic)');
+                cachedDb = client.db('etainabl');
+                return cachedDb;
+            }
+            log.debug('Connecting to MongoDB server... (Auth: AWS)');
+            const client = new mongodb_1.MongoClient(uri, {
+                auth: {
+                    username: process.env.AWS_ACCESS_KEY_ID,
+                    password: process.env.AWS_SECRET_ACCESS_KEY
+                },
+                authSource: '$external',
+                authMechanism: 'MONGODB-AWS'
+            });
             yield client.connect();
-            log.debug('Connected successfully to MongoDB server! (Auth: Basic)');
+            log.debug('Connected successfully to MongoDB server! (Auth: AWS)');
             cachedDb = client.db('etainabl');
             return cachedDb;
         }
-        log.debug('Connecting to MongoDB server... (Auth: AWS)');
-        const client = new mongodb_1.MongoClient(uri, {
-            auth: {
-                username: process.env.AWS_ACCESS_KEY_ID,
-                password: process.env.AWS_SECRET_ACCESS_KEY
-            },
-            authSource: '$external',
-            authMechanism: 'MONGODB-AWS'
-        });
-        yield client.connect();
-        log.debug('Connected successfully to MongoDB server! (Auth: AWS)');
-        cachedDb = client.db('etainabl');
-        return cachedDb;
+        catch (e) {
+            // Retry
+            if (retryAttempt > 5) {
+                console.log(`Error connecting to MongoDB server after 5 attempts...`);
+                throw e;
+            }
+            console.log(`MongoDB Connection error: ${e.message}`);
+            console.log(`Error connecting to MongoDB server... Retrying in 3 seconds... (Attempt ${retryAttempt})`);
+            return connectToDatabase(retryAttempt + 1);
+        }
     });
 }
 exports.default = {

package/dist/cjs/index.d.ts

@@ -6,6 +6,6 @@ import * as units from './units.js';
 import * as consumption from './consumption.js';
 import * as monitoring from './monitoring.js';
 import * as reporting from './reporting.js';
-import type { Account, Asset, Automation, Company, DataIngest, Invoice, Log, Reading, Supplier } from '../types/index.d.js';
+import type { Account, Asset, Automation, Company, DataIngest, Invoice, Log, Reading, Supplier } from './types/index.d.js';
 export { api, logger, consumption, monitoring, db, slack, units, reporting };
 export type { Account, Asset, Automation, Company, DataIngest, Invoice, Log, Reading, Supplier };

package/dist/cjs/units.d.ts

@@ -5,9 +5,9 @@ interface Item {
     value: number;
     [key: string]: any;
 }
-export declare type AccountType = 'electricity' | 'gas' | 'water' | 'waste' | 'solar' | 'heating' | 'flow' | 'cooling' | 'temperature' | 'other';
-export declare type ETNUnit = 'kwh' | 'kg' | 'm3' | 'lbs' | 'tonnes' | 'wh' | 'mwh' | 'ft3' | 'hcf' | 'm3/h' | 'qty' | 'l' | 'C' | 'mcuf' | 'hcuf' | 'tcuf' | 'ocuf' | 'hm3' | 'tm3' | 'nm3';
-export declare type BaseUnit = 'kwh' | 'm3' | 'C' | 'kg' | 'm3/h';
+export type AccountType = 'electricity' | 'gas' | 'water' | 'waste' | 'solar' | 'heating' | 'flow' | 'cooling' | 'temperature' | 'other';
+export type ETNUnit = 'kwh' | 'kg' | 'm3' | 'lbs' | 'tonnes' | 'wh' | 'mwh' | 'ft3' | 'hcf' | 'm3/h' | 'qty' | 'l' | 'C' | 'mcuf' | 'hcuf' | 'tcuf' | 'ocuf' | 'hm3' | 'tm3' | 'nm3';
+export type BaseUnit = 'kwh' | 'm3' | 'C' | 'kg' | 'm3/h';
 export declare const accountTypeMap: {
     [key: string]: BaseUnit;
 };

package/dist/mjs/api.d.ts

@@ -1,4 +1,5 @@
 import type { AxiosRequestConfig, AxiosInstance, CreateAxiosDefaults } from 'axios';
+import type { Account, Asset, Company, Invoice, Log, Reading, Report } from './types/index.js';
 export interface ETNPagedResponse<T = any> {
     data: T[];
     total: number;

package/dist/mjs/db.d.ts

@@ -1,5 +1,5 @@
 import { Db } from 'mongodb';
-declare function connectToDatabase(): Promise<Db>;
+declare function connectToDatabase(retryAttempt?: number): Promise<Db>;
 declare const _default: {
     connectToDatabase: typeof connectToDatabase;
 };

package/dist/mjs/db.js

@@ -2,7 +2,7 @@ import { MongoClient } from 'mongodb';
 import logger from './logger.js';
 const log = logger('dbHelpers');
 let cachedDb;
-async function connectToDatabase() {
+async function connectToDatabase(retryAttempt = 1) {
     if (!process.env.ETAINABL_DB_URL)
         throw new Error("ETAINABL_DB_URL is not set");
     if (!process.env.AWS_ACCESS_KEY_ID)
@@ -14,27 +14,39 @@ async function connectToDatabase() {
         return Promise.resolve(cachedDb);
     }
     const uri = `mongodb+srv://${process.env.ETAINABL_DB_URL}`;
-    if (process.env.DB_BASIC_AUTH === 'true') {
-        log.debug('Connecting to MongoDB server... (Auth: Basic)');
-        const client = new MongoClient(uri);
+    try {
+        if (process.env.DB_BASIC_AUTH === 'true') {
+            log.debug('Connecting to MongoDB server... (Auth: Basic)');
+            const client = new MongoClient(uri);
+            await client.connect();
+            log.debug('Connected successfully to MongoDB server! (Auth: Basic)');
+            cachedDb = client.db('etainabl');
+            return cachedDb;
+        }
+        log.debug('Connecting to MongoDB server... (Auth: AWS)');
+        const client = new MongoClient(uri, {
+            auth: {
+                username: process.env.AWS_ACCESS_KEY_ID,
+                password: process.env.AWS_SECRET_ACCESS_KEY
+            },
+            authSource: '$external',
+            authMechanism: 'MONGODB-AWS'
+        });
         await client.connect();
-        log.debug('Connected successfully to MongoDB server! (Auth: Basic)');
+        log.debug('Connected successfully to MongoDB server! (Auth: AWS)');
         cachedDb = client.db('etainabl');
         return cachedDb;
     }
-    log.debug('Connecting to MongoDB server... (Auth: AWS)');
-    const client = new MongoClient(uri, {
-        auth: {
-            username: process.env.AWS_ACCESS_KEY_ID,
-            password: process.env.AWS_SECRET_ACCESS_KEY
-        },
-        authSource: '$external',
-        authMechanism: 'MONGODB-AWS'
-    });
-    await client.connect();
-    log.debug('Connected successfully to MongoDB server! (Auth: AWS)');
-    cachedDb = client.db('etainabl');
-    return cachedDb;
+    catch (e) {
+        // Retry
+        if (retryAttempt > 5) {
+            console.log(`Error connecting to MongoDB server after 5 attempts...`);
+            throw e;
+        }
+        console.log(`MongoDB Connection error: ${e.message}`);
+        console.log(`Error connecting to MongoDB server... Retrying in 3 seconds... (Attempt ${retryAttempt})`);
+        return connectToDatabase(retryAttempt + 1);
+    }
 }
 export default {
     connectToDatabase

package/dist/mjs/index.d.ts

@@ -6,6 +6,6 @@ import * as units from './units.js';
 import * as consumption from './consumption.js';
 import * as monitoring from './monitoring.js';
 import * as reporting from './reporting.js';
-import type { Account, Asset, Automation, Company, DataIngest, Invoice, Log, Reading, Supplier } from '../types/index.d.js';
+import type { Account, Asset, Automation, Company, DataIngest, Invoice, Log, Reading, Supplier } from './types/index.d.js';
 export { api, logger, consumption, monitoring, db, slack, units, reporting };
 export type { Account, Asset, Automation, Company, DataIngest, Invoice, Log, Reading, Supplier };

package/dist/mjs/units.d.ts

@@ -5,9 +5,9 @@ interface Item {
     value: number;
     [key: string]: any;
 }
-export declare type AccountType = 'electricity' | 'gas' | 'water' | 'waste' | 'solar' | 'heating' | 'flow' | 'cooling' | 'temperature' | 'other';
-export declare type ETNUnit = 'kwh' | 'kg' | 'm3' | 'lbs' | 'tonnes' | 'wh' | 'mwh' | 'ft3' | 'hcf' | 'm3/h' | 'qty' | 'l' | 'C' | 'mcuf' | 'hcuf' | 'tcuf' | 'ocuf' | 'hm3' | 'tm3' | 'nm3';
-export declare type BaseUnit = 'kwh' | 'm3' | 'C' | 'kg' | 'm3/h';
+export type AccountType = 'electricity' | 'gas' | 'water' | 'waste' | 'solar' | 'heating' | 'flow' | 'cooling' | 'temperature' | 'other';
+export type ETNUnit = 'kwh' | 'kg' | 'm3' | 'lbs' | 'tonnes' | 'wh' | 'mwh' | 'ft3' | 'hcf' | 'm3/h' | 'qty' | 'l' | 'C' | 'mcuf' | 'hcuf' | 'tcuf' | 'ocuf' | 'hm3' | 'tm3' | 'nm3';
+export type BaseUnit = 'kwh' | 'm3' | 'C' | 'kg' | 'm3/h';
 export declare const accountTypeMap: {
     [key: string]: BaseUnit;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etainabl/nodejs-sdk",
-  "version": "1.2.26",
+  "version": "1.2.28",
   "main": "dist/cjs/index.js",
   "module": "dist/mjs/index.js",
   "author": "Jonathan Lambert <jonathan@etainabl.com>",

package/src/api.ts

@@ -4,7 +4,7 @@ import https from 'https';
 
 import logger from './logger.js';
 
-import type { Account, Asset, Automation, Company, DataIngest, Invoice, Log, Reading, Report, Supplier } from '../types/index.js'
+import type { Account, Asset, Automation, Company, DataIngest, Invoice, Log, Reading, Report, Supplier } from './types/index.js'
 
 const log = logger('etainablApi');
 

package/src/db.ts

@@ -5,7 +5,7 @@ const log = logger('dbHelpers');
 
 let cachedDb: Db;
 
-async function connectToDatabase() {
+async function connectToDatabase(retryAttempt: number = 1): Promise<Db> {
   if (!process.env.ETAINABL_DB_URL) throw new Error("ETAINABL_DB_URL is not set");
   if (!process.env.AWS_ACCESS_KEY_ID) throw new Error("AWS_ACCESS_KEY_ID is not set");
   if (!process.env.AWS_SECRET_ACCESS_KEY) throw new Error("AWS_SECRET_ACCESS_KEY is not set");
@@ -17,37 +17,51 @@ async function connectToDatabase() {
   
   const uri = `mongodb+srv://${process.env.ETAINABL_DB_URL}`;
   
-  if (process.env.DB_BASIC_AUTH === 'true') {
-    log.debug('Connecting to MongoDB server... (Auth: Basic)');
+  try {
+    if (process.env.DB_BASIC_AUTH === 'true') {
+      log.debug('Connecting to MongoDB server... (Auth: Basic)');
 
-    const client = new MongoClient(uri);
-    await client.connect();
+      const client = new MongoClient(uri);
+      await client.connect();
 
-    log.debug('Connected successfully to MongoDB server! (Auth: Basic)');
+      log.debug('Connected successfully to MongoDB server! (Auth: Basic)');
 
-    cachedDb = client.db('etainabl');
+      cachedDb = client.db('etainabl');
 
-    return cachedDb;
-  }
+      return cachedDb;
+    }
 
-  log.debug('Connecting to MongoDB server... (Auth: AWS)');
+    log.debug('Connecting to MongoDB server... (Auth: AWS)');
 
-  const client = new MongoClient(uri, {
-    auth: {
-      username: process.env.AWS_ACCESS_KEY_ID,
-      password: process.env.AWS_SECRET_ACCESS_KEY
-    },
-    authSource: '$external',
-    authMechanism: 'MONGODB-AWS'
-  });
+    const client = new MongoClient(uri, {
+      auth: {
+        username: process.env.AWS_ACCESS_KEY_ID,
+        password: process.env.AWS_SECRET_ACCESS_KEY
+      },
+      authSource: '$external',
+      authMechanism: 'MONGODB-AWS'
+    });
 
-  await client.connect();
+    await client.connect();
 
-  log.debug('Connected successfully to MongoDB server! (Auth: AWS)');
+    log.debug('Connected successfully to MongoDB server! (Auth: AWS)');
 
-  cachedDb = client.db('etainabl');
+    cachedDb = client.db('etainabl');
 
-  return cachedDb;
+    return cachedDb;
+
+  } catch (e: any) {
+    // Retry
+    if (retryAttempt > 5) {
+      console.log(`Error connecting to MongoDB server after 5 attempts...`);
+      throw e;
+    }
+
+    console.log(`MongoDB Connection error: ${e.message}`);
+
+    console.log(`Error connecting to MongoDB server... Retrying in 3 seconds... (Attempt ${retryAttempt})`);
+    return connectToDatabase(retryAttempt + 1);
+  }
 }
 
 export default {

package/src/index.ts

@@ -6,7 +6,7 @@ import * as units from './units.js';
 import * as consumption from './consumption.js';
 import * as monitoring from './monitoring.js';
 import * as reporting from './reporting.js';
-import type { Account, Asset, Automation, Company, DataIngest, Invoice, Log, Reading, Supplier } from '../types/index.d.js';
+import type { Account, Asset, Automation, Company, DataIngest, Invoice, Log, Reading, Supplier } from './types/index.d.js';
 
 export {
   api,