Fixed double "/" in path & priority to <head>

victrme · Mar 5, 2024 · 84cc257 · 84cc257
1 parent e423005
commit 84cc257
Showing 1 changed file with 24 additions and 20 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -80,22 +80,22 @@ async function foundIconUrls(query: string): Promise<string[]> {
 	}
 
 	//
-	// Step 3: Put all potential icon paths in a list
+	// Step 3: Put and sort all potential icon paths in a list
 
 	const icons: Icon[] = []
 	const html = await fetchBody(query)
 
 	if (html) {
 		const head = parseHead(html)
-		icons.push(...head.icons)
+		icons.push(...sortClosestToSize(head.icons, 144))
 
 		if (head.manifest) {
 			const path = fullpath(head.manifest, query)
 			const manifest = await fetchManifest(path)
 
 			if (manifest) {
-				const json = parseManifest(manifest)
-				icons.push(...json)
+				const manifestIcons = parseManifest(manifest)
+				icons.push(...sortClosestToSize(manifestIcons, 144))
 			}
 		}
 	}
@@ -109,9 +109,9 @@ async function foundIconUrls(query: string): Promise<string[]> {
 	}
 
 	//
-	// Step 4: Return sorted icons around specific size
+	// Step 4: Return list of href
 
-	return sortClosestToSize(icons, 144).map(({ href }) => fullpath(href, query))
+	return icons.map((icon) => icon.href)
 }
 
 //
@@ -241,26 +241,30 @@ function parseHead(html: string): Head {
 //
 
 function fullpath(url: string, query: string): string {
+	if (!url) return ''
+
+	let queryURL: URL
+
 	try {
-		const { hostname, protocol, pathname } = new URL(query)
+		queryURL = new URL(query)
+	} catch (_) {
+		return '' // ... error handling ?
+	}
 
-		if (!url) return ''
+	const { hostname, protocol, pathname } = queryURL
 
-		// It means (https:)//
-		if (url.startsWith('//')) {
-			url = `${protocol}${url}`
-		}
+	if (url.startsWith('http')) {
+		return url
+	}
 
-		// If icon from root, only add protocol & hostname
-		// Absolute path, also gets pathname
-		if (!url.startsWith('http')) {
-			url = `${protocol}//${hostname}${url.startsWith('/') ? '' : pathname + '/'}${url}`
-		}
-	} catch (_) {
-		// ... error handling ?
+	// It means (https:)//
+	if (url.startsWith('//')) {
+		return `${protocol}${url}`
 	}
 
-	return url
+	// If icon from root, only add protocol & hostname
+	// Absolute path, also gets pathname
+	return `${protocol}//${hostname}${url.startsWith('/') ? '' : pathname}${url}`
 }
 
 function sortClosestToSize(icons: Icon[], val: number): Icon[] {