@cuppet/core 1.2.1 → 1.2.2

package/features/app/mqttManager.js

@@ -249,6 +249,35 @@ class MqttManager {
         });
     }
 
+    /** Wait for specific message on a topic with timeout. IMPORTANT: Message is position,case and whitespace sensitive.
+     * @param {string} topic - Topic to wait for message on
+     * @param {string} message - Message to wait for
+     * @param {number} timeoutSeconds - Timeout in seconds
+     * @returns {Promise<Object>} - Resolves with message when received
+     */
+    async waitForSpecificMessage(topic, message, timeoutSeconds = 10) {
+        const timeoutMs = timeoutSeconds * 1000;
+        const startTime = Date.now();
+
+        while (Date.now() - startTime < timeoutMs) {
+            const latestMessage = this.getLatestMessage(topic);
+            if (latestMessage) {
+                const latestMessageString = JSON.stringify(latestMessage.message);
+                const expectedMessageString = JSON.stringify(message);
+                if (latestMessageString === expectedMessageString) {
+                    return latestMessage;
+                } else {
+                    throw new Error(
+                        `Message: ${latestMessageString} on topic ${topic} does not match expected: ${expectedMessageString}`
+                    );
+                }
+            }
+            await new Promise((resolve) => setTimeout(resolve, 100));
+        }
+
+        throw new Error(`Timeout waiting for message on topic: ${topic} after ${timeoutSeconds} seconds`);
+    }
+
     /**
      * Check if client is connected
      * @returns {boolean}

package/features/app/stepDefinitions/mqttSteps.js

@@ -69,6 +69,20 @@ Then('I should receive a message on MQTT topic {string}', async function (topic)
     await mqttFunctions.validateMessageReceived(this.mqttManager, topic, 10);
 });
 
+/**
+ * Wait for a specific message on a topic with timeout
+ * @example Then I should receive the message "Hello World" on MQTT topic "test/response" within 5 seconds
+ */
+Then(
+    'I should receive the message {string} on MQTT topic {string} within {int} seconds',
+    async function (message, topic, timeout) {
+        await mqttFunctions.waitForSpecificMessage(this.mqttManager, topic, message, timeout);
+    }
+);
+
+Then('I should receive the message {string} on MQTT topic {string}', async function (message, topic) {
+    await mqttFunctions.waitForSpecificMessage(this.mqttManager, topic, message, 10);
+});
 /**
  * Validate the content of the latest message on a topic
  * @example Then the MQTT message on topic "test/echo" should equal "Hello World"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cuppet/core",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "description": "Core testing framework components for Cuppet - BDD framework based on Cucumber and Puppeteer",
     "main": "index.js",
     "files": [

package/src/mqttFunctions.js

@@ -98,6 +98,20 @@ module.exports = {
         return await mqttManager.waitForMessage(resolvedTopic, timeoutSeconds);
     },
 
+    /**
+     * Wait for a specific message on a topic with timeout
+     * @param {object} mqttManager - MQTT manager instance
+     * @param {string} topic - Topic to wait for message on
+     * @param {string} message - Message to wait for
+     * @param {number} timeoutSeconds - Timeout in seconds
+     * @returns {Promise<Object>} - Message object
+     */
+    waitForSpecificMessage: async function (mqttManager, topic, message, timeoutSeconds = 10) {
+        const resolvedTopic = await this.prepareTopic(topic);
+        const resolvedMessage = await this.prepareMessage(message);
+        return await mqttManager.waitForSpecificMessage(resolvedTopic, resolvedMessage, timeoutSeconds);
+    },
+
     /**
      * Get the latest message from a topic
      * @param {object} mqttManager - MQTT manager instance