6.3.2

.vscode/settings.json

@@ -2,7 +2,7 @@
 	"liveSassCompile.settings.formats": [
 		{
 			"format": "compressed",
-			"extensionName": ".css",
+			"extensionName": ".min.css",
 			"savePath": "/server/styles",
 		}
 	],
@@ -17,4 +17,4 @@
 	"editor.codeActionsOnSave": {
 		"source.fixAll.eslint": "explicit"
 	},
-}
+}

README.md

@@ -200,7 +200,9 @@ https://weatherstar.netbymatt.com/?settings-units-select=metric
 ```
 
 ### Kiosk mode
-Kiosk mode can be activated by a checkbox on the page. Note that there is no way out of kiosk mode (except refresh or closing the browser), and the play/pause and other controls will not be available. This is deliberate as a browser's kiosk mode it intended not to be exited or significantly modified. A separate full-screen icon is available in the tool bar to go full-screen on a laptop or mobile browser.
+Kiosk mode can be activated by a checkbox on the page. This will start Weatherstar in a fullscreen-like view without the play/volume/etc toolbar and scaled to fill the entire space. This does not activate the browser's fullscreen or kiosk mode. Those can only be activated by user interaction or by launching the browser with specific parameters such as `--start-fullscreen` or `--kiosk`. 
+
+ When using kiosk mode (via the checkbox), there will be no way to exit the fullscreen-like view of weatherstar. Reloading the page should remove the kiosk checkbox and return you to the normal view. This is deliberate as a browser's kiosk mode it intended not to be exited or significantly modified. A separate full-screen icon is available in the tool bar to go full-screen on a laptop or mobile browser.
 
 It's also possible to enter kiosk mode using a permalink. First generate a [Permalink](#sharing-a-permalink-bookmarking), then to the end of it add `&kiosk=true`. Opening this link will load all of the selected displays included in the Permalink, enter kiosk mode immediately upon loading and start playing the forecast.
 

gulp/publish-frontend.mjs

@@ -1,4 +1,4 @@
-import { config } from 'dotenv';
+import 'dotenv/config';
 import {
 	src, dest, series, parallel,
 } from 'gulp';
@@ -15,14 +15,15 @@ import { readFile } from 'fs/promises';
 import file from 'gulp-file';
 import { CloudFrontClient, CreateInvalidationCommand } from '@aws-sdk/client-cloudfront';
 import log from 'fancy-log';
+import dartSass from 'sass';
+import gulpSass from 'gulp-sass';
+import sourceMaps from 'gulp-sourcemaps';
 import OVERRIDES from '../src/overrides.mjs';
 
 // get cloudfront
 import reader from '../src/playlist-reader.mjs';
 
-config({
-	path: ['gulp/.env', '.env'],
-});
+const sass = gulpSass(dartSass);
 
 const clean = () => deleteAsync(['./dist/**/*', '!./dist/readme.txt']);
 
@@ -40,6 +41,7 @@ const webpackOptions = {
 	resolve: {
 		roots: ['./'],
 	},
+	devtool: 'source-map',
 	optimization: {
 		minimize: true,
 		minimizer: [
@@ -88,19 +90,18 @@ const mjsSources = [
 	'server/scripts/index.mjs',
 ];
 
-if (!process.env.DISABLE_PERSONAL) {
-	mjsSources.push('server/scripts/modules/personal-weather.mjs');
-}
-
 const buildJs = () => src(mjsSources)
 	.pipe(webpack(webpackOptions))
 	.pipe(dest(RESOURCES_PATH));
 
 const cssSources = [
-	'server/styles/main.css',
+	'server/styles/scss/**/*.scss',
 ];
-const copyCss = () => src(cssSources)
-	.pipe(concat('ws.min.css'))
+const buildCss = () => src(cssSources)
+	.pipe(sourceMaps.init())
+	.pipe(sass({ style: 'compressed' }).on('error', sass.logError))
+	.pipe(rename({ suffix: '.min' }))
+	.pipe(sourceMaps.write('./'))
 	.pipe(dest(RESOURCES_PATH));
 
 const htmlSources = [
@@ -122,7 +123,6 @@ const compressHtml = async () => src(htmlSources)
 		version,
 		OVERRIDES,
 		query: {},
-		DISABLE_PERSONAL: process.env.DISABLE_PERSONAL === '1',
 	}))
 	.pipe(rename({ extname: '.html' }))
 	.pipe(htmlmin({ collapseWhitespace: true }))
@@ -150,7 +150,6 @@ const s3 = s3Upload({
 });
 const uploadSources = [
 	'dist/**',
-	'!dist/**/*.map',
 	'!dist/images/**/*',
 	'!dist/fonts/**/*',
 ];
@@ -218,7 +217,7 @@ const logVersion = async () => {
 	log(`Version Published: ${version}`);
 };
 
-const buildDist = series(clean, parallel(buildJs, compressJsVendor, copyCss, compressHtml, copyOtherFiles, copyDataFiles, copyImageSources, buildPlaylist));
+const buildDist = series(clean, parallel(buildJs, compressJsVendor, buildCss, compressHtml, copyOtherFiles, copyDataFiles, copyImageSources, buildPlaylist));
 
 // upload_images could be in parallel with upload, but _images logs a lot and has little changes
 // by running upload last the majority of the changes will be at the bottom of the log for easy viewing

index.mjs

@@ -9,7 +9,6 @@ import playlist from './src/playlist.mjs';
 import OVERRIDES from './src/overrides.mjs';
 import cache from './proxy/cache.mjs';
 import devTools from './src/com.chrome.devtools.mjs';
-import ambientRelay from "./src/personal-weather.mjs";
 
 const travelCities = JSON.parse(await readFile('./datagenerators/output/travelcities.json'));
 const regionalCities = JSON.parse(await readFile('./datagenerators/output/regionalcities.json'));
@@ -60,7 +59,6 @@ const renderIndex = (req, res, production = false) => {
 		version,
 		OVERRIDES,
 		query: req.query,
-		DISABLE_PERSONAL: process.env.DISABLE_PERSONAL === '1'
 	});
 };
 
@@ -172,7 +170,6 @@ if (process.env?.DIST === '1') {
 	app.use('/resources', express.static('./server/scripts/modules'));
 	app.get('/', index);
 	app.get('/.well-known/appspecific/com.chrome.devtools.json', devTools);
-	app.get('/ambient-relay/api/latest', ambientRelay);
 	app.get('*name', express.static('./server', staticOptions));
 }
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ws4kp",
-	"version": "6.3.1",
+	"version": "6.3.2",
 	"description": "Welcome to the WeatherStar 4000+ project page!",
 	"main": "index.mjs",
 	"type": "module",
@@ -44,6 +44,7 @@
 		"gulp-rename": "^2.0.0",
 		"gulp-s3-uploader": "^1.0.6",
 		"gulp-sass": "^6.0.0",
+		"gulp-sourcemaps": "^3.0.0",
 		"gulp-terser": "^2.0.0",
 		"luxon": "^3.0.0",
 		"metar-taf-parser": "^9.0.0",

server/scripts/modules/almanac.mjs

@@ -205,7 +205,7 @@ const formatTimesForColumn = (times) => {
 };
 
 // register display
-const display = new Almanac(10, 'almanac');
+const display = new Almanac(9, 'almanac');
 registerDisplay(display);
 
 export default display.getSun.bind(display);

server/scripts/modules/extendedforecast.mjs

@@ -209,4 +209,4 @@ const shortenExtendedForecastText = (long) => {
 };
 
 // register display
-registerDisplay(new ExtendedForecast(9, 'extended-forecast'));
+registerDisplay(new ExtendedForecast(8, 'extended-forecast'));

server/scripts/modules/hourly-graph.mjs

@@ -148,4 +148,4 @@ const drawPath = (path, ctx, options) => {
 const formatTime = (time) => time.setZone(timeZone()).toFormat('ha').slice(0, -1);
 
 // register display
-registerDisplay(new HourlyGraph(5, 'hourly-graph'));
+registerDisplay(new HourlyGraph(4, 'hourly-graph'));

server/scripts/modules/hourly.mjs

@@ -255,7 +255,7 @@ const expand = (data, maxHours = 24) => {
 };
 
 // register display
-const display = new Hourly(4, 'hourly', false);
+const display = new Hourly(3, 'hourly', false);
 registerDisplay(display);
 
 export default display.getHourlyData.bind(display);

server/scripts/modules/latestobservations.mjs

@@ -205,4 +205,4 @@ const shortenCurrentConditions = (_condition) => {
 	return condition;
 };
 // register display
-registerDisplay(new LatestObservations(3, 'latest-observations'));
+registerDisplay(new LatestObservations(2, 'latest-observations'));

server/scripts/modules/localforecast.mjs

@@ -262,4 +262,4 @@ const parse = (forecast, forecastUrl) => {
 	}));
 };
 // register display
-registerDisplay(new LocalForecast(8, 'local-forecast'));
+registerDisplay(new LocalForecast(7, 'local-forecast'));

server/scripts/modules/personal-weather.mjs

@@ -1,114 +0,0 @@
-// current weather conditions display
-import STATUS from './status.mjs';
-import { safeJson } from './utils/fetch.mjs';
-import WeatherDisplay from './weatherdisplay.mjs';
-import { registerDisplay } from './navigation.mjs';
-import {
-	temperature, pressure, distanceMm, windSpeed,
-} from './utils/units.mjs';
-import { DateTime } from '../vendor/auto/luxon.mjs';
-
-class PersonalWeather extends WeatherDisplay {
-	constructor(navId, elemId) {
-		super(navId, elemId, 'Personal Weather Station', true);
-	}
-
-	async getData(weatherParameters, refresh) {
-		// always load the data for use in the lower scroll
-		const superResult = super.getData(weatherParameters, refresh);
-
-		const dataUrl = '/ambient-relay/api/latest';
-
-		let personalData;
-		try {
-			personalData = await safeJson(dataUrl, {
-				retryCount: 3,
-				stillWaiting: () => this.stillWaiting(),
-			});
-		} catch (error) {
-			console.error(`Unexpected error getting personal weather station data from: ${dataUrl}: ${error.message}`);
-		}
-		// test for data received
-		if (!personalData) {
-			if (this.isEnabled) this.setStatus(STATUS.failed);
-			// send failed to subscribers
-			this.getDataCallback(undefined);
-			return;
-		}
-
-		// we only get here if there was no error above
-		this.data = parseData(personalData);
-		this.getDataCallback();
-
-		// stop here if we're disabled
-		if (!superResult) return;
-
-		// Data is available, ensure we're enabled for display
-		this.timing.totalScreens = 1;
-		this.setStatus(STATUS.loaded);
-	}
-
-	async drawCanvas() {
-		super.drawCanvas();
-
-		const fill = {
-			temp: this.data.Temperature + String.fromCharCode(176),
-			wind: `${this.data.WindSpeed} ${this.data.WindUnit}`,
-			deviceName: this.data.device_name,
-			deviceLocation: this.data.device_location,
-			humidity: `${this.data.Humidity}%`,
-			pressure: `${this.data.Pressure} ${this.data.PressureUnit}`,
-			dailyRain: `${this.data.DailyRain} ${this.data.DailyRainUnit}`,
-			timestamp: `At ${this.data.timestamp}`,
-		};
-
-		const area = this.elem.querySelector('.main');
-
-		area.innerHTML = '';
-		area.append(this.fillTemplate('weather', fill));
-
-		this.finishDraw();
-	}
-
-	// make data available outside this class
-	// promise allows for data to be requested before it is available
-	async getCurrentWeather(stillWaiting) {
-		// an external caller has requested data, set up auto reload
-		this.setAutoReload();
-		if (stillWaiting) this.stillWaitingCallbacks.push(stillWaiting);
-		return new Promise((resolve) => {
-			if (this.data) resolve(this.data);
-			// data not available, put it into the data callback queue
-			this.getDataCallbacks.push(() => resolve(this.data));
-		});
-	}
-}
-
-// format the received data
-const parseData = (data) => {
-	// get the unit converters
-	const temperatureConverter = temperature('us');
-	const pressureConverter = pressure('us');
-	const inConverter = distanceMm('us');
-	const windConverter = windSpeed('us');
-
-	data.Pressure = pressureConverter(data.baromrelin * 10000) / 100;
-	data.PressureUnit = pressureConverter.units;
-	data.Humidity = data.humidity;
-	data.Temperature = temperatureConverter(data.tempf);
-	data.WindSpeed = windConverter(data.windspeedmph);
-	data.WindUnit = windConverter.units;
-	data.DailyRain = inConverter(data.dailyrainin);
-	data.DailyRainUnit = inConverter.units;
-	data.timestamp = DateTime.fromISO(data.date).toFormat('H:mm:ss a EEE MMM d').toUpperCase();
-
-	// set wind speed of 0 as calm
-	if (data.WindSpeed === 0) data.WindSpeed = 'Calm';
-
-	return data;
-};
-
-const display = new PersonalWeather(2, 'personal-weather');
-registerDisplay(display);
-
-// export default display.getPersonalWeather.bind(display);

server/scripts/modules/radar.mjs

@@ -231,4 +231,4 @@ class Radar extends WeatherDisplay {
 }
 
 // register display
-registerDisplay(new Radar(12, 'radar'));
+registerDisplay(new Radar(11, 'radar'));

server/scripts/modules/regionalforecast.mjs

@@ -235,4 +235,4 @@ const getAndFormatPoint = async (lat, lon) => {
 };
 
 // register display
-registerDisplay(new RegionalForecast(7, 'regional-forecast'));
+registerDisplay(new RegionalForecast(6, 'regional-forecast'));

server/scripts/modules/spc-outlook.mjs

@@ -146,4 +146,4 @@ class SpcOutlook extends WeatherDisplay {
 }
 
 // register display
-registerDisplay(new SpcOutlook(11, 'spc-outlook'));
+registerDisplay(new SpcOutlook(10, 'spc-outlook'));

server/scripts/modules/travelforecast.mjs

@@ -222,4 +222,4 @@ const getTravelCitiesDayName = (cities) => cities.reduce((dayName, city) => {
 }, '');
 
 // register display, not active by default
-registerDisplay(new TravelForecast(6, 'travel', false));
+registerDisplay(new TravelForecast(5, 'travel', false));

server/scripts/modules/utils/units.mjs

@@ -13,7 +13,6 @@ const fahrenheitToCelsius = (Fahrenheit) => Math.round((Fahrenheit - 32) * 5 / 9
 const kilometersToMiles = (Kilometers) => Math.round(Kilometers / 1.609_34);
 const metersToFeet = (Meters) => Math.round(Meters / 0.3048);
 const pascalToInHg = (Pascal) => round2(Pascal * 0.000_295_3, 2);
-const mmToIn = (mm) => round2(mm / 25.4);
 
 // each module/page/slide creates it's own unit converter as needed by providing the base units available
 // the factory function then returns an appropriate converter or pass-thru function for use on the page
@@ -99,23 +98,6 @@ const distanceKilometers = (defaultUnit = 'si') => {
 	return converter;
 };
 
-// millimeters (annoying with camel case)
-const distanceMm = (defaultUnit = 'si') => {
-	// default to passthru
-	let converter = passthru();
-	// change the converter if there is a mismatch
-	if (defaultUnit !== settings.units.value) {
-		converter = convert((value) => Math.round(mmToIn(value)));
-	}
-	// append units
-	if (settings.units.value === 'si') {
-		converter.units = ' mm.';
-	} else {
-		converter.units = ' in.';
-	}
-	return converter;
-};
-
 const pressure = (defaultUnit = 'si') => {
 	// default to passthru (millibar)
 	let converter = passthru(100);
@@ -139,7 +121,6 @@ export {
 	distanceMeters,
 	distanceKilometers,
 	pressure,
-	distanceMm,
 
 	// formatter
 	round2,

server/styles/scss/_current-weather.scss

@@ -1,7 +1,6 @@
-@use 'shared/_colors'as c;
-@use 'shared/_utils'as u;
+@use 'shared/_colors' as c;
+@use 'shared/_utils' as u;
 
-// also shared with personal weather
 .weather-display .main.current-weather {
 	&.main {
 
@@ -93,4 +92,4 @@
 			text-wrap: nowrap;
 		}
 	}
-}
+}

server/styles/scss/_personal-weather.scss

@@ -1,68 +0,0 @@
-@use 'shared/_colors'as c;
-@use 'shared/_utils'as u;
-
-// also shared with personal weather
-.weather-display .main.personal-weather {
-	&.main {
-
-		@include u.text-shadow();
-
-		font-family: "Star4000 Large";
-		font-size: 20px;
-		font-weight: bold;
-		line-height: 24px;
-		top: 20px;
-		height: 290px;
-
-		.row {
-			margin-bottom: 12px;
-
-			.label,
-			.value {
-				display: inline-block;
-			}
-
-			.label {
-				margin-left: 20px;
-			}
-
-			.value {
-				float: right;
-				margin-right: 10px;
-			}
-
-		}
-
-		.center {
-			text-align: center;
-		}
-
-		.temp {
-			font-family: 'Star4000 Large';
-			font-size: 24pt;
-			position: absolute;
-			top: 20px;
-			right: 0px;
-		}
-
-		.deviceName,
-		.deviceLocation {
-			color: c.$title-color;
-			max-height: 32px;
-			margin-bottom: 10px;
-			padding-top: 4px;
-			overflow: hidden;
-			text-wrap: nowrap;
-		}
-
-		.timestamp {
-			position: absolute;
-			bottom: 15px;
-			right: 10px;
-			text-align: right;
-			font-family: "Star4000 Small";
-			font-size: 24pt;
-			font-weight: normal;
-		}
-	}
-}

server/styles/scss/ws.scss

@@ -1,7 +1,6 @@
 @use 'page';
 @use 'weather-display';
 @use 'current-weather';
-@use 'personal-weather';
 @use 'extended-forecast';
 @use 'hourly';
 @use 'hourly-graph';

src/personal-weather.mjs

@@ -1,20 +0,0 @@
-// testing data for use with personal weather stations via
-// ambient-relay https://github.com/jasonkonen/ambient-relay
-const ambientRelay = (req, res) => {
-	res.json({
-		"id": 123,
-		"mac_address": "00:00:00:00:00:00",
-		"device_name": "My Weather Station",
-		"device_location": "Backyard",
-		"dateutc": 1515436500000,
-		"date": "2018-01-08T18:35:00.000Z",
-		"tempf": 66.9,
-		"humidity": 30,
-		"windspeedmph": 0.9,
-		"baromrelin": 30.05,
-		"dailyrainin": 0,
-		"raw_data": {}
-	})
-}
-
-export default ambientRelay;

tests/package-lock.json

@@ -28,26 +28,26 @@
 			}
 		},
 		"node_modules/@babel/helper-validator-identifier": {
-			"version": "7.27.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
-			"integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
+			"version": "7.28.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+			"integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@puppeteer/browsers": {
-			"version": "2.10.5",
-			"resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.10.5.tgz",
-			"integrity": "sha512-eifa0o+i8dERnngJwKrfp3dEq7ia5XFyoqB17S4gK8GhsQE4/P8nxOfQSE0zQHxzzLo/cmF+7+ywEQ7wK7Fb+w==",
+			"version": "2.10.13",
+			"resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.10.13.tgz",
+			"integrity": "sha512-a9Ruw3j3qlnB5a/zHRTkruppynxqaeE4H9WNj5eYGRWqw0ZauZ23f4W2ARf3hghF5doozyD+CRtt7XSYuYRI/Q==",
 			"license": "Apache-2.0",
 			"dependencies": {
-				"debug": "^4.4.1",
+				"debug": "^4.4.3",
 				"extract-zip": "^2.0.1",
 				"progress": "^2.0.3",
 				"proxy-agent": "^6.5.0",
-				"semver": "^7.7.2",
-				"tar-fs": "^3.0.8",
+				"semver": "^7.7.3",
+				"tar-fs": "^3.1.1",
 				"yargs": "^17.7.2"
 			},
 			"bin": {
@@ -64,13 +64,13 @@
 			"license": "MIT"
 		},
 		"node_modules/@types/node": {
-			"version": "22.15.29",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.29.tgz",
-			"integrity": "sha512-LNdjOkUDlU1RZb8e1kOIUpN1qQUlzGkEtbVNo53vbrwDg5om6oduhm4SiUaPW5ASTXhAiP0jInWG8Qx9fVlOeQ==",
+			"version": "24.10.1",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
+			"integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
 			"license": "MIT",
 			"optional": true,
 			"dependencies": {
-				"undici-types": "~6.21.0"
+				"undici-types": "~7.16.0"
 			}
 		},
 		"node_modules/@types/yauzl": {
@@ -84,9 +84,9 @@
 			}
 		},
 		"node_modules/agent-base": {
-			"version": "7.1.3",
-			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-			"integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+			"version": "7.1.4",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+			"integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
 			"license": "MIT",
 			"engines": {
 				"node": ">= 14"
@@ -135,28 +135,45 @@
 			}
 		},
 		"node_modules/b4a": {
-			"version": "1.6.7",
-			"resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz",
-			"integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==",
-			"license": "Apache-2.0"
+			"version": "1.7.3",
+			"resolved": "https://registry.npmjs.org/b4a/-/b4a-1.7.3.tgz",
+			"integrity": "sha512-5Q2mfq2WfGuFp3uS//0s6baOJLMoVduPYVeNmDYxu5OUA1/cBfvr2RIS7vi62LdNj/urk1hfmj867I3qt6uZ7Q==",
+			"license": "Apache-2.0",
+			"peerDependencies": {
+				"react-native-b4a": "*"
+			},
+			"peerDependenciesMeta": {
+				"react-native-b4a": {
+					"optional": true
+				}
+			}
 		},
 		"node_modules/bare-events": {
-			"version": "2.5.4",
-			"resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.4.tgz",
-			"integrity": "sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==",
+			"version": "2.8.2",
+			"resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz",
+			"integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==",
 			"license": "Apache-2.0",
-			"optional": true
+			"peerDependencies": {
+				"bare-abort-controller": "*"
+			},
+			"peerDependenciesMeta": {
+				"bare-abort-controller": {
+					"optional": true
+				}
+			}
 		},
 		"node_modules/bare-fs": {
-			"version": "4.1.5",
-			"resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.5.tgz",
-			"integrity": "sha512-1zccWBMypln0jEE05LzZt+V/8y8AQsQQqxtklqaIyg5nu6OAYFhZxPXinJTSG+kU5qyNmeLgcn9AW7eHiCHVLA==",
+			"version": "4.5.1",
+			"resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.5.1.tgz",
+			"integrity": "sha512-zGUCsm3yv/ePt2PHNbVxjjn0nNB1MkIaR4wOCxJ2ig5pCf5cCVAYJXVhQg/3OhhJV6DB1ts7Hv0oUaElc2TPQg==",
 			"license": "Apache-2.0",
 			"optional": true,
 			"dependencies": {
 				"bare-events": "^2.5.4",
 				"bare-path": "^3.0.0",
-				"bare-stream": "^2.6.4"
+				"bare-stream": "^2.6.4",
+				"bare-url": "^2.2.2",
+				"fast-fifo": "^1.3.2"
 			},
 			"engines": {
 				"bare": ">=1.16.0"
@@ -171,9 +188,9 @@
 			}
 		},
 		"node_modules/bare-os": {
-			"version": "3.6.1",
-			"resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.1.tgz",
-			"integrity": "sha512-uaIjxokhFidJP+bmmvKSgiMzj2sV5GPHaZVAIktcxcpCyBFFWO+YlikVAdhmUo2vYFvFhOXIAlldqV29L8126g==",
+			"version": "3.6.2",
+			"resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.2.tgz",
+			"integrity": "sha512-T+V1+1srU2qYNBmJCXZkUY5vQ0B4FSlL3QDROnKQYOqeiQR8UbjNHlPa+TIbM4cuidiN9GaTaOZgSEgsvPbh5A==",
 			"license": "Apache-2.0",
 			"optional": true,
 			"engines": {
@@ -191,9 +208,9 @@
 			}
 		},
 		"node_modules/bare-stream": {
-			"version": "2.6.5",
-			"resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.6.5.tgz",
-			"integrity": "sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA==",
+			"version": "2.7.0",
+			"resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.7.0.tgz",
+			"integrity": "sha512-oyXQNicV1y8nc2aKffH+BUHFRXmx6VrPzlnaEvMhram0nPBrKcEdcyBg5r08D0i8VxngHFAiVyn1QKXpSG0B8A==",
 			"license": "Apache-2.0",
 			"optional": true,
 			"dependencies": {
@@ -212,6 +229,16 @@
 				}
 			}
 		},
+		"node_modules/bare-url": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.3.2.tgz",
+			"integrity": "sha512-ZMq4gd9ngV5aTMa5p9+UfY0b3skwhHELaDkhEHetMdX0LRkW9kzaym4oo/Eh+Ghm0CCDuMTsRIGM/ytUc1ZYmw==",
+			"license": "Apache-2.0",
+			"optional": true,
+			"dependencies": {
+				"bare-path": "^3.0.0"
+			}
+		},
 		"node_modules/basic-ftp": {
 			"version": "5.0.5",
 			"resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
@@ -240,9 +267,9 @@
 			}
 		},
 		"node_modules/chalk": {
-			"version": "5.4.1",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
-			"integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==",
+			"version": "5.6.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
+			"integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
 			"license": "MIT",
 			"engines": {
 				"node": "^12.17.0 || ^14.13 || >=16.0.0"
@@ -252,9 +279,9 @@
 			}
 		},
 		"node_modules/chromium-bidi": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-5.1.0.tgz",
-			"integrity": "sha512-9MSRhWRVoRPDG0TgzkHrshFSJJNZzfY5UFqUMuksg7zL1yoZIZ3jLB0YAgHclbiAxPI86pBnwDX1tbzoiV8aFw==",
+			"version": "11.0.0",
+			"resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-11.0.0.tgz",
+			"integrity": "sha512-cM3DI+OOb89T3wO8cpPSro80Q9eKYJ7hGVXoGS3GkDPxnYSqiv+6xwpIf6XERyJ9Tdsl09hmNmY94BkgZdVekw==",
 			"license": "Apache-2.0",
 			"dependencies": {
 				"mitt": "^3.0.1",
@@ -332,9 +359,9 @@
 			}
 		},
 		"node_modules/debug": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-			"integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+			"version": "4.4.3",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+			"integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
 			"license": "MIT",
 			"dependencies": {
 				"ms": "^2.1.3"
@@ -363,10 +390,11 @@
 			}
 		},
 		"node_modules/devtools-protocol": {
-			"version": "0.0.1452169",
-			"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1452169.tgz",
-			"integrity": "sha512-FOFDVMGrAUNp0dDKsAU1TorWJUx2JOU1k9xdgBKKJF3IBh/Uhl2yswG5r3TEAOrCiGY2QRp1e6LVDQrCsTKO4g==",
-			"license": "BSD-3-Clause"
+			"version": "0.0.1521046",
+			"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1521046.tgz",
+			"integrity": "sha512-vhE6eymDQSKWUXwwA37NtTTVEzjtGVfDr3pRbsWEQ5onH/Snp2c+2xZHWJJawG/0hCCJLRGt4xVtEVUVILol4w==",
+			"license": "BSD-3-Clause",
+			"peer": true
 		},
 		"node_modules/emoji-regex": {
 			"version": "8.0.0",
@@ -375,9 +403,9 @@
 			"license": "MIT"
 		},
 		"node_modules/end-of-stream": {
-			"version": "1.4.4",
-			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+			"version": "1.4.5",
+			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
+			"integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
 			"license": "MIT",
 			"dependencies": {
 				"once": "^1.4.0"
@@ -393,9 +421,9 @@
 			}
 		},
 		"node_modules/error-ex": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+			"version": "1.3.4",
+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz",
+			"integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==",
 			"license": "MIT",
 			"dependencies": {
 				"is-arrayish": "^0.2.1"
@@ -462,6 +490,15 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/events-universal": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.1.tgz",
+			"integrity": "sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"bare-events": "^2.7.0"
+			}
+		},
 		"node_modules/extract-zip": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
@@ -522,9 +559,9 @@
 			}
 		},
 		"node_modules/get-uri": {
-			"version": "6.0.4",
-			"resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.4.tgz",
-			"integrity": "sha512-E1b1lFFLvLgak2whF2xDBcOy6NLVGZBqqjJjsIhvopKfWWEi64pLVTWWehV8KlLerZkfNTA95sTe2OdJKm1OzQ==",
+			"version": "6.0.5",
+			"resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.5.tgz",
+			"integrity": "sha512-b1O07XYq8eRuVzBNgJLstU6FYc1tS6wnMtF1I1D9lE8LxZSOGZ7LhxN54yPP6mGw5f2CkXY2BQUL9Fx41qvcIg==",
 			"license": "MIT",
 			"dependencies": {
 				"basic-ftp": "^5.0.2",
@@ -578,14 +615,10 @@
 			}
 		},
 		"node_modules/ip-address": {
-			"version": "9.0.5",
-			"resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
-			"integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+			"version": "10.1.0",
+			"resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz",
+			"integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==",
 			"license": "MIT",
-			"dependencies": {
-				"jsbn": "1.1.0",
-				"sprintf-js": "^1.1.3"
-			},
 			"engines": {
 				"node": ">= 12"
 			}
@@ -612,9 +645,9 @@
 			"license": "MIT"
 		},
 		"node_modules/js-yaml": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+			"integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
 			"license": "MIT",
 			"dependencies": {
 				"argparse": "^2.0.1"
@@ -623,12 +656,6 @@
 				"js-yaml": "bin/js-yaml.js"
 			}
 		},
-		"node_modules/jsbn": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
-			"integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
-			"license": "MIT"
-		},
 		"node_modules/json-parse-even-better-errors": {
 			"version": "2.3.1",
 			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -789,9 +816,9 @@
 			"license": "MIT"
 		},
 		"node_modules/pump": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
-			"integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz",
+			"integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==",
 			"license": "MIT",
 			"dependencies": {
 				"end-of-stream": "^1.1.0",
@@ -799,17 +826,17 @@
 			}
 		},
 		"node_modules/puppeteer": {
-			"version": "24.10.0",
-			"resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-24.10.0.tgz",
-			"integrity": "sha512-Oua9VkGpj0S2psYu5e6mCer6W9AU9POEQh22wRgSXnLXASGH+MwLUVWgLCLeP9QPHHcJ7tySUlg4Sa9OJmaLpw==",
+			"version": "24.31.0",
+			"resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-24.31.0.tgz",
+			"integrity": "sha512-q8y5yLxLD8xdZdzNWqdOL43NbfvUOp60SYhaLZQwHC9CdKldxQKXOyJAciOr7oUJfyAH/KgB2wKvqT2sFKoVXA==",
 			"hasInstallScript": true,
 			"license": "Apache-2.0",
 			"dependencies": {
-				"@puppeteer/browsers": "2.10.5",
-				"chromium-bidi": "5.1.0",
+				"@puppeteer/browsers": "2.10.13",
+				"chromium-bidi": "11.0.0",
 				"cosmiconfig": "^9.0.0",
-				"devtools-protocol": "0.0.1452169",
-				"puppeteer-core": "24.10.0",
+				"devtools-protocol": "0.0.1521046",
+				"puppeteer-core": "24.31.0",
 				"typed-query-selector": "^2.12.0"
 			},
 			"bin": {
@@ -820,17 +847,18 @@
 			}
 		},
 		"node_modules/puppeteer-core": {
-			"version": "24.10.0",
-			"resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-24.10.0.tgz",
-			"integrity": "sha512-xX0QJRc8t19iAwRDsAOR38Q/Zx/W6WVzJCEhKCAwp2XMsaWqfNtQ+rBfQW9PlF+Op24d7c8Zlgq9YNmbnA7hdQ==",
+			"version": "24.31.0",
+			"resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-24.31.0.tgz",
+			"integrity": "sha512-pnAohhSZipWQoFpXuGV7xCZfaGhqcBR9C4pVrU0QSrcMi7tQMH9J9lDBqBvyMAHQqe8HCARuREqFuVKRQOgTvg==",
 			"license": "Apache-2.0",
 			"dependencies": {
-				"@puppeteer/browsers": "2.10.5",
-				"chromium-bidi": "5.1.0",
-				"debug": "^4.4.1",
-				"devtools-protocol": "0.0.1452169",
+				"@puppeteer/browsers": "2.10.13",
+				"chromium-bidi": "11.0.0",
+				"debug": "^4.4.3",
+				"devtools-protocol": "0.0.1521046",
 				"typed-query-selector": "^2.12.0",
-				"ws": "^8.18.2"
+				"webdriver-bidi-protocol": "0.3.9",
+				"ws": "^8.18.3"
 			},
 			"engines": {
 				"node": ">=18"
@@ -855,9 +883,9 @@
 			}
 		},
 		"node_modules/semver": {
-			"version": "7.7.2",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-			"integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+			"version": "7.7.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+			"integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
 			"license": "ISC",
 			"bin": {
 				"semver": "bin/semver.js"
@@ -877,12 +905,12 @@
 			}
 		},
 		"node_modules/socks": {
-			"version": "2.8.4",
-			"resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz",
-			"integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==",
+			"version": "2.8.7",
+			"resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",
+			"integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==",
 			"license": "MIT",
 			"dependencies": {
-				"ip-address": "^9.0.5",
+				"ip-address": "^10.0.1",
 				"smart-buffer": "^4.2.0"
 			},
 			"engines": {
@@ -914,23 +942,15 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/sprintf-js": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-			"integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
-			"license": "BSD-3-Clause"
-		},
 		"node_modules/streamx": {
-			"version": "2.22.0",
-			"resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.0.tgz",
-			"integrity": "sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==",
+			"version": "2.23.0",
+			"resolved": "https://registry.npmjs.org/streamx/-/streamx-2.23.0.tgz",
+			"integrity": "sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==",
 			"license": "MIT",
 			"dependencies": {
+				"events-universal": "^1.0.0",
 				"fast-fifo": "^1.3.2",
 				"text-decoder": "^1.1.0"
-			},
-			"optionalDependencies": {
-				"bare-events": "^2.2.0"
 			}
 		},
 		"node_modules/string-width": {
@@ -960,9 +980,9 @@
 			}
 		},
 		"node_modules/tar-fs": {
-			"version": "3.0.9",
-			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.9.tgz",
-			"integrity": "sha512-XF4w9Xp+ZQgifKakjZYmFdkLoSWd34VGKcsTCwlNWM7QG3ZbaxnTsaBwnjFZqHRf/rROxaR8rXnbtwdvaDI+lA==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.1.1.tgz",
+			"integrity": "sha512-LZA0oaPOc2fVo82Txf3gw+AkEd38szODlptMYejQUhndHMLQ9M059uXR+AfS7DNo0NpINvSqDsvyaCrBVkptWg==",
 			"license": "MIT",
 			"dependencies": {
 				"pump": "^3.0.0",
@@ -1006,12 +1026,18 @@
 			"license": "MIT"
 		},
 		"node_modules/undici-types": {
-			"version": "6.21.0",
-			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-			"integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+			"version": "7.16.0",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+			"integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
 			"license": "MIT",
 			"optional": true
 		},
+		"node_modules/webdriver-bidi-protocol": {
+			"version": "0.3.9",
+			"resolved": "https://registry.npmjs.org/webdriver-bidi-protocol/-/webdriver-bidi-protocol-0.3.9.tgz",
+			"integrity": "sha512-uIYvlRQ0PwtZR1EzHlTMol1G0lAlmOe6wPykF9a77AK3bkpvZHzIVxRE2ThOx5vjy2zISe0zhwf5rzuUfbo1PQ==",
+			"license": "Apache-2.0"
+		},
 		"node_modules/wrap-ansi": {
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -1036,9 +1062,9 @@
 			"license": "ISC"
 		},
 		"node_modules/ws": {
-			"version": "8.18.2",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.2.tgz",
-			"integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==",
+			"version": "8.18.3",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
+			"integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=10.0.0"
@@ -1103,9 +1129,9 @@
 			}
 		},
 		"node_modules/zod": {
-			"version": "3.25.49",
-			"resolved": "https://registry.npmjs.org/zod/-/zod-3.25.49.tgz",
-			"integrity": "sha512-JMMPMy9ZBk3XFEdbM3iL1brx4NUSejd6xr3ELrrGEfGb355gjhiAWtG3K5o+AViV/3ZfkIrCzXsZn6SbLwTR8Q==",
+			"version": "3.25.76",
+			"resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
+			"integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
 			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/sponsors/colinhacks"

views/index.ejs

@@ -36,7 +36,7 @@
     const OVERRIDES = <%- JSON.stringify(OVERRIDES ?? {}) %>;
   </script>
   <% } else { %>
-  <link rel="stylesheet" type="text/css" href="styles/main.css" />
+  <link rel="stylesheet" type="text/css" href="styles/ws.min.css" />
   <!--<script type="text/javascript">const OVERRIDES={};</script>-->
   <script type="text/javascript">
     OVERRIDES = <%- JSON.stringify(OVERRIDES ?? {}) %>;
@@ -63,9 +63,6 @@
   <script type="module" src="scripts/modules/settings.mjs"></script>
   <script type="module" src="scripts/modules/media.mjs"></script>
   <script type="module" src="scripts/modules/custom-rss-feed.mjs"></script>
-	<% if (!DISABLE_PERSONAL) { %>
-  <script type="module" src="scripts/modules/personal-weather.mjs"></script>
-	<% } %>
   <script type="module" src="scripts/index.mjs"></script>
   <% } %>
 
@@ -112,11 +109,6 @@
         <div id="current-weather-html" class="weather-display">
           <%- include('partials/current-weather.ejs') %>
         </div>
-				<% if (!DISABLE_PERSONAL) { %>
-				<div id="personal-weather-html" class="weather-display">
-          <%- include('partials/personal-weather.ejs') %>
-        </div>
-				<% } %>
         <div id="local-forecast-html" class="weather-display">
           <%- include('partials/local-forecast.ejs') %>
         </div>

views/partials/personal-weather.ejs

@@ -1,25 +0,0 @@
-<%- include('header.ejs', {titleDual:{ top: 'Personal' , bottom: 'Weather Station' }, noaaLogo: false, hasTime: true}) %>
-<div class="main has-scroll has-box personal-weather">
-  <div class="weather template">
-    <div class="deviceName value"></div>
-    <div class="deviceLocation value"></div>
-    <div class="temp value"></div>
-    <div class="row">
-      <div class="label">Humidity:</div>
-      <div class="humidity value"></div>
-    </div>
-    <div class="row">
-      <div class="label">Wind:</div>
-      <div class="wind value"></div>
-    </div>
-    <div class="row">
-      <div class="label">Pressure:</div>
-      <div class="pressure value"></div>
-    </div>
-    <div class="row">
-      <div class="label">Daily Rain:</div>
-      <div class="dailyRain value"></div>
-    </div>
-    <div class="timestamp value">At 12:34:55 PM</div>
-  </div>
-</div>