Update CNAME

Pool getPort race condition

.gitignore

@@ -1,6 +1,6 @@
 node_modules
-npm-debug.log
+*.log
 .env
 .vscode
 .DS_Store
-docs
+

.npmignore

@@ -3,4 +3,6 @@ npm-debug.log
 .env
 .vscode
 .DS_Store
-docs
+docs
+test
+Gruntfile.js

CHANGELOG.md

@@ -1,9 +1,47 @@
 # Changelog
 
+## [4.0.13] - 2019-11-23
+### Added
+- Added a mechanism to handle dynamically allocating numerous ports at the same time without collisions per [jogli5er's](https://github.com/jogli5er) suggestion in [PR 15](https://zb.gy/3a).
+### Changed
+- Switched 'granax' package to '@deadcanaries/granax' as suggested in [issue 12](https://zb.gy/2z).
+
+## [4.0.12] - 2019-11-21
+### Added
+- Added a entrypoint file so the node.js process is not the root process, so it responds to SIGINT calls (Ctrl+C).
+
+## [4.0.11] - 2019-01-15
+### Changed
+- Updates `multi-rpc` to version 1.5.5.
+
+## [4.0.10] - 2018-12-14
+### Changed
+- Updates `multi-rpc` to version 1.4.1.
+
+## [4.0.9] - 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.
+
+## [4.0.6] - 2018-12-14
+### Changed
+- Updates `multi-rpc` to version 1.1.1.
+
+## [4.0.5] - 2018-10-15
+### Changed
+- Prevents errors that occur when connecting to the destination in the SOCKS Proxy and HTTP Proxy from crashing the applications
+
+## [4.0.4] - 2018-09-24
+### Changed
+- Replaces `jrpc2` with `multi-rpc` for providing the RPC Interface. No changes to the application or API
+
 ## [4.0.3] - 2018-09-15
 
 ### Changed
-- References granax in `default_config.js` to comply with licensing requirements.
+- References granax in `default_config.js` to comply with licensing requirements
 
 ## [4.0.2] - 2018-09-15
 

Dockerfile

@@ -20,7 +20,9 @@ USER tor_router
 
 ADD package.json /app/package.json
 
-RUN npm install 
+ADD package-lock.json /app/package-lock.json
+
+RUN npm ci 
 
 ADD . /app
 
@@ -28,6 +30,6 @@ ENV HOME /home/tor_router
 
 EXPOSE 9050 9053 9077
 
-ENTRYPOINT [ "tor-router" ]
+ENTRYPOINT [ "/bin/bash", "/app/docker-entrypoint.sh" ]
 
 CMD [ "-s", "-d", "-j", "1" ]

README.md

@@ -51,7 +51,7 @@ For example: `tor-router -j 3 -s 127.0.0.1:9050` would start the proxy with 3 to
 
 For detailed examples and insturctions on using Tor Router [see the wiki](https://github.com/znetstar/tor-router/wiki).
 
-To generate API documentation run `npm run docs`. The documentation will be available in `docs/`. An online version of the documentation is also [available here](https://tor-router.docs.zacharyboyd.nyc/). 
+Documentation is available in `docs/`. An online version of the documentation is also [available here](https://tor-router.docs.zacharyboyd.nyc/). 
 
 ## Testing
 

docker-entrypoint.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/app/bin/tor-router $@

docs/CNAME

@@ -0,0 +1 @@
+tor-router.gh.zb.gy

docs/scripts/collapse.js

@@ -0,0 +1,11 @@
+function hideAllButCurrent(){
+    //by default all submenut items are hidden
+    $("nav > ul > li > ul li").hide();
+    
+    //only current page (if it exists) should be opened
+    var file = window.location.pathname.split("/").pop();
+    $("nav > ul > li > a[href^='"+file+"']").parent().find("> ul li").show();
+}
+$( document ).ready(function() {
+    hideAllButCurrent();
+});

docs/scripts/linenumber.js

@@ -0,0 +1,25 @@
+/*global document */
+(function() {
+    var source = document.getElementsByClassName('prettyprint source linenums');
+    var i = 0;
+    var lineNumber = 0;
+    var lineId;
+    var lines;
+    var totalLines;
+    var anchorHash;
+
+    if (source && source[0]) {
+        anchorHash = document.location.hash.substring(1);
+        lines = source[0].getElementsByTagName('li');
+        totalLines = lines.length;
+
+        for (; i < totalLines; i++) {
+            lineNumber++;
+            lineId = 'line' + lineNumber;
+            lines[i].id = lineId;
+            if (lineId === anchorHash) {
+                lines[i].className += ' selected';
+            }
+        }
+    }
+})();

docs/scripts/prettify/Apache-License-2.0.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

docs/scripts/prettify/lang-css.js

@@ -0,0 +1,2 @@
+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\f\r ]+/,null," \t\r\n"]],[["str",/^"(?:[^\n\f\r"\\]|\\(?:\r\n?|\n|\f)|\\[\S\s])*"/,null],["str",/^'(?:[^\n\f\r'\\]|\\(?:\r\n?|\n|\f)|\\[\S\s])*'/,null],["lang-css-str",/^url\(([^"')]*)\)/i],["kwd",/^(?:url|rgb|!important|@import|@page|@media|@charset|inherit)(?=[^\w-]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*)\s*:/i],["com",/^\/\*[^*]*\*+(?:[^*/][^*]*\*+)*\//],["com",
+/^(?:<\!--|--\>)/],["lit",/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],["lit",/^#[\da-f]{3,6}/i],["pln",/^-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*/i],["pun",/^[^\s\w"']+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[["kwd",/^-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[["str",/^[^"')]+/]]),["css-str"]);

docs/scripts/prettify/prettify.js

@@ -0,0 +1,28 @@
+var q=null;window.PR_SHOULD_USE_CONTINUATION=!0;
+(function(){function L(a){function m(a){var f=a.charCodeAt(0);if(f!==92)return f;var b=a.charAt(1);return(f=r[b])?f:"0"<=b&&b<="7"?parseInt(a.substring(1),8):b==="u"||b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function e(a){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"||a==="-"||a==="["||a==="]")a="\\"+a;return a}function h(a){for(var f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),a=
+[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c<i;++c){var j=f[c];if(/\\[bdsw]/i.test(j))a.push(j);else{var j=m(j),d;c+2<i&&"-"===f[c+1]?(d=m(f[c+2]),c+=2):d=j;b.push([j,d]);d<65||j>122||(d<65||j>90||b.push([Math.max(65,j)|32,Math.min(d,90)|32]),d<97||j>122||b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return a[0]-f[0]||f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;c<b.length;++c)i=b[c],i[0]<=j[1]+1?j[1]=Math.max(j[1],i[1]):f.push(j=i);b=["["];o&&b.push("^");b.push.apply(b,a);for(c=0;c<
+f.length;++c)i=f[c],b.push(e(i[0])),i[1]>i[0]&&(i[1]+1>i[0]&&b.push("-"),b.push(e(i[1])));b.push("]");return b.join("")}function y(a){for(var f=a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c<b;++c){var j=f[c];j==="("?++i:"\\"===j.charAt(0)&&(j=+j.substring(1))&&j<=i&&(d[j]=-1)}for(c=1;c<d.length;++c)-1===d[c]&&(d[c]=++t);for(i=c=0;c<b;++c)j=f[c],j==="("?(++i,d[i]===void 0&&(f[c]="(?:")):"\\"===j.charAt(0)&&
+(j=+j.substring(1))&&j<=i&&(f[c]="\\"+d[i]);for(i=c=0;c<b;++c)"^"===f[c]&&"^"!==f[c+1]&&(f[c]="");if(a.ignoreCase&&s)for(c=0;c<b;++c)j=f[c],a=j.charAt(0),j.length>=2&&a==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p<d;++p){var g=a[p];if(g.ignoreCase)l=!0;else if(/[a-z]/i.test(g.source.replace(/\\u[\da-f]{4}|\\x[\da-f]{2}|\\[^UXux]/gi,""))){s=!0;l=!1;break}}for(var r=
+{b:8,t:9,n:10,v:11,f:12,r:13},n=[],p=0,d=a.length;p<d;++p){g=a[p];if(g.global||g.multiline)throw Error(""+g);n.push("(?:"+y(g)+")")}return RegExp(n.join("|"),l?"gi":"g")}function M(a){function m(a){switch(a.nodeType){case 1:if(e.test(a.className))break;for(var g=a.firstChild;g;g=g.nextSibling)m(g);g=a.nodeName;if("BR"===g||"LI"===g)h[s]="\n",t[s<<1]=y++,t[s++<<1|1]=a;break;case 3:case 4:g=a.nodeValue,g.length&&(g=p?g.replace(/\r\n?/g,"\n"):g.replace(/[\t\n\r ]+/g," "),h[s]=g,t[s<<1]=y,y+=g.length,
+t[s++<<1|1]=a)}}var e=/(?:^|\s)nocode(?:\s|$)/,h=[],y=0,t=[],s=0,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=document.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);m(a);return{a:h.join("").replace(/\n$/,""),c:t}}function B(a,m,e,h){m&&(a={a:m,d:a},e(a),h.push.apply(h,a.e))}function x(a,m){function e(a){for(var l=a.d,p=[l,"pln"],d=0,g=a.a.match(y)||[],r={},n=0,z=g.length;n<z;++n){var f=g[n],b=r[f],o=void 0,c;if(typeof b===
+"string")c=!1;else{var i=h[f.charAt(0)];if(i)o=f.match(i[1]),b=i[0];else{for(c=0;c<t;++c)if(i=m[c],o=f.match(i[1])){b=i[0];break}o||(b="pln")}if((c=b.length>=5&&"lang-"===b.substring(0,5))&&!(o&&typeof o[1]==="string"))c=!1,b="src";c||(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else p.push(l+i,b)}a.e=p}var h={},y;(function(){for(var e=a.concat(m),
+l=[],p={},d=0,g=e.length;d<g;++d){var r=e[d],n=r[3];if(n)for(var k=n.length;--k>=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)||(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var t=m.length;return e}function u(a){var m=[],e=[];a.tripleQuotedStrings?m.push(["str",/^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/,q,"'\""]):a.multiLineStrings?m.push(["str",/^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/,
+q,"'\"`"]):m.push(["str",/^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,q,"\"'"]);a.verbatimStrings&&e.push(["str",/^@"(?:[^"]|"")*(?:"|$)/,q]);var h=a.hashComments;h&&(a.cStyleComments?(h>1?m.push(["com",/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,q,"#"]):m.push(["com",/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/,q,"#"]),e.push(["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,q])):m.push(["com",/^#[^\n\r]*/,
+q,"#"]));a.cStyleComments&&(e.push(["com",/^\/\/[^\n\r]*/,q]),e.push(["com",/^\/\*[\S\s]*?(?:\*\/|$)/,q]));a.regexLiterals&&e.push(["lang-regex",/^(?:^^\.?|[!+-]|!=|!==|#|%|%=|&|&&|&&=|&=|\(|\*|\*=|\+=|,|-=|->|\/|\/=|:|::|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|[?@[^]|\^=|\^\^|\^\^=|{|\||\|=|\|\||\|\|=|~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\s*(\/(?=[^*/])(?:[^/[\\]|\\[\S\s]|\[(?:[^\\\]]|\\[\S\s])*(?:]|$))+\/)/]);(h=a.types)&&e.push(["typ",h]);a=(""+a.keywords).replace(/^ | $/g,
+"");a.length&&e.push(["kwd",RegExp("^(?:"+a.replace(/[\s,]+/g,"|")+")\\b"),q]);m.push(["pln",/^\s+/,q," \r\n\t\xa0"]);e.push(["lit",/^@[$_a-z][\w$@]*/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]*/i,q],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,q,"0123456789"],["pln",/^\\[\S\s]?/,q],["pun",/^.[^\s\w"-$'./@\\`]*/,q]);return x(m,e)}function D(a,m){function e(a){switch(a.nodeType){case 1:if(k.test(a.className))break;if("BR"===a.nodeName)h(a),
+a.parentNode&&a.parentNode.removeChild(a);else for(a=a.firstChild;a;a=a.nextSibling)e(a);break;case 3:case 4:if(p){var b=a.nodeValue,d=b.match(t);if(d){var c=b.substring(0,d.index);a.nodeValue=c;(b=b.substring(d.index+d[0].length))&&a.parentNode.insertBefore(s.createTextNode(b),a.nextSibling);h(a);c||a.parentNode.removeChild(a)}}}}function h(a){function b(a,d){var e=d?a.cloneNode(!1):a,f=a.parentNode;if(f){var f=b(f,1),g=a.nextSibling;f.appendChild(e);for(var h=g;h;h=g)g=h.nextSibling,f.appendChild(h)}return e}
+for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var a=b(a.nextSibling,0),e;(e=a.parentNode)&&e.nodeType===1;)a=e;d.push(a)}var k=/(?:^|\s)nocode(?:\s|$)/,t=/\r\n?|\n/,s=a.ownerDocument,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=s.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);for(l=s.createElement("LI");a.firstChild;)l.appendChild(a.firstChild);for(var d=[l],g=0;g<d.length;++g)e(d[g]);m===(m|0)&&d[0].setAttribute("value",
+m);var r=s.createElement("OL");r.className="linenums";for(var n=Math.max(0,m-1|0)||0,g=0,z=d.length;g<z;++g)l=d[g],l.className="L"+(g+n)%10,l.firstChild||l.appendChild(s.createTextNode("\xa0")),r.appendChild(l);a.appendChild(r)}function k(a,m){for(var e=m.length;--e>=0;){var h=m[e];A.hasOwnProperty(h)?window.console&&console.warn("cannot override language handler %s",h):A[h]=a}}function C(a,m){if(!a||!A.hasOwnProperty(a))a=/^\s*</.test(m)?"default-markup":"default-code";return A[a]}function E(a){var m=
+a.g;try{var e=M(a.h),h=e.a;a.a=h;a.c=e.c;a.d=0;C(m,h)(a);var k=/\bMSIE\b/.test(navigator.userAgent),m=/\n/g,t=a.a,s=t.length,e=0,l=a.c,p=l.length,h=0,d=a.e,g=d.length,a=0;d[g]=s;var r,n;for(n=r=0;n<g;)d[n]!==d[n+2]?(d[r++]=d[n++],d[r++]=d[n++]):n+=2;g=r;for(n=r=0;n<g;){for(var z=d[n],f=d[n+1],b=n+2;b+2<=g&&d[b+1]===f;)b+=2;d[r++]=z;d[r++]=f;n=b}for(d.length=r;h<p;){var o=l[h+2]||s,c=d[a+2]||s,b=Math.min(o,c),i=l[h+1],j;if(i.nodeType!==1&&(j=t.substring(e,b))){k&&(j=j.replace(m,"\r"));i.nodeValue=
+j;var u=i.ownerDocument,v=u.createElement("SPAN");v.className=d[a+1];var x=i.parentNode;x.replaceChild(v,i);v.appendChild(i);e<o&&(l[h+1]=i=u.createTextNode(t.substring(b,o)),x.insertBefore(i,v.nextSibling))}e=b;e>=o&&(h+=2);e>=c&&(a+=2)}}catch(w){"console"in window&&console.log(w&&w.stack?w.stack:w)}}var v=["break,continue,do,else,for,if,return,while"],w=[[v,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"],
+"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],F=[w,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],G=[w,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"],
+H=[G,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"],w=[w,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],I=[v,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"],
+J=[v,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],v=[v,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],K=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/,N=/\S/,O=u({keywords:[F,H,w,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END"+
+I,J,v],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),A={};k(O,["default-code"]);k(x([],[["pln",/^[^<?]+/],["dec",/^<!\w[^>]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\S\s]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),
+["default-markup","htm","html","mxml","xhtml","xml","xsl"]);k(x([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/],["lang-js",/^on\w+\s*=\s*"([^"]+)"/i],["lang-js",/^on\w+\s*=\s*'([^']+)'/i],["lang-js",/^on\w+\s*=\s*([^\s"'>]+)/i],["lang-css",/^style\s*=\s*"([^"]+)"/i],["lang-css",/^style\s*=\s*'([^']+)'/i],["lang-css",
+/^style\s*=\s*([^\s"'>]+)/i]]),["in.tag"]);k(x([],[["atv",/^[\S\s]+/]]),["uq.val"]);k(u({keywords:F,hashComments:!0,cStyleComments:!0,types:K}),["c","cc","cpp","cxx","cyc","m"]);k(u({keywords:"null,true,false"}),["json"]);k(u({keywords:H,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:K}),["cs"]);k(u({keywords:G,cStyleComments:!0}),["java"]);k(u({keywords:v,hashComments:!0,multiLineStrings:!0}),["bsh","csh","sh"]);k(u({keywords:I,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}),
+["cv","py"]);k(u({keywords:"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["perl","pl","pm"]);k(u({keywords:J,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb"]);k(u({keywords:w,cStyleComments:!0,regexLiterals:!0}),["js"]);k(u({keywords:"all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes",
+hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);k(x([],[["str",/^[\S\s]+/]]),["regex"]);window.prettyPrintOne=function(a,m,e){var h=document.createElement("PRE");h.innerHTML=a;e&&D(h,e);E({g:m,i:e,h:h});return h.innerHTML};window.prettyPrint=function(a){function m(){for(var e=window.PR_SHOULD_USE_CONTINUATION?l.now()+250:Infinity;p<h.length&&l.now()<e;p++){var n=h[p],k=n.className;if(k.indexOf("prettyprint")>=0){var k=k.match(g),f,b;if(b=
+!k){b=n;for(var o=void 0,c=b.firstChild;c;c=c.nextSibling)var i=c.nodeType,o=i===1?o?b:c:i===3?N.test(c.nodeValue)?b:o:o;b=(f=o===b?void 0:o)&&"CODE"===f.tagName}b&&(k=f.className.match(g));k&&(k=k[1]);b=!1;for(o=n.parentNode;o;o=o.parentNode)if((o.tagName==="pre"||o.tagName==="code"||o.tagName==="xmp")&&o.className&&o.className.indexOf("prettyprint")>=0){b=!0;break}b||((b=(b=n.className.match(/\blinenums\b(?::(\d+))?/))?b[1]&&b[1].length?+b[1]:!0:!1)&&D(n,b),d={g:k,h:n,i:b},E(d))}}p<h.length?setTimeout(m,
+250):a&&a()}for(var e=[document.getElementsByTagName("pre"),document.getElementsByTagName("code"),document.getElementsByTagName("xmp")],h=[],k=0;k<e.length;++k)for(var t=0,s=e[k].length;t<s;++t)h.push(e[k][t]);var e=q,l=Date;l.now||(l={now:function(){return+new Date}});var p=0,d,g=/\blang(?:uage)?-([\w.]+)(?!\S)/;m()};window.PR={createSimpleLexer:x,registerLangHandler:k,sourceDecorator:u,PR_ATTRIB_NAME:"atn",PR_ATTRIB_VALUE:"atv",PR_COMMENT:"com",PR_DECLARATION:"dec",PR_KEYWORD:"kwd",PR_LITERAL:"lit",
+PR_NOCODE:"nocode",PR_PLAIN:"pln",PR_PUNCTUATION:"pun",PR_SOURCE:"src",PR_STRING:"str",PR_TAG:"tag",PR_TYPE:"typ"}})();

docs/scripts/search.js

@@ -0,0 +1,42 @@
+$( document ).ready(function() {
+    jQuery.expr[':'].Contains = function(a,i,m){
+        return (a.textContent || a.innerText || "").toUpperCase().indexOf(m[3].toUpperCase())>=0;
+    };
+    //on search
+    $("#nav-search").on("keyup", function(event) {
+        var search = $(this).val();
+        if (!search) {
+            //no search, show all results
+            $("nav > ul > li").show();
+            
+            if(typeof hideAllButCurrent === "function"){
+                //let's do what ever collapse wants to do
+                hideAllButCurrent();
+            }
+            else{
+                //menu by default should be opened
+                $("nav > ul > li > ul li").show();
+            }
+        }
+        else{
+            //we are searching
+            //show all parents
+            $("nav > ul > li").show();
+            //hide all results
+            $("nav > ul > li > ul li").hide();
+            //show results matching filter
+            $("nav > ul > li > ul").find("a:Contains("+search+")").parent().show();
+            //hide parents without children
+            $("nav > ul > li").each(function(){
+                if($(this).find("a:Contains("+search+")").length == 0 && $(this).children("ul").length === 0){
+                    //has no child at all and does not contain text
+                    $(this).hide();
+                }
+                else if($(this).find("a:Contains("+search+")").length == 0 && $(this).find("ul").children(':visible').length == 0){
+                    //has no visible child and does not contain text
+                    $(this).hide();
+                }
+            });
+        }
+    });
+});

docs/styles/jsdoc.css

@@ -0,0 +1,654 @@
+@import url(https://fonts.googleapis.com/css?family=Montserrat:400,700);
+
+* {
+  box-sizing: border-box
+}
+
+html, body {
+  height: 100%;
+  width: 100%;
+}
+
+body {
+  color: #4d4e53;
+  background-color: white;
+  margin: 0 auto;
+  padding: 0 20px;
+  font-family: 'Helvetica Neue', Helvetica, sans-serif;
+  font-size: 16px;
+  line-height: 160%;
+}
+
+img {
+  max-width: 100%;
+}
+
+a,
+a:active {
+  color: #606;
+  text-decoration: none;
+}
+
+a:hover {
+  text-decoration: none;
+}
+
+article a {
+  border-bottom: 1px solid #ddd;
+}
+
+article a:hover, article a:active {
+  border-bottom-color: #222;
+}
+
+p, ul, ol, blockquote {
+  margin-bottom: 1em;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  font-family: 'Montserrat', sans-serif;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  color: #000;
+  font-weight: 400;
+  margin: 0;
+}
+
+h1 {
+  font-weight: 300;
+  font-size: 48px;
+  margin: 1em 0 .5em;
+}
+
+h1.page-title {
+  font-size: 48px;
+  margin: 1em 30px;
+  line-height: 100%;
+}
+
+h2 {
+  font-size: 24px;
+  margin: 1.5em 0 .3em;
+}
+
+h3 {
+  font-size: 24px;
+  margin: 1.2em 0 .3em;
+}
+
+h4 {
+  font-size: 18px;
+  margin: 1em 0 .2em;
+  color: #4d4e53;
+}
+
+h4.name {
+  color: #fff;
+  background: #6d426d;
+  box-shadow: 0 .25em .5em #d3d3d3;
+  border-top: 1px solid #d3d3d3;
+  border-bottom: 1px solid #d3d3d3;
+  margin: 1.5em 0 0.5em;
+  padding: .75em 0 .75em 10px;
+}
+
+h4.name a {
+  color: #fc83ff;
+}
+
+h4.name a:hover {
+  border-bottom-color: #fc83ff;
+}
+
+h5, .container-overview .subsection-title {
+  font-size: 120%;
+  letter-spacing: -0.01em;
+  margin: 8px 0 3px 0;
+}
+
+h6 {
+  font-size: 100%;
+  letter-spacing: -0.01em;
+  margin: 6px 0 3px 0;
+  font-style: italic;
+}
+
+tt, code, kbd, samp {
+  font-family: Consolas, Monaco, 'Andale Mono', monospace;
+  background: #f4f4f4;
+  padding: 1px 5px;
+}
+
+.class-description {
+  font-size: 130%;
+  line-height: 140%;
+  margin-bottom: 1em;
+  margin-top: 1em;
+}
+
+.class-description:empty {
+  margin: 0
+}
+
+#main {
+  float: right;
+  min-width: 360px;
+  width: calc(100% - 240px);
+}
+
+header {
+  display: block
+}
+
+section {
+  display: block;
+  background-color: #fff;
+  padding: 0 0 0 30px;
+}
+
+.variation {
+  display: none
+}
+
+.signature-attributes {
+  font-size: 60%;
+  color: #eee;
+  font-style: italic;
+  font-weight: lighter;
+}
+
+nav {
+  float: left;
+  display: block;
+  width: 250px;
+  background: #fff;
+  overflow: auto;
+  position: fixed;
+  height: 100%;
+}
+
+nav #nav-search{
+    width: 210px;
+    height: 30px;
+    padding: 5px 10px;
+    font-size: 12px;
+    line-height: 1.5;
+    border-radius: 3px;
+    margin-right: 20px;
+    margin-top: 20px;
+}
+
+nav h3 {
+  margin-top: 12px;
+  font-size: 13px;
+  text-transform: uppercase;
+  letter-spacing: 1px;
+  font-weight: 700;
+  line-height: 24px;
+  margin: 15px 0 10px;
+  padding: 0;
+  color: #000;
+}
+
+nav ul {
+  font-family: 'Lucida Grande', 'Lucida Sans Unicode', arial, sans-serif;
+  font-size: 100%;
+  line-height: 17px;
+  padding: 0;
+  margin: 0;
+  list-style-type: none;
+}
+
+nav ul a,
+nav ul a:active {
+  font-family: 'Montserrat', sans-serif;
+  line-height: 18px;
+  padding: 0;
+  display: block;
+  font-size: 12px;
+}
+
+nav a:hover,
+nav a:active {
+  color: #606;
+}
+
+nav > ul {
+  padding: 0 10px;
+}
+
+nav > ul > li > a {
+  color: #606;
+  margin-top: 10px;
+}
+
+nav ul ul a {
+  color: hsl(207, 1%, 60%);
+  border-left: 1px solid hsl(207, 10%, 86%);
+}
+
+nav ul ul a,
+nav ul ul a:active {
+  padding-left: 20px
+}
+
+nav h2 {
+   font-size: 12px;
+   margin: 0;
+   padding: 0;
+}
+
+nav > h2 > a {
+   display: block;
+   margin: 10px 0 -10px;
+   color: #606 !important;
+}
+
+footer {
+  color: hsl(0, 0%, 28%);
+  margin-left: 250px;
+  display: block;
+  padding: 15px;
+  font-style: italic;
+  font-size: 90%;
+}
+
+.ancestors {
+  color: #999
+}
+
+.ancestors a {
+   color: #999 !important;
+}
+
+.clear {
+  clear: both
+}
+
+.important {
+  font-weight: bold;
+  color: #950B02;
+}
+
+.yes-def {
+  text-indent: -1000px
+}
+
+.type-signature {
+  color: #CA79CA
+}
+
+.type-signature:last-child {
+  color: #eee;
+}
+
+.name, .signature {
+  font-family: Consolas, Monaco, 'Andale Mono', monospace
+}
+
+.signature {
+    color: #fc83ff;
+}
+
+.details {
+  margin-top: 6px;
+  border-left: 2px solid #DDD;
+  line-height: 20px;
+  font-size: 14px;
+}
+
+.details dt {
+   width: auto;
+   float: left;
+   padding-left: 10px;
+}
+
+.details dd {
+   margin-left: 70px;
+   margin-top: 6px;
+   margin-bottom: 6px;
+}
+
+.details ul {
+   margin: 0
+}
+
+.details ul {
+   list-style-type: none
+}
+
+.details pre.prettyprint {
+   margin: 0
+}
+
+.details .object-value {
+   padding-top: 0
+}
+
+.description {
+  margin-bottom: 1em;
+  margin-top: 1em;
+}
+
+.code-caption {
+  font-style: italic;
+  font-size: 107%;
+  margin: 0;
+}
+
+.prettyprint {
+  font-size: 14px;
+  overflow: auto;
+}
+
+.prettyprint.source {
+  width: inherit;
+  line-height: 18px;
+  display: block;
+  background-color: #0d152a;
+  color: #aeaeae;
+}
+
+.prettyprint code {
+  line-height: 18px;
+  display: block;
+  background-color: #0d152a;
+  color: #4D4E53;
+}
+
+.prettyprint > code {
+  padding: 15px;
+}
+
+.prettyprint .linenums code {
+  padding: 0 15px
+}
+
+.prettyprint .linenums li:first-of-type code {
+  padding-top: 15px
+}
+
+.prettyprint code span.line {
+  display: inline-block
+}
+
+.prettyprint.linenums {
+  padding-left: 70px;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+.prettyprint.linenums ol {
+   padding-left: 0
+}
+
+.prettyprint.linenums li {
+   border-left: 3px #34446B solid;
+}
+
+.prettyprint.linenums li.selected, .prettyprint.linenums li.selected * {
+   background-color: #34446B;
+}
+
+.prettyprint.linenums li * {
+   -webkit-user-select: text;
+   -moz-user-select: text;
+   -ms-user-select: text;
+   user-select: text;
+}
+
+table {
+  border-spacing: 0;
+  border: 1px solid #ddd;
+  border-collapse: collapse;
+  border-radius: 3px;
+  box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+  width: 100%;
+  font-size: 14px;
+  margin: 1em 0;
+}
+
+td, th {
+   margin: 0px;
+   text-align: left;
+   vertical-align: top;
+   padding: 10px;
+   display: table-cell;
+}
+
+thead tr, thead tr {
+   background-color: #fff;
+   font-weight: bold;
+   border-bottom: 1px solid #ddd;
+}
+
+.params .type {
+  white-space: nowrap;
+}
+
+.params code {
+  white-space: pre;
+}
+
+.params td, .params .name, .props .name, .name code {
+   color: #4D4E53;
+   font-family: Consolas, Monaco, 'Andale Mono', monospace;
+   font-size: 100%;
+}
+
+.params td {
+   border-top: 1px solid #eee
+}
+
+.params td.description > p:first-child, .props td.description > p:first-child {
+   margin-top: 0;
+   padding-top: 0;
+}
+
+.params td.description > p:last-child, .props td.description > p:last-child {
+   margin-bottom: 0;
+   padding-bottom: 0;
+}
+
+span.param-type, .params td .param-type, .param-type dd {
+   color: #606;
+  font-family: Consolas, Monaco, 'Andale Mono', monospace
+}
+
+.param-type dt, .param-type dd {
+  display: inline-block
+}
+
+.param-type {
+  margin: 14px 0;
+}
+
+.disabled {
+  color: #454545
+}
+
+/* navicon button */
+.navicon-button {
+  display: none;
+  position: relative;
+  padding: 2.0625rem 1.5rem;
+  transition: 0.25s;
+  cursor: pointer;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
+  opacity: .8;
+}
+.navicon-button .navicon:before, .navicon-button .navicon:after {
+  transition: 0.25s;
+}
+.navicon-button:hover {
+  transition: 0.5s;
+  opacity: 1;
+}
+.navicon-button:hover .navicon:before, .navicon-button:hover .navicon:after {
+  transition: 0.25s;
+}
+.navicon-button:hover .navicon:before {
+  top: .825rem;
+}
+.navicon-button:hover .navicon:after {
+  top: -.825rem;
+}
+
+/* navicon */
+.navicon {
+  position: relative;
+  width: 2.5em;
+  height: .3125rem;
+  background: #000;
+  transition: 0.3s;
+  border-radius: 2.5rem;
+}
+.navicon:before, .navicon:after {
+  display: block;
+  content: "";
+  height: .3125rem;
+  width: 2.5rem;
+  background: #000;
+  position: absolute;
+  z-index: -1;
+  transition: 0.3s 0.25s;
+  border-radius: 1rem;
+}
+.navicon:before {
+  top: .625rem;
+}
+.navicon:after {
+  top: -.625rem;
+}
+
+/* open */
+.nav-trigger:checked + label:not(.steps) .navicon:before,
+.nav-trigger:checked + label:not(.steps) .navicon:after {
+  top: 0 !important;
+}
+
+.nav-trigger:checked + label .navicon:before,
+.nav-trigger:checked + label .navicon:after {
+  transition: 0.5s;
+}
+
+/* Minus */
+.nav-trigger:checked + label {
+  -webkit-transform: scale(0.75);
+          transform: scale(0.75);
+}
+
+/* × and + */
+.nav-trigger:checked + label.plus .navicon,
+.nav-trigger:checked + label.x .navicon {
+  background: transparent;
+}
+
+.nav-trigger:checked + label.plus .navicon:before,
+.nav-trigger:checked + label.x .navicon:before {
+  -webkit-transform: rotate(-45deg);
+          transform: rotate(-45deg);
+  background: #FFF;
+}
+
+.nav-trigger:checked + label.plus .navicon:after,
+.nav-trigger:checked + label.x .navicon:after {
+  -webkit-transform: rotate(45deg);
+          transform: rotate(45deg);
+  background: #FFF;
+}
+
+.nav-trigger:checked + label.plus {
+  -webkit-transform: scale(0.75) rotate(45deg);
+          transform: scale(0.75) rotate(45deg);
+}
+
+.nav-trigger:checked ~ nav {
+  left: 0 !important;
+}
+
+.nav-trigger:checked ~ .overlay {
+  display: block;
+}
+
+.nav-trigger {
+  position: fixed;
+  top: 0;
+  clip: rect(0, 0, 0, 0);
+}
+
+.overlay {
+  display: none;
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  width: 100%;
+  height: 100%;
+  background: hsla(0, 0%, 0%, 0.5);
+  z-index: 1;
+}
+
+@media only screen and (min-width: 320px) and (max-width: 680px) {
+  body {
+    overflow-x: hidden;
+  }
+
+  nav {
+    background: #FFF;
+    width: 250px;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: -250px;
+    z-index: 3;
+    padding: 0 10px;
+    transition: left 0.2s;
+  }
+
+  .navicon-button {
+    display: inline-block;
+    position: fixed;
+    top: 1.5em;
+    right: 0;
+    z-index: 2;
+  }
+
+  #main {
+    width: 100%;
+    min-width: 360px;
+  }
+
+  #main h1.page-title {
+    margin: 1em 0;
+  }
+
+  #main section {
+    padding: 0;
+  }
+
+  footer {
+    margin-left: 0;
+  }
+}
+
+/** Add a '#' to static members */
+[data-type="member"] a::before {
+  content: '#';
+  display: inline-block;
+  margin-left: -14px;
+  margin-right: 5px;
+}
+
+#disqus_thread{
+    margin-left: 30px;
+}

docs/styles/prettify.css

@@ -0,0 +1,79 @@
+.pln {
+  color: #ddd;
+}
+
+/* string content */
+.str {
+  color: #61ce3c;
+}
+
+/* a keyword */
+.kwd {
+  color: #fbde2d;
+}
+
+/* a comment */
+.com {
+  color: #aeaeae;
+}
+
+/* a type name */
+.typ {
+  color: #8da6ce;
+}
+
+/* a literal value */
+.lit {
+  color: #fbde2d;
+}
+
+/* punctuation */
+.pun {
+  color: #ddd;
+}
+
+/* lisp open bracket */
+.opn {
+  color: #000000;
+}
+
+/* lisp close bracket */
+.clo {
+  color: #000000;
+}
+
+/* a markup tag name */
+.tag {
+  color: #8da6ce;
+}
+
+/* a markup attribute name */
+.atn {
+  color: #fbde2d;
+}
+
+/* a markup attribute value */
+.atv {
+  color: #ddd;
+}
+
+/* a declaration */
+.dec {
+  color: #EF5050;
+}
+
+/* a variable name */
+.var {
+  color: #c82829;
+}
+
+/* a function name */
+.fun {
+  color: #4271ae;
+}
+
+/* Specify class=linenums on a pre to get line numbering */
+ol.linenums {
+  margin-top: 0;
+  margin-bottom: 0;
+}

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "tor-router",
-  "version": "4.0.2",
+  "version": "4.0.13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -10,17 +10,117 @@
       "integrity": "sha1-nK+xca+CMpSQNTtIFvAzR6oVCjA=",
       "optional": true
     },
+    "@deadcanaries/granax": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@deadcanaries/granax/-/granax-3.2.4.tgz",
+      "integrity": "sha512-2R/OUWeTlx6/2HVAeCtViKZHoQvD8YSKa/sVHc24itbNUGZ/StDbfwVE82/IvqNmY7Du7M1CsCDKYteGxkcNcQ==",
+      "requires": {
+        "7zip": "0.0.6",
+        "async": "^2.3.0",
+        "latest-torbrowser-version": "^2.0.2",
+        "merge": "^1.2.1",
+        "mkdirp": "^0.5.1",
+        "mv": "^2.1.1",
+        "ncp": "^2.0.0",
+        "progress": "^2.0.3",
+        "rimraf": "^2.6.3"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "latest-torbrowser-version": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/latest-torbrowser-version/-/latest-torbrowser-version-2.0.2.tgz",
+          "integrity": "sha512-2cg5j8szOY0g3jlyLZhye9as3oJihNJD3DN9+I7tdXMEBW4ZKH8Blq17xtj5Q2jtV7v8NjRCkBrXz3zPEjMWLQ==",
+          "requires": {
+            "async": "^2.6.0",
+            "cheerio": "^1.0.0-rc.2",
+            "follow-redirects": "^1.2.4",
+            "semver": "^5.4.1"
+          }
+        },
+        "merge": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+          "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
+    "@types/events": {
+      "version": "1.2.0",
+      "resolved": "https://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",
+      "integrity": "sha512-Y9GFyM8qt5p7p+HtM9rsSAnle4ZmcpNAhbaFQyj1XzaHgEVCYgRNJiCeGxf5Jf81/a/G1o+LuGDE3mvLosU2MA==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/node": {
       "version": "10.9.4",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-10.9.4.tgz",
       "integrity": "sha512-fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw=="
     },
+    "@types/serialize-error": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@types/serialize-error/-/serialize-error-2.1.0.tgz",
+      "integrity": "sha512-PXQYOySu+YjmtSKxWkXn00H3e4anQMiCaDw0Km7EHfM2/Da79Vni3Mt1QuKP9fmBobaLxN+3vjhSowjQp6XY9g=="
+    },
+    "@types/uuid": {
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.4.tgz",
+      "integrity": "sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/websocket": {
+      "version": "0.0.40",
+      "resolved": "https://registry.npmjs.org/@types/websocket/-/websocket-0.0.40.tgz",
+      "integrity": "sha512-ldteZwWIgl9cOy7FyvYn+39Ah4+PfpVE72eYKw75iy2L0zTbhbcwvzeJ5IOu6DQP93bjfXq0NGHY6FYtmYoqFQ==",
+      "requires": {
+        "@types/events": "*",
+        "@types/node": "*"
+      }
+    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true
     },
+    "acorn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.5.tgz",
+      "integrity": "sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg=="
+    },
     "agent-base": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
@@ -103,6 +203,11 @@
       "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
       "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
     },
+    "arrify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="
+    },
     "asn1": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
@@ -131,10 +236,10 @@
         "lodash": "^4.14.0"
       }
     },
-    "async-limiter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
+    "async-mutex": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.1.4.tgz",
+      "integrity": "sha512-zVWTmAnxxHaeB2B1te84oecI8zTDJ/8G49aVBblRX6be0oq6pAybNcUSxwfgVOmOjSCvN4aYZAqwtyNI8e1YGw=="
     },
     "asynckit": {
       "version": "0.4.0",
@@ -157,7 +262,8 @@
     "babylon": {
       "version": "7.0.0-beta.19",
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz",
-      "integrity": "sha512-Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A=="
+      "integrity": "sha512-Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A==",
+      "dev": true
     },
     "balanced-match": {
       "version": "1.0.0",
@@ -246,6 +352,7 @@
       "version": "0.8.9",
       "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz",
       "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=",
+      "dev": true,
       "requires": {
         "underscore-contrib": "~0.3.0"
       }
@@ -438,6 +545,15 @@
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
+    "cross-fetch": {
+      "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.3.0",
+        "whatwg-fetch": "3.0.0"
+      }
+    },
     "cross-spawn": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
@@ -519,6 +635,15 @@
         "type-detect": "^4.0.0"
       }
     },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "requires": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      }
+    },
     "del": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
@@ -654,7 +779,8 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
     },
     "esprima": {
       "version": "2.7.3",
@@ -662,6 +788,11 @@
       "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
       "dev": true
     },
+    "event-lite": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/event-lite/-/event-lite-0.1.2.tgz",
+      "integrity": "sha512-HnSYx1BsJ87/p6swwzv+2v6B4X+uxUteoDfRxsAb1S1BePzQqOLevVmkdA15GHJVd9A9Ok6wygUR18Hu0YeV9g=="
+    },
     "eventemitter2": {
       "version": "0.4.14",
       "resolved": "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
@@ -868,20 +999,8 @@
     "graceful-fs": {
       "version": "4.1.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
-    },
-    "granax": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/granax/-/granax-3.1.4.tgz",
-      "integrity": "sha512-MhmOZs4c2KKCYqC5ORANfW535QTvkqAGOZPTBpiUsdqtgF5sOix14pDsq3Ye11kx+C6IgFPQZoTmifESDBswaA==",
-      "requires": {
-        "7zip": "0.0.6",
-        "async": "^2.3.0",
-        "latest-torbrowser-version": "^2.0.1",
-        "merge": "^1.2.0",
-        "mkdirp": "^0.5.1",
-        "ncp": "^2.0.0"
-      }
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true
     },
     "growl": {
       "version": "1.10.5",
@@ -1154,6 +1273,11 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
+    "ieee754": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
+      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA=="
+    },
     "indent-string": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
@@ -1182,6 +1306,11 @@
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
       "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
     },
+    "int64-buffer": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/int64-buffer/-/int64-buffer-0.1.10.tgz",
+      "integrity": "sha1-J3siiofZWtd30HwTgyAiQGpHNCM="
+    },
     "interpret": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
@@ -1203,6 +1332,14 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.9.tgz",
       "integrity": "sha1-qceMzBLckBDylqua7y9h9DLWnvo="
     },
+    "is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "requires": {
+        "kind-of": "^6.0.0"
+      }
+    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -1218,6 +1355,24 @@
         "builtin-modules": "^1.0.0"
       }
     },
+    "is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "requires": {
+        "kind-of": "^6.0.0"
+      }
+    },
+    "is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "requires": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      }
+    },
     "is-finite": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
@@ -1261,8 +1416,7 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -1280,27 +1434,16 @@
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+    },
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
-    "jrpc2": {
-      "version": "git+https://github.com/znetstar/jrpc2.git#f1521bd3f2fa73d716e74bf8f746d08d5e03e7d7",
-      "from": "git+https://github.com/znetstar/jrpc2.git#f1521bd3f2fa73d716e74bf8f746d08d5e03e7d7",
-      "requires": {
-        "async": "^1.2",
-        "ws": "^6.0.0",
-        "xtend": "^4.0.0"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
-        }
-      }
-    },
     "js-weighted-list": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/js-weighted-list/-/js-weighted-list-0.1.1.tgz",
@@ -1320,6 +1463,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz",
       "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=",
+      "dev": true,
       "requires": {
         "xmlcreate": "^1.0.1"
       }
@@ -1335,6 +1479,7 @@
       "version": "3.5.5",
       "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz",
       "integrity": "sha512-6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg==",
+      "dev": true,
       "requires": {
         "babylon": "7.0.0-beta.19",
         "bluebird": "~3.5.0",
@@ -1388,10 +1533,16 @@
         }
       }
     },
+    "kind-of": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+    },
     "klaw": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz",
       "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=",
+      "dev": true,
       "requires": {
         "graceful-fs": "^4.1.9"
       }
@@ -1404,17 +1555,6 @@
         "colornames": "0.0.2"
       }
     },
-    "latest-torbrowser-version": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/latest-torbrowser-version/-/latest-torbrowser-version-2.0.1.tgz",
-      "integrity": "sha512-HtbbcKs6cl7Tz4RG+l1uulWd+tOJujn8wqyXd2zZjPRk9rO/mslg7Ajg72beEFCXwHPWZzwVR+w8mPO5yDiOWg==",
-      "requires": {
-        "async": "^2.6.0",
-        "cheerio": "^1.0.0-rc.2",
-        "follow-redirects": "^1.2.4",
-        "semver": "^5.4.1"
-      }
-    },
     "lcid": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
@@ -1509,7 +1649,8 @@
     "marked": {
       "version": "0.3.19",
       "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz",
-      "integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="
+      "integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==",
+      "dev": true
     },
     "mem": {
       "version": "1.1.0",
@@ -1545,11 +1686,6 @@
         }
       }
     },
-    "merge": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz",
-      "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo="
-    },
     "mime-db": {
       "version": "1.36.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz",
@@ -1615,6 +1751,195 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
+    "msgpack-lite": {
+      "version": "0.1.26",
+      "resolved": "https://registry.npmjs.org/msgpack-lite/-/msgpack-lite-0.1.26.tgz",
+      "integrity": "sha1-3TxQsm8FnyXn7e42REGDWOKprYk=",
+      "requires": {
+        "event-lite": "^0.1.1",
+        "ieee754": "^1.1.8",
+        "int64-buffer": "^0.1.9",
+        "isarray": "^1.0.0"
+      }
+    },
+    "multi-rpc": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/multi-rpc/-/multi-rpc-1.5.5.tgz",
+      "integrity": "sha512-JS6Pr0e9Rk4jFKAnyJD4qVzahlkreHH0cA76cua9pqiYnJhrb+pqGDNFxcSBfLvLhNpnY+dCOaBlsuRPahkzQA==",
+      "requires": {
+        "multi-rpc-common": "^2.2.6",
+        "multi-rpc-core": "^1.0.3",
+        "multi-rpc-http-client-side-transport": "^1.0.5",
+        "multi-rpc-http-transport": "^1.0.4",
+        "multi-rpc-json-serializer": "^1.0.5",
+        "multi-rpc-msgpack-serializer": "^1.0.5",
+        "multi-rpc-tcp-transport": "^1.1.3",
+        "multi-rpc-websocket-client-side-transport": "^1.2.7",
+        "multi-rpc-websocket-transport": "^1.2.5"
+      }
+    },
+    "multi-rpc-common": {
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/multi-rpc-common/-/multi-rpc-common-2.2.6.tgz",
+      "integrity": "sha512-TEN63Sd2GYFbPJtCGh+7uwWk2N+W+Q6AZkPwAGsVPesFg9VptP34wBKlPSjyT0S5+OmjhDtcuCMUk664nfqNpg==",
+      "requires": {
+        "@types/lodash": "^4.14.119",
+        "@types/serialize-error": "^2.1.0",
+        "@types/uuid": "^3.4.4",
+        "eventemitter2": "^5.0.1",
+        "lodash": "^4.17.11",
+        "serialize-error": "^3.0.0",
+        "uuid": "^3.3.2"
+      },
+      "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-core": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/multi-rpc-core/-/multi-rpc-core-1.0.3.tgz",
+      "integrity": "sha512-2CuqXaEBxaru2sDG0ng5EkM7F722RdYFv+GjQA8Ui/2QH5yMtb5EbwXM0S0LFrRkFWOzGaeHJLQ9n3pc15S0+Q==",
+      "requires": {
+        "@types/lodash": "^4.14.119",
+        "acorn": "^6.0.4",
+        "eventemitter2": "^5.0.1",
+        "lodash": "^4.17.11",
+        "multi-rpc-common": "^2.2.6",
+        "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.5",
+      "resolved": "https://registry.npmjs.org/multi-rpc-http-client-side-transport/-/multi-rpc-http-client-side-transport-1.0.5.tgz",
+      "integrity": "sha512-5+UXbN5V+BJrQwC09FJpv+4+B+ZjJaTeAfNorqQDjKhPEIFNnShxmvgUOfNghNph6H3hhHMnoM942kUA7rhb0w==",
+      "requires": {
+        "cross-fetch": "^3.0.0",
+        "multi-rpc-common": "^2.2.6"
+      }
+    },
+    "multi-rpc-http-transport": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/multi-rpc-http-transport/-/multi-rpc-http-transport-1.0.4.tgz",
+      "integrity": "sha512-R4q+RrQjuk2t02aZtBze6yUDB/RZzklcx1HsZjT7lFBCzbPZWgZqhVeJLgbMlhLbo4/E6fG/nvW5MYZDdOLz3g==",
+      "requires": {
+        "multi-rpc-common": "^2.2.6",
+        "multi-rpc-http-client-side-transport": "^1.0.5"
+      }
+    },
+    "multi-rpc-json-serializer": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/multi-rpc-json-serializer/-/multi-rpc-json-serializer-1.0.5.tgz",
+      "integrity": "sha512-5OUU1+U4clAanrc9tn2XZ328OjeSxG+vmnb78tLyQkxfXgDJ3igZrODSnV2i5MoBC3qi99Tdp73oCkBU4rfkxg==",
+      "requires": {
+        "multi-rpc-common": "^2.2.6",
+        "text-encoding": "^0.7.0"
+      }
+    },
+    "multi-rpc-msgpack-serializer": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/multi-rpc-msgpack-serializer/-/multi-rpc-msgpack-serializer-1.0.5.tgz",
+      "integrity": "sha512-Sa+CjMjKICDQcTolS70PUbR61uKNBmFWNInQF5hpCkS1iICnjCK490+JaGio5OAXsB58VDzwMmBrzbZialS/IQ==",
+      "requires": {
+        "@types/msgpack-lite": "^0.1.6",
+        "msgpack-lite": "^0.1.26",
+        "multi-rpc-common": "^2.2.6"
+      }
+    },
+    "multi-rpc-tcp-transport": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/multi-rpc-tcp-transport/-/multi-rpc-tcp-transport-1.1.3.tgz",
+      "integrity": "sha512-pcahuoXtKbWhVLJ/mi6Dd6r6JI+6RhpTkReWkXrI/AYsivdCYkn1TGNuj3Xpt9yJsLkYXchPHW2qF3mZcGGVWQ==",
+      "requires": {
+        "multi-rpc-common": "^2.2.6"
+      }
+    },
+    "multi-rpc-websocket-client-side-transport": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/multi-rpc-websocket-client-side-transport/-/multi-rpc-websocket-client-side-transport-1.2.7.tgz",
+      "integrity": "sha512-VmzWFF+xSOmLOjlcA5AbqUfIs8T+2U/WpfMvU9pjzLb76VSOaRJ+6FWbwQRYiBClsM4gqj9aohP0XSvR9DyxEg==",
+      "requires": {
+        "@types/websocket": "0.0.40",
+        "lodash": "^4.17.11",
+        "multi-rpc-common": "^2.2.6",
+        "websocket": "^1.0.28"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+        }
+      }
+    },
+    "multi-rpc-websocket-transport": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/multi-rpc-websocket-transport/-/multi-rpc-websocket-transport-1.2.6.tgz",
+      "integrity": "sha512-dlr0NvRTWjNhqKNhQfHJ+a05qyoejr3+4ijaf/8R5hnS1lwCt6jhQXHJ2gAoNNPSp28hqyMBEX0QvwrEMPChtA==",
+      "requires": {
+        "@types/websocket": "0.0.40",
+        "multi-rpc-common": "^2.2.6",
+        "multi-rpc-websocket-client-side-transport": "^1.2.7",
+        "websocket": "^1.0.28"
+      }
+    },
+    "mv": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
+      "integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=",
+      "requires": {
+        "mkdirp": "~0.5.1",
+        "ncp": "~2.0.0",
+        "rimraf": "~2.4.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "6.0.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+          "requires": {
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "rimraf": {
+          "version": "2.4.5",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
+          "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=",
+          "requires": {
+            "glob": "^6.0.1"
+          }
+        }
+      }
+    },
+    "nan": {
+      "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",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-1.2.3.tgz",
@@ -1625,7 +1950,7 @@
       "from": "git+https://github.com/znetstar/node-dns.git#336f1d3027b2a3da719b5cd65380219267901aeb",
       "requires": {
         "ipaddr.js": "~0.1.3",
-        "native-dns-cache": "git+https://github.com/znetstar/native-dns-cache.git#7743c19bd1b70d0ec32a364aadc77fbcfd5a67ad",
+        "native-dns-cache": "git+https://github.com/znetstar/native-dns-cache.git",
         "native-dns-packet": "~0.1.1"
       }
     },
@@ -1735,8 +2060,7 @@
     "ncp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
-      "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
-      "optional": true
+      "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M="
     },
     "nice-try": {
       "version": "1.0.5",
@@ -1744,6 +2068,11 @@
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
+    "node-fetch": {
+      "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",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -1856,6 +2185,28 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
       "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
     },
+    "parse-function": {
+      "version": "5.2.11",
+      "resolved": "https://registry.npmjs.org/parse-function/-/parse-function-5.2.11.tgz",
+      "integrity": "sha512-2nQChgTKz80awFjQqs93ZzgQPOykT+BXomHUfwMdIben3PT2uohAPot+h5D+PNa0T+odzjuMZUMOoCyJfnej1Q==",
+      "requires": {
+        "arrify": "1.0.1",
+        "babylon": "7.0.0-beta.47",
+        "define-property": "2.0.2"
+      },
+      "dependencies": {
+        "arrify": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+          "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
+        },
+        "babylon": {
+          "version": "7.0.0-beta.47",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.47.tgz",
+          "integrity": "sha512-+rq2cr4GDhtToEzKFD6KZZMDBXhjFAr9JjPw9pAppZACeEWqNM294j+NdBzkSHYXwzzBmVjZ3nEVJlOhbR2gOQ=="
+        }
+      }
+    },
     "parse-json": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
@@ -1957,6 +2308,11 @@
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
       "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
     },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
+    },
     "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
@@ -2139,6 +2495,7 @@
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz",
       "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=",
+      "dev": true,
       "requires": {
         "underscore": "~1.6.0"
       },
@@ -2146,7 +2503,8 @@
         "underscore": {
           "version": "1.6.0",
           "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
-          "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
+          "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
+          "dev": true
         }
       }
     },
@@ -2184,6 +2542,11 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz",
       "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw=="
     },
+    "serialize-error": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-3.0.0.tgz",
+      "integrity": "sha512-+y3nkkG/go1Vdw+2f/+XUXM1DXX1XcxTl99FfiD/OEPUNw4uo0i6FKABfTAN5ZcgGtjTRZcEbxcE/jtXbEY19A=="
+    },
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -2244,15 +2607,16 @@
       }
     },
     "socksv5": {
-      "version": "git+https://github.com/znetstar/socksv5.git#431e541390314adbbe765650d8d810ec1df38d8a",
-      "from": "git+https://github.com/znetstar/socksv5.git#431e541390314adbbe765650d8d810ec1df38d8a",
+      "version": "git+https://github.com/znetstar/socksv5.git#1480422215cf1464fa06f5aec4a3e7f2117e3403",
+      "from": "git+https://github.com/znetstar/socksv5.git#1480422215cf1464fa06f5aec4a3e7f2117e3403",
       "requires": {
         "ipv6": "*"
       },
       "dependencies": {
         "ipv6": {
           "version": "3.1.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-RtoOJgrzb9m+tBKXyYe3whotnhw=",
           "requires": {
             "cli": "0.4.x",
             "cliff": "0.1.x",
@@ -2261,7 +2625,8 @@
           "dependencies": {
             "sprintf": {
               "version": "0.1.3",
-              "bundled": true
+              "resolved": false,
+              "integrity": "sha1-Uw/DFAXUdCL27bQPKb2vrFme3hE="
             }
           }
         }
@@ -2384,7 +2749,8 @@
     "strip-json-comments": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true
     },
     "supports-color": {
       "version": "5.4.0",
@@ -2398,7 +2764,8 @@
     "taffydb": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz",
-      "integrity": "sha1-fLy2S1oUG2ou/CxdLGe04VCyomg="
+      "integrity": "sha1-fLy2S1oUG2ou/CxdLGe04VCyomg=",
+      "dev": true
     },
     "temp": {
       "version": "0.8.3",
@@ -2409,6 +2776,11 @@
         "rimraf": "~2.2.6"
       }
     },
+    "text-encoding": {
+      "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",
       "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-0.0.0.tgz",
@@ -2456,15 +2828,25 @@
       "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
       "dev": true
     },
+    "typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "requires": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
     "underscore": {
       "version": "1.8.3",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
+      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=",
+      "dev": true
     },
     "underscore-contrib": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz",
       "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc=",
+      "dev": true,
       "requires": {
         "underscore": "1.6.0"
       },
@@ -2472,7 +2854,8 @@
         "underscore": {
           "version": "1.6.0",
           "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
-          "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
+          "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
+          "dev": true
         }
       }
     },
@@ -2494,8 +2877,7 @@
     "uuid": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
-      "dev": true
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -2517,6 +2899,32 @@
         "extsprintf": "^1.2.0"
       }
     },
+    "websocket": {
+      "version": "1.0.28",
+      "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.28.tgz",
+      "integrity": "sha512-00y/20/80P7H4bCYkzuuvvfDvh+dgtXi5kzDf3UcZwN6boTYaKvsrtZ5lIYm1Gsg48siMErd9M4zjSYfYFHTrA==",
+      "requires": {
+        "debug": "^2.2.0",
+        "nan": "^2.11.0",
+        "typedarray-to-buffer": "^3.1.5",
+        "yaeti": "^0.0.6"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "whatwg-fetch": {
+      "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",
       "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz",
@@ -2608,29 +3016,22 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
-    "ws": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.0.0.tgz",
-      "integrity": "sha512-c2UlYcAZp1VS8AORtpq6y4RJIkJ9dQz18W32SpR/qXGfLDZ2jU4y4wKvvZwqbi7U6gxFQTeE+urMbXU/tsDy4w==",
-      "requires": {
-        "async-limiter": "~1.0.0"
-      }
-    },
     "xmlcreate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz",
-      "integrity": "sha1-+mv3YqYKQT+z3Y9LA8WyaSONMI8="
-    },
-    "xtend": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+      "integrity": "sha1-+mv3YqYKQT+z3Y9LA8WyaSONMI8=",
+      "dev": true
     },
     "y18n": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
       "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
     },
+    "yaeti": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
+      "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc="
+    },
     "yallist": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tor-router",
-  "version": "4.0.3",
+  "version": "4.0.13",
   "main": "src/index.js",
   "repository": "git@github.com:znetstar/tor-router.git",
   "author": "Zachary Boyd <zachary@zacharyboyd.nyc>",
@@ -9,6 +9,9 @@
   "bin": {
     "tor-router": "bin/tor-router"
   },
+  "keywords": [
+    "tor"
+  ],
   "scripts": {
     "start": "bin/tor-router -s -d -j 1",
     "test": "mocha -u tdd --exit test/index.js",
@@ -20,6 +23,7 @@
     "docdash": "^1.0.0",
     "grunt": "^1.0.3",
     "grunt-jsdoc": "^2.3.0",
+    "jsdoc": "^3.5.5",
     "mocha": "^5.2.0",
     "request": "^2.87.0",
     "request-promise": "^4.2.2",
@@ -27,20 +31,21 @@
     "socks-proxy-agent": "^4.0.1"
   },
   "dependencies": {
+    "@deadcanaries/granax": "^3.2.4",
+    "arrify": "^2.0.1",
+    "async-mutex": "^0.1.4",
     "bluebird": "^3.5.2",
     "del": "^3.0.0",
     "eventemitter3": "^3.1.0",
     "get-port": "^2.1.0",
-    "granax": "^3.1.4",
-    "jrpc2": "git+https://github.com/znetstar/jrpc2.git#f1521bd3f2fa73d716e74bf8f746d08d5e03e7d7",
     "js-weighted-list": "^0.1.1",
-    "jsdoc": "^3.5.5",
     "lodash": "^4.17.4",
+    "multi-rpc": "^1.5.5",
     "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#431e541390314adbbe765650d8d810ec1df38d8a",
+    "socksv5": "git+https://github.com/znetstar/socksv5.git#1480422215cf1464fa06f5aec4a3e7f2117e3403",
     "temp": "^0.8.3",
     "winston": "^3.0.0-rc5",
     "yargs": "^11.0.0"

src/ControlServer.js

@@ -1,4 +1,4 @@
-const rpc = require('jrpc2');
+const { Server, WebSocketTransport, TCPTransport, JSONSerializer } = require("multi-rpc");
 const Promise = require('bluebird');
 
 const SOCKSServer = require('./SOCKSServer');
@@ -51,38 +51,40 @@ class ControlServer {
 		/**
 		 * RPC Server instance
 		 * 
-		 * @type {rpc.Server}
+		 * @type {Server}
 		 */
-		let server = this.server = new rpc.Server();
+		let server = this.server = new Server();
 
-		server.expose('createTorPool', this.createTorPool.bind(this));
-		server.expose('createSOCKSServer', this.createSOCKSServer.bind(this));
-		server.expose('createDNSServer', this.createDNSServer.bind(this));
-		server.expose('createHTTPServer', this.createHTTPServer.bind(this));
+		this.serializer = new JSONSerializer();
+
+		this.server.methods.createTorPool = this.createTorPool.bind(this);
+		this.server.methods.createSocksServer = this.createSOCKSServer.bind(this);
+		this.server.methods.createDNSServer = this.createDNSServer.bind(this);
+		this.server.methods.createHTTPServer =  this.createHTTPServer.bind(this);
 		
 		/**
 		 * Returns a list of all instances currently in the pool.
 		 */
-		server.expose('queryInstances', (() => {
+		this.server.methods.queryInstances = (() => {
 			return this.tor_pool.instances.map(ControlServer.instance_info);
-		}).bind(this));
+		}).bind(this);
 
 		/**
 		 * Returns information on an instance identified by the {@link TorProcess#instance_name} field.
 		 */
-		server.expose('queryInstanceByName', ((instance_name) => {
+		this.server.methods.queryInstanceByName = ((instance_name) => {
 			let instance = this.tor_pool.instance_by_name(instance_name);
 
 			if (!instance)
 				throw new Error(`Instance "${instance_name}"" does not exist`);
 
 			return ControlServer.instance_info(instance);	
-		}).bind(this));
+		}).bind(this);
 
 		/**
 		 * Returns information on an instance identified by its index in the pool.
 		 */
-		server.expose('queryInstanceAt', ((index) => {
+		this.server.methods.queryInstanceAt = ((index) => {
 			if (!this.tor_pool)
 				throw new Error('No pool created');
 
@@ -92,228 +94,228 @@ class ControlServer {
 				throw new Error(`Instance at "${i}"" does not exist`);
 
 			return ControlServer.instance_info(this.tor_pool.instance_at(index));	
-		}).bind(this));
+		}).bind(this);
 
 		/**
 		 * Returns a list of the names of all of the instances in the pool.
 		 */
-		server.expose('queryInstanceNames', (() => this.tor_pool.instance_names).bind(this));
+		this.server.methods.queryInstanceNames = (() => this.tor_pool.instance_names).bind(this);
 	
 		/**
 		 * Returns a list of the names of all of the current groups.
 		 */
-		server.expose('queryGroupNames', (() => Array.from(this.tor_pool.group_names)).bind(this));
+		this.server.methods.queryGroupNames = (() => Array.from(this.tor_pool.group_names)).bind(this);
 
 		/**
 		 * Returns a list of the instances that exist in a given group.
 		 */
-		server.expose('queryInstancesByGroup', ((group) => this.tor_pool.instances_by_group(group).map(ControlServer.instance_info)).bind(this));
+		this.server.methods.queryInstancesByGroup = ((group) => this.tor_pool.instances_by_group(group).map(ControlServer.instance_info)).bind(this);
 
 		/**
 		 * Creates instances from a number, an array of instance definitions or a single instance definition. 
 		 * If a number is provided, creates n many instances.
 		 */
-		server.expose('createInstances', (async (instances_to_create) => {
+		this.server.methods.createInstances = (async (instances_to_create) => {
 			let instances = await this.tor_pool.create(instances_to_create);
 
 			return instances.map(ControlServer.instance_info);
-		}).bind(this));
+		}).bind(this);
 
 		/**
 		 * Creates instances from an array of instance definitions or a single instance definition.
 		 */
-		server.expose('addInstances', (async (defs) => {
+		this.server.methods.addInstances = (async (defs) => {
 			let instances = await this.tor_pool.add(defs);
 
 			return instances.map(ControlServer.instance_info);
-		}).bind(this));
+		}).bind(this);
 
 		/**
 		 * Removes a number of instances from the pool.
 		 */
-		server.expose('removeInstances', this.tor_pool.remove.bind(this.tor_pool));
+		this.server.methods.removeInstances = this.tor_pool.remove.bind(this.tor_pool);
 
 		/**
 		 * Remove an instance at the index provided from the pool.
 		 */
-		server.expose('removeInstanceAt', this.tor_pool.remove_at.bind(this.tor_pool));
+		this.server.methods.removeInstanceAt =  this.tor_pool.remove_at.bind(this.tor_pool);
 
 		/**
 		 * Remove an instance from the pool by the {@link TorProcess#instance_name} field.
 		 */
-		server.expose('removeInstanceByName', this.tor_pool.remove_by_name.bind(this.tor_pool));
+		this.server.methods.removeInstanceByName = this.tor_pool.remove_by_name.bind(this.tor_pool);
 
 		/**
 		 * Gets new identities for all instances in the pool.
 		 */
-		server.expose('newIdentites', this.tor_pool.new_identites.bind(this.tor_pool));
+		this.server.methods.newIdentites = this.tor_pool.new_identites.bind(this.tor_pool);
 
 		/**
 		 * Get a new identity for the instance at the index provided in the pool.
 		 */
-		server.expose('newIdentityAt', this.tor_pool.new_identity_at.bind(this.tor_pool));
+		this.server.methods.newIdentityAt = this.tor_pool.new_identity_at.bind(this.tor_pool);
 
 		/**
 		 * Get a new identity for the instance by the {@link TorProcess#instance_name} field.
 		 */
-		server.expose('newIdentityByName', this.tor_pool.new_identity_by_name.bind(this.tor_pool));
+		this.server.methods.newIdentityByName =  this.tor_pool.new_identity_by_name.bind(this.tor_pool);
 
 		/**
 		 * Gets new identities for all instances in the group.
 		 */
-		server.expose('newIdentitiesByGroup', this.tor_pool.new_identites_by_group.bind(this.tor_pool));
+		this.server.methods.newIdentitiesByGroup = this.tor_pool.new_identites_by_group.bind(this.tor_pool);
 
 		/**
 		 * Gets the next instance in the pool using the load balance method.
 		 */
-		server.expose('nextInstance', (() => ControlServer.instance_info(this.tor_pool.next())).bind(this));
+		this.server.methods.nextInstance = (() => ControlServer.instance_info(this.tor_pool.next())).bind(this);
 
 		/**
 		 * Gets the next instance in the group using the load balance method.
 		 */
-		server.expose('nextInstanceByGroup', ((group) => {
+		this.server.methods.nextInstanceByGroup =  ((group) => {
 			return ControlServer.instance_info(this.tor_pool.next_by_group(group));
-		}).bind(this));
+		}).bind(this);
 
 		/**
 		 * Kills the processes of all instances in the pool.
 		 */
-		server.expose('closeInstances', this.tor_pool.exit.bind(this.tor_pool));
+		this.server.methods.closeInstances = this.tor_pool.exit.bind(this.tor_pool);
 
 		/**
 		 * Sets a property in the application configuration.
 		 */
-		server.expose('setConfig', ((key, value) => {
+		this.server.methods.setConfig = ((key, value) => {
 			this.nconf.set(key, value);
-		}).bind(this));	
+		}).bind(this);	
 	
 		/**
 		 * Gets a property in the application configuration.
 		 */
-		server.expose('getConfig', ((key) => {
+		this.server.methods.getConfig = ((key) => {
 			return this.nconf.get(key);
-		}).bind(this));	
+		}).bind(this);
 
 		/**
 		 * Saves the application configuration to the underlying store (usually a JSON file).
 		 */
-		server.expose('saveConfig', (async () => {
+		this.server.methods.saveConfig = (async () => {
 			await new Promise((resolve, reject) => {
 				this.nconf.save((err) => {
 					if (err) return reject(err);
 					resolve();
 				});
 			});
-		}).bind(this));	
+		}).bind(this);	
 
 		/**
 		 * Loads the application configuration from the underlying store (usually a JSON file).
 		 */
-		server.expose('loadConfig', (async () => {
+		this.server.methods.loadConfig = (async () => {
 			await new Promise((resolve, reject) => {
 				this.nconf.load((err) => {
 					if (err) return reject(err);
 					resolve();
 				});
 			});
-		}).bind(this));	
+		}).bind(this);	
 
 		/**
 		 * Sets a configuration property on all instances in the pool.
 		 */
-		server.expose('setTorConfig', (async (config) => {
+		this.server.methods.setTorConfig = (async (config) => {
 			await Promise.all(Object.keys(config).map((key) => {
 				let value = config[key];
 
 				return this.tor_pool.set_config_all(key, value);
 			}));
-		}).bind(this));
+		}).bind(this);
 
 		/**
 		 * Sets a configuration property on all instances in a group.
 		 */
-		server.expose('setTorConfigByGroup', (async (group, config) => {
+		this.server.methods.setTorConfigByGroup = (async (group, config) => {
 			await Promise.all(Object.keys(config).map((key) => {
 				let value = config[key];
 
 				return this.tor_pool.set_config_by_group(group, key, value);
 			}));
-		}).bind(this));
+		}).bind(this);
 
 		/**
 		 * Retrieves the current load balance method for the pool
 		 */
-		server.expose('getLoadBalanceMethod', (() => {
+		this.server.methods.getLoadBalanceMethod = (() => {
 			return this.tor_pool.load_balance_method;
-		}).bind(this));	
+		}).bind(this);	
 
 		/**
 		 * Sets the current load balance method for the pool
 		 */
-		server.expose('setLoadBalanceMethod', ((loadBalanceMethod) => {
+		this.server.methods.setLoadBalanceMethod = ((loadBalanceMethod) => {
 			this.tor_pool.load_balance_method = loadBalanceMethod;
 			this.nconf.set('loadBalanceMethod', loadBalanceMethod);
-		}).bind(this));	
+		}).bind(this);	
 
 		/**
 		 * Retrieve a configuration property for an instance identified by the {@link TorProcess#instance_name} field.
 		 */
-		server.expose('getInstanceConfigByName', this.tor_pool.get_config_by_name.bind(this.tor_pool));	
+		this.server.methods.getInstanceConfigByName =  this.tor_pool.get_config_by_name.bind(this.tor_pool);	
 
 		/**
 		 * Retrieves a configuration property for an instance by its index in the pool.
 		 */
-		server.expose('getInstanceConfigAt', this.tor_pool.get_config_at.bind(this.tor_pool));	
+		this.server.methods.getInstanceConfigAt = this.tor_pool.get_config_at.bind(this.tor_pool);	
 
 		/**
 		 * Sets a configuration property for an instance identified by the {@link TorProcess#instance_name} field.
 		 */
-		server.expose('setInstanceConfigByName', this.tor_pool.set_config_by_name.bind(this.tor_pool));
+		this.server.methods.setInstanceConfigByName = this.tor_pool.set_config_by_name.bind(this.tor_pool);
 
 		/**
 		 * Sets a configuration property for an instance identified by its index in the pool.
 		 */
-		server.expose('setInstanceConfigAt', this.tor_pool.set_config_at.bind(this.tor_pool));
+		this.server.methods.setInstanceConfigAt = this.tor_pool.set_config_at.bind(this.tor_pool);
 
 		/**
 		 * Sends a signal to all instances in the pool
 		 */
-		server.expose('signalAllInstances', this.tor_pool.signal_all.bind(this.tor_pool));
+		this.server.methods.signalAllInstances = this.tor_pool.signal_all.bind(this.tor_pool);
 	
 		/**
 		 * Sends a signal to an instance identified by its index in the pool.
 		 */
-		server.expose('signalInstanceAt', this.tor_pool.signal_at.bind(this.tor_pool));
+		this.server.methods.signalInstanceAt = this.tor_pool.signal_at.bind(this.tor_pool);
 
 		/**
 		 * Sends a signal to an instance identified by the {@link TorProcess#instance_name} field.
 		 */
-		server.expose('signalInstanceByName', this.tor_pool.signal_by_name.bind(this.tor_pool));
+		this.server.methods.signalInstanceByName = this.tor_pool.signal_by_name.bind(this.tor_pool);
 
 		/**
 		 * Sends a singal to all instances in a group.
 		 */
-		server.expose('signalInstancesByGroup', this.tor_pool.signal_by_group.bind(this.tor_pool));
+		this.server.methods.signalInstancesByGroup = this.tor_pool.signal_by_group.bind(this.tor_pool);
 
 		/**
 		 * Adds an instance to a group identified by its {@link TorProcess#instance_name} field.
 		 */
-		server.expose('addInstanceToGroupByName', this.tor_pool.add_instance_to_group_by_name.bind(this.tor_pool));
+		this.server.methods.addInstanceToGroupByName = this.tor_pool.add_instance_to_group_by_name.bind(this.tor_pool);
 		
 		/**
 		 * Adds an instance to a group identified by its index in the pool.
 		 */
-		server.expose('addInstanceToGroupAt', this.tor_pool.add_instance_to_group_at.bind(this.tor_pool));
+		this.server.methods.addInstanceToGroupAt = this.tor_pool.add_instance_to_group_at.bind(this.tor_pool);
 
 		/**
 		 * Removes an instance from a group identified by its {@link TorProcess#instance_name} field.
 		 */
-		server.expose('removeInstanceFromGroupByName', this.tor_pool.remove_instance_from_group_by_name.bind(this.tor_pool));
+		this.server.methods.removeInstanceFromGroupByName = this.tor_pool.remove_instance_from_group_by_name.bind(this.tor_pool);
 		
 		/**
 		 * Remove an instance from a group identified by its index in the pool.
 		 */
-		server.expose('removeInstanceFromGroupAt', this.tor_pool.remove_instance_from_group_at .bind(this.tor_pool));
+		this.server.methods.removeInstanceFromGroupAt = this.tor_pool.remove_instance_from_group_at .bind(this.tor_pool);
 	}
 
 	/**
@@ -342,9 +344,10 @@ class ControlServer {
 	 * @returns {Promise}
 	 */
 	async listenTcp(port, hostname) {  
-		this.tcpTransport = new rpc.tcpTransport({ port, hostname });
-		this.tcpTransport.listen(this.server);
-        this.logger.info(`[control]: control server listening on tcp://${hostname}:${port}`);
+		this.tcpTransport = new TCPTransport(this.serializer, port, hostname);
+		this.server.addTransport(this.tcpTransport);
+		this.logger.info(`[control]: control server listening on tcp://${hostname}:${port}`);
+		await this.tcpTransport.listen();
 	}
 
 	/**
@@ -355,9 +358,10 @@ class ControlServer {
 	 * @returns {Promise}
 	 */
 	async listenWs(port, hostname) {
-		this.wsTransport = new rpc.wsTransport({ port, hostname });
-		this.wsTransport.listen(this.server);
+		this.wsTransport = new WebSocketTransport(this.serializer, port, hostname);
+		this.server.addTransport(this.wsTransport);
 		this.logger.info(`[control]: control server listening on ws://${hostname}:${port}`);
+		await this.wsTransport.listen();
 	}
 
 	/**
@@ -373,10 +377,7 @@ class ControlServer {
 	 * Closes the TCP and/or WebSocket servers
 	 */
 	close() { 
-		if (this.tcpTransport && this.tcpTransport.tcpServer)
-			this.tcpTransport.tcpServer.close();
-		if (this.wsTransport && this.wsTransport.httpServer)
-			this.wsTransport.httpServer.close();
+		this.server.close();
 	}
 
 	/**

src/HTTPServer.js

@@ -147,6 +147,12 @@ class HTTPServer extends Server {
 
 			let buffer = [];
 
+			const onError = (err) => {
+				this.logger.error("[http-proxy]: an error occured: "+err.message);
+				res.writeHead(500);
+				res.end();
+			}
+
 			function onIncomingData(chunk) {
 				buffer.push(chunk);
 			}
@@ -157,26 +163,26 @@ class HTTPServer extends Server {
 
 			req.on('data', onIncomingData);
 			req.on('end', preConnectClosed);
-			req.on('error', function (err) {
-				this.logger.error("[http-proxy]: an error occured: "+err.message);
-			});
+			req.on('error', onError);
 
 			let connect = (tor_instance) => {
 				let source = { hostname: req.connection.remoteAddress, port: req.connection.remotePort, proto: 'http', by_name: Boolean(instance) };
 				let socks_port = tor_instance.socks_port;
 				
+				const agent =  socks.HttpAgent({
+					proxyHost: '127.0.0.1',
+					proxyPort: socks_port,
+					auths: [ socks.auth.None() ],
+					localDNS: false
+				});
+
 				let proxy_req = http.request({
 					method: req.method,
 					hostname: url.hostname, 
 					port: url.port,
 					path: url.path,
 					headers: req.headers,
-					agent: socks.HttpAgent({
-						proxyHost: '127.0.0.1',
-						proxyPort: socks_port,
-						auths: [ socks.auth.None() ],
-						localDNS: false
-					})
+					agent
 				}, (proxy_res) => {
 					/**
 					 * Fires when the proxy has made a connection through an instance using HTTP or HTTP-Connect.
@@ -199,6 +205,8 @@ class HTTPServer extends Server {
 					res.writeHead(proxy_res.statusCode, proxy_res.headers);
 				});
 
+				proxy_req.on("error", onError);
+				
 				req.removeListener('data', onIncomingData);
 
 				req.on('data', (chunk) => {
@@ -271,7 +279,7 @@ class HTTPServer extends Server {
 				inbound_socket.on('error', onClose);
 				inbound_socket.on('close', onClose);
 
-				socks.connect({
+				const client = socks.connect({
 					host: hostname,
 					port: port,
 					proxyHost: '127.0.0.1',
@@ -292,6 +300,8 @@ class HTTPServer extends Server {
 					outbound_socket.pipe(inbound_socket);
 					inbound_socket.pipe(outbound_socket);
 				});
+
+				client.on('error', onClose);	
 			};
 
 			if (instance) {

src/SOCKSServer.js

@@ -146,7 +146,7 @@ class SOCKSServer extends Server{
 				let source = { hostname: info.srcAddr, port: info.srcPort, proto: 'socks', by_name: Boolean(instance) };
 				let socks_port = tor_instance.socks_port;
 
-				socks.connect({
+				let client = socks.connect({
 					host: info.dstAddr,
 					port: info.dstPort,
 					proxyHost: '127.0.0.1',
@@ -182,6 +182,8 @@ class SOCKSServer extends Server{
 						outbound_socket.write(buffer.shift());
 					}
 				});
+
+				client.on('error', onClose);
 			};
 			
 			if (instance) {

src/TorPool.js

@@ -27,7 +27,9 @@ const Promise = require("bluebird");
 const _ = require('lodash');
 const WeightedList = require('js-weighted-list');
 
+const getPort = require('get-port');
 const TorProcess = require('./TorProcess');
+const { Mutex } = require('async-mutex');
 
 Promise.promisifyAll(fs);
 
@@ -462,6 +464,19 @@ class TorPool extends EventEmitter {
 		
 		if (typeof(instances) === 'number') {
 			instances = Array.from(Array(instances)).map(() => ({}));
+			const lock = new Mutex();
+			instances = await Promise.all(instances.map(async(instance) => {
+				instance.ports = {};
+				let release = await lock.acquire();
+				try {
+					instance.ports.dns_port = await getPort();
+					instance.ports.socks_port = await getPort();
+					instance.ports.control_port = await getPort();
+				} finally {
+					release();
+				}
+				return instance;
+			}));
 		}
 		return await this.add(instances);
 	}

src/TorProcess.js

@@ -13,7 +13,7 @@ const shell = require('shelljs');
 const getPort = require('get-port');
 const del = require('del');
 const temp = require('temp');
-const { TorController } = require('granax');
+const { TorController } = require('@deadcanaries/granax');
 const nanoid = require("nanoid");
 const winston = require('winston');
 Promise.promisifyAll(temp);
@@ -52,6 +52,7 @@ class TorProcess extends EventEmitter {
 		definition.Config = definition.Config || {};
 
 		this._definition = definition;
+		this._ports = definition.ports || {};
 
 		/**
 		 * Path to the Tor executable.
@@ -263,10 +264,12 @@ class TorProcess extends EventEmitter {
 	 * @returns {Promise<ChildProcess>} - The process that has been created.
 	 */
 	async create() {
-		this._ports = {};
-		let dnsPort = this._ports.dns_port = await getPort();
-		let socksPort = this._ports.socks_port =  await getPort();
-		let controlPort = this._ports.control_port = await getPort();
+		let dnsPort = this._ports.dns_port || await getPort();
+		let socksPort = this._ports.socks_port || await getPort();
+		let controlPort = this._ports.control_port || await getPort();
+		this.logger.info(`[tor-${this.instance_name}]: DNS PORT = ${dnsPort}`);
+		this.logger.info(`[tor-${this.instance_name}]: SOCKS PORT = ${socksPort}`);
+		this.logger.info(`[tor-${this.instance_name}]: CONTROL PORT = ${controlPort}`);
 		Object.freeze(this._ports);
 
 		let options = {
@@ -403,7 +406,7 @@ class TorProcess extends EventEmitter {
 				 * @returns {Error}
 				 */
 				this.emit('error', new Error(msg));
-				this.logger.error(`[tor-${this.instance_name}]: ${msg}`);
+				this.logger.error(`[tor-${this.instance_name}]: ${text}`);
 			}
 
 			else if (text.indexOf('[notice]') !== -1) {

src/default_config.js

@@ -21,7 +21,7 @@ module.exports = {
 		"Log": "notice stdout",
 		"NewCircuitPeriod": "10"
 	},
-	"torPath": require('granax').tor(require('os').platform()),
+	"torPath": require('@deadcanaries/granax').tor(require('os').platform()),
 	"instances": null,
 	"dns": {
 		"timeout": 10000,

src/launch.js

@@ -132,7 +132,7 @@ async function main(nconf, logger) {
         }
 
         if (error instanceof Error) {
-            logger.error(`[global]: error shutting down: ${error.message}`);
+            logger.error(`[global]: ${error.stack || 'An unknown error occured'}`);
         } else {
             error = 0;
         }
@@ -148,6 +148,7 @@ async function main(nconf, logger) {
 
     process.on('exit', cleanUp);
     process.on('SIGINT', cleanUp);
+    process.on('SIGTERM', cleanUp);
     process.on('uncaughtException', cleanUp.bind({ handleError: true }));
 }
 

test/RPCInterface.js

@@ -4,7 +4,7 @@ const assert = require('chai').assert;
 const Promise = require('bluebird');
 const { Provider } = require('nconf');
 const nconf = new Provider();
-const rpc = require('jrpc2');
+const { Client, JSONSerializer, TCPTransport } = require('multi-rpc');
 const getPort = require('get-port');
 const temp = require('temp');
 const fs = require('fs');
@@ -25,22 +25,19 @@ describe('ControlServer - RPC Interface', function () {
 	before('setup control server', async function () {
 		rpcControlPort = await getPort();
 		await rpcControlServer.listen(rpcControlPort);
-		rpcClient = new rpc.Client(new rpc.tcpTransport({ port: rpcControlPort, hostname: 'localhost' }));
-		Promise.promisifyAll(rpcClient);
+		rpcClient = new Client(new TCPTransport(new JSONSerializer(), rpcControlPort));
 	});
 
 	describe('#createInstances(number_of_instances)', function () {
 		this.timeout(WAIT_FOR_CREATE*2);
 		it('should create an instance', async function () {
-			await rpcClient.invokeAsync('createInstances', [{ Name: 'instance-1', Group: "foo" }]);		
+			await rpcClient.invoke('createInstances', [{ Name: 'instance-1', Group: "foo" }]);		
 		});
 	});
 
 	describe('#queryInstanceNames()', function () {
 		it("should have an instance named \"instance-1\"", async function () {
-			let raw = await rpcClient.invokeAsync('queryInstanceNames', [ ]);
-
-			let instances = JSON.parse(raw).result;
+			let instances = await rpcClient.invoke('queryInstanceNames', [ ]);
 
 			assert.deepEqual(instances, [ 'instance-1' ]);
 		});
@@ -48,9 +45,7 @@ describe('ControlServer - RPC Interface', function () {
 
 	describe('#queryGroupNames()', function () {
 		it("should have a group named \"foo\"", async function () {
-			let raw = await rpcClient.invokeAsync('queryGroupNames', [ ]);
-
-			let groups = JSON.parse(raw).result;
+			let groups = await rpcClient.invoke('queryGroupNames', [ ]);
 
 			assert.deepEqual(groups, [ 'foo' ]);
 		});
@@ -58,9 +53,7 @@ describe('ControlServer - RPC Interface', function () {
 
 	describe('#queryInstancesByGroup()', function () {
 		it("should return an instance named \"instance-1\"", async function () {
-			let raw = await rpcClient.invokeAsync('queryInstancesByGroup', [ 'foo' ]);
-
-			let instances = JSON.parse(raw).result;
+			let instances = await rpcClient.invoke('queryInstancesByGroup', [ 'foo' ]);
 
 			assert.equal(instances.length, 1);
 			assert.ok(instances[0]);
@@ -71,9 +64,7 @@ describe('ControlServer - RPC Interface', function () {
 	describe('#queryInstances()', function () {
 		this.timeout(3000);
 		it('should return a list of instances', async function () {
-			let raw = await rpcClient.invokeAsync('queryInstances', []);
-
-			let instances = JSON.parse(raw).result;
+			let instances = await rpcClient.invoke('queryInstances', []);
 
 			assert.isArray(instances, 'Did not return an array');
 			assert.isNotEmpty(instances, 'Returned an empty array');
@@ -88,7 +79,7 @@ describe('ControlServer - RPC Interface', function () {
 				Name: 'instance-2',
 				Group: 'bar'
 			};
-			await rpcClient.invokeAsync('addInstances', [ def ]);
+			await rpcClient.invoke('addInstances', [ def ]);
 		});
 
 		it("tor pool should now contain and instance that has the same name as the name specified in the defintion", function () {
@@ -99,9 +90,7 @@ describe('ControlServer - RPC Interface', function () {
 	describe('#queryInstanceByName(instance_name)', function () {
 		this.timeout(3000);
 		it('should return a single instance by name', async function () {
-			let raw = await rpcClient.invokeAsync('queryInstanceByName', ['instance-1']);
-			
-			let instance = JSON.parse(raw).result;
+			let instance = await rpcClient.invoke('queryInstanceByName', ['instance-1']);
 			
 			assert.isOk(instance);
 		});
@@ -110,9 +99,7 @@ describe('ControlServer - RPC Interface', function () {
 	describe('#queryInstanceAt(index)', function () {
 		this.timeout(3000);
 		it('should return a single instance by index', async function () {
-			let raw = await rpcClient.invokeAsync('queryInstanceAt', [0]);
-			
-			let instance = JSON.parse(raw).result;
+			let instance = await rpcClient.invoke('queryInstanceAt', [0]);
 			
 			assert.isOk(instance);
 		});
@@ -120,7 +107,7 @@ describe('ControlServer - RPC Interface', function () {
 
 	describe('#addInstanceToGroupByName()', function () {
 		it(`should add "instance-1" to baz`, async function () {
-			await rpcClient.invokeAsync('addInstanceToGroupByName', [ 'baz', "instance-1" ]);
+			await rpcClient.invoke('addInstanceToGroupByName', [ 'baz', "instance-1" ]);
 		});
 
 		it('"instance-1" should be added to "baz"', function () {
@@ -134,7 +121,7 @@ describe('ControlServer - RPC Interface', function () {
 
 	describe('#addInstanceToGroupAt()', function () {
 		it(`should add "instance-1" to baz`, async function () {
-			await rpcClient.invokeAsync('addInstanceToGroupAt', [ 'baz', 0 ]);
+			await rpcClient.invoke('addInstanceToGroupAt', [ 'baz', 0 ]);
 		});
 
 		it('"instance-1" should be added to "baz"', function () {
@@ -152,7 +139,7 @@ describe('ControlServer - RPC Interface', function () {
 		});
 
 		it(`should remove "instance-1" from baz`, async function () {
-			await rpcClient.invokeAsync('removeInstanceFromGroupByName', [ 'baz', "instance-1" ]);
+			await rpcClient.invoke('removeInstanceFromGroupByName', [ 'baz', "instance-1" ]);
 		});
 
 		it('"instance-1" should be remove from to "baz"', function () {
@@ -166,7 +153,7 @@ describe('ControlServer - RPC Interface', function () {
 		});
 
 		it(`should remove "instance-1" from baz`, async function () {
-			await rpcClient.invokeAsync('removeInstanceFromGroupAt', [ 'baz', 0 ]);
+			await rpcClient.invoke('removeInstanceFromGroupAt', [ 'baz', 0 ]);
 		});
 
 		it('"instance-1" should be remove from to "baz"', function () {
@@ -177,35 +164,35 @@ describe('ControlServer - RPC Interface', function () {
 	describe('#newIdentites()', function () {
 		this.timeout(3000);
 		it('should request new identities for all instances', async function () {
-			await rpcClient.invokeAsync('newIdentites', []);		
+			await rpcClient.invoke('newIdentites', []);		
 		});
 	});
 
 	describe('#newIdentityByName(instance_name)', function () {
 		this.timeout(3000);
 		it('should request new identities for all instances', async function () {
-			await rpcClient.invokeAsync('newIdentityByName', ['instance-1']);		
+			await rpcClient.invoke('newIdentityByName', ['instance-1']);		
 		});
 	});
 
 	describe('#newIdentityAt(index)', function () {
 		this.timeout(3000);
 		it('should request new identities for all instances', async function () {
-			await rpcClient.invokeAsync('newIdentityAt', [0]);		
+			await rpcClient.invoke('newIdentityAt', [0]);		
 		});
 	});
 
 
 	describe('#newIdentitiesByGroup()', function () {
 		it(`should get new identites for all instances in group`, async function () {
-			await rpcClient.invokeAsync('newIdentitiesByGroup', [ 'foo' ]);
+			await rpcClient.invoke('newIdentitiesByGroup', [ 'foo' ]);
 		});
 	});
 
 	describe("#setTorConfig(config_object)", function () {
 		this.timeout(3000);
 		it('should set several config variables on all instances', async function () {
-			await rpcClient.invokeAsync('setTorConfig', [ { TestSocks: 1, ProtocolWarnings: 1 } ]);
+			await rpcClient.invoke('setTorConfig', [ { TestSocks: 1, ProtocolWarnings: 1 } ]);
 		});
 
 		it('all instances should have the modified variables', async function() {
@@ -227,7 +214,7 @@ describe('ControlServer - RPC Interface', function () {
 	describe('#setConfig(key, value)', function () {
 		it('should set the default config of new instances', async function () {
 			this.timeout(3000);
-			await rpcClient.invokeAsync('setConfig', [ 'foo', 'bar' ]);
+			await rpcClient.invoke('setConfig', [ 'foo', 'bar' ]);
 		});
 
 		it('a new instance should be created with the modified property', function () {
@@ -241,7 +228,7 @@ describe('ControlServer - RPC Interface', function () {
 
 	describe('#setTorConfigByGroup()', function () {
 		it(`should set the config value on all instances`, async function () {
-			await rpcClient.invokeAsync('setTorConfigByGroup', [ 'foo', { 'ProtocolWarnings': 1 } ]);
+			await rpcClient.invoke('setTorConfigByGroup', [ 'foo', { 'ProtocolWarnings': 1 } ]);
 		});
 
 		it('all instances should have the config value set', async function () {
@@ -262,8 +249,7 @@ describe('ControlServer - RPC Interface', function () {
 
 		it('should return the property that was set', async function () {
 			this.timeout(6000);
-			let raw = await rpcClient.invokeAsync('getConfig', [ 'foo' ]);
-			let value = JSON.parse(raw).result;
+			let value = await rpcClient.invoke('getConfig', [ 'foo' ]);
 
 			assert.equal(value, 'bar');
 		});
@@ -285,7 +271,7 @@ describe('ControlServer - RPC Interface', function () {
 
 		it('should save the config to the the temp file', async function () {
 			this.timeout(6000);
-			await rpcClient.invokeAsync('saveConfig', []);
+			await rpcClient.invoke('saveConfig', []);
 		});
 
 		it('the temp file should contain the property', async function () {
@@ -318,7 +304,7 @@ describe('ControlServer - RPC Interface', function () {
 
 		it('should load the config from the the temp file', async function () {
 			this.timeout(6000);
-			await rpcClient.invokeAsync('loadConfig', []);
+			await rpcClient.invoke('loadConfig', []);
 		});
 
 		it("the application's config should contain the property", async function () {
@@ -341,8 +327,7 @@ describe('ControlServer - RPC Interface', function () {
 		});
 
 		it('should return the current load balance method', async function () {
-			let raw = await rpcClient.invokeAsync('getLoadBalanceMethod', []);
-			let lb_method = JSON.parse(raw).result;
+			let lb_method = await rpcClient.invoke('getLoadBalanceMethod', []);
 			assert.equal(lb_method, 'round_robin');
 		});
 	});
@@ -351,7 +336,7 @@ describe('ControlServer - RPC Interface', function () {
 		this.timeout(3000);
 
 		it('should set the load balance method', async function () {
-			await rpcClient.invokeAsync('setLoadBalanceMethod', ['weighted']);
+			await rpcClient.invoke('setLoadBalanceMethod', ['weighted']);
 		});
 
 		it('the load balance method should be changed', function () {
@@ -371,8 +356,7 @@ describe('ControlServer - RPC Interface', function () {
 		});
 
 		it('should retrieve the property from the tor instance', async function () {
-			let raw = await rpcClient.invokeAsync('getInstanceConfigByName', ['instance-1', "TestSocks"]);		
-			let values = JSON.parse(raw).result;
+			let values = await rpcClient.invoke('getInstanceConfigByName', ['instance-1', "TestSocks"]);
 
 			assert.isNotEmpty(values);
 			assert.equal(values[0], "1");
@@ -391,9 +375,8 @@ describe('ControlServer - RPC Interface', function () {
 		});
 
 		it('should retrieve the property from the tor instance', async function () {
-			let raw = await rpcClient.invokeAsync('getInstanceConfigAt', [0, "TestSocks"]);
-			let values = JSON.parse(raw).result;
-
+			let values = await rpcClient.invoke('getInstanceConfigAt', [0, "TestSocks"]);
+			
 			assert.isNotEmpty(values);
 			assert.equal(values[0], "1");
 		});
@@ -411,7 +394,7 @@ describe('ControlServer - RPC Interface', function () {
 		});
 
 		it('should set the property for the tor instance', async function () {
-			await rpcClient.invokeAsync('setInstanceConfigByName', ['instance-1', 'TestSocks', 1]);			
+			await rpcClient.invoke('setInstanceConfigByName', ['instance-1', 'TestSocks', 1]);			
 		});
 
 		it('tor instance should have the modified property', async function () {
@@ -432,7 +415,7 @@ describe('ControlServer - RPC Interface', function () {
 		});
 
 		it('should set the property for the tor instance', async function () {
-			await rpcClient.invokeAsync('setInstanceConfigAt', [0, 'TestSocks', 1]);			
+			await rpcClient.invoke('setInstanceConfigAt', [0, 'TestSocks', 1]);			
 		});
 
 		it('tor instance should have the modified property', async function () {
@@ -448,27 +431,27 @@ describe('ControlServer - RPC Interface', function () {
 	describe('#signalAllInstances(signal)', function () {
 		this.timeout(3000);
 		it('should signal to all interfaces', async function () {
-			await rpcClient.invokeAsync('signalAllInstances', [ 'DEBUG' ]);
+			await rpcClient.invoke('signalAllInstances', [ 'DEBUG' ]);
 		});
 	});
 
 	describe('#signalInstanceAt(signal)', function () {
 		this.timeout(3000);
 		it('should signal to all interfaces', async function () {
-			await rpcClient.invokeAsync('signalInstanceAt', [ 0, 'DEBUG' ]);
+			await rpcClient.invoke('signalInstanceAt', [ 0, 'DEBUG' ]);
 		});
 	});
 
 	describe('#signalAllInstances(signal)', function () {
 		this.timeout(3000);
 		it('should signal to all interfaces', async function () {
-			await rpcClient.invokeAsync('signalInstanceByName', [ 'instance-1', 'DEBUG' ]);
+			await rpcClient.invoke('signalInstanceByName', [ 'instance-1', 'DEBUG' ]);
 		});
 	});
 
 	describe('#signalInstancesByGroup()', function () {
 		it(`should get new identites for all instances in group`, async function () {
-			await rpcClient.invokeAsync('signalInstancesByGroup', [ 'foo', 'DEBUG' ]);
+			await rpcClient.invoke('signalInstancesByGroup', [ 'foo', 'DEBUG' ]);
 		});
 	});
 
@@ -477,7 +460,7 @@ describe('ControlServer - RPC Interface', function () {
 		let instance_name;
 		it('should rotate the 0th item in the instances array', async function () {
 			instance_name = rpcControlServer.tor_pool.instances[0].instance_name;
-			await rpcClient.invokeAsync('nextInstance', []);					
+			await rpcClient.invoke('nextInstance', []);					
 		});
 
 		it('0th item in the instances array should be different after nextInstance is called', function () {
@@ -493,7 +476,7 @@ describe('ControlServer - RPC Interface', function () {
 		it('should rotate the instances in group "foo"', async function () {
 			this.timeout(5000);
 			let first_instance_name_before = rpcControlServer.tor_pool.groups['foo'][0].instance_name;
-			await rpcClient.invokeAsync('nextInstanceByGroup', [ 'foo' ]);		
+			await rpcClient.invoke('nextInstanceByGroup', [ 'foo' ]);		
 			let first_instance_name_after = rpcControlServer.tor_pool.groups['foo'][0].instance_name;
 			
 			assert.notEqual(first_instance_name_after, first_instance_name_before);
@@ -509,7 +492,7 @@ describe('ControlServer - RPC Interface', function () {
 		this.timeout(10000);
 		it("should remove an instance at the position specified", async function () {
 			instance_num1 = rpcControlServer.tor_pool.instances.length;
-			await rpcClient.invokeAsync('removeInstanceAt', [0]);
+			await rpcClient.invoke('removeInstanceAt', [0]);
 		});
 
 		it('the tor pool should contain one instance fewer', function () {
@@ -521,7 +504,7 @@ describe('ControlServer - RPC Interface', function () {
 		this.timeout(10000);
 		it("should remove an instance at the position specified", async function () {
 			instance_num2 = rpcControlServer.tor_pool.instances.length;
-			await rpcClient.invokeAsync('removeInstanceByName', [ "instance-1" ]);
+			await rpcClient.invoke('removeInstanceByName', [ "instance-1" ]);
 		});
 
 		it('the tor pool should contain one instance fewer', function () {
@@ -533,7 +516,7 @@ describe('ControlServer - RPC Interface', function () {
 		this.timeout(10000);
 		it('should shutdown all instances', async function () {
 			instance_num = rpcControlServer.tor_pool.instances.length;
-			await rpcClient.invokeAsync('closeInstances', [ ]);	
+			await rpcClient.invoke('closeInstances', [ ]);	
 		});
 
 		it('no instances should be present in the pool', function () {