diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 8e33792f..b5a38211 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -3,134 +3,129 @@ "version": "0.11.0", "dependencies": { "async": { - "version": "0.8.0", - "from": "https://registry.npmjs.org/async/-/async-0.8.0.tgz", - "resolved": "https://registry.npmjs.org/async/-/async-0.8.0.tgz" + "version": "0.9.0", + "from": "async@~0.9.0", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz" }, "bignumber.js": { "version": "2.0.0", - "from": "bignumber.js@>=2.0.0 <3.0.0", + "from": "bignumber.js@^2.0.0", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.0.0.tgz" }, "extend": { "version": "1.2.1", - "from": "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz", + "from": "extend@~1.2.1", "resolved": "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz" }, "lodash": { - "version": "2.4.1", - "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz" + "version": "3.1.0", + "from": "lodash@^3.1.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz" }, "lru-cache": { "version": "2.5.0", - "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz", + "from": "lru-cache@~2.5.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz" }, "ripple-wallet-generator": { "version": "1.0.1", - "from": "https://registry.npmjs.org/ripple-wallet-generator/-/ripple-wallet-generator-1.0.1.tgz", + "from": "ripple-wallet-generator@1.0.1", "resolved": "https://registry.npmjs.org/ripple-wallet-generator/-/ripple-wallet-generator-1.0.1.tgz" }, "superagent": { "version": "0.18.2", - "from": "https://registry.npmjs.org/superagent/-/superagent-0.18.2.tgz", + "from": "superagent@^0.18.0", "resolved": "https://registry.npmjs.org/superagent/-/superagent-0.18.2.tgz", "dependencies": { "qs": { "version": "0.6.6", - "from": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz", + "from": "qs@0.6.6", "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz" }, "formidable": { "version": "1.0.14", - "from": "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz", + "from": "formidable@1.0.14", "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz" }, "mime": { "version": "1.2.11", - "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz", + "from": "mime@1.2.11", "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz" }, "component-emitter": { "version": "1.1.2", - "from": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz", + "from": "component-emitter@1.1.2", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz" }, "methods": { "version": "1.0.1", - "from": "https://registry.npmjs.org/methods/-/methods-1.0.1.tgz", + "from": "methods@1.0.1", "resolved": "https://registry.npmjs.org/methods/-/methods-1.0.1.tgz" }, "cookiejar": { "version": "2.0.1", - "from": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz", + "from": "cookiejar@2.0.1", "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz" }, "debug": { "version": "1.0.4", - "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz", + "from": "debug@~1.0.1", "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz", "dependencies": { "ms": { "version": "0.6.2", - "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz", + "from": "ms@0.6.2", "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz" } } }, "reduce-component": { "version": "1.0.1", - "from": "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz", + "from": "reduce-component@1.0.1", "resolved": "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz" }, "form-data": { "version": "0.1.3", - "from": "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz", + "from": "form-data@0.1.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz", "dependencies": { "combined-stream": { "version": "0.0.7", - "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz", + "from": "combined-stream@~0.0.4", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz", "dependencies": { "delayed-stream": { "version": "0.0.5", - "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz", + "from": "delayed-stream@0.0.5", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz" } } - }, - "async": { - "version": "0.9.0", - "from": "https://registry.npmjs.org/async/-/async-0.9.0.tgz", - "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz" } } }, "readable-stream": { "version": "1.0.27-1", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz", + "from": "readable-stream@1.0.27-1", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz", + "from": "core-util-is@~1.0.0", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" }, "isarray": { "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "from": "isarray@0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "from": "string_decoder@~0.10.x", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" }, "inherits": { "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "from": "inherits@~2.0.1", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -138,26 +133,53 @@ } }, "ws": { - "version": "0.4.32", - "from": "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz", - "resolved": "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz", + "version": "0.7.1", + "from": "ws@~0.7.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-0.7.1.tgz", "dependencies": { - "commander": { - "version": "2.1.0", - "from": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz" - }, - "nan": { - "version": "1.0.0", - "from": "nan@1.0.0" - }, - "tinycolor": { - "version": "0.0.1", - "from": "tinycolor@0.0.1" - }, "options": { "version": "0.0.6", - "from": "options@0.0.6" + "from": "options@>=0.0.5", + "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz" + }, + "ultron": { + "version": "1.0.1", + "from": "ultron@1.0.x", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.1.tgz" + }, + "bufferutil": { + "version": "1.0.1", + "from": "bufferutil@1.0.x", + "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-1.0.1.tgz", + "dependencies": { + "bindings": { + "version": "1.2.1", + "from": "bindings@1.2.x", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz" + }, + "nan": { + "version": "1.6.1", + "from": "nan@1.6.x", + "resolved": "https://registry.npmjs.org/nan/-/nan-1.6.1.tgz" + } + } + }, + "utf-8-validate": { + "version": "1.0.1", + "from": "utf-8-validate@1.0.x", + "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.0.1.tgz", + "dependencies": { + "bindings": { + "version": "1.2.1", + "from": "bindings@1.2.x", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz" + }, + "nan": { + "version": "1.6.1", + "from": "nan@1.6.x", + "resolved": "https://registry.npmjs.org/nan/-/nan-1.6.1.tgz" + } + } } } } diff --git a/test/server-test.js b/test/server-test.js index bff0f041..1c84f73b 100644 --- a/test/server-test.js +++ b/test/server-test.js @@ -378,8 +378,6 @@ describe('Server', function() { validated_ledgers: '32570-7053695' } })); - - wss.close(); }); }); @@ -387,6 +385,7 @@ describe('Server', function() { server.once('connect', function() { server.once('disconnect', function() { + wss.close(); done(); }); server.disconnect(); @@ -442,8 +441,6 @@ describe('Server', function() { validated_ledgers: '32570-7053695' } })); - - wss.close(); }); }); @@ -451,6 +448,7 @@ describe('Server', function() { server.once('connect', function() { server.once('disconnect', function() { + wss.close(); done(); }); server.disconnect(); @@ -509,15 +507,16 @@ describe('Server', function() { validated_ledgers: '3175520-3176615' } })); - - wss.close(); }); }); - var server = new Server(new Remote({ allow_partial_history: false }), 'ws://localhost:5748'); + var server = new Server(new Remote({ + allow_partial_history: false + }), 'ws://localhost:5748'); server.reconnect = function() { setImmediate(function() { + wss.close(); done(); }); }; @@ -554,8 +553,6 @@ describe('Server', function() { server_status: 'syncing' } })); - - wss.close(); }); }); @@ -567,6 +564,7 @@ describe('Server', function() { assert.strictEqual(server._load_factor, 256); assert.strictEqual(server._fee_base, 10); assert.strictEqual(server._fee_ref, 10); + wss.close(); done(); }); @@ -1102,12 +1100,15 @@ describe('Server', function() { case 'subscribe': assert.strictEqual(m.command, 'subscribe'); assert.deepEqual(m.streams, [ 'ledger', 'server' ]); - sendSubscribe(m); + setImmediate(function() { + sendSubscribe(m); + }); break; case 'server_info': assert.strictEqual(m.command, 'server_info'); - sendServerInfo(m); - wss.close(); + setImmediate(function() { + sendServerInfo(m); + }); break; } }); @@ -1116,16 +1117,13 @@ describe('Server', function() { var server = new Server(new Remote(), 'ws://localhost:5748'); server.once('connect', function() { - var receivedSubscribe = false; - server.once('response_server_info', function() { - receivedSubscribe = true; - }); - - server.once('disconnect', function() { - assert(receivedSubscribe); assert.strictEqual(server.getServerID(), 'ws://localhost:5748 (n94pSqypSfddzAVj9qoezHyUoetsrMnwgNuBqRJ3WHvM8aMMf7rW)'); - done(); + server.once('disconnect', function() { + wss.close(); + done(); + }); + server.disconnect(); }); });