fix(frontend): dont assume wss for panel pingtest as well

packages/api-client/src/features/node-auth.ts

@@ -1,6 +1,7 @@
 import { AbstractFeature, type FeatureConfig } from '../core/abstract-feature'
 import { ModrinthApiError } from '../core/errors'
 import type { RequestContext } from '../types/request'
+import { getNodeBaseUrl } from '../utils/node-url'
 
 /**
  * Node authentication credentials
@@ -107,7 +108,7 @@ export class NodeAuthFeature extends AbstractFeature {
 	}
 
 	private applyAuth(context: RequestContext, auth: NodeAuth): void {
-		const baseUrl = `https://${auth.url.replace(/\/modrinth\/v\d+\/fs\/?$/, '')}`
+		const baseUrl = getNodeBaseUrl(auth.url)
 		context.url = this.buildUrl(context.path, baseUrl, context.options.version)
 
 		context.options.headers = {

packages/api-client/src/index.ts

@@ -50,4 +50,5 @@ export {
 	parseSyncEventData,
 	SseParser,
 } from './utils/sse'
+export { getNodeWebSocketUrl } from './utils/node-url'
 export type { Override, RawDecimal } from './utils/types'

packages/api-client/src/modules/kyros/files/v0.ts

@@ -1,5 +1,6 @@
 import { AbstractModule } from '../../../core/abstract-module'
 import type { UploadHandle, UploadProgress } from '../../../types/upload'
+import { getNodeBaseUrl } from '../../../utils/node-url'
 import type { Archon } from '../../archon/types'
 import type { Kyros } from '../types'
 
@@ -11,7 +12,7 @@ export class KyrosFilesV0Module extends AbstractModule {
 	}
 
 	private getNodeBaseUrl(auth: NodeFsAuth): string {
-		return `https://${auth.url.replace(/\/modrinth\/v\d+\/fs\/?$/, '')}`
+		return getNodeBaseUrl(auth.url)
 	}
 
 	/**

packages/api-client/src/platform/websocket-generic.ts

@@ -2,6 +2,7 @@ import mitt from 'mitt'
 
 import { AbstractWebSocketClient, type WebSocketConnection } from '../core/abstract-websocket'
 import type { Archon } from '../modules/archon/types'
+import { getNodeWebSocketUrl } from '../utils/node-url'
 
 type WSEventMap = {
 	[K in Archon.Websocket.v0.WSEvent as `${string}:${K['event']}`]: K
@@ -19,7 +20,7 @@ export class GenericWebSocketClient extends AbstractWebSocketClient {
 
 		return new Promise((resolve, reject) => {
 			try {
-				const ws = new WebSocket(`wss://${auth.url}`)
+				const ws = new WebSocket(getNodeWebSocketUrl(auth.url))
 
 				const connection: WebSocketConnection = {
 					serverId,

packages/api-client/src/utils/node-url.ts

@@ -0,0 +1,18 @@
+const NODE_FS_PATH_REGEX = /\/modrinth\/v\d+\/fs\/?$/
+const HTTP_SCHEME_REGEX = /^https?:\/\//i
+const WS_SCHEME_REGEX = /^wss?:\/\//i
+const HTTP_SECURE_SCHEME_REGEX = /^https:\/\//i
+const HTTP_INSECURE_SCHEME_REGEX = /^http:\/\//i
+
+export function getNodeBaseUrl(url: string): string {
+	const baseUrl = url.replace(NODE_FS_PATH_REGEX, '')
+	return HTTP_SCHEME_REGEX.test(baseUrl) ? baseUrl : `https://${baseUrl}`
+}
+
+export function getNodeWebSocketUrl(url: string): string {
+	if (WS_SCHEME_REGEX.test(url)) return url
+	if (HTTP_SECURE_SCHEME_REGEX.test(url)) return url.replace(HTTP_SECURE_SCHEME_REGEX, 'wss://')
+	if (HTTP_INSECURE_SCHEME_REGEX.test(url)) return url.replace(HTTP_INSECURE_SCHEME_REGEX, 'ws://')
+
+	return `wss://${url}`
+}

packages/ui/src/layouts/wrapped/hosting/manage/root.vue

@@ -344,7 +344,7 @@
 
 <script setup lang="ts">
 import type { Archon, Labrinth } from '@modrinth/api-client'
-import { ModrinthApiError } from '@modrinth/api-client'
+import { getNodeWebSocketUrl, ModrinthApiError } from '@modrinth/api-client'
 import {
 	BoxesIcon,
 	CheckIcon,
@@ -1299,7 +1299,7 @@ async function testNodeReachability(): Promise<boolean> {
 	const nodeInstance = serverData.value?.node?.instance
 	if (!nodeInstance) return false
 
-	const wsUrl = `wss://${nodeInstance}/pingtest`
+	const wsUrl = getNodeWebSocketUrl(`${nodeInstance}/pingtest`)
 
 	try {
 		return await new Promise((resolve) => {