woonplan-packages-redishelper 1.0.20 → 1.0.24

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { Redis } from "ioredis";
 import { RedisMessage } from "./types";
 declare const listenToStream: (client: Redis, groupname: string, channelname: string, consumername: string, callback: Function) => Promise<boolean>;
-export { listenToStream, RedisMessage };
+declare const sendMessageToStream: (client: Redis, channelname: string, message: RedisMessage) => void;
+export { listenToStream, RedisMessage, sendMessageToStream };

package/dist/index.js

@@ -1,6 +1,15 @@
 "use strict";
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listenToStream = void 0;
+exports.sendMessageToStream = exports.listenToStream = void 0;
 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);
@@ -18,6 +27,14 @@ var createGroup = function (client, groupname, channelname) { return new Promise
         reject(error);
     });
 }); };
+var reduceArraysToArray = function (toArray, fromArray) { return toArray.concat(fromArray); };
+var redisMessageToArrayOfKeysAndValues = function (message) { return Object.keys(message).map(function (key) { return [key, message[key]]; }); };
+var sendMessageToStream = function (client, channelname, message) {
+    var arrayOfKeysAndValues = redisMessageToArrayOfKeysAndValues(message).reduce(reduceArraysToArray, []);
+    console.log('sendings message', channelname);
+    client.xadd.apply(client, __spreadArray([channelname, '*'], arrayOfKeysAndValues, false));
+};
+exports.sendMessageToStream = sendMessageToStream;
 var listenForMessage = function (client, groupname, channelname, consumername, callback, lastId) {
     if (lastId === void 0) { lastId = "$"; }
     console.log("listening to ".concat(channelname, " as ").concat(consumername));
@@ -35,13 +52,13 @@ var listenForMessage = function (client, groupname, channelname, consumername, c
                         return;
                     messagedata[key] = keysandvalues[n + 1];
                 });
-                callback(messagedata).then(function () {
-                    return client.xack(channelname, groupname, id).then(function () {
-                        console.log(id + ' acknowledged');
-                    });
-                }).catch(function (error) {
+                callback(messagedata).catch(function (error) {
                     console.log(error);
                 }).finally(function () {
+                    // not sure yet? For now always acknowledge
+                    client.xack(channelname, groupname, id).then(function () {
+                        console.log(id + ' acknowledged');
+                    });
                     // relisten 
                     listenForMessage(client, groupname, channelname, consumername, callback);
                 });

package/dist/types.d.ts

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

package/dist/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/index.ts

@@ -28,6 +28,15 @@ const createGroup = ( client:Redis, groupname:string, channelname:string ):Promi
   )
 })
 
+const reduceArraysToArray = ( toArray:any[], fromArray:[] ) => toArray.concat( fromArray )
+const redisMessageToArrayOfKeysAndValues = ( message:RedisMessage ):any[] => Object.keys(message).map((key) => [ key, message[key]]);
+
+const sendMessageToStream = ( client:Redis, channelname:string, message:RedisMessage) => {
+  const arrayOfKeysAndValues = redisMessageToArrayOfKeysAndValues( message ).reduce( reduceArraysToArray, [] );
+  console.log( 'sendings message', channelname )
+  client.xadd( channelname, '*', ...arrayOfKeysAndValues )
+}
+
 
 
 const listenForMessage = ( client:Redis, groupname:string, channelname:string, consumername:string, callback:Function, lastId = "$" ) => {
@@ -52,15 +61,15 @@ const listenForMessage = ( client:Redis, groupname:string, channelname:string, c
                 messagedata[key] = keysandvalues[n+1];
               })
 
-              callback( messagedata ).then(() => 
-                client.xack( channelname, groupname, id ).then( () => {
-                  console.log( id + ' acknowledged')
-                })
-              ).catch(
+              callback( messagedata ).catch(
                 ( error:Error ) => {
                   console.log( error );        
                 }
               ).finally(()=>{
+                // not sure yet? For now always acknowledge
+                client.xack( channelname, groupname, id ).then( () => {
+                  console.log( id + ' acknowledged')
+                })
                 // relisten 
                 listenForMessage( client, groupname, channelname, consumername, callback );
               })
@@ -76,4 +85,4 @@ const listenForMessage = ( client:Redis, groupname:string, channelname:string, c
     })
 }
 
-export { listenToStream, RedisMessage }
+export { listenToStream, RedisMessage, sendMessageToStream }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "woonplan-packages-redishelper",
-  "version": "1.0.20",
+  "version": "1.0.24",
   "description": "",
   "main": "dist/index.js",
-  "types": "dist/types.d.ts",
+  "types": "dist/index.d.ts",
   "scripts": {
     "prepublish": "npm run build",
     "build": "tsc",

package/types.ts

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

package/types.d.ts

@@ -1,5 +0,0 @@
-interface RedisMessage{
-  [index: string]: any;  
-}
-
-export { RedisMessage}