mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 03:39:55 +00:00
## [2.23.0] - 2023-04-04 Thanks to: @angeldeejay, @buxxi, @CarJem, @dariom, @DaveChild, @dWoolridge, @grenagit, @Hirschberger, @KristjanESPERANTO, @MagMar94, @naveensrinivasan, @nfogal, @psieg, @rajniszp, @retroflex, @SkySails and @tomzt. 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 guys! You are awesome! ### Added - Added increments for hourly forecasts in weather module (#2996) - Added tests for hourly weather forecast - Added possibility to ignore MagicMirror repo in updatenotification module - Added Pirate Weather as new weather provider (#3005) - Added possibility to use your own templates in Alert module - Added error message if `<modulename>.js` file is missing in module folder to get a hint in the logs (#2403) - Added possibility to use environment variables in `config.js` (#1756) - Added option `pastDaysCount` to default calendar module to control of how many days past events should be displayed - Added thai language to alert module - Added option `sendNotifications` in clock module (#3056) ### Removed - Removed darksky weather provider - Removed unneeded (and unwanted) '.' after the year in calendar repeatingCountTitle (#2896) ### Updated - Use develop as target branch for dependabot - Update issue template, contributing doc and sample config - The weather modules clearly separates precipitation amount and probability (risk of rain/snow) - This requires all providers that only supports probability to change the config from `showPrecipitationAmount` to `showPrecipitationProbability`. - Update tests for weather and calendar module - Changed updatenotification module for MagicMirror repo only: Send only notifications for `master` if there is a tag on a newer commit - Update dates in Calendar widgets every minute - Cleanup jest coverage for patches - Update `stylelint` dependencies, switch to `stylelint-config-standard` and handle `stylelint` issues, update `main.css` matching new rules - Update Eslint config, add new rule and handle issue - Convert lots of callbacks to async/await - Revise require imports (#3071 and #3072) ### Fixed - Fix wrong day labels in envcanada forecast (#2987) - Fix for missing default class name prefix for customEvents in calendar - Fix electron flashing white screen on startup (#1919) - Fix weathergov provider hourly forecast (#3008) - Fix message display with HTML code into alert module (#2828) - Fix typo in french translation - Yr wind direction is no longer inverted - Fix async node_helper stopping electron start (#2487) - The wind direction arrow now points in the direction the wind is flowing, not into the wind (#3019) - Fix precipitation css styles and rounding value - Fix wrong vertical alignment of calendar title column when wrapEvents is true (#3053) - Fix empty news feed stopping the reload forever - Fix e2e tests (failed after async changes) by running calendar and newsfeed tests last - Lint: Use template literals instead of string concatenation - Fix default alert module to render HTML for title and message - Fix Open-Meteo wind speed units
128 lines
3.5 KiB
JavaScript
128 lines
3.5 KiB
JavaScript
const fs = require("fs");
|
|
const path = require("path");
|
|
const Log = require("logger");
|
|
const fetch = require("./fetch");
|
|
|
|
/**
|
|
* Gets the config.
|
|
*
|
|
* @param {Request} req - the request
|
|
* @param {Response} res - the result
|
|
*/
|
|
function getConfig(req, res) {
|
|
res.send(config);
|
|
}
|
|
|
|
/**
|
|
* 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 expectedRecievedHeaders = geExpectedRecievedHeaders(req.url);
|
|
|
|
Log.log(`cors url: ${url}`);
|
|
const response = await fetch(url, { headers: headersToSend });
|
|
|
|
for (const header of expectedRecievedHeaders) {
|
|
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 geExpectedRecievedHeaders(url) {
|
|
const expectedRecievedHeaders = ["Content-Type"];
|
|
const expectedRecievedHeadersMatch = new RegExp("expectedheaders=(.+?)(&|$)", "g").exec(url);
|
|
if (expectedRecievedHeadersMatch) {
|
|
const headers = expectedRecievedHeadersMatch[1].split(",");
|
|
for (const header of headers) {
|
|
expectedRecievedHeaders.push(header);
|
|
}
|
|
}
|
|
return expectedRecievedHeaders;
|
|
}
|
|
|
|
/**
|
|
* 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);
|
|
}
|
|
|
|
module.exports = { cors, getConfig, getHtml, getVersion };
|