Skip to content

Polling fall back for Swift order confirmation #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChesterSim merged 1 commit into from
Dec 29, 2025
Merged

Polling fall back for Swift order confirmation #295

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 30 additions & 31 deletions common-ts/src/clients/swiftClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,14 +223,10 @@ export class SwiftClient {
signedMsgOrderUuid: Uint8Array,
confirmDuration: number
): Promise<number | undefined> {
allEnvDlog(
'swiftClient',
'confirmSwiftOrderWS - confirmation duration',
confirmDuration
);
return new Promise((resolve, reject) => {
let settled = false;
let subId: number | undefined = undefined;
let pollInterval: NodeJS.Timeout | undefined = undefined;

const finalizeResolve = (orderId: number) => {
if (settled) return;
Expand All @@ -239,6 +235,11 @@ export class SwiftClient {
connection.removeAccountChangeListener(subId).catch(() => {});
}
clearTimeout(timeout);

if (pollInterval) {
clearInterval(pollInterval);
}

resolve(orderId);
};

Expand All @@ -249,10 +250,17 @@ export class SwiftClient {
connection.removeAccountChangeListener(subId).catch(() => {});
}
clearTimeout(timeout);

if (pollInterval) {
clearInterval(pollInterval);
}

reject(error);
};

const timeout = setTimeout(async () => {
const checkOrder = async (
confirmType: 'initial' | 'poll' | 'timeout'
) => {
try {
const lastOrderId = await this.confirmSwiftOrderRPCFetch(
connection,
Expand All @@ -263,40 +271,31 @@ export class SwiftClient {
if (lastOrderId !== undefined) {
allEnvDlog(
'swiftClient',
'confirmed in last RPC fetch orderID\n',
`confirmed in ${confirmType} RPC fetch orderID\n`,
lastOrderId
);
finalizeResolve(lastOrderId);
return;
}
} catch (err) {
allEnvDlog('swiftClient', 'last RPC fetch error', err);
allEnvDlog('swiftClient', `${confirmType} RPC fetch error`, err);
}
};

const timeout = setTimeout(async () => {
await checkOrder('timeout');

if (!settled) {
finalizeReject(new Error('Order not found'));
}
finalizeReject(new Error('Order not found'));
}, confirmDuration);

// Initial pre-subscription RPC check
this.confirmSwiftOrderRPCFetch(
connection,
client,
signedMsgUserOrdersAccount,
signedMsgOrderUuid
)
.then((initialOrderId) => {
if (initialOrderId !== undefined) {
allEnvDlog(
'swiftClient',
'confirmed in initial fetch orderID\n',
initialOrderId
);
finalizeResolve(initialOrderId);
}
})
.catch((err) => {
allEnvDlog('swiftClient', 'initial RPC fetch error', err);
});
// Perform an initial check.
checkOrder('initial');

// Poll every 2 seconds as backup for unreliable websocket.
pollInterval = setInterval(() => checkOrder('poll'), 2000);

// Subscribe for account change confirmations
// Subscribe for account change confirmations via WS.
subId = connection.onAccountChange(
signedMsgUserOrdersAccount,
(accountInfo) => {
Expand Down
Loading