[mirotalkbro] - refactoring

app/server.js

@@ -8,7 +8,7 @@
  * @license For open source under AGPL-3.0
  * @license For private project or commercial purposes contact us at: [email protected]
  * @author  Miroslav Pejic - [email protected]
- * @version 1.0.69
+ * @version 1.0.70
  */
 
 require('dotenv').config();

package.json

@@ -1,6 +1,6 @@
 {
     "name": "mirotalkbro",
-    "version": "1.0.69",
+    "version": "1.0.70",
     "description": "P2P WebRTC audio, video and screen live broadcast",
     "main": "app/server.js",
     "scripts": {
@@ -23,7 +23,7 @@
     "author": "Miroslav Pejic",
     "license": "AGPLv3",
     "dependencies": {
-        "@sentry/node": "^8.47.0",
+        "@sentry/node": "^8.48.0",
         "compression": "^1.7.5",
         "cors": "^2.8.5",
         "dotenv": "^16.4.7",

public/js/broadcast.js

@@ -63,11 +63,14 @@ const videoQualitySelect = document.getElementById('videoQualitySelect');
 const videoFpsSelect = document.getElementById('videoFpsSelect');
 const audioSelect = document.getElementById('audioSelect');
 
-const userAgent = navigator.userAgent.toLowerCase();
-const isMobileDevice = isMobile();
-const isTabletDevice = isTablet();
-const isIPadDevice = isIpad();
-const isDesktopDevice = isDesktop();
+const userAgent = navigator.userAgent;
+const parser = new UAParser(userAgent);
+const result = parser.getResult();
+const deviceType = result.device.type || 'desktop';
+const isMobileDevice = deviceType === 'mobile';
+const isTabletDevice = deviceType === 'tablet';
+const isIPadDevice = result.device.model?.toLowerCase() === 'ipad';
+const isDesktopDevice = deviceType === 'desktop';
 
 const isSpeechSynthesisSupported = 'speechSynthesis' in window;
 

public/js/utils.js

@@ -44,25 +44,7 @@ function getRandomInt(max) {
 }
 
 function isPIPSupported() {
-    return !isMobile() && document.pictureInPictureEnabled;
-}
-
-function isMobile() {
-    return !!/Android|webOS|iPhone|iPad|iPod|BB10|BlackBerry|IEMobile|Opera Mini|Mobile|mobile/i.test(userAgent || '');
-}
-
-function isTablet() {
-    return /(ipad|tablet|(android(?!.*mobile))|(windows(?!.*phone)(.*touch))|kindle|playbook|silk|(puffin(?!.*(IP|AP|WP))))/.test(
-        userAgent,
-    );
-}
-
-function isIpad() {
-    return /macintosh/.test(userAgent) && 'ontouchend' in document;
-}
-
-function isDesktop() {
-    return !isMobileDevice && !isTabletDevice && !isIPadDevice;
+    return !isMobileDevice && document.pictureInPictureEnabled;
 }
 
 function setTippy(elem, content, placement) {

public/js/viewer.js

@@ -34,8 +34,11 @@ const messagesForm = document.getElementById('messagesForm');
 const messageInput = document.getElementById('messageInput');
 const messageSend = document.getElementById('messageSend');
 
-const userAgent = navigator.userAgent.toLowerCase();
-const isMobileDevice = isMobile();
+const userAgent = navigator.userAgent;
+const parser = new UAParser(userAgent);
+const result = parser.getResult();
+const deviceType = result.device.type || 'desktop';
+const isMobileDevice = deviceType === 'mobile';
 
 // =====================================================
 // Handle ToolTips

public/views/broadcast.html

@@ -111,17 +111,18 @@
                 </table>
             </div>
         </div>
-        <script src="/socket.io/socket.io.js"></script>
-        <script src="../js/swal.js"></script>
-        <script src="../js/utils.js"></script>
-        <script src="../js/utils.js"></script>
-        <script src="../js/config.js"></script>
-        <script src="../js/broadcast.js"></script>
-        <script src="../js/recording.js"></script>
-        <script async src="../js/umami.js"></script>
         <script defer src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
         <script defer src="https://cdn.jsdelivr.net/npm/[email protected]/dist/qrious.min.js"></script>
         <script defer src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.11.8/umd/popper.min.js"></script>
         <script defer src="https://cdnjs.cloudflare.com/ajax/libs/tippy.js/6.3.7/tippy-bundle.umd.min.js"></script>
+        <script defer src="https://cdnjs.cloudflare.com/ajax/libs/UAParser.js/1.0.37/ua-parser.min.js"></script>
+        <script defer src="/socket.io/socket.io.js"></script>
+        <script defer src="../js/swal.js"></script>
+        <script defer src="../js/utils.js"></script>
+        <script defer src="../js/utils.js"></script>
+        <script defer src="../js/config.js"></script>
+        <script defer src="../js/broadcast.js"></script>
+        <script defer src="../js/recording.js"></script>
+        <script async src="../js/umami.js"></script>
     </body>
 </html>

public/views/viewer.html

@@ -46,15 +46,16 @@
                 <button id="messageSend"><i class="fas fa-paper-plane"></i> Send message</button>
             </div>
         </div>
-        <script src="/socket.io/socket.io.js"></script>
-        <script src="../js/swal.js"></script>
-        <script src="../js/utils.js"></script>
-        <script src="../js/config.js"></script>
-        <script src="../js/viewer.js"></script>
-        <script src="../js/recording.js"></script>
-        <script async src="../js/umami.js"></script>
         <script defer src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
         <script defer src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.11.8/umd/popper.min.js"></script>
         <script defer src="https://cdnjs.cloudflare.com/ajax/libs/tippy.js/6.3.7/tippy-bundle.umd.min.js"></script>
+        <script defer src="https://cdnjs.cloudflare.com/ajax/libs/UAParser.js/1.0.37/ua-parser.min.js"></script>
+        <script defer src="/socket.io/socket.io.js"></script>
+        <script defer src="../js/swal.js"></script>
+        <script defer src="../js/utils.js"></script>
+        <script defer src="../js/config.js"></script>
+        <script defer src="../js/viewer.js"></script>
+        <script defer src="../js/recording.js"></script>
+        <script async src="../js/umami.js"></script>
     </body>
 </html>