move measurePing as a util

src/helpers/measurePing.js

@@ -1,62 +0,0 @@
-import request from "../request"
-
-const fetchers = {
-    http: () => new Promise(async (resolve) => {
-        const start = Date.now()
-
-        const failTimeout = setTimeout(() => {
-            resolve("timeout")
-        }, 5000)
-
-        request({
-            method: "GET",
-            url: "/ping",
-        })
-            .then(() => {
-                clearTimeout(failTimeout)
-                resolve(Date.now() - start)
-            })
-            .catch((err) => {
-                console.log(err)
-                clearTimeout(failTimeout)
-                resolve("failed")
-            })
-    }),
-    ws: () => new Promise((resolve) => {
-        const start = Date.now()
-
-        const failTimeout = setTimeout(() => {
-            resolve("failed")
-        }, 5000)
-
-        globalThis.__comty_shared_state.sockets["main"].on("pong", () => {
-            failTimeout && clearTimeout(failTimeout)
-
-            resolve(Date.now() - start)
-        })
-
-        globalThis.__comty_shared_state.sockets["main"].emit("ping")
-    })
-}
-
-export default async ({ select } = {}) => {
-    let selectedPromises = []
-
-    if (Array.isArray(select)) {
-        select.forEach((item) => {
-            if (!fetchers[item]) {
-                return
-            }
-            selectedPromises.push(fetchers[item]())
-        })
-    } else {
-        selectedPromises = [
-            fetchers["http"](),
-            fetchers["ws"](),
-        ]
-    }
-
-    const result = await Promise.all(selectedPromises)
-
-    return result
-}

src/utils/measurePing.js

@@ -0,0 +1,63 @@
+import request from "../request"
+
+const fetchers = {
+	http: () =>
+		new Promise(async (resolve) => {
+			const start = Date.now()
+
+			const failTimeout = setTimeout(() => {
+				resolve("timeout")
+			}, 5000)
+
+			request({
+				method: "GET",
+				url: "/ping",
+			})
+				.then(() => {
+					clearTimeout(failTimeout)
+					resolve(Date.now() - start)
+				})
+				.catch((err) => {
+					console.log(err)
+					clearTimeout(failTimeout)
+					resolve("failed")
+				})
+		}),
+	ws: () =>
+		new Promise((resolve) => {
+			const start = Date.now()
+
+			const failTimeout = setTimeout(() => {
+				resolve("failed")
+			}, 5000)
+
+			globalThis.__comty_shared_state.ws.sockets
+				.get("main")
+				.once("pong", () => {
+					failTimeout && clearTimeout(failTimeout)
+
+					resolve(Date.now() - start)
+				})
+
+			globalThis.__comty_shared_state.ws.sockets.get("main").emit("ping")
+		}),
+}
+
+export default async ({ select } = {}) => {
+	let selectedPromises = []
+
+	if (Array.isArray(select)) {
+		select.forEach((item) => {
+			if (!fetchers[item]) {
+				return
+			}
+			selectedPromises.push(fetchers[item]())
+		})
+	} else {
+		selectedPromises = [fetchers["http"](), fetchers["ws"]()]
+	}
+
+	const result = await Promise.all(selectedPromises)
+
+	return result
+}