neptune/ghost-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't connect to unreachable/disabled para endpoints (#6977)

Browse Source 
* Don't connect to unreachable/disabled para endpoints

* Only check on API creation

* Address TODO
This commit is contained in:
Jaco 2022-02-13 14:56:53 +01:00 committed by GitHub
parent 2db45eb717
commit 6fe5f8996b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/react-hooks/src/useParaApi.ts
View File

@ -7,6 +7,7 @@ import type { BN } from '@polkadot/util';
import { useEffect, useState } from 'react';
import { ApiPromise } from '@polkadot/api';
import { arrayShuffle } from '@polkadot/util';
import { createNamedHook } from './createNamedHook';
import { useApiUrl } from './useApiUrl';
@ -19,23 +20,6 @@ interface Result {
urls: string[];
}
// use from @polkadot/util
function arrayShuffle (result: string[]): string[] {
let currentIndex = result.length;
while (currentIndex !== 0) {
const randomIndex = Math.floor(Math.random() * currentIndex);
currentIndex--;
[result[currentIndex], result[randomIndex]] = [
result[randomIndex], result[currentIndex]
];
}
return result;
}
function useParaApiImpl (paraId: BN | number): Result {
const mountedRef = useIsMountedRef();
const endpoints = useParaEndpoints(paraId);
@ -50,7 +34,10 @@ function useParaApiImpl (paraId: BN | number): Result {
mountedRef.current && setState({
api: null,
endpoints,
urls: arrayShuffle(endpoints.map(({ value }) => value))
urls: arrayShuffle(
endpoints
.filter(({ isDisabled, isUnreachable }) => !isDisabled && !isUnreachable)
.map(({ value }) => value))
});
}, [endpoints, mountedRef]);

4
packages/react-hooks/src/useParaEndpoints.ts
View File

@ -23,7 +23,9 @@ function extractRelayEndpoints (genesisHash: string): LinkOption[] {
function extractParaEndpoints (allEndpoints: LinkOption[], paraId: BN | number): LinkOption[] {
const numId = bnToBn(paraId).toNumber();
return allEndpoints.filter(({ paraId }) => paraId === numId);
return allEndpoints.filter(({ paraId }) =>
paraId === numId
);
}
function useRelayEndpointsImpl (): LinkOption[] {