.github/workflows/auto-test.yml

@@ -78,7 +78,7 @@ jobs:
 
   e2e-test:
     needs: [ ]
-    runs-on: ubuntu-24.04-arm
+    runs-on: ARM64
     steps:
     - run: git config --global core.autocrlf false  # Mainly for Windows
     - uses: actions/checkout@v4

test/backend-test/test-websocket.js

@@ -1,99 +1,76 @@
-const { describe, test } = require("node:test");
+const test = require("node:test");
 const assert = require("node:assert");
 const { websocket } = require("../../server/monitor-types/websocket");
 const { UP, DOWN, PENDING } = require("../../src/util");
 
-describe("Websocket Test", {
-}, () => {
-    test("Non Websocket Server", {}, async () => {
-        const websocketMonitor = new websocket();
+test("Test Websocket TLS", async () => {
+    const websocketMonitor = new websocket();
 
-        const monitor = {
-            wsurl: "wss://example.org",
-            wsIgnoreHeaders: false,
-        };
+    const monitor = {
+        wsurl: "wss://echo.websocket.org",
+        wsIgnoreHeaders: false,
+    };
 
-        const heartbeat = {
-            msg: "",
-            status: PENDING,
-        };
+    const heartbeat = {
+        msg: "",
+        status: PENDING,
+    };
 
-        await websocketMonitor.check(monitor, heartbeat, {});
-        assert.strictEqual(heartbeat.status, DOWN);
-        assert.strictEqual(heartbeat.msg, "Unexpected server response: 200");
-    });
-
-    test("Secure Websocket", async () => {
-        const websocketMonitor = new websocket();
-
-        const monitor = {
-            wsurl: "wss://echo.websocket.org",
-            wsIgnoreHeaders: false,
-        };
-
-        const heartbeat = {
-            msg: "",
-            status: PENDING,
-        };
-
-        await websocketMonitor.check(monitor, heartbeat, {});
-        assert.strictEqual(heartbeat.status, UP);
-        assert.strictEqual(heartbeat.msg, "101 - OK");
-    });
-
-    test("Insecure Websocket", {
-        skip: !!process.env.CI,
-    }, async () => {
-        const websocketMonitor = new websocket();
-
-        const monitor = {
-            wsurl: "ws://ws.ifelse.io",
-            wsIgnoreHeaders: false,
-        };
-
-        const heartbeat = {
-            msg: "",
-            status: PENDING,
-        };
-
-        await websocketMonitor.check(monitor, heartbeat, {});
-        assert.strictEqual(heartbeat.status, UP);
-        assert.strictEqual(heartbeat.msg, "101 - OK");
-    });
-
-    test("Test a non compliant WS server without ignore", async () => {
-        const websocketMonitor = new websocket();
-
-        const monitor = {
-            wsurl: "wss://c.img-cdn.net/yE4s7KehTFyj/",
-            wsIgnoreHeaders: false,
-        };
-
-        const heartbeat = {
-            msg: "",
-            status: PENDING,
-        };
-
-        await websocketMonitor.check(monitor, heartbeat, {});
-        assert.strictEqual(heartbeat.status, DOWN);
-        assert.strictEqual(heartbeat.msg, "Invalid Sec-WebSocket-Accept header");
-    });
-
-    test("Test a non compliant WS server with ignore", async () => {
-        const websocketMonitor = new websocket();
-
-        const monitor = {
-            wsurl: "wss://c.img-cdn.net/yE4s7KehTFyj/",
-            wsIgnoreHeaders: true,
-        };
-
-        const heartbeat = {
-            msg: "",
-            status: PENDING,
-        };
-
-        await websocketMonitor.check(monitor, heartbeat, {});
-        assert.strictEqual(heartbeat.status, UP);
-        assert.strictEqual(heartbeat.msg, "101 - OK");
-    });
+    await websocketMonitor.check(monitor, heartbeat, {});
+    assert.strictEqual(heartbeat.status, UP);
+    assert.strictEqual(heartbeat.msg, "101 - OK");
+});
+
+test("Test Websocket non TLS", async () => {
+    const websocketMonitor = new websocket();
+
+    const monitor = {
+        wsurl: "ws://ws.ifelse.io",
+        wsIgnoreHeaders: false,
+    };
+
+    const heartbeat = {
+        msg: "",
+        status: PENDING,
+    };
+
+    await websocketMonitor.check(monitor, heartbeat, {});
+    assert.strictEqual(heartbeat.status, UP);
+    assert.strictEqual(heartbeat.msg, "101 - OK");
+});
+
+test("Test a non compliant WS server without ignore", async () => {
+    const websocketMonitor = new websocket();
+
+    const monitor = {
+        wsurl: "wss://c.img-cdn.net/yE4s7KehTFyj/",
+        wsIgnoreHeaders: false,
+    };
+
+    const heartbeat = {
+        msg: "",
+        status: PENDING,
+    };
+
+    await websocketMonitor.check(monitor, heartbeat, {});
+    assert.strictEqual(heartbeat.status, DOWN);
+    assert.strictEqual(heartbeat.msg, "Invalid Sec-WebSocket-Accept header");
+});
+
+test("Test a non compliant WS server with ignore", async () => {
+    const websocketMonitor = new websocket();
+
+    const monitor = {
+        wsurl: "wss://c.img-cdn.net/yE4s7KehTFyj/",
+        wsIgnoreHeaders: true,
+    };
+
+    const heartbeat = {
+        msg: "",
+        status: PENDING,
+    };
+
+    await websocketMonitor.check(monitor, heartbeat, {});
+    assert.strictEqual(heartbeat.status, UP);
+    assert.strictEqual(heartbeat.msg, "101 - OK");
 });