woonplan-packages-redishelper 1.0.78 → 1.0.82
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/index.js +4 -2
- package/dist/setters.js +17 -1
- package/index.ts +4 -2
- package/package.json +1 -1
- package/setters.ts +18 -1
package/dist/index.js
CHANGED
|
@@ -120,8 +120,10 @@ var listenForMessageForDataRequest = function (listenerclient, groupname, channe
|
|
|
120
120
|
return (0, setters_1.publishMessageResponse)(listenerclient, messageid, result != null ? result : '');
|
|
121
121
|
})
|
|
122
122
|
.catch(function (e) {
|
|
123
|
-
|
|
124
|
-
|
|
123
|
+
return (0, setters_1.publishMessageResponse)(listenerclient, messageid, JSON.stringify({
|
|
124
|
+
rejected: true,
|
|
125
|
+
error: e
|
|
126
|
+
}));
|
|
125
127
|
})
|
|
126
128
|
.finally(function () {
|
|
127
129
|
listenerclient.xack(channelname, groupname, streammsgid).then(function () {
|
package/dist/setters.js
CHANGED
|
@@ -46,7 +46,14 @@ var toApiRequest = function (config, options) {
|
|
|
46
46
|
(0, data_1.subscribeToMessageResponse)(callbackclient, messageid)
|
|
47
47
|
.then(function () {
|
|
48
48
|
callbackclient.once("message", function (_channel, message) {
|
|
49
|
-
|
|
49
|
+
if (message.length && isJson(message)) {
|
|
50
|
+
var messagedata = JSON.parse(message);
|
|
51
|
+
if (messagedata.rejected && messagedata.error)
|
|
52
|
+
reject(messagedata.error);
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
resolve(message.length ? message : null);
|
|
56
|
+
}
|
|
50
57
|
callbackclient.disconnect();
|
|
51
58
|
});
|
|
52
59
|
// setup timeout
|
|
@@ -63,3 +70,12 @@ var toApiRequest = function (config, options) {
|
|
|
63
70
|
});
|
|
64
71
|
};
|
|
65
72
|
exports.toApiRequest = toApiRequest;
|
|
73
|
+
function isJson(str) {
|
|
74
|
+
try {
|
|
75
|
+
JSON.parse(str);
|
|
76
|
+
}
|
|
77
|
+
catch (e) {
|
|
78
|
+
return false;
|
|
79
|
+
}
|
|
80
|
+
return true;
|
|
81
|
+
}
|
package/index.ts
CHANGED
|
@@ -144,8 +144,10 @@ const listenForMessageForDataRequest = (
|
|
|
144
144
|
publishMessageResponse( listenerclient, messageid, result != null ? result : '' )
|
|
145
145
|
)
|
|
146
146
|
.catch((e)=>{
|
|
147
|
-
|
|
148
|
-
|
|
147
|
+
return publishMessageResponse( listenerclient, messageid, JSON.stringify({
|
|
148
|
+
rejected : true,
|
|
149
|
+
error : e
|
|
150
|
+
}))
|
|
149
151
|
})
|
|
150
152
|
.finally( () =>
|
|
151
153
|
{
|
package/package.json
CHANGED
package/setters.ts
CHANGED
|
@@ -37,7 +37,15 @@ const toApiRequest = ( config:RedisConfig, options:toApiRequestOptions = { endpo
|
|
|
37
37
|
subscribeToMessageResponse( callbackclient, messageid )
|
|
38
38
|
.then(() => {
|
|
39
39
|
callbackclient.once( "message", ( _channel, message ) => {
|
|
40
|
-
|
|
40
|
+
|
|
41
|
+
if( message.length && isJson( message )){
|
|
42
|
+
const messagedata = JSON.parse( message )
|
|
43
|
+
if( messagedata.rejected && messagedata.error ) return reject( messagedata.error )
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
resolve( message.length ? message : null )
|
|
47
|
+
|
|
48
|
+
|
|
41
49
|
callbackclient.disconnect()
|
|
42
50
|
})
|
|
43
51
|
|
|
@@ -60,5 +68,14 @@ const toApiRequest = ( config:RedisConfig, options:toApiRequestOptions = { endpo
|
|
|
60
68
|
|
|
61
69
|
})
|
|
62
70
|
|
|
71
|
+
function isJson(str:any) {
|
|
72
|
+
try {
|
|
73
|
+
JSON.parse(str);
|
|
74
|
+
} catch (e) {
|
|
75
|
+
return false;
|
|
76
|
+
}
|
|
77
|
+
return true;
|
|
78
|
+
}
|
|
79
|
+
|
|
63
80
|
|
|
64
81
|
export { publishMessageResponse, sendMessageToStream, toApiRequest }
|