mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 17:01:08 -04: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>
305 lines
9.5 KiB
JavaScript
305 lines
9.5 KiB
JavaScript
/* global WeatherProvider, WeatherUtils, 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", // this is now a string; see current.njk
|
|
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,
|
|
hourlyForecastIncrements: 1
|
|
},
|
|
|
|
// Module properties.
|
|
weatherProvider: null,
|
|
|
|
// Can be used by the provider to display location of event if nothing else is specified
|
|
firstEvent: null,
|
|
|
|
// Define required scripts.
|
|
getStyles () {
|
|
return ["font-awesome.css", "weather-icons.css", "weather.css"];
|
|
},
|
|
|
|
// Return the scripts that are necessary for the weather module.
|
|
getScripts () {
|
|
return ["moment.js", "weatherutils.js", "weatherobject.js", this.file("providers/overrideWrapper.js"), "weatherprovider.js", "suncalc.js", this.file(`providers/${this.config.weatherProvider.toLowerCase()}.js`)];
|
|
},
|
|
|
|
// Override getHeader method.
|
|
getHeader () {
|
|
if (this.config.appendLocationNameToHeader && this.weatherProvider) {
|
|
if (this.data.header) return `${this.data.header} ${this.weatherProvider.fetchedLocation()}`;
|
|
else return this.weatherProvider.fetchedLocation();
|
|
}
|
|
|
|
return this.data.header ? this.data.header : "";
|
|
},
|
|
|
|
// Start the weather module.
|
|
start () {
|
|
moment.locale(this.config.lang);
|
|
|
|
if (this.config.useKmh) {
|
|
Log.warn("Your are using the deprecated config values 'useKmh'. Please switch to windUnits!");
|
|
this.windUnits = "kmh";
|
|
} else if (this.config.useBeaufort) {
|
|
Log.warn("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";
|
|
}
|
|
|
|
// Initialize the weather provider.
|
|
this.weatherProvider = WeatherProvider.initialize(this.config.weatherProvider, this);
|
|
|
|
// Let the weather provider know we are starting.
|
|
this.weatherProvider.start();
|
|
|
|
// Add custom filters
|
|
this.addFilters();
|
|
|
|
// Schedule the first update.
|
|
this.scheduleUpdate(this.config.initialLoadDelay);
|
|
},
|
|
|
|
// 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("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) {
|
|
this.weatherProvider.notificationReceived(payload);
|
|
}
|
|
},
|
|
|
|
// Select the template depending on the display type.
|
|
getTemplate () {
|
|
switch (this.config.type.toLowerCase()) {
|
|
case "current":
|
|
return "current.njk";
|
|
case "hourly":
|
|
return "hourly.njk";
|
|
case "daily":
|
|
case "forecast":
|
|
return "forecast.njk";
|
|
//Make the invalid values use the "Loading..." from forecast
|
|
default:
|
|
return "forecast.njk";
|
|
}
|
|
},
|
|
|
|
// Add all the data to the template.
|
|
getTemplateData () {
|
|
const currentData = this.weatherProvider.currentWeather();
|
|
const forecastData = this.weatherProvider.weatherForecast();
|
|
|
|
// Skip some hourly forecast entries if configured
|
|
const hourlyData = this.weatherProvider.weatherHourly()?.filter((e, i) => (i + 1) % this.config.hourlyForecastIncrements === this.config.hourlyForecastIncrements - 1);
|
|
|
|
return {
|
|
config: this.config,
|
|
current: currentData,
|
|
forecast: forecastData,
|
|
hourly: hourlyData,
|
|
indoor: {
|
|
humidity: this.indoorHumidity,
|
|
temperature: this.indoorTemperature
|
|
}
|
|
};
|
|
},
|
|
|
|
// What to do when the weather provider has new information available?
|
|
updateAvailable () {
|
|
Log.log("New weather information available.");
|
|
this.updateDom(0);
|
|
this.scheduleUpdate();
|
|
|
|
if (this.weatherProvider.currentWeather()) {
|
|
this.sendNotification("CURRENTWEATHER_TYPE", { type: this.weatherProvider.currentWeather().weatherType.replace("-", "_") });
|
|
}
|
|
|
|
const notificationPayload = {
|
|
currentWeather: this.config.units === "imperial"
|
|
? WeatherUtils.convertWeatherObjectToImperial(this.weatherProvider?.currentWeatherObject?.simpleClone()) ?? null
|
|
: this.weatherProvider?.currentWeatherObject?.simpleClone() ?? null,
|
|
forecastArray: this.config.units === "imperial"
|
|
? this.weatherProvider?.weatherForecastArray?.map((ar) => WeatherUtils.convertWeatherObjectToImperial(ar.simpleClone())) ?? []
|
|
: this.weatherProvider?.weatherForecastArray?.map((ar) => ar.simpleClone()) ?? [],
|
|
hourlyArray: this.config.units === "imperial"
|
|
? this.weatherProvider?.weatherHourlyArray?.map((ar) => WeatherUtils.convertWeatherObjectToImperial(ar.simpleClone())) ?? []
|
|
: this.weatherProvider?.weatherHourlyArray?.map((ar) => ar.simpleClone()) ?? [],
|
|
locationName: this.weatherProvider?.fetchedLocationName,
|
|
providerName: this.weatherProvider.providerName
|
|
};
|
|
|
|
this.sendNotification("WEATHER_UPDATED", notificationPayload);
|
|
},
|
|
|
|
scheduleUpdate (delay = null) {
|
|
let nextLoad = this.config.updateInterval;
|
|
if (delay !== null && delay >= 0) {
|
|
nextLoad = delay;
|
|
}
|
|
|
|
setTimeout(() => {
|
|
switch (this.config.type.toLowerCase()) {
|
|
case "current":
|
|
this.weatherProvider.fetchCurrentWeather();
|
|
break;
|
|
case "hourly":
|
|
this.weatherProvider.fetchWeatherHourly();
|
|
break;
|
|
case "daily":
|
|
case "forecast":
|
|
this.weatherProvider.fetchWeatherForecast();
|
|
break;
|
|
default:
|
|
Log.error(`Invalid type ${this.config.type} configured (must be one of 'current', 'hourly', 'daily' or 'forecast')`);
|
|
}
|
|
}, nextLoad);
|
|
},
|
|
|
|
roundValue (temperature) {
|
|
const decimals = this.config.roundTemp ? 0 : 1;
|
|
const roundValue = parseFloat(temperature).toFixed(decimals);
|
|
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") {
|
|
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)
|
|
);
|
|
}
|
|
});
|