Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions doc/rate-limiting.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ const manualFullResponse = await client.v1.get<TweetV1TimelineResult>('statuses/
manualFullResponse.data; // TweetV1TimelineResult
// Rate limit information
manualFullResponse.rateLimit; // { limit: number, remaining: number, reset: number }
// Optional daily limits
manualFullResponse.rateLimit.day; // Application 24h limit (if provided)
manualFullResponse.rateLimit.userDay; // User 24h limit (if provided)
```

## Handle errors - Everywhere in this library
Expand Down
8 changes: 8 additions & 0 deletions src/client-mixins/request-handler.helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,14 @@ export class RequestHandlerHelper<T> {
};
}

if (res.headers['x-user-limit-24hour-limit']) {
rateLimit.userDay = {
limit: Number(res.headers['x-user-limit-24hour-limit']),
remaining: Number(res.headers['x-user-limit-24hour-remaining']),
reset: Number(res.headers['x-user-limit-24hour-reset']),
};
}

if (this.requestData.rateLimitSaver) {
this.requestData.rateLimitSaver(rateLimit);
}
Expand Down
1 change: 1 addition & 0 deletions src/types/responses.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ export interface SingleTwitterRateLimit {

export interface TwitterRateLimit extends SingleTwitterRateLimit {
day?: SingleTwitterRateLimit;
userDay?: SingleTwitterRateLimit;
}
39 changes: 39 additions & 0 deletions test/rate-limit.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import 'mocha';
import { expect } from 'chai';
import { RequestHandlerHelper } from '../src/client-mixins/request-handler.helper';
import type { IncomingMessage } from 'http';

class TestRequestHandlerHelper extends RequestHandlerHelper<any> {
public parse(res: IncomingMessage) {
return this.getRateLimitFromResponse(res);
}
}

describe('Rate limit parsing', () => {
it('includes user 24-hour limits when present', () => {
const helper = new TestRequestHandlerHelper({
url: new URL('https://example.com'),
options: {},
} as any);

const res = {
headers: {
'x-rate-limit-limit': '15',
'x-rate-limit-remaining': '14',
'x-rate-limit-reset': '100',
'x-app-limit-24hour-limit': '5000',
'x-app-limit-24hour-remaining': '4999',
'x-app-limit-24hour-reset': '200',
'x-user-limit-24hour-limit': '1000',
'x-user-limit-24hour-remaining': '999',
'x-user-limit-24hour-reset': '300',
},
} as unknown as IncomingMessage;

const rateLimit = helper.parse(res)!;
expect(rateLimit.limit).to.equal(15);
expect(rateLimit.day).to.deep.equal({ limit: 5000, remaining: 4999, reset: 200 });
expect(rateLimit.userDay).to.deep.equal({ limit: 1000, remaining: 999, reset: 300 });
});
});