MigrateRepos/decentralized-video-chat
1
0
Fork 0
mirror of https://github.com/ianramzy/decentralized-video-chat.git synced 2025-02-23 00:15:04 +08:00
Code Issues Releases Wiki Activity

restructure dataChannel - fixed it so that messaging works with 3 peers

Browse Source
This commit is contained in:
Khush Jammu 2020-05-30 21:08:11 +08:00
parent cb419b0817
commit 658c8d514c
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
public/js/chat.js
View File

@ -1,7 +1,6 @@
// Vars // Vars
var isMuted; var isMuted;
var videoIsPaused; var videoIsPaused;
var dataChanel = null;
const browserName = getBrowserName(); const browserName = getBrowserName();
const url = window.location.href; const url = window.location.href;
const roomHash = url.substring(url.lastIndexOf("/") + 1).toLowerCase(); const roomHash = url.substring(url.lastIndexOf("/") + 1).toLowerCase();
@ -27,6 +26,9 @@ const captionButtontext = $("#caption-button-text");
const entireChat = $("#entire-chat"); const entireChat = $("#entire-chat");
const chatZone = $("#chat-zone"); const chatZone = $("#chat-zone");
var dataChannel = new Map();
var VideoChat = { var VideoChat = {
nickname: undefined, nickname: undefined,
videoEnabled: true, videoEnabled: true,
@ -157,17 +159,17 @@ var VideoChat = {
}); });
// Add general purpose data channel to peer connection, // Add general purpose data channel to peer connection,
// used for text chats, captions, and toggling sending captions // used for text chats, captions, and toggling sending captions
dataChanel = VideoChat.peerConnections.get(uuid).createDataChannel("chat", { dataChannel.set(uuid, VideoChat.peerConnections.get(uuid).createDataChannel("chat", {
negotiated: true, negotiated: true,
// both peers must have same id // both peers must have same id
id: 0, id: 0,
}); }));
// Called when dataChannel is successfully opened // Called when dataChannel is successfully opened
dataChanel.onopen = function (event) { dataChannel.get(uuid).onopen = function (event) {
logIt("dataChannel opened"); logIt("dataChannel opened");
}; };
// Handle different dataChannel types // Handle different dataChannel types
dataChanel.onmessage = function (event) { dataChannel.get(uuid).onmessage = function (event) {
const receivedData = event.data; const receivedData = event.data;
// First 4 chars represent data type // First 4 chars represent data type
const dataType = receivedData.substring(0, 4); const dataType = receivedData.substring(0, 4);
@ -435,6 +437,13 @@ function isConnected() {
return connected; return connected;
} }
function sendToAllDataChannels(message) {
// key is UUID, value is dataChannel object
dataChannel.forEach(function(value, key, map) {
value.send(message);
});
}
// Fullscreen // Fullscreen
// function openFullscreen() { // function openFullscreen() {
// try { // try {
@ -648,7 +657,7 @@ function switchStreamHelper(stream) {
// Request captions from other user, toggles state // Request captions from other user, toggles state
function requestToggleCaptions() { function requestToggleCaptions() {
// Handle requesting captions before connected // Handle requesting captions before connected
if (!VideoChat.connected) { if (!isConnected()) {
alert("You must be connected to a peer to use Live Caption"); alert("You must be connected to a peer to use Live Caption");
return; return;
} }
@ -669,7 +678,7 @@ function requestToggleCaptions() {
receivingCaptions = true; receivingCaptions = true;
} }
// Send request to get captions over data channel // Send request to get captions over data channel
dataChanel.send("tog:"); sendToAllDataChannels("tog:");
} }
// Start/stop sending captions to other user // Start/stop sending captions to other user
@ -695,7 +704,7 @@ function startSpeech() {
logIt(e); logIt(e);
logIt("error importing speech library"); logIt("error importing speech library");
// Alert other user that they cannon use live caption // Alert other user that they cannon use live caption
dataChanel.send("cap:notusingchrome"); sendToAllDataChannels("cap:notusingchrome");
return; return;
} }
// recognition.maxAlternatives = 3; // recognition.maxAlternatives = 3;
@ -707,6 +716,7 @@ function startSpeech() {
let interimTranscript = ""; let interimTranscript = "";
for (let i = event.resultIndex, len = event.results.length; i < len; i++) { for (let i = event.resultIndex, len = event.results.length; i < len; i++) {
var transcript = event.results[i][0].transcript; var transcript = event.results[i][0].transcript;
console.log(transcript);
if (event.results[i].isFinal) { if (event.results[i].isFinal) {
finalTranscript += transcript; finalTranscript += transcript;
} else { } else {
@ -714,10 +724,10 @@ function startSpeech() {
var charsToKeep = interimTranscript.length % 100; var charsToKeep = interimTranscript.length % 100;
// Send captions over data chanel, // Send captions over data chanel,
// subtracting as many complete 100 char slices from start // subtracting as many complete 100 char slices from start
dataChanel.send( sendToAllDataChannels(
"cap:" + "cap:" +
interimTranscript.substring(interimTranscript.length - charsToKeep) interimTranscript.substring(interimTranscript.length - charsToKeep)
); );
} }
} }
}; };
@ -818,7 +828,7 @@ chatInput.addEventListener("keypress", function (event) {
// Make links clickable // Make links clickable
msg = msg.autoLink(); msg = msg.autoLink();
// Send message over data channel // Send message over data channel
dataChanel.send("mes:" + VideoChat.nickname + ": " + msg); sendToAllDataChannels("mes:" + VideoChat.nickname + ": " + msg);
// Add message to screen // Add message to screen
addMessageToScreen(msg, true); addMessageToScreen(msg, true);
// Auto scroll chat down // Auto scroll chat down