usbharu
/
misskey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

サーバーチェックの方法を変更 

* Update api.ts

* Update api.ts

* lint
This commit is contained in:
FineArchs 2023-10-18 20:52:54 +09:00 committed by GitHub
parent 1a222693e3
commit 253d548c81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/frontend/src/scripts/api.ts
View File

@ -51,13 +51,20 @@ export function api<E extends keyof Misskey.Endpoints, P extends Misskey.Endpoin
return promise;
}
export async function apiExternal<E extends keyof Misskey.Endpoints, P extends Misskey.Endpoints[E]['req']>(hostUrl: string, endpoint: E, data: P = {} as any, token?: string | null | undefined, signal?: AbortSignal): Promise<Misskey.Endpoints[E]['res']> {
if (!/^https?:\/\//.test(hostUrl)) throw new Error('invalid host name');
export async function apiExternal<E extends keyof Misskey.Endpoints, P extends Misskey.Endpoints[E]['req']>(host: string, endpoint: E, data: P = {} as any, token?: string | null | undefined, signal?: AbortSignal): Promise<Misskey.Endpoints[E]['res']> {
if (endpoint.includes('://')) throw new Error('invalid endpoint');
const knownUrls = (await api('federation/instances', { blocked: false })).map(v => v.host);
if (!knownUrls.includes(URL(hostUrl).host)) throw new Error(hostname + 'is blocked by or not known to this server.');
pendingApiRequestsCount.value++;
const [hostName, hostUrl] = await (new Promise(resolve => resolve(URL(host))))
.then(url => {
if (['http:', 'https:'].includes(url.protocol)) return [url.host, host];
else throw new Error('Only http and https are allowed as url protocol.');
}, err => {
if (err instanceof TypeError) return [host, 'https://' + host];
else throw err;
});
const serverInfo = await api('federation/show-instance', { host: hostName });
if ((!serverInfo) || serverInfo.isBlocked) throw new Error(hostName + 'is blocked by or not known to this server.');
pendingApiRequestsCount.value++;
const onFinally = () => {
pendingApiRequestsCount.value--;
};