woonplan-packages-redishelper 1.0.89 → 1.0.92

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

@@ -10,14 +10,68 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 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 getStreamInfo = function (config, streamname, count) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                _b.trys.push([0, 2, , 3]);
+                return [4 /*yield*/, (0, memdb_1.getRedisClient)(config).xinfo('stream', streamname, 'FULL', 'COUNT', count)];
+            case 1: return [2 /*return*/, _b.sent()];
+            case 2:
+                _a = _b.sent();
+                return [2 /*return*/, []];
+            case 3: return [2 /*return*/];
+        }
+    });
+}); };
+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) { return ({
+        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;
@@ -26,8 +80,14 @@ var getEntriesFromStream = function (config, streamname) {
         }); });
     });
 };
-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/eventsource.ts

@@ -1,22 +1,37 @@
 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 getStreamInfo = async ( config:RedisConfig, streamname:string, count:number ) => {
+  try{
+   return await getRedisClient( config ).xinfo('stream', streamname,'FULL', 'COUNT', count )
+  }catch{
+    return []
+  }  
+}
 
-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.89",
+  "version": "1.0.92",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",