Fix merge issue in conflict, update security dependency

Author: milindl

examples/kafkajs/consumer.js

@@ -1,23 +1,16 @@
-const { Kafka } = require('../..').KafkaJS;
+const { Kafka, logLevel } = require('../..').KafkaJS;
 //const { Kafka } = require('kafkajs')
 
 async function consumerStart() {
     let consumer;
     var stopped = false;
 
     const kafka = new Kafka({
-        brokers: ['<fill>'],
-        ssl: true,
-        connectionTimeout: 5000,
-        sasl: {
-            mechanism: 'plain',
-            username: '<fill>',
-            password: '<fill>',
-        },
+        brokers: ['localhost:9092'],
     });
 
     consumer = kafka.consumer({
-      groupId: 'test-group',
+      groupId: 'test-group22' + Math.random(),
       rebalanceListener: {
         onPartitionsAssigned: async (assignment) => {
           console.log(`Assigned partitions ${JSON.stringify(assignment)}`);
@@ -33,10 +26,11 @@ async function consumerStart() {
       },
       rdKafka: {
         globalConfig: {
-        'enable.auto.commit': false
+        'debug': 'conf',
+        'enable.auto.commit': false,
+        'auto.offset.reset': 'error'
         },
         topicConfig: {
-          'auto.offset.reset': 'earliest'
         },
       }
     });
@@ -46,7 +40,7 @@ async function consumerStart() {
 
     await consumer.subscribe({
       topics: [
-        "topic2"
+        "test-topic"
       ]
     })
 

lib/kafkajs/_kafka.js

@@ -27,8 +27,8 @@ class Kafka {
     mergedConfig.rdKafka = mergedConfig.rdKafka ?? {};
 
     if (typeof config.rdKafka === 'object') {
-      Object.assign(mergedConfig.rdKafka.globalConfig ?? {}, config.rdKafka.globalConfig ?? {});
-      Object.assign(mergedConfig.rdKafka.topicConfig ?? {}, config.rdKafka.topicConfig ?? {});
+      mergedConfig.rdKafka.globalConfig = Object.assign(mergedConfig.rdKafka.globalConfig ?? {}, config.rdKafka.globalConfig ?? {});
+      mergedConfig.rdKafka.topicConfig = Object.assign(mergedConfig.rdKafka.topicConfig ?? {}, config.rdKafka.topicConfig ?? {});
       delete config.rdKafka;
     }
 

package-lock.json

@@ -32,9 +32,9 @@
   "devDependencies": {
     "@types/node": "^20.4.5",
     "bluebird": "^3.5.3",
-    "jest": "^29.7.0",
     "eslint": "8.54.0",
-    "jsdoc": "^3.4.0",
+    "jest": "^29.7.0",
+    "jsdoc": "^4.0.2",
     "jshint": "^2.10.1",
     "mocha": "^10.2.0",
     "node-gyp": "^9.3.1",