@fastify/compress 6.1.1 → 6.2.1

package/index.js

@@ -16,7 +16,7 @@ const { isStream, isGzip, isDeflate } = require('./lib/utils')
 const InvalidRequestEncodingError = createError('FST_CP_ERR_INVALID_CONTENT_ENCODING', 'Unsupported Content-Encoding: %s', 415)
 const InvalidRequestCompressedPayloadError = createError('FST_CP_ERR_INVALID_CONTENT', 'Could not decompress the request payload using the provided encoding', 400)
 
-function compressPlugin (fastify, opts, next) {
+function fastifyCompress (fastify, opts, next) {
   const globalCompressParams = processCompressParams(opts)
   const globalDecompressParams = processDecompressParams(opts)
 
@@ -142,7 +142,7 @@ function processCompressParams (opts) {
   params.encodings = Array.isArray(opts.encodings)
     ? supportedEncodings
       .filter(encoding => opts.encodings.includes(encoding))
-      .sort((a, b) => opts.encodings.indexOf(a) - supportedEncodings.indexOf(b))
+      .sort((a, b) => opts.encodings.indexOf(a) - opts.encodings.indexOf(b))
     : supportedEncodings
 
   return params
@@ -174,7 +174,7 @@ function processDecompressParams (opts) {
   params.encodings = Array.isArray(opts.requestEncodings)
     ? supportedEncodings
       .filter(encoding => opts.requestEncodings.includes(encoding))
-      .sort((a, b) => opts.requestEncodings.indexOf(a) - supportedEncodings.indexOf(b))
+      .sort((a, b) => opts.requestEncodings.indexOf(a) - opts.requestEncodings.indexOf(b))
     : supportedEncodings
 
   if (opts.forceRequestEncoding) {
@@ -548,7 +548,9 @@ function createError (code, message, statusCode) {
   return FastifyCompressError
 }
 
-module.exports = fp(compressPlugin, {
+module.exports = fp(fastifyCompress, {
   fastify: '4.x',
   name: '@fastify/compress'
 })
+module.exports.default = fastifyCompress
+module.exports.fastifyCompress = fastifyCompress

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@fastify/compress",
-  "version": "6.1.1",
+  "version": "6.2.1",
   "description": "Fastify compression utils",
   "main": "index.js",
-  "types": "index.d.ts",
+  "types": "types/index.d.ts",
   "dependencies": {
     "@fastify/accept-negotiator": "^1.0.0",
     "fastify-plugin": "^4.0.0",
     "into-stream": "^6.0.0",
     "mime-db": "^1.51.0",
-    "minipass": "^3.1.6",
+    "minipass": "^4.0.0",
     "peek-stream": "^1.1.3",
     "pump": "^3.0.0",
     "pumpify": "^2.0.1"
@@ -24,8 +24,8 @@
     "jsonstream": "^1.0.3",
     "standard": "^17.0.0",
     "tap": "^16.0.0",
-    "tsd": "^0.22.0",
-    "typescript": "^4.5.4"
+    "tsd": "^0.28.0",
+    "typescript": "^5.0.2"
   },
   "scripts": {
     "coverage": "npm run unit -- --cov",

package/test/global-compress.test.js

@@ -2703,7 +2703,7 @@ test('It should sort and follow custom `encodings` options', async (t) => {
   const fastify = Fastify()
   await fastify.register(compressPlugin, {
     global: true,
-    encodings: ['gzip', 'br']
+    encodings: ['br', 'gzip']
   })
 
   fastify.get('/', (request, reply) => {
@@ -2725,6 +2725,35 @@ test('It should sort and follow custom `encodings` options', async (t) => {
   t.equal(payload.toString('utf-8'), file)
 })
 
+test('It should sort and prefer the order of custom `encodings` options', async (t) => {
+  t.plan(2)
+
+  const fastify = Fastify()
+  await fastify.register(compressPlugin, {
+    global: true,
+    encodings: ['gzip', 'deflate', 'br']
+  })
+
+  fastify.get('/', (request, reply) => {
+    reply
+      .type('text/plain')
+      .compress(createReadStream('./package.json'))
+  })
+
+  const response = await fastify.inject({
+    url: '/',
+    method: 'GET',
+    headers: {
+      'accept-encoding': 'hello,gzip,br'
+    }
+  })
+
+  const file = readFileSync('./package.json', 'utf8')
+  const payload = zlib.gunzipSync(response.rawPayload)
+  t.equal(response.headers['content-encoding'], 'gzip')
+  t.equal(payload.toString('utf-8'), file)
+})
+
 test('It should sort and follow custom `requestEncodings` options', async (t) => {
   t.plan(2)
 

package/types/index.d.ts

@@ -0,0 +1,100 @@
+import {
+  FastifyPluginCallback,
+  FastifyReply,
+  FastifyRequest,
+  RawServerBase,
+  RawServerDefault,
+  RouteOptions as FastifyRouteOptions
+} from 'fastify'
+import { Input, InputObject } from 'into-stream'
+import { Stream } from 'stream'
+import { BrotliOptions, ZlibOptions } from 'zlib'
+
+declare module 'fastify' {
+  export interface FastifyContextConfig {
+    /** @deprecated `config.compress` is deprecated, use `compress` shorthand option instead */
+    compress?: RouteCompressOptions | false;
+    /** @deprecated `config.decompress` is deprecated, use `decompress` shorthand option instead */
+    decompress?: RouteDecompressOptions | false;
+  }
+
+  export interface RouteShorthandOptions<
+    RawServer extends RawServerBase = RawServerDefault
+  > {
+    compress?: RouteCompressOptions | false;
+    decompress?: RouteDecompressOptions | false;
+  }
+
+  interface FastifyReply {
+    compress(input: Stream | Input | InputObject): void;
+  }
+
+  export interface RouteOptions {
+    compress?: RouteCompressOptions | false;
+    decompress?: RouteDecompressOptions | false;
+  }
+}
+
+type FastifyCompress = FastifyPluginCallback<fastifyCompress.FastifyCompressOptions>
+
+type RouteCompressOptions = Pick<fastifyCompress.FastifyCompressOptions,
+  | 'brotliOptions'
+  | 'customTypes'
+  | 'encodings'
+  | 'inflateIfDeflated'
+  | 'onUnsupportedEncoding'
+  | 'removeContentLengthHeader'
+  | 'threshold'
+  | 'zlib'
+  | 'zlibOptions'
+>
+
+type RouteDecompressOptions = Pick<fastifyCompress.FastifyCompressOptions,
+  | 'forceRequestEncoding'
+  | 'onInvalidRequestPayload'
+  | 'onUnsupportedRequestEncoding'
+  | 'requestEncodings'
+  | 'zlib'
+>
+
+type EncodingToken = 'br' | 'deflate' | 'gzip' | 'identity';
+
+declare namespace fastifyCompress {
+
+  export interface FastifyCompressOptions {
+    brotliOptions?: BrotliOptions;
+    customTypes?: RegExp;
+    encodings?: EncodingToken[];
+    forceRequestEncoding?: EncodingToken;
+    global?: boolean;
+    inflateIfDeflated?: boolean;
+    onInvalidRequestPayload?: (encoding: string, request: FastifyRequest, error: Error) => Error | undefined | null;
+    onUnsupportedEncoding?: (encoding: string, request: FastifyRequest, reply: FastifyReply) => string | Buffer | Stream;
+    onUnsupportedRequestEncoding?: (encoding: string, request: FastifyRequest, reply: FastifyReply) => Error | undefined | null;
+    removeContentLengthHeader?: boolean;
+    requestEncodings?: EncodingToken[];
+    threshold?: number;
+    zlib?: unknown;
+    zlibOptions?: ZlibOptions;
+  }
+
+  export interface FastifyCompressRouteOptions {
+    compress?: RouteCompressOptions | false;
+    decompress?: RouteDecompressOptions | false;
+  }
+
+  export interface RouteOptions extends FastifyRouteOptions, FastifyCompressRouteOptions { }
+
+  export interface RoutesConfigCompressOptions {
+    /** @deprecated `config.compress` is deprecated, use `compress` shorthand option instead */
+    compress?: RouteCompressOptions | false;
+    /** @deprecated `config.decompress` is deprecated, use `decompress` shorthand option instead */
+    decompress?: RouteDecompressOptions | false;
+  }
+
+  export const fastifyCompress: FastifyCompress
+  export { fastifyCompress as default }
+}
+
+declare function fastifyCompress(...params: Parameters<FastifyCompress>): ReturnType<FastifyCompress>
+export = fastifyCompress

package/{test/types → types}/index.test-d.ts

@@ -2,7 +2,7 @@ import fastify, { FastifyInstance } from 'fastify'
 import { createReadStream } from 'fs'
 import { expectError, expectType } from 'tsd'
 import * as zlib from 'zlib'
-import fastifyCompress, { FastifyCompressOptions } from '../..'
+import fastifyCompress, { FastifyCompressOptions } from '..'
 
 const stream = createReadStream('./package.json')
 

package/index.d.ts

@@ -1,81 +0,0 @@
-import {
-  FastifyPluginCallback,
-  FastifyReply,
-  FastifyRequest,
-  RawServerBase,
-  RawServerDefault
-} from 'fastify'
-import * as fastify from 'fastify'
-import { Input, InputObject } from 'into-stream'
-import { Stream } from 'stream'
-import { BrotliOptions, ZlibOptions } from 'zlib'
-
-type EncodingToken = 'br' | 'deflate' | 'gzip' | 'identity';
-
-export interface FastifyCompressOptions {
-  brotliOptions?: BrotliOptions;
-  customTypes?: RegExp;
-  encodings?: EncodingToken[];
-  forceRequestEncoding?: EncodingToken;
-  global?: boolean;
-  inflateIfDeflated?: boolean;
-  onInvalidRequestPayload?: (encoding: string, request: FastifyRequest, error: Error) => Error | undefined | null;
-  onUnsupportedEncoding?: (encoding: string, request: FastifyRequest, reply: FastifyReply) => string | Buffer | Stream;
-  onUnsupportedRequestEncoding?: (encoding: string, request: FastifyRequest, reply: FastifyReply) => Error | undefined | null;
-  removeContentLengthHeader?: boolean;
-  requestEncodings?: EncodingToken[];
-  threshold?: number;
-  zlib?: unknown;
-  zlibOptions?: ZlibOptions;
-}
-
-interface RouteCompressOptions extends Pick<FastifyCompressOptions,
-  | 'brotliOptions'
-  | 'customTypes'
-  | 'encodings'
-  | 'inflateIfDeflated'
-  | 'onUnsupportedEncoding'
-  | 'removeContentLengthHeader'
-  | 'threshold'
-  | 'zlib'
-  | 'zlibOptions'
-> {}
-
-interface RouteDecompressOptions extends Pick<FastifyCompressOptions,
-  | 'forceRequestEncoding'
-  | 'onInvalidRequestPayload'
-  | 'onUnsupportedRequestEncoding'
-  | 'requestEncodings'
-  | 'zlib'
-> {}
-
-interface FastifyCompressRouteOptions {
-  compress?: RouteCompressOptions | false;
-  decompress?: RouteDecompressOptions | false;
-}
-
-export interface RouteOptions extends fastify.RouteOptions, FastifyCompressRouteOptions {}
-
-export interface RoutesConfigCompressOptions {
-  /** @deprecated `config.compress` is deprecated, use `compress` shorthand option instead */
-  compress?: RouteCompressOptions | false;
-  /** @deprecated `config.decompress` is deprecated, use `decompress` shorthand option instead */
-  decompress?: RouteDecompressOptions | false;
-}
-
-declare module 'fastify' {
-  export interface FastifyContextConfig extends RoutesConfigCompressOptions {}
-
-  export interface RouteShorthandOptions<
-    RawServer extends RawServerBase = RawServerDefault
-  > extends FastifyCompressRouteOptions {}
-
-  interface FastifyReply {
-    compress(input: Stream | Input | InputObject): void;
-  }
-
-  export interface RouteOptions extends FastifyCompressRouteOptions {}
-}
-
-declare const fastifyCompress: FastifyPluginCallback<FastifyCompressOptions>
-export default fastifyCompress