woonplan-packages-redishelper 1.0.59 → 1.0.63

package/dist/getters.d.ts

@@ -1,6 +1,6 @@
 import { Redis } from "ioredis";
-import { RedisConfig } from "./types";
-declare const getOrRequestKey: (config: RedisConfig, key: string, service: string) => Promise<unknown>;
+import { RedisConfig, Struct } from "./types";
+declare const getOrRequestData: (config: RedisConfig, request: string, service: string, data?: Struct) => Promise<unknown>;
 declare const subscribeToMessageResponse: (client: Redis, messageid: string) => Promise<number>;
 declare const requestAndWaitForList: (client: Redis, service: string, listname: string, listsubject: string, props: {} | undefined, {}: {}) => Promise<unknown>;
-export { getOrRequestKey, requestAndWaitForList, subscribeToMessageResponse };
+export { getOrRequestData, requestAndWaitForList, subscribeToMessageResponse };

package/dist/getters.js

@@ -1,63 +1,62 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.subscribeToMessageResponse = exports.requestAndWaitForList = exports.getOrRequestKey = void 0;
+exports.subscribeToMessageResponse = exports.requestAndWaitForList = exports.getOrRequestData = void 0;
 var utils_1 = require("./utils");
 var memdb_1 = require("./memdb");
 var uuid_1 = require("uuid");
 var timeout = 250;
-var getOrRequestKey = function (config, key, service) { return new Promise(function (resolve, reject) {
-    var getterclient = (0, memdb_1.getRedisClient)(config);
-    getterclient.get(key)
-        .then(function (result) {
-        if (result)
-            resolve(result);
-        if (!result) {
-            return requestAndWaitForKey(getterclient, config, key, service);
-        }
-    })
-        .then(function (result) { return resolve(result); })
-        .catch(function (error) {
-        console.log(error);
-        resolve(null);
-    });
-}); };
-exports.getOrRequestKey = getOrRequestKey;
-var requestAndWaitForKey = function (getterclient, config, key, service) { return new Promise(function (resolve) {
-    var messageid = (0, uuid_1.v4)();
-    // create a listener  
-    var listenerclient = (0, memdb_1.getRedisClient)(config);
-    subscribeToMessageResponse(listenerclient, messageid).
-        then(function () {
-        console.log("subscribed to ".concat(messageid, " at ").concat(new Date().toISOString()));
-        // we are subscribed
-        // setting up a one time event listener
-        listenerclient.once("message", function (channel, message) {
-            if (message.length)
-                resolve(message);
-            else
-                resolve(null);
-            console.log("unsubscribing from ".concat(channel));
-            listenerclient.unsubscribe();
-            listenerclient.disconnect();
+var getOrRequestData = function (config, request, service, data) {
+    if (data === void 0) { data = {}; }
+    return new Promise(function (resolve, reject) {
+        var getterclient = (0, memdb_1.getRedisClient)(config);
+        requestAndWaitForData(getterclient, config, request, service, data)
+            .then(function (result) { return resolve(result); })
+            .catch(function (error) {
+            console.log(error);
+            resolve(null);
         });
-        // setup timeout 
-        setTimeout(function () {
-            if (listenerclient.status != "end") {
-                console.log("sub timedout");
+    });
+};
+exports.getOrRequestData = getOrRequestData;
+var requestAndWaitForData = function (getterclient, config, request, service, data) {
+    if (data === void 0) { data = {}; }
+    return new Promise(function (resolve) {
+        var messageid = (0, uuid_1.v4)();
+        // create a listener  
+        var listenerclient = (0, memdb_1.getRedisClient)(config);
+        subscribeToMessageResponse(listenerclient, messageid).
+            then(function () {
+            console.log("subscribed to ".concat(messageid, " at ").concat(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))
+                .catch(function (e) {
+                console.log(e);
                 resolve(null);
+            })
+                .finally(function () { return getterclient.disconnect(); });
+            // setting up a one time event listener
+            listenerclient.once("message", function (channel, message) {
+                if (message.length)
+                    resolve(message);
+                else
+                    resolve(null);
+                console.log("unsubscribing from ".concat(channel));
                 listenerclient.unsubscribe();
                 listenerclient.disconnect();
-            }
-        }, timeout);
+            });
+            // setup timeout 
+            setTimeout(function () {
+                if (listenerclient.status != "end") {
+                    console.log("sub timedout");
+                    resolve(null);
+                    listenerclient.unsubscribe();
+                    listenerclient.disconnect();
+                }
+            }, timeout);
+        });
     });
-    // send out the request
-    getterclient.xadd((0, utils_1.getKeyRequestedChannelName)(service), '*', 'key', key, 'messageid', messageid)
-        .catch(function (e) {
-        console.log(e);
-        resolve(null);
-    })
-        .finally(function () { return getterclient.disconnect(); });
-}); };
+};
 var subscribeToMessageResponse = function (client, messageid) { return client.subscribe((0, utils_1.getMessageReponseKey)(messageid)); };
 exports.subscribeToMessageResponse = subscribeToMessageResponse;
 var requestAndWaitForList = function (client, service, listname, listsubject, props, _a) {

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { Redis } from "ioredis";
 import { RedisConfig, RedisMessage } from "./types";
 import { sendMessageToStream, publishMessageResponse } from "./setters";
-import { getOrRequestKey, subscribeToMessageResponse, requestAndWaitForList } from "./getters";
+import { getOrRequestData, subscribeToMessageResponse, requestAndWaitForList } from "./getters";
 declare const listenToStream: (client: Redis, 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, getOrRequestKey, dataRequester, subscribeToMessageResponse, requestAndWaitForList };
+export { listenToStream, RedisMessage, sendMessageToStream, publishMessageResponse, getOrRequestData, dataRequester, subscribeToMessageResponse, requestAndWaitForList };

package/dist/index.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.requestAndWaitForList = exports.subscribeToMessageResponse = exports.dataRequester = exports.getOrRequestKey = exports.publishMessageResponse = exports.sendMessageToStream = exports.listenToStream = void 0;
+exports.requestAndWaitForList = exports.subscribeToMessageResponse = exports.dataRequester = exports.getOrRequestData = 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; } });
 var getters_1 = require("./getters");
-Object.defineProperty(exports, "getOrRequestKey", { enumerable: true, get: function () { return getters_1.getOrRequestKey; } });
+Object.defineProperty(exports, "getOrRequestData", { enumerable: true, get: function () { return getters_1.getOrRequestData; } });
 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");
@@ -50,7 +50,6 @@ var getMessagedataFromResult = function (results) {
             return;
         messagedata[key] = keysandvalues[n + 1];
     });
-    console.log(messagedata);
     return { messagedata: messagedata, id: id };
 };
 var listenForMessageForDataRequest = function (listenerclient, groupname, channelname, consumername, callback) {
@@ -66,7 +65,7 @@ var listenForMessageForDataRequest = function (listenerclient, groupname, channe
         var messagedata = _a.messagedata, id = _a.id;
         // messageid should have been set in getters/requestAndWaitForKey
         if ('messageid' in messagedata)
-            messageid = messagedata.id;
+            messageid = messagedata.messageid;
         //stream id from redis
         streammsgid = id;
         return messagedata;

package/getters.ts

@@ -1,22 +1,15 @@
 import { Redis } from "ioredis"
 import { getMessageReponseKey, getKeyRequestedChannelName, getListRequestedChannelName } from "./utils"
-import { RedisConfig } from "./types"
+import { RedisConfig, Struct } from "./types"
 import { getRedisClient } from "./memdb"
 import { v4 as uuidv4 } from 'uuid';
 
 const timeout = 250;
 
-const getOrRequestKey = ( config:RedisConfig, key:string, service:string ) => new Promise((resolve, reject) => {
+const getOrRequestData = ( config:RedisConfig, request:string, service:string, data:Struct={} ) => new Promise((resolve, reject) => {
   const getterclient = getRedisClient( config )
-  getterclient.get( key )
-  .then(
-    ( result ) => {
-      if( result ) resolve( result );
-      if( !result ){
-        return requestAndWaitForKey( getterclient, config, key, service )
-      }
-    }  
-  )
+
+  requestAndWaitForData( getterclient, config, request, service, data )
   .then(
     (result) => resolve( result )
   )
@@ -29,11 +22,12 @@ const getOrRequestKey = ( config:RedisConfig, key:string, service:string ) => ne
 })
 
 
-const requestAndWaitForKey = (
+const requestAndWaitForData = (
   getterclient:Redis,
   config:RedisConfig,
-  key:string,
+  request:string,
   service:string,
+  data:Struct={}
 ) => new Promise((resolve) => {  
   const messageid  = uuidv4()
 
@@ -44,8 +38,21 @@ const requestAndWaitForKey = (
     () => {      
       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 ) )
+      .catch(
+        (e) => {
+          console.log( e )
+          resolve( null )
+        }
+      )
+      .finally(
+        () => getterclient.disconnect()
+      )
+
       // setting up a one time event listener
       listenerclient.once( "message", ( channel, message ) => {        
+        
         if( message.length ) resolve( message );
         else resolve( null )
 
@@ -67,17 +74,6 @@ const requestAndWaitForKey = (
     }
   )
 
-  // send out the request
-  getterclient.xadd( getKeyRequestedChannelName( service ), '*', 'key', key, 'messageid', messageid )
-  .catch(
-    (e) => {
-      console.log( e )
-      resolve( null )
-    }
-  )
-  .finally(
-    () => getterclient.disconnect()
-  )
 })
 
 const subscribeToMessageResponse = ( client:Redis, messageid:string ) => client.subscribe( getMessageReponseKey( messageid ) )
@@ -102,4 +98,4 @@ const requestAndWaitForList = (
 
 
 
-export { getOrRequestKey, requestAndWaitForList, subscribeToMessageResponse }
+export { getOrRequestData, requestAndWaitForList, subscribeToMessageResponse }

package/index.ts

@@ -1,7 +1,7 @@
 import { Redis } from "ioredis"
 import { RedisConfig, RedisMessage, Struct } from "./types"
 import { sendMessageToStream, publishMessageResponse } from "./setters"
-import { getOrRequestKey, subscribeToMessageResponse, requestAndWaitForList } from "./getters"
+import { getOrRequestData, subscribeToMessageResponse, requestAndWaitForList } from "./getters"
 import { getRedisClient } from "./memdb"
 import { getKeyRequestedChannelName } from "./utils"
 
@@ -62,9 +62,6 @@ const getMessagedataFromResult = ( results:any ) => {
     if( !( n == 0 || n % 2 == 0 ) ) return;
     messagedata[key] = keysandvalues[n+1];
   })
-
-  console.log( messagedata )
-
   return { messagedata, id}
 }
 
@@ -81,8 +78,7 @@ const listenForMessageForDataRequest = (
   )
   .then(({messagedata,id}) => {      
       // messageid should have been set in getters/requestAndWaitForKey
-      if( 'messageid' in messagedata ) messageid = messagedata.id;
-
+      if( 'messageid' in messagedata ) messageid = messagedata.messageid;
       //stream id from redis
       streammsgid = id;
       return messagedata
@@ -160,4 +156,4 @@ const listenForMessage = ( client:Redis, groupname:string, channelname:string, c
     })
 }
 
-export { listenToStream, RedisMessage, sendMessageToStream, publishMessageResponse, getOrRequestKey, dataRequester, subscribeToMessageResponse, requestAndWaitForList }
+export { listenToStream, RedisMessage, sendMessageToStream, publishMessageResponse, getOrRequestData, dataRequester, subscribeToMessageResponse, requestAndWaitForList }

package/package.json

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