woonplan-packages-redishelper 1.0.88 → 1.0.91

package/dist/eventsource.d.ts

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

package/dist/eventsource.js

@@ -14,26 +14,30 @@ 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)
+var getEntriesFromStream = function (config, streamname, count) {
+    if (count === void 0) { count = 0; }
+    return getStreamInfo(config, streamname, count)
         .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 redisStreamResult = getObjectFromStreamResult(result);
+        if (!redisStreamResult.entries)
+            return [];
+        return redisStreamResult.entries.map(function (entry) { return ({
+            id: entry[0],
+            message: entry[1].reduce(function (prevValue, currentValue, n) {
+                var _a;
+                return (n % 2 ? __assign({}, prevValue) : __assign(__assign({}, prevValue), (_a = {}, _a[currentValue] = entry[1][n + 1], _a)));
+            }, {})
+        }); });
     });
 };
-var filterStream = function (config, streamname, key, value) {
-    return getEntriesFromStream(config, streamname)
+var getObjectFromStreamResult = function (arr) { return arr.reduce(function (obj, current, n) {
+    if (!(n % 2) && arr.length + 1 >= n)
+        obj[current] = arr[n + 1];
+    return obj;
+}, {}); };
+var filterStream = function (config, streamname, key, value, count) {
+    if (count === void 0) { count = 0; }
+    return getEntriesFromStream(config, streamname, count)
         .then(function (entries) { return entries.filter(function (entry) {
         return Object.keys(entry.message).indexOf(key) > -1 && entry.message[key] == value;
     }); });

package/dist/memdb.js

@@ -2,5 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRedisClient = void 0;
 var IORedis = require("ioredis");
-var getRedisClient = function (config) { return new IORedis(config.REDISURL); };
+var getRedisClient = function (config) { return new IORedis({
+    host: config.REDISURL,
+    password: config.REDISPW
+}); };
 exports.getRedisClient = getRedisClient;

package/dist/types.d.ts

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

package/eventsource.ts

@@ -3,20 +3,29 @@ 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 getEntriesFromStream = ( config:RedisConfig, streamname:string, count:number = 0  ) => 
+  getStreamInfo( config, streamname, count )
+  .then(( result:any[] ) => {
+    const redisStreamResult = getObjectFromStreamResult( result )
+    if( !redisStreamResult.entries ) return []
+
+    return redisStreamResult.entries.map( (entry:[string,string[]]) => ({
         id : entry[0],
         message : entry[1].reduce( (prevValue:RedisMessage, currentValue:string, n:number) => (n%2 ? {...prevValue} : { ...prevValue, [currentValue] : entry[1][n+1] }) as RedisMessage, {} as RedisMessage )
       } 
     ) 
   ) as RedisStreamEntry[]
-  )
+})
+
+
+const getObjectFromStreamResult = ( arr:any[] ) => arr.reduce( (obj,current,n:number) => {
+  if( !(n % 2) && arr.length+1 >= n ) obj[current] = arr[n+1]
+  return obj
+}, {} )
 
 
-const filterStream = ( config:RedisConfig, streamname:string, key:string, value:string ) => 
-  getEntriesFromStream( config, streamname )
+const filterStream = ( config:RedisConfig, streamname:string, key:string, value:string, count:number = 0 ) => 
+  getEntriesFromStream( config, streamname, count )
   .then((entries:RedisStreamEntry[]) => entries.filter( entry => {
     return Object.keys( entry.message ).indexOf( key ) > -1 && entry.message[key] == value  
   }))

package/package.json

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