woonplan-packages-redishelper 1.0.21 → 1.0.25
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 +9 -8
- package/index.ts +9 -8
- package/package.json +5 -2
package/dist/index.js
CHANGED
|
@@ -27,11 +27,12 @@ var createGroup = function (client, groupname, channelname) { return new Promise
|
|
|
27
27
|
reject(error);
|
|
28
28
|
});
|
|
29
29
|
}); };
|
|
30
|
+
var reduceArraysToArray = function (toArray, fromArray) { return toArray.concat(fromArray); };
|
|
30
31
|
var redisMessageToArrayOfKeysAndValues = function (message) { return Object.keys(message).map(function (key) { return [key, message[key]]; }); };
|
|
31
32
|
var sendMessageToStream = function (client, channelname, message) {
|
|
32
|
-
var arrayOfKeysAndValues = redisMessageToArrayOfKeysAndValues(message);
|
|
33
|
-
console.log(
|
|
34
|
-
client.xadd.apply(client, __spreadArray([channelname], arrayOfKeysAndValues, false));
|
|
33
|
+
var arrayOfKeysAndValues = redisMessageToArrayOfKeysAndValues(message).reduce(reduceArraysToArray, []);
|
|
34
|
+
console.log('sendings message', channelname);
|
|
35
|
+
client.xadd.apply(client, __spreadArray([channelname, '*'], arrayOfKeysAndValues, false));
|
|
35
36
|
};
|
|
36
37
|
exports.sendMessageToStream = sendMessageToStream;
|
|
37
38
|
var listenForMessage = function (client, groupname, channelname, consumername, callback, lastId) {
|
|
@@ -51,13 +52,13 @@ var listenForMessage = function (client, groupname, channelname, consumername, c
|
|
|
51
52
|
return;
|
|
52
53
|
messagedata[key] = keysandvalues[n + 1];
|
|
53
54
|
});
|
|
54
|
-
callback(messagedata).
|
|
55
|
-
return client.xack(channelname, groupname, id).then(function () {
|
|
56
|
-
console.log(id + ' acknowledged');
|
|
57
|
-
});
|
|
58
|
-
}).catch(function (error) {
|
|
55
|
+
callback(messagedata).catch(function (error) {
|
|
59
56
|
console.log(error);
|
|
60
57
|
}).finally(function () {
|
|
58
|
+
// not sure yet? For now always acknowledge
|
|
59
|
+
client.xack(channelname, groupname, id).then(function () {
|
|
60
|
+
console.log(id + ' acknowledged');
|
|
61
|
+
});
|
|
61
62
|
// relisten
|
|
62
63
|
listenForMessage(client, groupname, channelname, consumername, callback);
|
|
63
64
|
});
|
package/index.ts
CHANGED
|
@@ -28,12 +28,13 @@ const createGroup = ( client:Redis, groupname:string, channelname:string ):Promi
|
|
|
28
28
|
)
|
|
29
29
|
})
|
|
30
30
|
|
|
31
|
+
const reduceArraysToArray = ( toArray:any[], fromArray:[] ) => toArray.concat( fromArray )
|
|
31
32
|
const redisMessageToArrayOfKeysAndValues = ( message:RedisMessage ):any[] => Object.keys(message).map((key) => [ key, message[key]]);
|
|
32
33
|
|
|
33
34
|
const sendMessageToStream = ( client:Redis, channelname:string, message:RedisMessage) => {
|
|
34
|
-
const arrayOfKeysAndValues = redisMessageToArrayOfKeysAndValues( message );
|
|
35
|
-
console.log(
|
|
36
|
-
client.xadd( channelname, ...arrayOfKeysAndValues )
|
|
35
|
+
const arrayOfKeysAndValues = redisMessageToArrayOfKeysAndValues( message ).reduce( reduceArraysToArray, [] );
|
|
36
|
+
console.log( 'sendings message', channelname )
|
|
37
|
+
client.xadd( channelname, '*', ...arrayOfKeysAndValues )
|
|
37
38
|
}
|
|
38
39
|
|
|
39
40
|
|
|
@@ -60,15 +61,15 @@ const listenForMessage = ( client:Redis, groupname:string, channelname:string, c
|
|
|
60
61
|
messagedata[key] = keysandvalues[n+1];
|
|
61
62
|
})
|
|
62
63
|
|
|
63
|
-
callback( messagedata ).
|
|
64
|
-
client.xack( channelname, groupname, id ).then( () => {
|
|
65
|
-
console.log( id + ' acknowledged')
|
|
66
|
-
})
|
|
67
|
-
).catch(
|
|
64
|
+
callback( messagedata ).catch(
|
|
68
65
|
( error:Error ) => {
|
|
69
66
|
console.log( error );
|
|
70
67
|
}
|
|
71
68
|
).finally(()=>{
|
|
69
|
+
// not sure yet? For now always acknowledge
|
|
70
|
+
client.xack( channelname, groupname, id ).then( () => {
|
|
71
|
+
console.log( id + ' acknowledged')
|
|
72
|
+
})
|
|
72
73
|
// relisten
|
|
73
74
|
listenForMessage( client, groupname, channelname, consumername, callback );
|
|
74
75
|
})
|
package/package.json
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "woonplan-packages-redishelper",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.25",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
|
-
"types": "dist/
|
|
6
|
+
"types": "dist/index.d.ts",
|
|
7
7
|
"scripts": {
|
|
8
8
|
"prepublish": "npm run build",
|
|
9
9
|
"build": "tsc",
|
|
@@ -16,5 +16,8 @@
|
|
|
16
16
|
"@types/ioredis": "^4.28.4",
|
|
17
17
|
"@types/node": "^16.11.13",
|
|
18
18
|
"typescript": "^4.2.3"
|
|
19
|
+
},
|
|
20
|
+
"dependencies": {
|
|
21
|
+
"@types/ioredis": "^4.28.5"
|
|
19
22
|
}
|
|
20
23
|
}
|