woonplan-packages-redishelper 1.0.16 → 1.0.20

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,19 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listenToStream = void 0;
-var listenToStream = function (client, groupname, channelname, consumername, callback) {
-    client.xgroup('CREATE', channelname, groupname, '$', 'MKSTREAM').catch(function (error) {
-        console.log('halloo');
-        console.log(typeof error);
+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);
+        resolve(true);
+    }).catch(function (error) {
         console.log(error);
+        reject(error);
     });
-};
+}); };
 exports.listenToStream = listenToStream;
-var listenForMessage = function (client, groupname, channelname, consumername, lastId) {
+var createGroup = function (client, groupname, channelname) { return new Promise(function (resolve, reject) {
+    client.xgroup('CREATE', channelname, groupname, '$', 'MKSTREAM').then(function () { return resolve(true); }).catch(function (error) {
+        if (error.message.includes('BUSYGROUP'))
+            return resolve(true);
+        reject(error);
+    });
+}); };
+var listenForMessage = function (client, groupname, channelname, consumername, callback, lastId) {
     if (lastId === void 0) { lastId = "$"; }
+    console.log("listening to ".concat(channelname, " as ").concat(consumername));
     client.xreadgroup('GROUP', groupname, consumername, 'COUNT', 1, 'BLOCK', 0, 'STREAMS', channelname, '>')
-        .then(function () {
-        console.log(1);
+        .then(function (results) {
+        results.forEach(function (result) {
+            var group = result[0];
+            var messages = result[1];
+            messages.forEach(function (message) {
+                var id = message[0];
+                var keysandvalues = message[1];
+                var messagedata = {};
+                keysandvalues.forEach(function (key, n) {
+                    if (!(n == 0 || n % 2 == 0))
+                        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) {
+                    console.log(error);
+                }).finally(function () {
+                    // relisten 
+                    listenForMessage(client, groupname, channelname, consumername, callback);
+                });
+            });
+        });
     })
         .catch(function (error) {
         console.log(error);

package/index.ts

@@ -1,24 +1,79 @@
 import { Redis } from "ioredis"
+import { RedisMessage } from "./types"
 
-const listenToStream = ( client:Redis, groupname:string, channelname:string, consumername:string, callback:Function ) => {
-  client.xgroup('CREATE', channelname, groupname, '$', 'MKSTREAM' ).catch(
+const listenToStream = ( client:Redis, groupname:string, channelname:string, consumername:string, callback:Function ):Promise<boolean> => new Promise((resolve,reject) => { 
+  createGroup( client, groupname, channelname ).then(
+    ( ) => {
+      listenForMessage( client, groupname, channelname, consumername, callback );
+      resolve( true )
+    }
+  ).catch(
     ( error ) => {
-      console.log( 'halloo');
-      console.log( typeof error );
       console.log( error );
+      reject( error )
     }
   )
-}
+})
+
+const createGroup = ( client:Redis, groupname:string, channelname:string ):Promise<boolean> => new Promise((resolve,reject) => { 
+  client.xgroup('CREATE', channelname, groupname, '$', 'MKSTREAM' ).then(
+    () => resolve( true )
+  ).catch(
+    ( error:Error ) => {      
+      if( error.message.includes('BUSYGROUP'))
+        return resolve( true );
+      
+      reject( error );
+    }
+  )
+})
+
 
-const listenForMessage = ( client:Redis, groupname:string, channelname:string, consumername:string, lastId = "$" ) => {
+
+const listenForMessage = ( client:Redis, groupname:string, channelname:string, consumername:string, callback:Function, lastId = "$" ) => {
+  console.log( `listening to ${channelname} as ${consumername}`)
   client.xreadgroup('GROUP', groupname, consumername, 'COUNT', 1, 'BLOCK', 0, 'STREAMS', channelname, '>')
-  .then( () => {
-    console.log( 1 );
-  } )
-  .catch( ( error ) => {
-    
-    console.log( error );
-  })
+    .then( ( results ) => {
+      results.forEach(
+        (result) => {
+          const group     = result[0];
+          const messages  = result[1];
+
+          messages.forEach(
+            (message) => {
+              const id            = message[0];
+              const keysandvalues = message[1];
+
+      
+              let messagedata:RedisMessage = {};
+      
+              keysandvalues.forEach( (key, n ) => {
+                if( !( n == 0 || n % 2 == 0 ) ) return;
+                messagedata[key] = keysandvalues[n+1];
+              })
+
+              callback( messagedata ).then(() => 
+                client.xack( channelname, groupname, id ).then( () => {
+                  console.log( id + ' acknowledged')
+                })
+              ).catch(
+                ( error:Error ) => {
+                  console.log( error );        
+                }
+              ).finally(()=>{
+                // relisten 
+                listenForMessage( client, groupname, channelname, consumername, callback );
+              })
+            }
+          )
+
+        }
+      )
+    })
+    .catch( ( error ) => {
+      
+      console.log( error );
+    })
 }
 
-export { listenToStream }
+export { listenToStream, RedisMessage }

package/package.json

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

package/types.d.ts

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