feat: betterment 💈

Author: bricss

lib/compression.js

@@ -134,6 +134,7 @@ exports = module.exports = internals.Compression = class {
 
     enableZstdCompression(compressionOptions) {
 
+        Hoek.assert(!!Zlib.constants.ZSTD_CLEVEL_DEFAULT, 'Zstd is not supported by the engine');
         this.decoders.zstd = (options) => Zlib.createZstdDecompress({ ...options, ...compressionOptions });
         this.encoders.zstd = (options) => Zlib.createZstdCompress({ ...options, ...compressionOptions });
         this.setPriority(['zstd']);

test/common.js

@@ -3,6 +3,7 @@
 const ChildProcess = require('child_process');
 const Http = require('http');
 const Net = require('net');
+const Zlib = require('zlib');
 
 const internals = {};
 
@@ -30,3 +31,5 @@ internals.hasIPv6 = () => {
 exports.hasLsof = internals.hasLsof();
 
 exports.hasIPv6 = internals.hasIPv6();
+
+exports.hasZstd = !!Zlib.constants.ZSTD_CLEVEL_DEFAULT;

test/payload.js

@@ -12,9 +12,10 @@ const Code = require('@hapi/code');
 const Hapi = require('..');
 const Hoek = require('@hapi/hoek');
 const Lab = require('@hapi/lab');
-const Somever = require('@hapi/somever');
 const Wreck = require('@hapi/wreck');
 
+const Common = require('./common');
+
 const internals = {};
 
 
@@ -550,7 +551,7 @@ describe('Payload', () => {
         expect(res.result).to.equal(message);
     });
 
-    it('handles zstd payload', { skip: Somever.match(process.version, '<22.15.0') }, async () => {
+    it('handles zstd payload', { skip: !Common.hasZstd }, async () => {
 
         const message = { 'msg': 'This message is going to be zstded.' };
         const server = Hapi.server({ compression: { enableZstd: true } });

test/transmit.js

@@ -16,7 +16,6 @@ const Hoek = require('@hapi/hoek');
 const Bounce = require('@hapi/bounce');
 const Inert = require('@hapi/inert');
 const Lab = require('@hapi/lab');
-const Somever = require('@hapi/somever');
 const Teamwork = require('@hapi/teamwork');
 const Wreck = require('@hapi/wreck');
 
@@ -678,7 +677,7 @@ describe('transmission', () => {
             expect(res3.headers['last-modified']).to.equal(res2.headers['last-modified']);
         });
 
-        it('returns a zstded file in the response when the request accepts zstd', { skip: Somever.match(process.version, '<22.15.0') }, async () => {
+        it('returns a zstded file in the response when the request accepts zstd', { skip: !Common.hasZstd }, async () => {
 
             const server = Hapi.server({ compression: { enableZstd: true, minBytes: 1 }, routes: { files: { relativeTo: __dirname } } });
             await server.register(Inert);
@@ -809,7 +808,7 @@ describe('transmission', () => {
             expect(res.headers['content-length']).to.not.exist();
         });
 
-        it('returns a zstd response on a post request when accept-encoding: zstd is requested', { skip: Somever.match(process.version, '<22.15.0') }, async () => {
+        it('returns a zstd response on a post request when accept-encoding: zstd is requested', { skip: !Common.hasZstd }, async () => {
 
             const data = '{"test":"true"}';
 
@@ -824,7 +823,7 @@ describe('transmission', () => {
             await server.stop();
         });
 
-        it('returns a zstd response on a get request when accept-encoding: zstd is requested', { skip: Somever.match(process.version, '<22.15.0') }, async () => {
+        it('returns a zstd response on a get request when accept-encoding: zstd is requested', { skip: !Common.hasZstd }, async () => {
 
             const data = '{"test":"true"}';
 
@@ -1039,7 +1038,7 @@ describe('transmission', () => {
             await server.stop();
         });
 
-        it('returns a zstd response on a post request when accept-encoding: gzip;q=1, deflate;q=0.5, br;q=0.7; zstd;q=1 is requested', { skip: Somever.match(process.version, '<22.15.0') }, async () => {
+        it('returns a zstd response on a post request when accept-encoding: gzip;q=1, deflate;q=0.5, br;q=0.7; zstd;q=1 is requested', { skip: !Common.hasZstd }, async () => {
 
             const data = '{"test":"true"}';
             const server = Hapi.server({ compression: { enableZstd: true, minBytes: 1 } });
@@ -1053,7 +1052,7 @@ describe('transmission', () => {
             await server.stop();
         });
 
-        it('returns a zstd response on a get request when accept-encoding: gzip;q=1, deflate;q=0.5, br;q=0.7, zstd;q=1 is requested', { skip: Somever.match(process.version, '<22.15.0') }, async () => {
+        it('returns a zstd response on a get request when accept-encoding: gzip;q=1, deflate;q=0.5, br;q=0.7, zstd;q=1 is requested', { skip: !Common.hasZstd }, async () => {
 
             const data = '{"test":"true"}';
             const server = Hapi.server({ compression: { enableZstd: true, minBytes: 1 } });
@@ -1123,7 +1122,7 @@ describe('transmission', () => {
             await server.stop();
         });
 
-        it('returns a zstd response on a post request when accept-encoding: gzip, deflate, br, zstd is requested', { skip: Somever.match(process.version, '<22.15.0') }, async () => {
+        it('returns a zstd response on a post request when accept-encoding: gzip, deflate, br, zstd is requested', { skip: !Common.hasZstd }, async () => {
 
             const data = '{"test":"true"}';
             const server = Hapi.server({ compression: { enableZstd: true, minBytes: 1 } });
@@ -1137,7 +1136,7 @@ describe('transmission', () => {
             await server.stop();
         });
 
-        it('returns a zstd response on a get request when accept-encoding: gzip, deflate, br, zstd is requested', { skip: Somever.match(process.version, '<22.15.0') }, async () => {
+        it('returns a zstd response on a get request when accept-encoding: gzip, deflate, br, zstd is requested', { skip: !Common.hasZstd }, async () => {
 
             const data = '{"test":"true"}';
             const server = Hapi.server({ compression: { enableZstd: true, minBytes: 1 } });