diff --git a/package-lock.json b/package-lock.json index 4d871fe..746aa59 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "rats-search", - "version": "0.5.0", + "version": "0.6.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -63,7 +63,7 @@ "convert-source-map": "1.5.1", "debug": "3.1.0", "json5": "0.5.1", - "lodash": "4.17.4", + "lodash": "4.17.5", "micromatch": "2.3.11", "resolve": "1.5.0", "source-map": "0.5.7" @@ -88,7 +88,7 @@ "requires": { "@babel/types": "7.0.0-beta.38", "jsesc": "2.5.1", - "lodash": "4.17.4", + "lodash": "4.17.5", "source-map": "0.5.7", "trim-right": "1.0.1" } @@ -141,7 +141,7 @@ "requires": { "@babel/helper-function-name": "7.0.0-beta.38", "@babel/types": "7.0.0-beta.38", - "lodash": "4.17.4" + "lodash": "4.17.5" } }, "@babel/helper-explode-assignable-expression": { @@ -190,7 +190,7 @@ "dev": true, "requires": { "@babel/types": "7.0.0-beta.38", - "lodash": "4.17.4" + "lodash": "4.17.5" } }, "@babel/helper-module-transforms": { @@ -203,7 +203,7 @@ "@babel/helper-simple-access": "7.0.0-beta.38", "@babel/template": "7.0.0-beta.38", "@babel/types": "7.0.0-beta.38", - "lodash": "4.17.4" + "lodash": "4.17.5" } }, "@babel/helper-optimise-call-expression": { @@ -221,7 +221,7 @@ "integrity": "sha512-ovwkKMmLkZspr7ge5y8w7JQoO1MXPXcp8UaLxcmP5Akw0uAmISvd4vGFy4tpwtnsgPU1N7J5NyomTdMPqn78Aw==", "dev": true, "requires": { - "lodash": "4.17.4" + "lodash": "4.17.5" } }, "@babel/helper-remap-async-to-generator": { @@ -257,7 +257,7 @@ "requires": { "@babel/template": "7.0.0-beta.38", "@babel/types": "7.0.0-beta.38", - "lodash": "4.17.4" + "lodash": "4.17.5" } }, "@babel/helper-wrap-function": { @@ -573,7 +573,7 @@ "integrity": "sha512-GoYqWrbwEQty36dUzjbBoIBW+hymFrE8S7IifH6Lzess3a9z9ST1APNYk4XHrGYYyn7lOGOWe3SL8tPLWoo+OA==", "dev": true, "requires": { - "lodash": "4.17.4" + "lodash": "4.17.5" } }, "@babel/plugin-transform-classes": { @@ -920,7 +920,7 @@ "@babel/code-frame": "7.0.0-beta.38", "@babel/types": "7.0.0-beta.38", "babylon": "7.0.0-beta.38", - "lodash": "4.17.4" + "lodash": "4.17.5" } }, "@babel/traverse": { @@ -937,7 +937,7 @@ "debug": "3.1.0", "globals": "11.2.0", "invariant": "2.2.2", - "lodash": "4.17.4" + "lodash": "4.17.5" }, "dependencies": { "debug": { @@ -958,7 +958,7 @@ "dev": true, "requires": { "esutils": "2.0.2", - "lodash": "4.17.4", + "lodash": "4.17.5", "to-fast-properties": "2.0.0" } }, @@ -970,7 +970,7 @@ "requires": { "@semantic-release/error": "2.1.0", "fs-extra": "5.0.0", - "lodash": "4.17.4" + "lodash": "4.17.5" }, "dependencies": { "fs-extra": { @@ -1010,7 +1010,7 @@ "@semantic-release/error": "2.1.0", "debug": "3.1.0", "execa": "0.9.0", - "lodash": "4.17.4" + "lodash": "4.17.5" }, "dependencies": { "execa": { @@ -1041,7 +1041,7 @@ "dir-glob": "2.0.0", "execa": "0.9.0", "fs-extra": "5.0.0", - "lodash": "4.17.4", + "lodash": "4.17.5", "micromatch": "3.1.5", "p-reduce": "1.0.0" }, @@ -1289,6 +1289,144 @@ } } }, + "@semantic-release/npm": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@semantic-release/npm/-/npm-3.0.2.tgz", + "integrity": "sha512-lCYlQQFDWic+8ZP95G8j6NFqqdT+q3MB6J7EnK418yx01tgtIWgVQL4AOhmFoW14epEDOSvupQQOrrN/J4v5sw==", + "dev": true, + "requires": { + "@semantic-release/error": "2.1.0", + "execa": "0.9.0", + "fs-extra": "5.0.0", + "lodash": "4.17.5", + "nerf-dart": "1.0.0", + "normalize-url": "2.0.1", + "read-pkg": "3.0.0", + "registry-auth-token": "3.3.2" + }, + "dependencies": { + "execa": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.9.0.tgz", + "integrity": "sha512-BbUMBiX4hqiHZUA5+JujIjNb6TyAlp2D5KLheMjMluwOuzcnylDL4AxZYLLn1n2AGB49eSWwyKvvEQoRpnAtmA==", + "dev": true, + "requires": { + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + } + }, + "fs-extra": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz", + "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.1" + } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + }, + "load-json-file": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "4.0.0", + "pify": "3.0.0", + "strip-bom": "3.0.0" + } + }, + "normalize-url": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz", + "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", + "dev": true, + "requires": { + "prepend-http": "2.0.0", + "query-string": "5.1.0", + "sort-keys": "2.0.0" + } + }, + "parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "dev": true, + "requires": { + "error-ex": "1.3.1", + "json-parse-better-errors": "1.0.1" + } + }, + "path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "dev": true, + "requires": { + "pify": "3.0.0" + } + }, + "prepend-http": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", + "dev": true + }, + "query-string": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.0.tgz", + "integrity": "sha512-F3DkxxlY0AqD/rwe4YAwjRE2HjOkKW7TxsuteyrS/Jbwrxw887PqYBL4sWUJ9D/V1hmFns0SCD6FDyvlwo9RCQ==", + "dev": true, + "requires": { + "decode-uri-component": "0.2.0", + "object-assign": "4.1.1", + "strict-uri-encode": "1.1.0" + } + }, + "read-pkg": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", + "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", + "dev": true, + "requires": { + "load-json-file": "4.0.0", + "normalize-package-data": "2.4.0", + "path-type": "3.0.0" + } + }, + "sort-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz", + "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=", + "dev": true, + "requires": { + "is-plain-obj": "1.1.0" + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + } + } + }, "@types/node": { "version": "7.0.52", "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.52.tgz", @@ -1452,7 +1590,7 @@ "async": "2.6.0", "buffer-crc32": "0.2.13", "glob": "7.1.2", - "lodash": "4.17.4", + "lodash": "4.17.5", "readable-stream": "2.3.3", "tar-stream": "1.5.5", "zip-stream": "1.2.0" @@ -1499,7 +1637,7 @@ "glob": "7.1.2", "graceful-fs": "4.1.11", "lazystream": "1.0.0", - "lodash": "4.17.4", + "lodash": "4.17.5", "normalize-path": "2.1.1", "readable-stream": "2.3.3" }, @@ -1696,7 +1834,7 @@ "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", "dev": true, "requires": { - "lodash": "4.17.4" + "lodash": "4.17.5" } }, "async-each": { @@ -2032,9 +2170,9 @@ } }, "bittorrent-tracker": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.3.0.tgz", - "integrity": "sha512-yNW9UNQhGJgR93u60RG9jV+uDhsVtqGtYytXZQhj94w5UwbISSBJSmvHGrym4lnwe5H5ehThVqfDtqEDwfky4g==", + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.4.0.tgz", + "integrity": "sha512-crjYvkPtIJa+0DELC49AEAAgte+Z9a3DUxssW4he5xmsXltl3A6PnG4YnLcDYexdMM/RSqUSWhArFanU+XnyOw==", "requires": { "bencode": "1.0.0", "bittorrent-peerid": "1.2.0", @@ -2049,12 +2187,12 @@ "once": "1.4.0", "random-iterate": "1.0.1", "randombytes": "2.0.6", - "run-parallel": "1.1.6", + "run-parallel": "1.1.7", "run-series": "1.1.4", "safe-buffer": "5.1.1", "simple-get": "2.7.0", - "simple-peer": "8.3.0", - "simple-websocket": "6.0.0", + "simple-peer": "8.5.0", + "simple-websocket": "7.0.1", "string2compact": "1.2.2", "uniq": "1.0.1", "unordered-array-remove": "1.0.2", @@ -3339,7 +3477,7 @@ "once": "1.4.0", "piece-length": "1.0.0", "readable-stream": "2.3.4", - "run-parallel": "1.1.6", + "run-parallel": "1.1.7", "simple-sha1": "2.1.0", "xtend": "4.0.1" }, @@ -4875,7 +5013,7 @@ "random-access-file": "1.8.1", "randombytes": "2.0.6", "rimraf": "2.6.2", - "run-parallel": "1.1.6", + "run-parallel": "1.1.7", "thunky": "1.0.2" } }, @@ -5972,7 +6110,7 @@ "dev": true, "requires": { "glob": "7.1.2", - "lodash": "4.17.4", + "lodash": "4.17.5", "minimatch": "3.0.4" } }, @@ -6343,7 +6481,7 @@ "cli-width": "2.2.0", "external-editor": "2.1.0", "figures": "2.0.0", - "lodash": "4.17.4", + "lodash": "4.17.5", "mute-stream": "0.0.7", "run-async": "2.3.0", "rx-lite": "4.0.8", @@ -6846,6 +6984,12 @@ "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==", "dev": true }, + "json-parse-better-errors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz", + "integrity": "sha512-xyQpxeWWMKyJps9CuGJYeng6ssI5bpqS9ltQpdVQ90t4ql6NdnxFKh95JcRt2cun/DjMVNrdjniLPuMA69xmCw==", + "dev": true + }, "json-schema": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", @@ -6858,6 +7002,11 @@ "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", "dev": true }, + "json-socket": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/json-socket/-/json-socket-0.3.0.tgz", + "integrity": "sha512-jc8ZbUnYIWdxERFWQKVgwSLkGSe+kyzvmYxwNaRgx/c8NNyuHes4UHnPM3LUrAFXUx1BhNJ94n1h/KCRlbvV0g==" + }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", @@ -7082,10 +7231,9 @@ } }, "lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", - "dev": true + "version": "4.17.5", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", + "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" }, "lodash.camelcase": { "version": "4.3.0", @@ -7744,6 +7892,12 @@ } } }, + "nerf-dart": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/nerf-dart/-/nerf-dart-1.0.0.tgz", + "integrity": "sha1-5tq3/r9a2Bbqgc9cYpxaDr3nLBo=", + "dev": true + }, "netmask": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz", @@ -9855,9 +10009,9 @@ } }, "run-parallel": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.6.tgz", - "integrity": "sha1-KQA8miFj4B4tLfyQV18sbB1hoDk=" + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.7.tgz", + "integrity": "sha512-nB641a6enJOh0fdsFHR9SiVCiOlAyjMplImDdjV3kWCzJZw9rwzvGwmpGuPmfX//Yxblh0pkzPcFcxA81iwmxA==" }, "run-parallel-limit": { "version": "1.0.3", @@ -10019,9 +10173,9 @@ } }, "simple-peer": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/simple-peer/-/simple-peer-8.3.0.tgz", - "integrity": "sha512-GSSUXMFzKtAHu/PuNb0UWnwVKHTPGhq8EM78Saf25jG4k/aA3PJOvwlVSS/rchZJSrGxSUiH2qyJD2PgTqi4Qw==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/simple-peer/-/simple-peer-8.5.0.tgz", + "integrity": "sha512-L901ld7sqQv7c8ehThEZGIDqgBrTC1iJLlcqFlqtH3YhUb+S8uBjdQpzaJGth+NkSoWNJSsXjNyWbzaM99cMQg==", "requires": { "debug": "3.1.0", "get-browser-rtc": "1.0.2", @@ -10073,9 +10227,9 @@ } }, "simple-websocket": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/simple-websocket/-/simple-websocket-6.0.0.tgz", - "integrity": "sha512-lXEIUwJmT+DKBGB/fjr8GEh8u1g1UD4qM3J3Q//WegmXGLx9OkQJxpunDB61fV4VBed4iNYTfBBtgw/nXKMJ+w==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/simple-websocket/-/simple-websocket-7.0.1.tgz", + "integrity": "sha512-gnjsv2e5dUnhESIBdGBOZ0JS80MUFF15opL8uT2T1nPrHG9Q0w3p6hTK5gaishJ3mk9hu0DxKkoo4lOud3SOmg==", "requires": { "debug": "3.1.0", "inherits": "2.0.3", @@ -11080,10 +11234,10 @@ "integrity": "sha1-e0+jOQwqlau4e0sDJDazCArWrdY=", "requires": { "bittorrent-dht": "7.10.0", - "bittorrent-tracker": "9.3.0", + "bittorrent-tracker": "9.4.0", "debug": "2.6.9", "inherits": "2.0.3", - "run-parallel": "1.1.6", + "run-parallel": "1.1.7", "xtend": "4.0.1" }, "dependencies": { @@ -12064,7 +12218,7 @@ "integrity": "sha512-geQsZ86YkXOVOjvPC5yv3JSNnL6/X3Kzh935AQ/gJNEYXEfJDQFu/sdFuktS9OW2JcH/SJec8TGfRdrpHshH7A==", "dev": true, "requires": { - "lodash": "4.17.4" + "lodash": "4.17.5" } }, "webpack-node-externals": { @@ -12117,12 +12271,12 @@ "range-parser": "1.2.0", "readable-stream": "2.3.4", "render-media": "2.10.0", - "run-parallel": "1.1.6", + "run-parallel": "1.1.7", "run-parallel-limit": "1.0.3", "safe-buffer": "5.1.1", "simple-concat": "1.0.0", "simple-get": "2.7.0", - "simple-peer": "8.3.0", + "simple-peer": "8.5.0", "simple-sha1": "2.1.0", "speedometer": "1.0.0", "stream-to-blob": "1.0.0", @@ -12454,7 +12608,7 @@ "requires": { "archiver-utils": "1.3.0", "compress-commons": "1.2.2", - "lodash": "4.17.4", + "lodash": "4.17.5", "readable-stream": "2.3.3" }, "dependencies": { diff --git a/src/app/admin-page.js b/src/app/admin-page.js index 05439b1..94a3e9e 100644 --- a/src/app/admin-page.js +++ b/src/app/admin-page.js @@ -50,10 +50,19 @@ export default class AdminPage extends Page { style={{marginTop: '10px'}} label="Enabled network scanning" toggled={this.options.indexer} - thumbSwitchedStyle={{backgroundColor: 'red'}} - trackSwitchedStyle={{backgroundColor: '#ff9d9d'}} onToggle={(e, checked) => { - this.options.indexer = checked + this.options.indexer = checked + if(!this.options.indexer) + this.options.p2p = false + this.forceUpdate() + }} + /> + { + this.options.p2p = this.options.indexer && checked this.forceUpdate() }} /> diff --git a/src/background/config.js b/src/background/config.js index 127361b..3cbb871 100644 --- a/src/background/config.js +++ b/src/background/config.js @@ -9,6 +9,7 @@ let config = { spiderPort: 4445, udpTrackersPort: 4446, udpTrackersTimeout: 3 * 60 * 1000, + p2p: true, sitemapMaxSize: 25000,