5.25.1

chore(docker): fix pushing on tag

.eslintignore

@@ -1,2 +0,0 @@
-*.min.*
-server/scripts/vendor/*

.eslintrc

@@ -1,92 +0,0 @@
-{
-	"env": {
-		"browser": true,
-		"es6": true,
-		"node": true
-	},
-	"extends": [
-		"airbnb-base"
-	],
-	"globals": {
-		"TravelCities": "readonly",
-		"RegionalCities": "readonly",
-		"StationInfo": "readonly",
-		"SunCalc": "readonly",
-		"NoSleep": "readonly",
-		"OVERRIDES": "readonly"
-	},
-	"parserOptions": {
-		"ecmaVersion": "latest",
-		"sourceType": "module"
-	},
-	"plugins": [],
-	"rules": {
-		"indent": [
-			"error",
-			"tab",
-			{
-				"SwitchCase": 1
-			}
-		],
-		"no-tabs": 0,
-		"no-console": 0,
-		"max-len": 0,
-		"no-use-before-define": [
-			"error",
-			{
-				"variables": false
-			}
-		],
-		"no-param-reassign": [
-			"error",
-			{
-				"props": false
-			}
-		],
-		"no-mixed-operators": [
-			"error",
-			{
-				"groups": [
-					[
-						"&",
-						"|",
-						"^",
-						"~",
-						"<<",
-						">>",
-						">>>"
-					],
-					[
-						"==",
-						"!=",
-						"===",
-						"!==",
-						">",
-						">=",
-						"<",
-						"<="
-					],
-					[
-						"&&",
-						"||"
-					],
-					[
-						"in",
-						"instanceof"
-					]
-				],
-				"allowSamePrecedence": true
-			}
-		],
-		"import/extensions": [
-			"error",
-			{
-				"mjs": "always",
-				"json": "always"
-			}
-		]
-	},
-	"ignorePatterns": [
-		"*.min.js"
-	]
-}

.github/workflows/build-docker.yaml

@@ -3,7 +3,7 @@ name: build-docker
 on:
   push:
     branches:
-      - main
+      - '**'
     tags:
       - 'v*.*.*'
       - 'v*.*'
@@ -49,8 +49,8 @@ jobs:
         with:
           context: .
           pull: true
-          push: ${{ github.ref == 'refs/heads/main' }}
+          push: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') }}
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
+          platforms: linux/amd64,linux/arm64/v8
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha

.npmrc

@@ -0,0 +1 @@
+legacy-peer-deps=true

README.md

@@ -139,6 +139,11 @@ Ws4kp is muted by default, but if it was unmuted on the last visit it is coded t
 
 Chrome seems to be more lenient on auto play and will eventually let a site auto-play music if you're visited it enough recently and manually clicked to start playing music on each visit. It also has a flag you can add to the command line when launching Chrome: `chrome.exe --autoplay-policy=no-user-gesture-required`. This is the best solution when using Kiosk-style setup.
 
+If you're unable to pre-set the play state before entering kiosk mode (such as with a home dashboard implemenation) you can add the query string value below to the url. The browser will still follow the auto play rules outlined above.
+```
+?settings-mediaPlaying-boolean=true
+```
+
 ## Community Notes
 
 Thanks to the WeatherStar community for providing these discussions to further extend your retro forecasts!

cors/index.mjs

@@ -1,45 +0,0 @@
-// pass through api requests
-
-// http(s) modules
-import https from 'https';
-
-// url parsing
-import queryString from 'querystring';
-
-// return an express router
-const cors = (req, res) => {
-	// add out-going headers
-	const headers = {};
-	headers['user-agent'] = '(WeatherStar 4000+, ws4000@netbymatt.com)';
-	headers.accept = req.headers.accept;
-
-	// get query paramaters if the exist
-	const queryParams = Object.keys(req.query).reduce((acc, key) => {
-		// skip the paramater 'u'
-		if (key === 'u') return acc;
-		// add the paramter to the resulting object
-		acc[key] = req.query[key];
-		return acc;
-	}, {});
-	let query = queryString.encode(queryParams);
-	if (query.length > 0) query = `?${query}`;
-
-	// get the page
-	https.get(`https://api.weather.gov${req.path}${query}`, {
-		headers,
-	}, (getRes) => {
-		// pull some info
-		const { statusCode } = getRes;
-		// pass the status code through
-		res.status(statusCode);
-
-		// set headers
-		res.header('content-type', getRes.headers['content-type']);
-		// pipe to response
-		getRes.pipe(res);
-	}).on('error', (e) => {
-		console.error(e);
-	});
-};
-
-export default cors;

cors/outlook.mjs

@@ -1,46 +0,0 @@
-// pass through api requests
-
-// http(s) modules
-import https from 'https';
-
-// url parsing
-import queryString from 'querystring';
-
-// return an express router
-const outlook = (req, res) => {
-	// add out-going headers
-	const headers = {};
-	headers['user-agent'] = '(WeatherStar 4000+, ws4000@netbymatt.com)';
-	headers.accept = req.headers.accept;
-
-	// get query paramaters if the exist
-	const queryParams = Object.keys(req.query).reduce((acc, key) => {
-		// skip the paramater 'u'
-		if (key === 'u') return acc;
-		// add the paramter to the resulting object
-		acc[key] = req.query[key];
-		return acc;
-	}, {});
-	let query = queryString.encode(queryParams);
-	if (query.length > 0) query = `?${query}`;
-
-	// get the page
-	https.get(`https://www.cpc.ncep.noaa.gov/${req.path}${query}`, {
-		headers,
-	}, (getRes) => {
-		// pull some info
-		const { statusCode } = getRes;
-		// pass the status code through
-		res.status(statusCode);
-
-		// set headers
-		res.header('content-type', getRes.headers['content-type']);
-		res.header('last-modified', getRes.headers['last-modified']);
-		// pipe to response
-		getRes.pipe(res);
-	}).on('error', (e) => {
-		console.error(e);
-	});
-};
-
-export default outlook;

cors/radar.mjs

@@ -1,46 +0,0 @@
-// pass through api requests
-
-// http(s) modules
-import https from 'https';
-
-// url parsing
-import queryString from 'querystring';
-
-// return an express router
-const radar = (req, res) => {
-	// add out-going headers
-	const headers = {};
-	headers['user-agent'] = '(WeatherStar 4000+, ws4000@netbymatt.com)';
-	headers.accept = req.headers.accept;
-
-	// get query paramaters if the exist
-	const queryParams = Object.keys(req.query).reduce((acc, key) => {
-		// skip the paramater 'u'
-		if (key === 'u') return acc;
-		// add the paramter to the resulting object
-		acc[key] = req.query[key];
-		return acc;
-	}, {});
-	let query = queryString.encode(queryParams);
-	if (query.length > 0) query = `?${query}`;
-
-	// get the page
-	https.get(`https://radar.weather.gov${req.path}${query}`, {
-		headers,
-	}, (getRes) => {
-		// pull some info
-		const { statusCode } = getRes;
-		// pass the status code through
-		res.status(statusCode);
-
-		// set headers
-		res.header('content-type', getRes.headers['content-type']);
-		res.header('last-modified', getRes.headers['last-modified']);
-		// pipe to response
-		getRes.pipe(res);
-	}).on('error', (e) => {
-		console.error(e);
-	});
-};
-
-export default radar;

eslint.config.mjs

@@ -0,0 +1,105 @@
+import { FlatCompat } from '@eslint/eslintrc';
+
+const compat = new FlatCompat({
+});
+
+export default [{
+	ignores: [
+		'*.min.*',
+		'server/scripts/vendor/*',
+		'dist/**/*',
+	],
+},
+...compat.config({
+	env: {
+		browser: true,
+		es6: true,
+		node: true,
+	},
+	extends: [
+		'airbnb-base',
+	],
+	globals: {
+		TravelCities: 'readonly',
+		RegionalCities: 'readonly',
+		StationInfo: 'readonly',
+		SunCalc: 'readonly',
+		NoSleep: 'readonly',
+		OVERRIDES: 'readonly',
+	},
+	parserOptions: {
+		ecmaVersion: 'latest',
+		sourceType: 'module',
+	},
+	plugins: [],
+	rules: {
+		indent: [
+			'error',
+			'tab',
+			{
+				SwitchCase: 1,
+			},
+		],
+		'no-tabs': 0,
+		'no-console': 0,
+		'max-len': 0,
+		'no-use-before-define': [
+			'error',
+			{
+				variables: false,
+			},
+		],
+		'no-param-reassign': [
+			'error',
+			{
+				props: false,
+			},
+		],
+		'no-mixed-operators': [
+			'error',
+			{
+				groups: [
+					[
+						'&',
+						'|',
+						'^',
+						'~',
+						'<<',
+						'>>',
+						'>>>',
+					],
+					[
+						'==',
+						'!=',
+						'===',
+						'!==',
+						'>',
+						'>=',
+						'<',
+						'<=',
+					],
+					[
+						'&&',
+						'||',
+					],
+					[
+						'in',
+						'instanceof',
+					],
+				],
+				allowSamePrecedence: true,
+			},
+		],
+		'import/extensions': [
+			'error',
+			{
+				mjs: 'always',
+				json: 'always',
+			},
+		],
+	},
+	ignorePatterns: [
+		'*.min.js',
+	],
+}),
+];

gulp/publish-frontend.mjs

@@ -96,6 +96,29 @@ const buildJs = () => src(mjsSources)
 	.pipe(webpack(webpackOptions))
 	.pipe(dest(RESOURCES_PATH));
 
+const workerSources = [
+	'./server/scripts/modules/radar-worker.mjs',
+];
+
+const buildWorkers = () => {
+	// update the file name in the webpack options
+	const output = {
+		chunkFilename: '[id].mjs',
+		chunkFormat: 'module',
+		filename: '[name].mjs',
+	};
+	const workerWebpackOptions = {
+		...webpackOptions,
+		output,
+		entry: {
+			'radar-worker': workerSources[0],
+		},
+	};
+	return src(workerSources)
+		.pipe(webpack(workerWebpackOptions))
+		.pipe(dest(RESOURCES_PATH));
+};
+
 const cssSources = [
 	'server/styles/main.css',
 ];
@@ -137,6 +160,8 @@ const s3 = s3Upload({
 const uploadSources = [
 	'dist/**',
 	'!dist/**/*.map',
+	'!dist/images/**/*',
+	'!dist/fonts/**/*',
 ];
 const upload = () => src(uploadSources, { base: './dist', encoding: false })
 	.pipe(s3({
@@ -167,6 +192,9 @@ const uploadImages = () => src(imageSources, { base: './server', encoding: false
 		}),
 	);
 
+const copyImageSources = () => src(imageSources, { base: './server', encoding: false })
+	.pipe(dest('./dist'));
+
 const invalidate = () => cloudfront.send(new CreateInvalidationCommand({
 	DistributionId: process.env.DISTRIBUTION_ID,
 	InvalidationBatch: {
@@ -184,7 +212,7 @@ const buildPlaylist = async () => {
 	return file('playlist.json', JSON.stringify(playlist)).pipe(dest('./dist'));
 };
 
-const buildDist = series(clean, parallel(buildJs, compressJsData, compressJsVendor, copyCss, compressHtml, copyOtherFiles, buildPlaylist));
+const buildDist = series(clean, parallel(buildJs, buildWorkers, compressJsData, compressJsVendor, copyCss, compressHtml, copyOtherFiles, copyImageSources, buildPlaylist));
 
 // upload_images could be in parallel with upload, but _images logs a lot and has little changes
 // by running upload last the majority of the changes will be at the bottom of the log for easy viewing

index.mjs

@@ -1,9 +1,6 @@
 import 'dotenv/config';
 import express from 'express';
 import fs from 'fs';
-import corsPassThru from './cors/index.mjs';
-import radarPassThru from './cors/radar.mjs';
-import outlookPassThru from './cors/outlook.mjs';
 import playlist from './src/playlist.mjs';
 import OVERRIDES from './src/overrides.mjs';
 
@@ -13,12 +10,6 @@ const port = process.env.WS4KP_PORT ?? 8080;
 // template engine
 app.set('view engine', 'ejs');
 
-// cors pass-thru to api.weather.gov
-app.get('/stations/*station', corsPassThru);
-app.get('/Conus/*radar', radarPassThru);
-app.get('/products/*product', outlookPassThru);
-app.get('/playlist.json', playlist);
-
 // version
 const { version } = JSON.parse(fs.readFileSync('package.json'));
 
@@ -81,8 +72,6 @@ const geoip = (req, res) => {
 // debugging
 if (process.env?.DIST === '1') {
 	// distribution
-	app.use('/images', express.static('./server/images'));
-	app.use('/fonts', express.static('./server/fonts'));
 	app.use('/scripts', express.static('./server/scripts'));
 	app.use('/geoip', geoip);
 	app.use('/', express.static('./dist'));
@@ -90,8 +79,11 @@ if (process.env?.DIST === '1') {
 	// debugging
 	app.get('/index.html', index);
 	app.use('/geoip', geoip);
+	app.use('/resources', express.static('./server/scripts/modules'));
 	app.get('/', index);
 	app.get('*name', express.static('./server'));
+	// cors pass-thru to api.weather.gov
+	app.get('/playlist.json', playlist);
 }
 
 const server = app.listen(port, () => {

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ws4kp",
-	"version": "5.21.15",
+	"version": "5.25.1",
 	"description": "Welcome to the WeatherStar 4000+ project page!",
 	"main": "index.mjs",
 	"type": "module",
@@ -23,15 +23,18 @@
 	"homepage": "https://github.com/netbymatt/ws4kp#readme",
 	"devDependencies": {
 		"@aws-sdk/client-cloudfront": "^3.609.0",
+		"@eslint/eslintrc": "^3.3.1",
+		"ajv": "^8.17.1",
 		"del": "^8.0.0",
-		"eslint": "^8.2.0",
+		"eslint": "^9.0.0",
-		"eslint-config-airbnb-base": "^15.0.0",
+		"eslint-config-airbnb-base": "15.0.0",
 		"eslint-plugin-import": "^2.10.0",
 		"gulp": "^5.0.0",
 		"gulp-awspublish": "^8.0.0",
 		"gulp-concat": "^2.6.1",
 		"gulp-ejs": "^5.1.0",
 		"gulp-file": "^0.4.0",
+		"gulp-html-minifier-terser": "^7.1.0",
 		"gulp-rename": "^2.0.0",
 		"gulp-s3-uploader": "^1.0.6",
 		"gulp-sass": "^6.0.0",
@@ -42,8 +45,8 @@
 		"suncalc": "^1.8.0",
 		"swiped-events": "^1.1.4",
 		"terser-webpack-plugin": "^5.3.6",
-		"webpack-stream": "^7.0.0",
+		"webpack": "^5.99.9",
-		"gulp-html-minifier-terser": "^7.1.0"
+		"webpack-stream": "^7.0.0"
 	},
 	"dependencies": {
 		"dotenv": "^16.5.0",