Mirrors/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2025-12-28 07:50:41 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

zlib: use modern class syntax for zstd classes

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/56965
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jan Krems <jan.krems@gmail.com>
Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
This commit is contained in:
Yagiz Nizipli 2025-02-10 14:42:20 -05:00 committed by GitHub
parent 92dae7de04
commit 3ea97d5c25
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 44 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
lib/zlib.js
View File

@ -842,45 +842,44 @@ const zstdDefaultOpts = {
finishFlush: ZSTD_e_end,
fullFlush: ZSTD_e_flush,
};
function Zstd(opts, mode, initParamsArray, maxParam) {
assert(mode === ZSTD_COMPRESS || mode === ZSTD_DECOMPRESS);
class Zstd extends ZlibBase {
constructor(opts, mode, initParamsArray, maxParam) {
assert(mode === ZSTD_COMPRESS || mode === ZSTD_DECOMPRESS);
initParamsArray.fill(-1);
if (opts?.params) {
ObjectKeys(opts.params).forEach((origKey) => {
const key = +origKey;
if (NumberIsNaN(key) || key < 0 || key > maxParam ||
(initParamsArray[key] | 0) !== -1) {
throw new ERR_ZSTD_INVALID_PARAM(origKey);
}
initParamsArray.fill(-1);
if (opts?.params) {
ObjectKeys(opts.params).forEach((origKey) => {
const key = +origKey;
if (NumberIsNaN(key) || key < 0 || key > maxParam ||
(initParamsArray[key] | 0) !== -1) {
throw new ERR_ZSTD_INVALID_PARAM(origKey);
}
const value = opts.params[origKey];
if (typeof value !== 'number' && typeof value !== 'boolean') {
throw new ERR_INVALID_ARG_TYPE('options.params[key]',
'number', opts.params[origKey]);
}
initParamsArray[key] = value;
});
const value = opts.params[origKey];
if (typeof value !== 'number' && typeof value !== 'boolean') {
throw new ERR_INVALID_ARG_TYPE('options.params[key]',
'number', opts.params[origKey]);
}
initParamsArray[key] = value;
});
}
const handle = mode === ZSTD_COMPRESS ?
new binding.ZstdCompress() : new binding.ZstdDecompress();
const pledgedSrcSize = opts?.pledgedSrcSize ?? undefined;
const writeState = new Uint32Array(2);
handle.init(
initParamsArray,
pledgedSrcSize,
writeState,
processCallback,
);
super(opts, mode, handle, zstdDefaultOpts);
this._writeState = writeState;
}
const handle = mode === ZSTD_COMPRESS ?
new binding.ZstdCompress() : new binding.ZstdDecompress();
const pledgedSrcSize = opts?.pledgedSrcSize ?? undefined;
this._writeState = new Uint32Array(2);
handle.init(
initParamsArray,
pledgedSrcSize,
this._writeState,
processCallback,
);
ReflectApply(ZlibBase, this, [opts, mode, handle, zstdDefaultOpts]);
}
ObjectSetPrototypeOf(Zstd.prototype, ZlibBase.prototype);
ObjectSetPrototypeOf(Zstd, ZlibBase);
const kMaxZstdCParam = MathMax(...ObjectKeys(constants).map(
(key) => (key.startsWith('ZSTD_c_') ?
@ -890,16 +889,11 @@ const kMaxZstdCParam = MathMax(...ObjectKeys(constants).map(
const zstdInitCParamsArray = new Uint32Array(kMaxZstdCParam + 1);
function ZstdCompress(opts) {
if (!(this instanceof ZstdCompress))
return new ZstdCompress(opts);
ReflectApply(Zstd, this,
[opts, ZSTD_COMPRESS, zstdInitCParamsArray, kMaxZstdCParam]);
class ZstdCompress extends Zstd {
constructor(opts) {
super(opts, ZSTD_COMPRESS, zstdInitCParamsArray, kMaxZstdCParam);
}
}
ObjectSetPrototypeOf(ZstdCompress.prototype, Zstd.prototype);
ObjectSetPrototypeOf(ZstdCompress, Zstd);
const kMaxZstdDParam = MathMax(...ObjectKeys(constants).map(
(key) => (key.startsWith('ZSTD_d_') ?
@ -909,16 +903,11 @@ const kMaxZstdDParam = MathMax(...ObjectKeys(constants).map(
const zstdInitDParamsArray = new Uint32Array(kMaxZstdDParam + 1);
function ZstdDecompress(opts) {
if (!(this instanceof ZstdDecompress))
return new ZstdDecompress(opts);
ReflectApply(Zstd, this,
[opts, ZSTD_DECOMPRESS, zstdInitDParamsArray, kMaxZstdDParam]);
class ZstdDecompress extends Zstd {
constructor(opts) {
super(opts, ZSTD_DECOMPRESS, zstdInitDParamsArray, kMaxZstdDParam);
}
}
ObjectSetPrototypeOf(ZstdDecompress.prototype, Zstd.prototype);
ObjectSetPrototypeOf(ZstdDecompress, Zstd);
function createProperty(ctor) {
return {

2
test/parallel/test-zlib-invalid-input.js
View File

@ -40,7 +40,7 @@ const unzips = [
zlib.Inflate(),
zlib.InflateRaw(),
zlib.BrotliDecompress(),
zlib.ZstdDecompress(),
new zlib.ZstdDecompress(),
];
nonStringInputs.forEach(common.mustCall((input) => {

2
test/parallel/test-zlib-zero-byte.js
View File

@ -36,7 +36,7 @@ test('zlib should properly handle zero byte input', async () => {
for (const [Compressor, expected] of compressors) {
const { promise, resolve, reject } = Promise.withResolvers();
const gz = Compressor();
const gz = new Compressor();
const emptyBuffer = Buffer.alloc(0);
let received = 0;
gz.on('data', function(c) {