Skip to content

fix 2 bugs for redis: ttl -1 and X-RateLimit-Reset #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
codeHui wants to merge 1 commit into
base: develop
Choose a base branch
from
+5 −2
Open

fix 2 bugs for redis: ttl -1 and X-RateLimit-Reset #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/RedisStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,18 @@ class RedisStore extends Store {
async _hit(key, options, weight) {

let [counter, dateEnd] = await this.client.multi().get(key).ttl(key).exec();

if(counter === null) {

//check "dateEnd===-1", the reason is below
if(counter === null || dateEnd===-1) {
counter = weight;
dateEnd = Date.now() + options.interval;

const seconds = Math.ceil(options.interval / 1000);
await this.client.setEx(key, seconds.toString(), counter.toString());
}else {
//"dateEnd===-1" may happen just after ttl expires then "await this.client.incrBy(key, weight)" will set ttl to -1; we count this low probability requests as the previous period and check "dateEnd===-1" for the next request
counter = await this.client.incrBy(key, weight);
dateEnd = Date.now() + dateEnd * 1000;
}

return {
Expand Down