eric/WeatherStar4000
1
0
Fork 0
mirror of https://github.com/netbymatt/ws4kp.git synced 2026-04-18 09:39:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream/main: integrate radar worker removal and improvements

Browse Source 
- Remove radar-worker.mjs and integrate functionality into radar-processor.mjs
- Update package.json and gulpfile.mjs with upstream changes
This commit is contained in:
Eddy G
2025-06-27 11:05:32 -04:00
parent 17585e97c4 15107ffe1c
commit 90c1ab92b4
8 changed files with 117 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
server/scripts/modules/radar.mjs
View File

@@ -5,33 +5,14 @@ import { safeText } from './utils/fetch.mjs';
import WeatherDisplay from './weatherdisplay.mjs';
import { registerDisplay, timeZone } from './navigation.mjs';
import * as utils from './radar-utils.mjs';
import { rewriteUrl } from './utils/url-rewrite.mjs';
import { debugFlag } from './utils/debug.mjs';
import { version } from './progress.mjs';
import setTiles from './radar-tiles.mjs';
// TEMPORARY fix to disable radar on ios safari. The same engine (webkit) is
// used for all ios browers (chrome, brave, firefox, etc) so it's safe to skip
// any subsequent narrowing of the user-agent.
const isIos = /iP(ad|od|hone)/i.test(window.navigator.userAgent);
// NOTE: iMessages/Messages preview is provided by an Apple scraper that uses a
// user-agent similar to: `Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_1)
// AppleWebKit/601.2.4 (KHTML, like Gecko) Version/9.0.1 Safari/601.2.4
// facebookexternalhit/1.1 Facebot Twitterbot/1.0`. There is currently a bug in
// Messages macos/ios where a constantly crashing website seems to cause an
// entire Messages thread to permanently lockup until the individual website
// preview is deleted! Messages ios will judder but allows the message to be
// deleted eventually. Messages macos beachballs forever and prevents the
// successful deletion. See
// https://github.com/netbymatt/ws4kp/issues/74#issuecomment-2921154962 for more
// context.
const isBot = /twitterbot|Facebot/i.test(window.navigator.userAgent);
import processRadar from './radar-processor.mjs';
// Use OVERRIDE_RADAR_HOST if provided, otherwise default to mesonet
const RADAR_HOST = (typeof OVERRIDES !== 'undefined' ? OVERRIDES?.RADAR_HOST : undefined) || 'mesonet.agron.iastate.edu';
class Radar extends WeatherDisplay {
constructor(navId, elemId) {
super(navId, elemId, 'Local Radar', !isIos && !isBot);
super(navId, elemId, 'Local Radar');
this.okToDrawCurrentConditions = false;
this.okToDrawCurrentDateTime = false;
@@ -72,12 +53,6 @@ class Radar extends WeatherDisplay {
return;
}
// get the workers started
if (!this.workers) {
// get some web workers started
this.workers = (new Array(this.dopplerRadarImageMax)).fill(null).map(() => radarWorker());
}
const baseUrl = `https://${RADAR_HOST}/archive/data/`;
const baseUrlEnd = '/GIS/uscomp/?F=0&P=n0r*.png'; // This URL returns an index of .png files for the given date
@@ -163,11 +138,12 @@ class Radar extends WeatherDisplay {
// Load the most recent doppler radar images.
try {
const radarInfo = await Promise.all(urls.map(async (url, index) => {
const processedRadar = await this.workers[index].processRadar({
url: rewriteUrl(url).toString(), // Apply URL rewriting for caching; convert to string for worker
const radarInfo = await Promise.all(urls.map(async (url) => {
const processedRadar = await processRadar({
url,
RADAR_HOST,
OVERRIDES,
radarSourceXY,
debug: debugFlag('radar'),
});
// store the time
@@ -184,15 +160,7 @@ class Radar extends WeatherDisplay {
zone: 'UTC',
}).setZone(timeZone());
const onscreenCanvas = document.createElement('canvas');
onscreenCanvas.width = processedRadar.width;
onscreenCanvas.height = processedRadar.height;
const onscreenContext = onscreenCanvas.getContext('bitmaprenderer');
onscreenContext.transferFromImageBitmap(processedRadar);
const dataUrl = onscreenCanvas.toDataURL();
const elem = this.fillTemplate('frame', { map: { type: 'img', src: dataUrl } });
const elem = this.fillTemplate('frame', { map: { type: 'img', src: processedRadar } });
return {
time,
elem,
@@ -233,50 +201,5 @@ class Radar extends WeatherDisplay {
}
}
// create a radar worker with helper functions
const radarWorker = () => {
// create the worker
const worker = new Worker(`/resources/radar-worker.mjs?_=${version()}`, { type: 'module' });
const processRadar = (data) => new Promise((resolve, reject) => {
if (debugFlag('radar')) {
console.log('[RADAR-MAIN] Posting to worker at:', new Date().toISOString(), 'File:', data.url.split('/').pop());
}
// prepare for done message
worker.onmessage = (e) => {
if (debugFlag('radar')) {
console.log('[RADAR-MAIN] Received from worker at:', new Date().toISOString(), 'Data type:', e?.data?.constructor?.name);
}
if (e?.data?.error) {
console.warn('[RADAR-MAIN] Worker error:', e.data.message);
// Worker encountered an error
reject(new Error(e.data.message));
} else if (e?.data instanceof Error) {
console.warn('[RADAR-MAIN] Worker exception:', e.data);
reject(e.data);
} else if (e?.data instanceof ImageBitmap) {
if (debugFlag('radar')) {
console.log('[RADAR-MAIN] Successfully received ImageBitmap, size:', e.data.width, 'x', e.data.height);
}
resolve(e.data);
}
};
// start up the worker
worker.postMessage({
...data,
debug: debugFlag('radar'),
});
});
// return the object
return {
processRadar,
};
};
// register display
// TEMPORARY: except on IOS and bots
if (!isIos && !isBot) {
registerDisplay(new Radar(11, 'radar'));
}
registerDisplay(new Radar(11, 'radar'));