sergiu
/
hub-video-tester
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update client

This commit is contained in:
Sergiu Toma 2021-02-22 20:23:40 +02:00
parent b0d00f7a59
commit 831e52f0dc
7 changed files with 128 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env
View File

@ -1 +1,2 @@
PORT=3001 PORT=3001
GENERATE_SOURCEMAP=true

27
public/index.html
View File

@ -9,22 +9,8 @@
name="description" name="description"
content="Web site created using create-react-app" content="Web site created using create-react-app"
/> />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo.png" />
<!-- <title>WebRTC Tester</title>
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
</head> </head>
<body> <body>
<noscript>You need to enable JavaScript to run this app.</noscript> <noscript>You need to enable JavaScript to run this app.</noscript>
@ -43,15 +29,6 @@
LOCAL VIDEO<video id="localVideo" autoplay></video> LOCAL VIDEO<video id="localVideo" autoplay></video>
<br></br> <br></br>
REMOTE VIDEO<video id="remoteVideo" autoplay></video> REMOTE VIDEO<video id="remoteVideo" autoplay></video>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body> </body>
</html> </html>

BIN
public/logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
public/logo192.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.2 KiB

BIN
public/logo512.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.4 KiB

25
public/manifest.json
View File

@ -1,25 +0,0 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}

164
src/App.js
View File

@ -4,7 +4,7 @@ import './App.css';
const io = require("socket.io-client"); const io = require("socket.io-client");
var socket, stream; var stream, pc;
// var config = { // var config = {
// iceServers: [{ // iceServers: [{
@ -101,8 +101,6 @@ var config = {
// rtcpMuxPolicy:"negotiate" // rtcpMuxPolicy:"negotiate"
// } // }
var pc = new RTCPeerConnection(config)
let localStream, remoteStream let localStream, remoteStream
let localVideo = document.getElementById("localVideo"); let localVideo = document.getElementById("localVideo");
@ -137,6 +135,7 @@ class App extends Component {
// setTimeout(() => { // setTimeout(() => {
// windowObjectReference = window.open("http://www.cnn.com/", "CNN_WindowName", windowFeatures); // windowObjectReference = window.open("http://www.cnn.com/", "CNN_WindowName", windowFeatures);
// }, 500) // }, 500)
pc = new RTCPeerConnection(config)
stream = await navigator.mediaDevices.getUserMedia({video:true, audio:false}) stream = await navigator.mediaDevices.getUserMedia({video:true, audio:false})
localStream = stream localStream = stream
localVideo.srcObject = stream localVideo.srcObject = stream
@ -144,6 +143,43 @@ class App extends Component {
// pc.addTrack(localStream.getTracks()[0], localStream); // pc.addTrack(localStream.getTracks()[0], localStream);
pc.addTrack(localStream.getTracks()[0], localStream) pc.addTrack(localStream.getTracks()[0], localStream)
// pc.addTrack(localStream.getTracks()[1], localStream) // pc.addTrack(localStream.getTracks()[1], localStream)
pc.oniceconnectionstatechange = this.onIceConnectionStateChange;
pc.onsignalingstatechange = this.onSignalingStateChange;
// pc.onicecandidate = ({candidate}) => {
// console.log('IIIIIIIIIIIIIIIIIIIIIIIII2', this.state.callId);
// this.state.socket.emit('video', JSON.stringify({
// type: 'candidate',
// candidate: candidate,
// dest_asset_id: parseInt(this.state.dest_asset_id),
// video_call_id: this.state.callId,
// test: '1111111111'
// }));
// }
}
onIceConnectionStateChange = (event) => {
console.log('onIceConnectionStateChange', event);
}
onSignalingStateChange = async ({currentTarget}) => {
console.log('onSignalingStateChange', currentTarget);
// if(currentTarget.connectionState === 'new') {
// console.log('pc.localDescription', pc.localDescription);
// if(pc.localDescription) {
// console.log('SEND SDP onSignalingStateChange');
// // await pc.setLocalDescription(await pc.createAnswer())
// this.state.socket.emit('video', JSON.stringify({
// origin_asset_id: this.state.user.asset.id,
// dest_asset_id: parseInt(this.state.dest_asset_id),
// type: 'offer',
// origin_asset_priority: this.state.user.asset.priority,
// origin_asset_type_name: this.state.user.user_role.name,
// origin_asset_name: this.state.user.asset.name,
// video_call_id: this.state.callId,
// sdp: pc.localDescription
// }));
// }
// }
} }
onAddStream = (event) => { onAddStream = (event) => {
@ -167,11 +203,11 @@ class App extends Component {
this.setState({ user: loginResponseJson.data }, () => { this.setState({ user: loginResponseJson.data }, () => {
// Connect to HUB // Connect to HUB
this.setState({ socket: io("https://hub.dev.linx.safemobile.com/", {reconnect:true, transports: ['websocket']}) }, () => { this.setState({ socket: io("https://hub.dev.linx.safemobile.com/", {reconnect:true, transports: ['websocket']}) }, () => {
socket = this.state.socket; // socket = this.state.socket;
socket.on('connect', () => { this.state.socket.on('connect', () => {
this.setState({ hubStatus: 2 }) this.setState({ hubStatus: 2 })
// Send ARS after connected to HUB // Send ARS after connected to HUB
socket.emit('ars', JSON.stringify({ this.state.socket.emit('ars', JSON.stringify({
ars: true, ars: true,
asset_id: this.state.user.asset.id, asset_id: this.state.user.asset.id,
account_id: this.state.user.account.id account_id: this.state.user.account.id
@ -180,27 +216,71 @@ class App extends Component {
}); });
// HUB 'video' event handler // HUB 'video' event handler
socket.on('video', async (data) => { this.state.socket.on('video', async (data) => {
const parseData = JSON.parse(data); const parseData = JSON.parse(data);
console.log('[VIDEO]', parseData); console.log('[VIDEO]', parseData);
if(parseData.type === 'notify-request') { if(parseData.type === 'notify-request') {
await pc.setLocalDescription(await pc.createOffer()) console.log('NOTIFY-REQUEST');
console.log('IIIIIIIIIIIIIIIIIIIIIIIII', this.state.callId); if(!this.state.callId) {
socket.emit('video', JSON.stringify({ await pc.setLocalDescription(await pc.createOffer())
origin_asset_id: this.state.user.asset.id, this.state.socket.emit('video', JSON.stringify({
dest_asset_id: parseInt(parseData.origin_asset_id), origin_asset_id: this.state.user.asset.id,
type: 'offer', dest_asset_id: parseInt(parseData.origin_asset_id),
origin_asset_priority: this.state.user.asset.priority, type: 'notify-answer',
origin_asset_type_name: this.state.user.user_role.name, origin_asset_priority: this.state.user.asset.priority,
origin_asset_name: this.state.user.asset.name, origin_asset_type_name: this.state.user.user_role.name,
video_call_id: parseInt(parseData.video_call_id), origin_asset_name: this.state.user.asset.name,
answer: 'accepted', // answer: 'rejected' video_call_id: parseInt(parseData.video_call_id),
sdp: pc.localDescription answer: 'accepted', // answer: 'rejected'
})); sdp: pc.localDescription
this.setState({ callId: parseInt(parseData.video_call_id), dest_asset_id: parseInt(parseData.origin_asset_id) }) }));
this.setState({ callId: parseInt(parseData.video_call_id), dest_asset_id: parseInt(parseData.origin_asset_id) })
}
// else {
// console.log('!!!!!!!!!!!!!!!!!', {
// origin_asset_id: this.state.user.asset.id,
// dest_asset_id: parseInt(this.state.dest_asset_id),
// type: 'offer',
// origin_asset_priority: this.state.user.asset.priority,
// origin_asset_type_name: this.state.user.user_role.name,
// origin_asset_name: this.state.user.asset.name,
// video_call_id: this.state.callId,
// sdp: pc.localDescription
// });
// socket.emit('video', JSON.stringify({
// origin_asset_id: this.state.user.asset.id,
// dest_asset_id: parseInt(this.state.dest_asset_id),
// type: 'offer',
// origin_asset_priority: this.state.user.asset.priority,
// origin_asset_type_name: this.state.user.user_role.name,
// origin_asset_name: this.state.user.asset.name,
// video_call_id: this.state.callId,
// sdp: pc.localDescription
// }));
// }
}
if(parseData.type === 'notify-answer') {
console.log('NOTIFY-ANSWER');
this.setState({ callId: parseInt(parseData.video_call_id) })
this.offerReceived(parseData)
// await pc.setLocalDescription(await pc.createOffer())
// console.log('IIIIIIIIIIIIIIIIIIIIIIIII', this.state.callId);
// socket.emit('video', JSON.stringify({
// origin_asset_id: this.state.user.asset.id,
// dest_asset_id: parseInt(parseData.origin_asset_id),
// type: 'offer',
// origin_asset_priority: this.state.user.asset.priority,
// origin_asset_type_name: this.state.user.user_role.name,
// origin_asset_name: this.state.user.asset.name,
// video_call_id: parseInt(parseData.video_call_id),
// answer: 'accepted', // answer: 'rejected'
// sdp: pc.localDescription
// }));
// this.setState({ callId: parseInt(parseData.video_call_id), dest_asset_id: parseInt(parseData.origin_asset_id) })
} }
else if(parseData.type === 'offer') { else if(parseData.type === 'offer') {
if(parseData.sdp.type === 'offer') { if(parseData.sdp.type === 'offer') {
@ -210,16 +290,26 @@ class App extends Component {
} else if(parseData.sdp.type === 'answer') { } else if(parseData.sdp.type === 'answer') {
console.log('[ANSWER]'); console.log('[ANSWER]');
await pc.setRemoteDescription(parseData.sdp) await pc.setRemoteDescription(parseData.sdp)
pc.onicecandidate = ({candidate}) => { pc.onicecandidate = ({candidate}) => {
console.log('candidate1', candidate); console.log('candidate1', candidate);
this.state.socket.emit('video', JSON.stringify({ this.state.socket.emit('video', JSON.stringify({
type: 'candidate', type: 'candidate',
candidate, candidate,
dest_asset_id: parseInt(this.state.dest_asset_id), dest_asset_id: parseInt(this.state.dest_asset_id),
video_call_id: parseData.video_call_id, video_call_id: parseData.video_call_id,
test: '222222222222', test: '222222222222',
})); }));
} }
this.state.socket.emit('video', JSON.stringify({
origin_asset_id: this.state.user.asset.id,
dest_asset_id: parseInt(this.state.dest_asset_id),
type: 'offer',
origin_asset_priority: this.state.user.asset.priority,
origin_asset_type_name: this.state.user.user_role.name,
origin_asset_name: this.state.user.asset.name,
video_call_id: this.state.callId,
sdp: pc.localDescription
}));
} }
} else if(parseData.type === 'candidate') { } else if(parseData.type === 'candidate') {
console.log('candidate parseData', parseData); console.log('candidate parseData', parseData);
@ -227,8 +317,10 @@ class App extends Component {
console.log('parseData.candidate', parseData.candidate) console.log('parseData.candidate', parseData.candidate)
pc.addIceCandidate(parseData.candidate).catch(e => {console.log(e)}) pc.addIceCandidate(parseData.candidate).catch(e => {console.log(e)})
} }
} else if (parseData.type === 'notify-end') {
this.cleanVideoStreams();
} }
}); });
@ -261,7 +353,7 @@ class App extends Component {
console.log('IIIIIIIIIIIIIIIIIIIIIIIII3', this.state.callId); console.log('IIIIIIIIIIIIIIIIIIIIIIIII3', this.state.callId);
await pc.setLocalDescription(await pc.createOffer()); await pc.setLocalDescription(await pc.createOffer());
// socket.emit('signal', {destination:remoteUser, data:pc.localDescription}) // socket.emit('signal', {destination:remoteUser, data:pc.localDescription})
socket.emit('video', JSON.stringify({ this.state.socket.emit('video', JSON.stringify({
origin_asset_id: this.state.user.asset.id, origin_asset_id: this.state.user.asset.id,
dest_asset_id: parseInt(this.state.dest_asset_id), dest_asset_id: parseInt(this.state.dest_asset_id),
type: 'offer', type: 'offer',
@ -318,7 +410,6 @@ class App extends Component {
} }
handleClickEvent = () => { handleClickEvent = () => {
console.log('IIIIIIIIIIIIIIIIIIIIIIIII6', this.state.callId);
this.state.socket.emit('video', JSON.stringify({ this.state.socket.emit('video', JSON.stringify({
origin_asset_id: this.state.user.asset.id, origin_asset_id: this.state.user.asset.id,
dest_asset_id: parseInt(this.state.dest_asset_id), dest_asset_id: parseInt(this.state.dest_asset_id),
@ -328,13 +419,6 @@ class App extends Component {
origin_asset_name: this.state.user.name, origin_asset_name: this.state.user.name,
video_call_id: this.state.callId video_call_id: this.state.callId
})); }));
// var userToCall = document.getElementById('calluser').value
// remoteUser = userToCall
// document.getElementById('invitestatus').innerHTML = " INVITATIE TRIMISA"
// document.getElementById('loadingOverlay').style.display = "block"
// var x = document.getElementById('calluser');
// x.style.display = "none";
// socket.emit('call', userToCall)
} }
closeVideo = () => { closeVideo = () => {