From 58e59c2708c1c1817b6a614b57dcfd40032ff9ca Mon Sep 17 00:00:00 2001 From: NlightN22 Date: Tue, 5 Mar 2024 15:57:17 +0700 Subject: [PATCH] add ws/wss protocol selector --- Dockerfile | 2 +- src/services/frigate.proxy/frigate.api.ts | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0db2d86..8c5de47 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 # Build commands: -# - $VERSION=0.4 +# - $VERSION=0.5 # - rm build -r -Force ; rm ./node_modules/.cache/babel-loader -r -Force ; yarn build # - docker build --pull --rm -t oncharterliz/multi-frigate:latest -t oncharterliz/multi-frigate:$VERSION "." # - docker image push --all-tags oncharterliz/multi-frigate diff --git a/src/services/frigate.proxy/frigate.api.ts b/src/services/frigate.proxy/frigate.api.ts index c52a231..4f334eb 100644 --- a/src/services/frigate.proxy/frigate.api.ts +++ b/src/services/frigate.proxy/frigate.api.ts @@ -137,8 +137,10 @@ export const proxyApi = { getEventsSummary: (hostName: string, cameraName: string) => instanceApi.get(`proxy/${hostName}/api/${cameraName}/events/summary`).then(res => res.data), - cameraWsURL: (hostName: string, cameraName: string) => - `ws://${proxyURL.host}/proxy-ws/${hostName}/live/jsmpeg/${cameraName}`, + cameraWsURL: (hostName: string, cameraName: string) => { + const protocol = proxyURL.protocol === 'https:' ? 'wss' : 'ws'; + return `${protocol}://${proxyURL.host}/proxy-ws/${hostName}/live/jsmpeg/${cameraName}` + }, cameraImageURL: (hostName: string, cameraName: string) => `${proxyPrefix}${hostName}/api/${cameraName}/latest.jpg`, eventURL: (hostName: string, event: string) =>