woonplan-packages-redishelper 1.0.81 → 1.0.87

package/dist/eventsource.d.ts

@@ -0,0 +1,3 @@
+import { RedisConfig, RedisStreamEntry } from "./types";
+declare const filterStream: (config: RedisConfig, streamname: string, key: string, value: string) => Promise<RedisStreamEntry[]>;
+export { filterStream };

package/dist/eventsource.js

@@ -0,0 +1,41 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.filterStream = void 0;
+var memdb_1 = require("./memdb");
+var getStreamInfo = function (config, streamname, count) { return (0, memdb_1.getRedisClient)(config).xinfo('stream', streamname, 'FULL', 'COUNT', count); };
+var getEntriesFromStream = function (config, streamname) {
+    return getStreamInfo(config, streamname, 0)
+        .then(function (result) {
+        return result[9].map(function (entry) {
+            var keysandvalues = entry[1];
+            return {
+                id: entry[0],
+                message: keysandvalues.reduce(function (prevValue, currentValue, n) {
+                    if (n % 2)
+                        return __assign({}, prevValue);
+                    var newStruct = __assign({}, prevValue);
+                    newStruct[currentValue] = keysandvalues[n + 1];
+                    return newStruct;
+                }, {})
+            };
+        });
+    });
+};
+var filterStream = function (config, streamname, key, value) {
+    return getEntriesFromStream(config, streamname)
+        .then(function (entries) { return entries.filter(function (entry) {
+        return Object.keys(entry.message).indexOf(key) > -1 && entry.message[key] == value;
+    }); });
+};
+exports.filterStream = filterStream;

package/dist/getters.js

@@ -48,7 +48,7 @@ var requestAndWaitForData = function (getterclient, config, request, service, da
             // setup timeout 
             setTimeout(function () {
                 if (listenerclient.status != "end") {
-                    console.log("sub timedout");
+                    console.log("sub timedout: ".concat(request));
                     resolve(null);
                     listenerclient.unsubscribe();
                     listenerclient.disconnect();

package/dist/index.d.ts

@@ -1,7 +1,8 @@
 import { RedisConfig, RedisMessage } from "./types";
 import { sendMessageToStream, publishMessageResponse, toApiRequest } from "./setters";
 import { getOrRequestData, subscribeToMessageResponse, requestAndWaitForList } from "./getters";
+import { filterStream } from "./eventsource";
 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;
 declare const toApiListener: (config: RedisConfig, groupname: string, channelname: string, consumername: string, callback: Function) => void;
-export { listenToStream, RedisMessage, sendMessageToStream, toApiRequest, publishMessageResponse, getOrRequestData, toApiListener, dataRequester, subscribeToMessageResponse, requestAndWaitForList };
+export { listenToStream, RedisMessage, sendMessageToStream, toApiRequest, publishMessageResponse, filterStream, getOrRequestData, toApiListener, dataRequester, subscribeToMessageResponse, requestAndWaitForList };

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.requestAndWaitForList = exports.subscribeToMessageResponse = exports.dataRequester = exports.toApiListener = exports.getOrRequestData = exports.publishMessageResponse = exports.toApiRequest = exports.sendMessageToStream = exports.listenToStream = void 0;
+exports.requestAndWaitForList = exports.subscribeToMessageResponse = exports.dataRequester = exports.toApiListener = exports.getOrRequestData = exports.filterStream = exports.publishMessageResponse = exports.toApiRequest = 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; } });
@@ -11,6 +11,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 eventsource_1 = require("./eventsource");
+Object.defineProperty(exports, "filterStream", { enumerable: true, get: function () { return eventsource_1.filterStream; } });
 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 () {

package/dist/setters.js

@@ -37,7 +37,7 @@ var sendMessageToStream = function (config, channelname, message) {
     return client.xadd.apply(client, __spreadArray([channelname, '*'], arrayOfKeysAndValues, false));
 };
 exports.sendMessageToStream = sendMessageToStream;
-var timeout = 1500;
+var timeout = 2500;
 // send a message from socket to api, creating a message id to publish the response on 
 var toApiRequest = function (config, options) {
     if (options === void 0) { options = { endpoint: '', method: 'GET', data: {}, }; }
@@ -49,17 +49,15 @@ var toApiRequest = function (config, options) {
                 if (message.length && isJson(message)) {
                     var messagedata = JSON.parse(message);
                     if (messagedata.rejected && messagedata.error)
-                        reject(messagedata.error);
-                }
-                else {
-                    resolve(message.length ? message : null);
+                        return reject(messagedata.error);
                 }
+                resolve(message.length ? message : null);
                 callbackclient.disconnect();
             });
             // setup timeout 
             setTimeout(function () {
                 if (callbackclient.status != "end") {
-                    console.log("sub timedout");
+                    console.log("sub timedout ".concat(options.endpoint));
                     reject('timeout');
                     callbackclient.disconnect();
                 }

package/dist/types.d.ts

@@ -7,3 +7,7 @@ export interface Struct {
 export interface RedisConfig {
     REDISURL: string | number | undefined;
 }
+export interface RedisStreamEntry {
+    id: string;
+    message: RedisMessage;
+}

package/eventsource.ts

@@ -0,0 +1,33 @@
+import { getRedisClient } from "./memdb"
+import { RedisConfig, RedisStreamEntry, RedisMessage } from "./types"
+
+const getStreamInfo = ( config:RedisConfig, streamname:string, count:number ) => getRedisClient( config ).xinfo('stream', streamname,'FULL', 'COUNT', count )
+
+const getEntriesFromStream = ( config:RedisConfig, streamname:string ) => 
+  getStreamInfo( config, streamname, 0 )
+  .then(( result:any ) => 
+    result[9].map( (entry:[string,string[]]) => {
+      const keysandvalues = entry[1]
+      return {
+        id : entry[0],
+        message : keysandvalues.reduce( (prevValue:RedisMessage, currentValue:string, n:number) => {
+          if( n%2 ) return {
+            ...prevValue
+          }
+          const newStruct:RedisMessage = { ...prevValue }
+          newStruct[currentValue] = keysandvalues[n+1]
+          return newStruct
+        }, {} as RedisMessage )
+      } as RedisStreamEntry
+    })
+  )
+
+
+const filterStream = ( config:RedisConfig, streamname:string, key:string, value:string ) => 
+  getEntriesFromStream( config, streamname )
+  .then((entries:RedisStreamEntry[]) => entries.filter( entry => {
+    return Object.keys( entry.message ).indexOf( key ) > -1 && entry.message[key] == value  
+  }))
+
+export { filterStream }
+

package/getters.ts

@@ -65,7 +65,7 @@ const requestAndWaitForData = (
       // setup timeout 
       setTimeout( () => {
         if( listenerclient.status != "end" ){
-          console.log( `sub timedout`)
+          console.log( `sub timedout: ${request}`)
           resolve( null )
           listenerclient.unsubscribe()
           listenerclient.disconnect()

package/index.ts

@@ -4,6 +4,7 @@ import { sendMessageToStream, publishMessageResponse, toApiRequest } from "./set
 import { getOrRequestData, subscribeToMessageResponse, requestAndWaitForList } from "./getters"
 import { getRedisClient } from "./memdb"
 import { getKeyRequestedChannelName } from "./utils"
+import { filterStream } from "./eventsource"
 
 const listenToStream = ( config:RedisConfig, groupname:string, channelname:string, consumername:string, callback:Function ):Promise<boolean> => new Promise((resolve,reject) => { 
   const client = getRedisClient( config )
@@ -207,4 +208,4 @@ const listenForMessage = ( client:Redis, groupname:string, channelname:string, c
     })
 }
 
-export { listenToStream, RedisMessage, sendMessageToStream, toApiRequest, publishMessageResponse, getOrRequestData, toApiListener, dataRequester, subscribeToMessageResponse, requestAndWaitForList }
+export { listenToStream, RedisMessage, sendMessageToStream, toApiRequest, publishMessageResponse, filterStream, getOrRequestData, toApiListener, dataRequester, subscribeToMessageResponse, requestAndWaitForList }

package/package.json

@@ -1,26 +1,26 @@
-{
-  "name": "woonplan-packages-redishelper",
-  "version": "1.0.81",
-  "description": "",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "scripts": {
-    "prepublish": "npm run build",
-    "build": "tsc",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "Jasper Denk",
-  "license": "ISC",
-  "devDependencies": {
-    "@types/ioredis": "^4.28.4",
-    "@types/node": "^16.11.13",
-    "@types/uuid": "^8.3.4",
-    "typescript": "^4.2.3"
-  },
-  "dependencies": {
-    "@types/ioredis": "^4.28.5",
-    "ioredis": "^4.28.2",
-    "uuid": "^8.3.2"
-  }
-}
+{
+  "name": "woonplan-packages-redishelper",
+  "version": "1.0.87",
+  "description": "",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "prepublish": "npm run build",
+    "build": "tsc",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "Jasper Denk",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/ioredis": "^4.28.4",
+    "@types/node": "^16.11.13",
+    "@types/uuid": "^8.3.4",
+    "typescript": "^4.2.3"
+  },
+  "dependencies": {
+    "@types/ioredis": "^4.28.5",
+    "ioredis": "^4.28.2",
+    "uuid": "^8.3.2"
+  }
+}

package/setters.ts

@@ -26,7 +26,7 @@ export interface toApiRequestOptions{
   jwt? :string
 }
 
-const timeout = 1500
+const timeout = 2500
 
 // send a message from socket to api, creating a message id to publish the response on 
 const toApiRequest = ( config:RedisConfig, options:toApiRequestOptions = { endpoint : '', method: 'GET', data : {}, } ) => new Promise((resolve, reject) => {
@@ -34,16 +34,19 @@ const toApiRequest = ( config:RedisConfig, options:toApiRequestOptions = { endpo
         callbackclient = getRedisClient( config ),
         messageid = uuidv4()
   
+  
+
   subscribeToMessageResponse( callbackclient, messageid )
   .then(() => {    
     callbackclient.once( "message", ( _channel, message ) => {
 
       if( message.length && isJson( message )){
         const messagedata = JSON.parse( message )
-        if( messagedata.rejected && messagedata.error ) reject( messagedata.error )
-      }else{
-        resolve( message.length ? message : null )    
+        if( messagedata.rejected && messagedata.error ) return reject( messagedata.error )
       }
+      
+      resolve( message.length ? message : null )  
+     
 
       callbackclient.disconnect()
     })
@@ -51,7 +54,7 @@ const toApiRequest = ( config:RedisConfig, options:toApiRequestOptions = { endpo
     // setup timeout 
     setTimeout( () => {
       if( callbackclient.status != "end" ){
-        console.log( `sub timedout`)
+        console.log( `sub timedout ${options.endpoint}`)
         reject( 'timeout' )
         callbackclient.disconnect()
       }        

package/types.ts

@@ -7,4 +7,9 @@ export interface Struct{
 
 export interface RedisConfig{
   REDISURL: string | number | undefined;  
-}
+}
+
+export interface RedisStreamEntry{
+  id : string
+  message:RedisMessage
+}