CreatBot/CreatBotMainsail
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: fix webcam url with multiple moonraker instances (#1713)

Browse Source 
* fix: fix webcam url with multiple moonraker instances

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix: fix webcam url with multiple moonraker instances

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix: parse hostPort to int

Signed-off-by: Stefan Dej <meteyou@gmail.com>

---------

Signed-off-by: Stefan Dej <meteyou@gmail.com>
This commit is contained in:
Stefan Dej 2023-12-26 08:36:24 +01:00 committed by GitHub
parent 5b02b1236b
commit 1ad34107b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/mixins/base.ts
View File

@ -14,7 +14,7 @@ export default class BaseMixin extends Vue {
}
get hostPort(): number {
return this.$store.state.socket.port ?? 80
return parseInt(this.$store.state.socket.port ?? 80)
}
get instancesDB() {

8
src/components/mixins/webcam.ts
View File

@ -23,8 +23,12 @@ 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()
if (baseUrl.startsWith('/webcam')) {
const ports = [80]
ports.push(this.$store.state.server.config?.config?.server?.port ?? 7125)
ports.push(this.$store.state.server.config?.config?.server?.ssl_port ?? 7130)
if (!ports.includes(this.hostPort)) url.port = this.hostPort.toString()
}
return decodeURIComponent(url.toString())