fix: add port to webcam url if port is not 80 (#1566)

Co-authored-by: Stefan Dej <meteyou@gmail.com>
mainsail-crew · Dec 16, 2023 · 20524b0 · 20524b0
1 parent 59c31e7
commit 20524b0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/src/components/mixins/base.ts b/src/components/mixins/base.ts
@@ -13,7 +13,7 @@ export default class BaseMixin extends Vue {
         return this.$store.getters['socket/getHostUrl']
     }
 
-    get hostPort(): boolean {
+    get hostPort(): number {
         return this.$store.state.socket.port ?? 80
     }
 

diff --git a/src/components/mixins/webcam.ts b/src/components/mixins/webcam.ts
@@ -23,6 +23,10 @@ export default class WebcamMixin extends Mixins(BaseMixin) {
         // overwrite url to baseUrl, if it is an absolute URL
         if (baseUrl.startsWith('http') || baseUrl.startsWith('://')) url = new URL(baseUrl)
 
+        if (baseUrl.startsWith('/webcam') && ![80, 7125, 7130].includes(this.hostPort)) {
+            url.port = this.hostPort.toString()
+        }
+
         return decodeURIComponent(url.toString())
     }
 

diff --git a/src/components/webcams/streamers/MjpegstreamerAdaptive.vue b/src/components/webcams/streamers/MjpegstreamerAdaptive.vue
@@ -84,6 +84,10 @@ export default class MjpegstreamerAdaptive extends Mixins(BaseMixin, WebcamMixin
         return [90, 270].includes(this.camSettings.rotation ?? 0)
     }
 
+    get url() {
+        return this.convertUrl(this.camSettings?.snapshot_url, this.printerUrl)
+    }
+
     refreshFrame() {
         if (this.isVisible) {
             this.refresh = new Date().getTime()
@@ -92,11 +96,7 @@ export default class MjpegstreamerAdaptive extends Mixins(BaseMixin, WebcamMixin
     }
 
     async setFrame() {
-        const baseUrl = this.camSettings.snapshot_url
-
-        let url = new URL(baseUrl, this.printerUrl === null ? this.hostUrl.toString() : this.printerUrl)
-        if (baseUrl.startsWith('http') || baseUrl.startsWith('://')) url = new URL(baseUrl)
-
+        let url = new URL(this.url)
         url.searchParams.append('bypassCache', this.refresh.toString())
 
         this.request_start_time = performance.now()

diff --git a/src/components/webcams/streamers/WebrtcCameraStreamer.vue b/src/components/webcams/streamers/WebrtcCameraStreamer.vue
@@ -37,12 +37,7 @@ export default class WebrtcCameraStreamer extends Mixins(BaseMixin, WebcamMixin)
     @Ref() declare stream: HTMLVideoElement
 
     get url() {
-        const baseUrl = this.camSettings.stream_url
-        let url = new URL(baseUrl, this.printerUrl === null ? this.hostUrl.toString() : this.printerUrl)
-
-        if (baseUrl.startsWith('http') || baseUrl.startsWith('://')) url = new URL(baseUrl)
-
-        return decodeURIComponent(url.toString())
+        return this.convertUrl(this.camSettings?.stream_url, this.printerUrl)
     }
 
     get webcamStyle() {