woonplan-packages-redishelper 1.0.58 → 1.0.62

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/getters.js CHANGED
@@ -30,6 +30,13 @@ var requestAndWaitForKey = function (getterclient, config, key, service) { retur
30
30
  then(function () {
31
31
  console.log("subscribed to ".concat(messageid, " at ").concat(new Date().toISOString()));
32
32
  // we are subscribed
33
+ // send out the request
34
+ getterclient.xadd((0, utils_1.getKeyRequestedChannelName)(service), '*', 'key', key, 'messageid', messageid)
35
+ .catch(function (e) {
36
+ console.log(e);
37
+ resolve(null);
38
+ })
39
+ .finally(function () { return getterclient.disconnect(); });
33
40
  // setting up a one time event listener
34
41
  listenerclient.once("message", function (channel, message) {
35
42
  if (message.length)
@@ -50,13 +57,6 @@ var requestAndWaitForKey = function (getterclient, config, key, service) { retur
50
57
  }
51
58
  }, timeout);
52
59
  });
53
- // send out the request
54
- getterclient.xadd((0, utils_1.getKeyRequestedChannelName)(service), '*', 'key', key, 'messageid', messageid)
55
- .catch(function (e) {
56
- console.log(e);
57
- resolve(null);
58
- })
59
- .finally(function () { return getterclient.disconnect(); });
60
60
  }); };
61
61
  var subscribeToMessageResponse = function (client, messageid) { return client.subscribe((0, utils_1.getMessageReponseKey)(messageid)); };
62
62
  exports.subscribeToMessageResponse = subscribeToMessageResponse;
package/dist/index.js CHANGED
@@ -65,7 +65,7 @@ var listenForMessageForDataRequest = function (listenerclient, groupname, channe
65
65
  var messagedata = _a.messagedata, id = _a.id;
66
66
  // messageid should have been set in getters/requestAndWaitForKey
67
67
  if ('messageid' in messagedata)
68
- messageid = messagedata.id;
68
+ messageid = messagedata.messageid;
69
69
  //stream id from redis
70
70
  streammsgid = id;
71
71
  return messagedata;
package/getters.ts CHANGED
@@ -44,6 +44,18 @@ const requestAndWaitForKey = (
44
44
  () => {
45
45
  console.log( `subscribed to ${messageid} at ${new Date().toISOString()}` )
46
46
  // we are subscribed
47
+ // send out the request
48
+ getterclient.xadd( getKeyRequestedChannelName( service ), '*', 'key', key, 'messageid', messageid )
49
+ .catch(
50
+ (e) => {
51
+ console.log( e )
52
+ resolve( null )
53
+ }
54
+ )
55
+ .finally(
56
+ () => getterclient.disconnect()
57
+ )
58
+
47
59
  // setting up a one time event listener
48
60
  listenerclient.once( "message", ( channel, message ) => {
49
61
  if( message.length ) resolve( message );
@@ -67,17 +79,6 @@ const requestAndWaitForKey = (
67
79
  }
68
80
  )
69
81
 
70
- // send out the request
71
- getterclient.xadd( getKeyRequestedChannelName( service ), '*', 'key', key, 'messageid', messageid )
72
- .catch(
73
- (e) => {
74
- console.log( e )
75
- resolve( null )
76
- }
77
- )
78
- .finally(
79
- () => getterclient.disconnect()
80
- )
81
82
  })
82
83
 
83
84
  const subscribeToMessageResponse = ( client:Redis, messageid:string ) => client.subscribe( getMessageReponseKey( messageid ) )
package/index.ts CHANGED
@@ -62,7 +62,6 @@ const getMessagedataFromResult = ( results:any ) => {
62
62
  if( !( n == 0 || n % 2 == 0 ) ) return;
63
63
  messagedata[key] = keysandvalues[n+1];
64
64
  })
65
-
66
65
  return { messagedata, id}
67
66
  }
68
67
 
@@ -79,8 +78,7 @@ const listenForMessageForDataRequest = (
79
78
  )
80
79
  .then(({messagedata,id}) => {
81
80
  // messageid should have been set in getters/requestAndWaitForKey
82
- if( 'messageid' in messagedata ) messageid = messagedata.id;
83
-
81
+ if( 'messageid' in messagedata ) messageid = messagedata.messageid;
84
82
  //stream id from redis
85
83
  streammsgid = id;
86
84
  return messagedata
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "woonplan-packages-redishelper",
3
- "version": "1.0.58",
3
+ "version": "1.0.62",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",