@onlineapps/mq-client-core 1.0.18 → 1.0.20

package/package.json

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

package/src/index.js

@@ -18,27 +18,19 @@ const {
 } = require('./utils/errorHandler');
 const { initInfrastructureQueues } = require('./utils/initInfrastructureQueues');
 
-// Export BaseClient as default, with additional exports
+// Export BaseClient as default (constructor), with additional named exports
 // NOTE: When destructuring, use: const { initInfrastructureQueues } = require('@onlineapps/mq-client-core');
 // When using default, use: const BaseClient = require('@onlineapps/mq-client-core');
-const mqExports = {
-  BaseClient,
-  RabbitMQClient,
-  initInfrastructureQueues,
-  errors: {
-    ValidationError,
-    ConnectionError,
-    PublishError,
-    ConsumeError,
-    SerializationError,
-  }
+// 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,
+  PublishError,
+  ConsumeError,
+  SerializationError,
 };
 
-// Set BaseClient as default export (for backward compatibility)
-// Also attach all properties to the exported object
-Object.setPrototypeOf(mqExports, BaseClient);
-Object.assign(mqExports, BaseClient);
-
-// Export as both default and named exports
-module.exports = mqExports;
-

package/src/transports/rabbitmqClient.js

@@ -59,7 +59,12 @@ class RabbitMQClient extends EventEmitter {
    */
   async connect() {
     try {
-      this._connection = await amqp.connect(this._config.host);
+      // Add connection timeout to prevent hanging
+      const connectPromise = amqp.connect(this._config.host);
+      const timeoutPromise = new Promise((_, reject) => {
+        setTimeout(() => reject(new Error('Connection timeout after 10 seconds')), 10000);
+      });
+      this._connection = await Promise.race([connectPromise, timeoutPromise]);
       this._connection.on('error', (err) => this.emit('error', err));
       this._connection.on('close', () => {
         // Emit a connection close error to notify listeners