mirror of
https://github.com/netbymatt/ws4kp.git
synced 2026-04-17 00:59:29 -07:00
Compare commits
50 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c07ebe8bdd | ||
|
|
a41b0da196 | ||
|
|
30887202c8 | ||
|
|
38d1455a4b | ||
|
|
30ec847ed5 | ||
|
|
11c54391b2 | ||
|
|
0b47cf79c1 | ||
|
|
ba36904477 | ||
|
|
dae5b20bc6 | ||
|
|
ccc936d81a | ||
|
|
5dc214c6a5 | ||
|
|
2a4dc03cf7 | ||
|
|
8c13128005 | ||
|
|
942fa8b817 | ||
|
|
15b68eba2f | ||
|
|
933a289d03 | ||
|
|
e6121327ce | ||
|
|
678f04fe42 | ||
|
|
77592a08a3 | ||
|
|
dadfcb8a5c | ||
|
|
245e9daf9c | ||
|
|
177012317b | ||
|
|
7bd21bcf1d | ||
|
|
ec65025ae2 | ||
|
|
194e108037 | ||
|
|
d5b7c6630a | ||
|
|
39bafae394 | ||
|
|
ec8fffbb64 | ||
|
|
0a794eae36 | ||
|
|
8c83736aba | ||
|
|
872162080d | ||
|
|
69d2b0f40b | ||
|
|
37193112a7 | ||
|
|
0d9c445919 | ||
|
|
6c9fb4cf68 | ||
|
|
59b10ae222 | ||
|
|
d18b13821a | ||
|
|
320d3139c3 | ||
|
|
34dedb44c1 | ||
|
|
18633708f9 | ||
|
|
9b12255e0a | ||
|
|
f3360772c8 | ||
|
|
767bb8f11d | ||
|
|
7586dd7489 | ||
|
|
f37cbd66f7 | ||
|
|
d00262ebbc | ||
|
|
b4646b128a | ||
|
|
9f78761fe8 | ||
|
|
31c060c6d9 | ||
|
|
770f671d45 |
11
.github/ISSUE_TEMPLATE/screen_enhance.md
vendored
Normal file
11
.github/ISSUE_TEMPLATE/screen_enhance.md
vendored
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
---
|
||||||
|
name: Screen Enhancement
|
||||||
|
about: Items and tasks related to the screen enhancement project
|
||||||
|
title: '[Project]: '
|
||||||
|
labels: screen-enhance
|
||||||
|
projects: ['netbymatt/5']
|
||||||
|
assignees: ''
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
Describe the task, how it affects the overall project and what is considered complete.
|
||||||
2
.github/workflows/build-docker.yaml
vendored
2
.github/workflows/build-docker.yaml
vendored
@@ -4,6 +4,8 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- '**'
|
- '**'
|
||||||
|
- '!screen-enhance'
|
||||||
|
- '!screen-enhance/**'
|
||||||
tags:
|
tags:
|
||||||
- 'v*.*.*'
|
- 'v*.*.*'
|
||||||
- 'v*.*'
|
- 'v*.*'
|
||||||
|
|||||||
4
.vscode/settings.json
vendored
4
.vscode/settings.json
vendored
@@ -2,7 +2,7 @@
|
|||||||
"liveSassCompile.settings.formats": [
|
"liveSassCompile.settings.formats": [
|
||||||
{
|
{
|
||||||
"format": "compressed",
|
"format": "compressed",
|
||||||
"extensionName": ".css",
|
"extensionName": ".min.css",
|
||||||
"savePath": "/server/styles",
|
"savePath": "/server/styles",
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
@@ -17,4 +17,4 @@
|
|||||||
"editor.codeActionsOnSave": {
|
"editor.codeActionsOnSave": {
|
||||||
"source.fixAll.eslint": "explicit"
|
"source.fixAll.eslint": "explicit"
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
2
LICENSE
2
LICENSE
@@ -1,6 +1,6 @@
|
|||||||
MIT License
|
MIT License
|
||||||
|
|
||||||
Copyright (c) 2020-2025 Matt Walsh
|
Copyright (c) 2020-2026 Matt Walsh
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
|||||||
22
README.md
22
README.md
@@ -1,3 +1,5 @@
|
|||||||
|

|
||||||
|
|
||||||
# WeatherStar 4000+
|
# WeatherStar 4000+
|
||||||
|
|
||||||
A live version of this project is available at https://weatherstar.netbymatt.com
|
A live version of this project is available at https://weatherstar.netbymatt.com
|
||||||
@@ -32,7 +34,7 @@ From a learning standpoint, this codebase make use of a lot of different methods
|
|||||||
* Hand written CSS made easier to mange with SASS
|
* Hand written CSS made easier to mange with SASS
|
||||||
* A linting library to keep code style consistent
|
* A linting library to keep code style consistent
|
||||||
|
|
||||||
## Quck Start
|
## Quick Start
|
||||||
|
|
||||||
Ensure you have Node installed.
|
Ensure you have Node installed.
|
||||||
```bash
|
```bash
|
||||||
@@ -200,7 +202,9 @@ https://weatherstar.netbymatt.com/?settings-units-select=metric
|
|||||||
```
|
```
|
||||||
|
|
||||||
### Kiosk mode
|
### 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.
|
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.
|
||||||
|
|
||||||
@@ -332,8 +336,10 @@ When using Docker:
|
|||||||
* **Static deployment**: Mount your `custom.js` file to `/usr/share/nginx/html/scripts/custom.js`
|
* **Static deployment**: Mount your `custom.js` file to `/usr/share/nginx/html/scripts/custom.js`
|
||||||
* **Server deployment**: Mount your `custom.js` file to `/app/server/scripts/custom.js`
|
* **Server deployment**: Mount your `custom.js` file to `/app/server/scripts/custom.js`
|
||||||
|
|
||||||
### RSS feeds and custom scroll
|
### Custom text scroll
|
||||||
If you would like your Weatherstar to have custom scrolling text in the bottom blue bar, or show headlines from an rss feed turn on the setting for `Enable RSS Feed/Text` and then enter a URL or text in the resulting text box. Then press set.
|
If you would like your Weatherstar to have custom scrolling text in the bottom blue bar, turn on the setting for `Enable RSS Feed/Text` and then enter text in the resulting text box. Then press set.
|
||||||
|
|
||||||
|
Tip: You can have Weatherstar select randomly between several text strings on each pass through the current conditions. Use a pipe character to separate string. `Welcome to Weatherstar|Thanks for watching`.
|
||||||
|
|
||||||
## Issue reporting and feature requests
|
## Issue reporting and feature requests
|
||||||
|
|
||||||
@@ -347,6 +353,14 @@ Note: not all units are converted to metric, if selected. Some text-based produc
|
|||||||
|
|
||||||
This is a known problem with the Ws4kp as it ages. It was a problem with the [actual Weatherstar hardware](https://youtu.be/rcUwlZ4pqh0?feature=shared&t=116) as well.
|
This is a known problem with the Ws4kp as it ages. It was a problem with the [actual Weatherstar hardware](https://youtu.be/rcUwlZ4pqh0?feature=shared&t=116) as well.
|
||||||
|
|
||||||
|
## Phone App
|
||||||
|
|
||||||
|
An Android app is in a closed beta test. It's nothing too special, just a wrapper for displaying the website in a browser.
|
||||||
|
|
||||||
|
You can get this functionality without an app on both Andriod and iOS by using the install or add to home screen feature of your browser.
|
||||||
|
|
||||||
|
iOS native app? No. I own zero Apple devices and thus have no way to develop, test, compile or verify myself to the app store. That application will have to come from the community.
|
||||||
|
|
||||||
## Related Projects
|
## Related Projects
|
||||||
|
|
||||||
Not retro enough? Try the [Weatherstar 3000+](https://github.com/netbymatt/ws3kp)
|
Not retro enough? Try the [Weatherstar 3000+](https://github.com/netbymatt/ws3kp)
|
||||||
|
|||||||
@@ -729,6 +729,16 @@
|
|||||||
"wfo": "LMK"
|
"wfo": "LMK"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"city": "Lubbock",
|
||||||
|
"lat": 33.5836,
|
||||||
|
"lon": -101.8549,
|
||||||
|
"point": {
|
||||||
|
"x": 49,
|
||||||
|
"y": 34,
|
||||||
|
"wfo": "LUB"
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"city": "Manchester",
|
"city": "Manchester",
|
||||||
"lat": 42.9956,
|
"lat": 42.9956,
|
||||||
|
|||||||
@@ -364,6 +364,11 @@
|
|||||||
"lat": 38.2542,
|
"lat": 38.2542,
|
||||||
"lon": -85.7594
|
"lon": -85.7594
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"city": "Lubbock",
|
||||||
|
"lat": 33.5836,
|
||||||
|
"lon": -101.8549
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"city": "Manchester",
|
"city": "Manchester",
|
||||||
"lat": 42.9956,
|
"lat": 42.9956,
|
||||||
|
|||||||
@@ -8,13 +8,11 @@ import states from './stations-states.mjs';
|
|||||||
import chunk from './chunk.mjs';
|
import chunk from './chunk.mjs';
|
||||||
import overrides from './stations-overrides.mjs';
|
import overrides from './stations-overrides.mjs';
|
||||||
import postProcessor from './stations-postprocessor.mjs';
|
import postProcessor from './stations-postprocessor.mjs';
|
||||||
|
import { stationFilter } from '../server/scripts/modules/utils/string.mjs';
|
||||||
|
|
||||||
// check for cached flag
|
// check for cached flag
|
||||||
const USE_CACHE = process.argv.includes('--use-cache');
|
const USE_CACHE = process.argv.includes('--use-cache');
|
||||||
|
|
||||||
// skip stations starting with these letters
|
|
||||||
const skipStations = ['U', 'C', 'H', 'W', 'Y', 'T', 'S', 'M', 'O', 'L', 'A', 'F', 'B', 'N', 'V', 'R', 'D', 'E', 'I', 'G', 'J'];
|
|
||||||
|
|
||||||
// chunk the list of states
|
// chunk the list of states
|
||||||
const chunkStates = chunk(states, 3);
|
const chunkStates = chunk(states, 3);
|
||||||
|
|
||||||
@@ -41,10 +39,8 @@ if (!USE_CACHE) {
|
|||||||
// eslint-disable-next-line no-await-in-loop
|
// eslint-disable-next-line no-await-in-loop
|
||||||
const stationsRaw = await https(next);
|
const stationsRaw = await https(next);
|
||||||
stations = JSON.parse(stationsRaw);
|
stations = JSON.parse(stationsRaw);
|
||||||
// filter stations for 4 letter identifiers
|
|
||||||
const stationsFiltered4 = stations.features.filter((station) => station.properties.stationIdentifier.match(/^[A-Z]{4}$/));
|
|
||||||
// filter against starting letter
|
// filter against starting letter
|
||||||
const stationsFiltered = stationsFiltered4.filter((station) => !skipStations.includes(station.properties.stationIdentifier.slice(0, 1)));
|
const stationsFiltered = stations.filter(stationFilter);
|
||||||
// add each resulting station to the output
|
// add each resulting station to the output
|
||||||
stationsFiltered.forEach((station) => {
|
stationsFiltered.forEach((station) => {
|
||||||
const id = station.properties.stationIdentifier;
|
const id = station.properties.stationIdentifier;
|
||||||
|
|||||||
@@ -15,11 +15,16 @@ import { readFile } from 'fs/promises';
|
|||||||
import file from 'gulp-file';
|
import file from 'gulp-file';
|
||||||
import { CloudFrontClient, CreateInvalidationCommand } from '@aws-sdk/client-cloudfront';
|
import { CloudFrontClient, CreateInvalidationCommand } from '@aws-sdk/client-cloudfront';
|
||||||
import log from 'fancy-log';
|
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';
|
import OVERRIDES from '../src/overrides.mjs';
|
||||||
|
|
||||||
// get cloudfront
|
// get cloudfront
|
||||||
import reader from '../src/playlist-reader.mjs';
|
import reader from '../src/playlist-reader.mjs';
|
||||||
|
|
||||||
|
const sass = gulpSass(dartSass);
|
||||||
|
|
||||||
const clean = () => deleteAsync(['./dist/**/*', '!./dist/readme.txt']);
|
const clean = () => deleteAsync(['./dist/**/*', '!./dist/readme.txt']);
|
||||||
|
|
||||||
const cloudfront = new CloudFrontClient({ region: 'us-east-1' });
|
const cloudfront = new CloudFrontClient({ region: 'us-east-1' });
|
||||||
@@ -36,6 +41,7 @@ const webpackOptions = {
|
|||||||
resolve: {
|
resolve: {
|
||||||
roots: ['./'],
|
roots: ['./'],
|
||||||
},
|
},
|
||||||
|
devtool: 'source-map',
|
||||||
optimization: {
|
optimization: {
|
||||||
minimize: true,
|
minimize: true,
|
||||||
minimizer: [
|
minimizer: [
|
||||||
@@ -80,7 +86,7 @@ const mjsSources = [
|
|||||||
'server/scripts/modules/travelforecast.mjs',
|
'server/scripts/modules/travelforecast.mjs',
|
||||||
'server/scripts/modules/progress.mjs',
|
'server/scripts/modules/progress.mjs',
|
||||||
'server/scripts/modules/media.mjs',
|
'server/scripts/modules/media.mjs',
|
||||||
'server/scripts/modules/custom-rss-feed.mjs',
|
'server/scripts/modules/custom-scroll-text.mjs',
|
||||||
'server/scripts/index.mjs',
|
'server/scripts/index.mjs',
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -89,10 +95,13 @@ const buildJs = () => src(mjsSources)
|
|||||||
.pipe(dest(RESOURCES_PATH));
|
.pipe(dest(RESOURCES_PATH));
|
||||||
|
|
||||||
const cssSources = [
|
const cssSources = [
|
||||||
'server/styles/main.css',
|
'server/styles/scss/**/*.scss',
|
||||||
];
|
];
|
||||||
const copyCss = () => src(cssSources)
|
const buildCss = () => src(cssSources)
|
||||||
.pipe(concat('ws.min.css'))
|
.pipe(sourceMaps.init())
|
||||||
|
.pipe(sass({ style: 'compressed' }).on('error', sass.logError))
|
||||||
|
.pipe(rename({ suffix: '.min' }))
|
||||||
|
.pipe(sourceMaps.write('./'))
|
||||||
.pipe(dest(RESOURCES_PATH));
|
.pipe(dest(RESOURCES_PATH));
|
||||||
|
|
||||||
const htmlSources = [
|
const htmlSources = [
|
||||||
@@ -141,7 +150,6 @@ const s3 = s3Upload({
|
|||||||
});
|
});
|
||||||
const uploadSources = [
|
const uploadSources = [
|
||||||
'dist/**',
|
'dist/**',
|
||||||
'!dist/**/*.map',
|
|
||||||
'!dist/images/**/*',
|
'!dist/images/**/*',
|
||||||
'!dist/fonts/**/*',
|
'!dist/fonts/**/*',
|
||||||
];
|
];
|
||||||
@@ -209,7 +217,7 @@ const logVersion = async () => {
|
|||||||
log(`Version Published: ${version}`);
|
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
|
// 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
|
// by running upload last the majority of the changes will be at the bottom of the log for easy viewing
|
||||||
|
|||||||
@@ -158,6 +158,7 @@ if (process.env?.DIST === '1') {
|
|||||||
// 'npm run build' and then 'DIST=1 npm start'
|
// 'npm run build' and then 'DIST=1 npm start'
|
||||||
app.use('/scripts', express.static('./server/scripts', staticOptions));
|
app.use('/scripts', express.static('./server/scripts', staticOptions));
|
||||||
app.use('/geoip', geoip);
|
app.use('/geoip', geoip);
|
||||||
|
app.use('/music', express.static('./server/music', staticOptions));
|
||||||
|
|
||||||
// render the EJS template in production mode (serve compressed files from dist directory)
|
// render the EJS template in production mode (serve compressed files from dist directory)
|
||||||
app.get('/', (req, res) => { renderIndex(req, res, true); });
|
app.get('/', (req, res) => { renderIndex(req, res, true); });
|
||||||
|
|||||||
2999
package-lock.json
generated
2999
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
11
package.json
11
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "ws4kp",
|
"name": "ws4kp",
|
||||||
"version": "6.3.0",
|
"version": "6.5.9",
|
||||||
"description": "Welcome to the WeatherStar 4000+ project page!",
|
"description": "Welcome to the WeatherStar 4000+ project page!",
|
||||||
"main": "index.mjs",
|
"main": "index.mjs",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -31,19 +31,20 @@
|
|||||||
"@eslint/eslintrc": "^3.3.1",
|
"@eslint/eslintrc": "^3.3.1",
|
||||||
"ajv": "^8.17.1",
|
"ajv": "^8.17.1",
|
||||||
"del": "^8.0.0",
|
"del": "^8.0.0",
|
||||||
"eslint": "^9.0.0",
|
"eslint": "^10.0.3",
|
||||||
"eslint-config-airbnb-base": "15.0.0",
|
"eslint-config-airbnb-base": "15.0.0",
|
||||||
"eslint-plugin-import": "^2.10.0",
|
"eslint-plugin-import": "^2.10.0",
|
||||||
"fancy-log": "^2.0.0",
|
"fancy-log": "^2.0.0",
|
||||||
"gulp": "^5.0.0",
|
"gulp": "^5.0.0",
|
||||||
"gulp-awspublish": "^8.0.0",
|
"gulp-awspublish": "^9.0.0",
|
||||||
"gulp-concat": "^2.6.1",
|
"gulp-concat": "^2.6.1",
|
||||||
"gulp-ejs": "^5.1.0",
|
"gulp-ejs": "^5.1.0",
|
||||||
"gulp-file": "^0.4.0",
|
"gulp-file": "^0.4.0",
|
||||||
"gulp-html-minifier-terser": "^7.1.0",
|
"gulp-html-minifier-terser": "^8.0.0",
|
||||||
"gulp-rename": "^2.0.0",
|
"gulp-rename": "^2.0.0",
|
||||||
"gulp-s3-uploader": "^1.0.6",
|
"gulp-s3-uploader": "^1.0.6",
|
||||||
"gulp-sass": "^6.0.0",
|
"gulp-sass": "^6.0.0",
|
||||||
|
"gulp-sourcemaps": "^3.0.0",
|
||||||
"gulp-terser": "^2.0.0",
|
"gulp-terser": "^2.0.0",
|
||||||
"luxon": "^3.0.0",
|
"luxon": "^3.0.0",
|
||||||
"metar-taf-parser": "^9.0.0",
|
"metar-taf-parser": "^9.0.0",
|
||||||
@@ -57,7 +58,7 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"dotenv": "^17.0.1",
|
"dotenv": "^17.0.1",
|
||||||
"ejs": "^3.1.5",
|
"ejs": "^5.0.1",
|
||||||
"express": "^5.1.0"
|
"express": "^5.1.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ const init = async () => {
|
|||||||
if (!navigator.geolocation) btnGetGps.style.display = 'none';
|
if (!navigator.geolocation) btnGetGps.style.display = 'none';
|
||||||
|
|
||||||
document.querySelector('#divTwc').addEventListener('mousemove', () => {
|
document.querySelector('#divTwc').addEventListener('mousemove', () => {
|
||||||
if (document.fullscreenElement) updateFullScreenNavigate();
|
if (document.fullscreenElement || settings.kiosk?.value) updateFullScreenNavigate();
|
||||||
});
|
});
|
||||||
|
|
||||||
document.querySelector('#btnGetLatLng').addEventListener('click', () => autoComplete.directFormSubmit());
|
document.querySelector('#btnGetLatLng').addEventListener('click', () => autoComplete.directFormSubmit());
|
||||||
@@ -384,7 +384,7 @@ const updateFullScreenNavigate = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
navigateFadeIntervalId = setTimeout(() => {
|
navigateFadeIntervalId = setTimeout(() => {
|
||||||
if (document.fullscreenElement) {
|
if (document.fullscreenElement || settings.kiosk?.value) {
|
||||||
divTwcBottom.classList.remove('visible');
|
divTwcBottom.classList.remove('visible');
|
||||||
divTwcBottom.classList.add('hidden');
|
divTwcBottom.classList.add('hidden');
|
||||||
document.querySelector('#divTwc').classList.add('no-cursor');
|
document.querySelector('#divTwc').classList.add('no-cursor');
|
||||||
|
|||||||
@@ -15,9 +15,6 @@ import { debugFlag } from './utils/debug.mjs';
|
|||||||
import { isDataStale, enhanceObservationWithMapClick } from './utils/mapclick.mjs';
|
import { isDataStale, enhanceObservationWithMapClick } from './utils/mapclick.mjs';
|
||||||
import { DateTime } from '../vendor/auto/luxon.mjs';
|
import { DateTime } from '../vendor/auto/luxon.mjs';
|
||||||
|
|
||||||
// some stations prefixed do not provide all the necessary data
|
|
||||||
const skipStations = ['U', 'C', 'H', 'W', 'Y', 'T', 'S', 'M', 'O', 'L', 'A', 'F', 'B', 'N', 'V', 'R', 'D', 'E', 'I', 'G', 'J'];
|
|
||||||
|
|
||||||
class CurrentWeather extends WeatherDisplay {
|
class CurrentWeather extends WeatherDisplay {
|
||||||
constructor(navId, elemId) {
|
constructor(navId, elemId) {
|
||||||
super(navId, elemId, 'Current Conditions', true);
|
super(navId, elemId, 'Current Conditions', true);
|
||||||
@@ -29,8 +26,8 @@ class CurrentWeather extends WeatherDisplay {
|
|||||||
// note: current weather does not use old data on a silent refresh
|
// note: current weather does not use old data on a silent refresh
|
||||||
// this is deliberate because it can pull data from more than one station in sequence
|
// this is deliberate because it can pull data from more than one station in sequence
|
||||||
|
|
||||||
// filter for 4-letter observation stations, only those contain sky conditions and thus an icon
|
// get the available stations
|
||||||
const filteredStations = this.weatherParameters.stations.filter((station) => station?.properties?.stationIdentifier?.length === 4 && !skipStations.includes(station.properties.stationIdentifier.slice(0, 1)));
|
const { stations } = this.weatherParameters;
|
||||||
|
|
||||||
// Load the observations
|
// Load the observations
|
||||||
let observations;
|
let observations;
|
||||||
@@ -38,9 +35,9 @@ class CurrentWeather extends WeatherDisplay {
|
|||||||
|
|
||||||
// station number counter
|
// station number counter
|
||||||
let stationNum = 0;
|
let stationNum = 0;
|
||||||
while (!observations && stationNum < filteredStations.length) {
|
while (!observations && stationNum < stations.length) {
|
||||||
// get the station
|
// get the station
|
||||||
station = filteredStations[stationNum];
|
station = stations[stationNum];
|
||||||
const stationId = station.properties.stationIdentifier;
|
const stationId = station.properties.stationIdentifier;
|
||||||
|
|
||||||
stationNum += 1;
|
stationNum += 1;
|
||||||
@@ -104,7 +101,10 @@ class CurrentWeather extends WeatherDisplay {
|
|||||||
debugContext: 'currentweather',
|
debugContext: 'currentweather',
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// copy enhanced data and restore the timestamp if it was overwritten by older data from mapclick
|
||||||
|
|
||||||
candidateObservation.features[0].properties = enhancedResult.data;
|
candidateObservation.features[0].properties = enhancedResult.data;
|
||||||
|
|
||||||
const { missingFields } = enhancedResult;
|
const { missingFields } = enhancedResult;
|
||||||
const missingRequired = missingFields.filter((fieldName) => {
|
const missingRequired = missingFields.filter((fieldName) => {
|
||||||
const field = requiredFields.find((f) => f.name === fieldName && f.required);
|
const field = requiredFields.find((f) => f.name === fieldName && f.required);
|
||||||
@@ -324,7 +324,7 @@ const backfill = (data) => {
|
|||||||
// backfill each property
|
// backfill each property
|
||||||
Object.keys(sortedData[0].properties).forEach((key) => {
|
Object.keys(sortedData[0].properties).forEach((key) => {
|
||||||
// qualify the key (must have value)
|
// qualify the key (must have value)
|
||||||
if (Object.hasOwn(sortedData[0].properties[key], 'value')) {
|
if (Object.hasOwn(sortedData[0].properties?.[key] ?? {}, 'value')) {
|
||||||
// backfill this property
|
// backfill this property
|
||||||
result[key] = backfillProperty(sortedData, key);
|
result[key] = backfillProperty(sortedData, key);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -261,6 +261,7 @@ const parseMessage = (event) => {
|
|||||||
if (event?.data?.type === 'current-weather-scroll') {
|
if (event?.data?.type === 'current-weather-scroll') {
|
||||||
if (event.data?.method === 'start') start();
|
if (event.data?.method === 'start') start();
|
||||||
if (event.data?.method === 'reload') stop(true);
|
if (event.data?.method === 'reload') stop(true);
|
||||||
|
if (event.data?.method === 'non-display') nonDisplay();
|
||||||
if (event.data?.method === 'show') show();
|
if (event.data?.method === 'show') show();
|
||||||
if (event.data?.method === 'hide') hide();
|
if (event.data?.method === 'hide') hide();
|
||||||
}
|
}
|
||||||
@@ -274,6 +275,20 @@ const hide = () => {
|
|||||||
mainScroll.style.display = 'none';
|
mainScroll.style.display = 'none';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const nonDisplay = () => {
|
||||||
|
if (interval) {
|
||||||
|
clearInterval(interval);
|
||||||
|
interval = null;
|
||||||
|
stop();
|
||||||
|
// if greater than default update (typically long scroll) skip to the next weather screen
|
||||||
|
if (nextUpdate > DEFAULT_UPDATE) {
|
||||||
|
screenIndex = (screenIndex + 1) % (workingScreens.length);
|
||||||
|
sinceLastUpdate = 0;
|
||||||
|
nextUpdate = DEFAULT_UPDATE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const screenCount = () => workingScreens.length;
|
const screenCount = () => workingScreens.length;
|
||||||
const atDefault = () => defaultScreensLoaded;
|
const atDefault = () => defaultScreensLoaded;
|
||||||
|
|
||||||
|
|||||||
@@ -1,135 +0,0 @@
|
|||||||
import Setting from './utils/setting.mjs';
|
|
||||||
import { reset as resetScroll, addScreen as addScroll, hazards } from './currentweatherscroll.mjs';
|
|
||||||
import { json } from './utils/fetch.mjs';
|
|
||||||
|
|
||||||
let firstRun = true;
|
|
||||||
|
|
||||||
const parser = new DOMParser();
|
|
||||||
|
|
||||||
// change of enable handler
|
|
||||||
const changeEnable = (newValue) => {
|
|
||||||
let newDisplay;
|
|
||||||
if (newValue) {
|
|
||||||
// add the feed to the scroll
|
|
||||||
parseFeed(customFeed.value);
|
|
||||||
// show the string box
|
|
||||||
newDisplay = 'block';
|
|
||||||
} else {
|
|
||||||
// set scroll back to original
|
|
||||||
resetScroll();
|
|
||||||
// hide the string entry
|
|
||||||
newDisplay = 'none';
|
|
||||||
}
|
|
||||||
const stringEntry = document.getElementById('settings-customFeed-label');
|
|
||||||
if (stringEntry) {
|
|
||||||
stringEntry.style.display = newDisplay;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// parse the feed/text provided
|
|
||||||
const parseFeed = (textInput) => {
|
|
||||||
// skip getting the feed on first run
|
|
||||||
if (firstRun) return;
|
|
||||||
|
|
||||||
// test validity
|
|
||||||
if (textInput === undefined || textInput === '') {
|
|
||||||
resetScroll();
|
|
||||||
}
|
|
||||||
|
|
||||||
// test for url
|
|
||||||
if (textInput.match(/https?:\/\//)) {
|
|
||||||
getFeed(textInput);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// add single text scroll after hazards if present
|
|
||||||
resetScroll();
|
|
||||||
addScroll(hazards);
|
|
||||||
addScroll(
|
|
||||||
() => (
|
|
||||||
{
|
|
||||||
type: 'scroll',
|
|
||||||
text: textInput,
|
|
||||||
}),
|
|
||||||
// keep the existing scroll
|
|
||||||
true,
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
// get the rss feed and then swap out the current weather scroll
|
|
||||||
const getFeed = async (url) => {
|
|
||||||
// get the text as a string
|
|
||||||
// it needs to be proxied, use a free service
|
|
||||||
const rssResponse = await json(`https://api.allorigins.win/get?url=${url}`);
|
|
||||||
|
|
||||||
// this returns a data url
|
|
||||||
// a few sanity checks
|
|
||||||
if (rssResponse.status.content_type.indexOf('xml') < 0) return;
|
|
||||||
// determine return type
|
|
||||||
const isBase64 = rssResponse.status.content_type.substring(0, 8) !== 'text/xml';
|
|
||||||
|
|
||||||
// base 64 decode everything after the comma
|
|
||||||
const rss = isBase64 ? atob(rssResponse.contents.split('base64,')[1]) : rssResponse.contents;
|
|
||||||
|
|
||||||
// parse the rss
|
|
||||||
const doc = parser.parseFromString(rss, 'text/xml');
|
|
||||||
|
|
||||||
// get the title
|
|
||||||
const rssTitle = doc.querySelector('channel title').textContent;
|
|
||||||
|
|
||||||
// get each item
|
|
||||||
const titles = [...doc.querySelectorAll('item title')].map((t) => t.textContent);
|
|
||||||
|
|
||||||
// reset the scroll, then add the screens
|
|
||||||
resetScroll();
|
|
||||||
// add the hazards scroll first
|
|
||||||
addScroll(hazards);
|
|
||||||
titles.forEach((title) => {
|
|
||||||
// data is provided to the screen handler, so we return a function
|
|
||||||
addScroll(
|
|
||||||
() => ({
|
|
||||||
header: rssTitle,
|
|
||||||
type: 'scroll',
|
|
||||||
text: title,
|
|
||||||
}),
|
|
||||||
// false parameter does not include the default weather scrolls
|
|
||||||
false,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
// change the feed source and re-load if necessary
|
|
||||||
const changeFeed = (newValue) => {
|
|
||||||
// first pass through won't have custom feed enable ready
|
|
||||||
if (firstRun) return;
|
|
||||||
|
|
||||||
if (customFeedEnable.value) {
|
|
||||||
parseFeed(newValue);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const customFeed = new Setting('customFeed', {
|
|
||||||
name: 'Custom RSS Feed',
|
|
||||||
defaultValue: '',
|
|
||||||
type: 'string',
|
|
||||||
changeAction: changeFeed,
|
|
||||||
placeholder: 'Text or URL',
|
|
||||||
});
|
|
||||||
|
|
||||||
const customFeedEnable = new Setting('customFeedEnable', {
|
|
||||||
name: 'Enable RSS Feed/Text',
|
|
||||||
defaultValue: false,
|
|
||||||
changeAction: changeEnable,
|
|
||||||
});
|
|
||||||
|
|
||||||
// initialize the custom feed inputs on the page
|
|
||||||
document.addEventListener('DOMContentLoaded', () => {
|
|
||||||
// add the controls to the page
|
|
||||||
const settingsSection = document.querySelector('#settings');
|
|
||||||
settingsSection.append(customFeedEnable.generate(), customFeed.generate());
|
|
||||||
// clear the first run value
|
|
||||||
firstRun = false;
|
|
||||||
// call change enable with the current value to show/hide the url box
|
|
||||||
// and make the call to get the feed if enabled
|
|
||||||
changeEnable(customFeedEnable.value);
|
|
||||||
});
|
|
||||||
89
server/scripts/modules/custom-scroll-text.mjs
Normal file
89
server/scripts/modules/custom-scroll-text.mjs
Normal file
@@ -0,0 +1,89 @@
|
|||||||
|
import Setting from './utils/setting.mjs';
|
||||||
|
import { reset as resetScroll, addScreen as addScroll, hazards } from './currentweatherscroll.mjs';
|
||||||
|
|
||||||
|
let firstRun = true;
|
||||||
|
|
||||||
|
// change of enable handler
|
||||||
|
const changeEnable = (newValue) => {
|
||||||
|
let newDisplay;
|
||||||
|
if (newValue) {
|
||||||
|
// add the text to the scroll
|
||||||
|
parseText(customText.value);
|
||||||
|
// show the string box
|
||||||
|
newDisplay = 'block';
|
||||||
|
} else {
|
||||||
|
// set scroll back to original
|
||||||
|
resetScroll();
|
||||||
|
// hide the string entry
|
||||||
|
newDisplay = 'none';
|
||||||
|
}
|
||||||
|
const stringEntry = document.getElementById('settings-customText-string');
|
||||||
|
if (stringEntry) {
|
||||||
|
stringEntry.style.display = newDisplay;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// parse the text provided
|
||||||
|
const parseText = (textInput) => {
|
||||||
|
// skip updating text on first run
|
||||||
|
if (firstRun) return;
|
||||||
|
|
||||||
|
// test validity
|
||||||
|
if (textInput === undefined || textInput === '') {
|
||||||
|
resetScroll();
|
||||||
|
}
|
||||||
|
|
||||||
|
// split the text at pipe characters
|
||||||
|
const texts = textInput.split('|');
|
||||||
|
|
||||||
|
// add single text scroll after hazards if present
|
||||||
|
resetScroll();
|
||||||
|
addScroll(hazards);
|
||||||
|
addScroll(
|
||||||
|
() => {
|
||||||
|
// pick a random string from the available list
|
||||||
|
const randInt = Math.floor(Math.random() * texts.length);
|
||||||
|
return {
|
||||||
|
type: 'scroll',
|
||||||
|
text: texts[randInt],
|
||||||
|
};
|
||||||
|
},
|
||||||
|
// keep the existing scroll
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
// change the text
|
||||||
|
const changeText = (newValue) => {
|
||||||
|
// first pass through won't have custom text enable ready
|
||||||
|
if (firstRun) return;
|
||||||
|
|
||||||
|
if (customTextEnable.value) {
|
||||||
|
parseText(newValue);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const customText = new Setting('customText', {
|
||||||
|
name: 'Custom Text',
|
||||||
|
defaultValue: '',
|
||||||
|
type: 'string',
|
||||||
|
changeAction: changeText,
|
||||||
|
placeholder: 'Text to scroll',
|
||||||
|
});
|
||||||
|
|
||||||
|
const customTextEnable = new Setting('customTextEnable', {
|
||||||
|
name: 'Enable Custom Text',
|
||||||
|
defaultValue: false,
|
||||||
|
changeAction: changeEnable,
|
||||||
|
});
|
||||||
|
|
||||||
|
// initialize the custom text inputs on the page
|
||||||
|
document.addEventListener('DOMContentLoaded', () => {
|
||||||
|
// add the controls to the page
|
||||||
|
const settingsSection = document.querySelector('#settings');
|
||||||
|
settingsSection.append(customTextEnable.generate(), customText.generate());
|
||||||
|
// clear the first run value
|
||||||
|
firstRun = false;
|
||||||
|
// call change enable with the current value to show/hide the url box
|
||||||
|
changeEnable(customTextEnable.value);
|
||||||
|
});
|
||||||
@@ -97,11 +97,9 @@ const parse = (fullForecast, forecastUrl) => {
|
|||||||
// Skip the first period if it's nighttime (like "Tonight") since extended forecast
|
// Skip the first period if it's nighttime (like "Tonight") since extended forecast
|
||||||
// should focus on upcoming full days, not the end of the current day
|
// should focus on upcoming full days, not the end of the current day
|
||||||
let startIndex = 0;
|
let startIndex = 0;
|
||||||
let dateOffset = 0; // offset for date labels when we skip periods
|
|
||||||
|
|
||||||
if (activePeriods.length > 0 && !activePeriods[0].isDaytime) {
|
if (activePeriods.length > 0 && !activePeriods[0].isDaytime) {
|
||||||
startIndex = 1;
|
startIndex = 1;
|
||||||
dateOffset = 1; // start date labels from tomorrow since we're skipping tonight
|
|
||||||
if (debugFlag('extendedforecast')) {
|
if (debugFlag('extendedforecast')) {
|
||||||
console.log(`ExtendedForecast: Skipping first period "${activePeriods[0].name}" because it's nighttime`);
|
console.log(`ExtendedForecast: Skipping first period "${activePeriods[0].name}" because it's nighttime`);
|
||||||
}
|
}
|
||||||
@@ -111,25 +109,14 @@ const parse = (fullForecast, forecastUrl) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// create a list of days starting with the appropriate day
|
|
||||||
const Days = [0, 1, 2, 3, 4, 5, 6];
|
|
||||||
const dates = Days.map((shift) => {
|
|
||||||
const date = DateTime.local().startOf('day').plus({ days: shift + dateOffset });
|
|
||||||
return date.toLocaleString({ weekday: 'short' });
|
|
||||||
});
|
|
||||||
|
|
||||||
if (debugFlag('extendedforecast')) {
|
|
||||||
console.log(`ExtendedForecast: Generated date labels: [${dates.join(', ')}]`);
|
|
||||||
}
|
|
||||||
|
|
||||||
// track the destination forecast index
|
// track the destination forecast index
|
||||||
let destIndex = 0;
|
let destIndex = 0;
|
||||||
const forecast = [];
|
const forecast = [];
|
||||||
|
|
||||||
|
// if the first period is nighttime it is skipped above via startIndex
|
||||||
for (let i = startIndex; i < activePeriods.length; i += 1) {
|
for (let i = startIndex; i < activePeriods.length; i += 1) {
|
||||||
const period = activePeriods[i];
|
const period = activePeriods[i];
|
||||||
|
|
||||||
// create the destination object if necessary
|
|
||||||
if (!forecast[destIndex]) {
|
if (!forecast[destIndex]) {
|
||||||
forecast.push({
|
forecast.push({
|
||||||
dayName: '', low: undefined, high: undefined, text: undefined, icon: undefined,
|
dayName: '', low: undefined, high: undefined, text: undefined, icon: undefined,
|
||||||
@@ -138,15 +125,14 @@ const parse = (fullForecast, forecastUrl) => {
|
|||||||
// get the object to modify/populate
|
// get the object to modify/populate
|
||||||
const fDay = forecast[destIndex];
|
const fDay = forecast[destIndex];
|
||||||
|
|
||||||
// preload the icon
|
|
||||||
preloadImg(fDay.icon);
|
|
||||||
|
|
||||||
if (period.isDaytime) {
|
if (period.isDaytime) {
|
||||||
// day time is the high temperature
|
// day time is the high temperature
|
||||||
fDay.high = period.temperature;
|
fDay.high = period.temperature;
|
||||||
fDay.icon = getLargeIcon(period.icon);
|
fDay.icon = getLargeIcon(period.icon);
|
||||||
fDay.text = shortenExtendedForecastText(period.shortForecast);
|
fDay.text = shortenExtendedForecastText(period.shortForecast);
|
||||||
fDay.dayName = dates[destIndex];
|
fDay.dayName = DateTime.fromISO(period.startTime).startOf('day').toLocaleString({ weekday: 'short' });
|
||||||
|
// preload the icon
|
||||||
|
preloadImg(fDay.icon);
|
||||||
// Wait for the corresponding night period to increment
|
// Wait for the corresponding night period to increment
|
||||||
} else {
|
} else {
|
||||||
// low temperature
|
// low temperature
|
||||||
|
|||||||
@@ -40,9 +40,10 @@ class HourlyGraph extends WeatherDisplay {
|
|||||||
const temperature = data.map((d) => d.temperature);
|
const temperature = data.map((d) => d.temperature);
|
||||||
const probabilityOfPrecipitation = data.map((d) => d.probabilityOfPrecipitation);
|
const probabilityOfPrecipitation = data.map((d) => d.probabilityOfPrecipitation);
|
||||||
const skyCover = data.map((d) => d.skyCover);
|
const skyCover = data.map((d) => d.skyCover);
|
||||||
|
const dewpoint = data.map((d) => d.dewpoint);
|
||||||
|
|
||||||
this.data = {
|
this.data = {
|
||||||
skyCover, temperature, probabilityOfPrecipitation, temperatureUnit: data[0].temperatureUnit,
|
skyCover, temperature, probabilityOfPrecipitation, temperatureUnit: data[0].temperatureUnit, dewpoint,
|
||||||
};
|
};
|
||||||
|
|
||||||
this.setStatus(STATUS.loaded);
|
this.setStatus(STATUS.loaded);
|
||||||
@@ -63,12 +64,16 @@ class HourlyGraph extends WeatherDisplay {
|
|||||||
|
|
||||||
// calculate time scale
|
// calculate time scale
|
||||||
const timeScale = calcScale(0, 5, this.data.temperature.length - 1, availableWidth);
|
const timeScale = calcScale(0, 5, this.data.temperature.length - 1, availableWidth);
|
||||||
|
const timeStep = this.data.temperature.length / 4;
|
||||||
const startTime = DateTime.now().startOf('hour');
|
const startTime = DateTime.now().startOf('hour');
|
||||||
document.querySelector('.x-axis .l-1').innerHTML = formatTime(startTime);
|
let prevTime = startTime;
|
||||||
document.querySelector('.x-axis .l-2').innerHTML = formatTime(startTime.plus({ hour: 6 }));
|
Array(5).fill().forEach((val, idx) => {
|
||||||
document.querySelector('.x-axis .l-3').innerHTML = formatTime(startTime.plus({ hour: 12 }));
|
// track the previous label so a day of week can be added when it changes
|
||||||
document.querySelector('.x-axis .l-4').innerHTML = formatTime(startTime.plus({ hour: 18 }));
|
const label = formatTime(startTime.plus({ hour: idx * timeStep }), prevTime);
|
||||||
document.querySelector('.x-axis .l-5').innerHTML = formatTime(startTime.plus({ hour: 24 }));
|
prevTime = label.ts;
|
||||||
|
// write to page
|
||||||
|
document.querySelector(`.x-axis .l-${idx + 1}`).innerHTML = label.formatted;
|
||||||
|
});
|
||||||
|
|
||||||
// order is important last line drawn is on top
|
// order is important last line drawn is on top
|
||||||
// clouds
|
// clouds
|
||||||
@@ -86,11 +91,22 @@ class HourlyGraph extends WeatherDisplay {
|
|||||||
lineWidth: 3,
|
lineWidth: 3,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// calculate temperature scale for min and max of dewpoint and temperature
|
||||||
|
const minScale = Math.min(...this.data.dewpoint, ...this.data.temperature);
|
||||||
|
const maxScale = Math.max(...this.data.dewpoint, ...this.data.temperature);
|
||||||
|
const thirdScale = (maxScale - minScale) / 3;
|
||||||
|
const midScale1 = Math.round(minScale + thirdScale);
|
||||||
|
const midScale2 = Math.round(minScale + (thirdScale * 2));
|
||||||
|
const tempScale = calcScale(minScale, availableHeight - 10, maxScale, 10);
|
||||||
|
|
||||||
|
// dewpoint
|
||||||
|
const dewpointPath = createPath(this.data.dewpoint, timeScale, tempScale);
|
||||||
|
drawPath(dewpointPath, ctx, {
|
||||||
|
strokeStyle: 'green',
|
||||||
|
lineWidth: 3,
|
||||||
|
});
|
||||||
|
|
||||||
// temperature
|
// temperature
|
||||||
const minTemp = Math.min(...this.data.temperature);
|
|
||||||
const maxTemp = Math.max(...this.data.temperature);
|
|
||||||
const midTemp = Math.round((minTemp + maxTemp) / 2);
|
|
||||||
const tempScale = calcScale(minTemp, availableHeight - 10, maxTemp, 10);
|
|
||||||
const tempPath = createPath(this.data.temperature, timeScale, tempScale);
|
const tempPath = createPath(this.data.temperature, timeScale, tempScale);
|
||||||
drawPath(tempPath, ctx, {
|
drawPath(tempPath, ctx, {
|
||||||
strokeStyle: 'red',
|
strokeStyle: 'red',
|
||||||
@@ -100,15 +116,17 @@ class HourlyGraph extends WeatherDisplay {
|
|||||||
// temperature axis labels
|
// temperature axis labels
|
||||||
// limited to 3 characters, sacraficing degree character
|
// limited to 3 characters, sacraficing degree character
|
||||||
const degree = String.fromCharCode(176);
|
const degree = String.fromCharCode(176);
|
||||||
this.elem.querySelector('.y-axis .l-1').innerHTML = (maxTemp + degree).substring(0, 3);
|
this.elem.querySelector('.y-axis .l-1').innerHTML = (maxScale + degree).substring(0, 3);
|
||||||
this.elem.querySelector('.y-axis .l-2').innerHTML = (midTemp + degree).substring(0, 3);
|
this.elem.querySelector('.y-axis .l-2').innerHTML = (midScale2 + degree).substring(0, 3);
|
||||||
this.elem.querySelector('.y-axis .l-3').innerHTML = (minTemp + degree).substring(0, 3);
|
this.elem.querySelector('.y-axis .l-3').innerHTML = (midScale1 + degree).substring(0, 3);
|
||||||
|
this.elem.querySelector('.y-axis .l-4').innerHTML = (minScale + degree).substring(0, 3);
|
||||||
|
|
||||||
// set the image source
|
// set the image source
|
||||||
this.image.src = canvas.toDataURL();
|
this.image.src = canvas.toDataURL();
|
||||||
|
|
||||||
// change the units in the header
|
// change the units in the header
|
||||||
this.elem.querySelector('.temperature').innerHTML = `Temperature ${String.fromCharCode(176)}${this.data.temperatureUnit}`;
|
this.elem.querySelector('.temperature').innerHTML = `Temperature ${String.fromCharCode(176)}${this.data.temperatureUnit}`;
|
||||||
|
this.elem.querySelector('.dewpoint').innerHTML = `Dewpoint ${String.fromCharCode(176)}${this.data.temperatureUnit}`;
|
||||||
|
|
||||||
super.drawCanvas();
|
super.drawCanvas();
|
||||||
this.finishDraw();
|
this.finishDraw();
|
||||||
@@ -145,7 +163,18 @@ const drawPath = (path, ctx, options) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// format as 1p, 12a, etc.
|
// format as 1p, 12a, etc.
|
||||||
const formatTime = (time) => time.setZone(timeZone()).toFormat('ha').slice(0, -1);
|
const formatTime = (time, prev) => {
|
||||||
|
// if the day of the week changes, show the day of the week in the label
|
||||||
|
let format = 'ha';
|
||||||
|
if (prev.weekday !== time.weekday) format = 'ccc ha';
|
||||||
|
|
||||||
|
const ts = time.setZone(timeZone());
|
||||||
|
|
||||||
|
return {
|
||||||
|
ts,
|
||||||
|
formatted: ts.toFormat(format).slice(0, -1),
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
// register display
|
// register display
|
||||||
registerDisplay(new HourlyGraph(4, 'hourly-graph'));
|
registerDisplay(new HourlyGraph(4, 'hourly-graph'));
|
||||||
|
|||||||
@@ -75,7 +75,10 @@ class Hourly extends WeatherDisplay {
|
|||||||
|
|
||||||
const startingHour = DateTime.local().setZone(timeZone());
|
const startingHour = DateTime.local().setZone(timeZone());
|
||||||
|
|
||||||
const lines = this.data.map((data, index) => {
|
// shorten to 24 hours
|
||||||
|
const shortData = this.data.slice(0, 24);
|
||||||
|
|
||||||
|
const lines = shortData.map((data, index) => {
|
||||||
const fillValues = {};
|
const fillValues = {};
|
||||||
// hour
|
// hour
|
||||||
const hour = startingHour.plus({ hours: index });
|
const hour = startingHour.plus({ hours: index });
|
||||||
@@ -102,7 +105,7 @@ class Hourly extends WeatherDisplay {
|
|||||||
const filledRow = this.fillTemplate('hourly-row', fillValues);
|
const filledRow = this.fillTemplate('hourly-row', fillValues);
|
||||||
|
|
||||||
// alter the color of the feels like column to reflect wind chill or heat index
|
// alter the color of the feels like column to reflect wind chill or heat index
|
||||||
if (feelsLike < temperature) {
|
if (data.apparentTemperature < data.temperature) {
|
||||||
filledRow.querySelector('.like').classList.add('wind-chill');
|
filledRow.querySelector('.like').classList.add('wind-chill');
|
||||||
} else if (feelsLike > temperature) {
|
} else if (feelsLike > temperature) {
|
||||||
filledRow.querySelector('.like').classList.add('heat-index');
|
filledRow.querySelector('.like').classList.add('heat-index');
|
||||||
@@ -203,6 +206,7 @@ const parseForecast = async (data) => {
|
|||||||
const iceAccumulation = expand(data.iceAccumulation.values); // ice icon
|
const iceAccumulation = expand(data.iceAccumulation.values); // ice icon
|
||||||
const probabilityOfPrecipitation = expand(data.probabilityOfPrecipitation.values); // rain icon
|
const probabilityOfPrecipitation = expand(data.probabilityOfPrecipitation.values); // rain icon
|
||||||
const snowfallAmount = expand(data.snowfallAmount.values); // snow icon
|
const snowfallAmount = expand(data.snowfallAmount.values); // snow icon
|
||||||
|
const dewpoint = expand(data.dewpoint.values);
|
||||||
|
|
||||||
const icons = await determineIcon(skyCover, weather, iceAccumulation, probabilityOfPrecipitation, snowfallAmount, windSpeed);
|
const icons = await determineIcon(skyCover, weather, iceAccumulation, probabilityOfPrecipitation, snowfallAmount, windSpeed);
|
||||||
|
|
||||||
@@ -216,6 +220,7 @@ const parseForecast = async (data) => {
|
|||||||
probabilityOfPrecipitation: probabilityOfPrecipitation[idx],
|
probabilityOfPrecipitation: probabilityOfPrecipitation[idx],
|
||||||
skyCover: skyCover[idx],
|
skyCover: skyCover[idx],
|
||||||
icon: icons[idx],
|
icon: icons[idx],
|
||||||
|
dewpoint: temperatureConverter(dewpoint[idx]),
|
||||||
}));
|
}));
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -233,7 +238,7 @@ const determineIcon = async (skyCover, weather, iceAccumulation, probabilityOfPr
|
|||||||
};
|
};
|
||||||
|
|
||||||
// expand a set of values with durations to an hour-by-hour array
|
// expand a set of values with durations to an hour-by-hour array
|
||||||
const expand = (data, maxHours = 24) => {
|
const expand = (data, maxHours = 36) => {
|
||||||
const startOfHour = DateTime.utc().startOf('hour').toMillis();
|
const startOfHour = DateTime.utc().startOf('hour').toMillis();
|
||||||
const result = []; // resulting expanded values
|
const result = []; // resulting expanded values
|
||||||
data.forEach((item) => {
|
data.forEach((item) => {
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ const largeIcon = (link, _isNightTime) => {
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.warn(`largeIcon: ${error.message}`);
|
console.warn(`largeIcon: ${error.message}`);
|
||||||
// Return a fallback icon to prevent downstream errors
|
// Return a fallback icon to prevent downstream errors
|
||||||
return addPath(`No-Data.gif?${conditionIcon}${isNightTime ? '-n' : ''}`);
|
return addPath(`No-Data-Large.gif?${conditionIcon}${isNightTime ? '-n' : ''}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
// find the icon
|
// find the icon
|
||||||
@@ -102,6 +102,8 @@ const largeIcon = (link, _isNightTime) => {
|
|||||||
|
|
||||||
case 'snow_fzra':
|
case 'snow_fzra':
|
||||||
case 'snow_fzra-n':
|
case 'snow_fzra-n':
|
||||||
|
case 'winter_mix':
|
||||||
|
case 'winter_mix-n':
|
||||||
return addPath('Freezing-Rain-Snow.gif');
|
return addPath('Freezing-Rain-Snow.gif');
|
||||||
|
|
||||||
case 'fzra':
|
case 'fzra':
|
||||||
@@ -141,6 +143,8 @@ const largeIcon = (link, _isNightTime) => {
|
|||||||
return addPath('Thunderstorm.gif');
|
return addPath('Thunderstorm.gif');
|
||||||
|
|
||||||
case 'wind_skc':
|
case 'wind_skc':
|
||||||
|
case 'wind_':
|
||||||
|
case 'wind_-n':
|
||||||
return addPath('Windy.gif');
|
return addPath('Windy.gif');
|
||||||
|
|
||||||
case 'wind_skc-n':
|
case 'wind_skc-n':
|
||||||
@@ -169,7 +173,7 @@ const largeIcon = (link, _isNightTime) => {
|
|||||||
default: {
|
default: {
|
||||||
console.warn(`Unknown weather condition '${conditionIcon}' from ${link}; using fallback icon`);
|
console.warn(`Unknown weather condition '${conditionIcon}' from ${link}; using fallback icon`);
|
||||||
// Return a reasonable fallback instead of false to prevent downstream errors
|
// Return a reasonable fallback instead of false to prevent downstream errors
|
||||||
return addPath(`No-Data.gif?${conditionIcon}${isNightTime ? '-n' : ''}`);
|
return addPath(`No-Data-Large.gif?${conditionIcon}${isNightTime ? '-n' : ''}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -133,6 +133,7 @@ const smallIcon = (link, _isNightTime) => {
|
|||||||
|
|
||||||
case 'wind_few':
|
case 'wind_few':
|
||||||
case 'wind_few-n':
|
case 'wind_few-n':
|
||||||
|
case 'wind_':
|
||||||
return addPath('Wind.gif');
|
return addPath('Wind.gif');
|
||||||
|
|
||||||
case 'wind_sct':
|
case 'wind_sct':
|
||||||
@@ -170,7 +171,7 @@ const smallIcon = (link, _isNightTime) => {
|
|||||||
|
|
||||||
case 'blizzard':
|
case 'blizzard':
|
||||||
case 'blizzard-n':
|
case 'blizzard-n':
|
||||||
return addPath('Blowing Snow.gif');
|
return addPath('Blowing-Snow.gif');
|
||||||
|
|
||||||
default:
|
default:
|
||||||
console.warn(`Unknown weather condition '${conditionIcon}' from ${link}; using fallback icon`);
|
console.warn(`Unknown weather condition '${conditionIcon}' from ${link}; using fallback icon`);
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { safeJson } from './utils/fetch.mjs';
|
|||||||
import { getPoint } from './utils/weather.mjs';
|
import { getPoint } from './utils/weather.mjs';
|
||||||
import { debugFlag } from './utils/debug.mjs';
|
import { debugFlag } from './utils/debug.mjs';
|
||||||
import settings from './settings.mjs';
|
import settings from './settings.mjs';
|
||||||
|
import { stationFilter } from './utils/string.mjs';
|
||||||
|
|
||||||
document.addEventListener('DOMContentLoaded', () => {
|
document.addEventListener('DOMContentLoaded', () => {
|
||||||
init();
|
init();
|
||||||
@@ -85,7 +86,15 @@ const getWeather = async (latLon, haveDataCallback) => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const StationId = stations.features[0].properties.stationIdentifier;
|
// filter stations for proper format
|
||||||
|
const stationsFiltered = stations.features.filter(stationFilter);
|
||||||
|
// check for stations available after filtering
|
||||||
|
if (stationsFiltered.length === 0) {
|
||||||
|
console.warn('No observation stations left for location after filtering');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const StationId = stationsFiltered[0].properties.stationIdentifier;
|
||||||
|
|
||||||
let { city } = point.properties.relativeLocation.properties;
|
let { city } = point.properties.relativeLocation.properties;
|
||||||
const { state } = point.properties.relativeLocation.properties;
|
const { state } = point.properties.relativeLocation.properties;
|
||||||
@@ -108,7 +117,7 @@ const getWeather = async (latLon, haveDataCallback) => {
|
|||||||
weatherParameters.timeZone = point.properties.timeZone;
|
weatherParameters.timeZone = point.properties.timeZone;
|
||||||
weatherParameters.forecast = point.properties.forecast;
|
weatherParameters.forecast = point.properties.forecast;
|
||||||
weatherParameters.forecastGridData = point.properties.forecastGridData;
|
weatherParameters.forecastGridData = point.properties.forecastGridData;
|
||||||
weatherParameters.stations = stations.features;
|
weatherParameters.stations = stationsFiltered;
|
||||||
weatherParameters.relativeLocation = point.properties.relativeLocation.properties;
|
weatherParameters.relativeLocation = point.properties.relativeLocation.properties;
|
||||||
|
|
||||||
// update the main process for display purposes
|
// update the main process for display purposes
|
||||||
|
|||||||
@@ -9,10 +9,12 @@ const pixelToFile = (xPixel, yPixel) => {
|
|||||||
return `${yTile}-${xTile}`;
|
return `${yTile}-${xTile}`;
|
||||||
};
|
};
|
||||||
|
|
||||||
// convert a pixel location in the overall map to a pixel location on the tile
|
// convert a pixel location in the overall map to a pixel location on the tile set
|
||||||
const modTile = (xPixel, yPixel) => {
|
const modTile = (xPixel, yPixel) => {
|
||||||
const x = Math.round(xPixel) % TILE_SIZE.x;
|
// adjust for additional 1 tile when odd
|
||||||
const y = Math.round(yPixel) % TILE_SIZE.y;
|
const x = (Math.floor(xPixel) % (TILE_SIZE.x));
|
||||||
|
const y = (Math.floor(yPixel) % (TILE_SIZE.y));
|
||||||
|
|
||||||
return { x, y };
|
return { x, y };
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -46,8 +48,8 @@ const setTiles = (data) => {
|
|||||||
// determine which tiles are used
|
// determine which tiles are used
|
||||||
const usedTiles = [
|
const usedTiles = [
|
||||||
true,
|
true,
|
||||||
TILE_SIZE.x - tileShift.x < RADAR_FINAL_SIZE.width,
|
tileShift.x + TILE_SIZE.x > RADAR_FINAL_SIZE.width,
|
||||||
TILE_SIZE.y - tileShift.y < RADAR_FINAL_SIZE.width,
|
tileShift.y + TILE_SIZE.y > RADAR_FINAL_SIZE.height,
|
||||||
];
|
];
|
||||||
// if we need t[1] and t[2] then we also need t[3]
|
// if we need t[1] and t[2] then we also need t[3]
|
||||||
usedTiles.push(usedTiles[1] && usedTiles[2]);
|
usedTiles.push(usedTiles[1] && usedTiles[2]);
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ const buildForecast = (forecast, city, cityXY) => {
|
|||||||
const getRegionalObservation = async (point, city) => {
|
const getRegionalObservation = async (point, city) => {
|
||||||
try {
|
try {
|
||||||
// get stations using centralized safe handling
|
// get stations using centralized safe handling
|
||||||
const stations = await safeJson(`https://api.weather.gov/gridpoints/${point.wfo}/${point.x},${point.y}/stations?limit=1`);
|
const stations = await safeJson(`https://api.weather.gov/gridpoints/${point.wfo}/${point.x},${point.y}/stations?limit=10`);
|
||||||
|
|
||||||
if (!stations || !stations.features || stations.features.length === 0) {
|
if (!stations || !stations.features || stations.features.length === 0) {
|
||||||
if (debugFlag('verbose-failures')) {
|
if (debugFlag('verbose-failures')) {
|
||||||
@@ -32,9 +32,13 @@ const getRegionalObservation = async (point, city) => {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// get the first station
|
// get the first station with a 4-letter id (generally has appropriate data)
|
||||||
const station = stations.features[0].id;
|
const station4Letter = stations.features.find((station) => {
|
||||||
const stationId = stations.features[0].properties.stationIdentifier;
|
if (station.properties.stationIdentifier.length === 4) return station.properties;
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
const station = station4Letter.id;
|
||||||
|
const stationId = station4Letter.properties.stationIdentifier;
|
||||||
// get the observation data using centralized safe handling
|
// get the observation data using centralized safe handling
|
||||||
const observation = await safeJson(`${station}/observations/latest`);
|
const observation = await safeJson(`${station}/observations/latest`);
|
||||||
|
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ class RegionalForecast extends WeatherDisplay {
|
|||||||
const minMaxLatLon = utils.getMinMaxLatitudeLongitude(sourceXY.x, sourceXY.y, mapOffsetXY.x, mapOffsetXY.y, this.weatherParameters.state);
|
const minMaxLatLon = utils.getMinMaxLatitudeLongitude(sourceXY.x, sourceXY.y, mapOffsetXY.x, mapOffsetXY.y, this.weatherParameters.state);
|
||||||
|
|
||||||
// get a target distance
|
// get a target distance
|
||||||
let targetDistance = 2.5;
|
let targetDistance = 2.4;
|
||||||
if (this.weatherParameters.state === 'HI') targetDistance = 1;
|
if (this.weatherParameters.state === 'HI') targetDistance = 1;
|
||||||
|
|
||||||
// make station info into an array
|
// make station info into an array
|
||||||
|
|||||||
@@ -44,9 +44,11 @@ const kioskChange = (value) => {
|
|||||||
|
|
||||||
if (value) {
|
if (value) {
|
||||||
body.classList.add('kiosk');
|
body.classList.add('kiosk');
|
||||||
|
document.querySelector('#divTwc')?.classList.add('no-cursor');
|
||||||
window.dispatchEvent(new Event('resize'));
|
window.dispatchEvent(new Event('resize'));
|
||||||
} else {
|
} else {
|
||||||
body.classList.remove('kiosk');
|
body.classList.remove('kiosk');
|
||||||
|
document.querySelector('#divTwc')?.classList.remove('no-cursor');
|
||||||
window.dispatchEvent(new Event('resize'));
|
window.dispatchEvent(new Event('resize'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -650,7 +650,7 @@ export const enhanceObservationWithMapClick = async (observationData, options =
|
|||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
data: mapClickProps,
|
data: { ...mapClickProps, timestamp: observationData.timestamp },
|
||||||
wasImproved: true,
|
wasImproved: true,
|
||||||
improvements,
|
improvements,
|
||||||
missingFields: [...mapClickMissingRequired, ...mapClickMissingOptional],
|
missingFields: [...mapClickMissingRequired, ...mapClickMissingOptional],
|
||||||
|
|||||||
@@ -13,7 +13,12 @@ const locationCleanup = (input) => {
|
|||||||
return regexes.reduce((value, regex) => value.replace(regex, ''), input);
|
return regexes.reduce((value, regex) => value.replace(regex, ''), input);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// stations must be 4 alpha characters and not start with the provided list
|
||||||
|
const skipStations = ['U', 'C', 'H', 'W', 'Y', 'T', 'S', 'M', 'O', 'L', 'A', 'F', 'B', 'N', 'V', 'R', 'D', 'E', 'I', 'G', 'J'];
|
||||||
|
const stationFilter = (station) => station.properties.stationIdentifier.match(/^[A-Z]{4}$/) && !skipStations.includes(station.properties.stationIdentifier.slice(0, 1));
|
||||||
|
|
||||||
export {
|
export {
|
||||||
// eslint-disable-next-line import/prefer-default-export
|
|
||||||
locationCleanup,
|
locationCleanup,
|
||||||
|
stationFilter,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -172,6 +172,7 @@ class WeatherDisplay {
|
|||||||
if (this.screenIndex < 0) this.screenIndex = 0;
|
if (this.screenIndex < 0) this.screenIndex = 0;
|
||||||
if (this.okToDrawCurrentDateTime) this.drawCurrentDateTime();
|
if (this.okToDrawCurrentDateTime) this.drawCurrentDateTime();
|
||||||
if (this.okToDrawCurrentConditions) postMessage({ type: 'current-weather-scroll', method: 'start' });
|
if (this.okToDrawCurrentConditions) postMessage({ type: 'current-weather-scroll', method: 'start' });
|
||||||
|
if (!this.okToDrawCurrentConditions) postMessage({ type: 'current-weather-scroll', method: 'non-display' });
|
||||||
if (this.okToDrawCurrentConditions === false) postMessage({ type: 'current-weather-scroll', method: 'hide' });
|
if (this.okToDrawCurrentConditions === false) postMessage({ type: 'current-weather-scroll', method: 'hide' });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -346,7 +346,7 @@ var TimeIndicator;
|
|||||||
TimeIndicator["TL"] = "TL";
|
TimeIndicator["TL"] = "TL";
|
||||||
})(TimeIndicator || (TimeIndicator = {}));
|
})(TimeIndicator || (TimeIndicator = {}));
|
||||||
/**
|
/**
|
||||||
* https://www.aviationweather.gov/taf/decoder
|
* https://web.archive.org/web/20230318235549/https://aviationweather.gov/taf/decoder
|
||||||
*/
|
*/
|
||||||
var WeatherChangeType;
|
var WeatherChangeType;
|
||||||
(function (WeatherChangeType) {
|
(function (WeatherChangeType) {
|
||||||
@@ -2535,7 +2535,8 @@ class MetarParser extends AbstractParser {
|
|||||||
while (i < trendParts.length &&
|
while (i < trendParts.length &&
|
||||||
trendParts[i] !== this.TEMPO &&
|
trendParts[i] !== this.TEMPO &&
|
||||||
trendParts[i] !== this.INTER &&
|
trendParts[i] !== this.INTER &&
|
||||||
trendParts[i] !== this.BECMG) {
|
trendParts[i] !== this.BECMG &&
|
||||||
|
trendParts[i] !== this.RMK) {
|
||||||
if (trendParts[i].startsWith(this.FM) ||
|
if (trendParts[i].startsWith(this.FM) ||
|
||||||
trendParts[i].startsWith(this.TL) ||
|
trendParts[i].startsWith(this.TL) ||
|
||||||
trendParts[i].startsWith(this.AT)) {
|
trendParts[i].startsWith(this.AT)) {
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
right: 60px;
|
right: 60px;
|
||||||
width: 360px;
|
width: 360px;
|
||||||
font-family: 'Star4000 Small';
|
font-family: 'Star4000 Small';
|
||||||
font-size: 32px;
|
font-size: 28px;
|
||||||
@include u.text-shadow();
|
@include u.text-shadow();
|
||||||
text-align: right;
|
text-align: right;
|
||||||
|
|
||||||
@@ -23,6 +23,10 @@
|
|||||||
color: red;
|
color: red;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.dewpoint {
|
||||||
|
color: green;
|
||||||
|
}
|
||||||
|
|
||||||
.cloud {
|
.cloud {
|
||||||
color: lightgrey;
|
color: lightgrey;
|
||||||
}
|
}
|
||||||
@@ -52,32 +56,33 @@
|
|||||||
|
|
||||||
.x-axis {
|
.x-axis {
|
||||||
bottom: 0px;
|
bottom: 0px;
|
||||||
left: 0px;
|
left: 54px;
|
||||||
width: 640px;
|
width: 532px;
|
||||||
height: 20px;
|
height: 20px;
|
||||||
|
|
||||||
.label {
|
.label {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
width: 50px;
|
transform: translateX(-50%);
|
||||||
|
white-space: nowrap;
|
||||||
|
|
||||||
&.l-1 {
|
&.l-1 {
|
||||||
left: 25px;
|
left: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
&.l-2 {
|
&.l-2 {
|
||||||
left: 158px;
|
left: calc(532px / 4 * 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
&.l-3 {
|
&.l-3 {
|
||||||
left: 291px;
|
left: calc(532px / 4 * 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
&.l-4 {
|
&.l-4 {
|
||||||
left: 424px;
|
left: calc(532px / 4 * 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
&.l-5 {
|
&.l-5 {
|
||||||
left: 557px;
|
left: calc(532px / 4 * 4);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -110,10 +115,14 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
&.l-2 {
|
&.l-2 {
|
||||||
top: 140px;
|
top: calc(280px / 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
&.l-3 {
|
&.l-3 {
|
||||||
|
bottom: calc(280px / 3 - 11px);
|
||||||
|
}
|
||||||
|
|
||||||
|
&.l-4 {
|
||||||
bottom: 0px;
|
bottom: 0px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,6 +40,7 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
background-color: #000;
|
background-color: #000;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
z-index: 100;
|
||||||
|
|
||||||
@media (prefers-color-scheme: dark) {
|
@media (prefers-color-scheme: dark) {
|
||||||
background-color: #303030;
|
background-color: #303030;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
327
tests/package-lock.json
generated
327
tests/package-lock.json
generated
@@ -14,12 +14,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@babel/code-frame": {
|
"node_modules/@babel/code-frame": {
|
||||||
"version": "7.27.1",
|
"version": "7.29.0",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
|
||||||
"integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
|
"integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/helper-validator-identifier": "^7.27.1",
|
"@babel/helper-validator-identifier": "^7.28.5",
|
||||||
"js-tokens": "^4.0.0",
|
"js-tokens": "^4.0.0",
|
||||||
"picocolors": "^1.1.1"
|
"picocolors": "^1.1.1"
|
||||||
},
|
},
|
||||||
@@ -28,26 +28,26 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@babel/helper-validator-identifier": {
|
"node_modules/@babel/helper-validator-identifier": {
|
||||||
"version": "7.27.1",
|
"version": "7.28.5",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
|
||||||
"integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
|
"integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.9.0"
|
"node": ">=6.9.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@puppeteer/browsers": {
|
"node_modules/@puppeteer/browsers": {
|
||||||
"version": "2.10.5",
|
"version": "2.13.0",
|
||||||
"resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.10.5.tgz",
|
"resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.13.0.tgz",
|
||||||
"integrity": "sha512-eifa0o+i8dERnngJwKrfp3dEq7ia5XFyoqB17S4gK8GhsQE4/P8nxOfQSE0zQHxzzLo/cmF+7+ywEQ7wK7Fb+w==",
|
"integrity": "sha512-46BZJYJjc/WwmKjsvDFykHtXrtomsCIrwYQPOP7VfMJoZY2bsDF9oROBABR3paDjDcmkUye1Pb1BqdcdiipaWA==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"debug": "^4.4.1",
|
"debug": "^4.4.3",
|
||||||
"extract-zip": "^2.0.1",
|
"extract-zip": "^2.0.1",
|
||||||
"progress": "^2.0.3",
|
"progress": "^2.0.3",
|
||||||
"proxy-agent": "^6.5.0",
|
"proxy-agent": "^6.5.0",
|
||||||
"semver": "^7.7.2",
|
"semver": "^7.7.4",
|
||||||
"tar-fs": "^3.0.8",
|
"tar-fs": "^3.1.1",
|
||||||
"yargs": "^17.7.2"
|
"yargs": "^17.7.2"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
@@ -64,13 +64,13 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/@types/node": {
|
"node_modules/@types/node": {
|
||||||
"version": "22.15.29",
|
"version": "25.5.0",
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.29.tgz",
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-25.5.0.tgz",
|
||||||
"integrity": "sha512-LNdjOkUDlU1RZb8e1kOIUpN1qQUlzGkEtbVNo53vbrwDg5om6oduhm4SiUaPW5ASTXhAiP0jInWG8Qx9fVlOeQ==",
|
"integrity": "sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"undici-types": "~6.21.0"
|
"undici-types": "~7.18.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@types/yauzl": {
|
"node_modules/@types/yauzl": {
|
||||||
@@ -84,9 +84,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/agent-base": {
|
"node_modules/agent-base": {
|
||||||
"version": "7.1.3",
|
"version": "7.1.4",
|
||||||
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
|
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
|
||||||
"integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
|
"integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 14"
|
"node": ">= 14"
|
||||||
@@ -135,28 +135,44 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/b4a": {
|
"node_modules/b4a": {
|
||||||
"version": "1.6.7",
|
"version": "1.8.0",
|
||||||
"resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz",
|
"resolved": "https://registry.npmjs.org/b4a/-/b4a-1.8.0.tgz",
|
||||||
"integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==",
|
"integrity": "sha512-qRuSmNSkGQaHwNbM7J78Wwy+ghLEYF1zNrSeMxj4Kgw6y33O3mXcQ6Ie9fRvfU/YnxWkOchPXbaLb73TkIsfdg==",
|
||||||
"license": "Apache-2.0"
|
"license": "Apache-2.0",
|
||||||
|
"peerDependencies": {
|
||||||
|
"react-native-b4a": "*"
|
||||||
|
},
|
||||||
|
"peerDependenciesMeta": {
|
||||||
|
"react-native-b4a": {
|
||||||
|
"optional": true
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"node_modules/bare-events": {
|
"node_modules/bare-events": {
|
||||||
"version": "2.5.4",
|
"version": "2.8.2",
|
||||||
"resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.4.tgz",
|
"resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz",
|
||||||
"integrity": "sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==",
|
"integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"optional": true
|
"peerDependencies": {
|
||||||
|
"bare-abort-controller": "*"
|
||||||
|
},
|
||||||
|
"peerDependenciesMeta": {
|
||||||
|
"bare-abort-controller": {
|
||||||
|
"optional": true
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"node_modules/bare-fs": {
|
"node_modules/bare-fs": {
|
||||||
"version": "4.1.5",
|
"version": "4.5.6",
|
||||||
"resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.5.tgz",
|
"resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.5.6.tgz",
|
||||||
"integrity": "sha512-1zccWBMypln0jEE05LzZt+V/8y8AQsQQqxtklqaIyg5nu6OAYFhZxPXinJTSG+kU5qyNmeLgcn9AW7eHiCHVLA==",
|
"integrity": "sha512-1QovqDrR80Pmt5HPAsMsXTCFcDYr+NSUKW6nd6WO5v0JBmnItc/irNRzm2KOQ5oZ69P37y+AMujNyNtG+1Rggw==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"optional": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"bare-events": "^2.5.4",
|
"bare-events": "^2.5.4",
|
||||||
"bare-path": "^3.0.0",
|
"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": {
|
"engines": {
|
||||||
"bare": ">=1.16.0"
|
"bare": ">=1.16.0"
|
||||||
@@ -171,11 +187,10 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/bare-os": {
|
"node_modules/bare-os": {
|
||||||
"version": "3.6.1",
|
"version": "3.8.0",
|
||||||
"resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.1.tgz",
|
"resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.8.0.tgz",
|
||||||
"integrity": "sha512-uaIjxokhFidJP+bmmvKSgiMzj2sV5GPHaZVAIktcxcpCyBFFWO+YlikVAdhmUo2vYFvFhOXIAlldqV29L8126g==",
|
"integrity": "sha512-Dc9/SlwfxkXIGYhvMQNUtKaXCaGkZYGcd1vuNUUADVqzu4/vQfvnMkYYOUnt2VwQ2AqKr/8qAVFRtwETljgeFg==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"optional": true,
|
|
||||||
"engines": {
|
"engines": {
|
||||||
"bare": ">=1.14.0"
|
"bare": ">=1.14.0"
|
||||||
}
|
}
|
||||||
@@ -185,25 +200,28 @@
|
|||||||
"resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz",
|
||||||
"integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==",
|
"integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"optional": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"bare-os": "^3.0.1"
|
"bare-os": "^3.0.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/bare-stream": {
|
"node_modules/bare-stream": {
|
||||||
"version": "2.6.5",
|
"version": "2.11.0",
|
||||||
"resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.6.5.tgz",
|
"resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.11.0.tgz",
|
||||||
"integrity": "sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA==",
|
"integrity": "sha512-Y/+iQ49fL3rIn6w/AVxI/2+BRrpmzJvdWt5Jv8Za6Ngqc6V227c+pYjYYgLdpR3MwQ9ObVXD0ZrqoBztakM0rw==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"optional": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"streamx": "^2.21.0"
|
"streamx": "^2.25.0",
|
||||||
|
"teex": "^1.0.1"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
|
"bare-abort-controller": "*",
|
||||||
"bare-buffer": "*",
|
"bare-buffer": "*",
|
||||||
"bare-events": "*"
|
"bare-events": "*"
|
||||||
},
|
},
|
||||||
"peerDependenciesMeta": {
|
"peerDependenciesMeta": {
|
||||||
|
"bare-abort-controller": {
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
"bare-buffer": {
|
"bare-buffer": {
|
||||||
"optional": true
|
"optional": true
|
||||||
},
|
},
|
||||||
@@ -212,10 +230,19 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/bare-url": {
|
||||||
|
"version": "2.4.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.4.0.tgz",
|
||||||
|
"integrity": "sha512-NSTU5WN+fy/L0DDenfE8SXQna4voXuW0FHM7wH8i3/q9khUSchfPbPezO4zSFMnDGIf9YE+mt/RWhZgNRKRIXA==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"bare-path": "^3.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/basic-ftp": {
|
"node_modules/basic-ftp": {
|
||||||
"version": "5.0.5",
|
"version": "5.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
|
"resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.2.0.tgz",
|
||||||
"integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
|
"integrity": "sha512-VoMINM2rqJwJgfdHq6RiUudKt2BV+FY5ZFezP/ypmwayk68+NzzAQy4XXLlqsGD4MCzq3DrmNFD/uUmBJuGoXw==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=10.0.0"
|
"node": ">=10.0.0"
|
||||||
@@ -240,9 +267,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/chalk": {
|
"node_modules/chalk": {
|
||||||
"version": "5.4.1",
|
"version": "5.6.2",
|
||||||
"resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
|
"resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
|
||||||
"integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==",
|
"integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "^12.17.0 || ^14.13 || >=16.0.0"
|
"node": "^12.17.0 || ^14.13 || >=16.0.0"
|
||||||
@@ -252,9 +279,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/chromium-bidi": {
|
"node_modules/chromium-bidi": {
|
||||||
"version": "5.1.0",
|
"version": "14.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-5.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-14.0.0.tgz",
|
||||||
"integrity": "sha512-9MSRhWRVoRPDG0TgzkHrshFSJJNZzfY5UFqUMuksg7zL1yoZIZ3jLB0YAgHclbiAxPI86pBnwDX1tbzoiV8aFw==",
|
"integrity": "sha512-9gYlLtS6tStdRWzrtXaTMnqcM4dudNegMXJxkR0I/CXObHalYeYcAMPrL19eroNZHtJ8DQmu1E+ZNOYu/IXMXw==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"mitt": "^3.0.1",
|
"mitt": "^3.0.1",
|
||||||
@@ -297,9 +324,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/cosmiconfig": {
|
"node_modules/cosmiconfig": {
|
||||||
"version": "9.0.0",
|
"version": "9.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.1.tgz",
|
||||||
"integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
|
"integrity": "sha512-hr4ihw+DBqcvrsEDioRO31Z17x71pUYoNe/4h6Z0wB72p7MU7/9gH8Q3s12NFhHPfYBBOV3qyfUxmr/Yn3shnQ==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"env-paths": "^2.2.1",
|
"env-paths": "^2.2.1",
|
||||||
@@ -332,9 +359,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/debug": {
|
"node_modules/debug": {
|
||||||
"version": "4.4.1",
|
"version": "4.4.3",
|
||||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
|
"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
|
||||||
"integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
|
"integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ms": "^2.1.3"
|
"ms": "^2.1.3"
|
||||||
@@ -363,9 +390,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/devtools-protocol": {
|
"node_modules/devtools-protocol": {
|
||||||
"version": "0.0.1452169",
|
"version": "0.0.1581282",
|
||||||
"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1452169.tgz",
|
"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1581282.tgz",
|
||||||
"integrity": "sha512-FOFDVMGrAUNp0dDKsAU1TorWJUx2JOU1k9xdgBKKJF3IBh/Uhl2yswG5r3TEAOrCiGY2QRp1e6LVDQrCsTKO4g==",
|
"integrity": "sha512-nv7iKtNZQshSW2hKzYNr46nM/Cfh5SEvE2oV0/SEGgc9XupIY5ggf84Cz8eJIkBce7S3bmTAauFD6aysMpnqsQ==",
|
||||||
"license": "BSD-3-Clause"
|
"license": "BSD-3-Clause"
|
||||||
},
|
},
|
||||||
"node_modules/emoji-regex": {
|
"node_modules/emoji-regex": {
|
||||||
@@ -375,9 +402,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/end-of-stream": {
|
"node_modules/end-of-stream": {
|
||||||
"version": "1.4.4",
|
"version": "1.4.5",
|
||||||
"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
|
"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
|
||||||
"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
|
"integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"once": "^1.4.0"
|
"once": "^1.4.0"
|
||||||
@@ -393,9 +420,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/error-ex": {
|
"node_modules/error-ex": {
|
||||||
"version": "1.3.2",
|
"version": "1.3.4",
|
||||||
"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
|
"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz",
|
||||||
"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
|
"integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"is-arrayish": "^0.2.1"
|
"is-arrayish": "^0.2.1"
|
||||||
@@ -462,6 +489,15 @@
|
|||||||
"node": ">=0.10.0"
|
"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": {
|
"node_modules/extract-zip": {
|
||||||
"version": "2.0.1",
|
"version": "2.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
|
||||||
@@ -522,9 +558,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/get-uri": {
|
"node_modules/get-uri": {
|
||||||
"version": "6.0.4",
|
"version": "6.0.5",
|
||||||
"resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.4.tgz",
|
"resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.5.tgz",
|
||||||
"integrity": "sha512-E1b1lFFLvLgak2whF2xDBcOy6NLVGZBqqjJjsIhvopKfWWEi64pLVTWWehV8KlLerZkfNTA95sTe2OdJKm1OzQ==",
|
"integrity": "sha512-b1O07XYq8eRuVzBNgJLstU6FYc1tS6wnMtF1I1D9lE8LxZSOGZ7LhxN54yPP6mGw5f2CkXY2BQUL9Fx41qvcIg==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"basic-ftp": "^5.0.2",
|
"basic-ftp": "^5.0.2",
|
||||||
@@ -578,14 +614,10 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/ip-address": {
|
"node_modules/ip-address": {
|
||||||
"version": "9.0.5",
|
"version": "10.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
|
"resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz",
|
||||||
"integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
|
"integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
|
||||||
"jsbn": "1.1.0",
|
|
||||||
"sprintf-js": "^1.1.3"
|
|
||||||
},
|
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 12"
|
"node": ">= 12"
|
||||||
}
|
}
|
||||||
@@ -612,9 +644,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/js-yaml": {
|
"node_modules/js-yaml": {
|
||||||
"version": "4.1.0",
|
"version": "4.1.1",
|
||||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
|
||||||
"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
|
"integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"argparse": "^2.0.1"
|
"argparse": "^2.0.1"
|
||||||
@@ -623,12 +655,6 @@
|
|||||||
"js-yaml": "bin/js-yaml.js"
|
"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": {
|
"node_modules/json-parse-even-better-errors": {
|
||||||
"version": "2.3.1",
|
"version": "2.3.1",
|
||||||
"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
|
"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
|
||||||
@@ -789,9 +815,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/pump": {
|
"node_modules/pump": {
|
||||||
"version": "3.0.2",
|
"version": "3.0.4",
|
||||||
"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz",
|
||||||
"integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
|
"integrity": "sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"end-of-stream": "^1.1.0",
|
"end-of-stream": "^1.1.0",
|
||||||
@@ -799,18 +825,18 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/puppeteer": {
|
"node_modules/puppeteer": {
|
||||||
"version": "24.10.0",
|
"version": "24.40.0",
|
||||||
"resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-24.10.0.tgz",
|
"resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-24.40.0.tgz",
|
||||||
"integrity": "sha512-Oua9VkGpj0S2psYu5e6mCer6W9AU9POEQh22wRgSXnLXASGH+MwLUVWgLCLeP9QPHHcJ7tySUlg4Sa9OJmaLpw==",
|
"integrity": "sha512-IxQbDq93XHVVLWHrAkFP7F7iHvb9o0mgfsSIMlhHb+JM+JjM1V4v4MNSQfcRWJopx9dsNOr9adYv0U5fm9BJBQ==",
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@puppeteer/browsers": "2.10.5",
|
"@puppeteer/browsers": "2.13.0",
|
||||||
"chromium-bidi": "5.1.0",
|
"chromium-bidi": "14.0.0",
|
||||||
"cosmiconfig": "^9.0.0",
|
"cosmiconfig": "^9.0.0",
|
||||||
"devtools-protocol": "0.0.1452169",
|
"devtools-protocol": "0.0.1581282",
|
||||||
"puppeteer-core": "24.10.0",
|
"puppeteer-core": "24.40.0",
|
||||||
"typed-query-selector": "^2.12.0"
|
"typed-query-selector": "^2.12.1"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
"puppeteer": "lib/cjs/puppeteer/node/cli.js"
|
"puppeteer": "lib/cjs/puppeteer/node/cli.js"
|
||||||
@@ -820,17 +846,18 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/puppeteer-core": {
|
"node_modules/puppeteer-core": {
|
||||||
"version": "24.10.0",
|
"version": "24.40.0",
|
||||||
"resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-24.10.0.tgz",
|
"resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-24.40.0.tgz",
|
||||||
"integrity": "sha512-xX0QJRc8t19iAwRDsAOR38Q/Zx/W6WVzJCEhKCAwp2XMsaWqfNtQ+rBfQW9PlF+Op24d7c8Zlgq9YNmbnA7hdQ==",
|
"integrity": "sha512-MWL3XbUCfVgGR0gRsidzT6oKJT2QydPLhMITU6HoVWiiv4gkb6gJi3pcdAa8q4HwjBTbqISOWVP4aJiiyUJvag==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@puppeteer/browsers": "2.10.5",
|
"@puppeteer/browsers": "2.13.0",
|
||||||
"chromium-bidi": "5.1.0",
|
"chromium-bidi": "14.0.0",
|
||||||
"debug": "^4.4.1",
|
"debug": "^4.4.3",
|
||||||
"devtools-protocol": "0.0.1452169",
|
"devtools-protocol": "0.0.1581282",
|
||||||
"typed-query-selector": "^2.12.0",
|
"typed-query-selector": "^2.12.1",
|
||||||
"ws": "^8.18.2"
|
"webdriver-bidi-protocol": "0.4.1",
|
||||||
|
"ws": "^8.19.0"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=18"
|
"node": ">=18"
|
||||||
@@ -855,9 +882,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/semver": {
|
"node_modules/semver": {
|
||||||
"version": "7.7.2",
|
"version": "7.7.4",
|
||||||
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
|
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
|
||||||
"integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
|
"integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"bin": {
|
"bin": {
|
||||||
"semver": "bin/semver.js"
|
"semver": "bin/semver.js"
|
||||||
@@ -877,12 +904,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/socks": {
|
"node_modules/socks": {
|
||||||
"version": "2.8.4",
|
"version": "2.8.7",
|
||||||
"resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz",
|
"resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",
|
||||||
"integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==",
|
"integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ip-address": "^9.0.5",
|
"ip-address": "^10.0.1",
|
||||||
"smart-buffer": "^4.2.0"
|
"smart-buffer": "^4.2.0"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
@@ -914,23 +941,15 @@
|
|||||||
"node": ">=0.10.0"
|
"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": {
|
"node_modules/streamx": {
|
||||||
"version": "2.22.0",
|
"version": "2.25.0",
|
||||||
"resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.0.tgz",
|
"resolved": "https://registry.npmjs.org/streamx/-/streamx-2.25.0.tgz",
|
||||||
"integrity": "sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==",
|
"integrity": "sha512-0nQuG6jf1w+wddNEEXCF4nTg3LtufWINB5eFEN+5TNZW7KWJp6x87+JFL43vaAUPyCfH1wID+mNVyW6OHtFamg==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"events-universal": "^1.0.0",
|
||||||
"fast-fifo": "^1.3.2",
|
"fast-fifo": "^1.3.2",
|
||||||
"text-decoder": "^1.1.0"
|
"text-decoder": "^1.1.0"
|
||||||
},
|
|
||||||
"optionalDependencies": {
|
|
||||||
"bare-events": "^2.2.0"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/string-width": {
|
"node_modules/string-width": {
|
||||||
@@ -960,9 +979,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/tar-fs": {
|
"node_modules/tar-fs": {
|
||||||
"version": "3.0.9",
|
"version": "3.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.9.tgz",
|
"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.1.2.tgz",
|
||||||
"integrity": "sha512-XF4w9Xp+ZQgifKakjZYmFdkLoSWd34VGKcsTCwlNWM7QG3ZbaxnTsaBwnjFZqHRf/rROxaR8rXnbtwdvaDI+lA==",
|
"integrity": "sha512-QGxxTxxyleAdyM3kpFs14ymbYmNFrfY+pHj7Z8FgtbZ7w2//VAgLMac7sT6nRpIHjppXO2AwwEOg0bPFVRcmXw==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"pump": "^3.0.0",
|
"pump": "^3.0.0",
|
||||||
@@ -974,20 +993,30 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/tar-stream": {
|
"node_modules/tar-stream": {
|
||||||
"version": "3.1.7",
|
"version": "3.1.8",
|
||||||
"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
|
"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.8.tgz",
|
||||||
"integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
|
"integrity": "sha512-U6QpVRyCGHva435KoNWy9PRoi2IFYCgtEhq9nmrPPpbRacPs9IH4aJ3gbrFC8dPcXvdSZ4XXfXT5Fshbp2MtlQ==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"b4a": "^1.6.4",
|
"b4a": "^1.6.4",
|
||||||
|
"bare-fs": "^4.5.5",
|
||||||
"fast-fifo": "^1.2.0",
|
"fast-fifo": "^1.2.0",
|
||||||
"streamx": "^2.15.0"
|
"streamx": "^2.15.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/teex": {
|
||||||
|
"version": "1.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz",
|
||||||
|
"integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"streamx": "^2.12.5"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/text-decoder": {
|
"node_modules/text-decoder": {
|
||||||
"version": "1.2.3",
|
"version": "1.2.7",
|
||||||
"resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz",
|
"resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.7.tgz",
|
||||||
"integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==",
|
"integrity": "sha512-vlLytXkeP4xvEq2otHeJfSQIRyWxo/oZGEbXrtEEF9Hnmrdly59sUbzZ/QgyWuLYHctCHxFF4tRQZNQ9k60ExQ==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"b4a": "^1.6.4"
|
"b4a": "^1.6.4"
|
||||||
@@ -1000,18 +1029,24 @@
|
|||||||
"license": "0BSD"
|
"license": "0BSD"
|
||||||
},
|
},
|
||||||
"node_modules/typed-query-selector": {
|
"node_modules/typed-query-selector": {
|
||||||
"version": "2.12.0",
|
"version": "2.12.1",
|
||||||
"resolved": "https://registry.npmjs.org/typed-query-selector/-/typed-query-selector-2.12.0.tgz",
|
"resolved": "https://registry.npmjs.org/typed-query-selector/-/typed-query-selector-2.12.1.tgz",
|
||||||
"integrity": "sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==",
|
"integrity": "sha512-uzR+FzI8qrUEIu96oaeBJmd9E7CFEiQ3goA5qCVgc4s5llSubcfGHq9yUstZx/k4s9dXHVKsE35YWoFyvEqEHA==",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/undici-types": {
|
"node_modules/undici-types": {
|
||||||
"version": "6.21.0",
|
"version": "7.18.2",
|
||||||
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
|
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
|
||||||
"integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
|
"integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true
|
"optional": true
|
||||||
},
|
},
|
||||||
|
"node_modules/webdriver-bidi-protocol": {
|
||||||
|
"version": "0.4.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/webdriver-bidi-protocol/-/webdriver-bidi-protocol-0.4.1.tgz",
|
||||||
|
"integrity": "sha512-ARrjNjtWRRs2w4Tk7nqrf2gBI0QXWuOmMCx2hU+1jUt6d00MjMxURrhxhGbrsoiZKJrhTSTzbIrc554iKI10qw==",
|
||||||
|
"license": "Apache-2.0"
|
||||||
|
},
|
||||||
"node_modules/wrap-ansi": {
|
"node_modules/wrap-ansi": {
|
||||||
"version": "7.0.0",
|
"version": "7.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
|
||||||
@@ -1036,9 +1071,9 @@
|
|||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
"node_modules/ws": {
|
"node_modules/ws": {
|
||||||
"version": "8.18.2",
|
"version": "8.20.0",
|
||||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.2.tgz",
|
"resolved": "https://registry.npmjs.org/ws/-/ws-8.20.0.tgz",
|
||||||
"integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==",
|
"integrity": "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=10.0.0"
|
"node": ">=10.0.0"
|
||||||
@@ -1103,9 +1138,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/zod": {
|
"node_modules/zod": {
|
||||||
"version": "3.25.49",
|
"version": "3.25.76",
|
||||||
"resolved": "https://registry.npmjs.org/zod/-/zod-3.25.49.tgz",
|
"resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
|
||||||
"integrity": "sha512-JMMPMy9ZBk3XFEdbM3iL1brx4NUSejd6xr3ELrrGEfGb355gjhiAWtG3K5o+AViV/3ZfkIrCzXsZn6SbLwTR8Q==",
|
"integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"funding": {
|
"funding": {
|
||||||
"url": "https://github.com/sponsors/colinhacks"
|
"url": "https://github.com/sponsors/colinhacks"
|
||||||
|
|||||||
@@ -36,7 +36,7 @@
|
|||||||
const OVERRIDES = <%- JSON.stringify(OVERRIDES ?? {}) %>;
|
const OVERRIDES = <%- JSON.stringify(OVERRIDES ?? {}) %>;
|
||||||
</script>
|
</script>
|
||||||
<% } else { %>
|
<% } 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">const OVERRIDES={};</script>-->
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
OVERRIDES = <%- JSON.stringify(OVERRIDES ?? {}) %>;
|
OVERRIDES = <%- JSON.stringify(OVERRIDES ?? {}) %>;
|
||||||
@@ -62,7 +62,7 @@
|
|||||||
<script type="module" src="scripts/modules/radar.mjs"></script>
|
<script type="module" src="scripts/modules/radar.mjs"></script>
|
||||||
<script type="module" src="scripts/modules/settings.mjs"></script>
|
<script type="module" src="scripts/modules/settings.mjs"></script>
|
||||||
<script type="module" src="scripts/modules/media.mjs"></script>
|
<script type="module" src="scripts/modules/media.mjs"></script>
|
||||||
<script type="module" src="scripts/modules/custom-rss-feed.mjs"></script>
|
<script type="module" src="scripts/modules/custom-scroll-text.mjs"></script>
|
||||||
<script type="module" src="scripts/index.mjs"></script>
|
<script type="module" src="scripts/index.mjs"></script>
|
||||||
<% } %>
|
<% } %>
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
<div class="main has-scroll hourly-graph">
|
<div class="main has-scroll hourly-graph">
|
||||||
<div class="top-right template ">
|
<div class="top-right template ">
|
||||||
<div class="temperature">Temperature</div>
|
<div class="temperature">Temperature</div>
|
||||||
|
<div class="dewpoint">Dewpoint</div>
|
||||||
<div class="cloud">Cloud %</div>
|
<div class="cloud">Cloud %</div>
|
||||||
<div class="rain">Precip %</div>
|
<div class="rain">Precip %</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -9,6 +10,7 @@
|
|||||||
<div class="label l-1">75</div>
|
<div class="label l-1">75</div>
|
||||||
<div class="label l-2">65</div>
|
<div class="label l-2">65</div>
|
||||||
<div class="label l-3">55</div>
|
<div class="label l-3">55</div>
|
||||||
|
<div class="label l-4">45</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="chart">
|
<div class="chart">
|
||||||
<img id="chart-area"></img>
|
<img id="chart-area"></img>
|
||||||
|
|||||||
Reference in New Issue
Block a user