mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 11:50:00 +00:00
## [2.29.0] - 2024-10-01 Thanks to: @bugsounet, @dkallen78, @jargordon, @khassel, @KristjanESPERANTO, @MarcLandis, @rejas, @ryan-d-williams, @sdetweil, @skpanagiotis. > ⚠️ This release needs nodejs version `v20` or `v22`, minimum version is `v20.9.0` ### Added - [compliments] Added support for cron type date/time format entries mm hh DD MM dow (minutes/hours/days/months and day of week) see https://crontab.cronhub.io for construction (#3481) - [core] Check config at every start of MagicMirror² (#3450) - [core] Add spelling check (cspell): `npm run test:spelling` and handle spelling issues (#3544) - [core] removed `config.paths.vendor` (could not work because `vendor` is hardcoded in `index.html`), renamed `config.paths.modules` to `config.foreignModulesDir`, added variable `MM_CUSTOMCSS_FILE` which - if set - overrides `config.customCss`, added variable `MM_MODULES_DIR` which - if set - overrides `config.foreignModulesDir`, added test for `MM_MODULES_DIR` (#3530) - [core] elements are now removed from `index.html` when loading script or stylesheet files fails - [core] Added `MODULE_DOM_UPDATED` notification each time the DOM is re-rendered via `updateDom` (#3534) - [tests] added minimal needed node version to tests (currently v20.9.0) to avoid releases with wrong node version info - [tests] Added `node-libgpiod` library to electron-rebuild tests (#3563) ### Removed - [core] removed installer only files (#3492) - [core] removed raspberry object from systeminformation (#3505) - [linter] removed `eslint-plugin-import`, because it doesn't support ESLint v9. We will reenter it later when it does. - [tests] removed `onoff` library from electron-rebuild tests (#3563) ### Updated - [weather] Updated `apiVersion` default from 2.5 to 3.0 (#3424) - [core] Updated dependencies including stylistic-eslint - [core] nail down `node-ical` version to `0.18.0` with exception `allow-ghsas: GHSA-8hc4-vh64-cxmj` in `dep-review.yaml` (which should removed after next `node-ical` update) - [core] Updated SocketIO catch all to new API - [core] Allow custom modules positions by scanning index.html for the defined regions, instead of hard coded (PR #3518 fixes issue #3504) - [core] Detail optimizations in `config_check.js` - [core] Updated minimal needed node version in `package.json` (currently v20.9.0) (#3559) and except for v21 (no security updates) (#3561) - [linter] Switch to ESLint v9 and flat config and replace `eslint-plugin-unicorn` by `@eslint/js` - [core] fix discovering module positions twice after #3450 ### Fixed - Fixed `checks` badge in README.md - [weather] Fixed issue with the UK Met Office provider following a change in their API paths and header info. - [core] add check for node_helper loading for multiple instances of same module (#3502) - [weather] Fixed issue for respecting unit config on broadcasted notifications - [tests] Fixes calendar test by moving it from e2e to electron with fixed date (#3532) - [calendar] fixed sliceMultiDayEvents getting wrong count and displaying incorrect entries, Europe/Berlin (#3542) - [tests] ignore `js/positions.js` when linting (this file is created at runtime) - [calendar] fixed sliceMultiDayEvents showing previous day without config enabled --------- 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>
158 lines
4.4 KiB
JavaScript
158 lines
4.4 KiB
JavaScript
const fs = require("node:fs");
|
|
const path = require("node:path");
|
|
const Log = require("logger");
|
|
|
|
const startUp = new Date();
|
|
|
|
/**
|
|
* Gets the config.
|
|
* @param {Request} req - the request
|
|
* @param {Response} res - the result
|
|
*/
|
|
function getConfig (req, res) {
|
|
res.send(config);
|
|
}
|
|
|
|
/**
|
|
* Gets the startup time.
|
|
* @param {Request} req - the request
|
|
* @param {Response} res - the result
|
|
*/
|
|
function getStartup (req, res) {
|
|
res.send(startUp);
|
|
}
|
|
|
|
/**
|
|
* A method that forwards HTTP Get-methods to the internet to avoid CORS-errors.
|
|
*
|
|
* Example input request url: /cors?sendheaders=header1:value1,header2:value2&expectedheaders=header1,header2&url=http://www.test.com/path?param1=value1
|
|
*
|
|
* Only the url-param of the input request url is required. It must be the last parameter.
|
|
* @param {Request} req - the request
|
|
* @param {Response} res - the result
|
|
*/
|
|
async function cors (req, res) {
|
|
try {
|
|
const urlRegEx = "url=(.+?)$";
|
|
let url;
|
|
|
|
const match = new RegExp(urlRegEx, "g").exec(req.url);
|
|
if (!match) {
|
|
url = `invalid url: ${req.url}`;
|
|
Log.error(url);
|
|
res.send(url);
|
|
} else {
|
|
url = match[1];
|
|
|
|
const headersToSend = getHeadersToSend(req.url);
|
|
const expectedReceivedHeaders = geExpectedReceivedHeaders(req.url);
|
|
|
|
Log.log(`cors url: ${url}`);
|
|
const response = await fetch(url, { headers: headersToSend });
|
|
|
|
for (const header of expectedReceivedHeaders) {
|
|
const headerValue = response.headers.get(header);
|
|
if (header) res.set(header, headerValue);
|
|
}
|
|
const data = await response.text();
|
|
res.send(data);
|
|
}
|
|
} catch (error) {
|
|
Log.error(error);
|
|
res.send(error);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Gets headers and values to attach to the web request.
|
|
* @param {string} url - The url containing the headers and values to send.
|
|
* @returns {object} An object specifying name and value of the headers.
|
|
*/
|
|
function getHeadersToSend (url) {
|
|
const headersToSend = { "User-Agent": `Mozilla/5.0 MagicMirror/${global.version}` };
|
|
const headersToSendMatch = new RegExp("sendheaders=(.+?)(&|$)", "g").exec(url);
|
|
if (headersToSendMatch) {
|
|
const headers = headersToSendMatch[1].split(",");
|
|
for (const header of headers) {
|
|
const keyValue = header.split(":");
|
|
if (keyValue.length !== 2) {
|
|
throw new Error(`Invalid format for header ${header}`);
|
|
}
|
|
headersToSend[keyValue[0]] = decodeURIComponent(keyValue[1]);
|
|
}
|
|
}
|
|
return headersToSend;
|
|
}
|
|
|
|
/**
|
|
* Gets the headers expected from the response.
|
|
* @param {string} url - The url containing the expected headers from the response.
|
|
* @returns {string[]} headers - The name of the expected headers.
|
|
*/
|
|
function geExpectedReceivedHeaders (url) {
|
|
const expectedReceivedHeaders = ["Content-Type"];
|
|
const expectedReceivedHeadersMatch = new RegExp("expectedheaders=(.+?)(&|$)", "g").exec(url);
|
|
if (expectedReceivedHeadersMatch) {
|
|
const headers = expectedReceivedHeadersMatch[1].split(",");
|
|
for (const header of headers) {
|
|
expectedReceivedHeaders.push(header);
|
|
}
|
|
}
|
|
return expectedReceivedHeaders;
|
|
}
|
|
|
|
/**
|
|
* Gets the HTML to display the magic mirror.
|
|
* @param {Request} req - the request
|
|
* @param {Response} res - the result
|
|
*/
|
|
function getHtml (req, res) {
|
|
let html = fs.readFileSync(path.resolve(`${global.root_path}/index.html`), { encoding: "utf8" });
|
|
html = html.replace("#VERSION#", global.version);
|
|
|
|
let configFile = "config/config.js";
|
|
if (typeof global.configuration_file !== "undefined") {
|
|
configFile = global.configuration_file;
|
|
}
|
|
html = html.replace("#CONFIG_FILE#", configFile);
|
|
|
|
res.send(html);
|
|
}
|
|
|
|
/**
|
|
* Gets the MagicMirror version.
|
|
* @param {Request} req - the request
|
|
* @param {Response} res - the result
|
|
*/
|
|
function getVersion (req, res) {
|
|
res.send(global.version);
|
|
}
|
|
|
|
/**
|
|
* Gets environment variables needed in the browser.
|
|
* @returns {object} environment variables key: values
|
|
*/
|
|
function getEnvVarsAsObj () {
|
|
const obj = { modulesDir: `${config.foreignModulesDir}`, customCss: `${config.customCss}` };
|
|
if (process.env.MM_MODULES_DIR) {
|
|
obj.modulesDir = process.env.MM_MODULES_DIR.replace(`${global.root_path}/`, "");
|
|
}
|
|
if (process.env.MM_CUSTOMCSS_FILE) {
|
|
obj.customCss = process.env.MM_CUSTOMCSS_FILE.replace(`${global.root_path}/`, "");
|
|
}
|
|
|
|
return obj;
|
|
}
|
|
|
|
/**
|
|
* Gets environment variables needed in the browser.
|
|
* @param {Request} req - the request
|
|
* @param {Response} res - the result
|
|
*/
|
|
function getEnvVars (req, res) {
|
|
const obj = getEnvVarsAsObj();
|
|
res.send(obj);
|
|
}
|
|
|
|
module.exports = { cors, getConfig, getHtml, getVersion, getStartup, getEnvVars, getEnvVarsAsObj };
|