woonplan-packages-redishelper 1.0.38 → 1.0.42

package/dist/getters.d.ts

@@ -1,5 +1,7 @@
 import { Redis } from "ioredis";
+import { Struct } from "./types";
 declare const getOrRequestKey: (client: Redis, key: string, service: string) => Promise<unknown>;
-declare const subscribeToMessageResponse: (client: Redis, messageid: string) => Promise<number>;
+declare const requestAndWaitForData: (client: Redis, data: Struct, service: string) => Promise<unknown>;
+declare const subscribeToMessageResponse: (client: Redis, messageid: string, timeout: number) => void;
 declare const requestAndWaitForList: (client: Redis, service: string, listname: string, listsubject: string, props: {} | undefined, {}: {}) => Promise<unknown>;
-export { getOrRequestKey, requestAndWaitForList, subscribeToMessageResponse };
+export { getOrRequestKey, requestAndWaitForList, subscribeToMessageResponse, requestAndWaitForData };

package/dist/getters.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.subscribeToMessageResponse = exports.requestAndWaitForList = exports.getOrRequestKey = void 0;
+exports.requestAndWaitForData = exports.subscribeToMessageResponse = exports.requestAndWaitForList = exports.getOrRequestKey = void 0;
 var utils_1 = require("./utils");
 var getOrRequestKey = function (client, key, service) { return new Promise(function (resolve, reject) {
     client.get(key)
@@ -23,7 +23,7 @@ var requestAndWaitForKey = function (client, key, service) { return new Promise(
     client.xadd("keyRequestedFrom".concat(service, "Service"), '*', 'key', key)
         .then(function (messageid) {
         // create a key to listen to, the key contains the message we just created;
-        return subscribeToMessageResponse(client, messageid);
+        return subscribeToMessageResponse(client, messageid, 250);
     }).then(function () {
         // we are subscribed
         // setting up a one time event listener
@@ -36,9 +36,44 @@ var requestAndWaitForKey = function (client, key, service) { return new Promise(
                     resolve(null);
             });
         });
-    }).catch(function () { return resolve(null); });
+    }).catch(function (e) {
+        console.log(e);
+        resolve(null);
+    });
+}); };
+var requestAndWaitForData = function (client, data, service) { return new Promise(function (resolve) {
+    service = capitalizeFirstLetter(service);
+    client.xadd("dataRequestedFrom".concat(service, "Service"), '*', 'data', JSON.stringify(data))
+        .then(function (messageid) {
+        // create a key to listen to, the key contains the message we just created;
+        return subscribeToMessageResponse(client, messageid, 250);
+    }).then(function () {
+        // we are subscribed
+        // setting up a one time event listener
+        client.once("message", function (channel, message) {
+            console.log("unsubscribing from ".concat(channel));
+            client.unsubscribe().then(function () {
+                if (message.length)
+                    resolve(message);
+                else
+                    resolve(null);
+            });
+        });
+    }).catch(function (e) {
+        console.log(e);
+        resolve(null);
+    });
 }); };
-var subscribeToMessageResponse = function (client, messageid) { return client.subscribe((0, utils_1.getMessageReponseKey)(messageid)); };
+exports.requestAndWaitForData = requestAndWaitForData;
+var subscribeToMessageResponse = function (client, messageid, timeout) {
+    setTimeout(function () {
+        if (client.status != "end") {
+            console.log("sub ".concat(messageid, " timedout"));
+            client.disconnect();
+        }
+    }, timeout);
+    client.subscribe((0, utils_1.getMessageReponseKey)(messageid));
+};
 exports.subscribeToMessageResponse = subscribeToMessageResponse;
 var requestAndWaitForList = function (client, service, listname, listsubject, props, _a) {
     if (props === void 0) { props = {}; }

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Redis } from "ioredis";
 import { RedisMessage } from "./types";
 import { sendMessageToStream, publishMessageResponse } from "./setters";
-import { getOrRequestKey, subscribeToMessageResponse, requestAndWaitForList } from "./getters";
+import { getOrRequestKey, subscribeToMessageResponse, requestAndWaitForList, requestAndWaitForData } 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 };
+export { listenToStream, RedisMessage, sendMessageToStream, publishMessageResponse, requestAndWaitForData, getOrRequestKey, 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.getOrRequestKey = exports.requestAndWaitForData = 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,7 @@ 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; } });
+Object.defineProperty(exports, "requestAndWaitForData", { enumerable: true, get: function () { return getters_1.requestAndWaitForData; } });
 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);

package/dist/types.d.ts

@@ -1,3 +1,6 @@
 export interface RedisMessage {
     [index: string]: any;
 }
+export interface Struct {
+    [index: string]: any;
+}

package/getters.ts

@@ -1,5 +1,6 @@
 import { Redis } from "ioredis"
 import { getMessageReponseKey } from "./utils"
+import { Struct } from "./types"
 const getOrRequestKey = ( client:Redis, key:string, service:string ) => new Promise((resolve, reject) => {
   client.get( key )
   .then(
@@ -32,7 +33,7 @@ const requestAndWaitForKey = (
   .then(
     (messageid:string) => {
       // create a key to listen to, the key contains the message we just created;
-      return subscribeToMessageResponse( client, messageid )
+      return subscribeToMessageResponse( client, messageid, 250 )
     }
   ).then(
     () => {
@@ -51,11 +52,61 @@ const requestAndWaitForKey = (
       })
     }
   ).catch(
-    () => resolve( null )
+    (e) => {
+      console.log( e )
+      resolve( null )
+    }
   )
 })
 
-const subscribeToMessageResponse = ( client:Redis, messageid:string ) => client.subscribe( getMessageReponseKey( messageid ) )
+
+const requestAndWaitForData = (
+  client:Redis,
+  data:Struct,
+  service:string,
+) => new Promise((resolve) => {
+  service = capitalizeFirstLetter( service );
+  
+  client.xadd( `dataRequestedFrom${service}Service`, '*', 'data', JSON.stringify( data ) )
+  .then(
+    (messageid:string) => {
+      // create a key to listen to, the key contains the message we just created;
+      return subscribeToMessageResponse( client, messageid, 250 )
+    }
+  ).then(
+    () => {
+      // we are subscribed
+      // setting up a one time event listener
+      client.once( "message", ( channel, message ) => {
+        console.log( `unsubscribing from ${channel}` )
+
+        client.unsubscribe().then(
+          () => {          
+            if( message.length ) resolve( message );
+            else resolve( null )
+          }
+        );
+
+      })
+    }
+  ).catch(
+    (e) => {
+      console.log( e )
+      resolve( null )
+    }
+  )
+})
+
+const subscribeToMessageResponse = ( client:Redis, messageid:string, timeout:number ) => {
+  setTimeout( () => {
+    if( client.status != "end" ){
+      console.log( `sub ${messageid} timedout`)
+      client.disconnect()
+    }
+    
+  }, timeout )
+  client.subscribe( getMessageReponseKey( messageid ) )
+}
 
 
 const requestAndWaitForList = (
@@ -79,4 +130,4 @@ const requestAndWaitForList = (
 const capitalizeFirstLetter = (string:string) => string.charAt(0).toUpperCase() + string.slice(1)
 
 
-export { getOrRequestKey, requestAndWaitForList, subscribeToMessageResponse }
+export { getOrRequestKey, requestAndWaitForList, subscribeToMessageResponse, requestAndWaitForData }

package/index.ts

@@ -1,7 +1,7 @@
 import { Redis } from "ioredis"
 import { RedisMessage } from "./types"
 import { sendMessageToStream, publishMessageResponse } from "./setters"
-import { getOrRequestKey, subscribeToMessageResponse, requestAndWaitForList } from "./getters"
+import { getOrRequestKey, subscribeToMessageResponse, requestAndWaitForList, requestAndWaitForData } from "./getters"
 
 const listenToStream = ( client:Redis, groupname:string, channelname:string, consumername:string, callback:Function ):Promise<boolean> => new Promise((resolve,reject) => { 
   createGroup( client, groupname, channelname ).then(
@@ -79,4 +79,4 @@ const listenForMessage = ( client:Redis, groupname:string, channelname:string, c
     })
 }
 
-export { listenToStream, RedisMessage, sendMessageToStream, publishMessageResponse, getOrRequestKey, subscribeToMessageResponse, requestAndWaitForList }
+export { listenToStream, RedisMessage, sendMessageToStream, publishMessageResponse, requestAndWaitForData, getOrRequestKey, subscribeToMessageResponse, requestAndWaitForList }

package/package.json

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

package/types.ts

@@ -1,3 +1,7 @@
 export interface RedisMessage{
   [index: string]: any;  
 }
+export interface Struct{
+  [index: string]: any;  
+}
+