Add msgId attribute in the message object passed onto the callback registered during AQ subscription

Author: sharadraju

doc/src/release_notes.rst

@@ -69,6 +69,12 @@ Thin Mode Changes
 Thick Mode Changes
 ++++++++++++++++++
 
+#)  Added msgID (message Id) attribute in the message object passed onto the
+    callback registered during AQ subscription. The msgID attribute passed
+    with the callback functions can be compared with the msgID attribute
+    returned by the deq* functions for proper validation of the returned
+    message objects during message dequeue.
+
 #)  Added support to return a message object from the :meth:`queue.enqOne()
     <aqQueue.enqOne()>` and :meth:`queue.enqMany() <aqQueue.enqMany()>`
     functions.  This message object contains a ``msgId`` attribute identifying

lib/connection.js

@@ -1240,7 +1240,7 @@ class Connection extends EventEmitter {
     errors.assertArgCount(arguments, 2, 2);
     errors.assertParamValue(typeof name === 'string', 1);
     errors.assertParamValue(nodbUtil.isObject(options), 2);
-    options = {...options};
+    options = {name: name, ...options};
     errors.assertParamPropUnsignedInt(options, 2, "namespace");
     if (options.namespace === undefined)
       options.namespace = constants.SUBSCR_NAMESPACE_DBCHANGE;
@@ -1273,7 +1273,6 @@ class Connection extends EventEmitter {
       delete outValue.subscription;
     } else {
       subscription = outValue;
-      outValue = undefined;
     }
     _subscriptions.set(name, subscription);
     return outValue;

src/njsConnection.c

@@ -2198,6 +2198,9 @@ NJS_NAPI_METHOD_IMPL_ASYNC(njsConnection_subscribe, 2, NULL)
             return false;
         NJS_CHECK_NAPI(env, napi_create_reference(env, callback, 1,
                 &baton->subscription->jsCallback))
+        if (!njsUtils_getNamedPropertyString(env, args[1], "name",
+                &baton->name, &baton->nameLength))
+            return false;
     }
 
     // get options that are used for registering queries

src/njsSubscription.c

@@ -136,6 +136,14 @@ static bool njsSubscription_createMessage(napi_env env,
                 "queries", array))
     }
 
+    // msgId
+    if (message->aqMsgId && message->aqMsgIdLength > 0) {
+        NJS_CHECK_NAPI(env, napi_create_buffer_copy(env,
+                message->aqMsgIdLength, message->aqMsgId, NULL, &temp))
+        NJS_CHECK_NAPI(env, napi_set_named_property(env, *messageObj, "msgId",
+                temp))
+    }
+
     return true;
 }