didirus/AstralRinth
5
10
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 15 Wiki Activity

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

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

* fix(frontend): wss assumptions

* chore: fix export

* chore: prettier
This commit is contained in:
François-Xavier Talbot
2026-06-17 18:54:09 -04:00
committed by GitHub
parent 336050f4df
commit 486b467af2
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/api-client/src/index.ts
+1
View File
@@ -43,6 +43,7 @@ export { XHRUploadClient } from './platform/xhr-upload-client'
export { clearNodeAuthState, nodeAuthState, setNodeAuthState } from './state/node-auth'
export * from './types'
export { withJWTRetry } from './utils/jwt-retry'
export { getNodeWebSocketUrl } from './utils/node-url'
export {
type ParsedSseEvent,
type ParsedSseItem,
packages/api-client/src/utils/node-url.ts
+7 -1
View File
@@ -1,6 +1,8 @@
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, '')
@@ -8,5 +10,9 @@ export function getNodeBaseUrl(url: string): string {
}
export function getNodeWebSocketUrl(url: string): string {
return WS_SCHEME_REGEX.test(url) ? url : `wss://${url}`
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}`
}