Merge branch 'main' into kubernetes

src/utils/config/api-response.js

@@ -56,9 +56,12 @@ export async function servicesResponse() {
 
   try {
     discoveredDockerServices = cleanServiceGroups(await servicesFromDocker());
+    if (discoveredDockerServices?.length === 0) {
+      console.debug("No containers were found with homepage labels.");
+    }
   } catch (e) {
     console.error("Failed to discover services, please check docker.yaml for errors or remove example entries.");
-    if (e) console.error(e);
+    if (e) console.error(e.toString());
     discoveredDockerServices = [];
   }
 
@@ -66,7 +69,7 @@ export async function servicesResponse() {
     discoveredKubernetesServices = cleanServiceGroups(await servicesFromKubernetes());
   } catch (e) {
     console.error("Failed to discover services, please check kubernetes.yaml for errors or remove example entries.");
-    if (e) console.error(e);
+    if (e) console.error(e.toString());
     discoveredKubernetesServices = [];
   }
 
@@ -74,7 +77,7 @@ export async function servicesResponse() {
     configuredServices = cleanServiceGroups(await servicesFromConfig());
   } catch (e) {
     console.error("Failed to load services.yaml, please check for errors");
-    if (e) console.error(e);
+    if (e) console.error(e.toString());
     configuredServices = [];
   }
 
@@ -82,7 +85,7 @@ export async function servicesResponse() {
     initialSettings = await getSettings();
   } catch (e) {
     console.error("Failed to load settings.yaml, please check for errors");
-    if (e) console.error(e);
+    if (e) console.error(e.toString());
     initialSettings = {};
   }
 

src/utils/config/docker.js

@@ -22,11 +22,14 @@ export default function getDockerArguments(server) {
 
   if (servers[server]) {
     if (servers[server].socket) {
-      return { socketPath: servers[server].socket };
+      return { conn: { socketPath: servers[server].socket }, swarm: !!servers[server].swarm };
     }
 
     if (servers[server].host) {
-      return { host: servers[server].host, port: servers[server].port || null };
+      return {
+        conn: { host: servers[server].host, port: servers[server].port || null },
+        swarm: !!servers[server].swarm,
+      };
     }
 
     return servers[server];

src/utils/config/service-helpers.js

@@ -49,36 +49,41 @@ export async function servicesFromDocker() {
 
   const serviceServers = await Promise.all(
     Object.keys(servers).map(async (serverName) => {
-      const docker = new Docker(getDockerArguments(serverName));
-      const containers = await docker.listContainers({
-        all: true,
-      });
-
-      // bad docker connections can result in a <Buffer ...> object?
-      // in any case, this ensures the result is the expected array
-      if (!Array.isArray(containers)) {
-        return [];
-      }
-
-      const discovered = containers.map((container) => {
-        let constructedService = null;
-
-        Object.keys(container.Labels).forEach((label) => {
-          if (label.startsWith("homepage.")) {
-            if (!constructedService) {
-              constructedService = {
-                container: container.Names[0].replace(/^\//, ""),
-                server: serverName,
-              };
-            }
-            shvl.set(constructedService, label.replace("homepage.", ""), container.Labels[label]);
-          }
+      try {
+        const docker = new Docker(getDockerArguments(serverName).conn);
+        const containers = await docker.listContainers({
+          all: true,
         });
 
-        return constructedService;
-      });
+        // bad docker connections can result in a <Buffer ...> object?
+        // in any case, this ensures the result is the expected array
+        if (!Array.isArray(containers)) {
+          return [];
+        }
 
-      return { server: serverName, services: discovered.filter((filteredService) => filteredService) };
+        const discovered = containers.map((container) => {
+          let constructedService = null;
+
+          Object.keys(container.Labels).forEach((label) => {
+            if (label.startsWith("homepage.")) {
+              if (!constructedService) {
+                constructedService = {
+                  container: container.Names[0].replace(/^\//, ""),
+                  server: serverName,
+                };
+              }
+              shvl.set(constructedService, label.replace("homepage.", ""), container.Labels[label]);
+            }
+          });
+
+          return constructedService;
+        });
+
+        return { server: serverName, services: discovered.filter((filteredService) => filteredService) };
+      } catch (e) {
+        // a server failed, but others may succeed
+        return { server: serverName, services: [] };
+      }
     })
   );
 

src/utils/proxy/handlers/credentialed.js

@@ -7,7 +7,7 @@ import widgets from "widgets/widgets";
 
 const logger = createLogger("credentialedProxyHandler");
 
-export default async function credentialedProxyHandler(req, res) {
+export default async function credentialedProxyHandler(req, res, map) {
   const { group, service, endpoint } = req.query;
 
   if (group && service) {
@@ -36,6 +36,8 @@ export default async function credentialedProxyHandler(req, res) {
         headers["X-API-Token"] = `${widget.key}`;
       } else if (widget.type === "tubearchivist") {
         headers.Authorization = `Token ${widget.key}`;
+      } else if (widget.type === "miniflux") {
+        headers["X-Auth-Token"] = `${widget.key}`;
       } else {
         headers["X-API-Key"] = `${widget.key}`;
       }
@@ -47,6 +49,8 @@ export default async function credentialedProxyHandler(req, res) {
         headers,
       });
 
+      let resultData = data;
+
       if (status === 204 || status === 304) {
         return res.status(status).end();
       }
@@ -59,8 +63,12 @@ export default async function credentialedProxyHandler(req, res) {
         return res.status(500).json({error: {message: "Invalid data", url, data}});
       }
 
+      if (status === 200 && map) {
+        resultData = map(data);
+      }
+
       if (contentType) res.setHeader("Content-Type", contentType);
-      return res.status(status).send(data);
+      return res.status(status).send(resultData);
     }
   }