gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: reset subscriptions on ws close

Browse Source
This commit is contained in:
Justin Starry
2020-04-09 19:34:33 +08:00
committed by Michael Vines
parent 0f7789e373
commit 4409a05564
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
web3.js/src/connection.js
View File

@ -1428,20 +1428,15 @@ export class Connection {
* @private * @private
*/ */
_wsOnError(err: Error) { _wsOnError(err: Error) {
console.log('ws error:', err.message); console.error('ws error:', err.message);
} }
/** /**
* @private * @private
*/ */
_wsOnClose(code: number, message: string) { _wsOnClose() {
// 1000 means _rpcWebSocket.close() was called explicitly
if (code !== 1000) {
console.log('ws close:', code, message);
} else {
// Only after an explicit close do we need to explicitly connect again
this._rpcWebSocketConnected = false; this._rpcWebSocketConnected = false;
} this._resetSubscriptions();
} }
/** /**
@ -1483,11 +1478,32 @@ export class Connection {
try { try {
await this._rpcWebSocket.call(rpcMethod, [unsubscribeId]); await this._rpcWebSocket.call(rpcMethod, [unsubscribeId]);
} catch (err) { } catch (err) {
console.log(`${rpcMethod} error:`, err.message); console.error(`${rpcMethod} error:`, err.message);
} }
} }
} }
/**
* @private
*/
_resetSubscriptions() {
(Object.values(this._accountChangeSubscriptions): any).forEach(
s => (s.subscriptionId = null),
);
(Object.values(this._programAccountChangeSubscriptions): any).forEach(
s => (s.subscriptionId = null),
);
(Object.values(this._signatureSubscriptions): any).forEach(
s => (s.subscriptionId = null),
);
(Object.values(this._slotSubscriptions): any).forEach(
s => (s.subscriptionId = null),
);
(Object.values(this._rootSubscriptions): any).forEach(
s => (s.subscriptionId = null),
);
}
/** /**
* @private * @private
*/ */
@ -1513,21 +1529,7 @@ export class Connection {
} }
if (!this._rpcWebSocketConnected) { if (!this._rpcWebSocketConnected) {
for (let id of accountKeys) { this._resetSubscriptions();
this._accountChangeSubscriptions[id].subscriptionId = null;
}
for (let id of programKeys) {
this._programAccountChangeSubscriptions[id].subscriptionId = null;
}
for (let id of slotKeys) {
this._slotSubscriptions[id].subscriptionId = null;
}
for (let id of signatureKeys) {
this._signatureSubscriptions[id].subscriptionId = null;
}
for (let id of rootKeys) {
this._rootSubscriptions[id].subscriptionId = null;
}
this._rpcWebSocket.connect(); this._rpcWebSocket.connect();
return; return;
} }