[call-me] - fix remote display name
This commit is contained in:
Generated
+6
-6
@@ -1,19 +1,19 @@
|
||||
{
|
||||
"name": "call-me",
|
||||
"version": "1.2.64",
|
||||
"version": "1.2.65",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "call-me",
|
||||
"version": "1.2.64",
|
||||
"version": "1.2.65",
|
||||
"license": "AGPLv3",
|
||||
"dependencies": {
|
||||
"@ngrok/ngrok": "1.5.2",
|
||||
"axios": "^1.11.0",
|
||||
"colors": "^1.4.0",
|
||||
"cors": "^2.8.5",
|
||||
"dotenv": "^17.2.1",
|
||||
"dotenv": "^17.2.2",
|
||||
"express": "^5.1.0",
|
||||
"helmet": "^8.1.0",
|
||||
"httpolyglot": "0.1.2",
|
||||
@@ -601,9 +601,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/dotenv": {
|
||||
"version": "17.2.1",
|
||||
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.1.tgz",
|
||||
"integrity": "sha512-kQhDYKZecqnM0fCnzI5eIv5L4cAe/iRI+HqMbO/hbRdTAeXDG+M9FjipUxNfbARuEg4iHIbhnhs78BCHNbSxEQ==",
|
||||
"version": "17.2.2",
|
||||
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.2.tgz",
|
||||
"integrity": "sha512-Sf2LSQP+bOlhKWWyhFsn0UsfdK/kCWRv1iuA2gXAwt3dyNabr6QSj00I2V10pidqz69soatm9ZwZvpQMTIOd5Q==",
|
||||
"license": "BSD-2-Clause",
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "call-me",
|
||||
"version": "1.2.64",
|
||||
"version": "1.2.65",
|
||||
"description": "Your Go-To for Instant Video Calls",
|
||||
"author": "Miroslav Pejic - miroslav.pejic.85@gmail.com",
|
||||
"license": "AGPLv3",
|
||||
@@ -23,7 +23,7 @@
|
||||
"axios": "^1.11.0",
|
||||
"colors": "^1.4.0",
|
||||
"cors": "^2.8.5",
|
||||
"dotenv": "^17.2.1",
|
||||
"dotenv": "^17.2.2",
|
||||
"express": "^5.1.0",
|
||||
"helmet": "^8.1.0",
|
||||
"httpolyglot": "0.1.2",
|
||||
|
||||
+13
-4
@@ -66,6 +66,7 @@ const app = window.myAppConfig || {};
|
||||
let userInfo;
|
||||
let userName;
|
||||
let connectedUser;
|
||||
let pendingUser; // Track outgoing call target
|
||||
let thisConnection;
|
||||
let camera = 'user';
|
||||
let stream;
|
||||
@@ -538,8 +539,7 @@ function handleUserClickToCall(user) {
|
||||
return;
|
||||
}
|
||||
selectedUser = user;
|
||||
connectedUser = user;
|
||||
updateUsernameDisplay();
|
||||
pendingUser = user;
|
||||
renderUserList();
|
||||
sendMsg({
|
||||
type: 'offerAccept',
|
||||
@@ -1227,6 +1227,7 @@ async function handleOffer(data) {
|
||||
const { offer, name } = data;
|
||||
console.log('Handling offer from:', name);
|
||||
connectedUser = name;
|
||||
pendingUser = null;
|
||||
updateUsernameDisplay();
|
||||
|
||||
// Initialize fresh connection for incoming call
|
||||
@@ -1251,6 +1252,12 @@ async function handleAnswer(data) {
|
||||
const { answer } = data;
|
||||
try {
|
||||
await thisConnection.setRemoteDescription(new RTCSessionDescription(answer));
|
||||
// Set connectedUser from pendingUser after call is accepted
|
||||
if (pendingUser) {
|
||||
connectedUser = pendingUser;
|
||||
pendingUser = null;
|
||||
updateUsernameDisplay();
|
||||
}
|
||||
} catch (error) {
|
||||
handleError('Error when set remote description.', error);
|
||||
}
|
||||
@@ -1300,13 +1307,12 @@ function updateUsernameDisplay() {
|
||||
if (localUsername) {
|
||||
localUsername.innerText = userName || 'You';
|
||||
}
|
||||
// Only show remoteUsername if call is established (not just pending)
|
||||
if (remoteUsername && connectedUser) {
|
||||
remoteUsername.innerText = connectedUser;
|
||||
// Show remoteUsername when user is connected
|
||||
remoteUsername.classList.remove('hide');
|
||||
} else if (remoteUsername) {
|
||||
remoteUsername.innerText = '';
|
||||
// Hide remoteUsername when no user is connected
|
||||
remoteUsername.classList.add('hide');
|
||||
}
|
||||
}
|
||||
@@ -1572,8 +1578,11 @@ function handleRemoteScreenShare(data) {
|
||||
|
||||
// Send messages to the server
|
||||
function sendMsg(message) {
|
||||
// Use connectedUser if call is established, otherwise use pendingUser for signaling
|
||||
if (connectedUser) {
|
||||
message.name = connectedUser;
|
||||
} else if (pendingUser) {
|
||||
message.name = pendingUser;
|
||||
}
|
||||
socket.emit('message', message);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user