Merge branch 'ios-metar-regex'

gulp/publish-frontend.mjs

@@ -97,11 +97,16 @@ const copyCss = () => src(cssSources)
 const htmlSources = [
 	'views/*.ejs',
 ];
-const compressHtml = async () => {
+const packageJson = await readFile('package.json');
-	const packageJson = await readFile('package.json');
+let { version } = JSON.parse(packageJson);
-	const { version } = JSON.parse(packageJson);
+const previewVersion = async () => {
+	// generate a relatively unique timestamp for cache invalidation of the preview site
+	const now = new Date();
+	const msNow = now.getTime() % 1_000_000;
+	version = msNow.toString();
+};
 
-	return src(htmlSources)
+const compressHtml = async () => src(htmlSources)
 	.pipe(ejs({
 		production: version,
 		serverAvailable: false,
@@ -112,7 +117,6 @@ const compressHtml = async () => {
 	.pipe(rename({ extname: '.html' }))
 	.pipe(htmlmin({ collapseWhitespace: true }))
 	.pipe(dest('./dist'));
-};
 
 const otherFiles = [
 	'server/robots.txt',
@@ -205,7 +209,7 @@ const buildDist = series(clean, parallel(buildJs, compressJsVendor, copyCss, com
 // 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
 const publishFrontend = series(buildDist, uploadImages, upload, invalidate);
-const stageFrontend = series(buildDist, uploadImagesPreview, uploadPreview, invalidatePreview);
+const stageFrontend = series(previewVersion, buildDist, uploadImagesPreview, uploadPreview, invalidatePreview);
 
 export default publishFrontend;
 

package.json

@@ -56,6 +56,7 @@
 		"dotenv": "^17.0.1",
 		"ejs": "^3.1.5",
 		"express": "^5.1.0",
-		"metar-taf-parser": "^9.0.0"
+		"metar-taf-parser": "^9.0.0",
+		"npm": "^11.6.0"
 	}
 }

server/scripts/modules/utils/metar.mjs

@@ -3,13 +3,32 @@ import { parseMetar } from '../../vendor/auto/metar-taf-parser.mjs';
 // eslint-disable-next-line import/extensions
 import en from '../../vendor/auto/locale/en.js';
 
+// metar-taf-parser requires regex lookbehind
+// this does not work in iOS < 16.4
+// this is a detection algorithm for iOS versions
+const isIos = /iP(ad|od|hone)/i.test(window.navigator.userAgent);
+let iosVersionOk = false;
+if (isIos) {
+	// regex match the version string
+	const iosVersionRaw = /OS (\d+)_(\d+)/.exec(window.navigator.userAgent);
+	// check for match
+	if (iosVersionRaw) {
+		// break into parts
+		const iosVersionMajor = parseInt(iosVersionRaw[1], 10);
+		const iosVersionMinor = parseInt(iosVersionRaw[2], 10);
+		if (iosVersionMajor > 16) iosVersionOk = true;
+		if (iosVersionMajor === 16 && iosVersionMinor >= 4) iosVersionOk = true;
+	}
+}
+
 /**
  * Augment observation data by parsing METAR when API fields are missing
  * @param {Object} observation - The observation object from the API
  * @returns {Object} - Augmented observation with parsed METAR data filled in
  */
 const augmentObservationWithMetar = (observation) => {
-	if (!observation?.rawMessage) {
+	// check for a metar message and for unusable ios versions
+	if (!observation?.rawMessage || (isIos && !iosVersionOk)) {
 		return observation;
 	}