Enhance hosted apps liveliness classification

DanielHerr · DanielHerr · commit 3f87d7b664c4 · 2025-11-06T19:22:31.000-05:00
diff --git a/src/pages/[category]/[page].astro b/src/pages/[category]/[page].astro
@@ -8,6 +8,7 @@ import Footer from "../../components/footer.astro"
 import AppsList from "../../components/apps_list.astro"
 
 import categories from "../../categories.json" with { type: "json" }
+import { live } from "../../validate_hosted_apps.js"
 
 const characters = [ "1", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" ]
 
@@ -24,7 +25,9 @@ export async function getStaticPaths() {
 
 let { category, page } = Astro.params
 
-let apps = await Content.getCollection("metadata", function(app) {
+let packaged = await Content.getCollection("metadata", app => app.data.app_type != "hosted")
+
+let apps = packaged.concat(live).filter(function(app) {
 	if(! app.data.categories.includes(category)) {
 		return false
 	}
diff --git a/src/pages/[category]/index.astro b/src/pages/[category]/index.astro
@@ -7,14 +7,17 @@ import Metadata from "../../components/common_metadata.astro"
 import AppsList from "../../components/apps_list.astro"
 
 import categories from "../../categories.json" with { type: "json" }
+import { live } from "../../validate_hosted_apps.js"
 
 export async function getStaticPaths() {
 	return categories.map(category => ({ params: { category: category.slug }, props: { category } }))
 }
 
 let { category } = Astro.props
 
-let apps = await Content.getCollection("metadata", ({ data }) => data.categories.includes(category.slug))
+let packaged = await Content.getCollection("metadata", app => app.data.app_type != "hosted")
+let apps = packaged.concat(live).filter(app => app.data.categories.includes(category.slug))
+
 ---
 
 <!doctype html>
diff --git a/src/pages/all/[page].astro b/src/pages/all/[page].astro
@@ -7,6 +7,8 @@ import Header from "../../components/header.astro"
 import Footer from "../../components/footer.astro"
 import AppsList from "../../components/apps_list.astro"
 
+import { live } from "../../validate_hosted_apps.js"
+
 const characters = [ "1", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" ]
 
 export async function getStaticPaths() {
@@ -17,7 +19,9 @@ export async function getStaticPaths() {
 
 let { page } = Astro.params
 
-let apps = await Content.getCollection("metadata", function(app) {
+let packaged = await Content.getCollection("metadata", app => app.data.app_type != "hosted")
+
+let apps = packaged.concat(live).filter(function(app) {
 	let name = app.data.name["en-US"] ?? app.data.name.en ?? app.data.name[app.data.default_locale]
 	let starting = name[0].toUpperCase()
 	if(! characters.includes(starting)) {
diff --git a/src/pages/all/index.astro b/src/pages/all/index.astro
@@ -7,7 +7,10 @@ import Header from "../../components/header.astro"
 import Footer from "../../components/footer.astro"
 import AppsList from "../../components/apps_list.astro"
 
-let apps = await Content.getCollection("metadata")
+import { live } from "../../validate_hosted_apps.js"
+
+let packaged = await Content.getCollection("metadata", app => app.data.app_type != "hosted")
+let apps = packaged.concat(live)
 ---
 
 <!doctype html>
diff --git a/src/pages/dead/[page].astro b/src/pages/dead/[page].astro
@@ -7,7 +7,7 @@ import Header from "../../components/header.astro"
 import Footer from "../../components/footer.astro"
 import AppsList from "../../components/apps_list.astro"
 
-import { dead, total } from "../../validateHostedApps.js"
+import { dead } from "../../validate_hosted_apps.js"
 
 const characters = [ "1", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" ]
 
diff --git a/src/pages/dead/index.astro b/src/pages/dead/index.astro
@@ -5,7 +5,7 @@ import Header from "../../components/header.astro"
 import Footer from "../../components/footer.astro"
 import AppsList from "../../components/apps_list.astro"
 
-import { dead, total } from "../../validateHostedApps.js"
+import { dead } from "../../validate_hosted_apps.js"
 ---
 
 <!doctype html>
@@ -22,7 +22,6 @@ import { dead, total } from "../../validateHostedApps.js"
 			<header>
 				<h2>All Dead Hosted Apps</h2>
 			</header>
-			<p>Found { dead.length } dead hosted apps out of { total } total hosted apps.</p>
 			<AppsList apps={ dead }/>
 		</main>
 		<Footer/>
diff --git a/src/pages/hosted/[page].astro b/src/pages/hosted/[page].astro
@@ -7,6 +7,8 @@ import Header from "../../components/header.astro"
 import Footer from "../../components/footer.astro"
 import AppsList from "../../components/apps_list.astro"
 
+import { live } from "../../validate_hosted_apps.js"
+
 const characters = [ "1", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" ]
 
 export async function getStaticPaths() {
@@ -17,10 +19,7 @@ export async function getStaticPaths() {
 
 let { page } = Astro.params
 
-let apps = await Content.getCollection("metadata", function(app) {
-	if(app.data.app_type != "hosted") {
-		return false
-	}
+let apps = live.filter(app => {
 	let name = app.data.name["en-US"] ?? app.data.name.en ?? app.data.name[app.data.default_locale]
 	let starting = name[0].toUpperCase()
 	if(! characters.includes(starting)) {
diff --git a/src/pages/hosted/index.astro b/src/pages/hosted/index.astro
@@ -1,13 +1,11 @@
 ---
-import * as Content from "astro:content"
-
 import Imports from "../../components/common_imports.astro"
 import Metadata from "../../components/common_metadata.astro"
 import Header from "../../components/header.astro"
 import Footer from "../../components/footer.astro"
 import AppsList from "../../components/apps_list.astro"
 
-let hosted = await Content.getCollection("metadata", ({ data }) => data.app_type == "hosted")
+import { live } from "../../validate_hosted_apps.js"
 ---
 
 <!doctype html>
@@ -24,7 +22,7 @@ let hosted = await Content.getCollection("metadata", ({ data }) => data.app_type
 			<header>
 				<h2>All Hosted Apps</h2>
 			</header>
-			<AppsList apps={ hosted }/>
+			<AppsList apps={ live }/>
 		</main>
 		<Footer/>
 	</body>
diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -23,12 +23,11 @@ import Categories from "../components/categories.astro"
 			<p><a href="all/1">All Apps</a></p>
 			<p><a href="packaged/1">Packaged Apps - can be installed here</a></p>
 			<p><a href="privileged/1">Privileged Apps - cannot be installed directly and must be sideloaded using developer tools</a></p>
-			<p><a href="hosted/1">All Hosted Apps</a></p>
-			<p><a href="live/1">Live Hosted Apps - can be installed, but might no longer function</a></p>
+			<p><a href="hosted/1">Hosted Apps - possibly installable, but might no longer function</a></p>
 			<p><a href="dead/1">Dead Hosted Apps - cannot be installed</a></p>
 			<Categories/>
 			<p>
-				Firefox apps can be installed on any version of Firefox OS and on old versions of the Firefox web browser v16 - v46.<br>
+				Firefox apps can be installed on any version of Firefox OS and on old versions of the Firefox web browser until v46.<br>
 				<a href="https://ftp.mozilla.org/pub/firefox/releases/45.9.0esr/">Firefox desktop v45</a><br>
 				<a href="https://archive.mozilla.org/pub/mobile/releases/45.0.2/">Firefox Android v45</a><br>
 				<a href="https://freesoft.net/android/firefox_os_25_developer_preview">Firefox OS 2.5 Android launcher</a>
diff --git a/src/pages/live/[page].astro b/src/pages/live/[page].astro
diff --git a/src/pages/live/index.astro b/src/pages/live/index.astro
diff --git a/src/validateHostedApps.js b/src/validateHostedApps.js
diff --git a/src/validate_hosted_apps.js b/src/validate_hosted_apps.js
@@ -0,0 +1,40 @@
+import * as Content from "astro:content"
+
+async function check_html(url) {
+	try {
+		let response = await fetch(url)
+		if(response.ok) {
+			let type = response.headers.get("content-type")
+			return type && (type.includes("text/html") || type.includes("application/xhtml+xml"))
+		}
+	} catch {
+		return false
+} }
+
+let apps = await Content.getCollection("metadata", ({ data }) => data.app_type == "hosted")
+let total = apps.length
+let live = [], dead = []
+
+for await(let app of apps) {
+	let manifest = new URL(app.data.manifest_url)
+	try {
+		let response = await fetch(manifest)
+		if(response.ok) {
+			await response.json()
+			live.push(app)
+		} else {
+			throw new Error()
+		}
+	} catch {
+		let parent = new URL(manifest.pathname.split("/").slice(0, -1).join("/"), manifest.origin)
+		let root = new URL("/", manifest.origin)
+
+		if(await check_html(parent)) {
+			live.push(app)
+		} else if(await check_html(root)) {
+			live.push(app)
+		} else {
+			dead.push(app)
+} } }
+
+export { live, dead, total }
