diff options
Diffstat (limited to 'js')
| -rw-r--r-- | js/deno.ts | 2 | ||||
| -rw-r--r-- | js/dom_types.ts | 6 | ||||
| -rw-r--r-- | js/fetch.ts | 171 | ||||
| -rw-r--r-- | js/io.ts | 2 |
4 files changed, 116 insertions, 65 deletions
diff --git a/js/deno.ts b/js/deno.ts index bced9075e..afcde7033 100644 --- a/js/deno.ts +++ b/js/deno.ts @@ -13,7 +13,7 @@ export { Writer, Closer, Seeker, - ReaderCloser, + ReadCloser, WriteCloser, ReadSeeker, WriteSeeker, diff --git a/js/dom_types.ts b/js/dom_types.ts index 19a3d5fe2..22f704ee4 100644 --- a/js/dom_types.ts +++ b/js/dom_types.ts @@ -225,7 +225,7 @@ interface AbortSignal extends EventTarget { ): void; } -interface ReadableStream { +export interface ReadableStream { readonly locked: boolean; cancel(): Promise<void>; getReader(): ReadableStreamReader; @@ -235,7 +235,7 @@ interface EventListenerObject { handleEvent(evt: Event): void; } -interface ReadableStreamReader { +export interface ReadableStreamReader { cancel(): Promise<void>; // tslint:disable-next-line:no-any read(): Promise<any>; @@ -270,7 +270,7 @@ export interface Blob { slice(start?: number, end?: number, contentType?: string): Blob; } -interface Body { +export interface Body { /** A simple getter used to expose a `ReadableStream` of the body contents. */ readonly body: ReadableStream | null; /** Stores a `Boolean` that declares whether the body has been used in a diff --git a/js/fetch.ts b/js/fetch.ts index 16172b776..bd50cdfdc 100644 --- a/js/fetch.ts +++ b/js/fetch.ts @@ -1,12 +1,5 @@ // Copyright 2018 the Deno authors. All rights reserved. MIT license. -import { - assert, - log, - createResolvable, - Resolvable, - typedArrayToArrayBuffer, - notImplemented -} from "./util"; +import { assert, log, createResolvable, notImplemented } from "./util"; import * as flatbuffers from "./flatbuffers"; import { sendAsync } from "./dispatch"; import * as msg from "gen/msg_generated"; @@ -14,60 +7,138 @@ import * as domTypes from "./dom_types"; import { TextDecoder } from "./text_encoding"; import { DenoBlob } from "./blob"; import { Headers } from "./headers"; +import * as io from "./io"; +import { read, close } from "./files"; +import { Buffer } from "./buffer"; + +class Body implements domTypes.Body, domTypes.ReadableStream, io.ReadCloser { + bodyUsed = false; + private _bodyPromise: null | Promise<ArrayBuffer> = null; + private _data: ArrayBuffer | null = null; + readonly locked: boolean = false; // TODO + readonly body: null | Body = this; + + constructor(private rid: number, readonly contentType: string) {} + + private async _bodyBuffer(): Promise<ArrayBuffer> { + assert(this._bodyPromise == null); + const buf = new Buffer(); + try { + const nread = await buf.readFrom(this); + const ui8 = buf.bytes(); + assert(ui8.byteLength === nread); + this._data = ui8.buffer.slice( + ui8.byteOffset, + ui8.byteOffset + nread + ) as ArrayBuffer; + assert(this._data.byteLength === nread); + } finally { + this.close(); + } + + return this._data; + } + + async arrayBuffer(): Promise<ArrayBuffer> { + // If we've already bufferred the response, just return it. + if (this._data != null) { + return this._data; + } + + // If there is no _bodyPromise yet, start it. + if (this._bodyPromise == null) { + this._bodyPromise = this._bodyBuffer(); + } -class FetchResponse implements domTypes.Response { + return this._bodyPromise; + } + + async blob(): Promise<domTypes.Blob> { + const arrayBuffer = await this.arrayBuffer(); + return new DenoBlob([arrayBuffer], { + type: this.contentType + }); + } + + async formData(): Promise<domTypes.FormData> { + return notImplemented(); + } + + // tslint:disable-next-line:no-any + async json(): Promise<any> { + const text = await this.text(); + return JSON.parse(text); + } + + async text(): Promise<string> { + const ab = await this.arrayBuffer(); + const decoder = new TextDecoder("utf-8"); + return decoder.decode(ab); + } + + read(p: Uint8Array): Promise<io.ReadResult> { + return read(this.rid, p); + } + + close(): void { + close(this.rid); + } + + async cancel(): Promise<void> { + return notImplemented(); + } + + getReader(): domTypes.ReadableStreamReader { + return notImplemented(); + } +} + +class Response implements domTypes.Response { readonly url: string = ""; - body: null; - bodyUsed = false; // TODO statusText = "FIXME"; // TODO readonly type = "basic"; // TODO redirected = false; // TODO headers: domTypes.Headers; readonly trailer: Promise<domTypes.Headers>; - //private bodyChunks: Uint8Array[] = []; - private first = true; - private bodyData: ArrayBuffer; - private bodyWaiter: Resolvable<ArrayBuffer>; + bodyUsed = false; + readonly body: Body; constructor( readonly status: number, - readonly body_: ArrayBuffer, - headersList: Array<[string, string]> + headersList: Array<[string, string]>, + rid: number, + body_: null | Body = null ) { - this.bodyWaiter = createResolvable(); this.trailer = createResolvable(); this.headers = new Headers(headersList); - this.bodyData = body_; - setTimeout(() => { - this.bodyWaiter.resolve(body_); - }, 0); + const contentType = this.headers.get("content-type") || ""; + + if (body_ == null) { + this.body = new Body(rid, contentType); + } else { + this.body = body_; + } } - arrayBuffer(): Promise<ArrayBuffer> { - return this.bodyWaiter; + async arrayBuffer(): Promise<ArrayBuffer> { + return this.body.arrayBuffer(); } async blob(): Promise<domTypes.Blob> { - const arrayBuffer = await this.arrayBuffer(); - return new DenoBlob([arrayBuffer], { - type: this.headers.get("content-type") || "" - }); + return this.body.blob(); } async formData(): Promise<domTypes.FormData> { - notImplemented(); - return {} as domTypes.FormData; + return this.body.formData(); } - async json(): Promise<object> { - const text = await this.text(); - return JSON.parse(text); + // tslint:disable-next-line:no-any + async json(): Promise<any> { + return this.body.json(); } async text(): Promise<string> { - const ab = await this.arrayBuffer(); - const decoder = new TextDecoder("utf-8"); - return decoder.decode(ab); + return this.body.text(); } get ok(): boolean { @@ -87,25 +158,7 @@ class FetchResponse implements domTypes.Response { headersList.push(header); } - return new FetchResponse(this.status, this.bodyData.slice(0), headersList); - } - - onHeader?: (res: FetchResponse) => void; - onError?: (error: Error) => void; - - onMsg(base: msg.Base) { - /* - const error = base.error(); - if (error != null) { - assert(this.onError != null); - this.onError!(new Error(error)); - return; - } - */ - - if (this.first) { - this.first = false; - } + return new Response(this.status, headersList, -1, this.body); } } @@ -113,7 +166,7 @@ class FetchResponse implements domTypes.Response { export async function fetch( input?: domTypes.Request | string, init?: domTypes.RequestInit -): Promise<domTypes.Response> { +): Promise<Response> { const url = input as string; log("dispatch FETCH_REQ", url); @@ -134,9 +187,7 @@ export async function fetch( assert(resBase.inner(inner) != null); const status = inner.status(); - const bodyArray = inner.bodyArray(); - assert(bodyArray != null); - const body = typedArrayToArrayBuffer(bodyArray!); + const bodyRid = inner.bodyRid(); const headersList: Array<[string, string]> = []; const len = inner.headerKeyLength(); @@ -146,6 +197,6 @@ export async function fetch( headersList.push([key, value]); } - const response = new FetchResponse(status, body, headersList); + const response = new Response(status, headersList, bodyRid); return response; } @@ -77,7 +77,7 @@ export interface Seeker { } // https://golang.org/pkg/io/#ReadCloser -export interface ReaderCloser extends Reader, Closer {} +export interface ReadCloser extends Reader, Closer {} // https://golang.org/pkg/io/#WriteCloser export interface WriteCloser extends Writer, Closer {} |