Fix: Use the default message when no valid message option is provided

SolaceLabs · Feb 26, 2024 · 2d5af17 · 2d5af17
1 parent 709e858
commit 2d5af17
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stm",
-  "version": "0.0.30",
+  "version": "0.0.31",
   "description": "Solace Try-Me Command Line Tool",
   "keywords": [
     "solace",

diff --git a/src/lib/publish.ts b/src/lib/publish.ts
@@ -38,7 +38,7 @@ const publish = async (
   }
 
   var message:any = options.message as string;
-  message = (optionsSource.defaultMessage === 'cli') ? getDefaultMessage() : message;
+  message = (optionsSource.defaultMessage === 'default' || optionsSource.defaultMessage === 'cli') ? getDefaultMessage() : message;
 
   var contentType:any = options.contentType as string;
 
@@ -69,7 +69,7 @@ const publish = async (
 
   if (count === 1) {
     for (var i=0; i<options.topic.length; i++) {
-      if (optionsSource.defaultMessage === 'cli') message = getDefaultMessage();
+      if (optionsSource.defaultMessage === 'default' || optionsSource.defaultMessage === 'cli') message = getDefaultMessage();
       publisher.publish(options.topic[i], message, contentType, 0);
     } 
     if (options.waitBeforeExit) {
@@ -83,7 +83,7 @@ const publish = async (
   } else {
     for (var iter=count ? count : 1, n=1;iter > 0;iter--, n++) {
       for (var i=0; i<options.topic.length; i++) {
-        if (optionsSource.defaultMessage === 'cli') message = getDefaultMessage();
+        if (optionsSource.defaultMessage === 'default' || optionsSource.defaultMessage === 'cli') message = getDefaultMessage();
         publisher.publish(options.topic[i], message, contentType, n-1);
       }
       if (interval) await delay(interval)

diff --git a/src/lib/reply.ts b/src/lib/reply.ts
@@ -37,7 +37,7 @@ const reply = async (
   });
 
   var message:any = options.message as string;
-  message = (optionsSource.defaultMessage === 'cli') ? getDefaultMessage() : message;
+  message = (optionsSource.defaultMessage === 'default' || optionsSource.defaultMessage === 'cli') ? getDefaultMessage() : message;
 
   var contentType:any = options.contentType as string;
 

diff --git a/src/lib/request.ts b/src/lib/request.ts
@@ -37,7 +37,7 @@ const request = async (
   });
 
   var message:any = options.message as string;
-  message = (optionsSource.defaultMessage === 'cli') ? getDefaultMessage() : message;
+  message = (optionsSource.defaultMessage === 'default' || optionsSource.defaultMessage === 'cli') ? getDefaultMessage() : message;
 
   var contentType:any = options.contentType as string;