@shushed/helpers 0.0.133 → 0.0.134

package/dist/index.js

@@ -171159,6 +171159,7 @@ var ActionHelper = class _ActionHelper {
       fromPubSub,
       matchByPartialQueryString
     } = routingConditions || {};
+    const reqIsPubSub = isPubSubRequest(optionsEnchanced.request.headers);
     const routingRequired = havingApiKey || fromScheduler || fromPubSub || matchByPartialQueryString || matchByPubSubSubscriptionName;
     if (!routingRequired) {
       return true;
@@ -171176,26 +171177,29 @@ var ActionHelper = class _ActionHelper {
         routingMatched = true;
       }
     }
-    if (matchByPartialQueryString) {
+    if (matchByPartialQueryString && !reqIsPubSub) {
+      let queryStringMatched = false;
       const querystring = optionsEnchanced.request.querystring || "";
       if (typeof matchByPartialQueryString === "string") {
         if (querystring.indexOf(matchByPartialQueryString) !== -1) {
-          routingMatched = true;
+          queryStringMatched = true;
         }
       } else {
         const match = querystring.match(matchByPartialQueryString);
         if (match) {
-          routingMatched = true;
+          queryStringMatched = true;
         }
       }
+      routingMatched = queryStringMatched;
     }
-    if (matchByPubSubSubscriptionName && message?.subscriptionName) {
+    if (matchByPubSubSubscriptionName && reqIsPubSub) {
+      routingMatched = false;
       if (typeof matchByPubSubSubscriptionName === "string") {
         if (message.subscriptionName === matchByPubSubSubscriptionName) {
           routingMatched = true;
         }
       } else {
-        const match = message.subscriptionName.match(matchByPubSubSubscriptionName);
+        const match = (message?.subscriptionName || "").match(matchByPubSubSubscriptionName);
         if (match) {
           routingMatched = true;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shushed/helpers",
-  "version": "0.0.133",
+  "version": "0.0.134",
   "author": "",
   "license": "UNLICENSED",
   "description": "",