From f5ad15b5048ec34346cb86450c5cba0509b584db Mon Sep 17 00:00:00 2001 From: Jovi De Croock Date: Wed, 3 Jan 2024 14:33:51 +0100 Subject: fix(node/zlib): accept dataview and buffer in zlib bindings (#21756) Fixes #20516 Follow up to #21747 and #21746 This tackles the last point of #20516 where certain inputs weren't accepted in the other zlib methods This adds the `toU8` conversion of `_brotli` to `_zlib.mjs`, when we create the ZLibBuffer, we'll sanitize the input. I noticed that the async had no handler for `string` input so I added that as well. --- cli/tests/unit_node/zlib_test.ts | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'cli') diff --git a/cli/tests/unit_node/zlib_test.ts b/cli/tests/unit_node/zlib_test.ts index 1819be268..fa94493c1 100644 --- a/cli/tests/unit_node/zlib_test.ts +++ b/cli/tests/unit_node/zlib_test.ts @@ -9,6 +9,8 @@ import { createBrotliCompress, createBrotliDecompress, createDeflate, + gzipSync, + unzipSync, } from "node:zlib"; import { Buffer } from "node:buffer"; import { createReadStream, createWriteStream } from "node:fs"; @@ -32,6 +34,13 @@ Deno.test("brotli compression async", async () => { assertEquals(decompressed.toString(), "hello world"); }); +Deno.test("gzip compression sync", { sanitizeResources: false }, () => { + const buf = Buffer.from("hello world"); + const compressed = gzipSync(buf); + const decompressed = unzipSync(compressed); + assertEquals(decompressed.toString(), "hello world"); +}); + Deno.test("brotli compression", async () => { const { promise, resolve } = Promise.withResolvers(); const compress = createBrotliCompress(); @@ -125,3 +134,24 @@ Deno.test("should work with a buffer from an encoded string", () => { const decompressed = brotliDecompressSync(compressed); assertEquals(decompressed.toString(), "hello world"); }); + +Deno.test( + "zlib compression with dataview", + { sanitizeResources: false }, + () => { + const buf = Buffer.from("hello world"); + const compressed = gzipSync(new DataView(buf.buffer)); + const decompressed = unzipSync(compressed); + assertEquals(decompressed.toString(), "hello world"); + }, +); + +Deno.test("zlib compression with an encoded string", { + sanitizeResources: false, +}, () => { + const encoder = new TextEncoder(); + const buffer = encoder.encode("hello world"); + const compressed = gzipSync(buffer); + const decompressed = unzipSync(compressed); + assertEquals(decompressed.toString(), "hello world"); +}); -- cgit v1.2.3