Commit 3b7b4f2

committed

support whatwg streams in decodeAsync() and decodeArrayStream()

1 parent ec1a37a commit 3b7b4f2Copy full SHA for 3b7b4f2

File tree

+56

-28

lines changed

+56

-28

lines changed

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,18 @@`
`1`	`1`	`import { Decoder } from "./Decoder";`
`2`	`2`	`import { defaultDecodeOptions, DecodeOptions } from "./decode";`
	`3`	`+import { isReadableStream, asyncIterableFromStream } from "./utils/stream";`
`3`	`4`
`4`	`5`	`export type DecodeAsyncOptions = DecodeOptions;`
`5`	`6`	`export const defaultDecodeAsyncOptions = defaultDecodeOptions;`
`6`	`7`
	`8`	`+type StreamLike<T> = AsyncIterable<T> \| ReadableStream<T>;`
	`9`	`+`
`7`	`10`	`export async function decodeAsync(`
`8`		`- stream: AsyncIterable<Uint8Array \| ArrayLike<number>>,`
	`11`	`+ streamLike: StreamLike<Uint8Array \| ArrayLike<number>>,`
`9`	`12`	`options: DecodeAsyncOptions = defaultDecodeOptions,`
`10`	`13`	`): Promise<unknown> {`
	`14`	`+ const stream = isReadableStream(streamLike) ? asyncIterableFromStream(streamLike) : streamLike;`
	`15`	`+`
`11`	`16`	`const decoder = new Decoder(`
`12`	`17`	`options.extensionCodec,`
`13`	`18`	`options.maxStrLength,`
`@@ -20,9 +25,11 @@ export async function decodeAsync(`
`20`	`25`	`}`
`21`	`26`
`22`	`27`	`export async function* decodeArrayStream(`
`23`		`- stream: AsyncIterable<Uint8Array \| ArrayLike<number>>,`
	`28`	`+ streamLike: StreamLike<Uint8Array \| ArrayLike<number>>,`
`24`	`29`	`options: DecodeAsyncOptions = defaultDecodeOptions,`
`25`	`30`	`) {`
	`31`	`+ const stream = isReadableStream(streamLike) ? asyncIterableFromStream(streamLike) : streamLike;`
	`32`	`+`
`26`	`33`	`const decoder = new Decoder(`
`27`	`34`	`options.extensionCodec,`
`28`	`35`	`options.maxStrLength,`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// utility for whatwg streams`
`2`	`2`
`3`	`3`	`export function isReadableStream<T>(object: unknown): object is ReadableStream<T> {`
`4`		`- return typeof ReadableStream !== "object" && object instanceof ReadableStream;`
	`4`	`+ return typeof ReadableStream !== "undefined" && object instanceof ReadableStream;`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`export async function* asyncIterableFromStream<T>(stream: ReadableStream<T>): AsyncIterable<T> {`

Lines changed: 1 addition & 25 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`import { deepStrictEqual } from "assert";`
`2`		`-import { encode, decode, decodeAsync } from "@msgpack/msgpack";`
`3`		`-import { asyncIterableFromStream } from "../src/utils/stream";`
	`2`	`+import { encode, decode } from "@msgpack/msgpack";`
`4`	`3`
`5`	`4`	`describe("README", () => {`
`6`	`5`	`context("## Synopsis", () => {`
`@@ -22,27 +21,4 @@ describe("README", () => {`
`22`	`21`	`deepStrictEqual(decode(encoded), object);`
`23`	`22`	`});`
`24`	`23`	`});`
`25`		`-`
`26`		`- context("## ReadableStream", () => {`
`27`		`- before(function() {`
`28`		`- if (typeof ReadableStream === "undefined") {`
`29`		`- this.skip();`
`30`		`- }`
`31`		`- });`
`32`		`-`
`33`		`- it("reads from stream", async () => {`
`34`		`- const data = [1, 2, 3];`
`35`		`- const encoded = encode(data);`
`36`		`- const stream = new ReadableStream({`
`37`		`- start(controller) {`
`38`		`- for (const byte of encoded) {`
`39`		`- controller.enqueue([byte]);`
`40`		`- }`
`41`		`- controller.close();`
`42`		`- },`
`43`		`- });`
`44`		`-`
`45`		`- deepStrictEqual(await decodeAsync(asyncIterableFromStream(stream)), data);`
`46`		`- });`
`47`		`- });`
`48`	`24`	`});`

Lines changed: 45 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,45 @@`
	`1`	`+import { deepStrictEqual } from "assert";`
	`2`	`+import { decodeAsync, encode, decodeArrayStream } from "@msgpack/msgpack";`
	`3`	`+import { constants } from "http2";`
	`4`	`+`
	`5`	`+describe("whatwg streams", () => {`
	`6`	`+ before(function() {`
	`7`	`+ if (typeof ReadableStream === "undefined") {`
	`8`	`+ this.skip();`
	`9`	`+ }`
	`10`	`+ });`
	`11`	`+`
	`12`	`+ context("decodeAsync", async () => {`
	`13`	`+ const data = [1, 2, 3];`
	`14`	`+ const encoded = encode(data);`
	`15`	`+ const stream = new ReadableStream({`
	`16`	`+ start(controller) {`
	`17`	`+ for (const byte of encoded) {`
	`18`	`+ controller.enqueue([byte]);`
	`19`	`+ }`
	`20`	`+ controller.close();`
	`21`	`+ },`
	`22`	`+ });`
	`23`	`+`
	`24`	`+ const items = [];`
	`25`	`+ for await (const item of decodeArrayStream(stream)) {`
	`26`	`+ items.push(item);`
	`27`	`+ }`
	`28`	`+ deepStrictEqual(items, data);`
	`29`	`+ });`
	`30`	`+`
	`31`	`+ it("reads from stream", async () => {`
	`32`	`+ const data = [1, 2, 3];`
	`33`	`+ const encoded = encode(data);`
	`34`	`+ const stream = new ReadableStream({`
	`35`	`+ start(controller) {`
	`36`	`+ for (const byte of encoded) {`
	`37`	`+ controller.enqueue([byte]);`
	`38`	`+ }`
	`39`	`+ controller.close();`
	`40`	`+ },`
	`41`	`+ });`
	`42`	`+`
	`43`	`+ deepStrictEqual(await decodeAsync(stream), data);`
	`44`	`+ });`
	`45`	`+});`

Comments

(0)