Add session header. Fixes some RTSP clients like VLC

Author: chriswiggins

lib/Client.js

@@ -128,7 +128,7 @@ class Client {
 			} catch(e){
 				//Ignore
 			}
-		}, 30000);
+		}, 6e4);
 	}
 }
 

lib/ClientServer.js

@@ -39,12 +39,18 @@ class ClientServer {
 	}
 
 	optionsRequest(req, res){
-		if(req.socket.uuid){
-			let client = this.clients[req.socket.uuid];
-			client.keepalive();
+		// Update the client timeout if they provide a session
+		if(req.headers.session){
+			let client = this.clients[req.headers.session];
+			if (client){
+				client.keepalive();
+			} else {
+				res.statusCode = 454; // Session not found
+				return res.end(); 
+			}
 		}
 
-		res.setHeader('SETUP PLAY STOP', 'OPTIONS');
+		res.setHeader('DESCRIBE SETUP PLAY STOP', 'OPTIONS');
 		return res.end();
 	}
 
@@ -84,18 +90,18 @@ class ClientServer {
 		this.clients[client.id] = client;
 
 		res.setHeader('Transport', `${req.headers.transport};server_port=${client.rtpStartPort}-${client.rtpEndPort}`);
+		res.setHeader('Session', `${client.id};30`);
 		res.end();
 	}
 
 
 	async playRequest(req, res){
-		let clientId = req.socket.uuid;
-		if(!clientId){
-			res.statusCode = 404;
+		if(!req.headers.session || !this.clients[req.headers.session]){
+			res.statusCode = 454;
 			return res.end();
 		}
 
-		let client = this.clients[clientId];
+		let client = this.clients[req.headers.session];
 		client.play();
 
 		if(client.mount.range){
@@ -107,13 +113,12 @@ class ClientServer {
 
 
 	teardownRequest(req, res){
-		let clientId = req.socket.uuid;
-		if(!clientId){
-			res.statusCode = 404;
+		if(!req.headers.session || !this.clients[req.headers.session]){
+			res.statusCode = 454;
 			return res.end();
 		}
 
-		let client = this.clients[clientId];
+		let client = this.clients[req.headers.session];
 		client.close();
 
 		res.end();

lib/Server.js

@@ -37,7 +37,7 @@ class Server {
 	}
 
 	optionsRequest(req, res){
-		res.setHeader('SETUP ANNOUNCE RECORD', 'OPTIONS');
+		res.setHeader('DESCRIBE SETUP ANNOUNCE RECORD', 'OPTIONS');
 		return res.end();
 	}
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "rtsp-streaming-server",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Lightweight RTSP/RTP streaming media server written in Javascript",
   "main": "rtsp-server.js",
   "scripts": {
@@ -11,8 +11,8 @@
   "license": "GPL-3.0",
   "dependencies": {
     "rtsp-server": "^1.2.2",
-    "uuid": "^3.2.1",
-    "winston": "^2.4.0"
+    "uuid": "^3.3.2",
+    "winston": "^2.4.4"
   },
   "engines": {
     "node": "^8.0.0"