mirror of
https://github.com/hydra-synth/hydra.git
synced 2025-12-15 19:29:58 +01:00
added updated submodules
This commit is contained in:
@@ -8,7 +8,7 @@ const app = express()
|
||||
const path = require('path')
|
||||
const configureSSL = require('./configure-ssl.js')
|
||||
|
||||
var server = configureSSL(app)
|
||||
var server = configureSSL(app)
|
||||
|
||||
//
|
||||
// TURN server access
|
||||
@@ -16,7 +16,7 @@ var twilio = require('twilio')
|
||||
|
||||
//console.log('process', process.env)
|
||||
|
||||
if(process.env.TWILIO_SID) {
|
||||
if (process.env.TWILIO_SID) {
|
||||
var twilio_client = new twilio(process.env.TWILIO_SID, process.env.TWILIO_AUTH)
|
||||
}
|
||||
|
||||
@@ -38,11 +38,11 @@ var socketFromUser = {}
|
||||
|
||||
// new connection to websocket server
|
||||
io.on('connection', function (socket) {
|
||||
//console.log('new connection', socket.id)
|
||||
// console.log('new connection', socket.id)
|
||||
var thisRoom = null
|
||||
socket.on('join', function (room, _userData) {
|
||||
thisRoom = room
|
||||
// console.log('user', JSON.stringify(_userData))
|
||||
console.log('user', JSON.stringify(_userData))
|
||||
if (_userData.uuid) {
|
||||
userFromSocket[socket.id] = _userData.uuid
|
||||
socketFromUser[_userData.uuid] = socket.id
|
||||
@@ -54,24 +54,24 @@ io.on('connection', function (socket) {
|
||||
|
||||
io.of('/').in(room).clients(function (error, clients) {
|
||||
if (error) throw error
|
||||
// console.log(clients) // => [Anw2LatarvGVVXEIAAAD]
|
||||
// console.log(clients) // => [Anw2LatarvGVVXEIAAAD]
|
||||
})
|
||||
|
||||
var peerUuids = peers.map(socketId => userFromSocket[socketId])
|
||||
|
||||
// Send them to the client
|
||||
// socket.emit('ready', socket.id, peerUuids)
|
||||
if(twilio_client) {
|
||||
// socket.emit('ready', socket.id, peerUuids)
|
||||
if (twilio_client) {
|
||||
twilio_client.api.accounts(process.env.TWILIO_SID).tokens
|
||||
.create({})
|
||||
.then((token) => {
|
||||
.create({})
|
||||
.then((token) => {
|
||||
// console.log(token.iceServers)
|
||||
socket.emit('ready', {
|
||||
id: socket.id,
|
||||
peers: peerUuids,
|
||||
servers: token.iceServers
|
||||
})
|
||||
socket.emit('ready', {
|
||||
id: socket.id,
|
||||
peers: peerUuids,
|
||||
servers: token.iceServers
|
||||
})
|
||||
})
|
||||
} else {
|
||||
socket.emit('ready', {
|
||||
id: socket.id,
|
||||
@@ -86,12 +86,12 @@ io.on('connection', function (socket) {
|
||||
// io.sockets.emit('peers', peerUuids);
|
||||
socket.to(thisRoom).emit('new peer', _userData.uuid)
|
||||
|
||||
// console.log('user', JSON.stringify(Object.keys(socketFromUser)))
|
||||
// console.log('user', JSON.stringify(Object.keys(socketFromUser)))
|
||||
})
|
||||
|
||||
socket.on('broadcast', function (data) {
|
||||
// io.sockets.emit('broadcast', data)
|
||||
// console.log('broadcasting', data, socket.room)
|
||||
// console.log('broadcasting', data, socket.room)
|
||||
// io.sockets.in(socket.room).emit('broadcast', data)
|
||||
socket.to(thisRoom).emit('broadcast', data)
|
||||
})
|
||||
@@ -108,7 +108,7 @@ io.on('connection', function (socket) {
|
||||
})
|
||||
|
||||
socket.on('signal', function (data) {
|
||||
// console.log('forwarding signal ' + JSON.stringify(data))
|
||||
// console.log('forwarding signal ' + JSON.stringify(data))
|
||||
var client = io.sockets.connected[socketFromUser[data.id]]
|
||||
client && client.emit('signal', {
|
||||
id: userFromSocket[socket.id],
|
||||
|
||||
Reference in New Issue
Block a user