@wildix/xbees-conversations-utils 1.1.60 → 1.1.61

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.
Files changed (3) hide show
  1. package/dist-cjs/rateLimits/helpers/processStreamRateLimitException.js +63 -20
  2. package/dist-es/rateLimits/helpers/processStreamRateLimitException.js +63 -20
  3. package/package.json +1 -1
package/dist-cjs/rateLimits/helpers/processStreamRateLimitException.js CHANGED
@@ -2,30 +2,73 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.processStreamRateLimitException = void 0;
4
4
  const createRateLimitExceededException_1 = require("./createRateLimitExceededException");
5
- function isStreamException(error) {
5
+ function parseHeaderNumber(headers, key) {
6
+ const raw = headers[key];
7
+ if (typeof raw === 'number' && Number.isFinite(raw)) {
8
+ return raw;
9
+ }
10
+ if (typeof raw === 'string') {
11
+ const parsed = Number(raw);
12
+ if (Number.isFinite(parsed)) {
13
+ return parsed;
14
+ }
15
+ }
16
+ }
17
+ function parseRetryAfterMs(headers) {
18
+ const retryAfter = headers['retry-after'];
19
+ if (typeof retryAfter === 'number' && Number.isFinite(retryAfter) && retryAfter >= 0) {
20
+ return Math.round(retryAfter * 1000);
21
+ }
22
+ if (typeof retryAfter !== 'string') {
23
+ return;
24
+ }
25
+ const asSeconds = Number(retryAfter);
26
+ if (Number.isFinite(asSeconds) && asSeconds >= 0) {
27
+ return Math.round(asSeconds * 1000);
28
+ }
29
+ const asDateMs = Date.parse(retryAfter);
30
+ if (!Number.isNaN(asDateMs)) {
31
+ return Math.max(0, asDateMs - Date.now());
32
+ }
33
+ }
34
+ function getRateLimitFromHeaders(headers) {
35
+ const limit = parseHeaderNumber(headers, 'x-ratelimit-limit');
36
+ const remaining = parseHeaderNumber(headers, 'x-ratelimit-remaining');
37
+ const resetSeconds = parseHeaderNumber(headers, 'x-ratelimit-reset');
38
+ if (limit === undefined || remaining === undefined || resetSeconds === undefined) {
39
+ return;
40
+ }
41
+ return {
42
+ limit,
43
+ remaining,
44
+ reset: Math.round(resetSeconds * 1000),
45
+ };
46
+ }
47
+ function isStreamHttpRateLimitError(error) {
6
48
  return (typeof error === 'object' &&
7
49
  error !== null &&
8
- 'metadata' in error &&
9
- typeof error.metadata === 'object' &&
10
- error.metadata !== null &&
11
- 'responseCode' in error.metadata);
12
- }
13
- function isStreamAPIException(error) {
14
- return typeof error === 'object' && !!error.code;
50
+ (('status' in error && error.status === 429) ||
51
+ ('response' in error &&
52
+ typeof error.response === 'object' &&
53
+ error.response !== null &&
54
+ error.response?.status === 429)));
15
55
  }
16
56
  function processStreamRateLimitException(error) {
17
- if (isStreamException(error) && error.metadata?.responseCode === 429) {
18
- const rateLimit = error.metadata?.rateLimit;
19
- console.warn('Stream rate limit exceeded [StreamException]', { rateLimit });
20
- return (0, createRateLimitExceededException_1.createRateLimitExceededException)({ rateLimit, message: error.message || 'Rate limit exceeded' });
21
- }
22
- if (isStreamAPIException(error) && (error.code === 429 || error.StatusCode === 429)) {
23
- console.warn('Stream rate limit exceeded [StreamAPIException]', { code: error.code, StatusCode: error.StatusCode });
24
- return (0, createRateLimitExceededException_1.createRateLimitExceededException)({ message: error.message || 'Rate limit exceeded' });
25
- }
26
- if (typeof error === 'object' && error !== null && 'status' in error && error.status === 429) {
27
- console.warn('Stream rate limit exceeded [error.status === 429]', error, error.metadata);
28
- return (0, createRateLimitExceededException_1.createRateLimitExceededException)({ message: 'Rate limit exceeded' });
57
+ if (isStreamHttpRateLimitError(error)) {
58
+ const headers = error.response?.headers ?? {};
59
+ const rateLimit = getRateLimitFromHeaders(headers);
60
+ const retryAfterMs = parseRetryAfterMs(headers);
61
+ const message = error.response?.data?.message || error.message || 'Rate limit exceeded';
62
+ console.warn('Stream rate limit exceeded [HTTP 429]', {
63
+ status: error.status ?? error.response?.status,
64
+ retryAfterMs,
65
+ rateLimit,
66
+ });
67
+ return (0, createRateLimitExceededException_1.createRateLimitExceededException)({
68
+ rateLimit,
69
+ retryAfterMs,
70
+ message,
71
+ });
29
72
  }
30
73
  }
31
74
  exports.processStreamRateLimitException = processStreamRateLimitException;
package/dist-es/rateLimits/helpers/processStreamRateLimitException.js CHANGED
@@ -1,27 +1,70 @@
1
1
  import { createRateLimitExceededException } from './createRateLimitExceededException';
2
- function isStreamException(error) {
2
+ function parseHeaderNumber(headers, key) {
3
+ const raw = headers[key];
4
+ if (typeof raw === 'number' && Number.isFinite(raw)) {
5
+ return raw;
6
+ }
7
+ if (typeof raw === 'string') {
8
+ const parsed = Number(raw);
9
+ if (Number.isFinite(parsed)) {
10
+ return parsed;
11
+ }
12
+ }
13
+ }
14
+ function parseRetryAfterMs(headers) {
15
+ const retryAfter = headers['retry-after'];
16
+ if (typeof retryAfter === 'number' && Number.isFinite(retryAfter) && retryAfter >= 0) {
17
+ return Math.round(retryAfter * 1000);
18
+ }
19
+ if (typeof retryAfter !== 'string') {
20
+ return;
21
+ }
22
+ const asSeconds = Number(retryAfter);
23
+ if (Number.isFinite(asSeconds) && asSeconds >= 0) {
24
+ return Math.round(asSeconds * 1000);
25
+ }
26
+ const asDateMs = Date.parse(retryAfter);
27
+ if (!Number.isNaN(asDateMs)) {
28
+ return Math.max(0, asDateMs - Date.now());
29
+ }
30
+ }
31
+ function getRateLimitFromHeaders(headers) {
32
+ const limit = parseHeaderNumber(headers, 'x-ratelimit-limit');
33
+ const remaining = parseHeaderNumber(headers, 'x-ratelimit-remaining');
34
+ const resetSeconds = parseHeaderNumber(headers, 'x-ratelimit-reset');
35
+ if (limit === undefined || remaining === undefined || resetSeconds === undefined) {
36
+ return;
37
+ }
38
+ return {
39
+ limit,
40
+ remaining,
41
+ reset: Math.round(resetSeconds * 1000),
42
+ };
43
+ }
44
+ function isStreamHttpRateLimitError(error) {
3
45
  return (typeof error === 'object' &&
4
46
  error !== null &&
5
- 'metadata' in error &&
6
- typeof error.metadata === 'object' &&
7
- error.metadata !== null &&
8
- 'responseCode' in error.metadata);
9
- }
10
- function isStreamAPIException(error) {
11
- return typeof error === 'object' && !!error.code;
47
+ (('status' in error && error.status === 429) ||
48
+ ('response' in error &&
49
+ typeof error.response === 'object' &&
50
+ error.response !== null &&
51
+ error.response?.status === 429)));
12
52
  }
13
53
  export function processStreamRateLimitException(error) {
14
- if (isStreamException(error) && error.metadata?.responseCode === 429) {
15
- const rateLimit = error.metadata?.rateLimit;
16
- console.warn('Stream rate limit exceeded [StreamException]', { rateLimit });
17
- return createRateLimitExceededException({ rateLimit, message: error.message || 'Rate limit exceeded' });
18
- }
19
- if (isStreamAPIException(error) && (error.code === 429 || error.StatusCode === 429)) {
20
- console.warn('Stream rate limit exceeded [StreamAPIException]', { code: error.code, StatusCode: error.StatusCode });
21
- return createRateLimitExceededException({ message: error.message || 'Rate limit exceeded' });
22
- }
23
- if (typeof error === 'object' && error !== null && 'status' in error && error.status === 429) {
24
- console.warn('Stream rate limit exceeded [error.status === 429]', error, error.metadata);
25
- return createRateLimitExceededException({ message: 'Rate limit exceeded' });
54
+ if (isStreamHttpRateLimitError(error)) {
55
+ const headers = error.response?.headers ?? {};
56
+ const rateLimit = getRateLimitFromHeaders(headers);
57
+ const retryAfterMs = parseRetryAfterMs(headers);
58
+ const message = error.response?.data?.message || error.message || 'Rate limit exceeded';
59
+ console.warn('Stream rate limit exceeded [HTTP 429]', {
60
+ status: error.status ?? error.response?.status,
61
+ retryAfterMs,
62
+ rateLimit,
63
+ });
64
+ return createRateLimitExceededException({
65
+ rateLimit,
66
+ retryAfterMs,
67
+ message,
68
+ });
26
69
  }
27
70
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@wildix/xbees-conversations-utils",
3
- "version": "1.1.60",
3
+ "version": "1.1.61",
4
4
  "description": "",
5
5
  "main": "./dist-cjs/index.js",
6
6
  "module": "./dist-es/index.js",