Skip to content

Commit f1e8784

Browse files
authored
Merge pull request #13 from datarc/feature/reset-header-support
X-RateLimit-Reset support
2 parents 8147081 + 2df089e commit f1e8784

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

.editorconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
root = true
2+
3+
[*]
4+
indent_style = space
5+
indent_size = 2
6+
charset = utf-8
7+
trim_trailing_whitespace = false
8+
insert_final_newline = false

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
language: node_js
22
node_js:
3+
- 6
4+
- 8
5+
- 10
36
- stable
4-
- 4
5-
- '0.12'
67
deploy:
78
provider: npm
89
910
api_key:
10-
secure: POA2mmBIMEP37tEo4RR8rz0BMSnlKWFMqyxMrjyhB9HG9brfLxbsFRc9kerCKOFMd2eF6VW3mMNjqNeUubEDjlwrx33+mlNuHCy+r8RCV+O3d+WSppiN3HPzkbHSkP1LYI/pY3BMvCOAoO5X9Q6WbABIzG46bkpzpV1mOANHZdVbtvZX/yAE95jw5U0VUE75lWsrzMNMwfKZU1bHoTECctPSvWF4hCq+AtfS+w6g6HqU4mPwgq3tgIkSFGtGijhIgpLVAO/94u3I9io3QbfI33vAoKdyc6J1ykm8aeMulX5/TcRh1B5w0lZvTY+MUOLUIxMaBjsDKsMsyS8YfaadwlFZlsQvDaJWKmA1VkUNybzphI1jP4DOema4occDSOaanxZT98g49ZpNLNN6LSlVrBN5i8xhRfIbKJgxcD6wMC3AJIYlDF/hNeCjVOP1IfG5WbQThDibrzP54Pcw5iF0/LO9DbsizHOh8xtOYL1Qa5oe/3amgpg2XjqgwCKykIWS1G26B1wGuyBlC4MUqDyGNq+aPlkT+WzAR8jdGEwM0h20HiOhW73tD/wQ3krvGdm4VFbM9yr7/FeTVmGNsbEzUjEGENBXAPR3+N23wEHq3viD1AZgGOFNHJauKH7DxBAU+3ZlNsSEuFQiER8X5NIy7cmQlE7WkRCrR3817GInFeI=
11+
secure: AEMlF3sv9izoTxLKMX7H1qKTgEDPa1pFYSIsz77trHuUOka2jpiKt5Gtvc9ZrtZgOLhXWT9lnbi4E0H9Bkz6lo3nTH06FMb7wJ7jy4zolm552a/IuBrlWiOt67Y3IjAvZREj5ocxCrLzSuc2F2l5MX+frtv/MqmmjFOlYgfn9Igp/o6wLHWkJlUm/fLBwWzvo7vV+jFDSiyG6k+O2SYJbGTyRkGKnyEXgxSkaYmRm5rSDvtS8S7tlfqPFxvVNFW8/3k78/Tn3DheasxbMLyMB/biLNDoqiQ5p4uIMv1utAPH9kqkNeNMLJEyeis32MGnYOnveabUNV+SLAVh4V6bqubPBa8X5SJc3kM0iInaYVylskP6kqCnNantahJmWn71/evxXDFOC7flHQCdiSazXhw83yrQiGFhza8RwDt3Ko8GZblQYAu5yR+YqcgMlrLdXraznVrAhGY+cATEVrPuxmvE/o5EOXNIDRmEo1KVGmNApoktdnXKgzAWWnSgqOknyiC5IO0dDCn54aU3xHfA5xUpt/ZWAh7wOwYNgnFt74GSDyfyo1EBw78ZK/kIMe8pcZqaAyQ9A0TAOKqjlHMxs4uR1RxqHu5fycfiLVO3qTjf90hMay+KY/ico8tANjOA76OEDDdwNlFeCHUlrRx4XNJHOXkuvl02bgObGtlIkiE=
1112
on:
1213
tags: true
1314
repo: wyattjoh/rate-limit-redis

lib/redis-store.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ var RedisStore = function(options) {
1919
if (options.resetExpiryOnChange || replies[0] === 1 || replies[1] === -1) {
2020
// then expire it after the timeout
2121
options.client.pexpire(rdskey, expiryMs);
22+
return expiryMs;
23+
} else {
24+
return replies[1];
2225
}
2326
};
2427

@@ -47,9 +50,9 @@ var RedisStore = function(options) {
4750
}
4851

4952
replies = processReplies(replies);
50-
setExpire(replies, rdskey);
53+
var ttl = setExpire(replies, rdskey);
5154

52-
cb(null, replies[0]);
55+
cb(null, replies[0], ttl > 0 ? new Date(new Date().getTime() + ttl) : null);
5356
});
5457
};
5558

0 commit comments

Comments
 (0)