woonplan-packages-redishelper 1.0.77 → 1.0.81

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { RedisConfig, RedisMessage } from "./types";
-import { sendMessageToStream, publishMessageResponse } from "./setters";
+import { sendMessageToStream, publishMessageResponse, toApiRequest } 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;
-declare const socketToApiListener: (config: RedisConfig, groupname: string, channelname: string, consumername: string, callback: Function) => void;
-export { listenToStream, RedisMessage, sendMessageToStream, publishMessageResponse, getOrRequestData, socketToApiListener, dataRequester, subscribeToMessageResponse, requestAndWaitForList };
+declare const toApiListener: (config: RedisConfig, groupname: string, channelname: string, consumername: string, callback: Function) => void;
+export { listenToStream, RedisMessage, sendMessageToStream, toApiRequest, publishMessageResponse, getOrRequestData, toApiListener, dataRequester, subscribeToMessageResponse, requestAndWaitForList };

package/dist/index.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.requestAndWaitForList = exports.subscribeToMessageResponse = exports.dataRequester = exports.socketToApiListener = exports.getOrRequestData = exports.publishMessageResponse = exports.sendMessageToStream = exports.listenToStream = void 0;
+exports.requestAndWaitForList = exports.subscribeToMessageResponse = exports.dataRequester = exports.toApiListener = exports.getOrRequestData = exports.publishMessageResponse = exports.toApiRequest = 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; } });
+Object.defineProperty(exports, "toApiRequest", { enumerable: true, get: function () { return setters_1.toApiRequest; } });
 var getters_1 = require("./getters");
 Object.defineProperty(exports, "getOrRequestData", { enumerable: true, get: function () { return getters_1.getOrRequestData; } });
 Object.defineProperty(exports, "subscribeToMessageResponse", { enumerable: true, get: function () { return getters_1.subscribeToMessageResponse; } });
@@ -38,12 +39,12 @@ 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 toApiListener = 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;
+exports.toApiListener = toApiListener;
 var listenForMessageForApiRequest = function (listenerclient, groupname, channelname, consumername, callback) {
     console.log("listening to ".concat(channelname, " as ").concat(consumername));
     var streammsgid = '';
@@ -119,8 +120,10 @@ var listenForMessageForDataRequest = function (listenerclient, groupname, channe
         return (0, setters_1.publishMessageResponse)(listenerclient, messageid, result != null ? result : '');
     })
         .catch(function (e) {
-        console.log(e);
-        return (0, setters_1.publishMessageResponse)(listenerclient, messageid, '');
+        return (0, setters_1.publishMessageResponse)(listenerclient, messageid, JSON.stringify({
+            rejected: true,
+            error: e
+        }));
     })
         .finally(function () {
         listenerclient.xack(channelname, groupname, streammsgid).then(function () {

package/dist/setters.d.ts

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

package/dist/setters.js

@@ -20,7 +20,7 @@ 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.socketToApi = exports.sendMessageToStream = exports.publishMessageResponse = void 0;
+exports.toApiRequest = exports.sendMessageToStream = exports.publishMessageResponse = void 0;
 var memdb_1 = require("./memdb");
 var utils_1 = require("./utils");
 var uuid_1 = require("uuid");
@@ -39,14 +39,21 @@ var sendMessageToStream = function (config, channelname, message) {
 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) {
+var toApiRequest = 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);
+                if (message.length && isJson(message)) {
+                    var messagedata = JSON.parse(message);
+                    if (messagedata.rejected && messagedata.error)
+                        reject(messagedata.error);
+                }
+                else {
+                    resolve(message.length ? message : null);
+                }
                 callbackclient.disconnect();
             });
             // setup timeout 
@@ -62,4 +69,13 @@ var socketToApi = function (config, options) {
             .catch(reject);
     });
 };
-exports.socketToApi = socketToApi;
+exports.toApiRequest = toApiRequest;
+function isJson(str) {
+    try {
+        JSON.parse(str);
+    }
+    catch (e) {
+        return false;
+    }
+    return true;
+}

package/index.ts

@@ -144,8 +144,10 @@ const listenForMessageForDataRequest = (
     publishMessageResponse( listenerclient, messageid, result != null ? result : '' )
   )
   .catch((e)=>{
-    console.log( e )
-    return publishMessageResponse( listenerclient, messageid, '' )
+    return publishMessageResponse( listenerclient, messageid, JSON.stringify({
+      rejected : true,
+      error : e
+    }))
   })
   .finally( () => 
     {

package/package.json

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

package/setters.ts

@@ -37,7 +37,14 @@ const toApiRequest = ( config:RedisConfig, options:toApiRequestOptions = { endpo
   subscribeToMessageResponse( callbackclient, messageid )
   .then(() => {    
     callbackclient.once( "message", ( _channel, message ) => {
-      resolve( message.length ? message : null )    
+
+      if( message.length && isJson( message )){
+        const messagedata = JSON.parse( message )
+        if( messagedata.rejected && messagedata.error ) reject( messagedata.error )
+      }else{
+        resolve( message.length ? message : null )    
+      }
+
       callbackclient.disconnect()
     })
 
@@ -60,5 +67,14 @@ const toApiRequest = ( config:RedisConfig, options:toApiRequestOptions = { endpo
   
 })
 
+function isJson(str:any) {
+  try {
+      JSON.parse(str);
+  } catch (e) {
+      return false;
+  }
+  return true;
+}
+
 
 export { publishMessageResponse, sendMessageToStream, toApiRequest }