Merge from Fork

.dockerignore

@@ -0,0 +1,21 @@
+# git folder
+.git
+.gitignore
+
+# npm
+node_modules
+npm-debug.log
+yarn-error.log
+
+# build artifacts
+dist
+coverage
+
+# mac
+.DS_Store
+
+# cache
+.cache
+
+# personal env
+.env

.gitignore

@@ -8,18 +8,19 @@
 node_modules
 npm-debug.log
 
-# package
-package-lock.json
-
 # cache
 .cache
 
 # personal
+.env
 config.js
 docker-compose.yml
 docker-push.sh
+data
 rec
 rtmp
+rnnoiseBuild
+security
 
 # virtual background
 custom

.prettierignore

@@ -1 +1,2 @@
 .github
+public/sfu

.prettierrc.js

@@ -1,6 +1,6 @@
 module.exports = {
     semi: true,
-    trailingComma: 'all',
+    trailingComma: 'es5', // Trailing commas only where valid in ES5 (objects, arrays, not function arguments)
     singleQuote: true,
     printWidth: 120,
     tabWidth: 4,

Dockerfile

@@ -6,6 +6,7 @@ WORKDIR /src
 
 # Set environment variable to skip downloading prebuilt workers
 ENV MEDIASOUP_SKIP_WORKER_PREBUILT_DOWNLOAD="true"
+ENV NODE_ENV="production"
 
 # Install necessary system packages and dependencies
 RUN apt-get update \
@@ -19,9 +20,9 @@ RUN apt-get update \
 # Rename config.template.js to config.js
 COPY ./app/src/config.template.js ./app/src/config.js
 
-# Copy package.json and install npm dependencies
-COPY package.json .
-RUN npm install
+# Copy package*.json and install npm dependencies
+COPY package*.json ./
+RUN npm ci --only=production --silent
 
 # Cleanup unnecessary packages and files
 RUN apt-get purge -y --auto-remove \

app/api/README.md

@@ -43,7 +43,7 @@ Embedding a meeting into a `service` or `app` requires using an `iframe` with th
 
 ```html
 <iframe
-    allow="camera; microphone; display-capture; fullscreen; clipboard-read; clipboard-write; web-share; autoplay"
+    allow="camera; microphone; speaker-selection; display-capture; fullscreen; clipboard-read; clipboard-write; web-share; autoplay; picture-in-picture"
     src="https://sfu.mirotalk.com/join/your_room_name"
     style="height: 100vh; width: 100vw; border: 0px;"
 ></iframe>
@@ -55,7 +55,7 @@ Develop your `website` or `application`, and bring `video meetings` in with a si
 
 ```html
 <iframe
-    allow="camera; microphone; display-capture; fullscreen; clipboard-read; clipboard-write; web-share; autoplay"
+    allow="camera; microphone; speaker-selection; display-capture; fullscreen; clipboard-read; clipboard-write; web-share; autoplay; picture-in-picture"
     src="https://sfu.mirotalk.com/newroom"
     style="height: 100vh; width: 100vw; border: 0px;"
 ></iframe>

app/api/join/join.js

@@ -19,9 +19,11 @@ async function getJoin() {
                 room: 'test',
                 roomPassword: false,
                 name: 'mirotalksfu',
-                audio: true,
-                video: true,
-                screen: true,
+                avatar: false,
+                audio: false,
+                video: false,
+                screen: false,
+                chat: false,
                 hide: false,
                 notify: true,
                 duration: 'unlimited',

app/api/join/join.php

@@ -20,9 +20,11 @@
     "room"          => "test",
     "roomPassword"  => false,
     "name"          => "mirotalksfu",
-    "audio"         => true,
-    "video"         => true,
-    "screen"        => true,
+    "avatar"        => false,
+    "audio"         => false,
+    "video"         => false,
+    "screen"        => false,
+    "chat"          => false,
     "hide"          => false,
     "notify"        => true,
     "duration"      => "unlimited",

app/api/join/join.py

@@ -15,9 +15,11 @@
     "room": "test",
     "roomPassword": "false",
     "name": "mirotalksfu",
-    "audio": "true",
-    "video": "true",
-    "screen": "true",
+    "avatar": "false",
+    "audio": "false",
+    "video": "false",
+    "screen": "false",
+    "chat": "false",
     "hide": "false",
     "notify": "true",
     "duration": "unlimited",

app/api/join/join.sh

@@ -1,11 +1,34 @@
 #!/bin/bash
 
+# Configuration
 API_KEY_SECRET="mirotalksfu_default_secret"
 MIROTALK_URL="https://sfu.mirotalk.com/api/v1/join"
+# Alternative URL for local testing:
 # MIROTALK_URL="http://localhost:3010/api/v1/join"
 
-curl $MIROTALK_URL \
-    --header "authorization: $API_KEY_SECRET" \
-    --header "Content-Type: application/json" \
-    --data '{"room":"test","roomPassword":"false","name":"mirotalksfu","audio":"true","video":"true","screen":"false","hide":"false","notify":"true","duration":"unlimited","token":{"username":"username","password":"password","presenter":"true", "expire":"1h"}}' \
-    --request POST
+# Request data with proper JSON formatting
+REQUEST_DATA='{
+    "room": "test",
+    "roomPassword": false,
+    "name": "mirotalksfu",
+    "avatar": false,
+    "audio": false,
+    "video": false,
+    "screen": false,
+    "chat": false,
+    "hide": false,
+    "notify": true,
+    "duration": "unlimited",
+    "token": {
+        "username": "username",
+        "password": "password",
+        "presenter": true,
+        "expire": "1h"
+    }
+}'
+
+# Make the API request
+curl -X POST "$MIROTALK_URL" \
+    -H "Authorization: $API_KEY_SECRET" \
+    -H "Content-Type: application/json" \
+    -d "$REQUEST_DATA"

app/api/meeting/endMeeting.js

@@ -0,0 +1,35 @@
+'use strict';
+
+async function endMeeting() {
+    try {
+        // Use dynamic import with await
+        const { default: fetch } = await import('node-fetch');
+
+        const API_KEY_SECRET = 'mirotalksfu_default_secret';
+        const MIROTALK_URL = 'https://sfu.mirotalk.com/api/v1/meeting';
+        // const MIROTALK_URL = 'http://localhost:3010/api/v1/meeting';
+
+        const ROOM = 'test'; // Room name to end
+
+        const response = await fetch(`${MIROTALK_URL}/${ROOM}`, {
+            method: 'DELETE',
+            headers: {
+                authorization: API_KEY_SECRET,
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                // redirect: 'https://example.com/meeting-ended', // Optional: URL to redirect peers to (if empty, peers go to home page)
+            }),
+        });
+        const data = await response.json();
+        if (data.error) {
+            console.log('Error:', data.error);
+        } else {
+            console.log('result:', data);
+        }
+    } catch (error) {
+        console.error('Error fetching data:', error);
+    }
+}
+
+endMeeting();

app/api/meeting/endMeeting.php

@@ -0,0 +1,35 @@
+<?php
+
+$API_KEY_SECRET = "mirotalksfu_default_secret";
+$MIROTALK_URL = "https://sfu.mirotalk.com/api/v1/meeting";
+// $MIROTALK_URL = "http://localhost:3010/api/v1/meeting";
+
+$ROOM = "test";
+
+// Optional: redirect URL (leave empty for home page)
+$data = json_encode([
+    // 'redirect' => 'https://example.com/meeting-ended',
+]);
+
+$ch = curl_init();
+curl_setopt($ch, CURLOPT_URL, "$MIROTALK_URL/$ROOM");
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
+curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+
+$headers = [
+    'authorization:' . $API_KEY_SECRET,
+    'Content-Type: application/json'
+];
+
+curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+$response = curl_exec($ch);
+$httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+
+curl_close($ch);
+
+echo "Status code: $httpcode \n";
+$data = json_decode($response);
+echo "result: ";
+print_r($data);
+echo "\n";

app/api/meeting/endMeeting.py

@@ -0,0 +1,29 @@
+# pip3 install requests
+import requests
+import json
+
+API_KEY_SECRET = "mirotalksfu_default_secret"
+MIROTALK_URL = "https://sfu.mirotalk.com/api/v1/meeting"
+# MIROTALK_URL = "http://localhost:3010/api/v1/meeting"
+
+ROOM = "test"
+
+headers = {
+    "authorization": API_KEY_SECRET,
+    "Content-Type": "application/json",
+}
+
+# Optional: redirect URL (leave empty for home page)
+data = {
+    # "redirect": "https://example.com/meeting-ended",
+}
+
+response = requests.delete(
+    f"{MIROTALK_URL}/{ROOM}",
+    headers=headers,
+    json=data
+)
+
+print("Status code:", response.status_code)
+data = json.loads(response.text)
+print("result:", data)

app/api/meeting/endMeeting.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+API_KEY_SECRET="mirotalksfu_default_secret"
+MIROTALK_URL="https://sfu.mirotalk.com/api/v1/meeting"
+# MIROTALK_URL="http://localhost:3010/api/v1/meeting"
+
+ROOM="test"
+
+# Optional: redirect URL (leave empty object for home page)
+# BODY='{"redirect": "https://example.com/meeting-ended"}'
+BODY='{}'
+
+curl "$MIROTALK_URL/$ROOM" \
+    --header "authorization: $API_KEY_SECRET" \
+    --header "Content-Type: application/json" \
+    --data "$BODY" \
+    --request DELETE

app/api/swagger.yaml

@@ -66,6 +66,39 @@ paths:
                         $ref: '#/definitions/MeetingResponse'
                 '403':
                     description: 'Unauthorized!'
+    /meeting/{room}:
+        delete:
+            tags:
+                - 'meeting'
+            summary: 'End meeting'
+            description: 'End an active meeting by room name. All connected peers will be disconnected and redirected to the specified URL or home page.'
+            parameters:
+                - in: path
+                  name: room
+                  required: true
+                  type: string
+                  description: 'The room name/ID of the meeting to end'
+                - in: body
+                  name: body
+                  required: false
+                  description: 'Optional body with redirect URL'
+                  schema:
+                      $ref: '#/definitions/EndMeetingRequest'
+            consumes:
+                - 'application/json'
+            produces:
+                - 'application/json'
+            security:
+                - secretApiKey: []
+            responses:
+                '200':
+                    description: 'Meeting ended successfully'
+                    schema:
+                        $ref: '#/definitions/EndMeetingResponse'
+                '403':
+                    description: 'Unauthorized!'
+                '404':
+                    description: 'Room not found'
     /join:
         post:
             tags:
@@ -162,6 +195,9 @@ definitions:
             name:
                 type: string
                 default: 'mirotalksfu'
+            avatar:
+                type: ['boolean', 'string'] # Allow boolean or string type
+                default: false
             audio:
                 type: boolean
                 default: false
@@ -171,6 +207,9 @@ definitions:
             screen:
                 type: boolean
                 default: false
+            chat:
+                type: boolean
+                default: false
             hide:
                 type: boolean
                 default: false
@@ -197,6 +236,22 @@ definitions:
             expire:
                 type: string
                 default: '1h'
+    EndMeetingRequest:
+        type: object
+        properties:
+            redirect:
+                type: string
+                description: 'URL to redirect peers to after the meeting ends. If empty, peers are redirected to the home page.'
+                default: ''
+    EndMeetingResponse:
+        type: 'object'
+        properties:
+            success:
+                type: boolean
+            message:
+                type: string
+            room:
+                type: string
     JoinResponse:
         type: 'object'
         properties:
@@ -212,6 +267,8 @@ definitions:
         properties:
             name:
                 type: string
+            avatar:
+                type: string
             presenter:
                 type: boolean
             video: