mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 11:50:00 +00:00
## [2.27.0] - 2024-04-01 Thanks to: @bugsounet, @crazyscot, @illimarkangur, @jkriegshauser, @khassel, @KristjanESPERANTO, @Paranoid93, @rejas, @sdetweil and @vppencilsharpener. This release marks the first release without Michael Teeuw (@michmich). A very special thanks to him for creating MagicMirror and leading the project for so many years. For more info, please read the following post: [A New Chapter for MagicMirror: The Community Takes the Lead](https://forum.magicmirror.builders/topic/18329/a-new-chapter-for-magicmirror-the-community-takes-the-lead). ### Added - Output of system information to the console for troubleshooting (#3328 and #3337), ignore errors under aarch64 (#3349) - [chore] Add `eslint-plugin-package-json` to lint the `package.json` files (#3368) - [weather] `showHumidity` config is now a string describing where to show this element. Supported values: "wind", "temp", "feelslike", "below", "none". (#3330) - electron-rebuild test suite for electron and 3rd party modules compatibility (#3392) - Create MM² icon and attach it to electron process (#3407) ### Updated - Update updatenotification (update_helper.js): Recode with pm2 library (#3332) - Removing lodash dependency by replacing merge by spread operator (#3339) - Use node prefix for build-in modules (#3340) - Rework logging colors (#3350) - Update pm2 to v5.3.1 with no allow-ghsas (#3364) - [chore] Update husky and let lint-staged fix ESLint issues - [chore] Update dependencies including electron to v29 (#3357) and node-ical - Update translations for estonian (#3371) - Update electron to v29 and update other dependencies - [calendar] fullDay events over several days now show the left days from the first day on and 'today' on the last day - Update layout of current weather indoor values ### Fixed - Correct apibase of weathergov weatherprovider to match documentation (#2926) - Worked around several issues in the RRULE library that were causing deleted calender events to still show, some initial and recurring events to not show, and some event times to be off an hour. (#3291) - Skip changelog requirement when running tests for dependency updates (#3320) - Display precipitation probability when it is 0% instead of blank/empty (#3345) - [newsfeed] Suppress unsightly animation cases when there are 0 or 1 active news items (#3336) - [newsfeed] Always compute the feed item URL using the same helper function (#3336) - Ignore all custom css files (#3359) - [newsfeed] Fix newsfeed stall issue introduced by #3336 (#3361) - Changed `log.debug` to `log.log` in `app.js` where logLevel is not set because config is not loaded at this time (#3353) - [calendar] deny fetch interval < 60000 and set 60000 in this case (prevent fetch loop failed) (#3382) - added message in case where config.js is missing the module.export line PR #3383 - Fixed an issue where recurring events could extend past their recurrence end date (#3393) - Don't display any `npm WARN <....>` on install (#3399) - Fixed move suncalc dependency to production from dev, as it is used by clock module - [compliments] Fix mirror not responding anymore when no compliments are to be shown (#3385) ### Deleted - Unneeded file headers (#3358) --------- 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: Karsten Hassel <hassel@gmx.de> Co-authored-by: Ross Younger <crazyscot@gmail.com> 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: Paranoid93 <6515818+Paranoid93@users.noreply.github.com>
304 lines
11 KiB
JavaScript
304 lines
11 KiB
JavaScript
/* global SunCalc, formatTime */
|
|
|
|
Module.register("clock", {
|
|
// Module config defaults.
|
|
defaults: {
|
|
displayType: "digital", // options: digital, analog, both
|
|
|
|
timeFormat: config.timeFormat,
|
|
timezone: null,
|
|
|
|
displaySeconds: true,
|
|
showPeriod: true,
|
|
showPeriodUpper: false,
|
|
clockBold: false,
|
|
showDate: true,
|
|
showTime: true,
|
|
showWeek: false,
|
|
dateFormat: "dddd, LL",
|
|
sendNotifications: false,
|
|
|
|
/* specific to the analog clock */
|
|
analogSize: "200px",
|
|
analogFace: "simple", // options: 'none', 'simple', 'face-###' (where ### is 001 to 012 inclusive)
|
|
analogPlacement: "bottom", // options: 'top', 'bottom', 'left', 'right'
|
|
analogShowDate: "top", // OBSOLETE, can be replaced with analogPlacement and showTime, options: false, 'top', or 'bottom'
|
|
secondsColor: "#888888",
|
|
|
|
showSunTimes: false,
|
|
showMoonTimes: false, // options: false, 'times' (rise/set), 'percent' (lit percent), 'phase' (current phase), or 'both' (percent & phase)
|
|
lat: 47.630539,
|
|
lon: -122.344147
|
|
},
|
|
// Define required scripts.
|
|
getScripts () {
|
|
return ["moment.js", "moment-timezone.js", "suncalc.js"];
|
|
},
|
|
// Define styles.
|
|
getStyles () {
|
|
return ["clock_styles.css"];
|
|
},
|
|
// Define start sequence.
|
|
start () {
|
|
Log.info(`Starting module: ${this.name}`);
|
|
|
|
// Schedule update interval.
|
|
this.second = moment().second();
|
|
this.minute = moment().minute();
|
|
|
|
// Calculate how many ms should pass until next update depending on if seconds is displayed or not
|
|
const delayCalculator = (reducedSeconds) => {
|
|
const EXTRA_DELAY = 50; // Deliberate imperceptible delay to prevent off-by-one timekeeping errors
|
|
|
|
if (this.config.displaySeconds) {
|
|
return 1000 - moment().milliseconds() + EXTRA_DELAY;
|
|
} else {
|
|
return (60 - reducedSeconds) * 1000 - moment().milliseconds() + EXTRA_DELAY;
|
|
}
|
|
};
|
|
|
|
// A recursive timeout function instead of interval to avoid drifting
|
|
const notificationTimer = () => {
|
|
this.updateDom();
|
|
|
|
if (this.config.sendNotifications) {
|
|
// If seconds is displayed CLOCK_SECOND-notification should be sent (but not when CLOCK_MINUTE-notification is sent)
|
|
if (this.config.displaySeconds) {
|
|
this.second = moment().second();
|
|
if (this.second !== 0) {
|
|
this.sendNotification("CLOCK_SECOND", this.second);
|
|
setTimeout(notificationTimer, delayCalculator(0));
|
|
return;
|
|
}
|
|
}
|
|
|
|
// If minute changed or seconds isn't displayed send CLOCK_MINUTE-notification
|
|
this.minute = moment().minute();
|
|
this.sendNotification("CLOCK_MINUTE", this.minute);
|
|
}
|
|
|
|
setTimeout(notificationTimer, delayCalculator(0));
|
|
};
|
|
|
|
// Set the initial timeout with the amount of seconds elapsed as
|
|
// reducedSeconds, so it will trigger when the minute changes
|
|
setTimeout(notificationTimer, delayCalculator(this.second));
|
|
|
|
// Set locale.
|
|
moment.locale(config.language);
|
|
},
|
|
// Override dom generator.
|
|
getDom () {
|
|
const wrapper = document.createElement("div");
|
|
wrapper.classList.add("clock-grid");
|
|
|
|
/************************************
|
|
* Create wrappers for analog and digital clock
|
|
*/
|
|
const analogWrapper = document.createElement("div");
|
|
analogWrapper.className = "clock-circle";
|
|
const digitalWrapper = document.createElement("div");
|
|
digitalWrapper.className = "digital";
|
|
|
|
/************************************
|
|
* Create wrappers for DIGITAL clock
|
|
*/
|
|
const dateWrapper = document.createElement("div");
|
|
const timeWrapper = document.createElement("div");
|
|
const secondsWrapper = document.createElement("sup");
|
|
const periodWrapper = document.createElement("span");
|
|
const sunWrapper = document.createElement("div");
|
|
const moonWrapper = document.createElement("div");
|
|
const weekWrapper = document.createElement("div");
|
|
|
|
// Style Wrappers
|
|
dateWrapper.className = "date normal medium";
|
|
timeWrapper.className = "time bright large light";
|
|
secondsWrapper.className = "seconds dimmed";
|
|
sunWrapper.className = "sun dimmed small";
|
|
moonWrapper.className = "moon dimmed small";
|
|
weekWrapper.className = "week dimmed medium";
|
|
|
|
// Set content of wrappers.
|
|
// The moment().format("h") method has a bug on the Raspberry Pi.
|
|
// So we need to generate the timestring manually.
|
|
// See issue: https://github.com/MagicMirrorOrg/MagicMirror/issues/181
|
|
let timeString;
|
|
const now = moment();
|
|
if (this.config.timezone) {
|
|
now.tz(this.config.timezone);
|
|
}
|
|
|
|
let hourSymbol = "HH";
|
|
if (this.config.timeFormat !== 24) {
|
|
hourSymbol = "h";
|
|
}
|
|
|
|
if (this.config.clockBold) {
|
|
timeString = now.format(`${hourSymbol}[<span class="bold">]mm[</span>]`);
|
|
} else {
|
|
timeString = now.format(`${hourSymbol}:mm`);
|
|
}
|
|
|
|
if (this.config.showDate) {
|
|
dateWrapper.innerHTML = now.format(this.config.dateFormat);
|
|
digitalWrapper.appendChild(dateWrapper);
|
|
}
|
|
|
|
if (this.config.displayType !== "analog" && this.config.showTime) {
|
|
timeWrapper.innerHTML = timeString;
|
|
secondsWrapper.innerHTML = now.format("ss");
|
|
if (this.config.showPeriodUpper) {
|
|
periodWrapper.innerHTML = now.format("A");
|
|
} else {
|
|
periodWrapper.innerHTML = now.format("a");
|
|
}
|
|
if (this.config.displaySeconds) {
|
|
timeWrapper.appendChild(secondsWrapper);
|
|
}
|
|
if (this.config.showPeriod && this.config.timeFormat !== 24) {
|
|
timeWrapper.appendChild(periodWrapper);
|
|
}
|
|
digitalWrapper.appendChild(timeWrapper);
|
|
}
|
|
|
|
/****************************************************************
|
|
* Create wrappers for Sun Times, only if specified in config
|
|
*/
|
|
if (this.config.showSunTimes) {
|
|
const sunTimes = SunCalc.getTimes(now, this.config.lat, this.config.lon);
|
|
const isVisible = now.isBetween(sunTimes.sunrise, sunTimes.sunset);
|
|
let nextEvent;
|
|
if (now.isBefore(sunTimes.sunrise)) {
|
|
nextEvent = sunTimes.sunrise;
|
|
} else if (now.isBefore(sunTimes.sunset)) {
|
|
nextEvent = sunTimes.sunset;
|
|
} else {
|
|
const tomorrowSunTimes = SunCalc.getTimes(now.clone().add(1, "day"), this.config.lat, this.config.lon);
|
|
nextEvent = tomorrowSunTimes.sunrise;
|
|
}
|
|
const untilNextEvent = moment.duration(moment(nextEvent).diff(now));
|
|
const untilNextEventString = `${untilNextEvent.hours()}h ${untilNextEvent.minutes()}m`;
|
|
sunWrapper.innerHTML
|
|
= `<span class="${isVisible ? "bright" : ""}"><i class="fas fa-sun" aria-hidden="true"></i> ${untilNextEventString}</span>`
|
|
+ `<span><i class="fas fa-arrow-up" aria-hidden="true"></i> ${formatTime(this.config, sunTimes.sunrise)}</span>`
|
|
+ `<span><i class="fas fa-arrow-down" aria-hidden="true"></i> ${formatTime(this.config, sunTimes.sunset)}</span>`;
|
|
digitalWrapper.appendChild(sunWrapper);
|
|
}
|
|
|
|
/****************************************************************
|
|
* Create wrappers for Moon Times, only if specified in config
|
|
*/
|
|
if (this.config.showMoonTimes) {
|
|
const moonIllumination = SunCalc.getMoonIllumination(now.toDate());
|
|
const moonTimes = SunCalc.getMoonTimes(now, this.config.lat, this.config.lon);
|
|
const moonRise = moonTimes.rise;
|
|
let moonSet;
|
|
if (moment(moonTimes.set).isAfter(moonTimes.rise)) {
|
|
moonSet = moonTimes.set;
|
|
} else {
|
|
const nextMoonTimes = SunCalc.getMoonTimes(now.clone().add(1, "day"), this.config.lat, this.config.lon);
|
|
moonSet = nextMoonTimes.set;
|
|
}
|
|
const isVisible = now.isBetween(moonRise, moonSet) || moonTimes.alwaysUp === true;
|
|
const showFraction = ["both", "percent"].includes(this.config.showMoonTimes);
|
|
const showUnicode = ["both", "phase"].includes(this.config.showMoonTimes);
|
|
const illuminatedFractionString = `${Math.round(moonIllumination.fraction * 100)}%`;
|
|
const image = showUnicode ? [..."🌑🌒🌓🌔🌕🌖🌗🌘"][Math.floor(moonIllumination.phase * 8)] : "<i class=\"fas fa-moon\" aria-hidden=\"true\"></i>";
|
|
|
|
moonWrapper.innerHTML
|
|
= `<span class="${isVisible ? "bright" : ""}">${image} ${showFraction ? illuminatedFractionString : ""}</span>`
|
|
+ `<span><i class="fas fa-arrow-up" aria-hidden="true"></i> ${moonRise ? formatTime(this.config, moonRise) : "..."}</span>`
|
|
+ `<span><i class="fas fa-arrow-down" aria-hidden="true"></i> ${moonSet ? formatTime(this.config, moonSet) : "..."}</span>`;
|
|
digitalWrapper.appendChild(moonWrapper);
|
|
}
|
|
|
|
if (this.config.showWeek) {
|
|
weekWrapper.innerHTML = this.translate("WEEK", { weekNumber: now.week() });
|
|
digitalWrapper.appendChild(weekWrapper);
|
|
}
|
|
|
|
/****************************************************************
|
|
* Create wrappers for ANALOG clock, only if specified in config
|
|
*/
|
|
if (this.config.displayType !== "digital") {
|
|
// If it isn't 'digital', then an 'analog' clock was also requested
|
|
|
|
// Calculate the degree offset for each hand of the clock
|
|
if (this.config.timezone) {
|
|
now.tz(this.config.timezone);
|
|
}
|
|
const second = now.seconds() * 6,
|
|
minute = now.minute() * 6 + second / 60,
|
|
hour = ((now.hours() % 12) / 12) * 360 + 90 + minute / 12;
|
|
|
|
// Create wrappers
|
|
analogWrapper.style.width = this.config.analogSize;
|
|
analogWrapper.style.height = this.config.analogSize;
|
|
|
|
if (this.config.analogFace !== "" && this.config.analogFace !== "simple" && this.config.analogFace !== "none") {
|
|
analogWrapper.style.background = `url(${this.data.path}faces/${this.config.analogFace}.svg)`;
|
|
analogWrapper.style.backgroundSize = "100%";
|
|
|
|
// The following line solves issue: https://github.com/MagicMirrorOrg/MagicMirror/issues/611
|
|
// analogWrapper.style.border = "1px solid black";
|
|
analogWrapper.style.border = "rgba(0, 0, 0, 0.1)"; //Updated fix for Issue 611 where non-black backgrounds are used
|
|
} else if (this.config.analogFace !== "none") {
|
|
analogWrapper.style.border = "2px solid white";
|
|
}
|
|
const clockFace = document.createElement("div");
|
|
clockFace.className = "clock-face";
|
|
|
|
const clockHour = document.createElement("div");
|
|
clockHour.id = "clock-hour";
|
|
clockHour.style.transform = `rotate(${hour}deg)`;
|
|
clockHour.className = "clock-hour";
|
|
const clockMinute = document.createElement("div");
|
|
clockMinute.id = "clock-minute";
|
|
clockMinute.style.transform = `rotate(${minute}deg)`;
|
|
clockMinute.className = "clock-minute";
|
|
|
|
// Combine analog wrappers
|
|
clockFace.appendChild(clockHour);
|
|
clockFace.appendChild(clockMinute);
|
|
|
|
if (this.config.displaySeconds) {
|
|
const clockSecond = document.createElement("div");
|
|
clockSecond.id = "clock-second";
|
|
clockSecond.style.transform = `rotate(${second}deg)`;
|
|
clockSecond.className = "clock-second";
|
|
clockSecond.style.backgroundColor = this.config.secondsColor;
|
|
clockFace.appendChild(clockSecond);
|
|
}
|
|
analogWrapper.appendChild(clockFace);
|
|
}
|
|
|
|
/*******************************************
|
|
* Update placement, respect old analogShowDate even if it's not needed anymore
|
|
*/
|
|
if (this.config.displayType === "analog") {
|
|
// Display only an analog clock
|
|
if (this.config.showDate) {
|
|
// Add date to the analog clock
|
|
dateWrapper.innerHTML = now.format(this.config.dateFormat);
|
|
wrapper.appendChild(dateWrapper);
|
|
}
|
|
if (this.config.analogShowDate === "bottom") {
|
|
wrapper.classList.add("clock-grid-bottom");
|
|
} else if (this.config.analogShowDate === "top") {
|
|
wrapper.classList.add("clock-grid-top");
|
|
}
|
|
wrapper.appendChild(analogWrapper);
|
|
} else if (this.config.displayType === "digital") {
|
|
wrapper.appendChild(digitalWrapper);
|
|
} else if (this.config.displayType === "both") {
|
|
wrapper.classList.add(`clock-grid-${this.config.analogPlacement}`);
|
|
wrapper.appendChild(analogWrapper);
|
|
wrapper.appendChild(digitalWrapper);
|
|
}
|
|
|
|
// Return the wrapper to the dom.
|
|
return wrapper;
|
|
}
|
|
});
|