Bläddra i källkod

Merge pull request #340 from alphacornutum/master

Dominic Szablewski 5 år sedan
förälder
incheckning
7d831e5b68
No account linked to committer's email
1 ändrade filer med 6 tillägg och 3 borttagningar
  1. 6 3
      websocket-relay.js

+ 6 - 3
websocket-relay.js Visa fil

27
 socketServer.on('connection', function(socket, upgradeReq) {
27
 socketServer.on('connection', function(socket, upgradeReq) {
28
 	socketServer.connectionCount++;
28
 	socketServer.connectionCount++;
29
 	console.log(
29
 	console.log(
30
-		'New WebSocket Connection: ', 
30
+		'New WebSocket Connection: ',
31
 		(upgradeReq || socket.upgradeReq).socket.remoteAddress,
31
 		(upgradeReq || socket.upgradeReq).socket.remoteAddress,
32
 		(upgradeReq || socket.upgradeReq).headers['user-agent'],
32
 		(upgradeReq || socket.upgradeReq).headers['user-agent'],
33
 		'('+socketServer.connectionCount+' total)'
33
 		'('+socketServer.connectionCount+' total)'
61
 
61
 
62
 	response.connection.setTimeout(0);
62
 	response.connection.setTimeout(0);
63
 	console.log(
63
 	console.log(
64
-		'Stream Connected: ' + 
64
+		'Stream Connected: ' +
65
 		request.socket.remoteAddress + ':' +
65
 		request.socket.remoteAddress + ':' +
66
 		request.socket.remotePort
66
 		request.socket.remotePort
67
 	);
67
 	);
83
 		var path = 'recordings/' + Date.now() + '.ts';
83
 		var path = 'recordings/' + Date.now() + '.ts';
84
 		request.socket.recording = fs.createWriteStream(path);
84
 		request.socket.recording = fs.createWriteStream(path);
85
 	}
85
 	}
86
-}).listen(STREAM_PORT);
86
+})
87
+// Keep the socket open for streaming
88
+streamServer.headersTimeout = 0;
89
+streamServer.listen(STREAM_PORT);
87
 
90
 
88
 console.log('Listening for incomming MPEG-TS Stream on http://127.0.0.1:'+STREAM_PORT+'/<secret>');
91
 console.log('Listening for incomming MPEG-TS Stream on http://127.0.0.1:'+STREAM_PORT+'/<secret>');
89
 console.log('Awaiting WebSocket connections on ws://127.0.0.1:'+WEBSOCKET_PORT+'/');
92
 console.log('Awaiting WebSocket connections on ws://127.0.0.1:'+WEBSOCKET_PORT+'/');