Skip to content

Fix request.accept* bugs #341

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

Open
BV-WebDev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix request.accept* bugs #341

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
67 changes: 33 additions & 34 deletions src/components/compatibility/ExpressRequest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ const type_is = require('type-is');
const is_ip = require('net').isIP;

class ExpressRequest {
#negotiator;

ExpressRequest() {
this.#negotiator = new Negotiator(this);
}

/* Methods */
get(name) {
Expand All @@ -29,49 +24,53 @@ class ExpressRequest {
return this.get(name);
}

accepts(types) {
if (arguments.length === 0) {
return this.#negotiator.mediaTypes();
accepts(mediaTypes) {
const negotiator = new Negotiator(this);
if (mediaTypes && !Array.isArray(mediaTypes)) {
mediaTypes = Array.from(arguments);
}

const arrayTypes = Array.isArray(types) ? types : Array.from(arguments);
if (!arrayTypes.length) {
return this.#negotiator.mediaTypes();
if (!mediaTypes || !mediaTypes.length) {
return negotiator.mediaTypes();
}

const mimes = arrayTypes.map((type) => type.indexOf('/') === -1 ? mime_types.lookup(type) : type);
const first = this.#negotiator.mediaType(mimes.filter((type) => typeof type === 'string'));
return first ? arrayTypes[mimes.indexOf(first)] : false;
if (!this.headers.accept) {
return mediaTypes[0];
}
const mimes = mediaTypes.map((type) => type.indexOf('/') === -1 ? mime_types.lookup(type) : type);
const first = negotiator.mediaType(mimes.filter((type) => typeof type === 'string'));
return first ? mediaTypes[mimes.indexOf(first)] : false;
}

acceptsEncodings(encodings) {
if (arguments.length === 0) {
return this.#negotiator.encodings();
} else if (Array.isArray(encodings)) {
if (!encodings.length) return this.#negotiator.encodings();
return this.#negotiator.encoding(encodings) || false;
const negotiator = new Negotiator(this);
if (encodings && !Array.isArray(encodings)) {
encodings = Array.from(arguments);
}
if (!encodings || !encodings.length) {
return negotiator.encodings();
}
return this.#negotiator.encoding(Array.from(arguments)) || false;
return negotiator.encodings(encodings)[0] || false;
}

acceptsCharsets(charsets) {
if (arguments.length === 0) {
return this.#negotiator.charsets();
} else if (Array.isArray(charsets)) {
if (!charsets.length) return this.#negotiator.charsets();
return this.#negotiator.charset(charsets) || false;
const negotiator = new Negotiator(this);
if (charsets && !Array.isArray(charsets)) {
charsets = Array.from(arguments);
}
return this.#negotiator.charset(Array.from(arguments)) || false;
if (!charsets || !charsets.length) {
return negotiator.charsets();
}
return negotiator.charsets(charsets)[0] || false;
}

acceptsLanguages(languages) {
if (arguments.length === 0) {
return this.#negotiator.languages();
} else if (Array.isArray(languages)) {
if (!languages.length) return this.#negotiator.languages();
return this.#negotiator.language(languages) || false;
const negotiator = new Negotiator(this);
if (languages && !Array.isArray(languages)) {
languages = Array.from(arguments);
}
if (!languages || !languages.length) {
return negotiator.languages();
}
return this.#negotiator.language(Array.from(arguments)) || false;
return negotiator.languages(languages)[0] || false;
}

range(size, options) {
Expand Down