Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

enconding: Add preferred option #37

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

enconding: Add preferred option #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45cad4b
add preferred option
bjohansebas Oct 22, 2024
ca63979
support old node.js versions
bjohansebas Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,17 +119,22 @@ Accepts.prototype.types = function (types_) {
* ['gzip', 'deflate']
*
* @param {String|Array} encodings...
* @param {Object} options_
* @return {String|Array}
* @public
*/

Accepts.prototype.encoding =
Accepts.prototype.encodings = function (encodings_) {
Accepts.prototype.encodings = function (encodings_, options_) {
var encodings = encodings_
var preferred = arguments[arguments.length - 1] == null ? null : arguments[arguments.length - 1].preferred

// support flattened arguments
if (encodings && !Array.isArray(encodings)) {
encodings = new Array(arguments.length)
var lenght = preferred ? arguments.length - 1 : arguments.length

encodings = new Array(lenght)

for (var i = 0; i < encodings.length; i++) {
encodings[i] = arguments[i]
}
Expand All @@ -140,7 +145,7 @@ Accepts.prototype.encodings = function (encodings_) {
return this.negotiator.encodings()
}

return this.negotiator.encodings(encodings)[0] || false
return this.negotiator.encodings(encodings, { preferred: preferred })[0] || false
}

/**
Expand Down
15 changes: 15 additions & 0 deletions test/encoding.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ describe('accepts.encodings()', function () {
assert.strictEqual(accept.encodings('compress', 'gzip'), 'gzip')
assert.strictEqual(accept.encodings('gzip', 'compress'), 'gzip')
})

it('should accept a preferred encoding', function () {
var req = createRequest('gzip, br, compress')
var accept = accepts(req)
assert.strictEqual(accept.encodings('gzip', 'br', 'identity', { preferred: ['br'] }), 'br')
assert.strictEqual(accept.encodings('gzip', 'identity', 'br', { preferred: ['br'] }), 'br')
})
})

describe('with an array', function () {
Expand All @@ -65,6 +72,14 @@ describe('accepts.encodings()', function () {
assert.strictEqual(accept.encodings(['compress', 'gzip']), 'gzip')
})
})

describe('with preferred encoding', function () {
it('should return the preferred encoding', function () {
var req = createRequest('gzip, br')
var accept = accepts(req)
assert.strictEqual(accept.encodings(['br', 'gzip', 'identity'], { preferred: ['br'] }), 'br')
})
})
})

function createRequest (encoding) {
Expand Down
Loading