Skip to content

Fix promise stability in acquireLease/extendLease #241

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

Open
xrplto wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix promise stability in acquireLease/extendLease #241

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
129 changes: 78 additions & 51 deletions src/clients/tenant-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,49 +266,59 @@ class TenantClient extends BaseEvernodeClient {
console.log(`Waiting for acquire response... (txHash: ${tx.id})`);

return new Promise(async (resolve, reject) => {
let rejected = false;
let settled = false;
const safeResolve = (v) => { if (!settled) { settled = true; clearTimeout(failTimeout); resolve(v); } };
const safeReject = (e) => { if (!settled) { settled = true; clearTimeout(failTimeout); reject(e); } };
const failTimeout = setTimeout(() => {
rejected = true;
reject({ error: ErrorCodes.ACQUIRE_ERR, reason: ErrorReasons.TIMEOUT });
safeReject({ error: ErrorCodes.ACQUIRE_ERR, reason: ErrorReasons.TIMEOUT });
}, options.timeout || DEFAULT_WAIT_TIMEOUT);

let relevantTx = null;
while (!rejected && !relevantTx) {
let consecutiveErrors = 0;
while (!settled && !relevantTx) {
try {
const txList = await this.xrplAcc.getAccountTrx(tx.details.ledger_index);
consecutiveErrors = 0;
for (let t of txList) {
t.tx.Memos = TransactionHelper.deserializeMemos(t.tx?.Memos);
t.tx.HookParameters = TransactionHelper.deserializeHookParams(t.tx?.HookParameters);

if (t.meta?.delivered_amount)
t.tx.DeliveredAmount = t.meta.delivered_amount;

const res = await this.extractEvernodeEvent(t.tx);
if ((res?.name === EvernodeEvents.AcquireSuccess || res?.name === EvernodeEvents.AcquireError) && res?.data?.acquireRefId === tx.id) {
clearTimeout(failTimeout);
relevantTx = res;
break;
try {
t.tx.Memos = TransactionHelper.deserializeMemos(t.tx?.Memos);
t.tx.HookParameters = TransactionHelper.deserializeHookParams(t.tx?.HookParameters);

if (t.meta?.delivered_amount)
t.tx.DeliveredAmount = t.meta.delivered_amount;

const res = await this.extractEvernodeEvent(t.tx);
if ((res?.name === EvernodeEvents.AcquireSuccess || res?.name === EvernodeEvents.AcquireError) && res?.data?.acquireRefId === tx.id) {
relevantTx = res;
break;
}
} catch (innerErr) {
continue;
}
}
}
catch (e) {
rejected = true;
clearTimeout(failTimeout);
reject({ error: ErrorCodes.ACQUIRE_ERR, reason: 'UNKNOWN', acquireRefId: tx.id });
break;
consecutiveErrors++;
if (consecutiveErrors >= 10) {
safeReject({ error: ErrorCodes.ACQUIRE_ERR, reason: 'UNKNOWN', acquireRefId: tx.id, content: e?.message || String(e) });
break;
}
await new Promise(r => setTimeout(r, 3000));
continue;
}
if (relevantTx) break;
await new Promise(resolveSleep => setTimeout(resolveSleep, 2000));
}

if (!rejected) {
if (!settled) {
if (relevantTx?.name === TenantEvents.AcquireSuccess) {
resolve({
safeResolve({
transaction: relevantTx?.data.transaction,
instance: relevantTx?.data.payload.content,
acquireRefId: relevantTx?.data.acquireRefId
});
} else if (relevantTx?.name === TenantEvents.AcquireError) {
reject({
safeReject({
error: ErrorCodes.ACQUIRE_ERR,
transaction: relevantTx?.data.transaction,
reason: relevantTx?.data.reason,
Expand Down Expand Up @@ -453,16 +463,25 @@ class TenantClient extends BaseEvernodeClient {
*/
acquireLease(hostAddress, requirement, options = {}) {
return new Promise(async (resolve, reject) => {
const tx = await this.acquireLeaseSubmit(hostAddress, requirement, options).catch(error => {
reject({ error: ErrorCodes.ACQUIRE_ERR, reason: error.reason || ErrorReasons.TRANSACTION_FAILURE, content: error.error || error });
});
if (tx) {
let settled = false;
const safeResolve = (v) => { if (!settled) { settled = true; resolve(v); } };
const safeReject = (e) => { if (!settled) { settled = true; reject(e); } };
try {
let tx;
try {
tx = await this.acquireLeaseSubmit(hostAddress, requirement, options);
} catch (error) {
return safeReject({ error: ErrorCodes.ACQUIRE_ERR, reason: error.reason || ErrorReasons.TRANSACTION_FAILURE, content: error.error || error });
}
if (!tx) return safeReject({ error: ErrorCodes.ACQUIRE_ERR, reason: 'NO_TX' });
try {
const response = await this.watchAcquireResponse(tx, options);
resolve(response);
safeResolve(response);
} catch (error) {
reject(error);
safeReject(error);
}
} catch (outerErr) {
safeReject({ error: ErrorCodes.ACQUIRE_ERR, reason: 'OUTER_ERR', content: outerErr?.message || String(outerErr) });
}
});
}
Expand Down Expand Up @@ -586,49 +605,57 @@ class TenantClient extends BaseEvernodeClient {
console.log(`Waiting for extend lease response... (txHash: ${tx.id})`);

return new Promise(async (resolve, reject) => {
let rejected = false;
let settled = false;
const safeResolve = (v) => { if (!settled) { settled = true; clearTimeout(failTimeout); resolve(v); } };
const safeReject = (e) => { if (!settled) { settled = true; clearTimeout(failTimeout); reject(e); } };
const failTimeout = setTimeout(() => {
rejected = true;
reject({ error: ErrorCodes.EXTEND_ERR, reason: ErrorReasons.TIMEOUT });
safeReject({ error: ErrorCodes.EXTEND_ERR, reason: ErrorReasons.TIMEOUT });
}, options.timeout || DEFAULT_WAIT_TIMEOUT);

let relevantTx = null;
while (!rejected && !relevantTx) {
let consecutiveErrors = 0;
while (!settled && !relevantTx) {
try {
const txList = await this.xrplAcc.getAccountTrx(tx.details.ledger_index);
consecutiveErrors = 0;
for (let t of txList) {
t.tx.Memos = TransactionHelper.deserializeMemos(t.tx.Memos);
t.tx.HookParameters = TransactionHelper.deserializeHookParams(t.tx?.HookParameters);

if (t.meta?.delivered_amount)
t.tx.DeliveredAmount = t.meta.delivered_amount;

const res = await this.extractEvernodeEvent(t.tx);
if ((res?.name === TenantEvents.ExtendSuccess || res?.name === TenantEvents.ExtendError) && res?.data?.extendRefId === tx.id) {
clearTimeout(failTimeout);
relevantTx = res;
break;
}
try {
t.tx.Memos = TransactionHelper.deserializeMemos(t.tx.Memos);
t.tx.HookParameters = TransactionHelper.deserializeHookParams(t.tx?.HookParameters);

if (t.meta?.delivered_amount)
t.tx.DeliveredAmount = t.meta.delivered_amount;

const res = await this.extractEvernodeEvent(t.tx);
if ((res?.name === TenantEvents.ExtendSuccess || res?.name === TenantEvents.ExtendError) && res?.data?.extendRefId === tx.id) {
relevantTx = res;
break;
}
} catch (innerErr) { continue; }
}
}
catch (e) {
rejected = true;
clearTimeout(failTimeout);
reject({ error: ErrorCodes.EXTEND_ERR, reason: 'UNKNOWN', extendRefId: tx.id });
break;
consecutiveErrors++;
if (consecutiveErrors >= 10) {
safeReject({ error: ErrorCodes.EXTEND_ERR, reason: 'UNKNOWN', extendRefId: tx.id, content: e?.message || String(e) });
break;
}
await new Promise(r => setTimeout(r, 3000));
continue;
}
if (relevantTx) break;
await new Promise(resolveSleep => setTimeout(resolveSleep, 1000));
}

if (!rejected) {
if (!settled) {
if (relevantTx?.name === TenantEvents.ExtendSuccess) {
resolve({
safeResolve({
transaction: relevantTx?.data.transaction,
expiryMoment: relevantTx?.data.expiryMoment,
extendRefId: relevantTx?.data.extendRefId
});
} else if (relevantTx?.name === TenantEvents.ExtendError) {
reject({
safeReject({
error: ErrorCodes.EXTEND_ERR,
transaction: relevantTx?.data.transaction,
reason: relevantTx?.data.reason,
Expand Down