Merge branch 'master' of git+ssh://source.hacker.lu/var/repo/projects/syndilights

master
Gunstick 2013-09-02 21:00:16 +02:00
commit 86190027c1
2 changed files with 40 additions and 13 deletions

View File

@ -21,10 +21,11 @@ wsServer.on('request', function(r){
// Specific id for this client & increment count
var id = count++;
// // Store the connection method so we can loop through & contact all clients
// Store the connection method so we can loop through & contact all clients
clients[id] = connection
console.log((new Date()) + ' Connection accepted [' + id + ']');
clients[id].sendUTF("Welcome to the server. You are connected. This message has been pushed to you.");
// Create event listener
connection.on('message', function(message) {
@ -46,5 +47,22 @@ wsServer.on('request', function(r){
});
});
var sendTime = function () {
var now, i = 0;
// get time now
now = new Date();
// send time to all clients
for(i in clients) {
// Send a message to the client with the message
clients[i].sendUTF(now);
}
// repeat in 5 seconds
setTimeout(sendTime, 5000);
};
// every 5 seconds send the date/time
setTimeout(sendTime, 5000);

View File

@ -4,13 +4,17 @@
<meta charset="utf-8">
<title>Web socket test</title>
<script type="text/javascript">
var ws = new WebSocket('ws://localhost:1234', 'echo-protocol');
var ws;
function sendMessage(){
var message = document.getElementById('message').value;
ws.send(message);
}
function connection() {
ws = new WebSocket('ws://localhost:1234', 'echo-protocol');
ws.addEventListener("message", function(e) {
// The data is simply the message that we're sending back
var msg = e.data;
@ -19,6 +23,10 @@
document.getElementById('chatlog').innerHTML += '<br>' + msg;
});
document.getElementById('connect_button').style.display = 'none';
}
</script>
</head>
<body>
@ -27,5 +35,6 @@
<input type='button' value='send message' onclick='sendMessage()'/>
<div>Received from server:</div>
<div id='chatlog'></div>
<input id='connect_button' type='button' value='Connect to server using websockets' onclick='connection()'/>
</body>
</html>