Fix SSE URL handling and bump versions

This commit is contained in:
SrGooglo 2025-05-12 02:27:53 +00:00
parent 1b6d1c74a1
commit 15d31bc446
5 changed files with 9 additions and 7 deletions

@ -1 +1 @@
Subproject commit f408866ac27f7eb0ce2dd6abe1cfe4b1902cd7e8
Subproject commit 94c8d7383e84a2de4b193d27adfcb1baa4163f68

@ -1 +1 @@
Subproject commit bc9b82dab1767b2fa1085fcf22336c455a7f89c1
Subproject commit fa61273d5b4b40a22d97c7773321d8ca6c985fd7

View File

@ -1,6 +1,6 @@
{
"name": "@comty/app",
"version": "1.40.0@alpha",
"version": "1.41.0@alpha",
"license": "ComtyLicense",
"main": "electron/main",
"type": "module",
@ -33,7 +33,7 @@
"axios": "^1.7.7",
"bear-react-carousel": "^4.0.10-alpha.0",
"classnames": "2.3.1",
"comty.js": "^0.65.0",
"comty.js": "^0.65.5",
"d3": "^7.9.0",
"dashjs": "^5.0.0",
"dompurify": "^3.0.0",

View File

@ -195,9 +195,11 @@ export default class ChunkedUpload {
}
waitOnSSE(data) {
console.log(`[UPLOADER] Connecting to SSE channel >`, data.sseUrl)
// temporal solution until comty.js manages this
const url = `${app.cores.api.client().mainOrigin}/upload/sse_events/${data.sseChannelId}`
const eventSource = new EventSource(data.sseUrl)
console.log(`[UPLOADER] Connecting to SSE channel >`, url)
const eventSource = new EventSource(url)
eventSource.onerror = (error) => {
this.events.emit("error", error)

View File

@ -105,7 +105,7 @@ export default {
return {
uploadId: payload.uploadId,
sseChannelId: job.sseChannelId,
sseUrl: `${req.headers["x-forwarded-proto"] || req.protocol}://${req.get("host")}/upload/sse_events/${job.sseChannelId}`,
sseUrl: `${req.headers["x-forwarded-proto"] || req.protocol}://${req.get("x-forwarded-host") ?? req.get("host")}/upload/sse_events/${job.sseChannelId}`,
}
}