From 1b6f8318750d319d689f7eeef9e7e1f2e56b94a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Sun, 8 Mar 2020 13:09:22 +0100 Subject: reorg: move JS ops implementations to cli/js/ops/, part 1 (#4264) Following JS ops were moved to separate files in cli/js/ops directory: - compiler - dispatch_json - dispatch_minimal - errors - fetch - fs_events - os - random - repl - resources - runtime_compiler - runtime - tty --- cli/js/web/fetch.ts | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'cli/js/web/fetch.ts') diff --git a/cli/js/web/fetch.ts b/cli/js/web/fetch.ts index 17cd43129..fbe795b4a 100644 --- a/cli/js/web/fetch.ts +++ b/cli/js/web/fetch.ts @@ -10,12 +10,13 @@ import { TextDecoder, TextEncoder } from "./text_encoding.ts"; import { DenoBlob, bytesSymbol as blobBytesSymbol } from "./blob.ts"; import { Headers } from "./headers.ts"; import * as io from "../io.ts"; -import { read, close } from "../files.ts"; +import { read } from "../files.ts"; +import { close } from "../ops/resources.ts"; import { Buffer } from "../buffer.ts"; import { FormData } from "./form_data.ts"; import { URL } from "./url.ts"; import { URLSearchParams } from "./url_search_params.ts"; -import { sendAsync } from "../dispatch_json.ts"; +import { fetch as opFetch, FetchResponse } from "../ops/fetch.ts"; function getHeaderValueParams(value: string): Map { const params = new Map(); @@ -439,13 +440,6 @@ export class Response implements domTypes.Response { } } -interface FetchResponse { - bodyRid: number; - status: number; - statusText: string; - headers: Array<[string, string]>; -} - async function sendFetchReq( url: string, method: string | null, @@ -457,18 +451,13 @@ async function sendFetchReq( headerArray = Array.from(headers.entries()); } - let zeroCopy = undefined; - if (body) { - zeroCopy = new Uint8Array(body.buffer, body.byteOffset, body.byteLength); - } - const args = { method, url, headers: headerArray }; - return (await sendAsync("op_fetch", args, zeroCopy)) as FetchResponse; + return await opFetch(args, body); } /** Fetch a resource from the network. */ -- cgit v1.2.3