Merge branch 'master' of github.com:expressjs/compression into add-default-encoding

Author: bjohansebas

.github/workflows/ci.yml

@@ -35,6 +35,7 @@ jobs:
         - Node.js 20.x
         - Node.js 21.x
         - Node.js 22.x
+        - Node.js 23.x
 
         include:
         - name: Node.js 0.8
@@ -63,69 +64,72 @@ jobs:
           npm-i: mocha@3.5.3 nyc@10.3.2 supertest@2.0.0
 
         - name: Node.js 4.x
-          node-version: "4.9"
+          node-version: "4"
           npm-i: mocha@5.2.0 nyc@11.9.0 supertest@3.4.2
 
         - name: Node.js 5.x
-          node-version: "5.12"
+          node-version: "5"
           npm-i: mocha@5.2.0 nyc@11.9.0 supertest@3.4.2
 
         - name: Node.js 6.x
-          node-version: "6.17"
+          node-version: "6"
           npm-i: mocha@6.2.3 nyc@14.1.1 supertest@6.1.6
 
         - name: Node.js 7.x
-          node-version: "7.10"
+          node-version: "7"
           npm-i: mocha@6.2.3 nyc@14.1.1 supertest@6.1.6
 
         - name: Node.js 8.x
-          node-version: "8.16"
+          node-version: "8"
           npm-i: mocha@7.2.0 nyc@14.1.1
 
         - name: Node.js 9.x
-          node-version: "9.11"
+          node-version: "9"
           npm-i: mocha@7.2.0 nyc@14.1.1
 
         - name: Node.js 10.x
-          node-version: "10.16"
+          node-version: "10"
           npm-i: mocha@8.4.0
 
         - name: Node.js 11.x
-          node-version: "11.15"
+          node-version: "11"
           npm-i: mocha@8.4.0
 
         - name: Node.js 12.x
-          node-version: "12.22"
+          node-version: "12"
 
         - name: Node.js 13.x
-          node-version: "13.14"
+          node-version: "13"
 
         - name: Node.js 14.x
-          node-version: "14.19"
+          node-version: "14"
 
         - name: Node.js 15.x
-          node-version: "15.14"
+          node-version: "15"
 
         - name: Node.js 16.x
-          node-version: "16.15"
+          node-version: "16"
 
         - name: Node.js 17.x
-          node-version: "17.9"
+          node-version: "17"
 
         - name: Node.js 18.x
-          node-version: "18.14"
+          node-version: "18"
 
         - name: Node.js 19.x
-          node-version: "19.6"
+          node-version: "19"
 
         - name: Node.js 20.x
-          node-version: "20.12"
+          node-version: "20"
 
         - name: Node.js 21.x
-          node-version: "21.7"
+          node-version: "21"
 
         - name: Node.js 22.x
-          node-version: "22.0"
+          node-version: "22"
+
+        - name: Node.js 23.x
+          node-version: "23"
 
     steps:
     - uses: actions/checkout@v4

HISTORY.md

@@ -1,10 +1,15 @@
 unreleased
 ==========
   * Add the defaultEncoding option for requests without `Accept-Encoding` header
-  * deps: accepts@~1.3.8
-    - Fix sorting encoding with extra parameters
-    - deps: mime-types@~2.1.34
-    - deps: negotiator@0.6.3
+
+1.7.5 / 2024-10-31
+==========
+  * deps: Replace accepts with negotiator@~0.6.4
+    - Add preference option
+  * deps: bytes@3.1.2
+    - Add petabyte (`pb`) support
+    - Fix "thousandsSeparator" incorrecting formatting fractional part
+    - Fix return value for un-parsable strings
   * deps: compressible@~2.0.18
     - Mark `font/ttf` as compressible
     - Remove compressible from `multipart/mixed`

README.md

@@ -31,7 +31,7 @@ var compression = require('compression')
 ### compression([options])
 
 Returns the compression middleware using the given `options`. The middleware
-will attempt to compress response bodies for all request that traverse through
+will attempt to compress response bodies for all requests that traverse through
 the middleware, based on the given `options`.
 
 This middleware will never compress responses that include a `Cache-Control`

index.js

@@ -14,7 +14,7 @@
  * @private
  */
 
-var accepts = require('accepts')
+var Negotiator = require('negotiator')
 var Buffer = require('safe-buffer').Buffer
 var bytes = require('bytes')
 var compressible = require('compressible')
@@ -177,13 +177,8 @@ function compression (options) {
       }
 
       // compression method
-      var accept = accepts(req)
-      var method = accept.encoding(['gzip', 'deflate', 'identity'])
-
-      // we really don't prefer deflate
-      if (method === 'deflate' && accept.encoding(['gzip'])) {
-        method = accept.encoding(['gzip', 'identity'])
-      }
+      var negotiator = new Negotiator(req)
+      var method = negotiator.encoding(['gzip', 'deflate', 'identity'], ['gzip'])
 
       // if no method is found, use the default encoding
       if (encodingSupported.indexOf(defaultEncoding) !== -1 && !req.headers['accept-encoding']) {
@@ -253,9 +248,9 @@ function chunkLength (chunk, encoding) {
     return 0
   }
 
-  return !Buffer.isBuffer(chunk)
-    ? Buffer.byteLength(chunk, encoding)
-    : chunk.length
+  return Buffer.isBuffer(chunk)
+    ? chunk.length
+    : Buffer.byteLength(chunk, encoding)
 }
 
 /**
@@ -294,7 +289,7 @@ function shouldTransform (req, res) {
  */
 
 function toBuffer (chunk, encoding) {
-  return !Buffer.isBuffer(chunk)
-    ? Buffer.from(chunk, encoding)
-    : chunk
+  return Buffer.isBuffer(chunk)
+    ? chunk
+    : Buffer.from(chunk, encoding)
 }

package.json

@@ -1,18 +1,18 @@
 {
   "name": "compression",
   "description": "Node.js compression middleware",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "contributors": [
     "Douglas Christopher Wilson <doug@somethingdoug.com>",
     "Jonathan Ong <me@jongleberry.com> (http://jongleberry.com)"
   ],
   "license": "MIT",
   "repository": "expressjs/compression",
   "dependencies": {
-    "accepts": "~1.3.8",
-    "bytes": "3.0.0",
+    "bytes": "3.1.2",
     "compressible": "~2.0.18",
     "debug": "2.6.9",
+    "negotiator": "~0.6.4",
     "on-headers": "~1.0.2",
     "safe-buffer": "5.2.1",
     "vary": "~1.1.2"
@@ -40,7 +40,7 @@
   },
   "scripts": {
     "lint": "eslint .",
-    "test": "mocha --check-leaks --reporter spec --bail",
+    "test": "mocha --check-leaks --reporter spec",
     "test-ci": "nyc --reporter=lcovonly --reporter=text npm test",
     "test-cov": "nyc --reporter=html --reporter=text npm test"
   }