From face92f018dca40f24432b9c372e19c0e3f9c56c Mon Sep 17 00:00:00 2001 From: Sweet Date: Sat, 19 Jan 2013 12:25:31 -0800 Subject: [PATCH 1/4] paerse.js: modified parser to be used with the parser repo package.json: updated with the correct parser dependency common.js: changed the parser path server.js: also changed the parser path --- lib/parser.js | 2 +- package.json | 7 ++++++- test/common.js | 7 +++++++ test/server.js | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/lib/parser.js b/lib/parser.js index 5ac7de1b..f3d11e8d 100644 --- a/lib/parser.js +++ b/lib/parser.js @@ -2,4 +2,4 @@ * Exposes the client parser to avoid code repetition. */ -module.exports = require('engine.io-client/lib/parser'); +module.exports = require('engine.io-parser/lib/index'); diff --git a/package.json b/package.json index dac0a2d9..c4435803 100644 --- a/package.json +++ b/package.json @@ -13,15 +13,20 @@ , "dependencies": { "debug": "0.6.0" , "ws": "~0.4.21" - , "engine.io-client": "0.4.0" + , "engine.io-parser": "0.1.0" , "base64id": "0.1.0" } , "devDependencies": { "mocha": "*" , "expect.js": "*" , "superagent": "*" + , "engine.io-client": "0.4.0" , "ws": "*" , "s": "*" } , "scripts" : { "test" : "make test" } + , "repository": { + "type": "git" + , "url": "git@github.com:LearnBoost/engine.io.git" + } } diff --git a/test/common.js b/test/common.js index be6ad3b9..a6abab71 100644 --- a/test/common.js +++ b/test/common.js @@ -11,6 +11,13 @@ global.eio = require('../index'); global.eioc = require('engine.io-client'); +/** + * Expose parser. + */ + +global.eiop = require('engine.io-parser'); + + /** * Expose `request` global. */ diff --git a/test/server.js b/test/server.js index bead79a8..6972e51b 100644 --- a/test/server.js +++ b/test/server.js @@ -5,7 +5,7 @@ */ var http = require('http') - , parser = eio.parser + , parser = eiop , WebSocket = require('ws'); /** From 90c0cd0e3f5f5e1842f9d8ad7d5d07a9ee12cff5 Mon Sep 17 00:00:00 2001 From: Sweet Date: Sat, 19 Jan 2013 13:14:00 -0800 Subject: [PATCH 2/4] parser.js: deleted package.json: updated the version for the client everything else: fixed paths/requirements to the new protocol/parser repo --- lib/engine.io.js | 2 +- lib/parser.js | 5 ----- lib/transport.js | 2 +- lib/transports/polling.js | 2 +- lib/transports/websocket.js | 2 +- package.json | 2 +- test/common.js | 2 +- 7 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 lib/parser.js diff --git a/lib/engine.io.js b/lib/engine.io.js index f5d52459..1dfea87b 100644 --- a/lib/engine.io.js +++ b/lib/engine.io.js @@ -51,7 +51,7 @@ exports.transports = require('./transports'); * @api public */ -exports.parser = require('./parser'); +exports.parser = require('engine.io-parser/lib/index'); /** * Crates an http.Server exclusively used for WS upgrades. diff --git a/lib/parser.js b/lib/parser.js deleted file mode 100644 index f3d11e8d..00000000 --- a/lib/parser.js +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Exposes the client parser to avoid code repetition. - */ - -module.exports = require('engine.io-parser/lib/index'); diff --git a/lib/transport.js b/lib/transport.js index a07a901f..f394fd08 100644 --- a/lib/transport.js +++ b/lib/transport.js @@ -4,7 +4,7 @@ */ var EventEmitter = require('events').EventEmitter - , parser = require('./parser') + , parser = require('engine.io-parser/lib/index') , debug = require('debug')('engine:transport'); /** diff --git a/lib/transports/polling.js b/lib/transports/polling.js index 2b869e94..252bf3c4 100644 --- a/lib/transports/polling.js +++ b/lib/transports/polling.js @@ -4,7 +4,7 @@ */ var Transport = require('../transport') - , parser = require('../parser') + , parser = require('engine.io-parser/lib/index') , debug = require('debug')('engine:polling') /** diff --git a/lib/transports/websocket.js b/lib/transports/websocket.js index ca543b06..7e9dc52c 100644 --- a/lib/transports/websocket.js +++ b/lib/transports/websocket.js @@ -4,7 +4,7 @@ */ var Transport = require('../transport') - , parser = require('../parser') + , parser = require('engine.io-parser/lib/index') , debug = require('debug')('engine:ws') /** diff --git a/package.json b/package.json index 2f143dff..93c6664f 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "mocha": "*" , "expect.js": "*" , "superagent": "*" - , "engine.io-client": "0.4.0" + , "engine.io-client": "0.4.1" , "ws": "*" , "s": "*" } diff --git a/test/common.js b/test/common.js index a6abab71..be7b4da8 100644 --- a/test/common.js +++ b/test/common.js @@ -15,7 +15,7 @@ global.eioc = require('engine.io-client'); * Expose parser. */ -global.eiop = require('engine.io-parser'); +global.eiop = require('engine.io-parser/lib/index'); /** From 82ef6b416caadc28b2e35e884598f01fc706aefd Mon Sep 17 00:00:00 2001 From: Sweet Date: Sat, 19 Jan 2013 13:25:18 -0800 Subject: [PATCH 3/4] Adding .tracis.yml for first build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 615d3e60..8b3f6193 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ node_js: - 0.8 notifications: - irc: "irc.freenode.org#socket.io" + irc: "irc.freenode.org##socket.io" From b69264dad96783ece8539444fac7ecd1ce40ad6c Mon Sep 17 00:00:00 2001 From: Sweet Date: Sat, 19 Jan 2013 14:27:17 -0800 Subject: [PATCH 4/4] Removed the lib/index in all the files --- lib/engine.io.js | 2 +- lib/transport.js | 2 +- lib/transports/polling.js | 2 +- lib/transports/websocket.js | 2 +- test/common.js | 7 ------- test/server.js | 3 +-- 6 files changed, 5 insertions(+), 13 deletions(-) diff --git a/lib/engine.io.js b/lib/engine.io.js index 1dfea87b..38d656d8 100644 --- a/lib/engine.io.js +++ b/lib/engine.io.js @@ -51,7 +51,7 @@ exports.transports = require('./transports'); * @api public */ -exports.parser = require('engine.io-parser/lib/index'); +exports.parser = require('engine.io-parser'); /** * Crates an http.Server exclusively used for WS upgrades. diff --git a/lib/transport.js b/lib/transport.js index f394fd08..54e47778 100644 --- a/lib/transport.js +++ b/lib/transport.js @@ -4,7 +4,7 @@ */ var EventEmitter = require('events').EventEmitter - , parser = require('engine.io-parser/lib/index') + , parser = require('engine.io-parser') , debug = require('debug')('engine:transport'); /** diff --git a/lib/transports/polling.js b/lib/transports/polling.js index 252bf3c4..75f31442 100644 --- a/lib/transports/polling.js +++ b/lib/transports/polling.js @@ -4,7 +4,7 @@ */ var Transport = require('../transport') - , parser = require('engine.io-parser/lib/index') + , parser = require('engine.io-parser') , debug = require('debug')('engine:polling') /** diff --git a/lib/transports/websocket.js b/lib/transports/websocket.js index 7e9dc52c..ccafa74f 100644 --- a/lib/transports/websocket.js +++ b/lib/transports/websocket.js @@ -4,7 +4,7 @@ */ var Transport = require('../transport') - , parser = require('engine.io-parser/lib/index') + , parser = require('engine.io-parser') , debug = require('debug')('engine:ws') /** diff --git a/test/common.js b/test/common.js index be7b4da8..be6ad3b9 100644 --- a/test/common.js +++ b/test/common.js @@ -11,13 +11,6 @@ global.eio = require('../index'); global.eioc = require('engine.io-client'); -/** - * Expose parser. - */ - -global.eiop = require('engine.io-parser/lib/index'); - - /** * Expose `request` global. */ diff --git a/test/server.js b/test/server.js index b08c54c2..efb6a51e 100644 --- a/test/server.js +++ b/test/server.js @@ -5,8 +5,7 @@ */ var http = require('http') - , parser = eiop - , WebSocket = require('ws'); + WebSocket = require('ws'); /** * Tests.