Commit 8d59417

authored

Add decodeStream (#46)

* Add decodeStream * Fix code review comments * Fix codereview

1 parent 9fd6111 commit 8d59417Copy full SHA for 8d59417

File tree

+70

-5

lines changed

+70

-5

lines changed

Lines changed: 20 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,25 @@ export class Decoder {`
`140`	`140`	`);`
`141`	`141`	`}`
`142`	`142`
	`143`	`+ async *decodeStream(stream: AsyncIterable<ArrayLike<number> \| Uint8Array>) {`
	`144`	`+ for await (const buffer of stream) {`
	`145`	`+ this.appendBuffer(buffer);`
	`146`	`+`
	`147`	`+ try {`
	`148`	`+ while (true) {`
	`149`	`+ const result = this.decodeSync();`
	`150`	`+`
	`151`	`+ yield result;`
	`152`	`+ }`
	`153`	`+ } catch (e) {`
	`154`	`+ if (!(e instanceof DataViewIndexOutOfBoundsError)) {`
	`155`	`+ throw e; // rethrow`
	`156`	`+ }`
	`157`	`+ // fallthrough`
	`158`	`+ }`
	`159`	`+ }`
	`160`	`+ }`
	`161`	`+`
`143`	`162`	`async *decodeArrayStream(stream: AsyncIterable<ArrayLike<number> \| Uint8Array>) {`
`144`	`163`	`let headerParsed = false;`
`145`	`164`	`let decoded = false;`
`@@ -160,7 +179,7 @@ export class Decoder {`
`160`	`179`
`161`	`180`	`try {`
`162`	`181`	`while (true) {`
`163`		`- let result = this.decodeSync();`
	`182`	`+ const result = this.decodeSync();`
`164`	`183`
`165`	`184`	`yield result;`
`166`	`185`

Lines changed: 20 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ export async function decodeAsync(`
`22`	`22`	`return decoder.decodeOneAsync(stream);`
`23`	`23`	`}`
`24`	`24`
`25`		`-export asyncfunction* decodeArrayStream(`
	`25`	`+export function decodeArrayStream(`
`26`	`26`	`streamLike: ReadableStreamLike<Uint8Array \| ArrayLike<number>>,`
`27`	`27`	`options: DecodeAsyncOptions = defaultDecodeOptions,`
`28`	`28`	`) {`
`@@ -37,7 +37,23 @@ export async function* decodeArrayStream(`
`37`	`37`	`options.maxExtLength,`
`38`	`38`	`);`
`39`	`39`
`40`		`- for await (let item of decoder.decodeArrayStream(stream)) {`
`41`		`- yield item;`
`42`		`- }`
	`40`	`+ return decoder.decodeArrayStream(stream);`
	`41`	`+}`
	`42`	`+`
	`43`	`+export function decodeStream(`
	`44`	`+ streamLike: ReadableStreamLike<Uint8Array \| ArrayLike<number>>,`
	`45`	`+ options: DecodeAsyncOptions = defaultDecodeOptions,`
	`46`	`+) {`
	`47`	`+ const stream = ensureAsyncIterabe(streamLike);`
	`48`	`+`
	`49`	`+ const decoder = new Decoder(`
	`50`	`+ options.extensionCodec,`
	`51`	`+ options.maxStrLength,`
	`52`	`+ options.maxBinLength,`
	`53`	`+ options.maxArrayLength,`
	`54`	`+ options.maxMapLength,`
	`55`	`+ options.maxExtLength,`
	`56`	`+ );`
	`57`	`+`
	`58`	`+ return decoder.decodeStream(stream);`
`43`	`59`	`}`

Lines changed: 30 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,30 @@`
	`1`	`+import assert from "assert";`
	`2`	`+import { encode } from "../src";`
	`3`	`+import { decodeStream } from "../src/decodeAsync";`
	`4`	`+`
	`5`	`+describe("decodeStream", () => {`
	`6`	`+ it("decodes stream", async () => {`
	`7`	`+ const items = [`
	`8`	`+ "foo",`
	`9`	`+ 10,`
	`10`	`+ {`
	`11`	`+ name: "bar",`
	`12`	`+ },`
	`13`	`+ [1, 2, 3],`
	`14`	`+ ];`
	`15`	`+`
	`16`	`+ const createStream = async function*() {`
	`17`	`+ for (const item of items) {`
	`18`	`+ yield encode(item);`
	`19`	`+ }`
	`20`	`+ };`
	`21`	`+`
	`22`	`+ const result = [];`
	`23`	`+`
	`24`	`+ for await (const item of decodeStream(createStream())) {`
	`25`	`+ result.push(item);`
	`26`	`+ }`
	`27`	`+`
	`28`	`+ assert.deepStrictEqual(result, items);`
	`29`	`+ });`
	`30`	`+});`

Comments

(0)