@okf/ootils 1.21.4 → 1.21.6

package/dist/node.d.mts

@@ -776,9 +776,8 @@ declare class MongoConnector {
      */
     multiConnectToMongoDB(): {};
     multiConnectToMongoDBAsync(): Promise<{}>;
-    failedOptionalClusters: Set<any> | undefined;
+    skippedClusters: Set<any> | undefined;
     initiateConnectionEventListeners: (CLUSTER_NAME: any) => void;
-    initiateOptionalConnectionEventListeners: (CLUSTER_NAME: any) => void;
     /**
      * Helper function to close clusterConnections object
      */

package/dist/node.d.ts

@@ -776,9 +776,8 @@ declare class MongoConnector {
      */
     multiConnectToMongoDB(): {};
     multiConnectToMongoDBAsync(): Promise<{}>;
-    failedOptionalClusters: Set<any> | undefined;
+    skippedClusters: Set<any> | undefined;
     initiateConnectionEventListeners: (CLUSTER_NAME: any) => void;
-    initiateOptionalConnectionEventListeners: (CLUSTER_NAME: any) => void;
     /**
      * Helper function to close clusterConnections object
      */

package/dist/node.js

@@ -681,7 +681,7 @@ var require_MongoConnector = __commonJS({
     var AnnotationsSchema = (init_Annotations(), __toCommonJS(Annotations_exports));
     var PlatformConfigsSchema2 = (init_PlatformConfigs(), __toCommonJS(PlatformConfigs_exports));
     var TplSchema2 = (init_Tpl(), __toCommonJS(Tpl_exports));
-    var MongoConnector3 = class _MongoConnector {
+    var MongoConnector4 = class _MongoConnector {
       constructor(options) {
         __publicField(this, "initiateConnectionEventListeners", (CLUSTER_NAME) => {
           this.clusterConnections[CLUSTER_NAME].on("open", () => {
@@ -700,26 +700,6 @@ var require_MongoConnector = __commonJS({
             console.log(`\u{1F504} Mongoose reconnected to ${CLUSTER_NAME}`);
           });
         });
-        __publicField(this, "initiateOptionalConnectionEventListeners", (CLUSTER_NAME) => {
-          this.clusterConnections[CLUSTER_NAME].on("open", () => {
-            console.log(`\u2705 Mongoose connection open to optional cluster ${CLUSTER_NAME}`);
-            this.failedOptionalClusters?.delete(CLUSTER_NAME);
-          });
-          this.clusterConnections[CLUSTER_NAME].on("error", (err) => {
-            console.warn(
-              `\u26A0\uFE0F Mongoose connection error on optional cluster ${CLUSTER_NAME}: ${err.message}`
-            );
-            this.failedOptionalClusters?.add(CLUSTER_NAME);
-          });
-          this.clusterConnections[CLUSTER_NAME].on("disconnected", () => {
-            console.log(`\u{1F50C} Mongoose disconnected from optional cluster ${CLUSTER_NAME}`);
-            this.failedOptionalClusters?.add(CLUSTER_NAME);
-          });
-          this.clusterConnections[CLUSTER_NAME].on("reconnected", () => {
-            console.log(`\u{1F504} Mongoose reconnected to optional cluster ${CLUSTER_NAME}`);
-            this.failedOptionalClusters?.delete(CLUSTER_NAME);
-          });
-        });
         this.clusterConnections = {};
         this.env = options.env;
         this.dbConfigs = options.dbConfigs;
@@ -773,62 +753,37 @@ var require_MongoConnector = __commonJS({
       }
       async multiConnectToMongoDBAsync() {
         const allClusterConfigs = Object.values(this.dbConfigs);
-        this.failedOptionalClusters = /* @__PURE__ */ new Set();
+        this.skippedClusters = /* @__PURE__ */ new Set();
         await Promise.all(
           allClusterConfigs.map(async (clusterConf) => {
-            const { CLUSTER_NAME, CLUSTER_URI, optional } = clusterConf;
+            const { CLUSTER_NAME, CLUSTER_URI, skip } = clusterConf;
             if (!CLUSTER_NAME || !CLUSTER_URI) {
               throw new Error(
                 `Missing CLUSTER_NAME or CLUSTER_URI in cluster conf: ${JSON.stringify(clusterConf)}`
               );
             }
-            try {
-              const connection = mongoose5.createConnection(CLUSTER_URI, this.mongoOptions);
-              this.clusterConnections[CLUSTER_NAME] = connection;
-              if (!optional) {
-                this.initiateConnectionEventListeners(CLUSTER_NAME);
-              } else {
-                this.initiateOptionalConnectionEventListeners(CLUSTER_NAME);
-              }
-              await new Promise((resolve, reject) => {
-                connection.once("open", () => {
-                  console.log(`Connected to MongoDB: ${CLUSTER_NAME}`);
-                  resolve();
-                });
-                connection.once("error", (err) => {
-                  if (optional) {
-                    console.warn(`\u26A0\uFE0F Optional cluster ${CLUSTER_NAME} failed to connect: ${err.message}`);
-                    resolve();
-                  } else {
-                    reject(err);
-                  }
-                });
-              });
-            } catch (err) {
-              if (optional) {
-                console.warn(`\u26A0\uFE0F Optional cluster ${CLUSTER_NAME} failed to connect: ${err.message}`);
-                this.failedOptionalClusters.add(CLUSTER_NAME);
-                delete this.clusterConnections[CLUSTER_NAME];
-              } else {
-                throw err;
-              }
+            if (skip) {
+              console.log(`\u23ED\uFE0F Skipping cluster ${CLUSTER_NAME} (skip: true)`);
+              this.skippedClusters.add(CLUSTER_NAME);
+              return;
             }
+            const connection = mongoose5.createConnection(CLUSTER_URI, this.mongoOptions);
+            this.clusterConnections[CLUSTER_NAME] = connection;
+            this.initiateConnectionEventListeners(CLUSTER_NAME);
+            await new Promise((resolve, reject) => {
+              connection.once("open", () => {
+                console.log(`Connected to MongoDB: ${CLUSTER_NAME}`);
+                resolve();
+              });
+              connection.once("error", reject);
+            });
           })
         );
-        for (const clusterName of this.failedOptionalClusters) {
-          delete this.clusterConnections[clusterName];
-        }
-        const optionalFailedCount = this.failedOptionalClusters.size;
+        const skippedCount = this.skippedClusters.size;
         const connectedCount = Object.keys(this.clusterConnections).length;
-        if (optionalFailedCount > 0) {
-          console.log(
-            `\u{1F389} Connected to ${connectedCount} MongoDB databases (${optionalFailedCount} optional cluster(s) unavailable)`
-          );
-        } else {
-          console.log(
-            `\u{1F389} Connected to ${connectedCount} MongoDB databases`
-          );
-        }
+        let statusMsg = `\u{1F389} Connected to ${connectedCount} MongoDB databases`;
+        if (skippedCount > 0) statusMsg += ` (${skippedCount} skipped)`;
+        console.log(statusMsg);
         return this.clusterConnections;
       }
       // Static method to get the full instance
@@ -869,7 +824,7 @@ var require_MongoConnector = __commonJS({
         if (!_MongoConnector.instance) {
           throw new Error("MongoConnector not initialized");
         }
-        return _MongoConnector.instance.failedOptionalClusters?.has(clusterName) || !_MongoConnector.instance.clusterConnections[clusterName];
+        return _MongoConnector.instance.skippedClusters?.has(clusterName) || !_MongoConnector.instance.clusterConnections[clusterName];
       }
       /**
        * Helper function to close clusterConnections object
@@ -906,9 +861,9 @@ var require_MongoConnector = __commonJS({
         console.log("\u{1F389} All MongoDB clusterConnections closed gracefully");
       }
     };
-    MongoConnector3.instance = null;
+    MongoConnector4.instance = null;
     module2.exports = {
-      MongoConnector: MongoConnector3
+      MongoConnector: MongoConnector4
     };
   }
 });
@@ -1708,7 +1663,7 @@ __export(node_exports, {
   ElasticSearchConnector: () => import_ElasticSearchConnector.ElasticSearchConnector,
   GET_GLOBAL_BULLMQ_CONFIG: () => import_GET_GLOBAL_BULLMQ_CONFIG.GET_GLOBAL_BULLMQ_CONFIG,
   GeneratedTopicsSchema: () => GeneratedTopics_default,
-  MongoConnector: () => import_MongoConnector2.MongoConnector,
+  MongoConnector: () => import_MongoConnector3.MongoConnector,
   PlatformConfigsSchema: () => PlatformConfigs_default,
   ProducerManager: () => import_ProducerManager.ProducerManager,
   RedisCacheConnector: () => RedisCacheConnector,
@@ -2252,13 +2207,14 @@ var mergeAnnoDataIntoAnnotationsTags = ({
 };
 
 // src/node.ts
-var import_MongoConnector2 = __toESM(require_MongoConnector());
+var import_MongoConnector3 = __toESM(require_MongoConnector());
 var import_ElasticSearchConnector = __toESM(require_ElasticSearchConnector());
 
 // src/RedisCacheConnector.js
 var import_ioredis = __toESM(require("ioredis"));
 init_models();
 var import_getModelByTenant = __toESM(require_getModelByTenant());
+var import_MongoConnector2 = __toESM(require_MongoConnector());
 init_platformConfigTypes();
 var BASE_SETTINGS_FOR_CONFIGS_CACHE = [
   {
@@ -2522,7 +2478,13 @@ var RedisCacheConnector = class _RedisCacheConnector {
       const environment = this.getEnv();
       if (!tenant) throw new Error("No tenant/s defined to recache");
       console.log(`Loading configs and templates into cache...`);
+      const tenantToClusterMapping = import_MongoConnector2.MongoConnector.getTenantToClusterMapping();
       const tenantCollectionPromises = toArray(tenant).map(async (tenant2) => {
+        const clusterName = tenantToClusterMapping[tenant2]?.CLUSTER_NAME?.[environment];
+        if (clusterName && import_MongoConnector2.MongoConnector.isClusterUnavailable(clusterName)) {
+          console.log(`\u23ED\uFE0F Skipping cache load for tenant ${tenant2} (cluster ${clusterName} is unavailable)`);
+          return;
+        }
         return Promise.all(
           BASE_SETTINGS_FOR_CONFIGS_CACHE.map(
             async ({ modelName, schema, defaultQuery, typeKey }) => {

package/dist/node.mjs

@@ -686,7 +686,7 @@ var require_MongoConnector = __commonJS({
     var AnnotationsSchema = (init_Annotations(), __toCommonJS(Annotations_exports));
     var PlatformConfigsSchema2 = (init_PlatformConfigs(), __toCommonJS(PlatformConfigs_exports));
     var TplSchema2 = (init_Tpl(), __toCommonJS(Tpl_exports));
-    var MongoConnector3 = class _MongoConnector {
+    var MongoConnector4 = class _MongoConnector {
       constructor(options) {
         __publicField(this, "initiateConnectionEventListeners", (CLUSTER_NAME) => {
           this.clusterConnections[CLUSTER_NAME].on("open", () => {
@@ -705,26 +705,6 @@ var require_MongoConnector = __commonJS({
             console.log(`\u{1F504} Mongoose reconnected to ${CLUSTER_NAME}`);
           });
         });
-        __publicField(this, "initiateOptionalConnectionEventListeners", (CLUSTER_NAME) => {
-          this.clusterConnections[CLUSTER_NAME].on("open", () => {
-            console.log(`\u2705 Mongoose connection open to optional cluster ${CLUSTER_NAME}`);
-            this.failedOptionalClusters?.delete(CLUSTER_NAME);
-          });
-          this.clusterConnections[CLUSTER_NAME].on("error", (err) => {
-            console.warn(
-              `\u26A0\uFE0F Mongoose connection error on optional cluster ${CLUSTER_NAME}: ${err.message}`
-            );
-            this.failedOptionalClusters?.add(CLUSTER_NAME);
-          });
-          this.clusterConnections[CLUSTER_NAME].on("disconnected", () => {
-            console.log(`\u{1F50C} Mongoose disconnected from optional cluster ${CLUSTER_NAME}`);
-            this.failedOptionalClusters?.add(CLUSTER_NAME);
-          });
-          this.clusterConnections[CLUSTER_NAME].on("reconnected", () => {
-            console.log(`\u{1F504} Mongoose reconnected to optional cluster ${CLUSTER_NAME}`);
-            this.failedOptionalClusters?.delete(CLUSTER_NAME);
-          });
-        });
         this.clusterConnections = {};
         this.env = options.env;
         this.dbConfigs = options.dbConfigs;
@@ -778,62 +758,37 @@ var require_MongoConnector = __commonJS({
       }
       async multiConnectToMongoDBAsync() {
         const allClusterConfigs = Object.values(this.dbConfigs);
-        this.failedOptionalClusters = /* @__PURE__ */ new Set();
+        this.skippedClusters = /* @__PURE__ */ new Set();
         await Promise.all(
           allClusterConfigs.map(async (clusterConf) => {
-            const { CLUSTER_NAME, CLUSTER_URI, optional } = clusterConf;
+            const { CLUSTER_NAME, CLUSTER_URI, skip } = clusterConf;
             if (!CLUSTER_NAME || !CLUSTER_URI) {
               throw new Error(
                 `Missing CLUSTER_NAME or CLUSTER_URI in cluster conf: ${JSON.stringify(clusterConf)}`
               );
             }
-            try {
-              const connection = mongoose5.createConnection(CLUSTER_URI, this.mongoOptions);
-              this.clusterConnections[CLUSTER_NAME] = connection;
-              if (!optional) {
-                this.initiateConnectionEventListeners(CLUSTER_NAME);
-              } else {
-                this.initiateOptionalConnectionEventListeners(CLUSTER_NAME);
-              }
-              await new Promise((resolve, reject) => {
-                connection.once("open", () => {
-                  console.log(`Connected to MongoDB: ${CLUSTER_NAME}`);
-                  resolve();
-                });
-                connection.once("error", (err) => {
-                  if (optional) {
-                    console.warn(`\u26A0\uFE0F Optional cluster ${CLUSTER_NAME} failed to connect: ${err.message}`);
-                    resolve();
-                  } else {
-                    reject(err);
-                  }
-                });
-              });
-            } catch (err) {
-              if (optional) {
-                console.warn(`\u26A0\uFE0F Optional cluster ${CLUSTER_NAME} failed to connect: ${err.message}`);
-                this.failedOptionalClusters.add(CLUSTER_NAME);
-                delete this.clusterConnections[CLUSTER_NAME];
-              } else {
-                throw err;
-              }
+            if (skip) {
+              console.log(`\u23ED\uFE0F Skipping cluster ${CLUSTER_NAME} (skip: true)`);
+              this.skippedClusters.add(CLUSTER_NAME);
+              return;
             }
+            const connection = mongoose5.createConnection(CLUSTER_URI, this.mongoOptions);
+            this.clusterConnections[CLUSTER_NAME] = connection;
+            this.initiateConnectionEventListeners(CLUSTER_NAME);
+            await new Promise((resolve, reject) => {
+              connection.once("open", () => {
+                console.log(`Connected to MongoDB: ${CLUSTER_NAME}`);
+                resolve();
+              });
+              connection.once("error", reject);
+            });
           })
         );
-        for (const clusterName of this.failedOptionalClusters) {
-          delete this.clusterConnections[clusterName];
-        }
-        const optionalFailedCount = this.failedOptionalClusters.size;
+        const skippedCount = this.skippedClusters.size;
         const connectedCount = Object.keys(this.clusterConnections).length;
-        if (optionalFailedCount > 0) {
-          console.log(
-            `\u{1F389} Connected to ${connectedCount} MongoDB databases (${optionalFailedCount} optional cluster(s) unavailable)`
-          );
-        } else {
-          console.log(
-            `\u{1F389} Connected to ${connectedCount} MongoDB databases`
-          );
-        }
+        let statusMsg = `\u{1F389} Connected to ${connectedCount} MongoDB databases`;
+        if (skippedCount > 0) statusMsg += ` (${skippedCount} skipped)`;
+        console.log(statusMsg);
         return this.clusterConnections;
       }
       // Static method to get the full instance
@@ -874,7 +829,7 @@ var require_MongoConnector = __commonJS({
         if (!_MongoConnector.instance) {
           throw new Error("MongoConnector not initialized");
         }
-        return _MongoConnector.instance.failedOptionalClusters?.has(clusterName) || !_MongoConnector.instance.clusterConnections[clusterName];
+        return _MongoConnector.instance.skippedClusters?.has(clusterName) || !_MongoConnector.instance.clusterConnections[clusterName];
       }
       /**
        * Helper function to close clusterConnections object
@@ -911,9 +866,9 @@ var require_MongoConnector = __commonJS({
         console.log("\u{1F389} All MongoDB clusterConnections closed gracefully");
       }
     };
-    MongoConnector3.instance = null;
+    MongoConnector4.instance = null;
     module.exports = {
-      MongoConnector: MongoConnector3
+      MongoConnector: MongoConnector4
     };
   }
 });
@@ -2217,13 +2172,14 @@ var mergeAnnoDataIntoAnnotationsTags = ({
 };
 
 // src/node.ts
-var import_MongoConnector2 = __toESM(require_MongoConnector());
+var import_MongoConnector3 = __toESM(require_MongoConnector());
 var import_ElasticSearchConnector = __toESM(require_ElasticSearchConnector());
 
 // src/RedisCacheConnector.js
 init_models();
 import Redis from "ioredis";
 var import_getModelByTenant = __toESM(require_getModelByTenant());
+var import_MongoConnector2 = __toESM(require_MongoConnector());
 init_platformConfigTypes();
 var BASE_SETTINGS_FOR_CONFIGS_CACHE = [
   {
@@ -2487,7 +2443,13 @@ var RedisCacheConnector = class _RedisCacheConnector {
       const environment = this.getEnv();
       if (!tenant) throw new Error("No tenant/s defined to recache");
       console.log(`Loading configs and templates into cache...`);
+      const tenantToClusterMapping = import_MongoConnector2.MongoConnector.getTenantToClusterMapping();
       const tenantCollectionPromises = toArray(tenant).map(async (tenant2) => {
+        const clusterName = tenantToClusterMapping[tenant2]?.CLUSTER_NAME?.[environment];
+        if (clusterName && import_MongoConnector2.MongoConnector.isClusterUnavailable(clusterName)) {
+          console.log(`\u23ED\uFE0F Skipping cache load for tenant ${tenant2} (cluster ${clusterName} is unavailable)`);
+          return;
+        }
         return Promise.all(
           BASE_SETTINGS_FOR_CONFIGS_CACHE.map(
             async ({ modelName, schema, defaultQuery, typeKey }) => {
@@ -2557,7 +2519,7 @@ var export_BaseWorker = import_BaseWorker.BaseWorker;
 var export_ChunksElasticSyncProducer = import_ChunksElasticSyncProducer.ChunksElasticSyncProducer;
 var export_ElasticSearchConnector = import_ElasticSearchConnector.ElasticSearchConnector;
 var export_GET_GLOBAL_BULLMQ_CONFIG = import_GET_GLOBAL_BULLMQ_CONFIG.GET_GLOBAL_BULLMQ_CONFIG;
-var export_MongoConnector = import_MongoConnector2.MongoConnector;
+var export_MongoConnector = import_MongoConnector3.MongoConnector;
 var export_ProducerManager = import_ProducerManager.ProducerManager;
 var export_WorkerManager = import_WorkerManager.WorkerManager;
 var export_getAIChatModelByTenant = import_getModelByTenant2.getAIChatModelByTenant;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.21.4",
+  "version": "1.21.6",
   "description": "Utility functions for both browser and Node.js",
   "main": "dist/index.js",
   "module": "dist/index.mjs",