woonplan-packages-redishelper 1.0.53 → 1.0.58

package/dist/getters.js

@@ -23,7 +23,6 @@ var getOrRequestKey = function (config, key, service) { return new Promise(funct
 }); };
 exports.getOrRequestKey = getOrRequestKey;
 var requestAndWaitForKey = function (getterclient, config, key, service) { return new Promise(function (resolve) {
-    service = capitalizeFirstLetter(service);
     var messageid = (0, uuid_1.v4)();
     // create a listener  
     var listenerclient = (0, memdb_1.getRedisClient)(config);
@@ -52,7 +51,7 @@ var requestAndWaitForKey = function (getterclient, config, key, service) { retur
         }, timeout);
     });
     // send out the request
-    getterclient.xadd("keyRequestedFrom".concat(service, "Service"), '*', 'key', key)
+    getterclient.xadd((0, utils_1.getKeyRequestedChannelName)(service), '*', 'key', key, 'messageid', messageid)
         .catch(function (e) {
         console.log(e);
         resolve(null);
@@ -64,11 +63,9 @@ exports.subscribeToMessageResponse = subscribeToMessageResponse;
 var requestAndWaitForList = function (client, service, listname, listsubject, props, _a) {
     if (props === void 0) { props = {}; }
     return new Promise(function (resolve) {
-        service = capitalizeFirstLetter(service);
         // send message for list to be created and then block untill we have a list
-        client.xadd("listRequestedFrom".concat(service, "Service"), '*', 'listname', listname, 'listsubject', listsubject, 'props', JSON.stringify(props))
+        client.xadd((0, utils_1.getListRequestedChannelName)(service), '*', 'listname', listname, 'listsubject', listsubject, 'props', JSON.stringify(props))
             .then(function () { return resolve(client.blmove(listname, listname, 'RIGHT', 'LEFT', 2)); });
     });
 };
 exports.requestAndWaitForList = requestAndWaitForList;
-var capitalizeFirstLetter = function (string) { return string.charAt(0).toUpperCase() + string.slice(1); };

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.requestAndWaitForList = exports.subscribeToMessageResponse = exports.getOrRequestKey = exports.publishMessageResponse = exports.sendMessageToStream = exports.listenToStream = void 0;
+exports.requestAndWaitForList = exports.subscribeToMessageResponse = exports.dataRequester = exports.getOrRequestKey = exports.publishMessageResponse = exports.sendMessageToStream = exports.listenToStream = void 0;
 var setters_1 = require("./setters");
 Object.defineProperty(exports, "sendMessageToStream", { enumerable: true, get: function () { return setters_1.sendMessageToStream; } });
 Object.defineProperty(exports, "publishMessageResponse", { enumerable: true, get: function () { return setters_1.publishMessageResponse; } });
@@ -8,6 +8,8 @@ var getters_1 = require("./getters");
 Object.defineProperty(exports, "getOrRequestKey", { enumerable: true, get: function () { return getters_1.getOrRequestKey; } });
 Object.defineProperty(exports, "subscribeToMessageResponse", { enumerable: true, get: function () { return getters_1.subscribeToMessageResponse; } });
 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) {
     createGroup(client, groupname, channelname).then(function () {
         listenForMessage(client, groupname, channelname, consumername, callback);
@@ -26,6 +28,65 @@ var createGroup = function (client, groupname, channelname) { return new Promise
         reject(error);
     });
 }); };
+// this function is made as a responsding function to getters/requestAndWaitForKey
+// dataRequester listens to a stream and then publishes a respond 
+var dataRequester = function (config, groupname, service, consumername, callback) {
+    var channelname = (0, utils_1.getKeyRequestedChannelName)(service);
+    var listenerclient = (0, memdb_1.getRedisClient)(config);
+    createGroup(listenerclient, groupname, channelname)
+        .then(function () { return listenForMessageForDataRequest(listenerclient, groupname, channelname, consumername, callback); });
+};
+exports.dataRequester = dataRequester;
+var getMessagedataFromResult = function (results) {
+    if (!results.length)
+        throw ('no-messagedata');
+    var result = results[0], messages = result[1];
+    if (!messages.length)
+        throw ('no-messagedata');
+    var message = messages[0], id = message[0], keysandvalues = message[1];
+    var messagedata = {};
+    keysandvalues.forEach(function (key, n) {
+        if (!(n == 0 || n % 2 == 0))
+            return;
+        messagedata[key] = keysandvalues[n + 1];
+    });
+    return { messagedata: messagedata, id: id };
+};
+var listenForMessageForDataRequest = function (listenerclient, groupname, channelname, consumername, callback) {
+    console.log("listening to ".concat(channelname, " as ").concat(consumername));
+    var streammsgid = '';
+    var messageid = '';
+    // block client while listening for a message
+    listenerclient.xreadgroup('GROUP', groupname, consumername, 'COUNT', 1, 'BLOCK', 0, 'STREAMS', channelname, '>')
+        .then(function (results) {
+        return getMessagedataFromResult(results);
+    })
+        .then(function (_a) {
+        var messagedata = _a.messagedata, id = _a.id;
+        // messageid should have been set in getters/requestAndWaitForKey
+        if ('messageid' in messagedata)
+            messageid = messagedata.id;
+        //stream id from redis
+        streammsgid = id;
+        return messagedata;
+    })
+        .then(function (messagedata) {
+        return callback(messagedata, streammsgid);
+    })
+        .then(function (result) {
+        return (0, setters_1.publishMessageResponse)(listenerclient, messageid, result != null ? result : '');
+    })
+        .catch(function (e) {
+        console.log(e);
+        return (0, setters_1.publishMessageResponse)(listenerclient, messageid, '');
+    })
+        .finally(function () {
+        listenerclient.xack(channelname, groupname, streammsgid).then(function () {
+            console.log(streammsgid + ' acknowledged');
+        });
+        listenForMessageForDataRequest(listenerclient, groupname, channelname, consumername, callback);
+    });
+};
 var listenForMessage = function (client, groupname, channelname, consumername, callback, lastId) {
     if (lastId === void 0) { lastId = "$"; }
     console.log("listening to ".concat(channelname, " as ").concat(consumername));

package/dist/utils.d.ts

@@ -2,4 +2,6 @@ import { RedisMessage } from "./types";
 declare const getMessageReponseKey: (messageid: string) => string;
 declare const reduceArraysToArray: (toArray: any[], fromArray: []) => any[];
 declare const redisMessageToArrayOfKeysAndValues: (message: RedisMessage) => any[];
-export { getMessageReponseKey, redisMessageToArrayOfKeysAndValues, reduceArraysToArray };
+declare const getKeyRequestedChannelName: (service: string) => string;
+declare const getListRequestedChannelName: (service: string) => string;
+export { getMessageReponseKey, redisMessageToArrayOfKeysAndValues, reduceArraysToArray, getKeyRequestedChannelName, getListRequestedChannelName };

package/dist/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reduceArraysToArray = exports.redisMessageToArrayOfKeysAndValues = exports.getMessageReponseKey = void 0;
+exports.getListRequestedChannelName = exports.getKeyRequestedChannelName = exports.reduceArraysToArray = exports.redisMessageToArrayOfKeysAndValues = exports.getMessageReponseKey = void 0;
 var messagePrefix = "messageresponse";
 var getMessageReponseKey = function (messageid) { return messagePrefix + messageid; };
 exports.getMessageReponseKey = getMessageReponseKey;
@@ -8,3 +8,8 @@ var reduceArraysToArray = function (toArray, fromArray) { return toArray.concat(
 exports.reduceArraysToArray = reduceArraysToArray;
 var redisMessageToArrayOfKeysAndValues = function (message) { return Object.keys(message).map(function (key) { return [key, message[key]]; }); };
 exports.redisMessageToArrayOfKeysAndValues = redisMessageToArrayOfKeysAndValues;
+var capitalizeFirstLetter = function (string) { return string.charAt(0).toUpperCase() + string.slice(1); };
+var getKeyRequestedChannelName = function (service) { return "keyRequestedFrom".concat(capitalizeFirstLetter(service), "Service"); };
+exports.getKeyRequestedChannelName = getKeyRequestedChannelName;
+var getListRequestedChannelName = function (service) { return "listRequestedFrom".concat(capitalizeFirstLetter(service), "Service"); };
+exports.getListRequestedChannelName = getListRequestedChannelName;

package/getters.ts

@@ -1,5 +1,5 @@
 import { Redis } from "ioredis"
-import { getMessageReponseKey } from "./utils"
+import { getMessageReponseKey, getKeyRequestedChannelName, getListRequestedChannelName } from "./utils"
 import { RedisConfig } from "./types"
 import { getRedisClient } from "./memdb"
 import { v4 as uuidv4 } from 'uuid';
@@ -34,9 +34,7 @@ const requestAndWaitForKey = (
   config:RedisConfig,
   key:string,
   service:string,
-) => new Promise((resolve) => {
-  service = capitalizeFirstLetter( service );
-  
+) => new Promise((resolve) => {  
   const messageid  = uuidv4()
 
   // create a listener  
@@ -70,7 +68,7 @@ const requestAndWaitForKey = (
   )
 
   // send out the request
-  getterclient.xadd( `keyRequestedFrom${service}Service`, '*', 'key', key )
+  getterclient.xadd( getKeyRequestedChannelName( service ), '*', 'key', key, 'messageid', messageid )
   .catch(
     (e) => {
       console.log( e )
@@ -94,17 +92,14 @@ const requestAndWaitForList = (
   props = {}
 ,{
   
-}) => new Promise((resolve) => {
-  service = capitalizeFirstLetter( service );
-  
+}) => new Promise((resolve) => {  
   // send message for list to be created and then block untill we have a list
-  client.xadd( `listRequestedFrom${service}Service`, '*', 'listname', listname, 'listsubject', listsubject, 'props', JSON.stringify( props ))
+  client.xadd( getListRequestedChannelName( service ), '*', 'listname', listname, 'listsubject', listsubject, 'props', JSON.stringify( props ))
   .then(
     () => resolve( client.blmove( listname, listname, 'RIGHT', 'LEFT', 2) )
   )
 })
 
-const capitalizeFirstLetter = (string:string) => string.charAt(0).toUpperCase() + string.slice(1)
 
 
 export { getOrRequestKey, requestAndWaitForList, subscribeToMessageResponse }

package/index.ts

@@ -1,7 +1,9 @@
 import { Redis } from "ioredis"
-import { RedisMessage } from "./types"
+import { RedisConfig, RedisMessage, Struct } from "./types"
 import { sendMessageToStream, publishMessageResponse } from "./setters"
 import { getOrRequestKey, subscribeToMessageResponse, requestAndWaitForList } from "./getters"
+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) => { 
   createGroup( client, groupname, channelname ).then(
@@ -31,6 +33,81 @@ const createGroup = ( client:Redis, groupname:string, channelname:string ):Promi
   )
 })
 
+
+// this function is made as a responsding function to getters/requestAndWaitForKey
+// dataRequester listens to a stream and then publishes a respond 
+const dataRequester = ( config:RedisConfig, groupname:string, service:string, consumername:string, callback:Function ) => {
+  const channelname = getKeyRequestedChannelName( service ) ;
+  const listenerclient = getRedisClient( config )
+  createGroup( listenerclient, groupname, channelname )
+  .then(
+    () => listenForMessageForDataRequest( listenerclient, groupname, channelname, consumername, callback )
+  )
+}
+
+const getMessagedataFromResult = ( results:any ) => {
+  if( !results.length ) throw('no-messagedata');
+
+  const result    = results[0],
+        messages  = result[1]
+
+  if( !messages.length ) throw('no-messagedata');
+  const message       = messages[0],
+        id            = message[0],
+        keysandvalues = message[1] as string[]
+
+  let messagedata:RedisMessage = {};
+
+  keysandvalues.forEach( (key, n ) => {
+    if( !( n == 0 || n % 2 == 0 ) ) return;
+    messagedata[key] = keysandvalues[n+1];
+  })
+
+  return { messagedata, id}
+}
+
+const listenForMessageForDataRequest = (
+  listenerclient:Redis, groupname:string, channelname:string, consumername:string, callback:Function
+) => {
+  console.log( `listening to ${channelname} as ${consumername}`)
+  let streammsgid = '';
+  let messageid   = '';
+  // block client while listening for a message
+  listenerclient.xreadgroup('GROUP', groupname, consumername, 'COUNT', 1, 'BLOCK', 0, 'STREAMS', channelname, '>')
+  .then( (results) => 
+    getMessagedataFromResult( results )
+  )
+  .then(({messagedata,id}) => {      
+      // messageid should have been set in getters/requestAndWaitForKey
+      if( 'messageid' in messagedata ) messageid = messagedata.id;
+
+      //stream id from redis
+      streammsgid = id;
+      return messagedata
+    } 
+  )
+  .then( (messagedata) =>
+    callback( messagedata, streammsgid )
+  )
+  .then(( result:any ) => 
+    publishMessageResponse( listenerclient, messageid, result != null ? result : '' )
+  )
+  .catch((e)=>{
+    console.log( e )
+    return publishMessageResponse( listenerclient, messageid, '' )
+  })
+  .finally( () => 
+    {
+      listenerclient.xack( channelname, groupname, streammsgid ).then( () => {
+        console.log( streammsgid + ' acknowledged')
+      })
+      listenForMessageForDataRequest( listenerclient, groupname, channelname, consumername, callback );
+
+    }
+  )
+}
+
+
 const listenForMessage = ( client:Redis, groupname:string, channelname:string, consumername:string, callback:Function, lastId = "$" ) => {
   console.log( `listening to ${channelname} as ${consumername}`)
   client.xreadgroup('GROUP', groupname, consumername, 'COUNT', 1, 'BLOCK', 0, 'STREAMS', channelname, '>')
@@ -81,4 +158,4 @@ const listenForMessage = ( client:Redis, groupname:string, channelname:string, c
     })
 }
 
-export { listenToStream, RedisMessage, sendMessageToStream, publishMessageResponse, getOrRequestKey, subscribeToMessageResponse, requestAndWaitForList }
+export { listenToStream, RedisMessage, sendMessageToStream, publishMessageResponse, getOrRequestKey, dataRequester, subscribeToMessageResponse, requestAndWaitForList }

package/package.json

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

package/utils.ts

@@ -4,5 +4,7 @@ const messagePrefix:string = "messageresponse";
 const getMessageReponseKey = ( messageid:string ) => messagePrefix + messageid
 const reduceArraysToArray = ( toArray:any[], fromArray:[] ) => toArray.concat( fromArray )
 const redisMessageToArrayOfKeysAndValues = ( message:RedisMessage ):any[] => Object.keys(message).map((key) => [ key, message[key]]);
-
-export { getMessageReponseKey, redisMessageToArrayOfKeysAndValues, reduceArraysToArray };
+const capitalizeFirstLetter = (string:string) => string.charAt(0).toUpperCase() + string.slice(1)
+const getKeyRequestedChannelName = ( service:string ) => `keyRequestedFrom${capitalizeFirstLetter(service)}Service`
+const getListRequestedChannelName = ( service:string ) => `listRequestedFrom${capitalizeFirstLetter(service)}Service`
+export { getMessageReponseKey, redisMessageToArrayOfKeysAndValues, reduceArraysToArray, getKeyRequestedChannelName, getListRequestedChannelName };