Skip to content

fixes #29 #30

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

Merged
noamshemesh merged 4 commits into from
Feb 11, 2017
Merged

fixes #29 #30

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
520eeff
fixes #29
kp96 Jan 31, 2017
110c61a
fixed n value
kp96 Jan 31, 2017
e0dc931
added tests
kp96 Feb 1, 2017
2c4f277
test for node 0.1
kp96 Feb 6, 2017
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
25 changes: 13 additions & 12 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ function Limiter(opts) {
* @api public
*/

Limiter.prototype.inspect = function () {
return '<Limiter id='
+ this.id + ', duration='
+ this.duration + ', max='
+ this.max + '>';
Limiter.prototype.inspect = function() {
return '<Limiter id=' +
this.id + ', duration=' +
this.duration + ', max=' +
this.max + '>';
};

/**
Expand All @@ -57,7 +57,7 @@ Limiter.prototype.inspect = function () {
* @api public
*/

Limiter.prototype.get = function (fn) {
Limiter.prototype.get = function(fn) {
var count = this.prefix + 'count';
var limit = this.prefix + 'limit';
var reset = this.prefix + 'reset';
Expand All @@ -72,7 +72,7 @@ Limiter.prototype.get = function (fn) {
.set([count, max, 'PX', duration, 'NX'])
.set([limit, max, 'PX', duration, 'NX'])
.set([reset, ex, 'PX', duration, 'NX'])
.exec(function (err, res) {
.exec(function(err, res) {
if (err) return fn(err);

// If the request has failed, it means the values already
Expand Down Expand Up @@ -104,21 +104,22 @@ Limiter.prototype.get = function (fn) {
}

db.multi()
.set([count, n - 1, 'PX', ex * 1000 - dateNow, 'XX'])
.decr(count)

@noamshemesh noamshemesh Jan 31, 2017

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm wondering why we didn't change it before 🤔

.pexpire([count, ex * 1000 - dateNow])
.pexpire([limit, ex * 1000 - dateNow])
.pexpire([reset, ex * 1000 - dateNow])
.exec(function (err, res) {
.exec(function(err, res) {
if (err) return fn(err);
if (isFirstReplyNull(res)) return mget();
n = n - 1;
n = Array.isArray(res[0]) ? ~~res[0][1] : ~~res[0];

@noamshemesh noamshemesh Jan 31, 2017

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible that the return value would not be an array?

@kp96 kp96 Jan 31, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it is redis module, then res[0] is a string value. If it's ioredis then it's an array.

done();
});
}

function mget() {
db.watch([count], function (err) {
db.watch([count], function(err) {
if (err) return fn(err);
db.mget([count, limit, reset], function (err, res) {
db.mget([count, limit, reset], function(err, res) {
if (err) return fn(err);
if (!res[0] && res[0] !== 0) return create();

Expand Down
3 changes: 3 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
"limiter",
"limit"
],
"scripts" : {
"test" : "mocha"
},
"dependencies": {},
"devDependencies": {
"ioredis": "1.15.1",
Expand Down