mirror of
https://github.com/MichMich/MagicMirror.git
synced 2026-04-22 05:49:32 +00:00
## Release Notes Thanks to: @angeldeejay, @in-voker, @JHWelch, @khassel, @KristjanESPERANTO, @rejas, @sdetweil > ⚠️ This release needs nodejs version >=22.21.1 <23 || >=24 (no change to previous release) [Compare to previous Release v2.34.0](https://github.com/MagicMirrorOrg/MagicMirror/compare/v2.34.0...v2.25.0) > ⚠️ We introduced some internal changes with this release, please read [this forum post](https://forum.magicmirror.builders/topic/20138/upcoming-release-april-1-2026-breaking-changes-some-operational-changes) before upgrading! ### [core] - Prepare Release 2.35.0 (#4071) - docs: add security policy and vulnerability reporting guidelines (#4069) - refactor: simplify internal `require()` calls (#4056) - allow environment variables in cors urls (#4033) - fix cors proxy getting binary data (e.g. png, webp) (#4030) - fix: correct secret redaction and optimize loadConfig (#4031) - change loading config.js, allow variables in config.js and try to protect sensitive data (#4029) - remove kioskmode (#4027) - Add dark theme logo (#4026) - move custom.css from css to config (#4020) - move default modules from /modules/default to /defaultmodules (#4019) - update node versions in workflows (#4018) - [core] refactor: extract and centralize HTTP fetcher (#4016) - fix systeminformation not displaying electron version (#4012) - Update node-ical and support it's rrule-temporal changes (#4010) - Change default start scripts from X11 to Wayland (#4011) - refactor: unify favicon for index.html and Electron (#4006) - [core] run systeminformation in subprocess so the info is always displayed (#4002) - set next release dev number (#4000) ### [dependencies] - update dependencies (#4068) - update dependencies incl. electron to v41 (#4058) - chore: upgrade ESLint to v10 and fix newly surfaced issues (#4057) - chore: update ESLint and plugins, simplify config, apply new rules (#4052) - chore: update dependencies + add exports, files, and sideEffects fields to package.json (#4040) - [core] refactor: enable ESLint rule require-await and handle detected issues (#4038) - Update node-ical and other deps (#4025) - chore: update dependencies (#4021) - chore(eslint): migrate from eslint-plugin-vitest to @vitest/eslint-plugin and run rules only on test files (#4014) - Update deps as requested by dependabot (#4008) - update Collaboration.md and dependencies (#4001) ### [logging] - refactor: further logger clean-up (#4050) - Fix Node.js v25 logging prefix and modernize logger (#4049) ### [modules/calendar] - fix(calendar): make showEnd behavior more consistent across time formats (#4059) - test(calendar): fix hardcoded date in event shape test (#4055) - [calendar] refactor: delegate event expansion to node-ical's expandRecurringEvent (#4047) - calendar.js: remove useless hasCalendarURL function (#4028) - fix(calendar): update to node-ical 0.23.1 and fix full-day recurrence lookup (#4013) - fix(calendar): correct day-of-week for full-day recurring events across all timezones (#4004) ### [modules/newsfeed] - fix(newsfeed): fix full article view and add framing check (#4039) - [newsfeed] refactor: migrate to centralized HTTPFetcher (#4023) ### [modules/weather] - fix(weather): fix openmeteo forecast stuck in the past (#4064) - fix(weather): fix weathergov forecast day labels off by one (#4065) - weather: fixes for templates (#4054) - weather: add possibility to override njk's and css (#4051) - Use getDateString in openmeteo (#4046) - [weather] refactor: migrate to server-side providers with centralized HTTPFetcher (#4032) - [weather] feat: add Weather API Provider (#4036) ### [testing] - chore: remove obsolete Jest config and unit test global setup (#4044) - replace template_spec test with config_variables test (#4034) - refactor(clientonly): modernize code structure and add comprehensive tests (#4022) - Switch to undici Agent for HTTPS requests (#4015) - chore: migrate CI workflows to ubuntu-slim for faster startup times (#4007) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Co-authored-by: Bugsounet - Cédric <github@bugsounet.fr> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: sam detweiler <sdetweil@gmail.com> Co-authored-by: Veeck <github@veeck.de> 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> Co-authored-by: dathbe <github@beffa.us> Co-authored-by: Marcel <m-idler@users.noreply.github.com> Co-authored-by: Kevin G. <crazylegstoo@gmail.com> Co-authored-by: Jboucly <33218155+jboucly@users.noreply.github.com> Co-authored-by: Jboucly <contact@jboucly.fr> Co-authored-by: Jarno <54169345+jarnoml@users.noreply.github.com> Co-authored-by: Jordan Welch <JordanHWelch@gmail.com> Co-authored-by: Blackspirits <blackspirits@gmail.com> Co-authored-by: Samed Ozdemir <samed@xsor.io> Co-authored-by: in-voker <58696565+in-voker@users.noreply.github.com> Co-authored-by: Andrés Vanegas Jiménez <142350+angeldeejay@users.noreply.github.com>
134 lines
4.3 KiB
JavaScript
134 lines
4.3 KiB
JavaScript
/* global SunCalc, WeatherUtils */
|
|
|
|
/**
|
|
* @external Moment
|
|
*/
|
|
class WeatherObject {
|
|
|
|
/**
|
|
* Constructor for a WeatherObject
|
|
*/
|
|
constructor () {
|
|
this.date = null;
|
|
this.windSpeed = null;
|
|
this.windFromDirection = null;
|
|
this.sunrise = null;
|
|
this.sunset = null;
|
|
this.temperature = null;
|
|
this.minTemperature = null;
|
|
this.maxTemperature = null;
|
|
this.weatherType = null;
|
|
this.humidity = null;
|
|
this.precipitationAmount = null;
|
|
this.precipitationUnits = null;
|
|
this.precipitationProbability = null;
|
|
this.feelsLikeTemp = null;
|
|
}
|
|
|
|
cardinalWindDirection () {
|
|
if (this.windFromDirection > 11.25 && this.windFromDirection <= 33.75) {
|
|
return "NNE";
|
|
} else if (this.windFromDirection > 33.75 && this.windFromDirection <= 56.25) {
|
|
return "NE";
|
|
} else if (this.windFromDirection > 56.25 && this.windFromDirection <= 78.75) {
|
|
return "ENE";
|
|
} else if (this.windFromDirection > 78.75 && this.windFromDirection <= 101.25) {
|
|
return "E";
|
|
} else if (this.windFromDirection > 101.25 && this.windFromDirection <= 123.75) {
|
|
return "ESE";
|
|
} else if (this.windFromDirection > 123.75 && this.windFromDirection <= 146.25) {
|
|
return "SE";
|
|
} else if (this.windFromDirection > 146.25 && this.windFromDirection <= 168.75) {
|
|
return "SSE";
|
|
} else if (this.windFromDirection > 168.75 && this.windFromDirection <= 191.25) {
|
|
return "S";
|
|
} else if (this.windFromDirection > 191.25 && this.windFromDirection <= 213.75) {
|
|
return "SSW";
|
|
} else if (this.windFromDirection > 213.75 && this.windFromDirection <= 236.25) {
|
|
return "SW";
|
|
} else if (this.windFromDirection > 236.25 && this.windFromDirection <= 258.75) {
|
|
return "WSW";
|
|
} else if (this.windFromDirection > 258.75 && this.windFromDirection <= 281.25) {
|
|
return "W";
|
|
} else if (this.windFromDirection > 281.25 && this.windFromDirection <= 303.75) {
|
|
return "WNW";
|
|
} else if (this.windFromDirection > 303.75 && this.windFromDirection <= 326.25) {
|
|
return "NW";
|
|
} else if (this.windFromDirection > 326.25 && this.windFromDirection <= 348.75) {
|
|
return "NNW";
|
|
} else {
|
|
return "N";
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Determines if the sun sets or rises next. Uses the current time and not
|
|
* the date from the weather-forecast.
|
|
* @param {Moment} date an optional date where you want to get the next
|
|
* action for. Useful only in tests, defaults to the current time.
|
|
* @returns {string|null} "sunset", "sunrise", or null if sun data unavailable
|
|
*/
|
|
nextSunAction (date = moment()) {
|
|
// Return null if sunrise/sunset data is unavailable
|
|
if (!this.sunrise || !this.sunset) {
|
|
return null;
|
|
}
|
|
return date.isBetween(this.sunrise, this.sunset) ? "sunset" : "sunrise";
|
|
}
|
|
|
|
feelsLike () {
|
|
if (this.feelsLikeTemp) {
|
|
return this.feelsLikeTemp;
|
|
}
|
|
return WeatherUtils.calculateFeelsLike(this.temperature, this.windSpeed, this.humidity);
|
|
}
|
|
|
|
/**
|
|
* Checks if the weatherObject is at dayTime.
|
|
* @returns {boolean} true if it is at dayTime
|
|
*/
|
|
isDayTime () {
|
|
// Default to daytime if sunrise/sunset data unavailable
|
|
if (!this.sunrise || !this.sunset) {
|
|
return true;
|
|
}
|
|
const now = !this.date ? moment() : this.date;
|
|
return now.isBetween(this.sunrise, this.sunset, undefined, "[]");
|
|
}
|
|
|
|
/**
|
|
* Update the sunrise / sunset time depending on the location. This can be
|
|
* used if your provider doesn't provide that data by itself. Then SunCalc
|
|
* is used here to calculate them according to the location.
|
|
* @param {number} lat latitude
|
|
* @param {number} lon longitude
|
|
*/
|
|
updateSunTime (lat, lon) {
|
|
const now = !this.date ? new Date() : this.date.toDate();
|
|
const times = SunCalc.getTimes(now, lat, lon);
|
|
this.sunrise = moment(times.sunrise);
|
|
this.sunset = moment(times.sunset);
|
|
}
|
|
|
|
/**
|
|
* Clone to simple object to prevent mutating and deprecation of legacy library.
|
|
*
|
|
* Before being handed to other modules, mutable values must be cloned safely.
|
|
* Especially 'moment' object is not immutable, so original 'date', 'sunrise', 'sunset' could be corrupted or changed by other modules.
|
|
* @returns {object} plained object clone of original weatherObject
|
|
*/
|
|
simpleClone () {
|
|
const toFlat = ["date", "sunrise", "sunset"];
|
|
let clone = { ...this };
|
|
for (const prop of toFlat) {
|
|
clone[prop] = clone?.[prop]?.valueOf() ?? clone?.[prop];
|
|
}
|
|
return clone;
|
|
}
|
|
}
|
|
|
|
/*************** DO NOT EDIT THE LINE BELOW ***************/
|
|
if (typeof module !== "undefined") {
|
|
module.exports = WeatherObject;
|
|
}
|