[release] version 0.5.0-unstable19

changelog.md

@@ -6,6 +6,8 @@
  - Fixed issues that prevented from login in with different hostnames
  - Added more infoon the shield when blocking someone
  - Fixed home background image
+ - Fixed issue where the UI would have missing icon images
+ - Improved icon fetching for apps by following redirections
 
 ## Version 0.4.3
  - Fix for exposing routes from the details page

client/src/utils/routes.jsx

@@ -59,7 +59,8 @@ export const getFaviconURL = (route) => {
   const addRemote = (url) => {
     return '/cosmos/api/favicon?q=' + encodeURIComponent(url)
   }
-  if(route.Mode == "SERVAPP") {
+
+  if(route.Mode == "SERVAPP" || route.Mode == "PROXY") {
     return addRemote(route.Target)
   } else if (route.Mode == "STATIC") {
     return Folder;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cosmos-server",
-  "version": "0.5.0-unstable18",
+  "version": "0.5.0-unstable19",
   "description": "",
   "main": "test-server.js",
   "bugs": {

src/icons.go

@@ -4,13 +4,13 @@ import (
 	"net/http"
 	"net/url"
 	// "fmt"
+	"strings"
 	"os"
 	"io/ioutil"
+	"regexp"
 	"encoding/json"
-	"strconv"
 
 	"github.com/azukaar/cosmos-server/src/utils" 
-	"go.deanishe.net/favicon"
 )
 
 type CachedImage struct {
@@ -21,6 +21,25 @@ type CachedImage struct {
 
 var cache = make(map[string]CachedImage)
 
+func ExtractFaviconMetaTag(html string) string {
+	// Regular expression pattern to match the favicon metatag
+	pattern := `<link[^>]*rel="icon"[^>]*href="([^"]+)"[^>]*>`
+
+	// Compile the regular expression pattern
+	regex := regexp.MustCompile(pattern)
+
+	// Find the first match in the HTML string
+	match := regex.FindStringSubmatch(html)
+
+	if len(match) > 1 {
+		// Extract the URL from the matched metatag
+		faviconURL := match[1]
+		return faviconURL
+	}
+
+	return "/favicon.ico"
+}
+
 func sendImage(w http.ResponseWriter, image CachedImage) {
 		// Copy the response to the output
 		w.Header().Set("Content-Type", image.ContentType)
@@ -74,70 +93,48 @@ func GetFavicon(w http.ResponseWriter, req *http.Request) {
 			return
 		}
 
-		// follow siteurl and check if any redirect. if yes, use the final url
+		// follow siteurl and check if any redirect. 
 		respNew, err := http.Get(siteurl)
 		if err != nil {
 			utils.Error("FaviconFetch", err)
 			sendFallback(w)
 			return
 		}
-		siteurl = respNew.Request.URL.String()
-		
-		icons, err := favicon.Find(siteurl)
-		utils.Debug("Found Favicon: " + strconv.Itoa(len(icons)))
+
+		urlBody, err := ioutil.ReadAll(respNew.Body)
 		if err != nil {
 			utils.Error("FaviconFetch", err)
 			sendFallback(w)
 			return
 		}
-		
-		if len(icons) == 0 {
-			utils.Error("FaviconFetch", err)
-			sendFallback(w)
-			return
-		}
 
-		iconIndex := len(icons)-1
-		iconChanged := false
+		// get favicon meta tag from the response
+		faviconURL := ExtractFaviconMetaTag((string)(urlBody))
 
-		for i, icon := range icons {
-			utils.Debug("Favicon Width: " + icon.URL + " " + strconv.Itoa(icon.Width))
-			if icon.Width <= 256 {
-				iconIndex = i
-				iconChanged = true
-				break
+		// if faviconURL is relative get hostname of the URL and append icon
+		if !strings.HasPrefix(faviconURL, "http") {
+			u, err := url.Parse(siteurl)
+			if err != nil {
+				utils.Error("FaviconFetch", err)
+				sendFallback(w)
+				return
 			}
+			if !strings.HasPrefix(faviconURL, "/") {
+				faviconURL = "/" + faviconURL
+			}
+			faviconURL = u.Scheme + "://" + u.Host + faviconURL
 		}
-		if !iconChanged {
-			iconIndex = 0
-		}
-		icon := icons[iconIndex]
-
-		utils.Log("Favicon: " + icon.URL)
+		
+		utils.Log("Favicon: " + faviconURL)
 
 		// Fetch the favicon
-		resp, err := http.Get(icon.URL)
+		resp, err := http.Get(faviconURL)
 		if err != nil {
 			utils.Error("FaviconFetch", err)
 			sendFallback(w)
 			return
 		}
 
-		// save the body to a file
-		// out, err := os.Create("favicon.ico")
-		// if err != nil {
-		// 	utils.Error("FaviconFetch", err)
-		// 	utils.HTTPError(w, "Favicon Fetch", http.StatusInternalServerError, "FA001")
-		// 	return
-		// }
-		// defer out.Close()
-		// _, err = io.Copy(out, resp.Body)
-		// if err != nil {
-		// 	utils.Error("FaviconFetch", err)
-		// 	utils.HTTPError(w, "Favicon Fetch", http.StatusInternalServerError, "FA001")
-		// 	return
-		// }
-
 		// Cache the response 
 		body, err := ioutil.ReadAll(resp.Body)
 		if err != nil {