Skip to content

Websocket #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Aug 10, 2012
Merged

Websocket #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e6cad94
edited for use with the only websocket part
Aug 7, 2012
2e20bc7
fix for issue 1
Aug 7, 2012
394459a
remove socket.io dependenc and remove of auto set room
Aug 8, 2012
d6338f5
added remove of socket.id from room on close
Aug 8, 2012
226ef3a
added chat
Aug 10, 2012
61a0fa1
fixed chat repeat
Aug 10, 2012
e7fedbb
clean up some log
Aug 10, 2012
7e974e2
add dependency
Aug 10, 2012
8feb295
symlink the clientside code
benbrittain Aug 10, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 35 additions & 28 deletions example/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
<title>Example webrtc.io</title>
<link type="text/css" href="/style.css" rel="stylesheet"></link>

<script src="/socket.io/socket.io.js"></script>
<script src="/webrtc.io/webrtc.io.js"></script>
<script src="/webrtc.io.js"></script>
</head>
<body onload="init()">
<div id="videos">
Expand Down Expand Up @@ -56,7 +55,6 @@
var perColumn = Math.ceil(videos.length / perRow);
var width = Math.floor((window.innerWidth) / perRow);
var height = Math.floor((window.innerHeight - 190) / perColumn);
console.log(width, height);
video.width = width;
video.height = height;
video.style.position = "absolute";
Expand All @@ -80,28 +78,11 @@
}
}

function initChat() {

var input = document.getElementById("chatinput");
input.addEventListener('keydown', function(event) {
var key = event.which || event.keyCode;
if (key === 13) {
rtc._socket.emit('chat msg', input.value);
addToChat(input.value);
input.value = "";
}
}, false);
rtc._socket.on('receive chat msg', function(data) {
console.log(data.color);
addToChat(data.msg, data.color.toString(16));
});
}

function addToChat(msg, color) {
var messages = document.getElementById('messages');
msg = sanitize(msg);
if (color) {
msg = '<span style="color: #' + color + '; padding-left: 15px">' + msg + '</span>';
msg = '<span style="color: ' + color + '; padding-left: 15px">' + msg + '</span>';
} else {
msg = '<strong style="padding-left: 15px">' + msg + '</strong>';
}
Expand Down Expand Up @@ -140,9 +121,39 @@
})
}

function initChat() {
var input = document.getElementById("chatinput");
var room = window.location.hash.slice(1);
var color = "#"+((1<<24)*Math.random()|0).toString(16);

input.addEventListener('keydown', function(event) {
var key = event.which || event.keyCode;
if (key === 13) {
rtc._socket.send(JSON.stringify({
"eventName": "chat_msg",
"messages": input.value,
"room": room,
"color": color
}), function(error) {
if (error) {
console.log(error);
}
});
addToChat(input.value);
input.value = "";
}
}, false);
rtc.on('receive_chat_msg', function(data) {
console.log(data.color);
addToChat(data.messages, data.color.toString(16));
});
}


function init() {
if(PeerConnection){
rtc.createStream('you', function(stream) {
rtc.createStream({"video": true, "audio": true}, function(stream) {
document.getElementById('you').src = URL.createObjectURL(stream);
videos.push(document.getElementById('you'));
rtc.attachStream(stream, 'you');
subdivideVideos();
Expand All @@ -154,15 +165,11 @@

var room = window.location.hash.slice(1);

if (room === '') {
room = Math.floor(Math.random()*rooms.length);
window.location.hash = room;
}
//When connectiong to nodejitsu
//rtc.connect("http://multiwebrtc.nodejitsu.com/", room);

//When using localhost
rtc.connect("http://localhost:8000/", room);
rtc.connect("ws://localhost:8001/", room);

rtc.on('add remote stream', function(stream, socketId) {
console.log("ADDING REMOTE STREAM...");
Expand All @@ -175,9 +182,9 @@
console.log('remove ' + data);
removeVideo(data);
});
initChat();
initFullScreen();
initNewRoom();
initChat();
}

window.onresize = function(event) {
Expand Down
68 changes: 35 additions & 33 deletions example/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
var app = require('express').createServer();
var webRTC = require('webrtc.io').listen(app);

var colors = {};

var webRTC = require('webrtc.io').listen(8001);

//When connectiong to nodejitsu
//app.listen(80);
Expand All @@ -17,38 +14,43 @@ app.get('/style.css', function(req, res) {
res.sendfile(__dirname + '/style.css');
});

function selectRoom(socket) {
for (var room in servers) {
console.log('***' + room);
if (io.sockets.clients(room).length < 4) {
socket.emit('send', room);
}
console.log(io.sockets.clients('' + room));
}
}
app.get('/webrtc.io.js', function(req, res) {
res.sendfile(__dirname + '/webrtc.io.js');
});

webRTC.rtc.on('connection', function(rtc) {
//Client connected

rtc.on('send_answer', function() {
//answer sent
});
webRTC.rtc.on('connect', function(rtc) {
//Client connected
});

rtc.on('disconnect', function() {
//disconnect sent
});
webRTC.rtc.on('send answer', function(rtc) {
//answer sent
});

webRTC.sockets.on('connection', function(socket) {
console.log("connection received");

colors[socket.id] = Math.floor(Math.random()* 0xFFFFFF)
socket.on('chat msg', function(msg) {
console.log("chat received");

socket.broadcast.emit('receive chat msg', {
msg: msg,
color: colors[socket.id]
});
});
webRTC.rtc.on('disconnect', function(rtc) {
//Client disconnect
});

webRTC.rtc.on('chat_msg', function(data, socket) {
var roomList = webRTC.rtc.rooms[data.room] || [];

for (var i = 0; i < roomList.length; i++) {
var socketId = roomList[i];

if (socketId !== socket.id) {
var soc = webRTC.rtc.getSocket(data.room, socketId);

if (soc) {
soc.send(JSON.stringify({
"eventName": "receive_chat_msg",
"messages": data.messages,
"color": data.color
}), function(error) {
if (error) {
console.log(error);
}
});
}
}
}
});
1 change: 1 addition & 0 deletions example/webrtc.io.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../node_modules/webrtc.io/node_modules/webrtc.io-client/lib/webrtc.io.js
Copy link
Member

@sarenji sarenji Aug 10, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...?

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"node": ">= 0.6.0"
},
"dependencies": {
"socket.io": "latest",
"webrtc.io": "latest",
"express": "2.5.1"
"express": "2.5.1",
"ws": "latest"
},
"subdomain": "MultiWebRTC",
"scripts": {
Expand Down