Update opentera-webrtc.

introlab · Jan 8, 2024 · 5b4943a · 5b4943a
1 parent 2f2620c
commit 5b4943a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/teleop-vue/src/store/modules/opentera/init.ts b/teleop-vue/src/store/modules/opentera/init.ts
@@ -5,13 +5,13 @@ import {
   SignalingServerConfiguration,
   StreamConfiguration,
 } from "./types";
-import { getSignalingServerURL } from "./utils";
+import { getSignalingServerHttpURL, getSignalingServerWsURL } from "./utils";
 
 export function initSignalingServerConfiguration(
   payload: SignalingServerConfiguration
 ): SignalingServerConfiguration {
   return {
-    url: getSignalingServerURL() + "/socket.io",
+    url: getSignalingServerWsURL(),
     name: payload.name,
     data: payload.data,
     room: payload.room,
@@ -36,7 +36,7 @@ export async function initRtcConfiguration(
   password?: string
 ): Promise<RtcConfiguration> {
   return new Promise<RtcConfiguration>((resolve, reject) => {
-    const url = getSignalingServerURL() + "/iceservers";
+    const url = getSignalingServerHttpURL() + "/iceservers";
     openteraWebrtcWebClient.iceServers
       .fetchFromServer(url, password)
       .then((config: Array<IceServer>) =>

diff --git a/teleop-vue/src/store/modules/opentera/utils.ts b/teleop-vue/src/store/modules/opentera/utils.ts
@@ -14,7 +14,7 @@ export function fetchLocalStream(constraint?: MediaStreamConstraints) {
         {
           // eslint-disable-next-line no-console
           console.log(err);
-        } 
+        }
         alert("Can't access default media (Camera nor mic)");
         resolve(undefined);
       });
@@ -31,12 +31,16 @@ export function copyAttributes<T>(copy: T, original: T) {
   }
 }
 
-export function getSignalingServerURL() {
+export function getSignalingServerHttpURL() {
   if (process.env.NODE_ENV !== "production")
     return getOrigin() + getBasePath() + "signaling";
   else return getOrigin() + getBasePath();
 }
 
+export function getSignalingServerWsURL() {
+  return getSignalingServerHttpURL().replace("https://", "wss://").replace("http://", "ws://") + "/signaling";
+}
+
 export interface PromiseState<T = undefined> extends Promise<T> {
   isPending?: Function;
 }

diff --git a/teleop-vue/submodules/opentera-webrtc b/teleop-vue/submodules/opentera-webrtc