@wildix/xbees-conversations-utils 1.1.80 → 1.1.81

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 (7) hide show
  1. package/dist-cjs/rateLimits/createRateLimitedStreamProxy.js +8 -3
  2. package/dist-cjs/rateLimits/helpers/executeWithRateLimitHandling.js +1 -1
  3. package/dist-cjs/rateLimits/helpers/registerStreamInterceptors.js +15 -5
  4. package/dist-es/rateLimits/createRateLimitedStreamProxy.js +8 -3
  5. package/dist-es/rateLimits/helpers/executeWithRateLimitHandling.js +1 -1
  6. package/dist-es/rateLimits/helpers/registerStreamInterceptors.js +15 -5
  7. package/package.json +2 -2
package/dist-cjs/rateLimits/createRateLimitedStreamProxy.js CHANGED
@@ -55,13 +55,15 @@ function wrapTarget(target, dependencies) {
55
55
  }
56
56
  if (STREAM_SYNC_CHANNEL_RESULT_METHODS.has(property)) {
57
57
  return (...args) => {
58
- const result = Reflect.apply(value, originalTarget, args);
58
+ const { callArgs } = (0, splitCallArgsAndOptions_1.splitCallArgsAndOptions)(args);
59
+ const result = Reflect.apply(value, originalTarget, callArgs);
59
60
  return normalizeStreamCallResult(result, dependencies, true);
60
61
  };
61
62
  }
62
63
  if (CHANNEL_SYNC_PROXY_RESULT_METHODS.has(property)) {
63
64
  return (...args) => {
64
- const result = Reflect.apply(value, originalTarget, args);
65
+ const { callArgs } = (0, splitCallArgsAndOptions_1.splitCallArgsAndOptions)(args);
66
+ const result = Reflect.apply(value, originalTarget, callArgs);
65
67
  if (typeof result === 'object' && result !== null) {
66
68
  return wrapTarget(result, dependencies);
67
69
  }
@@ -69,7 +71,10 @@ function wrapTarget(target, dependencies) {
69
71
  };
70
72
  }
71
73
  if (STREAM_SYNC_METHODS.has(property) || CHANNEL_SYNC_METHODS.has(property)) {
72
- return (...args) => Reflect.apply(value, originalTarget, args);
74
+ return (...args) => {
75
+ const { callArgs } = (0, splitCallArgsAndOptions_1.splitCallArgsAndOptions)(args);
76
+ return Reflect.apply(value, originalTarget, callArgs);
77
+ };
73
78
  }
74
79
  return createRateLimitedMethodWrapper(originalTarget, value, property, dependencies, STREAM_CHANNEL_RESULT_METHODS.has(property));
75
80
  },
package/dist-cjs/rateLimits/helpers/executeWithRateLimitHandling.js CHANGED
@@ -4,8 +4,8 @@ exports.executeWithRateLimitHandling = void 0;
4
4
  const promises_1 = require("node:timers/promises");
5
5
  const constants_1 = require("../constants");
6
6
  const createRateLimitExceededException_1 = require("./createRateLimitExceededException");
7
- const rateLimitSnapshot_1 = require("./rateLimitSnapshot");
8
7
  const processStreamRateLimitException_1 = require("./processStreamRateLimitException");
8
+ const rateLimitSnapshot_1 = require("./rateLimitSnapshot");
9
9
  const RedisCooldown_1 = require("./RedisCooldown");
10
10
  function calculateRateLimitDelayMs(error, maxDelayMs) {
11
11
  const retryAfterMs = typeof error.rateLimitReset === 'number' && error.rateLimitReset > 0 ? error.rateLimitReset : 0;
package/dist-cjs/rateLimits/helpers/registerStreamInterceptors.js CHANGED
@@ -34,15 +34,25 @@ function registerStreamInterceptors(stream, context) {
34
34
  if (attachedInterceptors.has(axiosInstance)) {
35
35
  return;
36
36
  }
37
+ attachedInterceptors.add(axiosInstance);
37
38
  axiosInstance.interceptors.response.use(async (response) => {
38
- await (0, processStreamBudgetHeaders_1.processStreamBudgetHeaders)(response?.headers, context);
39
- await (0, processStreamRateLimitHeaders_1.processStreamRateLimitHeaders)(response?.headers, context);
39
+ try {
40
+ await (0, processStreamBudgetHeaders_1.processStreamBudgetHeaders)(response?.headers, context);
41
+ await (0, processStreamRateLimitHeaders_1.processStreamRateLimitHeaders)(response?.headers, context);
42
+ }
43
+ catch (error) {
44
+ logger.warn('Failed to process Stream response headers in interceptor', { error });
45
+ }
40
46
  return response;
41
47
  }, async (error) => {
42
- await (0, processStreamBudgetHeaders_1.processStreamBudgetHeaders)(error?.response?.headers, context);
43
- await (0, processStreamRateLimitHeaders_1.processStreamRateLimitHeaders)(error?.response?.headers, context);
48
+ try {
49
+ await (0, processStreamBudgetHeaders_1.processStreamBudgetHeaders)(error?.response?.headers, context);
50
+ await (0, processStreamRateLimitHeaders_1.processStreamRateLimitHeaders)(error?.response?.headers, context);
51
+ }
52
+ catch (interceptorError) {
53
+ logger.warn('Failed to process Stream error headers in interceptor', { error: interceptorError });
54
+ }
44
55
  return Promise.reject(error);
45
56
  });
46
- attachedInterceptors.add(axiosInstance);
47
57
  }
48
58
  exports.registerStreamInterceptors = registerStreamInterceptors;
package/dist-es/rateLimits/createRateLimitedStreamProxy.js CHANGED
@@ -52,13 +52,15 @@ function wrapTarget(target, dependencies) {
52
52
  }
53
53
  if (STREAM_SYNC_CHANNEL_RESULT_METHODS.has(property)) {
54
54
  return (...args) => {
55
- const result = Reflect.apply(value, originalTarget, args);
55
+ const { callArgs } = splitCallArgsAndOptions(args);
56
+ const result = Reflect.apply(value, originalTarget, callArgs);
56
57
  return normalizeStreamCallResult(result, dependencies, true);
57
58
  };
58
59
  }
59
60
  if (CHANNEL_SYNC_PROXY_RESULT_METHODS.has(property)) {
60
61
  return (...args) => {
61
- const result = Reflect.apply(value, originalTarget, args);
62
+ const { callArgs } = splitCallArgsAndOptions(args);
63
+ const result = Reflect.apply(value, originalTarget, callArgs);
62
64
  if (typeof result === 'object' && result !== null) {
63
65
  return wrapTarget(result, dependencies);
64
66
  }
@@ -66,7 +68,10 @@ function wrapTarget(target, dependencies) {
66
68
  };
67
69
  }
68
70
  if (STREAM_SYNC_METHODS.has(property) || CHANNEL_SYNC_METHODS.has(property)) {
69
- return (...args) => Reflect.apply(value, originalTarget, args);
71
+ return (...args) => {
72
+ const { callArgs } = splitCallArgsAndOptions(args);
73
+ return Reflect.apply(value, originalTarget, callArgs);
74
+ };
70
75
  }
71
76
  return createRateLimitedMethodWrapper(originalTarget, value, property, dependencies, STREAM_CHANNEL_RESULT_METHODS.has(property));
72
77
  },
package/dist-es/rateLimits/helpers/executeWithRateLimitHandling.js CHANGED
@@ -1,8 +1,8 @@
1
1
  import { setTimeout as sleep } from 'node:timers/promises';
2
2
  import { BUDGET_COOLDOWN_SLEEP_CHUNK_MS, BUDGET_DELAY_MAX_MS, DEFAULT_JITTER_MS, DEFAULT_MAX_DELAY_MS, DEFAULT_RETRY_AFTER_MS, RETRY_AFTER_BUFFER_MS, STREAM_BUDGET_COOLDOWN_KEY, STREAM_BUDGET_COOLDOWN_KEY_PREFIX, STREAM_RATE_LIMIT_COOLDOWN_KEY_PREFIX, STREAM_RATE_LIMIT_METADATA_KEY_SUFFIX, STREAM_RATE_LIMIT_SOFT_COOLDOWN_KEY, } from '../constants';
3
3
  import { createRateLimitExceededException } from './createRateLimitExceededException';
4
- import { parseRateLimitSnapshot, serializeRateLimitSnapshot } from './rateLimitSnapshot';
5
4
  import { processStreamRateLimitException } from './processStreamRateLimitException';
5
+ import { parseRateLimitSnapshot, serializeRateLimitSnapshot } from './rateLimitSnapshot';
6
6
  import { RedisCooldown } from './RedisCooldown';
7
7
  function calculateRateLimitDelayMs(error, maxDelayMs) {
8
8
  const retryAfterMs = typeof error.rateLimitReset === 'number' && error.rateLimitReset > 0 ? error.rateLimitReset : 0;
package/dist-es/rateLimits/helpers/registerStreamInterceptors.js CHANGED
@@ -31,14 +31,24 @@ export function registerStreamInterceptors(stream, context) {
31
31
  if (attachedInterceptors.has(axiosInstance)) {
32
32
  return;
33
33
  }
34
+ attachedInterceptors.add(axiosInstance);
34
35
  axiosInstance.interceptors.response.use(async (response) => {
35
- await processStreamBudgetHeaders(response?.headers, context);
36
- await processStreamRateLimitHeaders(response?.headers, context);
36
+ try {
37
+ await processStreamBudgetHeaders(response?.headers, context);
38
+ await processStreamRateLimitHeaders(response?.headers, context);
39
+ }
40
+ catch (error) {
41
+ logger.warn('Failed to process Stream response headers in interceptor', { error });
42
+ }
37
43
  return response;
38
44
  }, async (error) => {
39
- await processStreamBudgetHeaders(error?.response?.headers, context);
40
- await processStreamRateLimitHeaders(error?.response?.headers, context);
45
+ try {
46
+ await processStreamBudgetHeaders(error?.response?.headers, context);
47
+ await processStreamRateLimitHeaders(error?.response?.headers, context);
48
+ }
49
+ catch (interceptorError) {
50
+ logger.warn('Failed to process Stream error headers in interceptor', { error: interceptorError });
51
+ }
41
52
  return Promise.reject(error);
42
53
  });
43
- attachedInterceptors.add(axiosInstance);
44
54
  }
package/package.json CHANGED
@@ -1,11 +1,12 @@
1
1
  {
2
2
  "name": "@wildix/xbees-conversations-utils",
3
- "version": "1.1.80",
3
+ "version": "1.1.81",
4
4
  "description": "",
5
5
  "main": "./dist-cjs/index.js",
6
6
  "module": "./dist-es/index.js",
7
7
  "types": "./dist-types/index.d.ts",
8
8
  "scripts": {
9
+ "prebuild": "node ./scripts/generateRateLimitMethodNames.mjs",
9
10
  "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
10
11
  "build:cjs": "tsc -p tsconfig.cjs.json",
11
12
  "build:es": "tsc -p tsconfig.es.json",
@@ -14,7 +15,6 @@
14
15
  "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
15
16
  "build:api-extractor": "mkdir -p etc && api-extractor run --local --verbose",
16
17
  "check-types": "tsc --noemit",
17
- "generate:rate-limit-method-names": "node ./scripts/generateRateLimitMethodNames.mjs",
18
18
  "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo",
19
19
  "lint": "eslint . && npm run check-types",
20
20
  "lint:fix": "eslint . --fix",