From 08c0b7687e68b9f293a09dbd41af3f7f1ec75baf Mon Sep 17 00:00:00 2001 From: Zachary Boyd Date: Sun, 23 Dec 2018 20:56:55 -0500 Subject: [PATCH] Updates multi-rpc --- CHANGELOG.md | 4 + package-lock.json | 197 +++++++++++++++++++++++++++++++--------------- package.json | 6 +- 3 files changed, 142 insertions(+), 65 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3296ba8..14eb909 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [4.0.8] - 2018-12-14 +### Changed +- Updates `multi-rpc` to version 1.4.0. + ## [4.0.7] - 2018-12-14 ### Changed - Updates `multi-rpc` to version 1.1.9. diff --git a/package-lock.json b/package-lock.json index 427613c..e14793a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "tor-router", - "version": "4.0.6", + "version": "4.0.7", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -10,29 +10,16 @@ "integrity": "sha1-nK+xca+CMpSQNTtIFvAzR6oVCjA=", "optional": true }, - "@types/acorn": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@types/acorn/-/acorn-4.0.3.tgz", - "integrity": "sha512-gou/kWQkGPMZjdCKNZGDpqxLm9+ErG/pFZKPX4tvCjr0Xf4FCYYX3nAsu7aDVKJV3KUe27+mvqqyWT/9VZoM/A==", - "requires": { - "@types/estree": "*" - } - }, - "@types/detect-node": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@types/detect-node/-/detect-node-2.0.0.tgz", - "integrity": "sha512-+BozjlbPTACYITf1PWf62HLtDV79HbmZosUN1mv1gGrnjDCRwBXkDKka1sf6YQJvspmfPXVcy+X6tFW62KteeQ==" - }, - "@types/estree": { - "version": "0.0.39", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", - "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==" - }, "@types/events": { "version": "1.2.0", "resolved": "http://registry.npmjs.org/@types/events/-/events-1.2.0.tgz", "integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==" }, + "@types/lodash": { + "version": "4.14.119", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.119.tgz", + "integrity": "sha512-Z3TNyBL8Vd/M9D9Ms2S3LmFq2sSMzahodD6rCS9V2N44HUMINb75jNkSuwAx7eo2ufqTdfOdtGQpNbieUjPQmw==" + }, "@types/msgpack-lite": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/@types/msgpack-lite/-/msgpack-lite-0.1.6.tgz", @@ -51,11 +38,6 @@ "resolved": "https://registry.npmjs.org/@types/serialize-error/-/serialize-error-2.1.0.tgz", "integrity": "sha512-PXQYOySu+YjmtSKxWkXn00H3e4anQMiCaDw0Km7EHfM2/Da79Vni3Mt1QuKP9fmBobaLxN+3vjhSowjQp6XY9g==" }, - "@types/text-encoding": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/@types/text-encoding/-/text-encoding-0.0.33.tgz", - "integrity": "sha512-kAMOjud0Nw3HPY0Cu8cTFk0LVya8skY+ajb2rgrSahPQ6AreN0cpGBNrs8Kjlu9EhFIeh5cp7phovL7v9HrPdQ==" - }, "@types/uuid": { "version": "3.4.4", "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.4.tgz", @@ -504,12 +486,12 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "cross-fetch": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-2.2.3.tgz", - "integrity": "sha512-PrWWNH3yL2NYIb/7WF/5vFG3DCQiXDOVf8k3ijatbrtnwNuhMWLC7YF7uqf53tbTFDzHIUD8oITw4Bxt8ST3Nw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.0.tgz", + "integrity": "sha512-P8HyKlMwT1ed9LqEWlJu+zfcxfn0KI4Nl4nxyvu1a8sg4vgtHdwhElZOgSNzoar44zQMdliZcve4QG/04AUi9Q==", "requires": { - "node-fetch": "2.1.2", - "whatwg-fetch": "2.0.4" + "node-fetch": "2.3.0", + "whatwg-fetch": "3.0.0" } }, "cross-spawn": { @@ -621,11 +603,6 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, - "detect-node": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", - "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==" - }, "diagnostics": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.0.tgz", @@ -1755,28 +1732,33 @@ } }, "multi-rpc": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/multi-rpc/-/multi-rpc-1.1.9.tgz", - "integrity": "sha512-25OyDLSlgC+R5njseyd0AQUMEQkVD3gUnM5RkInk8qhxO9bJzL5h4nO783KT3mY1RS0f8ikMux5MufynFIlKFQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/multi-rpc/-/multi-rpc-1.4.0.tgz", + "integrity": "sha512-A73Ux1mUiRw1LT8uvdxm+MbmxVZCCtV3nVHS1ksYIx+zuXsjc86VoK7Ck7SFW0OLxhMROnsOEhU9rPhR1Gywww==", "requires": { - "@types/acorn": "^4.0.3", - "@types/detect-node": "^2.0.0", - "@types/msgpack-lite": "^0.1.6", + "multi-rpc-common": "^2.1.0", + "multi-rpc-core": "^1.0.1", + "multi-rpc-http-client-side-transport": "^1.0.4", + "multi-rpc-http-transport": "^1.0.3", + "multi-rpc-json-serializer": "^1.0.4", + "multi-rpc-msgpack-serializer": "^1.0.4", + "multi-rpc-tcp-transport": "^1.1.0", + "multi-rpc-websocket-client-side-transport": "^1.2.1", + "multi-rpc-websocket-transport": "^1.2.1" + } + }, + "multi-rpc-common": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/multi-rpc-common/-/multi-rpc-common-2.1.0.tgz", + "integrity": "sha512-retoFduGmmijF9XgBTJPKMWSXGXkf44N3nSBkSXznYtjA2YC25C8MCEaZmvwE43+Oe7HPpuEcPWQkvE23psb5w==", + "requires": { + "@types/lodash": "^4.14.119", "@types/serialize-error": "^2.1.0", - "@types/text-encoding": "0.0.33", "@types/uuid": "^3.4.4", - "@types/websocket": "0.0.40", - "acorn": "^6.0.1", - "cross-fetch": "^2.2.2", - "detect-node": "^2.0.4", "eventemitter2": "^5.0.1", "lodash": "^4.17.11", - "msgpack-lite": "^0.1.26", - "parse-function": "^5.2.10", "serialize-error": "^3.0.0", - "text-encoding": "^0.6.4", - "uuid": "^3.3.2", - "websocket": "^1.0.28" + "uuid": "^3.3.2" }, "dependencies": { "eventemitter2": { @@ -1791,10 +1773,101 @@ } } }, + "multi-rpc-core": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/multi-rpc-core/-/multi-rpc-core-1.0.1.tgz", + "integrity": "sha512-9Pdjs15reJqM8nbEOTN81SedR6MH3QVThx7LmxRgzvWVvq4gyrN/J6HQ9Q4uj7EQ6DR6O/Ureb8npqEf7xYESQ==", + "requires": { + "@types/lodash": "^4.14.119", + "acorn": "^6.0.4", + "eventemitter2": "^5.0.1", + "lodash": "^4.17.11", + "multi-rpc-common": "^2.1.0", + "parse-function": "^5.2.11" + }, + "dependencies": { + "eventemitter2": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-5.0.1.tgz", + "integrity": "sha1-YZegldX7a1folC9v1+qtY6CclFI=" + }, + "lodash": { + "version": "4.17.11", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", + "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + } + } + }, + "multi-rpc-http-client-side-transport": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/multi-rpc-http-client-side-transport/-/multi-rpc-http-client-side-transport-1.0.4.tgz", + "integrity": "sha512-QjjA1F5GAERhn0aCsfOjNzaFrRyf7pU4pQLM/BnH1jyX7C/Mrh0YXHwCQKUKWzLygTD7AXEkSGGPyoTl1Wh0xw==", + "requires": { + "cross-fetch": "^3.0.0", + "multi-rpc-common": "^2.1.0" + } + }, + "multi-rpc-http-transport": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/multi-rpc-http-transport/-/multi-rpc-http-transport-1.0.3.tgz", + "integrity": "sha512-Qvuxkuc4UB+F13goGz4rXP0wl2prVga0rn+eLJdwaDGfTDLgkWlh7H5iXb4jZEcdOyKqDjcZqcY1pVTfl7KeCg==", + "requires": { + "multi-rpc-common": "^2.1.0", + "multi-rpc-http-client-side-transport": "^1.0.4" + } + }, + "multi-rpc-json-serializer": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/multi-rpc-json-serializer/-/multi-rpc-json-serializer-1.0.4.tgz", + "integrity": "sha512-0b+r728HPCCW8S41x62gHxOITHy1QutL08pCuSufmnre3tjOmljXyTN8EUEHs2xu9Gu6WXriWxlb5EKGPJc7BA==", + "requires": { + "multi-rpc-common": "^2.1.0", + "text-encoding": "^0.7.0" + } + }, + "multi-rpc-msgpack-serializer": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/multi-rpc-msgpack-serializer/-/multi-rpc-msgpack-serializer-1.0.4.tgz", + "integrity": "sha512-8gy6GsZSQvKAWqiGaUG2MhUPcWu2ErDkbT2fsUdlxieO6llotrT9gTB6F5NaQKo/mUjpvShNHqCAmyGPos5erQ==", + "requires": { + "@types/msgpack-lite": "^0.1.6", + "msgpack-lite": "^0.1.26", + "multi-rpc-common": "^2.1.0" + } + }, + "multi-rpc-tcp-transport": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/multi-rpc-tcp-transport/-/multi-rpc-tcp-transport-1.1.0.tgz", + "integrity": "sha512-H4EbNMjDlGmgvBKrmxZ7XVtAYhXluivfiOGDMqlGYerPdiu3IdLKqD+x6IzYfFgoTa3ljRGlKhz5ipAnTnvBxw==", + "requires": { + "multi-rpc-common": "^2.1.0" + } + }, + "multi-rpc-websocket-client-side-transport": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/multi-rpc-websocket-client-side-transport/-/multi-rpc-websocket-client-side-transport-1.2.1.tgz", + "integrity": "sha512-uCQMpAJ271eVNngZiepQKNrEICoDhdRc+jFWHM474TxL0qBAw2aMctjhNnME/qUtj1Oal3CpUsTcytJD7kMrdA==", + "requires": { + "@types/websocket": "0.0.40", + "multi-rpc-common": "^2.1.0", + "websocket": "^1.0.28" + } + }, + "multi-rpc-websocket-transport": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/multi-rpc-websocket-transport/-/multi-rpc-websocket-transport-1.2.1.tgz", + "integrity": "sha512-4jrWeHCK1TJZX1I3Np0qATWP2TjkV8y12QtgTZFUJ+7Owr4/or2aiAwUeiq7vt1P8MMwB2mgTq5CEW8jphyWvA==", + "requires": { + "@types/websocket": "0.0.40", + "multi-rpc-common": "^2.1.0", + "multi-rpc-websocket-client-side-transport": "^1.2.1", + "websocket": "^1.0.28" + } + }, "nan": { - "version": "2.12.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.0.tgz", - "integrity": "sha512-zT5nC0JhbljmyEf+Z456nvm7iO7XgRV2hYxoBtPpnyp+0Q4aCoP6uWNn76v/I6k2kCYNLWqWbwBWQcjsNI/bjw==" + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz", + "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==" }, "nanoid": { "version": "1.2.3", @@ -1926,9 +1999,9 @@ "dev": true }, "node-fetch": { - "version": "2.1.2", - "resolved": "http://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz", - "integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=" + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz", + "integrity": "sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA==" }, "nopt": { "version": "3.0.6", @@ -2622,9 +2695,9 @@ } }, "text-encoding": { - "version": "0.6.4", - "resolved": "http://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", - "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=" + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.7.0.tgz", + "integrity": "sha512-oJQ3f1hrOnbRLOcwKz0Liq2IcrvDeZRHXhd9RgLrsT+DjWY/nty1Hi7v3dtkaEYbPYe0mUoOfzRrMwfXXwgPUA==" }, "text-hex": { "version": "0.0.0", @@ -2766,9 +2839,9 @@ } }, "whatwg-fetch": { - "version": "2.0.4", - "resolved": "http://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz", - "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz", + "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==" }, "when": { "version": "3.7.8", diff --git a/package.json b/package.json index fcca2aa..37dfa32 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tor-router", - "version": "4.0.7", + "version": "4.0.8", "main": "src/index.js", "repository": "git@github.com:znetstar/tor-router.git", "author": "Zachary Boyd ", @@ -38,13 +38,13 @@ "granax": "^3.1.4", "js-weighted-list": "^0.1.1", "lodash": "^4.17.4", - "multi-rpc": "^1.1.9", + "multi-rpc": "^1.2.2", "nanoid": "^1.2.3", "native-dns": "git+https://github.com/znetstar/node-dns.git#336f1d3027b2a3da719b5cd65380219267901aeb", "nconf": "^0.10.0", "shelljs": "^0.8.2", "socksv5": "git+https://github.com/znetstar/socksv5.git#1480422215cf1464fa06f5aec4a3e7f2117e3403", - "temp": "^0.8.3", + "temp": "^0.8.a3", "winston": "^3.0.0-rc5", "yargs": "^11.0.0" }