mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 11:50:00 +00:00
## [2.22.0] - 2023-01-01 Thanks to: @angeldeejay, @buxxi, @dariom, @dWoolridge, @KristjanESPERANTO, @MagMar94, @naveensrinivasan, @retroflex, @SkySails and @Tom. Special thanks to @khassel, @rejas and @sdetweil for taking over most (if not all) of the work on this release as project collaborators. This version would not be there without their effort. Thank you! ### Added - Added test for remoteFile option in compliments module - Added hourlyWeather functionality to Weather.gov weather provider - Removed weatherEndpoint definition from weathergov.js (not used) - Added css class names "today" and "tomorrow" for default calendar - Added Collaboration.md - Added new github action for dependency review (#2862) - Added a WeatherProvider for Open-Meteo - Added Yr as a weather provider - Added config options "ignoreXOriginHeader" and "ignoreContentSecurityPolicy" ### Removed - Removed usage of internal fetch function of node until it is more stable ### Updated - Cleaned up test directory (#2937) and jest config (#2959) - Wait for all modules to start before declaring the system ready (#2487) - Updated e2e tests (moved `done()` in helper functions) and use es6 syntax in all tests - Updated da translation - Rework weather module - Make sure smhi provider api only gets a maximum of 6 digits coordinates (#2955) - Use fetch instead of XMLHttpRequest in weatherprovider (#2935) - Reworked how weatherproviders handle units (#2849) - Use unix() method for parsing times, fix suntimes on the way (#2950) - Refactor conversion functions into utils class (#2958) - The `cors`-method in `server.js` now supports sending and recieving HTTP headers - Replace `…` by `…` - Cleanup compliments module - Updated dependencies including electron to v22 (#2903) ### Fixed - Correctly show apparent temperature in SMHI weather provider - Ensure updatenotification module isn't shown when local is _ahead_ of remote - Handle node_helper errors during startup (#2944) - Possibility to change FontAwesome class in calendar, so icons like `fab fa-facebook-square` works. - Fix cors problems with newsfeed articles (as far as possible), allow disabling cors per feed with option `useCorsProxy: false` (#2840) - Tests not waiting for the application to start and stop before starting the next test - Fix electron tests failing sometimes in github workflow - Fixed gap in clock module when displayed on the left side with displayType=digital - Fixed playwright issue by upgrading to v1.29.1 (#2969) Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com> Co-authored-by: Karsten Hassel <hassel@gmx.de> Co-authored-by: Malte Hallström <46646495+SkySails@users.noreply.github.com> Co-authored-by: Veeck <github@veeck.de> Co-authored-by: veeck <michael@veeck.de> Co-authored-by: dWoolridge <dwoolridge@charter.net> Co-authored-by: Johan <jojjepersson@yahoo.se> Co-authored-by: Dario Mratovich <dario_mratovich@hotmail.com> Co-authored-by: Dario Mratovich <dario.mratovich@outlook.com> Co-authored-by: Magnus <34011212+MagMar94@users.noreply.github.com> Co-authored-by: Naveen <172697+naveensrinivasan@users.noreply.github.com> Co-authored-by: buxxi <buxxi@omfilm.net> Co-authored-by: Thomas Hirschberger <47733292+Tom-Hirschberger@users.noreply.github.com> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Co-authored-by: Andrés Vanegas Jiménez <142350+angeldeejay@users.noreply.github.com>
148 lines
5.1 KiB
JavaScript
148 lines
5.1 KiB
JavaScript
/**
|
|
* A function to make HTTP requests via the server to avoid CORS-errors.
|
|
*
|
|
* @param {string} url the url to fetch from
|
|
* @param {string} type what contenttype to expect in the response, can be "json" or "xml"
|
|
* @param {boolean} useCorsProxy A flag to indicate
|
|
* @param {Array.<{name: string, value:string}>} requestHeaders the HTTP headers to send
|
|
* @param {Array.<string>} expectedResponseHeaders the expected HTTP headers to recieve
|
|
* @returns {Promise} resolved when the fetch is done. The response headers is placed in a headers-property (provided the response does not allready contain a headers-property).
|
|
*/
|
|
async function performWebRequest(url, type = "json", useCorsProxy = false, requestHeaders = undefined, expectedResponseHeaders = undefined) {
|
|
const request = {};
|
|
if (useCorsProxy) {
|
|
url = getCorsUrl(url, requestHeaders, expectedResponseHeaders);
|
|
} else {
|
|
request.headers = getHeadersToSend(requestHeaders);
|
|
}
|
|
const response = await fetch(url, request);
|
|
const data = await response.text();
|
|
|
|
if (type === "xml") {
|
|
return new DOMParser().parseFromString(data, "text/html");
|
|
} else {
|
|
if (!data || !data.length > 0) return undefined;
|
|
|
|
const dataResponse = JSON.parse(data);
|
|
if (!dataResponse.headers) {
|
|
dataResponse.headers = getHeadersFromResponse(expectedResponseHeaders, response);
|
|
}
|
|
return dataResponse;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Gets a URL that will be used when calling the CORS-method on the server.
|
|
*
|
|
* @param {string} url the url to fetch from
|
|
* @param {Array.<{name: string, value:string}>} requestHeaders the HTTP headers to send
|
|
* @param {Array.<string>} expectedResponseHeaders the expected HTTP headers to recieve
|
|
* @returns {string} to be used as URL when calling CORS-method on server.
|
|
*/
|
|
const getCorsUrl = function (url, requestHeaders, expectedResponseHeaders) {
|
|
if (!url || url.length < 1) {
|
|
throw new Error(`Invalid URL: ${url}`);
|
|
} else {
|
|
let corsUrl = `${location.protocol}//${location.host}/cors?`;
|
|
|
|
const requestHeaderString = getRequestHeaderString(requestHeaders);
|
|
if (requestHeaderString) corsUrl = `${corsUrl}sendheaders=${requestHeaderString}`;
|
|
|
|
const expectedResponseHeadersString = getExpectedResponseHeadersString(expectedResponseHeaders);
|
|
if (requestHeaderString && expectedResponseHeadersString) {
|
|
corsUrl = `${corsUrl}&expectedheaders=${expectedResponseHeadersString}`;
|
|
} else if (expectedResponseHeadersString) {
|
|
corsUrl = `${corsUrl}expectedheaders=${expectedResponseHeadersString}`;
|
|
}
|
|
|
|
if (requestHeaderString || expectedResponseHeadersString) {
|
|
return `${corsUrl}&url=${url}`;
|
|
}
|
|
return `${corsUrl}url=${url}`;
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Gets the part of the CORS URL that represents the HTTP headers to send.
|
|
*
|
|
* @param {Array.<{name: string, value:string}>} requestHeaders the HTTP headers to send
|
|
* @returns {string} to be used as request-headers component in CORS URL.
|
|
*/
|
|
const getRequestHeaderString = function (requestHeaders) {
|
|
let requestHeaderString = "";
|
|
if (requestHeaders) {
|
|
for (const header of requestHeaders) {
|
|
if (requestHeaderString.length === 0) {
|
|
requestHeaderString = `${header.name}:${encodeURIComponent(header.value)}`;
|
|
} else {
|
|
requestHeaderString = `${requestHeaderString},${header.name}:${encodeURIComponent(header.value)}`;
|
|
}
|
|
}
|
|
return requestHeaderString;
|
|
}
|
|
return undefined;
|
|
};
|
|
|
|
/**
|
|
* Gets headers and values to attatch to the web request.
|
|
*
|
|
* @param {Array.<{name: string, value:string}>} requestHeaders the HTTP headers to send
|
|
* @returns {object} An object specifying name and value of the headers.
|
|
*/
|
|
const getHeadersToSend = (requestHeaders) => {
|
|
const headersToSend = {};
|
|
if (requestHeaders) {
|
|
for (const header of requestHeaders) {
|
|
headersToSend[header.name] = header.value;
|
|
}
|
|
}
|
|
|
|
return headersToSend;
|
|
};
|
|
|
|
/**
|
|
* Gets the part of the CORS URL that represents the expected HTTP headers to recieve.
|
|
*
|
|
* @param {Array.<string>} expectedResponseHeaders the expected HTTP headers to recieve
|
|
* @returns {string} to be used as the expected HTTP-headers component in CORS URL.
|
|
*/
|
|
const getExpectedResponseHeadersString = function (expectedResponseHeaders) {
|
|
let expectedResponseHeadersString = "";
|
|
if (expectedResponseHeaders) {
|
|
for (const header of expectedResponseHeaders) {
|
|
if (expectedResponseHeadersString.length === 0) {
|
|
expectedResponseHeadersString = `${header}`;
|
|
} else {
|
|
expectedResponseHeadersString = `${expectedResponseHeadersString},${header}`;
|
|
}
|
|
}
|
|
return expectedResponseHeaders;
|
|
}
|
|
return undefined;
|
|
};
|
|
|
|
/**
|
|
* Gets the values for the expected headers from the response.
|
|
*
|
|
* @param {Array.<string>} expectedResponseHeaders the expected HTTP headers to recieve
|
|
* @param {Response} response the HTTP response
|
|
* @returns {string} to be used as the expected HTTP-headers component in CORS URL.
|
|
*/
|
|
const getHeadersFromResponse = (expectedResponseHeaders, response) => {
|
|
const responseHeaders = [];
|
|
|
|
if (expectedResponseHeaders) {
|
|
for (const header of expectedResponseHeaders) {
|
|
const headerValue = response.headers.get(header);
|
|
responseHeaders.push({ name: header, value: headerValue });
|
|
}
|
|
}
|
|
|
|
return responseHeaders;
|
|
};
|
|
|
|
if (typeof module !== "undefined")
|
|
module.exports = {
|
|
performWebRequest
|
|
};
|