@onlineapps/mq-client-core 1.0.23 → 1.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/mq-client-core",
-  "version": "1.0.23",
+  "version": "1.0.26",
   "description": "Core MQ client library for RabbitMQ - shared by infrastructure services and connectors",
   "main": "src/index.js",
   "scripts": {

package/src/config/queueConfig.js

@@ -113,6 +113,74 @@ module.exports = {
     }
   },
 
+  /**
+   * Infrastructure health tracking queue configurations
+   */
+  infrastructure: {
+    /**
+     * infrastructure.health.checks - Health check messages from infrastructure services
+     */
+    'health.checks': {
+      durable: true,
+      arguments: {
+        'x-message-ttl': 10000,       // 10 seconds TTL (prevent stale data)
+        'x-max-length': 1000
+      }
+    }
+  },
+
+  /**
+   * Monitoring infrastructure queue configurations
+   * These are dedicated queues for Monitoring service (separate from delivery queues)
+   */
+  monitoring: {
+    /**
+     * monitoring.workflow.completed - Completed workflows for monitoring
+     * Business services publish here for observability (separate from workflow.completed for delivery)
+     */
+    'workflow.completed': {
+      durable: true,
+      arguments: {
+        'x-message-ttl': 300000,      // 5 minutes TTL
+        'x-max-length': 10000
+      }
+    },
+
+    /**
+     * monitoring.workflow.failed - Failed workflows for monitoring
+     * Business services publish here for observability (separate from workflow.failed for delivery)
+     */
+    'workflow.failed': {
+      durable: true,
+      arguments: {
+        'x-message-ttl': 300000,      // 5 minutes TTL
+        'x-max-length': 10000
+      }
+    },
+
+    /**
+     * monitoring.registry.events - Registry events for monitoring
+     */
+    'registry.events': {
+      durable: true,
+      arguments: {
+        'x-message-ttl': 60000,       // 1 minute TTL
+        'x-max-length': 5000
+      }
+    },
+
+    /**
+     * monitoring.service.heartbeats - Service heartbeats for monitoring
+     */
+    'service.heartbeats': {
+      durable: true,
+      arguments: {
+        'x-message-ttl': 120000,      // 2 minutes TTL
+        'x-max-length': 10000
+      }
+    }
+  },
+
   /**
    * Registry infrastructure queue configurations
    */
@@ -197,7 +265,11 @@ module.exports = {
    * @returns {boolean} True if infrastructure queue
    */
   isInfrastructureQueue(queueName) {
-    return queueName.startsWith('workflow.') || queueName.startsWith('registry.');
+    return queueName.startsWith('workflow.') ||
+           queueName.startsWith('registry.') ||
+           queueName.startsWith('infrastructure.') ||
+           queueName.startsWith('validation.') ||
+           queueName.startsWith('monitoring.');
   },
 
   /**
@@ -255,9 +327,36 @@ module.exports = {
     return config;
   },
 
+  /**
+   * Get infrastructure health queue configuration
+   * @param {string} queueName - Queue name (e.g., 'infrastructure.health.checks')
+   * @returns {Object} Queue configuration
+   */
+  getInfrastructureHealthQueueConfig(queueName) {
+    const parts = queueName.split('.');
+    if (parts.length < 2 || parts[0] !== 'infrastructure') {
+      throw new Error(`Invalid infrastructure health queue name: ${queueName}. Expected format: infrastructure.{name}`);
+    }
+    const name = parts.slice(1).join('.');
+    return this.getQueueConfig('infrastructure', name);
+  },
+
+  /**
+   * Get monitoring queue configuration
+   * @param {string} queueName - Queue name (e.g., 'monitoring.workflow.completed')
+   * @returns {Object} Queue configuration
+   */
+  getMonitoringQueueConfig(queueName) {
+    if (!queueName.startsWith('monitoring.')) {
+      throw new Error(`Queue ${queueName} is not a monitoring queue`);
+    }
+    const name = queueName.replace('monitoring.', '');
+    return this.getQueueConfig('monitoring', name);
+  },
+
   /**
    * Get infrastructure queue configuration by queue name (auto-detect type)
-   * @param {string} queueName - Full queue name (e.g., 'workflow.init', 'registry.register')
+   * @param {string} queueName - Full queue name (e.g., 'workflow.init', 'registry.register', 'infrastructure.health.checks', 'monitoring.workflow.completed')
    * @returns {Object} Queue configuration
    */
   getInfrastructureQueueConfig(queueName) {
@@ -265,8 +364,12 @@ module.exports = {
       return this.getWorkflowQueueConfig(queueName);
     } else if (queueName.startsWith('registry.')) {
       return this.getRegistryQueueConfig(queueName);
+    } else if (queueName.startsWith('infrastructure.')) {
+      return this.getInfrastructureHealthQueueConfig(queueName);
+    } else if (queueName.startsWith('monitoring.')) {
+      return this.getMonitoringQueueConfig(queueName);
     } else {
-      throw new Error(`Queue ${queueName} is not an infrastructure queue. Infrastructure queues must start with 'workflow.' or 'registry.'`);
+      throw new Error(`Queue ${queueName} is not an infrastructure queue. Infrastructure queues must start with 'workflow.', 'registry.', 'infrastructure.', or 'monitoring.'`);
     }
   }
 };

package/src/index.js

@@ -5,6 +5,9 @@
  * 
  * Core MQ client library for RabbitMQ - shared by infrastructure services and connectors.
  * Provides basic publish/consume functionality without business-specific features.
+ * 
+ * NOTE: Infrastructure orchestration utilities (waitForInfrastructureReady, initInfrastructureQueues)
+ * have been moved to @onlineapps/infrastructure-tools to keep this library focused on core MQ operations.
  */
 
 const BaseClient = require('./BaseClient');
@@ -16,16 +19,14 @@ const {
   ConsumeError,
   SerializationError,
 } = require('./utils/errorHandler');
-const { initInfrastructureQueues } = require('./utils/initInfrastructureQueues');
 
 // Export BaseClient as default (constructor), with additional named exports
-// NOTE: When destructuring, use: const { initInfrastructureQueues } = require('@onlineapps/mq-client-core');
+// NOTE: When destructuring, use: const { BaseClient } = require('@onlineapps/mq-client-core');
 // When using default, use: const BaseClient = require('@onlineapps/mq-client-core');
 // BaseClient must be a constructor, so we export it directly and attach other exports as properties
 module.exports = BaseClient;
 module.exports.BaseClient = BaseClient;
 module.exports.RabbitMQClient = RabbitMQClient;
-module.exports.initInfrastructureQueues = initInfrastructureQueues;
 module.exports.errors = {
   ValidationError,
   ConnectionError,

package/src/utils/initInfrastructureQueues.js

@@ -1,143 +0,0 @@
-'use strict';
-
-/**
- * initInfrastructureQueues.js
- * 
- * Utility for infrastructure services to initialize infrastructure queues.
- * Uses queueConfig from @onlineapps/conn-infra-mq for configuration.
- * 
- * NOTE: This is for infrastructure services (gateway, monitoring, etc.)
- * Business services should use @onlineapps/conn-infra-mq connector instead.
- */
-
-/**
- * Initialize all infrastructure queues
- * @param {Object} channel - RabbitMQ channel
- * @param {Object} options - Options
- * @param {Array<string>} [options.queues] - Specific queues to create (default: all infrastructure queues)
- * @param {Object} [options.logger] - Logger instance (default: console)
- * @returns {Promise<void>}
- */
-async function initInfrastructureQueues(channel, options = {}) {
-  if (!channel) {
-    throw new Error('initInfrastructureQueues requires a valid channel');
-  }
-
-  const logger = options.logger || console;
-  const connection = options.connection || channel.connection;
-  
-  // Load queueConfig from mq-client-core (spodní vrstva)
-  // NOTE: queueConfig is part of mq-client-core because it's used by both:
-  // - Infrastructure services (via mq-client-core)
-  // - Business services (via conn-infra-mq connector)
-  const queueConfig = options.queueConfig || require('../config/queueConfig');
-
-  const queuesToCreate = options.queues || [
-    // Workflow infrastructure queues
-    'workflow.init',
-    'workflow.completed',
-    'workflow.failed',
-    'workflow.dlq',
-    // Registry infrastructure queues
-    'registry.register',
-    'registry.heartbeats'
-  ];
-
-  const watchChannel = (ch) => {
-    if (!ch) return ch;
-    if (!ch.__queueInitLinked) {
-      ch.__queueInitLinked = true;
-      ch.once('close', () => {
-        ch.__queueInitClosed = true;
-        logger.warn('[QueueInit] Queue channel closed');
-      });
-      ch.on('error', (err) => {
-        ch.__queueInitClosed = true;
-        logger.warn(`[QueueInit] Queue channel error: ${err.message}`);
-      });
-    }
-    return ch;
-  };
-
-  let workingChannel = watchChannel(channel);
-
-  const getChannel = async (forceNew = false) => {
-    if (!forceNew && workingChannel && !workingChannel.__queueInitClosed) {
-      return workingChannel;
-    }
-    if (!connection) {
-      throw new Error('Queue channel closed and no connection reference available to recreate it');
-    }
-    workingChannel = watchChannel(await connection.createChannel());
-    return workingChannel;
-  };
-
-  logger.log(`[QueueInit] Initializing ${queuesToCreate.length} infrastructure queues...`);
-
-  for (const queueName of queuesToCreate) {
-    try {
-      // Verify it's an infrastructure queue
-      if (!queueConfig.isInfrastructureQueue(queueName)) {
-        logger.warn(`[QueueInit] Skipping ${queueName} - not an infrastructure queue`);
-        continue;
-      }
-
-      // Get unified configuration
-      const config = queueConfig.getInfrastructureQueueConfig(queueName);
-      
-      // CRITICAL: Check if queue exists with different arguments (406 error)
-      // If so, delete it and recreate with correct parameters
-      const ensureQueue = async () => {
-        const activeChannel = await getChannel();
-        return activeChannel.assertQueue(queueName, {
-          durable: config.durable !== false,
-          arguments: { ...config.arguments }
-        });
-      };
-
-      try {
-        await ensureQueue();
-        logger.log(`[QueueInit] ✓ Created/verified infrastructure queue: ${queueName}`);
-      } catch (assertError) {
-        if (assertError.code === 406) {
-          logger.warn(
-            `[QueueInit] ⚠ Queue ${queueName} exists with different arguments - deleting and recreating...`
-          );
-          try {
-            const deleteChannel = await getChannel(true);
-            await deleteChannel.deleteQueue(queueName);
-            logger.log(`[QueueInit] ✓ Deleted queue ${queueName} with incorrect parameters`);
-          } catch (deleteError) {
-            logger.error(
-              `[QueueInit] ✗ Failed to delete queue ${queueName}:`,
-              deleteError.message
-            );
-            throw new Error(
-              `Cannot delete queue ${queueName} with incorrect parameters: ${deleteError.message}`
-            );
-          }
-
-          // Recreate with correct parameters (force fresh channel to avoid closed state)
-          await getChannel(true);
-          await ensureQueue();
-          logger.log(
-            `[QueueInit] ✓ Recreated infrastructure queue: ${queueName} with correct parameters`
-          );
-        } else {
-          logger.error(`[QueueInit] ✗ Failed to create ${queueName}:`, assertError.message);
-          throw assertError;
-        }
-      }
-    } catch (error) {
-      logger.error(`[QueueInit] ✗ Failed to initialize queue ${queueName}:`, error.message);
-      throw error;
-    }
-  }
-
-  logger.log(`[QueueInit] Infrastructure queues initialization complete`);
-}
-
-module.exports = {
-  initInfrastructureQueues
-};
-