Switches the granax package to the new package location

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [4.0.13] - 2019-11-21
+### 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).

docs/TorProcess.js.html

@@ -56,7 +56,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);

docs/default_config.js.html

@@ -64,7 +64,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,

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "tor-router",
-  "version": "4.0.11",
+  "version": "4.0.12",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -10,6 +10,61 @@
       "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",
@@ -942,19 +997,6 @@
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
       "dev": true
     },
-    "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"
-      }
-    },
     "growl": {
       "version": "1.10.5",
       "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
@@ -1508,17 +1550,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",
@@ -1650,11 +1681,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",
@@ -1872,6 +1898,38 @@
         "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",
@@ -1997,8 +2055,7 @@
     "ncp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
-      "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
+      "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M="
-      "optional": true
     },
     "nice-try": {
       "version": "1.0.5",
@@ -2241,6 +2298,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",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tor-router",
-  "version": "4.0.12",
+  "version": "4.0.13",
   "main": "src/index.js",
   "repository": "git@github.com:znetstar/tor-router.git",
   "author": "Zachary Boyd <zachary@zacharyboyd.nyc>",
@@ -31,11 +31,11 @@
     "socks-proxy-agent": "^4.0.1"
   },
   "dependencies": {
+    "@deadcanaries/granax": "^3.2.4",
     "bluebird": "^3.5.2",
     "del": "^3.0.0",
     "eventemitter3": "^3.1.0",
     "get-port": "^2.1.0",
-    "granax": "^3.1.4",
     "js-weighted-list": "^0.1.1",
     "lodash": "^4.17.4",
     "multi-rpc": "^1.5.5",

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);

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,