woonplan-packages-redishelper 1.0.65 → 1.0.69

package/dist/getters.js

@@ -4,7 +4,7 @@ exports.subscribeToMessageResponse = exports.requestAndWaitForList = exports.get
 var utils_1 = require("./utils");
 var memdb_1 = require("./memdb");
 var uuid_1 = require("uuid");
-var timeout = 250;
+var timeout = 1500;
 var getOrRequestData = function (config, request, service, data) {
     if (data === void 0) { data = {}; }
     return new Promise(function (resolve, reject) {
@@ -26,7 +26,7 @@ var requestAndWaitForData = function (getterclient, config, request, service, da
         var listenerclient = (0, memdb_1.getRedisClient)(config);
         subscribeToMessageResponse(listenerclient, messageid).
             then(function () {
-            console.log("subscribed to ".concat(messageid, " at ").concat(new Date().toISOString()));
+            //console.log( `subscribed to ${messageid} at ${new Date().toISOString()}` )
             // we are subscribed
             // send out the request
             getterclient.xadd((0, utils_1.getKeyRequestedChannelName)(service), '*', 'request', request, 'messageid', messageid, 'data', JSON.stringify(data))

package/dist/index.d.ts

@@ -1,7 +1,6 @@
-import { Redis } from "ioredis";
 import { RedisConfig, RedisMessage } from "./types";
 import { sendMessageToStream, publishMessageResponse } from "./setters";
 import { getOrRequestData, subscribeToMessageResponse, requestAndWaitForList } from "./getters";
-declare const listenToStream: (client: Redis, groupname: string, channelname: string, consumername: string, callback: Function) => Promise<boolean>;
+declare const listenToStream: (config: RedisConfig, groupname: string, channelname: string, consumername: string, callback: Function) => Promise<boolean>;
 declare const dataRequester: (config: RedisConfig, groupname: string, service: string, consumername: string, callback: Function) => void;
 export { listenToStream, RedisMessage, sendMessageToStream, publishMessageResponse, getOrRequestData, dataRequester, subscribeToMessageResponse, requestAndWaitForList };

package/dist/index.js

@@ -10,7 +10,8 @@ Object.defineProperty(exports, "subscribeToMessageResponse", { enumerable: true,
 Object.defineProperty(exports, "requestAndWaitForList", { enumerable: true, get: function () { return getters_1.requestAndWaitForList; } });
 var memdb_1 = require("./memdb");
 var utils_1 = require("./utils");
-var listenToStream = function (client, groupname, channelname, consumername, callback) { return new Promise(function (resolve, reject) {
+var listenToStream = function (config, groupname, channelname, consumername, callback) { return new Promise(function (resolve, reject) {
+    var client = (0, memdb_1.getRedisClient)(config);
     createGroup(client, groupname, channelname).then(function () {
         listenForMessage(client, groupname, channelname, consumername, callback);
         resolve(true);
@@ -111,8 +112,6 @@ var listenForMessage = function (client, groupname, channelname, consumername, c
                     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

@@ -12,13 +12,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendMessageToStream = exports.publishMessageResponse = void 0;
 var utils_1 = require("./utils");
 var publishMessageResponse = function (client, messageid, message) {
-    console.log("publishing to ".concat(messageid, " at ").concat(new Date().toISOString()));
+    //console.log( `publishing to ${messageid} at ${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, []);
-    console.log('sendings message', channelname);
+    console.log('sending message', channelname);
     return client.xadd.apply(client, __spreadArray([channelname, '*'], arrayOfKeysAndValues, false));
 };
 exports.sendMessageToStream = sendMessageToStream;

package/getters.ts

@@ -4,7 +4,7 @@ import { RedisConfig, Struct } from "./types"
 import { getRedisClient } from "./memdb"
 import { v4 as uuidv4 } from 'uuid';
 
-const timeout = 250;
+const timeout = 1500;
 
 const getOrRequestData = ( config:RedisConfig, request:string, service:string, data:Struct={} ) => new Promise((resolve, reject) => {
   const getterclient = getRedisClient( config )
@@ -36,7 +36,7 @@ const requestAndWaitForData = (
   subscribeToMessageResponse( listenerclient, messageid ).
   then(
     () => {      
-      console.log( `subscribed to ${messageid} at ${new Date().toISOString()}` )
+      //console.log( `subscribed to ${messageid} at ${new Date().toISOString()}` )
       // we are subscribed
       // send out the request
       getterclient.xadd( getKeyRequestedChannelName( service ), '*', 'request', request, 'messageid', messageid, 'data', JSON.stringify( data ) )

package/index.ts

@@ -5,7 +5,8 @@ import { getOrRequestData, subscribeToMessageResponse, requestAndWaitForList } f
 import { getRedisClient } from "./memdb"
 import { getKeyRequestedChannelName } from "./utils"
 
-const listenToStream = ( client:Redis, groupname:string, channelname:string, consumername:string, callback:Function ):Promise<boolean> => new Promise((resolve,reject) => { 
+const listenToStream = ( config:RedisConfig, groupname:string, channelname:string, consumername:string, callback:Function ):Promise<boolean> => new Promise((resolve,reject) => { 
+  const client = getRedisClient( config )
   createGroup( client, groupname, channelname ).then(
     ( ) => {
       listenForMessage( client, groupname, channelname, consumername, callback );
@@ -137,10 +138,6 @@ const listenForMessage = ( client:Redis, groupname:string, channelname:string, c
                 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.65",
+  "version": "1.0.69",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/setters.ts

@@ -4,14 +4,14 @@ import { RedisMessage } from "./types"
 import { getMessageReponseKey, redisMessageToArrayOfKeysAndValues, reduceArraysToArray } from "./utils"
 
 const publishMessageResponse = ( client:Redis, messageid:string, message:string ) => {
-  console.log( `publishing to ${messageid} at ${new Date().toISOString()}` )
+  //console.log( `publishing to ${messageid} at ${new Date().toISOString()}` )
   return client.publish( getMessageReponseKey( messageid ), message )
 }
 
 
 const sendMessageToStream = ( client:Redis, channelname:string, message:RedisMessage) => {
   const arrayOfKeysAndValues = redisMessageToArrayOfKeysAndValues( message ).reduce( reduceArraysToArray, [] );
-  console.log( 'sendings message', channelname )
+  console.log( 'sending message', channelname )
   return client.xadd( channelname, '*', ...arrayOfKeysAndValues )
 }