From e72603330e2dd3bca2aa8410f7c2bcaf13b3a171 Mon Sep 17 00:00:00 2001 From: Christian Date: Sat, 21 Oct 2017 22:31:55 +0200 Subject: [PATCH] updated to socket.io version 2 --- package.json | 72 ++++++++++++++++++++++++++++++++-------------------- server.js | 26 ++++++++----------- 2 files changed, 54 insertions(+), 44 deletions(-) diff --git a/package.json b/package.json index fcf748d..85d0b9b 100644 --- a/package.json +++ b/package.json @@ -1,32 +1,48 @@ { - "name": "babelweb" -, "version": "0.4.0" -, "description": "Web-based monitoring tool for the Babel routing protocol" -, "homepage": "http://gabriel.kerneis.info/software/babelweb" -, "keywords": [ "babel", "routing", "monitoring" ] -, "author": "Gabriel Kerneis (http://gabriel.kerneis.info/)" -, "repository": - { "type": "git" - , "url": "git://git.wifi.pps.univ-paris-diderot.fr/babelweb.git" } -, "scripts" : {"start": "./bin/babelweb"} -, "dependencies": - { "socket.io": "0.9.x" - , "connect": "2.7.x" } -, "devDependencies" : - { "ronn" : "0.4.x" } -, "engines": { "node": "0.10.x" } -, "directories" : - { "doc" : "./doc" - , "man" : "./man1" - , "bin" : "./bin" } -, "bin" : { "babelweb" : "./bin/babelweb" } -, "preferGlobal": true -, "licenses" : - [ { "type" : "MIT" - , "url" : "http://git.wifi.pps.univ-paris-diderot.fr/?p=babelweb.git;a=blob_plain;f=LICENSE" - } - , { "type" : "3-clause BSD" - , "url" : "http://git.wifi.pps.univ-paris-diderot.fr/?p=babelweb.git;a=blob_plain;f=LICENSE.d3" + "name": "babelweb", + "version": "0.4.0", + "description": "Web-based monitoring tool for the Babel routing protocol", + "homepage": "http://gabriel.kerneis.info/software/babelweb", + "keywords": [ + "babel", + "routing", + "monitoring" + ], + "author": "Gabriel Kerneis (http://gabriel.kerneis.info/)", + "repository": { + "type": "git", + "url": "git://git.wifi.pps.univ-paris-diderot.fr/babelweb.git" + }, + "scripts": { + "start": "./bin/babelweb" + }, + "dependencies": { + "connect": "2.7.x", + "socket.io": "^2.0.3" + }, + "devDependencies": { + "ronn": "0.4.x" + }, + "engines": { + "node": "0.10.x" + }, + "directories": { + "doc": "./doc", + "man": "./man1", + "bin": "./bin" + }, + "bin": { + "babelweb": "./bin/babelweb" + }, + "preferGlobal": true, + "licenses": [ + { + "type": "MIT", + "url": "http://git.wifi.pps.univ-paris-diderot.fr/?p=babelweb.git;a=blob_plain;f=LICENSE" + }, + { + "type": "3-clause BSD", + "url": "http://git.wifi.pps.univ-paris-diderot.fr/?p=babelweb.git;a=blob_plain;f=LICENSE.d3" } ] } diff --git a/server.js b/server.js index eb07f85..fc08fb0 100644 --- a/server.js +++ b/server.js @@ -86,27 +86,21 @@ var connect = require('connect'), http = require('http'), app = connect().use(connect.static(__dirname + '/static')), server = http.createServer(app), - io = require('socket.io').listen(server); + io = require('socket.io')({ + transports: [ + 'websocket', + // disabled by default + 'flashsocket', + 'htmlfile', + 'xhr-polling', + 'jsonp-polling' + ] + }).listen(server); if (config.verbose) { app.use(connect.logger('dev')); } // XXX server.listen(config.port, config.host); -io.configure(function () { - io.enable('browser client minification'); - io.enable('browser client etag'); - io.set('log level', config.verbose ? 3 : 1); - - io.set('transports', [ - 'websocket', - // disabled by default - 'flashsocket', - 'htmlfile', - 'xhr-polling', - 'jsonp-polling' - ]); -}); - /* Send updates to clients when they connect */ io.sockets.on('connection', function (client) {