Merge pull request #12 from unicam-complex-system/new-stream-integration

New stream integration
unicam-complex-system · Jan 20, 2024 · ebe958f · ebe958f
2 parents e5945b0 + 5233ba1
commit ebe958f
Show file tree

Hide file tree

Showing 42 changed files with 1,662 additions and 359 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -29,3 +29,5 @@ jobs:
           CSD_PASSWORD: ${{ secrets.CSD_PASSWORD }}
           TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_TOKEN }}
           BCRYPT_SALT: ${{ secrets.BCRYPT_SALT }}
+          OPENVIDU_URL: ${{ secrets.OPENVIDU_URL }}
+          OPENVIDU_SECRET: ${{ secrets.OPENVIDU_SECRET }}
diff --git a/Backend/.env-example b/Backend/.env-example
@@ -0,0 +1,14 @@
+#SSL_CERTIFICATE=/path-to/server.crt
+#PRIVATE_KEY=/path-to/server.key
+LISTEN_PORT=8080
+MONGO_PROTOCOL=mongodb
+MONGO_HOST=localhost:27017
+MONGO_INITDB_ROOT_USERNAME=root
+MONGO_INITDB_ROOT_PASSWORD=123123
+JWT_SECRET=RIpEW4QJCzEovH8wNsxv16aMiyGn0yNk
+CSD_USER=root
+CSD_PASSWORD=123123
+TELEGRAM_TOKEN=TOKEN_FROM_TELEGRAM
+BCRYPT_SALT=$2b$10$0H7uZ2aSzUll9k96X7EvHu
+OPENVIDU_URL=http://localhost:4443/
+OPENVIDU_SECRET=MY_SECRET 
diff --git a/Backend/.env-openvidu b/Backend/.env-openvidu
@@ -0,0 +1,5 @@
+OPENVIDU_SECRET=MY_SECRET
+OPENVIDU_WEBHOOK=true
+OPENVIDU_WEBHOOK_ENDPOINT=https://localhost:8080/media-server
+
+
diff --git a/Backend/nest-cli.json b/Backend/nest-cli.json
@@ -3,6 +3,14 @@
   "collection": "@nestjs/schematics",
   "sourceRoot": "src",
   "compilerOptions": {
-    "deleteOutDir": true
+    "deleteOutDir": true,
+    "assets": [
+      {
+        "include": "./ssl_certificate",
+        "outDir": "dist",
+        "watchAssets": true
+      }
+    ],
+    "watchAssets": true
   }
 }
diff --git a/Backend/package-lock.json b/Backend/package-lock.json
diff --git a/Backend/package.json b/Backend/package.json
@@ -6,8 +6,11 @@
   "private": true,
   "license": "GPL",
   "scripts": {
+    "docker:start": "npm ci && nest start",
+    "docker:dev": "npm run docker:start -- --watch",
+    "docker:test": "npm ci && jest",
     "build": "nest build",
-    "start": "npm ci && nest start",
+    "start": "nest start",
     "start:dev": "nest start --watch",
     "start:debug": "npm start -- --debug --watch",
     "start:prod": "node dist/main",
@@ -36,9 +39,9 @@
     "dotenv": "^16.3.1",
     "mongodb": "^6.3.0",
     "node-telegram-bot-api": "^0.64.0",
+    "openvidu-node-client": "^2.29.0",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.1",
-    "simple-peer": "^9.11.1",
     "ws": "^8.14.2"
   },
   "devDependencies": {

diff --git a/Backend/src/app.module.ts b/Backend/src/app.module.ts
@@ -12,6 +12,8 @@ import { TelegramService } from './telegram/telegram.service';
 import { LoginController } from './app/login.controller';
 import { CameraStreamGateway } from './cameraStream/cameraStream.gateway';
 import { LoginService } from './login/login.service';
+import { MediaServerController } from './app/mediaServer/mediaServer.controller';
+import { CSSOpenVidu } from './cameraStream/open-vidu.service';
 
 @Module({
   imports: [
@@ -23,12 +25,18 @@ import { LoginService } from './login/login.service';
       // signOptions: { expiresIn: "60s" },
     }),
   ],
-  controllers: [MachineLearningController, FrontendController, LoginController],
+  controllers: [
+    MachineLearningController,
+    FrontendController,
+    LoginController,
+    MediaServerController,
+  ],
   providers: [
     DatabaseService,
     TelegramService,
     CameraStreamGateway,
     LoginService,
+    CSSOpenVidu,
   ],
   exports: [DatabaseService, TelegramService],
 })