woonplan-packages-redishelper 1.0.47 → 1.0.51

package/dist/getters.js

@@ -20,11 +20,14 @@ var getOrRequestKey = function (client, key, service) { return new Promise(funct
 exports.getOrRequestKey = getOrRequestKey;
 var requestAndWaitForKey = function (client, key, service) { return new Promise(function (resolve) {
     service = capitalizeFirstLetter(service);
+    var createdMessageId = '';
     client.xadd("keyRequestedFrom".concat(service, "Service"), '*', 'key', key)
         .then(function (messageid) {
+        createdMessageId = messageid;
         // create a key to listen to, the key contains the message we just created;
         return subscribeToMessageResponse(client, messageid);
     }).then(function () {
+        console.log("subscribed to ".concat(createdMessageId, " at ").concat(new Date().toISOString()));
         // we are subscribed
         // setting up a one time event listener
         client.once("message", function (channel, message) {
@@ -45,7 +48,7 @@ var requestAndWaitForKey = function (client, key, service) { return new Promise(
                 client.unsubscribe();
                 resolve(null);
             }
-        }, 2000);
+        }, 250);
     }).catch(function (e) {
         console.log(e);
         resolve(null);

package/dist/index.js

@@ -46,13 +46,13 @@ var listenForMessage = function (client, groupname, channelname, consumername, c
                 });
                 callback(messagedata, id, client).catch(function (error) {
                     console.log(error);
-                    // in case somebody was subscribed to the response;
-                    (0, setters_1.publishMessageResponse)(client, id, '');
                 }).finally(function () {
                     // not sure yet? For now always acknowledge
                     client.xack(channelname, groupname, id).then(function () {
                         console.log(id + ' acknowledged');
                     });
+                    // in case somebody was subscribed to the response;
+                    (0, setters_1.publishMessageResponse)(client, id, '');
                     // relisten 
                     listenForMessage(client, groupname, channelname, consumername, callback);
                 });

package/dist/setters.js

@@ -11,7 +11,10 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendMessageToStream = exports.publishMessageResponse = void 0;
 var utils_1 = require("./utils");
-var publishMessageResponse = function (client, messageid, message) { return client.publish((0, utils_1.getMessageReponseKey)(messageid), message); };
+var publishMessageResponse = function (client, messageid, message) {
+    console.log("publishing to ".concat(messageid, " at ").concat(new Date().toISOString()));
+    return client.publish((0, utils_1.getMessageReponseKey)(messageid), message);
+};
 exports.publishMessageResponse = publishMessageResponse;
 var sendMessageToStream = function (client, channelname, message) {
     var arrayOfKeysAndValues = (0, utils_1.redisMessageToArrayOfKeysAndValues)(message).reduce(utils_1.reduceArraysToArray, []);

package/getters.ts

@@ -29,14 +29,21 @@ const requestAndWaitForKey = (
 ) => new Promise((resolve) => {
   service = capitalizeFirstLetter( service );
   
+  let createdMessageId = '';
+
   client.xadd( `keyRequestedFrom${service}Service`, '*', 'key', key )
   .then(
     (messageid:string) => {
+      createdMessageId = messageid;
       // create a key to listen to, the key contains the message we just created;
       return subscribeToMessageResponse( client, messageid )
     }
   ).then(
     () => {
+
+      
+      console.log( `subscribed to ${createdMessageId} at ${new Date().toISOString()}` )
+
       // we are subscribed
       // setting up a one time event listener
       client.once( "message", ( channel, message ) => {
@@ -63,7 +70,7 @@ const requestAndWaitForKey = (
           resolve( null )
         }
         
-      }, 2000 )
+      }, 250 )
     }
   ).catch(
     (e) => {

package/index.ts

@@ -56,14 +56,16 @@ const listenForMessage = ( client:Redis, groupname:string, channelname:string, c
               callback( messagedata, id, client ).catch(
                 ( error:Error ) => {
                   console.log( error );
-                  // in case somebody was subscribed to the response;
-                  publishMessageResponse( client, id, '' );
                 }
               ).finally(()=>{
                 // not sure yet? For now always acknowledge
                 client.xack( channelname, groupname, id ).then( () => {
                   console.log( id + ' acknowledged')
                 })
+                
+                  // in case somebody was subscribed to the response;
+                  publishMessageResponse( client, id, '' );
+
                 // relisten 
                 listenForMessage( client, groupname, channelname, consumername, callback );
               })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "woonplan-packages-redishelper",
-  "version": "1.0.47",
+  "version": "1.0.51",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/setters.ts

@@ -3,7 +3,10 @@ import { Redis } from "ioredis"
 import { RedisMessage } from "./types"
 import { getMessageReponseKey, redisMessageToArrayOfKeysAndValues, reduceArraysToArray } from "./utils"
 
-const publishMessageResponse = ( client:Redis, messageid:string, message:string ) => client.publish( getMessageReponseKey( messageid ), message )
+const publishMessageResponse = ( client:Redis, messageid:string, message:string ) => {
+  console.log( `publishing to ${messageid} at ${new Date().toISOString()}` )
+  return client.publish( getMessageReponseKey( messageid ), message )
+}
 
 
 const sendMessageToStream = ( client:Redis, channelname:string, message:RedisMessage) => {