woonplan-packages-redishelper 1.0.70 → 1.0.71

package/dist/index.d.ts

@@ -3,4 +3,5 @@ import { sendMessageToStream, publishMessageResponse } from "./setters";
 import { getOrRequestData, subscribeToMessageResponse, requestAndWaitForList } from "./getters";
 declare const listenToStream: (config: RedisConfig, groupname: string, channelname: string, consumername: string, callback: Function) => Promise<boolean>;
 declare const dataRequester: (config: RedisConfig, groupname: string, service: string, consumername: string, callback: Function) => void;
-export { listenToStream, RedisMessage, sendMessageToStream, publishMessageResponse, getOrRequestData, dataRequester, subscribeToMessageResponse, requestAndWaitForList };
+declare const socketToApiListener: (config: RedisConfig, groupname: string, channelname: string, consumername: string, callback: Function) => void;
+export { listenToStream, RedisMessage, sendMessageToStream, publishMessageResponse, getOrRequestData, socketToApiListener, dataRequester, subscribeToMessageResponse, requestAndWaitForList };

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.requestAndWaitForList = exports.subscribeToMessageResponse = exports.dataRequester = exports.getOrRequestData = exports.publishMessageResponse = exports.sendMessageToStream = exports.listenToStream = void 0;
+exports.requestAndWaitForList = exports.subscribeToMessageResponse = exports.dataRequester = exports.socketToApiListener = exports.getOrRequestData = exports.publishMessageResponse = exports.sendMessageToStream = exports.listenToStream = void 0;
 var setters_1 = require("./setters");
 Object.defineProperty(exports, "sendMessageToStream", { enumerable: true, get: function () { return setters_1.sendMessageToStream; } });
 Object.defineProperty(exports, "publishMessageResponse", { enumerable: true, get: function () { return setters_1.publishMessageResponse; } });
@@ -38,6 +38,47 @@ var dataRequester = function (config, groupname, service, consumername, callback
         .then(function () { return listenForMessageForDataRequest(listenerclient, groupname, channelname, consumername, callback); });
 };
 exports.dataRequester = dataRequester;
+var socketToApiListener = function (config, groupname, channelname, consumername, callback) {
+    var listenerclient = (0, memdb_1.getRedisClient)(config);
+    createGroup(listenerclient, groupname, channelname)
+        .then(function () { return listenForMessageForDataRequest(listenerclient, groupname, channelname, consumername, callback); });
+};
+exports.socketToApiListener = socketToApiListener;
+var listenForMessageForApiRequest = function (listenerclient, groupname, channelname, consumername, callback) {
+    console.log("listening to ".concat(channelname, " as ").concat(consumername));
+    var streammsgid = '';
+    var messageid = '';
+    // block client while listening for a message
+    listenerclient.xreadgroup('GROUP', groupname, consumername, 'COUNT', 1, 'BLOCK', 0, 'STREAMS', channelname, '>')
+        .then(function (results) {
+        return getMessagedataFromResult(results);
+    })
+        .then(function (_a) {
+        var messagedata = _a.messagedata, id = _a.id;
+        // messageid should have been set in getters/requestAndWaitForKey
+        if ('messageid' in messagedata)
+            messageid = messagedata.messageid;
+        //stream id from redis
+        streammsgid = id;
+        return messagedata;
+    })
+        .then(function (messagedata) {
+        return callback(messagedata, streammsgid);
+    })
+        .then(function (result) {
+        return (0, setters_1.publishMessageResponse)(listenerclient, messageid, result != null ? result : '');
+    })
+        .catch(function (e) {
+        console.log(e);
+        return (0, setters_1.publishMessageResponse)(listenerclient, messageid, '');
+    })
+        .finally(function () {
+        listenerclient.xack(channelname, groupname, streammsgid).then(function () {
+            console.log(streammsgid + ' acknowledged');
+        });
+        listenForMessageForApiRequest(listenerclient, groupname, channelname, consumername, callback);
+    });
+};
 var getMessagedataFromResult = function (results) {
     if (!results.length)
         throw ('no-messagedata');

package/dist/setters.d.ts

@@ -4,8 +4,8 @@ declare const publishMessageResponse: (client: Redis, messageid: string, message
 declare const sendMessageToStream: (client: Redis, channelname: string, message: RedisMessage) => Promise<string>;
 export interface SocketToApiOptions {
     endpoint: string;
-    data: Struct;
-    method: string;
+    data?: Struct;
+    method?: string;
 }
 declare const socketToApi: (config: RedisConfig, options?: SocketToApiOptions) => Promise<unknown>;
 export { publishMessageResponse, sendMessageToStream, socketToApi };

package/index.ts

@@ -46,6 +46,58 @@ const dataRequester = ( config:RedisConfig, groupname:string, service:string, co
   )
 }
 
+
+const socketToApiListener = ( config:RedisConfig, groupname:string, channelname:string, consumername:string, callback:Function ) => {
+  const listenerclient = getRedisClient( config )
+  createGroup( listenerclient, groupname, channelname )
+  .then(
+    () => listenForMessageForDataRequest( listenerclient, groupname, channelname, consumername, callback )
+  )
+}
+
+
+const listenForMessageForApiRequest = (
+  listenerclient:Redis, groupname:string, channelname:string, consumername:string, callback:Function
+) => {
+  console.log( `listening to ${channelname} as ${consumername}`)
+  let streammsgid = '';
+  let messageid   = '';
+  // block client while listening for a message
+  listenerclient.xreadgroup('GROUP', groupname, consumername, 'COUNT', 1, 'BLOCK', 0, 'STREAMS', channelname, '>')
+  .then( (results) => 
+    getMessagedataFromResult( results )
+  )
+  .then(({messagedata,id}) => {      
+      // messageid should have been set in getters/requestAndWaitForKey
+      if( 'messageid' in messagedata ) messageid = messagedata.messageid;
+      //stream id from redis
+      streammsgid = id;
+      return messagedata
+    } 
+  )
+  .then( (messagedata) =>
+    callback( messagedata, streammsgid )
+  )
+  .then(( result:any ) => 
+    publishMessageResponse( listenerclient, messageid, result != null ? result : '' )
+  )
+  .catch((e)=>{
+    console.log( e )
+    return publishMessageResponse( listenerclient, messageid, '' )
+  })
+  .finally( () => 
+    {
+      listenerclient.xack( channelname, groupname, streammsgid ).then( () => {
+        console.log( streammsgid + ' acknowledged')
+      })
+      listenForMessageForApiRequest( listenerclient, groupname, channelname, consumername, callback );
+
+    }
+  )
+}
+
+
+
 const getMessagedataFromResult = ( results:any ) => {
   if( !results.length ) throw('no-messagedata');
 
@@ -153,4 +205,4 @@ const listenForMessage = ( client:Redis, groupname:string, channelname:string, c
     })
 }
 
-export { listenToStream, RedisMessage, sendMessageToStream, publishMessageResponse, getOrRequestData, dataRequester, subscribeToMessageResponse, requestAndWaitForList }
+export { listenToStream, RedisMessage, sendMessageToStream, publishMessageResponse, getOrRequestData, socketToApiListener, dataRequester, subscribeToMessageResponse, requestAndWaitForList }

package/package.json

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

package/setters.ts

@@ -20,8 +20,8 @@ const sendMessageToStream = ( client:Redis, channelname:string, message:RedisMes
 
 export interface SocketToApiOptions{
   endpoint:string, 
-  data : Struct 
-  method:string 
+  data?: Struct 
+  method?:string 
 }
 
 const timeout = 1500