aheh/mirotalk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[mirotalk] - fix typo, refactoring screen detection

Browse Source
This commit is contained in:
Miroslav Pejic
2025-12-20 21:20:38 +01:00
parent 9a9b1bb0cb
commit 79ce8d288e
7 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.template
+1 -1
View File
@@ -1,5 +1,5 @@
# ====================================================
# MiroTalk P2P v.1.6.93 - Environment Configuration
# MiroTalk P2P v.1.6.94 - Environment Configuration
# ====================================================
# App environment
app/src/config.template.js
+1 -1
View File
@@ -2,7 +2,7 @@
/**
* ==============================================
* MiroTalk P2P v.1.6.93 - Configuration File
* MiroTalk P2P v.1.6.94 - Configuration File
* ==============================================
*
* Branding and customizations require a license:
app/src/server.js
+1 -1
View File
@@ -45,7 +45,7 @@ dependencies: {
* @license For commercial use or closed source, contact us at license.mirotalk@gmail.com or purchase directly from CodeCanyon
* @license CodeCanyon: https://codecanyon.net/item/mirotalk-p2p-webrtc-realtime-video-conferences/38376661
* @author Miroslav Pejic - miroslav.pejic.85@gmail.com
* @version 1.6.93
* @version 1.6.94
*
*/
package-lock.json
Generated
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "mirotalk",
"version": "1.6.93",
"version": "1.6.94",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "mirotalk",
"version": "1.6.93",
"version": "1.6.94",
"license": "AGPL-3.0",
"dependencies": {
"@mattermost/client": "11.2.0",
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "mirotalk",
"version": "1.6.93",
"version": "1.6.94",
"description": "A free WebRTC browser-based video call",
"main": "server.js",
"scripts": {
public/js/brand.js
+1 -1
View File
@@ -77,7 +77,7 @@ let brand = {
},
about: {
imageUrl: '../images/mirotalk-logo.gif',
title: 'WebRTC P2P v1.6.93',
title: 'WebRTC P2P v1.6.94',
html: `
<button
id="support-button"
public/js/client.js
+16 -9
View File
@@ -15,7 +15,7 @@
* @license For commercial use or closed source, contact us at license.mirotalk@gmail.com or purchase directly from CodeCanyon
* @license CodeCanyon: https://codecanyon.net/item/mirotalk-p2p-webrtc-realtime-video-conferences/38376661
* @author Miroslav Pejic - miroslav.pejic.85@gmail.com
* @version 1.6.93
* @version 1.6.94
*
*/
@@ -2504,15 +2504,22 @@ async function handleOnTrack(peer_id, peers) {
// Video or screen track
if (kind === 'video') {
// Determine if the incoming video track is a screen share or camera.
const extras = peerInfo.extras || {};
const label = event.track.label || '';
const settings = event?.track?.getSettings() || {};
// Classify as screen or camera
const isScreen =
extras.screen_track_id === event.track.id ||
extras.screen_stream_id === inbound.id ||
/screen|window|monitor|display/i.test(label) ||
(peerInfo.peer_screen_status && !peerInfo.peer_video_status);
const isDisplayCapture =
!!settings.displaySurface || settings.mediaSource === 'screen' || settings.displaySurface === 'monitor';
const isScreenByExtras =
extras.screen_track_id === event.track.id || extras.screen_stream_id === inbound.id;
const isScreenByLabel = /screen|window|monitor|display/i.test(label);
const isScreenByStatus = peerInfo.peer_screen_status && !peerInfo.peer_video_status;
const isScreen = isDisplayCapture || isScreenByExtras || isScreenByLabel || isScreenByStatus;
handleStream(isScreen ? 'screen' : 'video', isScreen ? 'screen' : 'video');
}
@@ -4270,7 +4277,7 @@ async function loadRemoteMediaStream(stream, peers, peer_id, kind) {
// refresh remote peers hand icon status and title
setPeerHandStatus(peer_id, peer_name, peer_hand_status);
// refresh remote peers video icon status and title
setPeerVideoStatus(peer_id, peer_screen_status ? peer_screen_status : peer_video_status);
setPeerVideoStatus(peer_id, peer_video_status);
// refresh remote peers audio icon status and title
setPeerAudioStatus(peer_id, peer_audio_status);
// handle remote peers audio on-off
@@ -13532,7 +13539,7 @@ function showAbout() {
Swal.fire({
background: swBg,
position: 'center',
title: brand.about?.title && brand.about.title.trim() !== '' ? brand.about.title : 'WebRTC P2P v1.6.93',
title: brand.about?.title && brand.about.title.trim() !== '' ? brand.about.title : 'WebRTC P2P v1.6.94',
imageUrl: brand.about?.imageUrl && brand.about.imageUrl.trim() !== '' ? brand.about.imageUrl : images.about,
customClass: { image: 'img-about' },
html: `