fix compile errors for fetch-likes

This commit is contained in:
mrjvs
2023-09-27 19:50:55 +02:00
parent 2a2a3adc24
commit f53a0c52a0
4 changed files with 7 additions and 7 deletions

View File

@@ -278,7 +278,7 @@ async function processOptions(options: CommandLineArguments) {
let fetcher; let fetcher;
if (options.fetcher === 'native') { if (options.fetcher === 'native') {
fetcher = makeStandardFetcher(fetch as any); fetcher = makeStandardFetcher(fetch);
} else { } else {
fetcher = makeStandardFetcher(nodeFetch); fetcher = makeStandardFetcher(nodeFetch);
} }

View File

@@ -10,7 +10,7 @@ export type FetchOps = {
}; };
export type FetchHeaders = { export type FetchHeaders = {
get(key: string): string | undefined; get(key: string): string | null;
}; };
export type FetchReply = { export type FetchReply = {
@@ -19,4 +19,4 @@ export type FetchReply = {
headers: FetchHeaders; headers: FetchHeaders;
}; };
export type FetchType = (url: string, ops?: FetchOps) => Promise<FetchReply>; export type FetchLike = (url: string, ops?: FetchOps | undefined) => Promise<FetchReply>;

View File

@@ -1,5 +1,5 @@
import { makeFullUrl } from '@/fetchers/common'; import { makeFullUrl } from '@/fetchers/common';
import { FetchType } from '@/fetchers/fetch'; import { FetchLike } from '@/fetchers/fetch';
import { makeStandardFetcher } from '@/fetchers/standardFetch'; import { makeStandardFetcher } from '@/fetchers/standardFetch';
import { Fetcher } from '@/fetchers/types'; import { Fetcher } from '@/fetchers/types';
@@ -9,7 +9,7 @@ const headerMap: Record<string, string> = {
origin: 'X-Origin', origin: 'X-Origin',
}; };
export function makeSimpleProxyFetcher(proxyUrl: string, f: FetchType): Fetcher { export function makeSimpleProxyFetcher(proxyUrl: string, f: FetchLike): Fetcher {
const fetcher = makeStandardFetcher(f); const fetcher = makeStandardFetcher(f);
const proxiedFetch: Fetcher = async (url, ops) => { const proxiedFetch: Fetcher = async (url, ops) => {
const fullUrl = makeFullUrl(url, ops); const fullUrl = makeFullUrl(url, ops);

View File

@@ -1,9 +1,9 @@
import { serializeBody } from '@/fetchers/body'; import { serializeBody } from '@/fetchers/body';
import { makeFullUrl } from '@/fetchers/common'; import { makeFullUrl } from '@/fetchers/common';
import { FetchType } from '@/fetchers/fetch'; import { FetchLike } from '@/fetchers/fetch';
import { Fetcher } from '@/fetchers/types'; import { Fetcher } from '@/fetchers/types';
export function makeStandardFetcher(f: FetchType): Fetcher { export function makeStandardFetcher(f: FetchLike): Fetcher {
const normalFetch: Fetcher = async (url, ops) => { const normalFetch: Fetcher = async (url, ops) => {
const fullUrl = makeFullUrl(url, ops); const fullUrl = makeFullUrl(url, ops);
const seralizedBody = serializeBody(ops.body); const seralizedBody = serializeBody(ops.body);