Skip to content

Commit

Permalink
initial commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@epmiller8464
epmiller8464 committed Mar 10, 2016
1 parent ee0ce51 commit 54a421b
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 51 deletions.
74 changes: 41 additions & 33 deletions lib/Room.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,45 +22,53 @@ function Room(io, opts) {
self.isConnected = false
self.transport = io.of('/' + opts.channel)
self.transport.on('connection', function (socket) {
var client_uuid = socket.id
var u;
self.subscribers[client_uuid] = u = new User({id: client_uuid, name: '', socket: socket, publisher: true})
//var username;
//socket.broadcast.emit('room-joined', self.subscribers[client_uuid]);
socket.join(self.name)
socket.emit('connect', true);
var client_uuid = socket.id
var u;
self.subscribers[client_uuid] = u = new User({id: client_uuid, name: '', socket: socket, publisher: true})
//var username;
//socket.broadcast.emit('room-joined', self.subscribers[client_uuid]);
socket.join(self.name)
//socket.emit('connect', true);
socket.emit('connect', true);
socket.on('message', function (data) {
//var name = data.username;
console.log(data)

socket.on('message', function (data) {
var name = data.username;
console.log('s: message')
console.log(data)
socket.broadcast.emit('message', data.data);
});
//self.transport.sockets.emit('message', data.data);
//self.transport.broadcast('message', data.data);
//socket.emit('message', data.data);
var id = Object.keys(self.subscribers)[1]
var to = self.subscribers[id];
//if (to) {
to.socket.broadcast.emit('message', {from: socket.id, data: data})
//to.socket.emit('message', {from: socket.id, data: data})
//}
//sends to all connected
self.transport.emit('message', data.data);

socket.on('signaling', function (data) {
console.log('s: signaling')
console.log(data)
socket.broadcast.emit('broadcasting', {echo: data});
});
socket.on('error', function (error) {
if (error) {
//socket.broadcast.emit('message', data.data);
});

socket.on('signaling', function (data) {
console.log('s: signaling')
console.log(data)
socket.broadcast.emit('broadcasting', {echo: data});
}
});
//socket.on('join-room', function (data) {
// if (data.sender) {
//
// socket.broadcast.emit('broadcasting', data.data);
// }
//});
});
socket.on('error', function (error) {
if (error) {

socket.on('disconnect', function () {
//self.subscribers[
socket.broadcast.emit('user-left', {});
})
socket.broadcast.emit('broadcasting', {echo: data});
}
});

});
socket.on('disconnect', function () {
//self.subscribers[
socket.broadcast.emit('user-left', {});
})

}
)
;

}

Expand Down
36 changes: 18 additions & 18 deletions static/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,13 @@
</head>
<body>

<div class="container-fluid">
<div class="container">
<div class="row">
<div class="col-md-1" style="margin-bottom: 20px;">
<a id="joinRoom" href="#" class="btn btn-success">
joinRoom
</a>
</div>
<!--<div class="col-md-2" data-webrtc-presenterId="1">-->
<!--<div id="mc" class="row">-->
<!--<div id="console" class="console democonsole">-->
<!--</div>-->
<!--</div>-->
<!--<div class="row">-->
<!--<input type="text" class="input-lg ">-->
<!--<a id="" href="#">send</a>-->
<!--</div>-->
<!--</div>-->
</div>
<div id="viewers" class="row">
</div>
Expand All @@ -57,18 +47,22 @@
this.socket = io('/' + opts.room);
this.room = this.socket.channel = opts.room;
this.id = opts.id
this.console = new Console(null, opts);
init()
function init() {
var container = $('#viewers');
container.append(textControl(self.id))
$('#' + index).click(function () {
$('#' + self.id).click(function () {
// alert($(this).attr('id'))
self.console.log('#txt_' + self.id)
var text = $('#txt_' + self.id)
self.socket.emit('message', {data: text.val()})
// self.console.log(text.val())
if (text)
self.socket.emit('message', {data: text.val()})

});

self.console = new Console(null, opts);

self.socket.on('connect', function (s) {
// console.log(socket)
console.log('connected ' + self.id + ' to room ' + self.room)
Expand All @@ -80,8 +74,9 @@
console.log(data)
});
self.socket.on('message', function (m) {
self.console.log(m)
console.log('message')
console.log(m)
// console.log(m)
});

self.socket.on('user-left', function () {
Expand All @@ -94,15 +89,18 @@

}
}

// var io = require('socket.io')
var path = '/'//ws://' + location.host
var room = location.pathname.replace('/', '')
var room = location.pathname.replace('/', '').replace('#', '')
room = room.replace(/\/|:|#|%|\.|\[|\]/g, '');
console.log(room)
var sender = Math.round(Math.random() * 999999999) + 999999999;
// var socket;
var index = 0;
var clients = []
$('#joinRoom').click(function () {
$('#joinRoom').click(function (evt) {
evt.preventDefault()
var c = new SocketClient({room: room, id: index})
clients.push(c)
index++;
Expand All @@ -117,7 +115,9 @@
'</div>' +
'<div class="row">' +
'<textarea type="text" id="txt_' + id + '" class="input-lg "/>' +
'<a id="' + id + '" href="#">send</a>' +
'<div class="row">' +
'<a id="' + id + '" href="#" class="btn btn-success">send</a>' +
'</div>' +
'</div>' +
'</div>'
}
Expand Down

0 comments on commit 54a421b

Please sign in to comment.