feat: add idle timeout and fix subscription race (#12093)
This commit is contained in:
@ -1,10 +1,6 @@
|
||||
// @flow
|
||||
|
||||
import {
|
||||
Client as RpcWebSocketClient,
|
||||
NodeWebSocketTypeOptions,
|
||||
IWSClientAdditionalOptions,
|
||||
} from 'rpc-websockets';
|
||||
import {Client as LiveClient} from 'rpc-websockets';
|
||||
|
||||
// Define TEST_LIVE in the environment to test against the real full node
|
||||
// identified by `url` instead of using the mock
|
||||
@ -12,49 +8,24 @@ export const mockRpcEnabled = !process.env.TEST_LIVE;
|
||||
|
||||
let mockNotice = true;
|
||||
|
||||
export class Client {
|
||||
client: RpcWebSocketClient;
|
||||
|
||||
constructor(
|
||||
url: string,
|
||||
options: NodeWebSocketTypeOptions & IWSClientAdditionalOptions,
|
||||
) {
|
||||
//console.log('MockClient', url, options);
|
||||
if (!mockRpcEnabled) {
|
||||
if (mockNotice) {
|
||||
console.log(
|
||||
'Note: rpc-websockets mock is disabled, testing live against',
|
||||
url,
|
||||
);
|
||||
mockNotice = false;
|
||||
}
|
||||
this.client = new RpcWebSocketClient(url, options);
|
||||
class MockClient {
|
||||
constructor(url: string) {
|
||||
if (mockNotice) {
|
||||
console.log(
|
||||
'Note: rpc-websockets mock is disabled, testing live against',
|
||||
url,
|
||||
);
|
||||
mockNotice = false;
|
||||
}
|
||||
}
|
||||
|
||||
connect() {
|
||||
if (!mockRpcEnabled) {
|
||||
return this.client.connect();
|
||||
}
|
||||
}
|
||||
|
||||
close() {
|
||||
if (!mockRpcEnabled) {
|
||||
return this.client.close();
|
||||
}
|
||||
}
|
||||
|
||||
on(event: string, callback: Function) {
|
||||
if (!mockRpcEnabled) {
|
||||
return this.client.on(event, callback);
|
||||
}
|
||||
//console.log('on', event);
|
||||
}
|
||||
|
||||
async call(method: string, params: Object): Promise<Object> {
|
||||
if (!mockRpcEnabled) {
|
||||
return await this.client.call(method, params);
|
||||
}
|
||||
connect() {}
|
||||
close() {}
|
||||
on() {}
|
||||
call(): Promise<Object> {
|
||||
throw new Error('call unsupported');
|
||||
}
|
||||
}
|
||||
|
||||
const Client = mockRpcEnabled ? MockClient : LiveClient;
|
||||
export {Client};
|
||||
|
Reference in New Issue
Block a user