From a1b03ea762b48397abc51de4df9fa0ea86db5fd9 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Wed, 12 Oct 2022 14:32:22 -0700
Subject: [PATCH 1/4] Add service ping

---
 src/components/services/item.jsx | 10 ++++++++-
 src/components/services/ping.jsx | 35 ++++++++++++++++++++++++++++++++
 src/pages/api/ping.js            | 22 ++++++++++++++++++++
 src/utils/proxy/http.js          |  2 +-
 4 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 src/components/services/ping.jsx
 create mode 100644 src/pages/api/ping.js

diff --git a/src/components/services/item.jsx b/src/components/services/item.jsx
index ed0cef2d..25e94266 100644
--- a/src/components/services/item.jsx
+++ b/src/components/services/item.jsx
@@ -4,6 +4,7 @@ import { useContext, useState } from "react";
 
 import Status from "./status";
 import Widget from "./widget";
+import Ping from "./ping";
 
 import Docker from "widgets/docker/component";
 import { SettingsContext } from "utils/contexts/settings";
@@ -102,11 +103,18 @@ export default function Item({ service }) {
             </div>
           )}
 
+          {service.ping && (
+            <div className="flex-shrink-0 flex items-center justify-center w-5 mr-4 cursor-pointer">
+              <Ping service={service} />
+              <span className="sr-only">Ping status</span>
+            </div>
+          )}
+
           {service.container && (
             <button
               type="button"
               onClick={() => (statsOpen ? closeStats() : setStatsOpen(true))}
-              className="flex-shrink-0 flex items-center justify-center w-12 cursor-pointer"
+              className="flex-shrink-0 flex items-center justify-center w-5 mr-4 cursor-pointer"
             >
               <Status service={service} />
               <span className="sr-only">View container stats</span>
diff --git a/src/components/services/ping.jsx b/src/components/services/ping.jsx
new file mode 100644
index 00000000..951a624d
--- /dev/null
+++ b/src/components/services/ping.jsx
@@ -0,0 +1,35 @@
+import { BsArrowDownCircle, BsArrowUpCircle } from "react-icons/bs";
+import useSWR from "swr";
+
+export default function Ping({ service }) {
+  const { data, error } = useSWR(`/api/ping?${new URLSearchParams({ping: service.ping}).toString()}`, {
+    refreshInterval: 5000
+  });
+
+  if (error) {
+    return <div className="w-3 h-3 text-xs text-rose-300 dark:text-rose-500" title={data.status}>&darr;</div>;
+  }
+  
+  if (!data) {
+    return <div className="w-3 h-3 text-[10px] text-black/20 dark:text-white/40">PING</div>;
+  }
+
+  const statusText = `${service.ping}: HTTP status ${data.status}`;
+  
+  if (data && data.status !== 200) {
+    return (
+      <div className="w-3 h-3 text-xs text-rose-300 dark:text-rose-500" title={statusText}>
+        <BsArrowDownCircle />
+      </div>
+    );
+  }
+  
+  if (data && data.status === 200) {
+    return (
+      <div className="w-3 h-3 text-xs text-emerald-300 dark:text-emerald-500" title={statusText}>
+        <BsArrowUpCircle />
+      </div>
+    );
+  }
+
+}
diff --git a/src/pages/api/ping.js b/src/pages/api/ping.js
new file mode 100644
index 00000000..548f1d9b
--- /dev/null
+++ b/src/pages/api/ping.js
@@ -0,0 +1,22 @@
+import { servicesFromConfig } from "utils/config/service-helpers";
+import createLogger from "utils/logger";
+import { httpProxy } from "utils/proxy/http";
+
+const logger = createLogger("ping");
+
+export default async function handler(req, res) {
+    const { ping: pingURL } = req.query;
+
+    if (!pingURL) {
+        logger.debug("No ping URL specified");
+        return res.status(400).send({
+        error: "No ping URL given",
+        });
+    }
+
+    const [status] = await httpProxy(pingURL);
+
+    return res.status(200).json({
+      status: status,
+    });
+}
diff --git a/src/utils/proxy/http.js b/src/utils/proxy/http.js
index 4eba83f3..8f180a7f 100644
--- a/src/utils/proxy/http.js
+++ b/src/utils/proxy/http.js
@@ -96,7 +96,7 @@ export async function httpProxy(url, params = {}) {
     return [status, contentType, data, responseHeaders];
   }
   catch (err) {
-    logger.error("Error calling %s//%s%s...", url.protocol, url.hostname, url.pathname);
+    logger.error("Error calling %s//%s%s...", constructedUrl.protocol, constructedUrl.hostname, constructedUrl.pathname);
     logger.error(err);
     return [500, "application/json", { error: "Unexpected error" }, null];
   }

From ac03795fe6adb14f84c5634aa4a93a49543557e1 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Fri, 14 Oct 2022 14:14:38 -0700
Subject: [PATCH 2/4] redesign ping & docker status

---
 public/locales/en/common.json      |  8 ++++++-
 src/components/services/item.jsx   | 38 ++++++++++++++++--------------
 src/components/services/ping.jsx   | 23 ++++++++++++------
 src/components/services/status.jsx | 27 +++++++++++++++++----
 src/pages/api/ping.js              |  3 +--
 5 files changed, 66 insertions(+), 33 deletions(-)

diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index d53d480c..c1b35aa7 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -47,7 +47,13 @@
         "tx": "TX",
         "mem": "MEM",
         "cpu": "CPU",
-        "offline": "Offline"
+        "offline": "Offline",
+        "error": "Error",
+        "unknown": "Unknown"
+    },
+    "ping": {
+        "error": "Error",
+        "ping": "Ping"
     },
     "emby": {
         "playing": "Playing",
diff --git a/src/components/services/item.jsx b/src/components/services/item.jsx
index 25e94266..a4b54ad3 100644
--- a/src/components/services/item.jsx
+++ b/src/components/services/item.jsx
@@ -65,7 +65,7 @@ export default function Item({ service }) {
       <div
         className={`${
           hasLink ? "cursor-pointer " : " "
-        }transition-all h-15 mb-3 p-1 rounded-md font-medium text-theme-700 dark:text-theme-200 dark:hover:text-theme-300 shadow-md shadow-theme-900/10 dark:shadow-theme-900/20 bg-theme-100/20 hover:bg-theme-300/20 dark:bg-white/5 dark:hover:bg-white/10`}
+        }transition-all h-15 mb-3 p-1 rounded-md font-medium text-theme-700 dark:text-theme-200 dark:hover:text-theme-300 shadow-md shadow-theme-900/10 dark:shadow-theme-900/20 bg-theme-100/20 hover:bg-theme-300/20 dark:bg-white/5 dark:hover:bg-white/10 relative`}
       >
         <div className="flex select-none">
           {service.icon &&
@@ -103,23 +103,25 @@ export default function Item({ service }) {
             </div>
           )}
 
-          {service.ping && (
-            <div className="flex-shrink-0 flex items-center justify-center w-5 mr-4 cursor-pointer">
-              <Ping service={service} />
-              <span className="sr-only">Ping status</span>
-            </div>
-          )}
-
-          {service.container && (
-            <button
-              type="button"
-              onClick={() => (statsOpen ? closeStats() : setStatsOpen(true))}
-              className="flex-shrink-0 flex items-center justify-center w-5 mr-4 cursor-pointer"
-            >
-              <Status service={service} />
-              <span className="sr-only">View container stats</span>
-            </button>
-          )}
+          <div className="absolute top-0 right-0 w-1/2 flex flex-row justify-end gap-2 mr-2">
+              {service.container && (
+                <button
+                  type="button"
+                  onClick={() => (statsOpen ? closeStats() : setStatsOpen(true))}
+                  className="flex-shrink-0 flex items-center justify-center cursor-pointer"
+                >
+                  <Status service={service} />
+                  <span className="sr-only">View container stats</span>
+                </button>
+              )}
+              
+              {service.ping && (
+                <div className="flex-shrink-0 flex items-center justify-center cursor-pointer">
+                  <Ping service={service} />
+                  <span className="sr-only">Ping status</span>
+                </div>
+              )}
+          </div>
         </div>
 
         {service.container && service.server && (
diff --git a/src/components/services/ping.jsx b/src/components/services/ping.jsx
index 951a624d..18ad8696 100644
--- a/src/components/services/ping.jsx
+++ b/src/components/services/ping.jsx
@@ -1,33 +1,42 @@
-import { BsArrowDownCircle, BsArrowUpCircle } from "react-icons/bs";
+import { useTranslation } from "react-i18next";
 import useSWR from "swr";
 
 export default function Ping({ service }) {
+  const { t } = useTranslation();
   const { data, error } = useSWR(`/api/ping?${new URLSearchParams({ping: service.ping}).toString()}`, {
     refreshInterval: 5000
   });
 
   if (error) {
-    return <div className="w-3 h-3 text-xs text-rose-300 dark:text-rose-500" title={data.status}>&darr;</div>;
+    return (
+      <div className="w-auto px-1.5 py-0.5 text-center bg-theme-500/10 dark:bg-theme-900/50 rounded-b-[3px] overflow-hidden">
+        <div className="text-[8px] font-bold text-rose-500 uppercase">{t("ping.error")}</div>
+      </div>
+    );
   }
   
   if (!data) {
-    return <div className="w-3 h-3 text-[10px] text-black/20 dark:text-white/40">PING</div>;
+    return (
+      <div className="w-auto px-1.5 py-0.5 text-center bg-theme-500/10 dark:bg-theme-900/50 rounded-b-[3px] overflow-hidden">
+        <div className="text-[8px] font-bold text-black/20 dark:text-white/40 uppercase">{t("ping.ping")}</div>
+      </div>
+    );
   }
 
   const statusText = `${service.ping}: HTTP status ${data.status}`;
   
   if (data && data.status !== 200) {
     return (
-      <div className="w-3 h-3 text-xs text-rose-300 dark:text-rose-500" title={statusText}>
-        <BsArrowDownCircle />
+      <div className="w-auto px-1.5 py-0.5 text-center bg-theme-500/10 dark:bg-theme-900/50 rounded-b-[3px] overflow-hidden" title={statusText}>
+        <div className="text-[8px] font-bold text-rose-500/80">{data.status}</div>
       </div>
     );
   }
   
   if (data && data.status === 200) {
     return (
-      <div className="w-3 h-3 text-xs text-emerald-300 dark:text-emerald-500" title={statusText}>
-        <BsArrowUpCircle />
+      <div className="w-auto px-1.5 py-0.5 text-center bg-theme-500/10 dark:bg-theme-900/50 rounded-b-[3px] overflow-hidden" title={statusText}>
+        <div className="text-[8px] font-bold text-emerald-500/80">{data.status}</div>
       </div>
     );
   }
diff --git a/src/components/services/status.jsx b/src/components/services/status.jsx
index dc903408..2d07e49e 100644
--- a/src/components/services/status.jsx
+++ b/src/components/services/status.jsx
@@ -1,19 +1,36 @@
+import { useTranslation } from "react-i18next";
 import useSWR from "swr";
 
 export default function Status({ service }) {
+  const { t } = useTranslation();
+
   const { data, error } = useSWR(`/api/docker/status/${service.container}/${service.server || ""}`);
 
   if (error) {
-    return <div className="w-3 h-3 bg-rose-300 dark:bg-rose-500 rounded-full" />;
+    <div className="w-auto px-1.5 py-0.5 text-center bg-theme-500/10 dark:bg-theme-900/50 rounded-b-[3px] overflow-hidden" title={data.status}>
+      <div className="text-[8px] font-bold text-rose-500/80 uppercase">{t("docker.error")}</div>
+    </div>
   }
 
   if (data && data.status === "running") {
-    return <div className="w-3 h-3 bg-emerald-300 dark:bg-emerald-500 rounded-full" />;
+    return (
+      <div className="w-auto px-1.5 py-0.5 text-center bg-theme-500/10 dark:bg-theme-900/50 rounded-b-[3px] overflow-hidden" title={data.status}>
+        <div className="text-[8px] font-bold text-emerald-500/80 uppercase">{data.status}</div>
+      </div>
+    );
   }
 
-  if (data && data.status === "not found") {
-    return <div className="h-2.5 w-2.5 bg-orange-400/50 dark:bg-yellow-200/40 -rotate-45" />;
+  if (data && (data.status === "not found" || data.status === "exited")) {
+    return (
+      <div className="w-auto px-1.5 py-0.5 text-center bg-theme-500/10 dark:bg-theme-900/50 rounded-b-[3px] overflow-hidden" title={data.status}>
+        <div className="text-[8px] font-bold text-orange-400/50 dark:text-orange-400/80 uppercase">{data.status}</div>
+      </div>
+    );
   }
 
-  return <div className="w-3 h-3 bg-black/20 dark:bg-white/40 rounded-full" />;
+  return (
+    <div className="w-auto px-1.5 py-0.5 text-center bg-theme-500/10 dark:bg-theme-900/50 rounded-b-[3px] overflow-hidden">
+      <div className="text-[8px] font-bold text-black/20 dark:text-white/40 uppercase">{t("docker.unknown")}</div>
+    </div>
+  );
 }
diff --git a/src/pages/api/ping.js b/src/pages/api/ping.js
index 548f1d9b..46ffda65 100644
--- a/src/pages/api/ping.js
+++ b/src/pages/api/ping.js
@@ -1,4 +1,3 @@
-import { servicesFromConfig } from "utils/config/service-helpers";
 import createLogger from "utils/logger";
 import { httpProxy } from "utils/proxy/http";
 
@@ -17,6 +16,6 @@ export default async function handler(req, res) {
     const [status] = await httpProxy(pingURL);
 
     return res.status(200).json({
-      status: status,
+      status,
     });
 }

From 5eb4778f53a9b40ee24bb5b15921b53aa3cac4d3 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Fri, 14 Oct 2022 14:19:15 -0700
Subject: [PATCH 3/4] Use HEAD request

---
 src/pages/api/ping.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/api/ping.js b/src/pages/api/ping.js
index 46ffda65..8c919f0a 100644
--- a/src/pages/api/ping.js
+++ b/src/pages/api/ping.js
@@ -13,7 +13,9 @@ export default async function handler(req, res) {
         });
     }
 
-    const [status] = await httpProxy(pingURL);
+    const [status] = await httpProxy(pingURL, {
+      method: "HEAD"
+    });
 
     return res.status(200).json({
       status,

From 8eca0011db1b23d3d464682452f7ed9ec385303d Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Fri, 14 Oct 2022 14:25:59 -0700
Subject: [PATCH 4/4] Show latency if status 200

---
 src/components/services/item.jsx | 14 +++++++-------
 src/components/services/ping.jsx |  4 ++--
 src/pages/api/ping.js            |  7 ++++++-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/components/services/item.jsx b/src/components/services/item.jsx
index a4b54ad3..1959df3a 100644
--- a/src/components/services/item.jsx
+++ b/src/components/services/item.jsx
@@ -104,6 +104,13 @@ export default function Item({ service }) {
           )}
 
           <div className="absolute top-0 right-0 w-1/2 flex flex-row justify-end gap-2 mr-2">
+              {service.ping && (
+                <div className="flex-shrink-0 flex items-center justify-center cursor-pointer">
+                  <Ping service={service} />
+                  <span className="sr-only">Ping status</span>
+                </div>
+              )}
+
               {service.container && (
                 <button
                   type="button"
@@ -114,13 +121,6 @@ export default function Item({ service }) {
                   <span className="sr-only">View container stats</span>
                 </button>
               )}
-              
-              {service.ping && (
-                <div className="flex-shrink-0 flex items-center justify-center cursor-pointer">
-                  <Ping service={service} />
-                  <span className="sr-only">Ping status</span>
-                </div>
-              )}
           </div>
         </div>
 
diff --git a/src/components/services/ping.jsx b/src/components/services/ping.jsx
index 18ad8696..e3056232 100644
--- a/src/components/services/ping.jsx
+++ b/src/components/services/ping.jsx
@@ -4,7 +4,7 @@ import useSWR from "swr";
 export default function Ping({ service }) {
   const { t } = useTranslation();
   const { data, error } = useSWR(`/api/ping?${new URLSearchParams({ping: service.ping}).toString()}`, {
-    refreshInterval: 5000
+    refreshInterval: 30000
   });
 
   if (error) {
@@ -36,7 +36,7 @@ export default function Ping({ service }) {
   if (data && data.status === 200) {
     return (
       <div className="w-auto px-1.5 py-0.5 text-center bg-theme-500/10 dark:bg-theme-900/50 rounded-b-[3px] overflow-hidden" title={statusText}>
-        <div className="text-[8px] font-bold text-emerald-500/80">{data.status}</div>
+        <div className="text-[8px] font-bold text-emerald-500/80">{t("common.ms", { value: data.latency, style: "unit", unit: "millisecond", unitDisplay: "narrow", maximumFractionDigits: 0 })}</div>
       </div>
     );
   }
diff --git a/src/pages/api/ping.js b/src/pages/api/ping.js
index 8c919f0a..79c7da0c 100644
--- a/src/pages/api/ping.js
+++ b/src/pages/api/ping.js
@@ -1,3 +1,5 @@
+import { performance } from "perf_hooks";
+
 import createLogger from "utils/logger";
 import { httpProxy } from "utils/proxy/http";
 
@@ -12,12 +14,15 @@ export default async function handler(req, res) {
         error: "No ping URL given",
         });
     }
-
+    
+    const startTime = performance.now();
     const [status] = await httpProxy(pingURL, {
       method: "HEAD"
     });
+    const endTime = performance.now();
 
     return res.status(200).json({
       status,
+      latency: endTime - startTime
     });
 }