blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: downgrade multiple unsubscribes from fatal to warning

This commit is contained in:
steveluscher 2022-04-25 11:49:20 -07:00 committed by Steven Luscher
parent 099258e4eb
commit 674c0d7602
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
web3.js/src/connection.ts
View File

@ -2120,6 +2120,13 @@ export type ConnectionConfig = {
confirmTransactionInitialTimeout?: number;
};
function createSubscriptionWarningMessage(id: number, label: string): string {
return (
'Ignored unsubscribe request because an active subscription ' +
`with id \`${id}\` for '${label}' events could not be found.`
);
}
/**
* A connection to a fullnode JSON RPC endpoint
*/
@ -4381,7 +4388,7 @@ export class Connection {
await this._unsubscribe(subInfo, 'accountUnsubscribe');
this._updateSubscriptions();
} else {
throw new Error(`Unknown account change id: ${id}`);
console.warn(createSubscriptionWarningMessage(id, 'account change'));
}
}
@ -4445,7 +4452,9 @@ export class Connection {
await this._unsubscribe(subInfo, 'programUnsubscribe');
this._updateSubscriptions();
} else {
throw new Error(`Unknown program account change id: ${id}`);
console.warn(
createSubscriptionWarningMessage(id, 'program account change'),
);
}
}
@ -4474,13 +4483,14 @@ export class Connection {
* @param id subscription id to deregister.
*/
async removeOnLogsListener(id: number): Promise<void> {
if (!this._logsSubscriptions[id]) {
throw new Error(`Unknown logs id: ${id}`);
if (this._logsSubscriptions[id]) {
const subInfo = this._logsSubscriptions[id];
delete this._logsSubscriptions[id];
await this._unsubscribe(subInfo, 'logsUnsubscribe');
this._updateSubscriptions();
} else {
console.warn(createSubscriptionWarningMessage(id, 'logs'));
}
const subInfo = this._logsSubscriptions[id];
delete this._logsSubscriptions[id];
await this._unsubscribe(subInfo, 'logsUnsubscribe');
this._updateSubscriptions();
}
/**
@ -4539,7 +4549,7 @@ export class Connection {
await this._unsubscribe(subInfo, 'slotUnsubscribe');
this._updateSubscriptions();
} else {
throw new Error(`Unknown slot change id: ${id}`);
console.warn(createSubscriptionWarningMessage(id, 'slot change'));
}
}
@ -4585,7 +4595,7 @@ export class Connection {
await this._unsubscribe(subInfo, 'slotsUpdatesUnsubscribe');
this._updateSubscriptions();
} else {
throw new Error(`Unknown slot update id: ${id}`);
console.warn(createSubscriptionWarningMessage(id, 'slot update'));
}
}
@ -4730,7 +4740,7 @@ export class Connection {
await this._unsubscribe(subInfo, 'signatureUnsubscribe');
this._updateSubscriptions();
} else {
throw new Error(`Unknown signature result id: ${id}`);
console.warn(createSubscriptionWarningMessage(id, 'signature result'));
}
}
@ -4775,7 +4785,7 @@ export class Connection {
await this._unsubscribe(subInfo, 'rootUnsubscribe');
this._updateSubscriptions();
} else {
throw new Error(`Unknown root change id: ${id}`);
console.warn(createSubscriptionWarningMessage(id, 'root change'));
}
}
}