mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-07-02 13:57:55 +00:00
## [2.32.0] - 2025-07-01 Thanks to: @bughaver, @bugsounet, @khassel, @KristjanESPERANTO, @plebcity, @rejas, @sdetweil. > ⚠️ This release needs nodejs version `v22.14.0 or higher` ### Added - [config] Allow to change module order for final renderer (or dynamically with CSS): Feature `order` in config (#3762) - [clock] Added option 'disableNextEvent' to hide next sun event (#3769) - [clock] Implement short syntax for clock week (#3775) ### Changed - [refactor] Simplify module loading process (#3766) - Use `node --run` instead of `npm run` (#3764) and adapt `start:dev` script (#3773) - [workflow] Run linter and spellcheck with LTS node version (#3767) - [workflow] Split "Run test" step into two steps for more clarity (#3767) - [linter] Review linter setup (#3783) - Fix command to lint markdown in `CONTRIBUTING.md` - Re-activate JSDoc linting and fix linting issues - Refactor ESLint config to use `defineConfig` and `globalIgnores` - Replace `eslint-plugin-import` with `eslint-plugin-import-x` - Switch Stylelint config to flat format and simplify Stylelint scripts - [workflow] Replace Node.js version v23 with v24 (#3770) - [refactor] Replace deprecated constants `fs.F_OK` and `fs.R_OK` (#3789) - [refactor] Replace `ansis` with built-in function `util.styleText` (#3793) - [core] Integrate stuff from `vendor` and `fonts` folders into main `package.json`, simplifies install and maintaining dependencies (#3795, #3805) - [l10n] Complete translations (with the help of translation tools) (#3794) - [refactor] Refactored `calendarfetcherutils` in Calendar module to handle timezones better (#3806) - Removed as many of the date conversions as possible - Use `moment-timezone` when calculating recurring events, this will fix problems from the past with offsets and DST not being handled properly - Added some tests to test the behavior of the refactored methods to make sure the correct event dates are returned - [linter] Enable ESLint rule `no-console` and replace `console` with `Log` in some files (#3810) - [tests] Review and refactor translation tests (#3792) ### Fixed - [fix] Handle spellcheck issues (#3783) - [calendar] fix fullday event rrule until with timezone offset (#3781) - [feat] Add rule `no-undef` in config file validation to fix #3785 (#3786) - [fonts] Fix `roboto.css` to avoid error message `Unknown descriptor 'var(' in @font-face rule.` in firefox console (#3787) - [tests] Fix and refactor e2e test `Same keys` in `translations_spec.js` (#3809) - [tests] Fix e2e tests newsfeed and calendar to exit without open handles (#3817) ### Updated - [core] Update dependencies including electron to v36 (#3774, #3788, #3811, #3804, #3815, #3823) - [core] Update package type to `commonjs` - [logger] Review factory code part: use `switch/case` instead of `if/else if` (#3812) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Michael Teeuw <michael@xonaymedia.nl> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ross Younger <crazyscot@gmail.com> Co-authored-by: Veeck <github@veeck.de> Co-authored-by: Bugsounet - Cédric <github@bugsounet.fr> Co-authored-by: jkriegshauser <joshuakr@nvidia.com> Co-authored-by: illimarkangur <116028111+illimarkangur@users.noreply.github.com> Co-authored-by: sam detweiler <sdetweil@gmail.com> Co-authored-by: vppencilsharpener <tim.pray@gmail.com> Co-authored-by: veeck <michael.veeck@nebenan.de> Co-authored-by: Paranoid93 <6515818+Paranoid93@users.noreply.github.com> Co-authored-by: Brian O'Connor <btoconnor@users.noreply.github.com> Co-authored-by: WallysWellies <59727507+WallysWellies@users.noreply.github.com> Co-authored-by: Jason Stieber <jrstieber@gmail.com> Co-authored-by: jargordon <50050429+jargordon@users.noreply.github.com> Co-authored-by: Daniel <32464403+dkallen78@users.noreply.github.com> Co-authored-by: Ryan Williams <65094007+ryan-d-williams@users.noreply.github.com> Co-authored-by: Panagiotis Skias <panagiotis.skias@gmail.com> Co-authored-by: Marc Landis <dirk.rettschlag@gmail.com> Co-authored-by: HeikoGr <20295490+HeikoGr@users.noreply.github.com> Co-authored-by: Pedro Lamas <pedrolamas@gmail.com> Co-authored-by: veeck <gitkraken@veeck.de> Co-authored-by: Magnus <34011212+MagMar94@users.noreply.github.com> Co-authored-by: Ikko Eltociear Ashimine <eltociear@gmail.com> Co-authored-by: DevIncomin <56730075+Developer-Incoming@users.noreply.github.com> Co-authored-by: Nathan <n8nyoung@gmail.com> Co-authored-by: mixasgr <mixasgr@users.noreply.github.com> Co-authored-by: Savvas Adamtziloglou <savvas-gr@greeklug.gr> Co-authored-by: Konstantinos <geraki@gmail.com> Co-authored-by: OWL4C <124401812+OWL4C@users.noreply.github.com> Co-authored-by: BugHaver <43462320+bughaver@users.noreply.github.com> Co-authored-by: BugHaver <43462320+lsaadeh@users.noreply.github.com> Co-authored-by: Koen Konst <koenspero@gmail.com> Co-authored-by: Koen Konst <c.h.konst@avisi.nl>
174 lines
5.9 KiB
JavaScript
174 lines
5.9 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 receive
|
|
* @param {string} basePath The base path, default is "/"
|
|
* @returns {Promise} resolved when the fetch is done. The response headers is placed in a headers-property (provided the response does not already contain a headers-property).
|
|
*/
|
|
async function performWebRequest (url, type = "json", useCorsProxy = false, requestHeaders = undefined, expectedResponseHeaders = undefined, basePath = "/") {
|
|
const request = {};
|
|
let requestUrl;
|
|
if (useCorsProxy) {
|
|
requestUrl = getCorsUrl(url, requestHeaders, expectedResponseHeaders, basePath);
|
|
} else {
|
|
requestUrl = url;
|
|
request.headers = getHeadersToSend(requestHeaders);
|
|
}
|
|
const response = await fetch(requestUrl, 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 receive
|
|
* @param {string} basePath The base path, default is "/"
|
|
* @returns {string} to be used as URL when calling CORS-method on server.
|
|
*/
|
|
const getCorsUrl = function (url, requestHeaders, expectedResponseHeaders, basePath = "/") {
|
|
if (!url || url.length < 1) {
|
|
throw new Error(`Invalid URL: ${url}`);
|
|
} else {
|
|
let corsUrl = `${location.protocol}//${location.host}${basePath}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 attach 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 receive.
|
|
* @param {Array.<string>} expectedResponseHeaders the expected HTTP headers to receive
|
|
* @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 receive
|
|
* @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;
|
|
};
|
|
|
|
/**
|
|
* Format the time according to the config
|
|
* @param {object} config The config of the module
|
|
* @param {object} time time to format
|
|
* @returns {string} The formatted time string
|
|
*/
|
|
const formatTime = (config, time) => {
|
|
let date = moment(time);
|
|
|
|
if (config.timezone) {
|
|
date = date.tz(config.timezone);
|
|
}
|
|
|
|
if (config.timeFormat !== 24) {
|
|
if (config.showPeriod) {
|
|
if (config.showPeriodUpper) {
|
|
return date.format("h:mm A");
|
|
} else {
|
|
return date.format("h:mm a");
|
|
}
|
|
} else {
|
|
return date.format("h:mm");
|
|
}
|
|
}
|
|
|
|
return date.format("HH:mm");
|
|
};
|
|
|
|
if (typeof module !== "undefined") module.exports = {
|
|
performWebRequest,
|
|
formatTime
|
|
};
|