Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix relative webcam urls on multi instances #1162

Merged
merged 2 commits into from
Nov 25, 2022
Merged

fix: fix relative webcam urls on multi instances #1162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a151b97
fix: fix relative webcam urls on multi instances
meteyou Nov 19, 2022
08da430
refactor: revert PR#1147
meteyou Nov 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/components/webcams/Mjpegstreamer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ export default class Mjpegstreamer extends Mixins(BaseMixin) {
get url() {
const baseUrl = this.camSettings.urlStream
let url = new URL(baseUrl, this.printerUrl === undefined ? this.hostUrl.toString() : this.printerUrl)
url.port = this.hostPort.toString()

if (baseUrl.startsWith('http') || baseUrl.startsWith('://')) url = new URL(baseUrl)

return decodeURIComponent(url.toString())
Expand Down
2 changes: 0 additions & 2 deletions src/components/webcams/MjpegstreamerAdaptive.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ export default class MjpegstreamerAdaptive extends Mixins(BaseMixin) {
const baseUrl = this.camSettings.urlSnapshot

let url = new URL(baseUrl, this.printerUrl === undefined ? this.hostUrl.toString() : this.printerUrl)
url.port = this.hostPort.toString()

if (baseUrl.startsWith('http') || baseUrl.startsWith('://')) url = new URL(baseUrl)

url.searchParams.append('bypassCache', this.refresh.toString())
Expand Down
2 changes: 0 additions & 2 deletions src/components/webcams/Uv4lMjpeg.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ export default class Uv4lMjpeg extends Mixins(BaseMixin) {
get url() {
const baseUrl = this.camSettings.urlStream
let url = new URL(baseUrl, this.printerUrl === undefined ? this.hostUrl.toString() : this.printerUrl)
url.port = this.hostPort.toString()

if (baseUrl.startsWith('http') || baseUrl.startsWith('://')) url = new URL(baseUrl)

return decodeURIComponent(url.toString())
Expand Down