woonplan-packages-redishelper 1.0.69 → 1.0.73

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

@@ -1,5 +1,12 @@
 import { Redis } from "ioredis";
-import { RedisMessage } from "./types";
+import { RedisConfig, RedisMessage, Struct } from "./types";
 declare const publishMessageResponse: (client: Redis, messageid: string, message: string) => Promise<number>;
 declare const sendMessageToStream: (client: Redis, channelname: string, message: RedisMessage) => Promise<string>;
-export { publishMessageResponse, sendMessageToStream };
+export interface SocketToApiOptions {
+    endpoint: string;
+    data?: Struct;
+    method?: string;
+    jwt?: string;
+}
+declare const socketToApi: (config: RedisConfig, options?: SocketToApiOptions) => Promise<unknown>;
+export { publishMessageResponse, sendMessageToStream, socketToApi };

package/dist/setters.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 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)) {
@@ -9,8 +20,11 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendMessageToStream = exports.publishMessageResponse = void 0;
+exports.socketToApi = exports.sendMessageToStream = exports.publishMessageResponse = void 0;
+var memdb_1 = require("./memdb");
 var utils_1 = require("./utils");
+var uuid_1 = require("uuid");
+var data_1 = require("./data");
 var publishMessageResponse = function (client, messageid, message) {
     //console.log( `publishing to ${messageid} at ${new Date().toISOString()}` )
     return client.publish((0, utils_1.getMessageReponseKey)(messageid), message);
@@ -22,3 +36,29 @@ var sendMessageToStream = function (client, channelname, message) {
     return client.xadd.apply(client, __spreadArray([channelname, '*'], arrayOfKeysAndValues, false));
 };
 exports.sendMessageToStream = sendMessageToStream;
+var timeout = 1500;
+// send a message from socket to api, creating a message id to publish the response on 
+var socketToApi = function (config, options) {
+    if (options === void 0) { options = { endpoint: '', method: 'GET', data: {}, }; }
+    return new Promise(function (resolve, reject) {
+        var client = (0, memdb_1.getRedisClient)(config), callbackclient = (0, memdb_1.getRedisClient)(config), messageid = (0, uuid_1.v4)();
+        (0, data_1.subscribeToMessageResponse)(callbackclient, messageid)
+            .then(function () {
+            callbackclient.once("message", function (_channel, message) {
+                resolve(message.length ? message : null);
+                callbackclient.disconnect();
+            });
+            // setup timeout 
+            setTimeout(function () {
+                if (callbackclient.status != "end") {
+                    console.log("sub timedout");
+                    reject('timeout');
+                    callbackclient.disconnect();
+                }
+            }, timeout);
+            return sendMessageToStream(client, 'api', __assign(__assign({}, options), { data: JSON.stringify(options.data), messageid: messageid }));
+        })
+            .catch(reject);
+    });
+};
+exports.socketToApi = 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.69",
+  "version": "1.0.73",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/setters.ts

@@ -1,7 +1,10 @@
 
 import { Redis } from "ioredis"
-import { RedisMessage } from "./types"
+import { getRedisClient } from "./memdb"
+import { RedisConfig, RedisMessage, Struct } from "./types"
 import { getMessageReponseKey, redisMessageToArrayOfKeysAndValues, reduceArraysToArray } from "./utils"
+import { v4 as uuidv4 } from 'uuid';
+import { subscribeToMessageResponse } from "./data";
 
 const publishMessageResponse = ( client:Redis, messageid:string, message:string ) => {
   //console.log( `publishing to ${messageid} at ${new Date().toISOString()}` )
@@ -15,6 +18,46 @@ const sendMessageToStream = ( client:Redis, channelname:string, message:RedisMes
   return client.xadd( channelname, '*', ...arrayOfKeysAndValues )
 }
 
+export interface SocketToApiOptions{
+  endpoint:string, 
+  data?: Struct 
+  method?:string 
+  jwt? :string
+}
+
+const timeout = 1500
+
+// send a message from socket to api, creating a message id to publish the response on 
+const socketToApi = ( config:RedisConfig, options:SocketToApiOptions = { endpoint : '', method: 'GET', data : {}, } ) => new Promise((resolve, reject) => {
+  const client = getRedisClient( config ),
+        callbackclient = getRedisClient( config ),
+        messageid = uuidv4()
+  
+  subscribeToMessageResponse( callbackclient, messageid )
+  .then(() => {    
+    callbackclient.once( "message", ( _channel, message ) => {
+      resolve( message.length ? message : null )    
+      callbackclient.disconnect()
+    })
+
+    // setup timeout 
+    setTimeout( () => {
+      if( callbackclient.status != "end" ){
+        console.log( `sub timedout`)
+        reject( 'timeout' )
+        callbackclient.disconnect()
+      }        
+    }, timeout )
+
+    return sendMessageToStream( client, 'api', {
+      ...options,
+      data : JSON.stringify( options.data ),
+      messageid : messageid
+    })
+  })
+  .catch( reject )
+  
+})
 
 
-export { publishMessageResponse, sendMessageToStream }
+export { publishMessageResponse, sendMessageToStream, socketToApi }