@okf/ootils 1.24.3 → 1.25.0

package/dist/node.d.mts

@@ -1332,6 +1332,7 @@ declare class SecretManagerConnector {
     static getGlobalConfigs(): any;
     static getDbConfigs(): any;
     static getTenantEnvConfigs(tenant: any): any;
+    static getEnvSpecificConfigs(env: any): any;
     static getInstance(): any;
     constructor({ secrets }?: {
         secrets?: never[] | undefined;

package/dist/node.d.ts

@@ -1332,6 +1332,7 @@ declare class SecretManagerConnector {
     static getGlobalConfigs(): any;
     static getDbConfigs(): any;
     static getTenantEnvConfigs(tenant: any): any;
+    static getEnvSpecificConfigs(env: any): any;
     static getInstance(): any;
     constructor({ secrets }?: {
         secrets?: never[] | undefined;

package/dist/node.js

@@ -1175,6 +1175,74 @@ var require_getModelByTenant = __commonJS({
   }
 });
 
+// src/SecretManagerConnector/index.js
+var SecretManagerConnector_exports = {};
+__export(SecretManagerConnector_exports, {
+  SecretManagerConnector: () => SecretManagerConnector
+});
+var import_secret_manager, import_path, PROJECT_ID, SecretManagerConnector;
+var init_SecretManagerConnector = __esm({
+  "src/SecretManagerConnector/index.js"() {
+    "use strict";
+    import_secret_manager = require("@google-cloud/secret-manager");
+    import_path = __toESM(require("path"));
+    PROJECT_ID = "ok-framework";
+    SecretManagerConnector = class _SecretManagerConnector {
+      constructor({ secrets = [] } = {}) {
+        if (_SecretManagerConnector.instance) {
+          throw new Error(
+            "SecretManagerConnector instance already exists. Use SecretManagerConnector.getInstance() instead."
+          );
+        }
+        this.client = new import_secret_manager.SecretManagerServiceClient();
+        this.secrets = secrets;
+        this.cache = {};
+        _SecretManagerConnector.instance = this;
+      }
+      async connect() {
+        for (const { name, fallbackPath } of this.secrets) {
+          try {
+            const secretPath = `projects/${PROJECT_ID}/secrets/${name}/versions/latest`;
+            const [version] = await this.client.accessSecretVersion({ name: secretPath });
+            this.cache[name] = JSON.parse(version.payload.data.toString("utf8"));
+            console.log(`  Secret Manager: loaded "${name}"`);
+          } catch (err) {
+            if (fallbackPath) {
+              const fullPath = import_path.default.resolve(process.cwd(), fallbackPath);
+              const module2 = await import(fullPath);
+              this.cache[name] = module2.default || module2;
+              console.log(`  Secret Manager: "${name}" fallback to local file - ${err.message}`);
+            } else {
+              throw new Error(`Secret Manager: failed to load "${name}" - ${err.message}`);
+            }
+          }
+        }
+      }
+      static getSecret(secretName) {
+        return _SecretManagerConnector.instance.cache[secretName];
+      }
+      static getGlobalConfigs() {
+        return _SecretManagerConnector.getSecret("globalConfigs");
+      }
+      static getDbConfigs() {
+        return _SecretManagerConnector.getSecret("dbConfigs");
+      }
+      static getTenantEnvConfigs(tenant) {
+        const configs = _SecretManagerConnector.getSecret("tenantEnvConfigs");
+        return tenant ? configs[tenant] : configs;
+      }
+      static getEnvSpecificConfigs(env) {
+        const configs = _SecretManagerConnector.getSecret("envSpecificConfigs");
+        return env ? configs[env] : configs;
+      }
+      static getInstance() {
+        return _SecretManagerConnector.instance;
+      }
+    };
+    SecretManagerConnector.instance = null;
+  }
+});
+
 // src/bullmq/WorkerManager.js
 var require_WorkerManager = __commonJS({
   "src/bullmq/WorkerManager.js"(exports2, module2) {
@@ -1587,18 +1655,20 @@ var require_ChunksElasticSyncProducer = __commonJS({
     "use strict";
     var { BaseProducer: BaseProducer2 } = require_BaseProducer();
     var { GET_GLOBAL_BULLMQ_CONFIG: GET_GLOBAL_BULLMQ_CONFIG2 } = require_GET_GLOBAL_BULLMQ_CONFIG();
+    var { SecretManagerConnector: SecretManagerConnector2 } = (init_SecretManagerConnector(), __toCommonJS(SecretManagerConnector_exports));
     var ChunksElasticSyncProducer2 = class extends BaseProducer2 {
       // Preserve class name through minification for ProducerManager lookup
       static get name() {
         return "ChunksElasticSyncProducer";
       }
-      // options - Configuration options (optional, defaults to process.env)
+      // options - Configuration options (optional, defaults to SecretManager)
       constructor(options = {}) {
         const env = options.env || process.env.ENV;
+        const c = SecretManagerConnector2.getEnvSpecificConfigs(env);
         const redisCredentials = options.redisCredentials || {
-          REDIS_HOST: process.env.REDIS_HOST,
-          REDIS_PORT: process.env.REDIS_PORT,
-          REDIS_PASSWORD: process.env.REDIS_PASSWORD
+          REDIS_HOST: c.REDIS_HOST,
+          REDIS_PORT: c.REDIS_PORT,
+          REDIS_PASSWORD: c.REDIS_PASSWORD
         };
         const GLOBAL_BULLMQ_CONFIG = GET_GLOBAL_BULLMQ_CONFIG2({
           env,
@@ -1629,18 +1699,20 @@ var require_AnnosElasticSyncProducer = __commonJS({
     "use strict";
     var { BaseProducer: BaseProducer2 } = require_BaseProducer();
     var { GET_GLOBAL_BULLMQ_CONFIG: GET_GLOBAL_BULLMQ_CONFIG2 } = require_GET_GLOBAL_BULLMQ_CONFIG();
+    var { SecretManagerConnector: SecretManagerConnector2 } = (init_SecretManagerConnector(), __toCommonJS(SecretManagerConnector_exports));
     var AnnosElasticSyncProducer2 = class extends BaseProducer2 {
       // Preserve class name through minification for ProducerManager lookup
       static get name() {
         return "AnnosElasticSyncProducer";
       }
-      // options - Configuration options (optional, defaults to process.env)
+      // options - Configuration options (optional, defaults to SecretManager)
       constructor(options = {}) {
         const env = options.env || process.env.ENV;
+        const c = SecretManagerConnector2.getEnvSpecificConfigs(env);
         const redisCredentials = options.redisCredentials || {
-          REDIS_HOST: process.env.REDIS_HOST,
-          REDIS_PORT: process.env.REDIS_PORT,
-          REDIS_PASSWORD: process.env.REDIS_PASSWORD
+          REDIS_HOST: c.REDIS_HOST,
+          REDIS_PORT: c.REDIS_PORT,
+          REDIS_PASSWORD: c.REDIS_PASSWORD
         };
         const GLOBAL_BULLMQ_CONFIG = GET_GLOBAL_BULLMQ_CONFIG2({
           env,
@@ -3535,61 +3607,8 @@ var RedisCacheConnector = class _RedisCacheConnector {
 };
 RedisCacheConnector.instance = null;
 
-// src/SecretManagerConnector/index.js
-var import_secret_manager = require("@google-cloud/secret-manager");
-var import_path = __toESM(require("path"));
-var PROJECT_ID = "ok-framework";
-var SecretManagerConnector = class _SecretManagerConnector {
-  constructor({ secrets = [] } = {}) {
-    if (_SecretManagerConnector.instance) {
-      throw new Error(
-        "SecretManagerConnector instance already exists. Use SecretManagerConnector.getInstance() instead."
-      );
-    }
-    this.client = new import_secret_manager.SecretManagerServiceClient();
-    this.secrets = secrets;
-    this.cache = {};
-    _SecretManagerConnector.instance = this;
-  }
-  async connect() {
-    for (const { name, fallbackPath } of this.secrets) {
-      try {
-        const secretPath = `projects/${PROJECT_ID}/secrets/${name}/versions/latest`;
-        const [version] = await this.client.accessSecretVersion({ name: secretPath });
-        this.cache[name] = JSON.parse(version.payload.data.toString("utf8"));
-        console.log(`  Secret Manager: loaded "${name}"`);
-      } catch (err) {
-        if (fallbackPath) {
-          const fullPath = import_path.default.resolve(process.cwd(), fallbackPath);
-          const module2 = await import(fullPath);
-          this.cache[name] = module2.default || module2;
-          console.log(`  Secret Manager: "${name}" fallback to local file - ${err.message}`);
-        } else {
-          throw new Error(`Secret Manager: failed to load "${name}" - ${err.message}`);
-        }
-      }
-    }
-  }
-  static getSecret(secretName) {
-    return _SecretManagerConnector.instance.cache[secretName];
-  }
-  static getGlobalConfigs() {
-    return _SecretManagerConnector.getSecret("globalConfigs");
-  }
-  static getDbConfigs() {
-    return _SecretManagerConnector.getSecret("dbConfigs");
-  }
-  static getTenantEnvConfigs(tenant) {
-    const configs = _SecretManagerConnector.getSecret("tenantEnvConfigs");
-    return tenant ? configs[tenant] : configs;
-  }
-  static getInstance() {
-    return _SecretManagerConnector.instance;
-  }
-};
-SecretManagerConnector.instance = null;
-
 // src/node.ts
+init_SecretManagerConnector();
 init_getDbByTenant();
 var import_getModelByTenant2 = __toESM(require_getModelByTenant());
 init_models();

package/dist/node.mjs

@@ -1180,6 +1180,74 @@ var require_getModelByTenant = __commonJS({
   }
 });
 
+// src/SecretManagerConnector/index.js
+var SecretManagerConnector_exports = {};
+__export(SecretManagerConnector_exports, {
+  SecretManagerConnector: () => SecretManagerConnector
+});
+import { SecretManagerServiceClient } from "@google-cloud/secret-manager";
+import path from "path";
+var PROJECT_ID, SecretManagerConnector;
+var init_SecretManagerConnector = __esm({
+  "src/SecretManagerConnector/index.js"() {
+    "use strict";
+    PROJECT_ID = "ok-framework";
+    SecretManagerConnector = class _SecretManagerConnector {
+      constructor({ secrets = [] } = {}) {
+        if (_SecretManagerConnector.instance) {
+          throw new Error(
+            "SecretManagerConnector instance already exists. Use SecretManagerConnector.getInstance() instead."
+          );
+        }
+        this.client = new SecretManagerServiceClient();
+        this.secrets = secrets;
+        this.cache = {};
+        _SecretManagerConnector.instance = this;
+      }
+      async connect() {
+        for (const { name, fallbackPath } of this.secrets) {
+          try {
+            const secretPath = `projects/${PROJECT_ID}/secrets/${name}/versions/latest`;
+            const [version] = await this.client.accessSecretVersion({ name: secretPath });
+            this.cache[name] = JSON.parse(version.payload.data.toString("utf8"));
+            console.log(`  Secret Manager: loaded "${name}"`);
+          } catch (err) {
+            if (fallbackPath) {
+              const fullPath = path.resolve(process.cwd(), fallbackPath);
+              const module = await import(fullPath);
+              this.cache[name] = module.default || module;
+              console.log(`  Secret Manager: "${name}" fallback to local file - ${err.message}`);
+            } else {
+              throw new Error(`Secret Manager: failed to load "${name}" - ${err.message}`);
+            }
+          }
+        }
+      }
+      static getSecret(secretName) {
+        return _SecretManagerConnector.instance.cache[secretName];
+      }
+      static getGlobalConfigs() {
+        return _SecretManagerConnector.getSecret("globalConfigs");
+      }
+      static getDbConfigs() {
+        return _SecretManagerConnector.getSecret("dbConfigs");
+      }
+      static getTenantEnvConfigs(tenant) {
+        const configs = _SecretManagerConnector.getSecret("tenantEnvConfigs");
+        return tenant ? configs[tenant] : configs;
+      }
+      static getEnvSpecificConfigs(env) {
+        const configs = _SecretManagerConnector.getSecret("envSpecificConfigs");
+        return env ? configs[env] : configs;
+      }
+      static getInstance() {
+        return _SecretManagerConnector.instance;
+      }
+    };
+    SecretManagerConnector.instance = null;
+  }
+});
+
 // src/bullmq/WorkerManager.js
 var require_WorkerManager = __commonJS({
   "src/bullmq/WorkerManager.js"(exports, module) {
@@ -1592,18 +1660,20 @@ var require_ChunksElasticSyncProducer = __commonJS({
     "use strict";
     var { BaseProducer: BaseProducer2 } = require_BaseProducer();
     var { GET_GLOBAL_BULLMQ_CONFIG: GET_GLOBAL_BULLMQ_CONFIG2 } = require_GET_GLOBAL_BULLMQ_CONFIG();
+    var { SecretManagerConnector: SecretManagerConnector2 } = (init_SecretManagerConnector(), __toCommonJS(SecretManagerConnector_exports));
     var ChunksElasticSyncProducer2 = class extends BaseProducer2 {
       // Preserve class name through minification for ProducerManager lookup
       static get name() {
         return "ChunksElasticSyncProducer";
       }
-      // options - Configuration options (optional, defaults to process.env)
+      // options - Configuration options (optional, defaults to SecretManager)
       constructor(options = {}) {
         const env = options.env || process.env.ENV;
+        const c = SecretManagerConnector2.getEnvSpecificConfigs(env);
         const redisCredentials = options.redisCredentials || {
-          REDIS_HOST: process.env.REDIS_HOST,
-          REDIS_PORT: process.env.REDIS_PORT,
-          REDIS_PASSWORD: process.env.REDIS_PASSWORD
+          REDIS_HOST: c.REDIS_HOST,
+          REDIS_PORT: c.REDIS_PORT,
+          REDIS_PASSWORD: c.REDIS_PASSWORD
         };
         const GLOBAL_BULLMQ_CONFIG = GET_GLOBAL_BULLMQ_CONFIG2({
           env,
@@ -1634,18 +1704,20 @@ var require_AnnosElasticSyncProducer = __commonJS({
     "use strict";
     var { BaseProducer: BaseProducer2 } = require_BaseProducer();
     var { GET_GLOBAL_BULLMQ_CONFIG: GET_GLOBAL_BULLMQ_CONFIG2 } = require_GET_GLOBAL_BULLMQ_CONFIG();
+    var { SecretManagerConnector: SecretManagerConnector2 } = (init_SecretManagerConnector(), __toCommonJS(SecretManagerConnector_exports));
     var AnnosElasticSyncProducer2 = class extends BaseProducer2 {
       // Preserve class name through minification for ProducerManager lookup
       static get name() {
         return "AnnosElasticSyncProducer";
       }
-      // options - Configuration options (optional, defaults to process.env)
+      // options - Configuration options (optional, defaults to SecretManager)
       constructor(options = {}) {
         const env = options.env || process.env.ENV;
+        const c = SecretManagerConnector2.getEnvSpecificConfigs(env);
         const redisCredentials = options.redisCredentials || {
-          REDIS_HOST: process.env.REDIS_HOST,
-          REDIS_PORT: process.env.REDIS_PORT,
-          REDIS_PASSWORD: process.env.REDIS_PASSWORD
+          REDIS_HOST: c.REDIS_HOST,
+          REDIS_PORT: c.REDIS_PORT,
+          REDIS_PASSWORD: c.REDIS_PASSWORD
         };
         const GLOBAL_BULLMQ_CONFIG = GET_GLOBAL_BULLMQ_CONFIG2({
           env,
@@ -3482,61 +3554,8 @@ var RedisCacheConnector = class _RedisCacheConnector {
 };
 RedisCacheConnector.instance = null;
 
-// src/SecretManagerConnector/index.js
-import { SecretManagerServiceClient } from "@google-cloud/secret-manager";
-import path from "path";
-var PROJECT_ID = "ok-framework";
-var SecretManagerConnector = class _SecretManagerConnector {
-  constructor({ secrets = [] } = {}) {
-    if (_SecretManagerConnector.instance) {
-      throw new Error(
-        "SecretManagerConnector instance already exists. Use SecretManagerConnector.getInstance() instead."
-      );
-    }
-    this.client = new SecretManagerServiceClient();
-    this.secrets = secrets;
-    this.cache = {};
-    _SecretManagerConnector.instance = this;
-  }
-  async connect() {
-    for (const { name, fallbackPath } of this.secrets) {
-      try {
-        const secretPath = `projects/${PROJECT_ID}/secrets/${name}/versions/latest`;
-        const [version] = await this.client.accessSecretVersion({ name: secretPath });
-        this.cache[name] = JSON.parse(version.payload.data.toString("utf8"));
-        console.log(`  Secret Manager: loaded "${name}"`);
-      } catch (err) {
-        if (fallbackPath) {
-          const fullPath = path.resolve(process.cwd(), fallbackPath);
-          const module = await import(fullPath);
-          this.cache[name] = module.default || module;
-          console.log(`  Secret Manager: "${name}" fallback to local file - ${err.message}`);
-        } else {
-          throw new Error(`Secret Manager: failed to load "${name}" - ${err.message}`);
-        }
-      }
-    }
-  }
-  static getSecret(secretName) {
-    return _SecretManagerConnector.instance.cache[secretName];
-  }
-  static getGlobalConfigs() {
-    return _SecretManagerConnector.getSecret("globalConfigs");
-  }
-  static getDbConfigs() {
-    return _SecretManagerConnector.getSecret("dbConfigs");
-  }
-  static getTenantEnvConfigs(tenant) {
-    const configs = _SecretManagerConnector.getSecret("tenantEnvConfigs");
-    return tenant ? configs[tenant] : configs;
-  }
-  static getInstance() {
-    return _SecretManagerConnector.instance;
-  }
-};
-SecretManagerConnector.instance = null;
-
 // src/node.ts
+init_SecretManagerConnector();
 init_getDbByTenant();
 var import_getModelByTenant2 = __toESM(require_getModelByTenant());
 init_models();

package/package.json

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