@wildix/xbees-conversations-utils 1.1.76 → 1.1.77

package/dist-cjs/rateLimits/constants.js

@@ -1,6 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_OPTIONS = exports.CHANNEL_SYNC_PROXY_RESULT_METHOD_NAMES = exports.CHANNEL_SYNC_METHOD_NAMES = exports.STREAM_SYNC_METHOD_NAMES = exports.STREAM_SYNC_CHANNEL_RESULT_METHOD_NAMES = exports.SOFT_THROTTLE_DELAY_HIGH_MS = exports.SOFT_THROTTLE_DELAY_MEDIUM_MS = exports.SOFT_THROTTLE_DELAY_LOW_MS = exports.SOFT_THROTTLE_USAGE_HIGH = exports.SOFT_THROTTLE_USAGE_MEDIUM = exports.SOFT_THROTTLE_USAGE_LOW = exports.BUDGET_DELAY_MAX_MS = exports.BUDGET_DELAY_MIN_MS = exports.BUDGET_THRESHOLD = exports.STREAM_BUDGET_COOLDOWN_KEY = exports.STREAM_RATE_LIMIT_SOFT_COOLDOWN_KEY = exports.STREAM_RATE_LIMIT_OPTIONS_MARKER = exports.STREAM_BUDGET_COOLDOWN_KEY_PREFIX = exports.STREAM_RATE_LIMIT_COOLDOWN_KEY_PREFIX = exports.RETRY_AFTER_BUFFER_MS = exports.DEFAULT_JITTER_MS = exports.DEFAULT_RETRY_AFTER_MS = exports.DEFAULT_MAX_DELAY_MS = void 0;
+exports.DEFAULT_OPTIONS = exports.SOFT_THROTTLE_DELAY_HIGH_MS = exports.SOFT_THROTTLE_DELAY_MEDIUM_MS = exports.SOFT_THROTTLE_DELAY_LOW_MS = exports.SOFT_THROTTLE_USAGE_HIGH = exports.SOFT_THROTTLE_USAGE_MEDIUM = exports.SOFT_THROTTLE_USAGE_LOW = exports.BUDGET_COOLDOWN_SLEEP_CHUNK_MS = exports.BUDGET_MINIMAL_DELAY_MAX_MS = exports.BUDGET_MINIMAL_DELAY_MIN_MS = exports.BUDGET_RELAXED_DELAY_MAX_MS = exports.BUDGET_RELAXED_DELAY_MIN_MS = exports.BUDGET_RELAXED_USAGE_THRESHOLD = exports.BUDGET_CLEAR_USAGE_THRESHOLD = exports.BUDGET_DELAY_MAX_MS = exports.BUDGET_DELAY_MIN_MS = exports.BUDGET_THRESHOLD = exports.STREAM_BUDGET_COOLDOWN_KEY = exports.STREAM_RATE_LIMIT_SOFT_COOLDOWN_KEY = exports.STREAM_RATE_LIMIT_OPTIONS_MARKER = exports.STREAM_BUDGET_COOLDOWN_KEY_PREFIX = exports.STREAM_RATE_LIMIT_COOLDOWN_KEY_PREFIX = exports.RETRY_AFTER_BUFFER_MS = exports.DEFAULT_JITTER_MS = exports.DEFAULT_RETRY_AFTER_MS = exports.DEFAULT_MAX_DELAY_MS = exports.STREAM_SYNC_METHOD_NAMES = exports.STREAM_SYNC_CHANNEL_RESULT_METHOD_NAMES = exports.STREAM_METHOD_NAMES = exports.STREAM_CHANNEL_RESULT_METHOD_NAMES = exports.CHANNEL_SYNC_PROXY_RESULT_METHOD_NAMES = exports.CHANNEL_SYNC_METHOD_NAMES = exports.CHANNEL_METHOD_NAMES = void 0;
+var generatedMethodNames_1 = require("./generatedMethodNames");
+Object.defineProperty(exports, "CHANNEL_METHOD_NAMES", { enumerable: true, get: function () { return generatedMethodNames_1.CHANNEL_METHOD_NAMES; } });
+Object.defineProperty(exports, "CHANNEL_SYNC_METHOD_NAMES", { enumerable: true, get: function () { return generatedMethodNames_1.CHANNEL_SYNC_METHOD_NAMES; } });
+Object.defineProperty(exports, "CHANNEL_SYNC_PROXY_RESULT_METHOD_NAMES", { enumerable: true, get: function () { return generatedMethodNames_1.CHANNEL_SYNC_PROXY_RESULT_METHOD_NAMES; } });
+Object.defineProperty(exports, "STREAM_CHANNEL_RESULT_METHOD_NAMES", { enumerable: true, get: function () { return generatedMethodNames_1.STREAM_CHANNEL_RESULT_METHOD_NAMES; } });
+Object.defineProperty(exports, "STREAM_METHOD_NAMES", { enumerable: true, get: function () { return generatedMethodNames_1.STREAM_METHOD_NAMES; } });
+Object.defineProperty(exports, "STREAM_SYNC_CHANNEL_RESULT_METHOD_NAMES", { enumerable: true, get: function () { return generatedMethodNames_1.STREAM_SYNC_CHANNEL_RESULT_METHOD_NAMES; } });
+Object.defineProperty(exports, "STREAM_SYNC_METHOD_NAMES", { enumerable: true, get: function () { return generatedMethodNames_1.STREAM_SYNC_METHOD_NAMES; } });
 exports.DEFAULT_MAX_DELAY_MS = 5000;
 exports.DEFAULT_RETRY_AFTER_MS = 10000;
 exports.DEFAULT_JITTER_MS = 150;
@@ -13,75 +21,22 @@ exports.STREAM_BUDGET_COOLDOWN_KEY = 'stream-budget-global';
 exports.BUDGET_THRESHOLD = 0.8;
 exports.BUDGET_DELAY_MIN_MS = 30000;
 exports.BUDGET_DELAY_MAX_MS = 60000;
+exports.BUDGET_CLEAR_USAGE_THRESHOLD = 0.6;
+exports.BUDGET_RELAXED_USAGE_THRESHOLD = 0.7;
+exports.BUDGET_RELAXED_DELAY_MIN_MS = 5000;
+exports.BUDGET_RELAXED_DELAY_MAX_MS = 10000;
+exports.BUDGET_MINIMAL_DELAY_MIN_MS = 1000;
+exports.BUDGET_MINIMAL_DELAY_MAX_MS = 2000;
+exports.BUDGET_COOLDOWN_SLEEP_CHUNK_MS = 3000;
 exports.SOFT_THROTTLE_USAGE_LOW = 0.7;
 exports.SOFT_THROTTLE_USAGE_MEDIUM = 0.85;
 exports.SOFT_THROTTLE_USAGE_HIGH = 0.95;
 exports.SOFT_THROTTLE_DELAY_LOW_MS = 500;
 exports.SOFT_THROTTLE_DELAY_MEDIUM_MS = 1500;
 exports.SOFT_THROTTLE_DELAY_HIGH_MS = 3000;
-exports.STREAM_SYNC_CHANNEL_RESULT_METHOD_NAMES = [
-    'channel',
-    'getChannelById',
-    'getChannelByMembers',
-    'hydrateActiveChannels',
-];
-exports.STREAM_SYNC_METHOD_NAMES = [
-    '_addChannelConfig',
-    '_buildWSPayload',
-    '_callClientListeners',
-    '_deleteUserMessageReference',
-    '_enrichAxiosOptions',
-    '_getConnectionID',
-    '_getToken',
-    '_handleClientEvent',
-    '_handleUserEvent',
-    '_hasConnectionID',
-    '_isUsingServerAuth',
-    '_logApiError',
-    '_logApiRequest',
-    '_logApiResponse',
-    '_muteStatus',
-    '_normalizeDate',
-    '_normalizeExpiration',
-    '_sayHi',
-    '_setUser',
-    '_startCleaning',
-    '_updateMemberWatcherReferences',
-    '_updateUserMessageReferences',
-    '_updateUserReferences',
-    '_validateAndGetMessageId',
-    'createAbortControllerForNextRequest',
-    'createToken',
-    'devToken',
-    'dispatchEvent',
-    'errorFromResponse',
-    'getAuthType',
-    'getUserAgent',
-    'handleEvent',
-    'handleResponse',
-    'off',
-    'on',
-    'setBaseURL',
-    'setLocalDevice',
-    'setUserAgent',
-    'userMuteStatus',
-    'verifyWebhook',
-];
-exports.CHANNEL_SYNC_METHOD_NAMES = [
-    '_channelURL',
-    'countUnread',
-    'countUnreadMentions',
-    'getConfig',
-    'lastMessage',
-    'lastRead',
-    'muteStatus',
-    'off',
-    'on',
-];
-exports.CHANNEL_SYNC_PROXY_RESULT_METHOD_NAMES = ['getClient'];
 exports.DEFAULT_OPTIONS = {
     maxAttempts: 3,
     enableCooldown: true,
-    maxDelayMs: exports.DEFAULT_MAX_DELAY_MS,
+    maxDelayMs: 5000,
     maxRetryableDelayMs: 10000,
 };

package/dist-cjs/rateLimits/createRateLimitedStreamProxy.js

@@ -4,13 +4,26 @@ exports.createRateLimitedStreamProxy = void 0;
 const constants_1 = require("./constants");
 const executeWithRateLimitHandling_1 = require("./helpers/executeWithRateLimitHandling");
 const isStreamChannelLike_1 = require("./helpers/isStreamChannelLike");
-const registerStreamBudgetInterceptors_1 = require("./helpers/registerStreamBudgetInterceptors");
+const registerStreamInterceptors_1 = require("./helpers/registerStreamInterceptors");
 const splitCallArgsAndOptions_1 = require("./helpers/splitCallArgsAndOptions");
 const STREAM_SYNC_METHODS = new Set(constants_1.STREAM_SYNC_METHOD_NAMES);
+const STREAM_CHANNEL_RESULT_METHODS = new Set(constants_1.STREAM_CHANNEL_RESULT_METHOD_NAMES);
 const STREAM_SYNC_CHANNEL_RESULT_METHODS = new Set(constants_1.STREAM_SYNC_CHANNEL_RESULT_METHOD_NAMES);
 const CHANNEL_SYNC_METHODS = new Set(constants_1.CHANNEL_SYNC_METHOD_NAMES);
 const CHANNEL_SYNC_PROXY_RESULT_METHODS = new Set(constants_1.CHANNEL_SYNC_PROXY_RESULT_METHOD_NAMES);
-function normalizeStreamCallResult(result, dependencies) {
+function wrapKnownChannelResult(result, dependencies) {
+    if (Array.isArray(result)) {
+        return result.map((item) => wrapKnownChannelResult(item, dependencies));
+    }
+    if (typeof result !== 'object' || result === null) {
+        return result;
+    }
+    return wrapTarget(result, dependencies);
+}
+function normalizeStreamCallResult(result, dependencies, wrapAsChannelResult = false) {
+    if (wrapAsChannelResult) {
+        return wrapKnownChannelResult(result, dependencies);
+    }
     if (Array.isArray(result)) {
         return result.map((item) => normalizeStreamCallResult(item, dependencies));
     }
@@ -19,14 +32,14 @@ function normalizeStreamCallResult(result, dependencies) {
     }
     return wrapTarget(result, dependencies);
 }
-function createRateLimitedMethodWrapper(target, value, operation, dependencies) {
+function createRateLimitedMethodWrapper(target, value, operation, dependencies, wrapAsChannelResult) {
     return async (...args) => {
         const { callArgs, callOptions } = (0, splitCallArgsAndOptions_1.splitCallArgsAndOptions)(args);
         const result = await (0, executeWithRateLimitHandling_1.executeWithRateLimitHandling)(() => Reflect.apply(value, target, callArgs), operation, dependencies.context, {
             ...constants_1.DEFAULT_OPTIONS,
             ...callOptions,
         });
-        return normalizeStreamCallResult(result, dependencies);
+        return normalizeStreamCallResult(result, dependencies, wrapAsChannelResult);
     };
 }
 function wrapTarget(target, dependencies) {
@@ -43,7 +56,7 @@ function wrapTarget(target, dependencies) {
             if (STREAM_SYNC_CHANNEL_RESULT_METHODS.has(property)) {
                 return (...args) => {
                     const result = Reflect.apply(value, originalTarget, args);
-                    return normalizeStreamCallResult(result, dependencies);
+                    return normalizeStreamCallResult(result, dependencies, true);
                 };
             }
             if (CHANNEL_SYNC_PROXY_RESULT_METHODS.has(property)) {
@@ -58,14 +71,14 @@ function wrapTarget(target, dependencies) {
             if (STREAM_SYNC_METHODS.has(property) || CHANNEL_SYNC_METHODS.has(property)) {
                 return (...args) => Reflect.apply(value, originalTarget, args);
             }
-            return createRateLimitedMethodWrapper(originalTarget, value, property, dependencies);
+            return createRateLimitedMethodWrapper(originalTarget, value, property, dependencies, STREAM_CHANNEL_RESULT_METHODS.has(property));
         },
     });
     dependencies.cache.set(target, proxy);
     return proxy;
 }
 function createRateLimitedStreamProxy(stream, context) {
-    (0, registerStreamBudgetInterceptors_1.registerStreamBudgetInterceptors)(stream, context);
+    (0, registerStreamInterceptors_1.registerStreamInterceptors)(stream, context);
     return wrapTarget(stream, {
         context,
         cache: new WeakMap(),

package/dist-cjs/rateLimits/generatedMethodNames.js

@@ -0,0 +1,320 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CHANNEL_SYNC_PROXY_RESULT_METHOD_NAMES = exports.CHANNEL_SYNC_METHOD_NAMES = exports.CHANNEL_METHOD_NAMES = exports.STREAM_SYNC_CHANNEL_RESULT_METHOD_NAMES = exports.STREAM_CHANNEL_RESULT_METHOD_NAMES = exports.STREAM_SYNC_METHOD_NAMES = exports.STREAM_METHOD_NAMES = void 0;
+exports.STREAM_METHOD_NAMES = [
+    '_addChannelConfig',
+    '_buildWSPayload',
+    '_callClientListeners',
+    '_createImport',
+    '_createImportURL',
+    '_deleteUserMessageReference',
+    '_enrichAxiosOptions',
+    '_getConnectionID',
+    '_getImport',
+    '_getToken',
+    '_handleClientEvent',
+    '_handleUserEvent',
+    '_hasConnectionID',
+    '_isUsingServerAuth',
+    '_listImports',
+    '_logApiError',
+    '_logApiRequest',
+    '_logApiResponse',
+    '_muteStatus',
+    '_normalizeDate',
+    '_normalizeExpiration',
+    '_queryFlagReports',
+    '_queryFlags',
+    '_reviewFlagReport',
+    '_sayHi',
+    '_setToken',
+    '_setupConnection',
+    '_setUser',
+    '_startCleaning',
+    '_unblockMessage',
+    '_updateMemberWatcherReferences',
+    '_updateUserMessageReferences',
+    '_updateUserReferences',
+    '_validateAndGetMessageId',
+    'addDevice',
+    'banUser',
+    'channel',
+    'closeConnection',
+    'commitMessage',
+    'connect',
+    'connectAnonymousUser',
+    'connectUser',
+    'createAbortControllerForNextRequest',
+    'createBlockList',
+    'createCampaign',
+    'createChannelType',
+    'createCommand',
+    'createPermission',
+    'createRole',
+    'createSegment',
+    'createToken',
+    'deactivateUser',
+    'deactivateUsers',
+    'delete',
+    'deleteBlockList',
+    'deleteCampaign',
+    'deleteChannels',
+    'deleteChannelType',
+    'deleteCommand',
+    'deleteMessage',
+    'deletePermission',
+    'deletePushProvider',
+    'deleteRole',
+    'deleteSegment',
+    'deleteUser',
+    'deleteUsers',
+    'devToken',
+    'disconnect',
+    'disconnectUser',
+    'dispatchEvent',
+    'doAxiosRequest',
+    'enrichURL',
+    'errorFromResponse',
+    'exportChannel',
+    'exportChannels',
+    'exportUser',
+    'exportUsers',
+    'flagMessage',
+    'flagUser',
+    'get',
+    'getAppSettings',
+    'getAuthType',
+    'getBlockList',
+    'getCallToken',
+    'getChannelById',
+    'getChannelByMembers',
+    'getChannelType',
+    'getCommand',
+    'getDevices',
+    'getExportChannelStatus',
+    'getMessage',
+    'getPermission',
+    'getRateLimits',
+    'getTask',
+    'getUnreadCount',
+    'getUserAgent',
+    'handleEvent',
+    'handleResponse',
+    'hydrateActiveChannels',
+    'listBlockLists',
+    'listChannelTypes',
+    'listCommands',
+    'listPermissions',
+    'listPushProviders',
+    'listRoles',
+    'markAllRead',
+    'markChannelsRead',
+    'muteUser',
+    'off',
+    'on',
+    'openConnection',
+    'partialUpdateMessage',
+    'partialUpdateUser',
+    'partialUpdateUsers',
+    'patch',
+    'pinMessage',
+    'post',
+    'put',
+    'queryBannedUsers',
+    'queryCampaigns',
+    'queryChannels',
+    'queryMessageFlags',
+    'queryRecipients',
+    'querySegments',
+    'queryUsers',
+    'reactivateUser',
+    'reactivateUsers',
+    'recoverState',
+    'removeDevice',
+    'removeShadowBan',
+    'restoreUsers',
+    'resumeCampaign',
+    'revokeTokens',
+    'revokeUsersToken',
+    'revokeUserToken',
+    'scheduleCampaign',
+    'search',
+    'sendFile',
+    'sendUserCustomEvent',
+    'setAnonymousUser',
+    'setBaseURL',
+    'setGuestUser',
+    'setLocalDevice',
+    'setUser',
+    'setUserAgent',
+    'shadowBan',
+    'stopCampaign',
+    'sync',
+    'testCampaign',
+    'testPushSettings',
+    'testSQSSettings',
+    'translateMessage',
+    'unbanUser',
+    'unblockMessage',
+    'unflagMessage',
+    'unflagUser',
+    'unmuteUser',
+    'unpinMessage',
+    'updateAppSettings',
+    'updateBlockList',
+    'updateCampaign',
+    'updateChannelType',
+    'updateCommand',
+    'updateMessage',
+    'updatePermission',
+    'updateSegment',
+    'updateUser',
+    'updateUsers',
+    'upsertPushProvider',
+    'upsertUser',
+    'upsertUsers',
+    'userMuteStatus',
+    'verifyWebhook',
+];
+exports.STREAM_SYNC_METHOD_NAMES = [
+    '_addChannelConfig',
+    '_buildWSPayload',
+    '_callClientListeners',
+    '_deleteUserMessageReference',
+    '_enrichAxiosOptions',
+    '_getConnectionID',
+    '_getToken',
+    '_handleClientEvent',
+    '_handleUserEvent',
+    '_hasConnectionID',
+    '_isUsingServerAuth',
+    '_logApiError',
+    '_logApiRequest',
+    '_logApiResponse',
+    '_muteStatus',
+    '_normalizeDate',
+    '_normalizeExpiration',
+    '_sayHi',
+    '_setUser',
+    '_startCleaning',
+    '_updateMemberWatcherReferences',
+    '_updateUserMessageReferences',
+    '_updateUserReferences',
+    '_validateAndGetMessageId',
+    'createAbortControllerForNextRequest',
+    'createToken',
+    'devToken',
+    'dispatchEvent',
+    'errorFromResponse',
+    'getAuthType',
+    'getUserAgent',
+    'handleEvent',
+    'handleResponse',
+    'off',
+    'on',
+    'setBaseURL',
+    'setLocalDevice',
+    'setUserAgent',
+    'userMuteStatus',
+    'verifyWebhook',
+];
+exports.STREAM_CHANNEL_RESULT_METHOD_NAMES = [
+    'channel',
+    'getChannelById',
+    'getChannelByMembers',
+    'hydrateActiveChannels',
+    'queryChannels',
+];
+exports.STREAM_SYNC_CHANNEL_RESULT_METHOD_NAMES = [
+    'channel',
+    'getChannelById',
+    'getChannelByMembers',
+    'hydrateActiveChannels',
+];
+exports.CHANNEL_METHOD_NAMES = [
+    '_callChannelListeners',
+    '_channelURL',
+    '_checkInitialized',
+    '_countMessageAsUnread',
+    '_disconnect',
+    '_extendEventWithOwnReactions',
+    '_handleChannelEvent',
+    '_initializeState',
+    '_update',
+    'acceptInvite',
+    'addMembers',
+    'addModerators',
+    'assignRoles',
+    'banUser',
+    'clean',
+    'countUnread',
+    'countUnreadMentions',
+    'create',
+    'createCall',
+    'delete',
+    'deleteFile',
+    'deleteImage',
+    'deleteReaction',
+    'demoteModerators',
+    'disableSlowMode',
+    'enableSlowMode',
+    'getClient',
+    'getConfig',
+    'getMessagesById',
+    'getPinnedMessages',
+    'getReactions',
+    'getReplies',
+    'hide',
+    'inviteMembers',
+    'keystroke',
+    'lastMessage',
+    'lastRead',
+    'markRead',
+    'markUnread',
+    'mute',
+    'muteStatus',
+    'off',
+    'on',
+    'query',
+    'queryMembers',
+    'rejectInvite',
+    'removeMembers',
+    'removeShadowBan',
+    'search',
+    'sendAction',
+    'sendEvent',
+    'sendFile',
+    'sendImage',
+    'sendMessage',
+    'sendReaction',
+    'shadowBan',
+    'show',
+    'stopTyping',
+    'stopWatching',
+    'truncate',
+    'unbanUser',
+    'unmute',
+    'update',
+    'updatePartial',
+    'watch',
+];
+exports.CHANNEL_SYNC_METHOD_NAMES = [
+    '_callChannelListeners',
+    '_channelURL',
+    '_checkInitialized',
+    '_countMessageAsUnread',
+    '_disconnect',
+    '_extendEventWithOwnReactions',
+    '_handleChannelEvent',
+    '_initializeState',
+    'clean',
+    'countUnread',
+    'countUnreadMentions',
+    'getConfig',
+    'lastMessage',
+    'lastRead',
+    'muteStatus',
+    'off',
+    'on',
+];
+exports.CHANNEL_SYNC_PROXY_RESULT_METHOD_NAMES = ['getClient'];

package/dist-cjs/rateLimits/helpers/RedisCooldown.js

@@ -56,6 +56,22 @@ class RedisCooldown {
             });
         }
     }
+    static async setRemainingMsExact(cooldownKey, cooldownMs, context, options) {
+        if (cooldownMs <= 0) {
+            return;
+        }
+        const { redis, logger } = context;
+        try {
+            await redis.set(RedisCooldown.resolveRedisKey(cooldownKey, options), '1', 'PX', cooldownMs);
+        }
+        catch (error) {
+            logger.warn('Failed to write exact stream rate-limit cooldown to Redis', {
+                cooldownKey,
+                cooldownMs,
+                error,
+            });
+        }
+    }
     static async clear(cooldownKey, context, options) {
         const { redis, logger } = context;
         try {

package/dist-cjs/rateLimits/helpers/createRateLimitExceededException.js

@@ -3,30 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRateLimitExceededException = void 0;
 const xbees_conversations_client_1 = require("@wildix/xbees-conversations-client");
 const constants_1 = require("../constants");
-const RETRY_AFTER_HEADER_PADDING_MS = 1500;
+const RETRY_AFTER_HEADER_PADDING_MS = 3000;
 function toPositiveMilliseconds(milliseconds) {
     return Math.max(0, Math.ceil(milliseconds));
 }
-function toRetryAfterSecondsFromDelayMs(delayMs) {
-    const positiveDelayMs = toPositiveMilliseconds(delayMs);
-    return Math.ceil(positiveDelayMs / 1000);
+function toEpochSecondsFromNow(delayMs) {
+    return Math.ceil((Date.now() + toPositiveMilliseconds(delayMs)) / 1000);
 }
 function createRateLimitExceededException(options = {}) {
     const { rateLimit, message, operation, retryAfterMs = constants_1.DEFAULT_RETRY_AFTER_MS } = options;
     const defaultMessage = operation ? `Rate limit exceeded for ${operation}` : 'Rate limit exceeded';
     const retryAfterFromResetMs = rateLimit?.reset ? rateLimit.reset - Date.now() : undefined;
     const effectiveRetryAfterMs = retryAfterFromResetMs ?? retryAfterMs;
-    const paddedRetryAfterMs = effectiveRetryAfterMs + RETRY_AFTER_HEADER_PADDING_MS;
     const retryAfterMilliseconds = toPositiveMilliseconds(effectiveRetryAfterMs);
-    const retryAfterSeconds = toRetryAfterSecondsFromDelayMs(paddedRetryAfterMs);
     const rateLimitResetMilliseconds = rateLimit?.reset
         ? toPositiveMilliseconds(retryAfterFromResetMs ?? 0)
         : retryAfterMilliseconds;
+    const retryAfterEpochSeconds = toEpochSecondsFromNow(effectiveRetryAfterMs + RETRY_AFTER_HEADER_PADDING_MS);
     return new xbees_conversations_client_1.RateLimitExceededException({
         $metadata: {},
         message: message || defaultMessage,
         rateLimitRemaining: rateLimit?.remaining || 0,
-        retryAfter: retryAfterSeconds,
+        retryAfter: retryAfterEpochSeconds,
         rateLimit: rateLimit?.limit?.toString() || 'unknown',
         rateLimitReset: rateLimitResetMilliseconds,
     });

package/dist-cjs/rateLimits/helpers/executeWithRateLimitHandling.js

@@ -6,33 +6,10 @@ const constants_1 = require("../constants");
 const createRateLimitExceededException_1 = require("./createRateLimitExceededException");
 const processStreamRateLimitException_1 = require("./processStreamRateLimitException");
 const RedisCooldown_1 = require("./RedisCooldown");
-function normalizeRetryAfterToDelayMs(retryAfter) {
-    if (typeof retryAfter === 'string') {
-        const asDateMs = Date.parse(retryAfter);
-        if (!Number.isNaN(asDateMs)) {
-            return Math.max(0, Math.round(asDateMs - Date.now()));
-        }
-        const asSeconds = Number(retryAfter);
-        if (Number.isFinite(asSeconds) && asSeconds > 0) {
-            return Math.max(0, Math.round(asSeconds * 1000));
-        }
-        return 0;
-    }
-    if (typeof retryAfter !== 'number' || !Number.isFinite(retryAfter) || retryAfter <= 0) {
-        return 0;
-    }
-    if (retryAfter > 1000000000) {
-        return Math.max(0, Math.round(retryAfter * 1000 - Date.now()));
-    }
-    if (retryAfter >= 1000) {
-        return Math.max(0, Math.round(retryAfter));
-    }
-    return Math.max(0, Math.round(retryAfter * 1000));
-}
 function calculateRateLimitDelayMs(error, maxDelayMs) {
-    const retryAfterMsFromError = normalizeRetryAfterToDelayMs(error.retryAfter);
-    const hasServerRetryAfter = retryAfterMsFromError > 0;
-    const baseDelayMs = hasServerRetryAfter ? retryAfterMsFromError + constants_1.RETRY_AFTER_BUFFER_MS : constants_1.DEFAULT_RETRY_AFTER_MS;
+    const retryAfterMs = typeof error.rateLimitReset === 'number' && error.rateLimitReset > 0 ? error.rateLimitReset : 0;
+    const hasServerRetryAfter = retryAfterMs > 0;
+    const baseDelayMs = hasServerRetryAfter ? retryAfterMs + constants_1.RETRY_AFTER_BUFFER_MS : constants_1.DEFAULT_RETRY_AFTER_MS;
     if (baseDelayMs > 0) {
         const jitterMs = Math.floor(Math.random() * constants_1.DEFAULT_JITTER_MS);
         const computedDelayMs = baseDelayMs + jitterMs;
@@ -48,6 +25,14 @@ async function executeWithRateLimitHandling(execute, operation, context, options
     const { enableCooldown, maxAttempts, maxDelayMs, maxRetryableDelayMs } = options;
     let attempt = 1;
     if (enableCooldown) {
+        const cooldownMs = await RedisCooldown_1.RedisCooldown.getRemainingMs(operation, { redis, logger });
+        if (cooldownMs > 0) {
+            logger.warn('Skipping stream request due to active rate-limit cooldown', {
+                operation,
+                cooldown: cooldownMs,
+            });
+            throw (0, createRateLimitExceededException_1.createRateLimitExceededException)({ operation, retryAfterMs: cooldownMs });
+        }
         const softCooldownMs = await RedisCooldown_1.RedisCooldown.getRemainingMs(constants_1.STREAM_RATE_LIMIT_SOFT_COOLDOWN_KEY, { redis, logger }, { keyPrefix: constants_1.STREAM_RATE_LIMIT_COOLDOWN_KEY_PREFIX });
         if (softCooldownMs > 0) {
             logger.debug('Delaying stream request due to active soft rate-limit cooldown', {
@@ -62,15 +47,16 @@ async function executeWithRateLimitHandling(execute, operation, context, options
                 operation,
                 cooldown: budgetCooldownMs,
             });
-            await (0, promises_1.setTimeout)(budgetCooldownMs);
-        }
-        const cooldownMs = await RedisCooldown_1.RedisCooldown.getRemainingMs(operation, { redis, logger });
-        if (cooldownMs > 0) {
-            logger.warn('Skipping stream request due to active rate-limit cooldown', {
-                operation,
-                cooldown: cooldownMs,
-            });
-            throw (0, createRateLimitExceededException_1.createRateLimitExceededException)({ operation, retryAfterMs: cooldownMs });
+            let totalBudgetWaitMs = 0;
+            for (;;) {
+                const waitMs = await RedisCooldown_1.RedisCooldown.getRemainingMs(constants_1.STREAM_BUDGET_COOLDOWN_KEY, { redis, logger }, { keyPrefix: constants_1.STREAM_BUDGET_COOLDOWN_KEY_PREFIX });
+                if (waitMs <= 0 || totalBudgetWaitMs >= constants_1.BUDGET_DELAY_MAX_MS) {
+                    break;
+                }
+                const chunkMs = Math.min(waitMs, constants_1.BUDGET_COOLDOWN_SLEEP_CHUNK_MS);
+                await (0, promises_1.setTimeout)(chunkMs);
+                totalBudgetWaitMs += chunkMs;
+            }
         }
     }
     for (;;) {

package/dist-cjs/rateLimits/helpers/headerUtils.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeResetToEpochMs = exports.parseHeaderNumber = exports.getHeaderCaseInsensitive = void 0;
+function getHeaderCaseInsensitive(headers, key) {
+    if (!headers) {
+        return;
+    }
+    const direct = headers[key];
+    if (direct !== undefined) {
+        return direct;
+    }
+    const normalizedKey = key.toLowerCase();
+    for (const [headerKey, headerValue] of Object.entries(headers)) {
+        if (headerKey.toLowerCase() === normalizedKey) {
+            return headerValue;
+        }
+    }
+}
+exports.getHeaderCaseInsensitive = getHeaderCaseInsensitive;
+function parseHeaderNumber(headers, key) {
+    const raw = getHeaderCaseInsensitive(headers, key);
+    if (typeof raw === 'number' && Number.isFinite(raw)) {
+        return raw;
+    }
+    if (typeof raw === 'string') {
+        const parsed = Number(raw);
+        if (Number.isFinite(parsed)) {
+            return parsed;
+        }
+    }
+}
+exports.parseHeaderNumber = parseHeaderNumber;
+function normalizeResetToEpochMs(reset) {
+    if (reset < 10000)
+        return Date.now() + Math.round(reset * 1000);
+    if (reset < 10000000000)
+        return Math.round(reset * 1000);
+    return Math.round(reset);
+}
+exports.normalizeResetToEpochMs = normalizeResetToEpochMs;