|
@@ -1,23 +1,25 @@
|
|
|
+var http = require('http');
|
|
|
var express = require('express');
|
|
|
var fs = require('fs');
|
|
|
var io = require('socket.io');
|
|
|
var _ = require('underscore');
|
|
|
var Mustache = require('mustache');
|
|
|
|
|
|
-var app = express.createServer();
|
|
|
+var app = express();
|
|
|
var staticDir = express.static;
|
|
|
+var server = http.createServer(app);
|
|
|
|
|
|
-io = io.listen(app);
|
|
|
+io = io(server);
|
|
|
|
|
|
var opts = {
|
|
|
port : 1947,
|
|
|
baseDir : __dirname + '/../../'
|
|
|
};
|
|
|
|
|
|
-io.sockets.on( 'connection', function( socket ) {
|
|
|
+io.on( 'connection', function( socket ) {
|
|
|
|
|
|
- socket.on( 'connect', function( data ) {
|
|
|
- socket.broadcast.emit( 'connect', data );
|
|
|
+ socket.on( 'new-subscriber', function( data ) {
|
|
|
+ socket.broadcast.emit( 'new-subscriber', data );
|
|
|
});
|
|
|
|
|
|
socket.on( 'statechanged', function( data ) {
|
|
@@ -26,12 +28,8 @@ io.sockets.on( 'connection', function( socket ) {
|
|
|
|
|
|
});
|
|
|
|
|
|
-app.configure( function() {
|
|
|
-
|
|
|
- [ 'css', 'js', 'images', 'plugin', 'lib' ].forEach( function( dir ) {
|
|
|
- app.use( '/' + dir, staticDir( opts.baseDir + dir ) );
|
|
|
- });
|
|
|
-
|
|
|
+[ 'css', 'js', 'images', 'plugin', 'lib' ].forEach( function( dir ) {
|
|
|
+ app.use( '/' + dir, staticDir( opts.baseDir + dir ) );
|
|
|
});
|
|
|
|
|
|
app.get('/', function( req, res ) {
|
|
@@ -52,7 +50,7 @@ app.get( '/notes/:socketId', function( req, res ) {
|
|
|
});
|
|
|
|
|
|
// Actually listen
|
|
|
-app.listen( opts.port || null );
|
|
|
+server.listen( opts.port || null );
|
|
|
|
|
|
var brown = '\033[33m',
|
|
|
green = '\033[32m',
|