@huskly/ibkr-client 0.11.0 → 0.12.0

package/dist/ibkr/ibkrClient.js

@@ -2,6 +2,7 @@ import { createRequire } from "node:module";
 import { ASSET_CLASS_LABELS, toNumber } from "../helpers.js";
 import { normalizeOptionContract, parseOsiOptionSymbol } from "./optionContract.js";
 import { normalizeDerivativeContract, normalizeDerivativeDataAvailability, } from "./derivativeContract.js";
+import { IbkrRequestScheduler, } from "./requestScheduler.js";
 // `ibkr-client`'s published ESM build is broken: its `import` condition points
 // at files that use extensionless relative imports, which Node's strict ESM
 // resolver rejects. Its CJS build is fine, so we deliberately load that via
@@ -56,9 +57,6 @@ const QUOTE_FIELDS = [
 const OPTION_DISCOVERY_MONTH_CONCURRENCY = 1;
 const OPTION_SECDEF_INFO_BATCH_SIZE = 8;
 const OPTION_MARKETDATA_BATCH_SIZE = 100;
-const READ_ONLY_REQUEST_MAX_RETRIES = 3;
-const REQUEST_RETRY_BASE_DELAY_MS = 250;
-const REQUEST_RETRY_MAX_DELAY_MS = 5_000;
 const DAY_MS = 24 * 60 * 60 * 1000;
 const IBKR_STATUS_FILTERS = {
     CANCELED: "cancelled",
@@ -167,8 +165,19 @@ export class IbkrClient {
     accountIdPromise;
     optionDiscovery = new Map();
     derivativeDiscovery = new Map();
-    constructor(config) {
+    requestScheduler;
+    constructor(config, options = {}) {
         this.raw = new RawIbkrClientCtor(config);
+        this.requestScheduler = new IbkrRequestScheduler({
+            ...options.requestScheduler,
+            now: () => this.now(),
+            sleep: (ms) => this.wait(ms),
+            random: () => this.random(),
+            classifyError: (error) => this.classifyRequestError(error),
+            ...(options.onRequestTelemetry === undefined
+                ? {}
+                : { onTelemetry: options.onRequestTelemetry }),
+        });
     }
     /** Obtain the live session token (idempotent — safe to await repeatedly). */
     init() {
@@ -238,14 +247,13 @@ export class IbkrClient {
         if (!request.clientOrderId.trim() || request.clientOrderId.length > 64) {
             throw new Error("Client order ID must contain 1 to 64 characters");
         }
-        if (!request.extOperator.trim())
-            throw new Error("External operator is required");
+        const cmeOperatorMetadata = this.cmeOperatorMetadata(request.legs[0].contract.assetClass, request);
         const diagnostics = await this.getTradingDiagnostics(request.accountId);
         if (!diagnostics.authenticated || diagnostics.competingSession) {
             throw new Error("IBKR brokerage session is not safely authenticated for submission");
         }
         await this.prepareBrokerageAccount(request.accountId);
-        const response = await this.sendRequest({
+        const response = await this.singleAttemptRequest({
             path: `iserver/account/${request.accountId}/orders`,
             method: "POST",
             data: {
@@ -253,8 +261,7 @@ export class IbkrClient {
                     {
                         ...this.comboOrderTicket(request),
                         cOID: request.clientOrderId,
-                        extOperator: request.extOperator,
-                        manualIndicator: request.manualIndicator,
+                        ...cmeOperatorMetadata,
                     },
                 ],
             },
@@ -264,7 +271,7 @@ export class IbkrClient {
     async acknowledgeOrderWarning(input) {
         if (!input.replyId.trim())
             throw new Error("An exact warning reply ID is required");
-        const response = await this.sendRequest({
+        const response = await this.singleAttemptRequest({
             path: `iserver/reply/${encodeURIComponent(input.replyId)}`,
             method: "POST",
             data: { confirmed: true },
@@ -276,31 +283,118 @@ export class IbkrClient {
             throw new Error("Exact account and order IDs are required");
         }
         await this.prepareBrokerageAccount(accountId);
+        const order = await this.req({
+            path: `iserver/account/order/status/${encodeURIComponent(orderId)}`,
+        });
+        if (String(order.order_id ?? order.orderId ?? "") !== orderId) {
+            throw new Error(`IBKR response does not match the requested order ${orderId}`);
+        }
+        if ((order.account ?? order.acct) !== accountId) {
+            throw new Error(`IBKR order ${orderId} does not belong to the requested account`);
+        }
+        const lifecycle = this.normalizeDerivativeOrderLifecycle(accountId, orderId, order);
+        if (lifecycle.status === "UNKNOWN") {
+            throw new Error(`IBKR order ${orderId} returned an unrecognized status`);
+        }
+        return lifecycle;
+    }
+    async findDerivativeOrder(input) {
+        if (!input.accountId.trim())
+            throw new Error("An exact account ID is required");
+        const identity = input.orderId ?? input.clientOrderId;
+        if (!identity.trim())
+            throw new Error("An exact broker or client order ID is required");
+        if (input.orderId !== undefined) {
+            return this.getDerivativeOrderStatus(input.accountId, input.orderId);
+        }
+        await this.prepareBrokerageAccount(input.accountId);
         const response = await this.req({
             path: "iserver/account/orders",
-            params: { force: true, accountId },
+            params: { force: true, accountId: input.accountId },
+        });
+        const order = response.orders?.find((candidate) => {
+            if (!this.orderBelongsToAccount(candidate, input.accountId))
+                return false;
+            return (candidate.cOID ?? candidate.order_ref) === input.clientOrderId;
         });
-        const order = response.orders?.find((candidate) => String(candidate.order_id ?? candidate.orderId) === orderId);
         if (order === undefined)
-            throw new Error(`IBKR order ${orderId} was not found`);
-        if (!this.orderBelongsToAccount(order, accountId)) {
-            throw new Error(`IBKR order ${orderId} does not belong to the requested account`);
+            throw new Error(`IBKR order ${identity} was not found`);
+        const orderId = order.order_id ?? order.orderId;
+        if (orderId === undefined) {
+            throw new Error(`IBKR order ${identity} did not include a broker order ID`);
+        }
+        return this.getDerivativeOrderStatus(input.accountId, String(orderId));
+    }
+    async getDerivativeExecutions(input) {
+        if (!input.accountId.trim())
+            throw new Error("An exact account ID is required");
+        if (input.days !== undefined &&
+            (!Number.isSafeInteger(input.days) || input.days < 1 || input.days > 7)) {
+            throw new Error("Execution history days must be an integer from 1 through 7");
+        }
+        if (input.orderId !== undefined && !input.orderId.trim()) {
+            throw new Error("Broker order ID cannot be empty");
+        }
+        if (input.clientOrderId !== undefined && !input.clientOrderId.trim()) {
+            throw new Error("Client order ID cannot be empty");
+        }
+        await this.prepareBrokerageAccount(input.accountId);
+        const response = await this.req({
+            path: "iserver/account/trades",
+            ...(input.days === undefined ? {} : { params: { days: input.days } }),
+        });
+        return response
+            .filter((trade) => (trade.account ?? trade.accountCode) === input.accountId)
+            .filter((trade) => input.orderId === undefined || String(trade.order_id) === input.orderId)
+            .filter((trade) => input.clientOrderId === undefined || trade.order_ref === input.clientOrderId)
+            .flatMap((trade) => {
+            const execution = this.normalizeDerivativeExecution(input.accountId, trade);
+            return execution === undefined ? [] : [execution];
+        });
+    }
+    async reconcileDerivativeComboExecution(request) {
+        this.validateReconciliationRequest(request);
+        const lifecycle = await this.getDerivativeOrderStatus(request.accountId, request.orderId);
+        const deadline = this.now() + (request.timeoutMs ?? 30_000);
+        const pollMs = request.pollMs ?? 1_000;
+        for (;;) {
+            const executions = await this.getDerivativeExecutions({
+                accountId: request.accountId,
+                clientOrderId: request.clientOrderId,
+                days: 1,
+            });
+            const result = this.evaluateDerivativeReconciliation(request, lifecycle, executions);
+            if (result.state !== "PENDING")
+                return result;
+            if (!this.isTerminalDerivativeStatus(lifecycle.status))
+                return result;
+            if (this.now() >= deadline) {
+                return {
+                    ...result,
+                    state: "RECOVERY_REQUIRED",
+                    reason: result.reason ?? "Terminal order is missing expected execution evidence",
+                };
+            }
+            await this.wait(Math.min(pollMs, Math.max(0, deadline - this.now())));
         }
-        return this.normalizeDerivativeOrderLifecycle(accountId, orderId, order);
     }
     async cancelDerivativeOrder(input) {
-        if (!input.accountId.trim() || !input.orderId.trim() || !input.extOperator.trim()) {
-            throw new Error("Exact account, order, and external operator are required");
+        if (!input.accountId.trim() || !input.orderId.trim()) {
+            throw new Error("Exact account and order IDs are required");
         }
+        const cmeOperatorMetadata = this.cmeOperatorMetadata(input.assetClass, input);
         await this.prepareBrokerageAccount(input.accountId);
-        await this.sendRequest({
+        const response = await this.singleAttemptRequest({
             path: `iserver/account/${input.accountId}/order/${encodeURIComponent(input.orderId)}`,
             method: "DELETE",
-            params: {
-                extOperator: input.extOperator,
-                manualIndicator: input.manualIndicator,
-            },
+            ...(Object.keys(cmeOperatorMetadata).length > 0 ? { params: cmeOperatorMetadata } : {}),
         });
+        return {
+            state: "requested",
+            accountId: input.accountId,
+            orderId: input.orderId,
+            message: this.trimmedString(response.msg),
+        };
     }
     async getAccountId() {
         this.accountIdPromise ??= (async () => {
@@ -522,6 +616,17 @@ export class IbkrClient {
             }
         }
     }
+    cmeOperatorMetadata(assetClass, input) {
+        if (assetClass === "OPT")
+            return {};
+        if (!input.extOperator?.trim() || input.manualIndicator === undefined) {
+            throw new Error(`${assetClass} orders require exact CME operator metadata`);
+        }
+        return {
+            extOperator: input.extOperator,
+            manualIndicator: input.manualIndicator,
+        };
+    }
     comboOrderTicket(request) {
         const exchange = request.legs[0].contract.exchange;
         const spreadConid = exchange === "SMART" ? "28812380" : `28812380@${exchange}`;
@@ -543,11 +648,15 @@ export class IbkrClient {
         const warnings = items.flatMap((item) => {
             if (!("id" in item) || typeof item.id !== "string")
                 return [];
-            const messageIds = item.messageIds?.filter((value) => typeof value === "string") ?? [];
+            const messageIds = Array.isArray(item.messageIds)
+                ? item.messageIds.filter((value) => typeof value === "string")
+                : [];
             return [
                 {
                     replyId: item.id,
-                    messages: item.message?.filter((value) => typeof value === "string") ?? [],
+                    messages: Array.isArray(item.message)
+                        ? item.message.filter((value) => typeof value === "string")
+                        : [],
                     messageIds,
                     known: messageIds.length > 0 && messageIds.every((id) => KNOWN_ORDER_WARNING_IDS.has(id)),
                 },
@@ -555,44 +664,77 @@ export class IbkrClient {
         });
         if (warnings.length > 0)
             return { state: "warning", warnings };
-        const reasons = items.flatMap((item) => "error" in item && typeof item.error === "string" && item.error.trim()
-            ? [item.error.trim()]
-            : []);
-        if (reasons.length > 0)
-            return { state: "rejected", reasons };
+        const errors = items.flatMap((item) => {
+            if (!("error" in item) || item.error === undefined || item.error === null)
+                return [];
+            return [this.normalizeBrokerError(item.error, item)];
+        });
+        if (errors.length > 0) {
+            return { state: "rejected", reasons: errors.map(({ message }) => message), errors };
+        }
         const accepted = items.find((item) => "order_id" in item || "orderId" in item);
         if (accepted !== undefined) {
             const orderId = ("order_id" in accepted ? accepted.order_id : undefined) ??
                 ("orderId" in accepted ? accepted.orderId : undefined);
-            if (orderId !== undefined) {
+            if (typeof orderId === "string" || typeof orderId === "number") {
+                const orderStatus = ("order_status" in accepted ? accepted.order_status : undefined) ??
+                    ("orderStatus" in accepted ? accepted.orderStatus : undefined);
                 return {
                     state: "accepted",
                     orderId: String(orderId),
-                    status: this.normalizeDerivativeOrderStatus(("order_status" in accepted ? accepted.order_status : undefined) ??
-                        ("orderStatus" in accepted ? accepted.orderStatus : undefined), 0, 0),
+                    status: this.normalizeDerivativeOrderStatus(typeof orderStatus === "string" ? orderStatus : undefined, 0, 0),
                     clientOrderId,
                     warnings: [],
                 };
             }
         }
-        return { state: "rejected", reasons: ["IBKR returned an unknown order response"] };
+        const unknown = "IBKR returned an unknown order response";
+        return {
+            state: "rejected",
+            reasons: [unknown],
+            errors: [{ message: unknown, code: null, statusCode: null, details: {} }],
+        };
+    }
+    normalizeBrokerError(error, response) {
+        const nested = typeof error === "object" && error !== null ? error : undefined;
+        const nestedMessage = nested ? nested.message : undefined;
+        const responseMessage = response["message"];
+        const message = (typeof nestedMessage === "string" && nestedMessage.trim()) ||
+            (typeof error === "string" && error.trim()) ||
+            (typeof responseMessage === "string" && responseMessage.trim()) ||
+            "IBKR rejected the order";
+        const nestedCode = nested ? nested.code : undefined;
+        const responseCode = response["code"];
+        const codeValue = nestedCode ?? responseCode;
+        const statusValue = response["statusCode"];
+        return {
+            message,
+            code: typeof codeValue === "string" || typeof codeValue === "number" ? String(codeValue) : null,
+            statusCode: typeof statusValue === "number" && Number.isFinite(statusValue) ? statusValue : null,
+            details: response,
+        };
     }
     normalizeDerivativeOrderLifecycle(accountId, orderId, order) {
-        const quantity = this.firstPositiveNumber(order.total_size, order.totalSize, order.size) ?? 0;
-        const filledQuantity = this.firstNumber(order.cum_fill, order.cumFill, order.filledQuantity) ?? 0;
-        const remainingQuantity = order.remainingQuantity === undefined
-            ? Math.max(0, quantity - filledQuantity)
-            : toNumber(order.remainingQuantity);
+        const quantity = this.firstPositiveNumber(order.total_size, order.totalSize, order.size);
+        const filledQuantity = this.firstNumber(order.cum_fill, order.cumFill, order.filledQuantity, order.filled);
+        const remainingQuantity = this.firstNumber(order.remainingQuantity, order.remaining_size, order.remaining);
+        if (quantity === undefined ||
+            filledQuantity === undefined ||
+            filledQuantity < 0 ||
+            remainingQuantity === undefined ||
+            remainingQuantity < 0) {
+            throw new Error(`IBKR order ${orderId} returned incomplete fill quantities`);
+        }
         return {
             accountId,
             orderId,
-            clientOrderId: order.cOID ?? null,
+            clientOrderId: order.cOID ?? order.order_ref ?? null,
             status: this.normalizeDerivativeOrderStatus(order.order_status ?? order.orderStatus ?? order.status, filledQuantity, remainingQuantity),
             quantity,
             filledQuantity,
             remainingQuantity,
-            averagePrice: this.firstNumber(order.avgPrice, order.average_price, order.averagePrice) ?? null,
-            limitPrice: this.firstNumber(order.limitPrice, order.price) ?? null,
+            averagePrice: this.firstNumber(order.avgPrice, order.avg_price, order.average_price, order.averagePrice) ?? null,
+            limitPrice: this.firstNumber(order.limitPrice, order.limit_price, order.price) ?? null,
             commissionAndFees: typeof order.commissionAndFees === "number"
                 ? order.commissionAndFees
                 : this.whatIfNumber(order.commissionAndFees),
@@ -600,6 +742,204 @@ export class IbkrClient {
             updatedAt: this.parseOrderTime(order)?.toISOString() ?? null,
         };
     }
+    normalizeDerivativeExecution(accountId, trade) {
+        if (!trade.execution_id || !Number.isSafeInteger(trade.conid) || Number(trade.conid) <= 0) {
+            return undefined;
+        }
+        const commission = typeof trade.commission === "number" ? trade.commission : this.whatIfNumber(trade.commission);
+        const commissionCurrency = typeof trade.commission === "string"
+            ? (/\b(?<currency>[A-Z]{3})\s*$/.exec(trade.commission.trim())?.groups?.["currency"] ??
+                null)
+            : null;
+        const side = trade.side?.trim().toUpperCase();
+        return {
+            accountId,
+            executionId: trade.execution_id,
+            orderId: trade.order_id === undefined ? null : String(trade.order_id),
+            clientOrderId: this.trimmedString(trade.order_ref),
+            conid: Number(trade.conid),
+            symbol: this.trimmedString(trade.contract_description_1) ?? this.trimmedString(trade.symbol),
+            side: side === "B" || side === "BUY" || side === "BOT"
+                ? "BUY"
+                : side === "S" || side === "SELL" || side === "SLD"
+                    ? "SELL"
+                    : "UNKNOWN",
+            quantity: this.firstNumber(trade.size) ?? 0,
+            price: this.firstNumber(trade.price) ?? null,
+            commission,
+            commissionCurrency,
+            netAmount: this.firstNumber(trade.net_amount) ?? null,
+            exchange: this.trimmedString(trade.exchange),
+            executedAt: this.parseTradeTime(trade),
+        };
+    }
+    parseTradeTime(trade) {
+        if (trade.trade_time_r !== undefined) {
+            const epoch = new Date(trade.trade_time_r);
+            if (!Number.isNaN(epoch.getTime()))
+                return epoch.toISOString();
+        }
+        const value = trade.trade_time;
+        const match = value ? /^(\d{4})(\d{2})(\d{2})-(\d{2}):(\d{2}):(\d{2})$/.exec(value) : null;
+        if (!match)
+            return null;
+        const [, year, month, day, hour, minute, second] = match;
+        if (!year || !month || !day || !hour || !minute || !second)
+            return null;
+        const parsed = new Date(`${year}-${month}-${day}T${hour}:${minute}:${second}Z`);
+        return Number.isNaN(parsed.getTime()) ? null : parsed.toISOString();
+    }
+    trimmedString(value) {
+        if (value === undefined)
+            return null;
+        const trimmed = value.trim();
+        return trimmed.length === 0 ? null : trimmed;
+    }
+    validateReconciliationRequest(request) {
+        if (!request.accountId.trim() || !request.orderId.trim() || !request.clientOrderId.trim()) {
+            throw new Error("Exact account, order, and client order IDs are required for reconciliation");
+        }
+        if (!Number.isSafeInteger(request.quantity) || request.quantity <= 0) {
+            throw new Error("Reconciliation quantity must be a positive integer");
+        }
+        if (!Number.isFinite(request.multiplier) || request.multiplier <= 0) {
+            throw new Error("Reconciliation multiplier must be positive");
+        }
+        if (request.legs.some(({ conid, ratio }) => !Number.isSafeInteger(conid) || conid <= 0 || !Number.isSafeInteger(ratio) || ratio === 0) ||
+            request.legs[0].conid === request.legs[1].conid) {
+            throw new Error("Reconciliation legs require distinct conids and non-zero integer ratios");
+        }
+        if ((request.timeoutMs ?? 30_000) < 0 || (request.pollMs ?? 1_000) <= 0) {
+            throw new Error("Reconciliation timing must use a non-negative timeout and positive poll");
+        }
+    }
+    evaluateDerivativeReconciliation(request, lifecycle, trades) {
+        const base = {
+            aggregateStatus: lifecycle.status,
+            filledQuantity: lifecycle.filledQuantity,
+            remainingQuantity: lifecycle.remainingQuantity,
+            multiplier: request.multiplier,
+        };
+        const recovery = (reason) => ({
+            ...base,
+            state: "RECOVERY_REQUIRED",
+            reason,
+            legs: [],
+            grossPoints: null,
+            grossAmount: null,
+            commission: null,
+            netAmount: null,
+        });
+        if (lifecycle.quantity !== request.quantity) {
+            return recovery("Aggregate order quantity does not match the reviewed combo");
+        }
+        if (lifecycle.clientOrderId !== null && lifecycle.clientOrderId !== request.clientOrderId) {
+            return recovery("Aggregate client order reference does not match the reviewed combo");
+        }
+        const expectedLegs = request.legs.map(({ conid, ratio }) => ({ conid, ratio }));
+        if (JSON.stringify(lifecycle.legs) !== JSON.stringify(expectedLegs)) {
+            return recovery("Aggregate combo legs do not match the reviewed combo");
+        }
+        const matching = trades.filter(({ clientOrderId }) => clientOrderId === request.clientOrderId);
+        const executionIds = new Set();
+        for (const trade of matching) {
+            if (executionIds.has(trade.executionId)) {
+                return recovery("Duplicate execution ID requires manual recovery");
+            }
+            executionIds.add(trade.executionId);
+            if (trade.orderId !== null && trade.orderId !== request.orderId) {
+                return recovery("Execution order ID does not match the reviewed combo");
+            }
+            const expected = request.legs.find(({ conid }) => conid === trade.conid);
+            if (expected === undefined) {
+                return recovery("Execution contains an unexpected combo leg");
+            }
+            if (trade.side !== this.sideForRatio(expected.ratio)) {
+                return recovery("Execution side does not match the reviewed combo ratio");
+            }
+            if (trade.quantity <= 0 ||
+                trade.price === null ||
+                trade.price < 0 ||
+                trade.commission === null ||
+                trade.commission < 0 ||
+                trade.executedAt === null) {
+                return recovery("Execution contains incomplete economics or timing evidence");
+            }
+        }
+        const completeExecutions = matching.flatMap((trade) => trade.side !== "UNKNOWN" &&
+            trade.price !== null &&
+            trade.commission !== null &&
+            trade.executedAt !== null
+            ? [
+                {
+                    ...trade,
+                    side: trade.side,
+                    price: trade.price,
+                    commission: trade.commission,
+                    executedAt: trade.executedAt,
+                },
+            ]
+            : []);
+        const summaries = [];
+        for (const expected of request.legs) {
+            const executions = completeExecutions.filter(({ conid }) => conid === expected.conid);
+            const quantity = executions.reduce((sum, trade) => sum + trade.quantity, 0);
+            const expectedQuantity = lifecycle.filledQuantity * Math.abs(expected.ratio);
+            if (quantity > expectedQuantity) {
+                return recovery("Execution quantity exceeds the aggregate fill");
+            }
+            if (quantity < expectedQuantity) {
+                return {
+                    ...base,
+                    state: "PENDING",
+                    reason: "Terminal order is missing expected execution evidence",
+                    legs: summaries,
+                    grossPoints: null,
+                    grossAmount: null,
+                    commission: null,
+                    netAmount: null,
+                };
+            }
+            if (quantity > 0) {
+                summaries.push({
+                    conid: expected.conid,
+                    side: this.sideForRatio(expected.ratio),
+                    quantity,
+                    averagePrice: this.round(executions.reduce((sum, trade) => sum + trade.price * trade.quantity, 0) / quantity, 8),
+                    commission: this.round(executions.reduce((sum, trade) => sum + trade.commission, 0), 2),
+                    executionCount: executions.length,
+                });
+            }
+        }
+        const cashFlowPoints = completeExecutions.reduce((sum, trade) => sum + (trade.side === "SELL" ? 1 : -1) * trade.price * trade.quantity, 0);
+        const grossPoints = lifecycle.filledQuantity > 0 ? this.round(cashFlowPoints / lifecycle.filledQuantity, 8) : 0;
+        const grossAmount = this.round(cashFlowPoints * request.multiplier, 2);
+        const commission = this.round(completeExecutions.reduce((sum, trade) => sum + trade.commission, 0), 2);
+        const result = {
+            ...base,
+            state: this.isTerminalDerivativeStatus(lifecycle.status) ? "VERIFIED" : "PENDING",
+            reason: null,
+            legs: summaries,
+            grossPoints,
+            grossAmount,
+            commission,
+            netAmount: this.round(grossAmount - commission, 2),
+        };
+        if (lifecycle.status === "FILLED" && lifecycle.filledQuantity !== request.quantity) {
+            return recovery("Filled aggregate quantity does not match the reviewed combo");
+        }
+        return result;
+    }
+    sideForRatio(ratio) {
+        return ratio > 0 ? "BUY" : "SELL";
+    }
+    isTerminalDerivativeStatus(status) {
+        return status === "FILLED" || status === "CANCELED" || status === "REJECTED";
+    }
+    round(value, decimalPlaces) {
+        const factor = 10 ** decimalPlaces;
+        return Math.round((value + Number.EPSILON) * factor) / factor;
+    }
     parseComboLegs(conidex) {
         const encoded = conidex?.split(";;;")[1];
         if (!encoded)
@@ -772,7 +1112,10 @@ export class IbkrClient {
     }
     /** Discover listed derivative series over an inclusive calendar range. */
     async getDerivativeExpiries(query) {
-        const contracts = (await Promise.all(monthCodes(query.from, query.to).map((month) => this.discoverDerivativeMonth(query.underlying, query.assetClass, month, query.exchange, query.right)))).flat();
+        const contracts = [];
+        for (const month of monthCodes(query.from, query.to)) {
+            contracts.push(...(await this.discoverDerivativeMonth(query.underlying, query.assetClass, month, query.exchange, query.right)));
+        }
         const filtered = contracts.filter((contract) => contract.expiration >= query.from &&
             contract.expiration <= query.to &&
             (query.right === undefined || contract.right === query.right) &&
@@ -1450,6 +1793,14 @@ export class IbkrClient {
     wait(ms) {
         return sleep(ms);
     }
+    /** Overridable monotonic-enough wall clock for bounded polling tests. */
+    now() {
+        return Date.now();
+    }
+    /** Overridable entropy source for deterministic scheduler jitter tests. */
+    random() {
+        return Math.random();
+    }
     normalizeQuote(contract, snapshot, history) {
         const symbol = this.snapshotString(snapshot, "55") ?? contract.symbol;
         const description = this.snapshotString(snapshot, "58") ?? history?.text ?? contract.description;
@@ -1571,23 +1922,84 @@ export class IbkrClient {
     async sendRequest(input) {
         return (await this.raw.request(input));
     }
-    async req(input) {
-        let retries = 0;
-        for (;;) {
+    req(input) {
+        return this.scheduledRequest(input, true);
+    }
+    singleAttemptRequest(input) {
+        return this.scheduledRequest(input, false);
+    }
+    scheduledRequest(input, retryable) {
+        return this.requestScheduler.schedule({
+            endpoint: this.requestEndpoint(input.path),
+            priority: this.requestPriority(input.path),
+            retryable,
+        }, () => this.sendRequest(input));
+    }
+    requestPriority(path) {
+        if (path === "iserver/accounts" ||
+            path === "iserver/auth/status" ||
+            path.includes("/orders") ||
+            path.includes("/order/status/") ||
+            path === "iserver/account/trades" ||
+            path.startsWith("iserver/reply/")) {
+            return "EXECUTION";
+        }
+        if (path.includes("secdef"))
+            return "DISCOVERY";
+        return "STANDARD";
+    }
+    requestEndpoint(path) {
+        if (path.includes("secdef/"))
+            return path.slice(path.indexOf("secdef/"));
+        if (path.includes("/order/status/"))
+            return "account/order/status";
+        if (path.includes("/orders/whatif"))
+            return "account/orders/whatif";
+        if (path.endsWith("/orders"))
+            return "account/orders";
+        if (path.includes("/order/"))
+            return "account/order";
+        if (path.startsWith("iserver/reply/"))
+            return "reply";
+        if (path === "iserver/account/trades")
+            return "account/trades";
+        return path.split("/").slice(0, 2).join("/");
+    }
+    classifyRequestError(error) {
+        if (/temporar(?:ily|y).*(?:block|ban)|(?:ip|access).*(?:temporar(?:ily|y) )?blocked/i.test(this.requestErrorText(error))) {
+            return { kind: "TEMPORARILY_BLOCKED" };
+        }
+        if (this.httpStatusFromError(error) === 429) {
+            const retryAfterMs = this.retryAfterFromError(error);
+            return retryAfterMs === undefined
+                ? { kind: "THROTTLED" }
+                : { kind: "THROTTLED", retryAfterMs };
+        }
+        return { kind: "OTHER" };
+    }
+    requestErrorText(error) {
+        if (typeof error !== "object" || error === null)
+            return String(error);
+        const message = error.message;
+        const response = error.response;
+        const responseData = typeof response === "object" && response !== null && "data" in response
+            ? response.data
+            : undefined;
+        const body = error.body;
+        return [message, responseData, body]
+            .flatMap((value) => {
+            if (typeof value === "string")
+                return [value];
+            if (value === undefined)
+                return [];
             try {
-                return await this.sendRequest(input);
+                return [JSON.stringify(value)];
             }
-            catch (error) {
-                const status = this.httpStatusFromError(error);
-                if (status !== 429 || retries >= READ_ONLY_REQUEST_MAX_RETRIES) {
-                    throw error;
-                }
-                const retryAfter = this.retryAfterFromError(error);
-                const delayMs = this.computeBackoffDelayMs(retries, retryAfter);
-                retries += 1;
-                await this.wait(delayMs);
+            catch {
+                return [];
             }
-        }
+        })
+            .join(" ");
     }
     httpStatusFromError(error) {
         if (typeof error !== "object" || error === null)
@@ -1623,11 +2035,6 @@ export class IbkrClient {
             this.headerValue(directHeaders, "Retry-After");
         return parseRetryAfter(retryAfterRaw);
     }
-    computeBackoffDelayMs(retry, retryAfterMs) {
-        if (retryAfterMs !== undefined)
-            return Math.min(retryAfterMs, REQUEST_RETRY_MAX_DELAY_MS);
-        return Math.min(REQUEST_RETRY_BASE_DELAY_MS * 2 ** retry, REQUEST_RETRY_MAX_DELAY_MS);
-    }
     numberFromUnknown(value) {
         if (typeof value === "number")
             return Number.isFinite(value) ? value : undefined;