@onlineapps/service-common 1.0.12 → 1.0.14

package/README.md

@@ -53,10 +53,10 @@ await waitForInfrastructureReady({
 Waits for all infrastructure services to be reported as healthy by Registry.
 
 **Options:**
-- `redisUrl` (string): Redis URL (default: from ENV or `redis://api_node_cache:6379`)
+- `redisUrl` (string): Redis URL
 - `maxWait` (number): Maximum wait time in ms (default: 300000 = 5 minutes)
 - `checkInterval` (number): Check interval in ms (default: 5000 = 5 seconds)
-- `logger` (Object): Logger instance (default: console)
+- `logger` (Object|Function): **Required** logger instance (or function). No implicit console fallback.
 
 **Returns:** `Promise<boolean>` - True if all infrastructure services are ready
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/service-common",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "Common utilities for both infrastructure services and business services",
   "main": "src/index.js",
   "scripts": {

package/src/defaults.js

@@ -12,8 +12,8 @@
 module.exports = {
   infrastructureHealthQueueName: 'infrastructure.health.checks',
   infrastructureHealthPublishIntervalMs: 5000,
-  infrastructureHealthWaitMaxTimeMs: 300000,
-  infrastructureHealthWaitCheckIntervalMs: 5000,
+  infrastructureHealthWaitMaxTimeMs: 60000,
+  infrastructureHealthWaitCheckIntervalMs: 2000,
   infrastructureHealthTimeoutMs: 15000,
   infrastructureHealthRedisTtlSeconds: 30,
   infrastructureHealthCleanupIntervalMs: 10000,

package/src/infrastructure/waitForHealthCheckQueueReady.js

@@ -37,15 +37,22 @@ async function waitForHealthCheckQueueReady(options = {}) {
   const redisUrl = buildRedisUrl({ redisUrl: options.redisUrl });
   const maxWait = runtimeCfg.get('infrastructureHealthQueueWaitMaxTimeMs', options.maxWait);
   const checkInterval = runtimeCfg.get('infrastructureHealthQueueWaitCheckIntervalMs', options.checkInterval);
-  const logger = options.logger || console;
+  const logger = options.logger;
+  if (!logger) {
+    throw new Error('[service-common][waitForHealthCheckQueueReady] Missing dependency - logger is required (no console fallback).');
+  }
   
   const log = (msg) => {
     if (logger && typeof logger.info === 'function') {
       logger.info(msg);
     } else if (logger && typeof logger.log === 'function') {
       logger.log(msg);
+    } else if (logger && typeof logger === 'function') {
+      logger(msg);
     } else {
-      console.log(msg);
+      throw new Error(
+        '[service-common][waitForHealthCheckQueueReady] Invalid logger - Expected logger.info(), logger.log(), or function logger(message).'
+      );
     }
   };
 

package/src/infrastructure/waitForInfrastructureReady.js

@@ -35,8 +35,8 @@ const runtimeCfg = require('../config');
  * Wait for all infrastructure services to be ready
  * @param {Object} options - Options
  * @param {string} [options.redisUrl] - Redis URL (default: REDIS_URL env or redis://api_node_cache:6379)
- * @param {number} [options.maxWait] - Maximum wait time in ms (default: INFRASTRUCTURE_HEALTH_WAIT_MAX_TIME env or 300000 = 5 minutes)
- * @param {number} [options.checkInterval] - Check interval in ms (default: INFRASTRUCTURE_HEALTH_WAIT_CHECK_INTERVAL env or 5000 = 5 seconds)
+ * @param {number} [options.maxWait] - Maximum wait time in ms (default: INFRASTRUCTURE_HEALTH_WAIT_MAX_TIME env or 60000 = 1 minute)
+ * @param {number} [options.checkInterval] - Check interval in ms (default: INFRASTRUCTURE_HEALTH_WAIT_CHECK_INTERVAL env or 2000 = 2 seconds)
  * @param {Object} [options.logger] - Logger instance (default: console)
  * @returns {Promise<boolean>} - True if all infrastructure services are ready
  * @throws {Error} - If timeout is reached
@@ -48,7 +48,10 @@ async function waitForInfrastructureReady(options = {}) {
   const redisUrl = buildRedisUrl({ redisUrl: options.redisUrl });
   const maxWait = runtimeCfg.get('infrastructureHealthWaitMaxTimeMs', options.maxWait);
   const checkInterval = runtimeCfg.get('infrastructureHealthWaitCheckIntervalMs', options.checkInterval);
-  const logger = options.logger || console;
+  const logger = options.logger;
+  if (!logger) {
+    throw new Error('[service-common][waitForInfrastructureReady] Missing dependency - logger is required (no console fallback).');
+  }
 
   // Helper to log messages (compatible with both console and winston)
   const log = (messageStr) => {
@@ -62,7 +65,9 @@ async function waitForInfrastructureReady(options = {}) {
       // console.log or similar
       logger(messageStr);
     } else {
-      console.log(messageStr);
+      throw new Error(
+        '[service-common][waitForInfrastructureReady] Invalid logger - Expected logger.info(), logger.log(), or function logger(message).'
+      );
     }
   };
 

package/src/postgresClient.js

@@ -3,46 +3,52 @@
 /**
  * PostgreSQL Client Utilities
  * 
- * Provides helper functions for building PostgreSQL connection URLs
- * with fallback support for infrastructure client configuration.
- * 
- * EXCEPTION: Fallbacks are allowed ONLY for infrastructure client configuration.
- * This is the ONLY place where fallbacks are acceptable.
+ * Provides helper functions for building PostgreSQL connection URLs.
+ *
+ * NO FALLBACKS: Topology must be explicit via ENV/config. This module must not
+ * embed docker-compose hostnames or credentials.
  */
 
 /**
  * Build a PostgreSQL connection URL from environment.
  *
- * EXCEPTION: Fallbacks are allowed ONLY for infrastructure client configuration.
- * This is the ONLY place where fallbacks are acceptable.
- *
- * Environment variable precedence (checked in order):
- * 1. POSTGRES_URL (full URL, e.g. postgres://monitoring:monitoring_pass@api_monitoring_postgres:5432/monitoring) - ENV variable name
- * 2. POSTGRES_HOST + POSTGRES_PORT + POSTGRES_USER + POSTGRES_PASSWORD + POSTGRES_DB (if POSTGRES_URL not set)
- * 3. Fallback: postgres://monitoring:monitoring_pass@api_monitoring_postgres:5432/monitoring (docker-compose default)
- *
  * @param {Object} options - Options
  * @param {Object} [options.env=process.env] - Environment variables
- * @param {Object} [options.defaults] - Default host/port/user/password/db overrides
  * @returns {string} PostgreSQL connection URL
  */
 function buildPostgresUrl(options = {}) {
   const env = options.env || process.env || {};
-  const defaults = options.defaults || {};
 
-  // Priority 1: POSTGRES_URL from environment (ENV variable name: POSTGRES_URL)
-  if (env.POSTGRES_URL && typeof env.POSTGRES_URL === 'string' && env.POSTGRES_URL.length > 0) {
-    return env.POSTGRES_URL;
+  const url = env.POSTGRES_URL && typeof env.POSTGRES_URL === 'string' ? env.POSTGRES_URL.trim() : '';
+  if (url) return url;
+
+  const host = env.POSTGRES_HOST && typeof env.POSTGRES_HOST === 'string' ? env.POSTGRES_HOST.trim() : '';
+  const port = env.POSTGRES_PORT && typeof env.POSTGRES_PORT === 'string' ? env.POSTGRES_PORT.trim() : '';
+  const user = env.POSTGRES_USER && typeof env.POSTGRES_USER === 'string' ? env.POSTGRES_USER.trim() : '';
+  const password = env.POSTGRES_PASSWORD && typeof env.POSTGRES_PASSWORD === 'string' ? env.POSTGRES_PASSWORD.trim() : '';
+  const database = env.POSTGRES_DB && typeof env.POSTGRES_DB === 'string' ? env.POSTGRES_DB.trim() : '';
+
+  const anyPartsProvided = Boolean(host || port || user || password || database);
+  if (!anyPartsProvided) {
+    throw new Error(
+      '[service-common][postgres] Missing configuration - POSTGRES_URL is required, or provide all: POSTGRES_HOST, POSTGRES_PORT, POSTGRES_USER, POSTGRES_PASSWORD, POSTGRES_DB.'
+    );
   }
 
-  // Priority 2: POSTGRES_HOST + POSTGRES_PORT + POSTGRES_USER + POSTGRES_PASSWORD + POSTGRES_DB (if POSTGRES_URL not set)
-  // Fallback for docker-compose environment (defined in library, not in docker-compose.yml)
-  const host = env.POSTGRES_HOST || defaults.host || 'api_monitoring_postgres';
-  const port = env.POSTGRES_PORT || defaults.port || '5432';
-  const user = env.POSTGRES_USER || defaults.user || 'monitoring';
-  const password = env.POSTGRES_PASSWORD || defaults.password || 'monitoring_pass';
-  const database = env.POSTGRES_DB || defaults.database || 'monitoring';
+  const missing = [];
+  if (!host) missing.push('POSTGRES_HOST');
+  if (!port) missing.push('POSTGRES_PORT');
+  if (!user) missing.push('POSTGRES_USER');
+  if (!password) missing.push('POSTGRES_PASSWORD');
+  if (!database) missing.push('POSTGRES_DB');
+  if (missing.length > 0) {
+    throw new Error(
+      `[service-common][postgres] Missing configuration - Partial PostgreSQL config provided. Missing: ${missing.join(', ')}. ` +
+        'Fix: set POSTGRES_URL or set all POSTGRES_* parts.'
+    );
+  }
 
+  // Do not attempt to do smart encoding here; POSTGRES_URL is the recommended option.
   return `postgres://${user}:${password}@${host}:${port}/${database}`;
 }
 
@@ -59,8 +65,7 @@ function createPostgresPool(options = {}) {
   const { Pool } = require('pg');
   
   const connectionString = buildPostgresUrl({
-    env: options.env,
-    defaults: options.defaults
+    env: options.env
   });
 
   const poolConfig = {
@@ -81,7 +86,10 @@ function createPostgresPool(options = {}) {
  * @param {Object} logger - Logger object with info/error methods
  * @returns {Promise<void>}
  */
-async function connectPostgres(pool, logger = console) {
+async function connectPostgres(pool, logger) {
+  if (!logger) {
+    throw new Error('[service-common][postgres] Missing dependency - logger is required (no console fallback).');
+  }
   try {
     await pool.query('SELECT NOW()');
     if (logger && logger.info) {

package/tests/unit/defaults.test.js

@@ -8,8 +8,8 @@ describe('@onlineapps/service-common defaults @unit', () => {
   test('should export stable module-owned defaults', () => {
     expect(defaults.infrastructureHealthQueueName).toBe('infrastructure.health.checks');
     expect(defaults.infrastructureHealthPublishIntervalMs).toBe(5000);
-    expect(defaults.infrastructureHealthWaitMaxTimeMs).toBe(300000);
-    expect(defaults.infrastructureHealthWaitCheckIntervalMs).toBe(5000);
+    expect(defaults.infrastructureHealthWaitMaxTimeMs).toBe(60000);
+    expect(defaults.infrastructureHealthWaitCheckIntervalMs).toBe(2000);
     expect(defaults.infrastructureHealthTimeoutMs).toBe(15000);
     expect(defaults.infrastructureHealthRedisTtlSeconds).toBe(30);
     expect(defaults.infrastructureHealthCleanupIntervalMs).toBe(10000);