revert: "feat(ping): ignore certificate error and show request durati… (#3680)

Co-authored-by: Meier Lukas <meierschlumpf@gmail.com>

packages/api/src/router/test/widgets/app.spec.ts

@@ -0,0 +1,53 @@
+import { describe, expect, test, vi } from "vitest";
+
+import type { Session } from "@homarr/auth";
+import { createDb } from "@homarr/db/test";
+import * as ping from "@homarr/ping";
+
+import { appRouter } from "../../widgets/app";
+
+// Mock the auth module to return an empty session
+vi.mock("@homarr/auth", () => ({ auth: () => ({}) as Session }));
+vi.mock("@homarr/ping", () => ({ sendPingRequestAsync: async () => await Promise.resolve(null) }));
+
+describe("ping should call sendPingRequestAsync with url and return result", () => {
+  test("ping with error response should return error and url", async () => {
+    // Arrange
+    const spy = vi.spyOn(ping, "sendPingRequestAsync");
+    const url = "http://localhost";
+    const db = createDb();
+    const caller = appRouter.createCaller({
+      db,
+      deviceType: undefined,
+      session: null,
+    });
+    spy.mockImplementation(() => Promise.resolve({ error: "error" }));
+
+    // Act
+    const result = await caller.ping({ url });
+
+    // Assert
+    expect(result.url).toBe(url);
+    expect("error" in result).toBe(true);
+  });
+
+  test("ping with success response should return statusCode and url", async () => {
+    // Arrange
+    const spy = vi.spyOn(ping, "sendPingRequestAsync");
+    const url = "http://localhost";
+    const db = createDb();
+    const caller = appRouter.createCaller({
+      db,
+      deviceType: undefined,
+      session: null,
+    });
+    spy.mockImplementation(() => Promise.resolve({ statusCode: 200, durationMs: 123 }));
+
+    // Act
+    const result = await caller.ping({ url });
+
+    // Assert
+    expect(result.url).toBe(url);
+    expect("statusCode" in result).toBe(true);
+  });
+});

packages/api/src/router/widgets/app.ts

@@ -1,12 +1,20 @@
 import { observable } from "@trpc/server/observable";
 import { z } from "zod";
 
-import { pingUrlChannel } from "@homarr/redis";
-import { pingRequestHandler } from "@homarr/request-handler/ping";
+import { sendPingRequestAsync } from "@homarr/ping";
+import { pingChannel, pingUrlChannel } from "@homarr/redis";
 
 import { createTRPCRouter, publicProcedure } from "../../trpc";
 
 export const appRouter = createTRPCRouter({
+  ping: publicProcedure.input(z.object({ url: z.string() })).query(async ({ input }) => {
+    const pingResult = await sendPingRequestAsync(input.url);
+
+    return {
+      url: input.url,
+      ...pingResult,
+    };
+  }),
   updatedPing: publicProcedure
     .input(
       z.object({
@@ -15,20 +23,16 @@ export const appRouter = createTRPCRouter({
     )
     .subscription(async ({ input }) => {
       await pingUrlChannel.addAsync(input.url);
-      const innerHandler = pingRequestHandler.handler({ url: input.url });
+
+      const pingResult = await sendPingRequestAsync(input.url);
 
       return observable<{ url: string; statusCode: number; durationMs: number } | { url: string; error: string }>(
         (emit) => {
-          // Run ping request in background
-          void innerHandler.getCachedOrUpdatedDataAsync({ forceUpdate: false }).then(({ data }) => {
-            emit.next({ url: input.url, ...data });
-          });
-
-          const unsubscribe = innerHandler.subscribe((pingResponse) => {
-            emit.next({
-              url: input.url,
-              ...pingResponse,
-            });
+          emit.next({ url: input.url, ...pingResult });
+          const unsubscribe = pingChannel.subscribe((message) => {
+            // Only emit if same url
+            if (message.url !== input.url) return;
+            emit.next(message);
           });
 
           return () => {