Clickup task: https://app.clickup.com/t/du0e8p

amolghode1981 · amolghode1981 · commit 9050efab9986 · 2021-11-03T15:26:14.000+05:30
Description: Remove the hardcoding for ICE servers. Now we pull it from the admin
settings. The setting Id is 'WebRTC_Servers'.
diff --git a/client/components/voip/SimpleVoipUser.ts b/client/components/voip/SimpleVoipUser.ts
@@ -50,6 +50,8 @@ export class SimpleVoipUser
 
 	mediaStreamRendered?: IMediaStreamRenderer;
 
+	iceServers: Array<object>;
+
 	config: VoIPUserConfiguration = {};
 
 	voipEventEmitter: Emitter;
@@ -61,6 +63,7 @@ export class SimpleVoipUser
 		password: string,
 		registrar: string,
 		webSocketPath: string,
+		iceServers: Array<object>,
 		callType?: CallType,
 		mediaStreamRendered?: IMediaStreamRenderer,
 	) {
@@ -75,6 +78,7 @@ export class SimpleVoipUser
 		this.callType = callType;
 		this.mediaStreamRendered = mediaStreamRendered;
 		this.voipEventEmitter = new Emitter();
+		this.iceServers = iceServers;
 		this.logger = new ClientLogger('SimpleVoipUser');
 	}
 
@@ -161,13 +165,7 @@ export class SimpleVoipUser
 
 		this.config.enableVideo = this.callType === CallType.AUDIO_VIDEO;
 		this.config.connectionDelegate = this;
-		/**
-		 * Note : Following hardcoding needs to be removed. Where to get this data from, needs to
-		 * be decided. Administration -> RateLimiter -> WebRTC has a setting for stun/turn servers.
-		 * Nevertheless, whether it is configurebla by agent or not is to be found out.
-		 * Agent will control these settings.
-		 */
-		this.config.iceServers = [{ urls: 'stun:stun.l.google.com:19302' }];
+		this.config.iceServers = this.iceServers;
 		this.userHandler = new VoIPUser(this.config, this, this, this, this.mediaStreamRendered);
 		await this.userHandler.init();
 	}
diff --git a/client/providers/OmnichannelProvider.tsx b/client/providers/OmnichannelProvider.tsx
@@ -36,7 +36,6 @@ const OmnichannelProvider: FC = ({ children }) => {
 	const loggerRef = useRef(new ClientLogger('OmnichannelProvider'));
 	const hasAccess = usePermission('view-l-room');
 	const canViewOmnichannelQueue = usePermission('view-livechat-queue');
-
 	const user = useUser() as IOmnichannelAgent;
 
 	const agentAvailable = user?.statusLivechat === 'available';
@@ -51,6 +50,7 @@ const OmnichannelProvider: FC = ({ children }) => {
 	const [voipUser, setVoipUser] = useState<SimpleVoipUser | undefined>(undefined);
 
 	const accessible = hasAccess && omniChannelEnabled;
+	const iceServersSetting: any = useSetting('WebRTC_Servers');
 
 	useEffect(() => {
 		if (!accessible) {
@@ -69,11 +69,31 @@ const OmnichannelProvider: FC = ({ children }) => {
 					extension,
 				})) as unknown as IExtensionConfig;
 				setExtensionConfig(extensionConfig);
+				const iceServers: Array<object> = [];
+				if (iceServersSetting && iceServersSetting.trim() !== '') {
+					const serversListStr = iceServersSetting.replace(/\s/g, '');
+					const serverList = serversListStr.split(',');
+					serverList.forEach((server: any) => {
+						server = server.split('@');
+						const serverConfig: any = {
+							urls: server.pop(),
+						};
+						if (server.length === 1) {
+							server = server[0].split(':');
+							serverConfig.username = decodeURIComponent(server[0]);
+							serverConfig.credential = decodeURIComponent(server[1]);
+						}
+						iceServers.push(serverConfig);
+					});
+				}
+				loggerRef.current.debug(JSON.stringify(iceServers));
+
 				voipUser = new SimpleVoipUser(
 					extensionConfig.extension,
 					extensionConfig.password,
 					extensionConfig.sipRegistrar,
 					extensionConfig.websocketUri,
+					iceServers,
 					CallType.AUDIO_VIDEO,
 				);
 				await voipUser.initUserAgent();
@@ -97,7 +117,7 @@ const OmnichannelProvider: FC = ({ children }) => {
 		if (voipCallAvailable) {
 			initVoipLib();
 		}
-	}, [accessible, getRoutingConfig, omnichannelRouting, voipCallAvailable]);
+	}, [accessible, getRoutingConfig, iceServersSetting, omnichannelRouting, voipCallAvailable]);
 
 	const enabled = accessible && !!user && !!routeConfig && !!extensionConfig && !!voipUser;
 	const manuallySelected =
