woonplan-packages-redishelper 1.0.22 → 1.0.23

package/dist/index.js

@@ -27,11 +27,11 @@ 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);
-    console.log(arrayOfKeysAndValues);
-    client.xadd.apply(client, __spreadArray([channelname], arrayOfKeysAndValues, false));
+    var arrayOfKeysAndValues = redisMessageToArrayOfKeysAndValues(message).reduce(reduceArraysToArray, []);
+    client.xadd.apply(client, __spreadArray([channelname, '*'], arrayOfKeysAndValues, false));
 };
 exports.sendMessageToStream = sendMessageToStream;
 var listenForMessage = function (client, groupname, channelname, consumername, callback, lastId) {
@@ -51,13 +51,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/index.ts

@@ -28,12 +28,12 @@ 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 );
-  console.log( arrayOfKeysAndValues );
-  client.xadd( channelname, ...arrayOfKeysAndValues )
+  const arrayOfKeysAndValues = redisMessageToArrayOfKeysAndValues( message ).reduce( reduceArraysToArray, [] );
+  client.xadd( channelname, '*', ...arrayOfKeysAndValues )
 }
 
 
@@ -60,15 +60,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 );
               })

package/package.json

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