Skip to content

Multiroom #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

Open
Antiik91 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Multiroom #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb0fa19
Started with multiroom support socket.get method's are gone, will hav…
Antiik91 Jan 3, 2017
f755809
Some progress, currently passing channel is null so messages comes to…
Antiik91 Jan 8, 2017
c6b9be6
figuring out where the problem is
Antiik91 Jan 9, 2017
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
33 changes: 30 additions & 3 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
</head>
<body>
<div id="username-taken"></div>
<div id="channels" style="visibility: hidden;">
<button id="main" type="button" name="main" onclick="joinChannel(document.getElementById('main').name)"> Main ch </button>
<button id="offtopic" type="button" name="offtopic" onclick="joinChannel(document.getElementById('offtopic').name)"> offtopic ch </button>
</div>
<div id="newUser">
<p style="align-text: center;"> Tervetuloa Tänne :) </p>
<input id="name" type="text" name="name" value="" placeholder="Saisinko Nickisi">
Expand All @@ -30,28 +34,51 @@
<script src ="/socket.io/socket.io.js"></script>
<script src="http://code.jquery.com/jquery-1.11.1.js"></script>
<script>
var socket = io();
var socket = io.connect('http://localhost:3000');
var user;
var currChannel;
function setUsername(){
socket.emit('setUsername', document.getElementById('name').value);
};
function joinChannel(channel){
if(currChannel) {
socket.emit('leave', currChannel,function(){
});
}
socket.emit('join', channel, function(){
appendMessage(user + ' liittyi kanavalle ' + channel);
currChannel = channel;
});

}
socket.on('userTaken', function(data){
document.getElementById('username-taken').innerHTML = data;
});
socket.on('setUser', function(data){
user = document.getElementById('name').value;
document.getElementById('newUser').style.visibility = 'hidden';
document.getElementById('msgs').style.visibility = 'visible';
document.getElementById('channels').style.visibility = 'visible';
});
$('form').submit(function(){
socket.emit('chat message', user, $('#m').val());
if (currChannel) {
socket.emit('chat message', user, currChannel, $('#m').val());
$('#m').val('');
return false;
} else {
socket.emit('chat message', user, 'main', 'Eipä toimi mutta tää toimii');
}

});
socket.on('broadcast', function(data){
$('#messages').append($('<li>').text(data.description));
appendMessage(data.description);
});
socket.on('error', function(err){
appendMessage('error: ' + err);
});
function appendMessage(msg) {
$('#messages').append($('<li>').text(msg));
};
</script>
</body>
</html>
68 changes: 49 additions & 19 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,65 @@ var app = require('express')();
var http = require('http').Server(app);
var io = require('socket.io')(http);

app.get('/', function(req, res){
app.get('/', function(req, res) {
res.sendFile(__dirname + '/index.html');
});

var clients = [];
io.on('connection', function(socket) {
var channels = [];
io.sockets.on('connection', function(socket) {
console.log('a user is connected');
socket.on('setUsername', function(data){
if(clients.indexOf(data) > -1) {
socket.emit('userTaken', data + ' Valitettavasti on jo varattu');
// console.log(data +' varattu');
}
else {
clients.push(data);
socket.emit('setUser', {username: data});
// console.log(data +' Vapaana');
io.sockets.emit('broadcast', {description: data + ' Liittyi kanavalle'});
}
// Check if username is taken or not.
socket.on('setUsername', function(data) {
if (clients.indexOf(data) > -1) {
socket.emit('userTaken', data + ' Valitettavasti on jo varattu');
// console.log(data +' varattu');
} else {
clients.push(data);
socket.emit('setUser', {
username: data
});
// console.log(data +' Vapaana');
io.sockets.emit('broadcast', {
description: data + ' Liittyi kanavalle'
});
}
});
socket.on('disconnect', function(data){
var u = clients.indexOf(data);
// Join to room
socket.on('join', function(channel) {
socket.join(channel);
console.log('user is now on ' + channel);
});
//Leave from room
socket.on('leave', function(channel) {
socket.leave(channel);
console.log('user is now left from: ' + channel);
});
//Handling the disconnection from the server
socket.on('disconnect', function(data) {
var u = clients.indexOf(data);
clients.splice(u, 1);
console.log(' user disconnected');
io.sockets.emit('broadcast', {description: 'Käyttäjä lähti kanavalta'});
io.sockets.emit('broadcast', {
description: 'Käyttäjä lähti kanavalta'
});
});
socket.on('chat message', function(user, data){
io.sockets.emit('broadcast', {description: user +": "+ data});
// console.log('viesti ' + user + " "+ data);
//Handles the chat message event.
socket.on('chat message', function(user, channel, data) {
//This currently doesn't work. channel is null
console.log('viesti.' + channel + ': ' + data);
if (channel) {
console.log(channel + ' Moi');
io.to(channel).emit('broadcast', {
description: user + ": " + data
});
} else {
console.log('Moikkamoi ' + channel);
// io.sockets.emit('error', 'Something happened :(');
}

});

});

http.listen(3000, function() {
Expand Down