mirror of
https://github.com/MichMich/MagicMirror.git
synced 2026-04-23 22:37:01 +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>
404 lines
12 KiB
JavaScript
404 lines
12 KiB
JavaScript
/* global WeatherProvider, WeatherUtils, WeatherObject, formatTime */
|
|
|
|
Module.register("weather", {
|
|
// Default module config.
|
|
defaults: {
|
|
weatherProvider: "openweathermap",
|
|
roundTemp: false,
|
|
type: "current", // current, forecast, daily (equivalent to forecast), hourly (only with OpenWeatherMap /onecall endpoint)
|
|
lang: config.language,
|
|
units: config.units,
|
|
tempUnits: config.units,
|
|
windUnits: config.units,
|
|
timeFormat: config.timeFormat,
|
|
updateInterval: 10 * 60 * 1000, // every 10 minutes
|
|
animationSpeed: 1000,
|
|
showFeelsLike: true,
|
|
showHumidity: "none", // possible options for "current" weather are "none", "wind", "temp", "feelslike" or "below", for "hourly" weather "none" or "true"
|
|
hideZeroes: false, // hide zeroes (and empty columns) in hourly, currently only for precipitation
|
|
showIndoorHumidity: false,
|
|
showIndoorTemperature: false,
|
|
allowOverrideNotification: false,
|
|
showPeriod: true,
|
|
showPeriodUpper: false,
|
|
showPrecipitationAmount: false,
|
|
showPrecipitationProbability: false,
|
|
showUVIndex: false,
|
|
showSun: true,
|
|
showWindDirection: true,
|
|
showWindDirectionAsArrow: false,
|
|
degreeLabel: false,
|
|
decimalSymbol: ".",
|
|
maxNumberOfDays: 5,
|
|
maxEntries: 5,
|
|
ignoreToday: false,
|
|
fade: true,
|
|
fadePoint: 0.25, // Start on 1/4th of the list.
|
|
initialLoadDelay: 0, // 0 seconds delay
|
|
appendLocationNameToHeader: true,
|
|
calendarClass: "calendar",
|
|
tableClass: "small",
|
|
onlyTemp: false,
|
|
colored: false,
|
|
absoluteDates: false,
|
|
forecastDateFormat: "ddd", // format for forecast date display, e.g., "ddd" = Mon, "dddd" = Monday, "D MMM" = 18 Oct
|
|
hourlyForecastIncrements: 1,
|
|
themeDir: "",
|
|
themeCustomScripts: []
|
|
},
|
|
|
|
// Module properties (all providers run server-side)
|
|
instanceId: null,
|
|
fetchedLocationName: null,
|
|
currentWeatherObject: null,
|
|
weatherForecastArray: null,
|
|
weatherHourlyArray: null,
|
|
|
|
// Can be used by the provider to display location of event if nothing else is specified
|
|
firstEvent: null,
|
|
|
|
getThemeDir () {
|
|
const td = this.config.themeDir.replace(/\/+$/, "");
|
|
if (td.length > 0) {
|
|
return `${td}/`;
|
|
} else {
|
|
return "";
|
|
}
|
|
},
|
|
|
|
// Define required scripts.
|
|
getStyles () {
|
|
return ["font-awesome.css", "weather-icons.css", `${this.getThemeDir()}weather.css`];
|
|
},
|
|
|
|
// Return the scripts that are necessary for the weather module.
|
|
getScripts () {
|
|
// Only load client-side dependencies for rendering
|
|
// All providers run server-side via node_helper
|
|
const resArr = ["moment.js", "weatherutils.js", "weatherobject.js", "suncalc.js"];
|
|
this.config.themeCustomScripts.forEach((element) => {
|
|
resArr.push(`${this.getThemeDir()}${element}`);
|
|
});
|
|
return resArr;
|
|
},
|
|
|
|
// Override getHeader method.
|
|
getHeader () {
|
|
if (this.config.appendLocationNameToHeader) {
|
|
const locationName = this.fetchedLocationName || "";
|
|
|
|
if (this.data.header && locationName) return `${this.data.header} ${locationName}`;
|
|
else if (locationName) return locationName;
|
|
}
|
|
|
|
return this.data.header ? this.data.header : "";
|
|
},
|
|
|
|
// Start the weather module.
|
|
start () {
|
|
moment.locale(this.config.lang);
|
|
|
|
if (this.config.useKmh) {
|
|
Log.warn("[weather] Deprecation warning: Your are using the deprecated config values 'useKmh'. Please switch to windUnits!");
|
|
this.windUnits = "kmh";
|
|
} else if (this.config.useBeaufort) {
|
|
Log.warn("[weather] Deprecation warning: Your are using the deprecated config values 'useBeaufort'. Please switch to windUnits!");
|
|
this.windUnits = "beaufort";
|
|
}
|
|
if (typeof this.config.showHumidity === "boolean") {
|
|
Log.warn("[weather] Deprecation warning: Please consider updating showHumidity to the new style (config string).");
|
|
this.config.showHumidity = this.config.showHumidity ? "wind" : "none";
|
|
}
|
|
|
|
// All providers run server-side: generate unique instance ID and initialize via node_helper
|
|
this.instanceId = `${this.identifier}_${Date.now()}`;
|
|
|
|
if (window.initWeatherTheme) window.initWeatherTheme(this);
|
|
|
|
Log.log(`[weather] Initializing server-side provider with instance ID: ${this.instanceId}`);
|
|
|
|
this.sendSocketNotification("INIT_WEATHER", {
|
|
instanceId: this.instanceId,
|
|
weatherProvider: this.config.weatherProvider,
|
|
...this.config
|
|
});
|
|
|
|
// Server-driven fetching - no client-side scheduling needed
|
|
|
|
// Add custom filters
|
|
this.addFilters();
|
|
},
|
|
|
|
// Cleanup on module hide/suspend
|
|
stop () {
|
|
if (this.instanceId) {
|
|
this.sendSocketNotification("STOP_WEATHER", {
|
|
instanceId: this.instanceId
|
|
});
|
|
}
|
|
},
|
|
|
|
// Override notification handler.
|
|
notificationReceived (notification, payload, sender) {
|
|
if (notification === "CALENDAR_EVENTS") {
|
|
const senderClasses = sender.data.classes.toLowerCase().split(" ");
|
|
if (senderClasses.indexOf(this.config.calendarClass.toLowerCase()) !== -1) {
|
|
this.firstEvent = null;
|
|
for (let event of payload) {
|
|
if (event.location || event.geo) {
|
|
this.firstEvent = event;
|
|
Log.debug("[weather] First upcoming event with location: ", event);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
} else if (notification === "INDOOR_TEMPERATURE") {
|
|
this.indoorTemperature = this.roundValue(payload);
|
|
this.updateDom(300);
|
|
} else if (notification === "INDOOR_HUMIDITY") {
|
|
this.indoorHumidity = this.roundValue(payload);
|
|
this.updateDom(300);
|
|
} else if (notification === "CURRENT_WEATHER_OVERRIDE" && this.config.allowOverrideNotification) {
|
|
// Override current weather with data from local sensors
|
|
if (this.currentWeatherObject) {
|
|
Object.assign(this.currentWeatherObject, payload);
|
|
this.updateDom(this.config.animationSpeed);
|
|
}
|
|
}
|
|
},
|
|
|
|
// Handle socket notifications from node_helper
|
|
socketNotificationReceived (notification, payload) {
|
|
if (payload.instanceId !== this.instanceId) {
|
|
return;
|
|
}
|
|
|
|
if (notification === "WEATHER_INITIALIZED") {
|
|
Log.log(`[weather] Provider initialized, location: ${payload.locationName}`);
|
|
this.fetchedLocationName = payload.locationName;
|
|
this.updateDom();
|
|
// Server-driven fetching - HTTPFetcher will send WEATHER_DATA automatically
|
|
} else if (notification === "WEATHER_DATA") {
|
|
this.handleWeatherData(payload);
|
|
} else if (notification === "WEATHER_ERROR") {
|
|
Log.error("[weather] Error from node_helper:", payload.error);
|
|
}
|
|
},
|
|
|
|
handleWeatherData (payload) {
|
|
const { type, data } = payload;
|
|
|
|
if (!data) {
|
|
return;
|
|
}
|
|
|
|
// Convert plain objects to WeatherObject instances
|
|
switch (type) {
|
|
case "current":
|
|
this.currentWeatherObject = this.createWeatherObject(data);
|
|
break;
|
|
case "forecast":
|
|
case "daily":
|
|
this.weatherForecastArray = data.map((d) => this.createWeatherObject(d));
|
|
break;
|
|
case "hourly":
|
|
this.weatherHourlyArray = data.map((d) => this.createWeatherObject(d));
|
|
break;
|
|
default:
|
|
Log.warn(`Unknown weather data type: ${type}`);
|
|
break;
|
|
}
|
|
|
|
this.updateAvailable();
|
|
},
|
|
|
|
createWeatherObject (data) {
|
|
const weather = new WeatherObject();
|
|
Object.assign(weather, {
|
|
...data,
|
|
// Convert to moment objects for template compatibility
|
|
date: data.date ? moment(data.date) : null,
|
|
sunrise: data.sunrise ? moment(data.sunrise) : null,
|
|
sunset: data.sunset ? moment(data.sunset) : null
|
|
});
|
|
return weather;
|
|
},
|
|
|
|
// Select the template depending on the display type.
|
|
getTemplate () {
|
|
switch (this.config.type.toLowerCase()) {
|
|
case "current":
|
|
return `${this.getThemeDir()}current.njk`;
|
|
case "hourly":
|
|
return `${this.getThemeDir()}hourly.njk`;
|
|
case "daily":
|
|
case "forecast":
|
|
return `${this.getThemeDir()}forecast.njk`;
|
|
//Make the invalid values use the "Loading..." from forecast
|
|
default:
|
|
return `${this.getThemeDir()}forecast.njk`;
|
|
}
|
|
},
|
|
|
|
// Add all the data to the template.
|
|
getTemplateData () {
|
|
const hourlyData = this.weatherHourlyArray?.filter((e, i) => (i + 1) % this.config.hourlyForecastIncrements === this.config.hourlyForecastIncrements - 1);
|
|
|
|
return {
|
|
config: this.config,
|
|
current: this.currentWeatherObject,
|
|
forecast: this.weatherForecastArray,
|
|
hourly: hourlyData,
|
|
indoor: {
|
|
humidity: this.indoorHumidity,
|
|
temperature: this.indoorTemperature
|
|
}
|
|
};
|
|
},
|
|
|
|
// What to do when the weather provider has new information available?
|
|
updateAvailable () {
|
|
Log.log("[weather] New weather information available.");
|
|
if (window.updateWeatherTheme) {
|
|
window.updateWeatherTheme(this);
|
|
} else {
|
|
this.updateDom(300);
|
|
}
|
|
|
|
const currentWeather = this.currentWeatherObject;
|
|
|
|
if (currentWeather) {
|
|
this.sendNotification("CURRENTWEATHER_TYPE", { type: currentWeather.weatherType?.replace("-", "_") });
|
|
}
|
|
|
|
const notificationPayload = {
|
|
currentWeather: this.config.units === "imperial"
|
|
? WeatherUtils.convertWeatherObjectToImperial(currentWeather?.simpleClone()) ?? null
|
|
: currentWeather?.simpleClone() ?? null,
|
|
forecastArray: this.config.units === "imperial"
|
|
? this.getForecastArray()?.map((ar) => WeatherUtils.convertWeatherObjectToImperial(ar.simpleClone())) ?? []
|
|
: this.getForecastArray()?.map((ar) => ar.simpleClone()) ?? [],
|
|
hourlyArray: this.config.units === "imperial"
|
|
? this.getHourlyArray()?.map((ar) => WeatherUtils.convertWeatherObjectToImperial(ar.simpleClone())) ?? []
|
|
: this.getHourlyArray()?.map((ar) => ar.simpleClone()) ?? [],
|
|
locationName: this.fetchedLocationName,
|
|
providerName: this.config.weatherProvider
|
|
};
|
|
|
|
this.sendNotification("WEATHER_UPDATED", notificationPayload);
|
|
},
|
|
|
|
getForecastArray () {
|
|
return this.weatherForecastArray;
|
|
},
|
|
|
|
getHourlyArray () {
|
|
return this.weatherHourlyArray;
|
|
},
|
|
|
|
// scheduleUpdate removed - all providers use server-driven fetching via HTTPFetcher
|
|
|
|
roundValue (temperature) {
|
|
if (temperature === null || temperature === undefined) {
|
|
return "";
|
|
}
|
|
const decimals = this.config.roundTemp ? 0 : 1;
|
|
const roundValue = parseFloat(temperature).toFixed(decimals);
|
|
if (roundValue === "NaN") {
|
|
return "";
|
|
}
|
|
return roundValue === "-0" ? 0 : roundValue;
|
|
},
|
|
|
|
addFilters () {
|
|
this.nunjucksEnvironment().addFilter(
|
|
"formatTime",
|
|
function (date) {
|
|
return formatTime(this.config, date);
|
|
}.bind(this)
|
|
);
|
|
|
|
this.nunjucksEnvironment().addFilter(
|
|
"unit",
|
|
function (value, type, valueUnit) {
|
|
let formattedValue;
|
|
if (type === "temperature") {
|
|
if (value === null || value === undefined) {
|
|
formattedValue = "";
|
|
} else {
|
|
formattedValue = `${this.roundValue(WeatherUtils.convertTemp(value, this.config.tempUnits))}°`;
|
|
if (this.config.degreeLabel) {
|
|
if (this.config.tempUnits === "metric") {
|
|
formattedValue += "C";
|
|
} else if (this.config.tempUnits === "imperial") {
|
|
formattedValue += "F";
|
|
} else {
|
|
formattedValue += "K";
|
|
}
|
|
}
|
|
}
|
|
} else if (type === "precip") {
|
|
if (value === null || isNaN(value)) {
|
|
formattedValue = "";
|
|
} else {
|
|
formattedValue = WeatherUtils.convertPrecipitationUnit(value, valueUnit, this.config.units);
|
|
}
|
|
} else if (type === "humidity") {
|
|
formattedValue = `${value}%`;
|
|
} else if (type === "wind") {
|
|
formattedValue = WeatherUtils.convertWind(value, this.config.windUnits);
|
|
}
|
|
return formattedValue;
|
|
}.bind(this)
|
|
);
|
|
|
|
this.nunjucksEnvironment().addFilter(
|
|
"roundValue",
|
|
function (value) {
|
|
return this.roundValue(value);
|
|
}.bind(this)
|
|
);
|
|
|
|
this.nunjucksEnvironment().addFilter(
|
|
"decimalSymbol",
|
|
function (value) {
|
|
return value.toString().replace(/\./g, this.config.decimalSymbol);
|
|
}.bind(this)
|
|
);
|
|
|
|
this.nunjucksEnvironment().addFilter(
|
|
"calcNumSteps",
|
|
function (forecast) {
|
|
return Math.min(forecast.length, this.config.maxNumberOfDays);
|
|
}.bind(this)
|
|
);
|
|
|
|
this.nunjucksEnvironment().addFilter(
|
|
"calcNumEntries",
|
|
function (dataArray) {
|
|
return Math.min(dataArray.length, this.config.maxEntries);
|
|
}.bind(this)
|
|
);
|
|
|
|
this.nunjucksEnvironment().addFilter(
|
|
"opacity",
|
|
function (currentStep, numSteps) {
|
|
if (this.config.fade && this.config.fadePoint < 1) {
|
|
if (this.config.fadePoint < 0) {
|
|
this.config.fadePoint = 0;
|
|
}
|
|
const startingPoint = numSteps * this.config.fadePoint;
|
|
const numFadesteps = numSteps - startingPoint;
|
|
if (currentStep >= startingPoint) {
|
|
return 1 - (currentStep - startingPoint) / numFadesteps;
|
|
} else {
|
|
return 1;
|
|
}
|
|
} else {
|
|
return 1;
|
|
}
|
|
}.bind(this)
|
|
);
|
|
}
|
|
});
|