From bdd9ba890e88595af3c154a85d78d810ee4317de Mon Sep 17 00:00:00 2001 From: captainyarr Date: Tue, 29 Oct 2019 22:38:00 -0700 Subject: [PATCH 01/77] Updated npm package update --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 59c0a4ee..f3f58bad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,7 +27,8 @@ jobs: - v1-nodecache-{{ checksum "gulpfile.js" }} # fallback to using the latest cache if no exact match is found - v1-dependencies- - + + - run: npm prune - run: npm install - run: sudo npm install -g gulp From 67bbec6c878f7168ed0a16fe3e8b4950253c9507 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Tue, 29 Oct 2019 22:42:13 -0700 Subject: [PATCH 02/77] CircleCi: Update node.js to 13.0.1 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f3f58bad..d32a7842 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: build: docker: # specify the version you desire here - - image: circleci/node:10.14.2 + - image: circleci/node:13.0.1 # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images From d54585e8b7e84bc3396ee54057dcdad1a6455158 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Tue, 29 Oct 2019 23:28:05 -0700 Subject: [PATCH 03/77] circleci: update cache --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index d32a7842..f0942221 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,6 +27,7 @@ jobs: - v1-nodecache-{{ checksum "gulpfile.js" }} # fallback to using the latest cache if no exact match is found - v1-dependencies- + - v1-nodecache- - run: npm prune - run: npm install From 4c430edce6b04bb32f21ef2e541004ec0d9bdda9 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Fri, 1 Nov 2019 14:04:16 -0700 Subject: [PATCH 04/77] circleci: updated cache settings --- .circleci/config.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f0942221..07514cdb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,10 +23,15 @@ jobs: # Download and cache dependencies - restore_cache: keys: - - v1-dependencies-{{ checksum "package.json" }} - - v1-nodecache-{{ checksum "gulpfile.js" }} + - v1-dependencies-{{ checksum "package-lock.json" }} # fallback to using the latest cache if no exact match is found - v1-dependencies- + + # Download and cache node-cache + - restore_cache: + keys: + - v1-nodecache-{{ checksum "gulpfile.js" }} + # fallback to using the latest cache if no exact match is found - v1-nodecache- - run: npm prune @@ -42,15 +47,16 @@ jobs: #store cache dependencies - save_cache: + key: v1-dependencies-{{ checksum "package-lock.json" }} paths: - node_modules - key: v1-dependencies-{{ checksum "package.json" }} - + + #store node cache - save_cache: + key: v1-nodecache-{{ checksum "gulpfile.js" }} paths: - cache - key: v1-nodecache-{{ checksum "gulpfile.js" }} - + - store_artifacts: path: ~/repo/dist From 92471f26bad01e371808f95c8e935158516ad1b2 Mon Sep 17 00:00:00 2001 From: CaptainYarr24 Date: Fri, 1 Nov 2019 14:27:22 -0700 Subject: [PATCH 05/77] circleci: remove gulp global install test (#99) --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 07514cdb..f24251f0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,14 +36,14 @@ jobs: - run: npm prune - run: npm install - - run: sudo npm install -g gulp + #- run: sudo npm install -g gulp # run tests! #- run: gulp build linux32,linux64,win32,win64,osx64 - - run: gulp build -p linux32,linux64,win32,win64 + - run: npx gulp build -p linux32,linux64,win32,win64 - deploy: - command: gulp zip -p linux32,linux64,win32,win64 + command: npx gulp zip -p linux32,linux64,win32,win64 #store cache dependencies - save_cache: From ae4919a264193e016df0844fd020bb9d574cd6e3 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sun, 3 Nov 2019 21:31:57 -0800 Subject: [PATCH 06/77] Update: Updated to new develop version --- CHANGELOG.md | 2 +- install | 2 +- package-lock.json | 385 +++++++++++++++++++++++++++++++++++----------- package.json | 8 +- 4 files changed, 305 insertions(+), 92 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c43f79d4..6d37cbeb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.4.1-17.1 Beta - Popcorn Treats - 24 October 2019 +## 0.4.1-18-develop Beta - Popcorn Treats - 24 October 2019 New Features: - Added more information to status screen: Active Users, and Total User, Time remaining diff --git a/install b/install index 14100e74..cb10da66 100755 --- a/install +++ b/install @@ -23,7 +23,7 @@ fi func_error #Variables -version="0.4.1-17.1" +version="0.4.1-18-develop" tos="https://popcorntime.sh/tos" $path="$HOME/.Popcorn-Time-CE" diff --git a/package-lock.json b/package-lock.json index 4630a401..aef6176c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Popcorn-Time-CE", - "version": "0.4.1-17.1", + "version": "0.4.1-18-develop", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -842,9 +842,9 @@ } }, "acorn-jsx": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz", - "integrity": "sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz", + "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==", "dev": true }, "acorn-walk": { @@ -2368,6 +2368,15 @@ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true }, + "camel-case": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", + "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", + "requires": { + "no-case": "^2.2.0", + "upper-case": "^1.1.1" + } + }, "camelcase": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", @@ -2443,6 +2452,31 @@ "supports-color": "^2.0.0" } }, + "change-case": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/change-case/-/change-case-3.1.0.tgz", + "integrity": "sha512-2AZp7uJZbYEzRPsFoa+ijKdvp9zsrnnt6+yFokfwEpeJm0xuJDVoxiRCAaTzyJND8GJkofo2IcKWaUZ/OECVzw==", + "requires": { + "camel-case": "^3.0.0", + "constant-case": "^2.0.0", + "dot-case": "^2.1.0", + "header-case": "^1.0.0", + "is-lower-case": "^1.1.0", + "is-upper-case": "^1.1.0", + "lower-case": "^1.1.1", + "lower-case-first": "^1.0.0", + "no-case": "^2.3.2", + "param-case": "^2.1.0", + "pascal-case": "^2.0.0", + "path-case": "^2.1.0", + "sentence-case": "^2.1.0", + "snake-case": "^2.1.0", + "swap-case": "^1.1.0", + "title-case": "^2.1.0", + "upper-case": "^1.1.1", + "upper-case-first": "^1.1.0" + } + }, "chardet": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz", @@ -2878,6 +2912,15 @@ "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true }, + "constant-case": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz", + "integrity": "sha1-QXV2TTidP6nI7NKRhu1gBSQ7akY=", + "requires": { + "snake-case": "^2.1.0", + "upper-case": "^1.1.1" + } + }, "consume-http-header": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/consume-http-header/-/consume-http-header-1.0.0.tgz", @@ -3433,6 +3476,14 @@ "domelementtype": "1" } }, + "dot-case": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-2.1.1.tgz", + "integrity": "sha1-NNzzf1Co6TwrO8qLt/uRVcfaO+4=", + "requires": { + "no-case": "^2.2.0" + } + }, "dot-prop": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", @@ -3442,6 +3493,11 @@ "is-obj": "^1.0.0" } }, + "dotenv": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", + "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==" + }, "duplexer2": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", @@ -3714,9 +3770,9 @@ } }, "eslint": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.5.1.tgz", - "integrity": "sha512-32h99BoLYStT1iq1v2P9uwpyznQ4M2jRiFB6acitKz52Gqn+vPaMDUTB1bYi1WN4Nquj2w+t+bimYUG83DC55A==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.6.0.tgz", + "integrity": "sha512-PpEBq7b6qY/qrOmpYQ/jTMDYfuQMELR4g4WI1M/NaSDDD/bdcMb+dj4Hgks7p41kW2caXsPsEZAEAyAgjVVC0g==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -3726,9 +3782,9 @@ "debug": "^4.0.1", "doctrine": "^3.0.0", "eslint-scope": "^5.0.0", - "eslint-utils": "^1.4.2", + "eslint-utils": "^1.4.3", "eslint-visitor-keys": "^1.1.0", - "espree": "^6.1.1", + "espree": "^6.1.2", "esquery": "^1.0.1", "esutils": "^2.0.2", "file-entry-cache": "^5.0.1", @@ -3738,7 +3794,7 @@ "ignore": "^4.0.6", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", - "inquirer": "^6.4.1", + "inquirer": "^7.0.0", "is-glob": "^4.0.0", "js-yaml": "^3.13.1", "json-stable-stringify-without-jsonify": "^1.0.1", @@ -3759,15 +3815,18 @@ }, "dependencies": { "ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", - "dev": true + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.2.1.tgz", + "integrity": "sha512-Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q==", + "dev": true, + "requires": { + "type-fest": "^0.5.2" + } }, "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", "dev": true }, "ansi-styles": { @@ -3796,6 +3855,15 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, + "cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "requires": { + "restore-cursor": "^3.1.0" + } + }, "cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", @@ -3826,6 +3894,12 @@ "ms": "^2.1.1" } }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, "external-editor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", @@ -3837,6 +3911,15 @@ "tmp": "^0.0.33" } }, + "figures": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz", + "integrity": "sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.5" + } + }, "glob-parent": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", @@ -3862,30 +3945,30 @@ "dev": true }, "inquirer": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz", - "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.0.tgz", + "integrity": "sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==", "dev": true, "requires": { - "ansi-escapes": "^3.2.0", + "ansi-escapes": "^4.2.1", "chalk": "^2.4.2", - "cli-cursor": "^2.1.0", + "cli-cursor": "^3.1.0", "cli-width": "^2.0.0", "external-editor": "^3.0.3", - "figures": "^2.0.0", - "lodash": "^4.17.12", - "mute-stream": "0.0.7", + "figures": "^3.0.0", + "lodash": "^4.17.15", + "mute-stream": "0.0.8", "run-async": "^2.2.0", "rxjs": "^6.4.0", - "string-width": "^2.1.0", + "string-width": "^4.1.0", "strip-ansi": "^5.1.0", "through": "^2.3.6" } }, "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, "lodash": { @@ -3894,12 +3977,43 @@ "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", "dev": true }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "dev": true + }, + "onetime": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", + "dev": true, + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "requires": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + } + }, "rxjs": { "version": "6.5.3", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz", @@ -3910,24 +4024,14 @@ } }, "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.1.0.tgz", + "integrity": "sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "dependencies": { - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^5.2.0" } }, "strip-ansi": { @@ -3937,14 +4041,6 @@ "dev": true, "requires": { "ansi-regex": "^4.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - } } }, "strip-json-comments": { @@ -3981,12 +4077,12 @@ } }, "eslint-utils": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz", - "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", + "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", "dev": true, "requires": { - "eslint-visitor-keys": "^1.0.0" + "eslint-visitor-keys": "^1.1.0" } }, "eslint-visitor-keys": { @@ -3996,13 +4092,13 @@ "dev": true }, "espree": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.1.tgz", - "integrity": "sha512-EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz", + "integrity": "sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==", "dev": true, "requires": { - "acorn": "^7.0.0", - "acorn-jsx": "^5.0.2", + "acorn": "^7.1.0", + "acorn-jsx": "^5.1.0", "eslint-visitor-keys": "^1.1.0" }, "dependencies": { @@ -5391,16 +5487,17 @@ } }, "gitlab": { - "version": "11.3.2", - "resolved": "https://registry.npmjs.org/gitlab/-/gitlab-11.3.2.tgz", - "integrity": "sha512-GJKj2SgYTNA2M3i21RcBUXw3ItRMn+MPwcmJZu+Yz3AYCEYdr0KOL+2kP37Jzyn4lqXdcPmAjsvQ6hk99uLmzg==", + "version": "11.4.2", + "resolved": "https://registry.npmjs.org/gitlab/-/gitlab-11.4.2.tgz", + "integrity": "sha512-YAwyaOuVHNaPO0R/AZrNs3olhimneqja0rJRNn1yIPen/GB6J/aLWGtepZgSghwTB9pn+1Pdk/djz4RQQMPnew==", "requires": { + "change-case": "^3.1.0", + "dotenv": "^8.2.0", "form-data": "^2.5.1", "ky": "^0.15.0", "ky-universal": "^0.3.0", "li": "^1.3.0", "query-string": "^6.8.3", - "universal-url": "^2.0.0", "xcase": "^2.0.1", "yargs": "^14.2.0" }, @@ -6100,11 +6197,6 @@ } } }, - "hasurl": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hasurl/-/hasurl-1.0.0.tgz", - "integrity": "sha512-43ypUd3DbwyCT01UYpA99AEZxZ4aKtRxWGBHEIbjcOsUghd9YUON0C+JF6isNjaiwC/UF5neaUudy6JS9jZPZQ==" - }, "hat": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/hat/-/hat-0.0.3.tgz", @@ -6121,6 +6213,15 @@ "sntp": "0.1.x" } }, + "header-case": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/header-case/-/header-case-1.0.1.tgz", + "integrity": "sha1-lTWXMZfBRLCWE81l0xfvGZY70C0=", + "requires": { + "no-case": "^2.2.0", + "upper-case": "^1.1.3" + } + }, "hoek": { "version": "0.7.6", "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz", @@ -6660,6 +6761,14 @@ "is-path-inside": "^1.0.0" } }, + "is-lower-case": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz", + "integrity": "sha1-fhR75HaNxGbbO/shzGCzHmrWk5M=", + "requires": { + "lower-case": "^1.1.0" + } + }, "is-negated-glob": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", @@ -6790,6 +6899,14 @@ "unc-path-regex": "^0.1.2" } }, + "is-upper-case": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz", + "integrity": "sha1-jQsfp+eTOh5YSDYA7H2WYcuvdW8=", + "requires": { + "upper-case": "^1.1.0" + } + }, "is-utf8": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", @@ -8785,7 +8902,8 @@ "lodash.sortby": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=" + "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", + "dev": true }, "lodash.template": { "version": "3.6.2", @@ -8844,6 +8962,19 @@ "signal-exit": "^3.0.0" } }, + "lower-case": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", + "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=" + }, + "lower-case-first": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/lower-case-first/-/lower-case-first-1.0.2.tgz", + "integrity": "sha1-5dp8JvKacHO+AtUrrJmA5ZIq36E=", + "requires": { + "lower-case": "^1.1.2" + } + }, "lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", @@ -9497,6 +9628,14 @@ "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" }, + "no-case": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", + "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", + "requires": { + "lower-case": "^1.1.1" + } + }, "node-captions": { "version": "0.4.6", "resolved": "https://registry.npmjs.org/node-captions/-/node-captions-0.4.6.tgz", @@ -10300,6 +10439,14 @@ "browserify-package-json": "^1.0.0" } }, + "param-case": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", + "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", + "requires": { + "no-case": "^2.2.0" + } + }, "parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -10386,12 +10533,29 @@ "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==", "dev": true }, + "pascal-case": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-2.0.1.tgz", + "integrity": "sha1-LVeNNFX2YNpl7KGO+VtODekSdh4=", + "requires": { + "camel-case": "^3.0.0", + "upper-case-first": "^1.1.0" + } + }, "pascalcase": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", "dev": true }, + "path-case": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/path-case/-/path-case-2.1.1.tgz", + "integrity": "sha1-lLgDfDctP+KQbkZbtF4l0ibo7qU=", + "requires": { + "no-case": "^2.2.0" + } + }, "path-dirname": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", @@ -11764,6 +11928,15 @@ } } }, + "sentence-case": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.1.tgz", + "integrity": "sha1-H24t2jnBaL+S0T+G1KkYkz9mftQ=", + "requires": { + "no-case": "^2.2.0", + "upper-case-first": "^1.1.2" + } + }, "server-destroy": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz", @@ -11973,6 +12146,14 @@ } } }, + "snake-case": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-2.1.0.tgz", + "integrity": "sha1-Qb2xtz8w7GagTU4srRt2OH1NbZ8=", + "requires": { + "no-case": "^2.2.0" + } + }, "snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", @@ -12528,6 +12709,15 @@ "es6-symbol": "^3.1.1" } }, + "swap-case": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz", + "integrity": "sha1-w5IDpFhzhfrTyFCgvRvK+ggZdOM=", + "requires": { + "lower-case": "^1.1.1", + "upper-case": "^1.1.1" + } + }, "symbol-observable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz", @@ -12648,9 +12838,9 @@ } }, "temp": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/temp/-/temp-0.9.0.tgz", - "integrity": "sha512-YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ==", + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/temp/-/temp-0.9.1.tgz", + "integrity": "sha512-WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA==", "requires": { "rimraf": "~2.6.2" }, @@ -12856,6 +13046,15 @@ "next-tick": "1" } }, + "title-case": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz", + "integrity": "sha1-PhJyFtpY0rxb7PE3q5Ha46fNj6o=", + "requires": { + "no-case": "^2.2.0", + "upper-case": "^1.0.3" + } + }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -13131,6 +13330,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", + "dev": true, "requires": { "punycode": "^2.1.0" }, @@ -13138,7 +13338,8 @@ "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true } } }, @@ -13183,6 +13384,12 @@ "prelude-ls": "~1.1.2" } }, + "type-fest": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz", + "integrity": "sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==", + "dev": true + }, "typechecker": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/typechecker/-/typechecker-2.1.0.tgz", @@ -13327,15 +13534,6 @@ "crypto-random-string": "^1.0.0" } }, - "universal-url": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universal-url/-/universal-url-2.0.0.tgz", - "integrity": "sha512-3DLtXdm/G1LQMCnPj+Aw7uDoleQttNHp2g5FnNQKR6cP6taNWS1b/Ehjjx4PVyvejKi3TJyu8iBraKM4q3JQPg==", - "requires": { - "hasurl": "^1.0.0", - "whatwg-url": "^7.0.0" - } - }, "unordered-array-remove": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unordered-array-remove/-/unordered-array-remove-1.0.2.tgz", @@ -13530,6 +13728,19 @@ } } }, + "upper-case": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", + "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=" + }, + "upper-case-first": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-1.1.2.tgz", + "integrity": "sha1-XXm+3P8UQZUY/S7bCgUHybaFkRU=", + "requires": { + "upper-case": "^1.1.1" + } + }, "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", @@ -13904,7 +14115,8 @@ "webidl-conversions": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", - "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==" + "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", + "dev": true }, "websocket-driver": { "version": "0.7.0", @@ -14185,6 +14397,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz", "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==", + "dev": true, "requires": { "lodash.sortby": "^4.7.0", "tr46": "^1.0.1", diff --git a/package.json b/package.json index 6284b926..658ddbac 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "license": "GPL-3.0", "main": "src/app/index.html", - "version": "0.4.1-17.1", + "version": "0.4.1-18-develop", "node-remote": "*://*", "releaseName": "Popcorn Treats", "scripts": { @@ -35,7 +35,7 @@ "ajv": "6.10.2", "async": "^3.0.1", "chromecast-js": "git+https://github.com/captainyarr/chromecast-js.git", - "gitlab": "^11.3.2", + "gitlab": "^11.4.2", "i18n": "0.8.3", "iconv-lite": "^0.5.0", "jschardet": "2.1.0", @@ -66,7 +66,7 @@ "send": "^0.17.1", "strike-api": "0.2.0", "tar": "^5.0.5", - "temp": "^0.9.0", + "temp": "^0.9.1", "torrent-tracker-health": "git+https://github.com/PTCE-Public/torrent-tracker-health.git", "underscore": "1.9.1", "upnp-mediarenderer-client": "^1.2.1", @@ -76,7 +76,7 @@ }, "devDependencies": { "del": "^5.1.0", - "eslint": "^6.5.1", + "eslint": "^6.6.0", "eslint-config-google": "^0.14.0", "gulp": "^4.0.2", "gulp-download": "0.0.1", From 11005bd44c2a84edc1120a2d787681237b4b2662 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Mon, 4 Nov 2019 22:59:02 -0800 Subject: [PATCH 07/77] nw.js: Disabled keyrong --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 658ddbac..0112c013 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "main": "src/app/index.html", "version": "0.4.1-18-develop", "node-remote": "*://*", + "chromium-args": "--password-store=basic", "releaseName": "Popcorn Treats", "scripts": { "start": "npx gulp run", From d1c3d0ba8bf5bb8a7c471c111a114d23e6c304c4 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sat, 16 Nov 2019 23:01:12 -0800 Subject: [PATCH 08/77] Package: Update gzip --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0112c013..83a847e1 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "eslint-config-google": "^0.14.0", "gulp": "^4.0.2", "gulp-download": "0.0.1", - "gulp-gzip": "^1.4.0", + "gulp-gzip": "^1.4.2", "gulp-tar": "^3.0.1", "gulp-unzip": "^1.1.0", "gulp-zip": "^5.0.1", From 8a46d9354d913229cd0bda67f1f206177014bedf Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sat, 16 Nov 2019 23:48:12 -0800 Subject: [PATCH 09/77] Gulp: Add additional logging --- gulpfile.js | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index f7231157..21ba3d07 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -185,29 +185,45 @@ var zipTask = function () { zipArray.add(gulp.src('./build/Popcorn-Time-CE/linux64/**') .pipe(tar('popcorn-time-ce_linux64_' + package.version + '.tar')) .pipe(gzip()) - .pipe(gulp.dest('./dist'))); + .pipe(gulp.dest('./dist')) + .on('end', function() { + console.log('Build Zip Complete: ' + item); + }) + ); break; case "linux32": zipArray.add(gulp.src('./build/Popcorn-Time-CE/linux32/**') .pipe(tar('popcorn-time-ce_linux32_' + package.version + '.tar')) .pipe(gzip()) - .pipe(gulp.dest('./dist'))); + .pipe(gulp.dest('./dist')) + .on('end', function() { + console.log('Build Zip Complete: ' + item); + })); break; case "win32": zipArray.add(gulp.src('./build/Popcorn-Time-CE/win32/**') .pipe(zip('popcorn-time-ce_win32_' + package.version + '.zip')) - .pipe(gulp.dest('./dist'))); + .pipe(gulp.dest('./dist')) + .on('end', function() { + console.log('Build Zip Complete: ' + item); + })); break; case "win64": zipArray.add(gulp.src('./build/Popcorn-Time-CE/win64/**') .pipe(zip('popcorn-time-ce_win64_' + package.version + '.zip')) - .pipe(gulp.dest('./dist'))); + .pipe(gulp.dest('./dist')) + .on('end', function() { + console.log('Build Zip Complete: ' + item); + })); break; case "osx64": zipArray.add(gulp.src('./build/Popcorn-Time-CE/osx64/**') .pipe(zip('popcorn-time-ce_osx64_' + package.version + '.zip')) //.pipe(gzip()) - .pipe(gulp.dest('./dist'))); + .pipe(gulp.dest('./dist')) + .on('end', function() { + console.log('Build Zip Complete: ' + item); + })); break; } }); From 64107dc11a6a1c52bba544715b946f1056393be8 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sun, 1 Dec 2019 22:18:29 -0800 Subject: [PATCH 10/77] Update CircleCi to Node 12.7.0 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f24251f0..434f94f0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: build: docker: # specify the version you desire here - - image: circleci/node:13.0.1 + - image: circleci/node:12.7.0 # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images From 57e2e6e43c53e7952ed8a7854ce13665609700b4 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sun, 1 Dec 2019 22:46:37 -0800 Subject: [PATCH 11/77] Update gulp-tar to 3.1.0 --- package-lock.json | 647 ++++++++++++++++++++++++++++------------------ package.json | 10 +- 2 files changed, 395 insertions(+), 262 deletions(-) diff --git a/package-lock.json b/package-lock.json index aef6176c..a8a55951 100644 --- a/package-lock.json +++ b/package-lock.json @@ -723,6 +723,11 @@ "@babel/types": "^7.3.0" } }, + "@types/color-name": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", + "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" + }, "@types/events": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", @@ -1214,9 +1219,9 @@ } }, "glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -1228,9 +1233,9 @@ } }, "graceful-fs": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", - "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", "dev": true }, "lodash": { @@ -2368,15 +2373,6 @@ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true }, - "camel-case": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", - "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", - "requires": { - "no-case": "^2.2.0", - "upper-case": "^1.1.1" - } - }, "camelcase": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", @@ -2452,31 +2448,6 @@ "supports-color": "^2.0.0" } }, - "change-case": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/change-case/-/change-case-3.1.0.tgz", - "integrity": "sha512-2AZp7uJZbYEzRPsFoa+ijKdvp9zsrnnt6+yFokfwEpeJm0xuJDVoxiRCAaTzyJND8GJkofo2IcKWaUZ/OECVzw==", - "requires": { - "camel-case": "^3.0.0", - "constant-case": "^2.0.0", - "dot-case": "^2.1.0", - "header-case": "^1.0.0", - "is-lower-case": "^1.1.0", - "is-upper-case": "^1.1.0", - "lower-case": "^1.1.1", - "lower-case-first": "^1.0.0", - "no-case": "^2.3.2", - "param-case": "^2.1.0", - "pascal-case": "^2.0.0", - "path-case": "^2.1.0", - "sentence-case": "^2.1.0", - "snake-case": "^2.1.0", - "swap-case": "^1.1.0", - "title-case": "^2.1.0", - "upper-case": "^1.1.1", - "upper-case-first": "^1.1.0" - } - }, "chardet": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz", @@ -2660,6 +2631,11 @@ "restore-cursor": "^2.0.0" } }, + "cli-spinners": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz", + "integrity": "sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==" + }, "cli-width": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", @@ -2669,6 +2645,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, "requires": { "string-width": "^3.1.0", "strip-ansi": "^5.2.0", @@ -2678,12 +2655,14 @@ "ansi-regex": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true }, "ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, "requires": { "color-convert": "^1.9.0" } @@ -2691,12 +2670,14 @@ "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true }, "string-width": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, "requires": { "emoji-regex": "^7.0.1", "is-fullwidth-code-point": "^2.0.0", @@ -2707,6 +2688,7 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, "requires": { "ansi-regex": "^4.1.0" } @@ -2715,6 +2697,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, "requires": { "ansi-styles": "^3.2.0", "string-width": "^3.0.0", @@ -2731,8 +2714,7 @@ "clone": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", - "dev": true + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" }, "clone-buffer": { "version": "1.0.0", @@ -2912,15 +2894,6 @@ "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true }, - "constant-case": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz", - "integrity": "sha1-QXV2TTidP6nI7NKRhu1gBSQ7akY=", - "requires": { - "snake-case": "^2.1.0", - "upper-case": "^1.1.1" - } - }, "consume-http-header": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/consume-http-header/-/consume-http-header-1.0.0.tgz", @@ -3248,6 +3221,14 @@ "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=", "dev": true }, + "defaults": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", + "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", + "requires": { + "clone": "^1.0.2" + } + }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -3476,14 +3457,6 @@ "domelementtype": "1" } }, - "dot-case": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-2.1.1.tgz", - "integrity": "sha1-NNzzf1Co6TwrO8qLt/uRVcfaO+4=", - "requires": { - "no-case": "^2.2.0" - } - }, "dot-prop": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", @@ -3493,11 +3466,6 @@ "is-obj": "^1.0.0" } }, - "dotenv": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", - "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==" - }, "duplexer2": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", @@ -3600,7 +3568,8 @@ "emoji-regex": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true }, "encodeurl": { "version": "1.0.2", @@ -3770,9 +3739,9 @@ } }, "eslint": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.6.0.tgz", - "integrity": "sha512-PpEBq7b6qY/qrOmpYQ/jTMDYfuQMELR4g4WI1M/NaSDDD/bdcMb+dj4Hgks7p41kW2caXsPsEZAEAyAgjVVC0g==", + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.7.2.tgz", + "integrity": "sha512-qMlSWJaCSxDFr8fBPvJM9kJwbazrhNcBU3+DszDW1OlEwKBBRWsJc7NJFelvwQpanHCR14cOLD41x8Eqvo3Nng==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -3790,7 +3759,7 @@ "file-entry-cache": "^5.0.1", "functional-red-black-tree": "^1.0.1", "glob-parent": "^5.0.0", - "globals": "^11.7.0", + "globals": "^12.1.0", "ignore": "^4.0.6", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", @@ -3803,7 +3772,7 @@ "minimatch": "^3.0.4", "mkdirp": "^0.5.1", "natural-compare": "^1.4.0", - "optionator": "^0.8.2", + "optionator": "^0.8.3", "progress": "^2.0.0", "regexpp": "^2.0.1", "semver": "^6.1.2", @@ -3815,18 +3784,18 @@ }, "dependencies": { "ansi-escapes": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.2.1.tgz", - "integrity": "sha512-Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz", + "integrity": "sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==", "dev": true, "requires": { - "type-fest": "^0.5.2" + "type-fest": "^0.8.1" } }, "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", "dev": true }, "ansi-styles": { @@ -3929,6 +3898,15 @@ "is-glob": "^4.0.1" } }, + "globals": { + "version": "12.3.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz", + "integrity": "sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==", + "dev": true, + "requires": { + "type-fest": "^0.8.1" + } + }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -4004,6 +3982,20 @@ "mimic-fn": "^2.1.0" } }, + "optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "requires": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + } + }, "restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", @@ -4024,14 +4016,25 @@ } }, "string-width": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.1.0.tgz", - "integrity": "sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^5.2.0" + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + } } }, "strip-ansi": { @@ -4041,6 +4044,14 @@ "dev": true, "requires": { "ansi-regex": "^4.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + } } }, "strip-json-comments": { @@ -5487,30 +5498,82 @@ } }, "gitlab": { - "version": "11.4.2", - "resolved": "https://registry.npmjs.org/gitlab/-/gitlab-11.4.2.tgz", - "integrity": "sha512-YAwyaOuVHNaPO0R/AZrNs3olhimneqja0rJRNn1yIPen/GB6J/aLWGtepZgSghwTB9pn+1Pdk/djz4RQQMPnew==", - "requires": { - "change-case": "^3.1.0", - "dotenv": "^8.2.0", - "form-data": "^2.5.1", - "ky": "^0.15.0", + "version": "11.6.1", + "resolved": "https://registry.npmjs.org/gitlab/-/gitlab-11.6.1.tgz", + "integrity": "sha512-arPancnbKBFUEVtFH5ksxv+Uz9kQ6/+/iGFgNb/lgm/RSMcG/rFz6uv1vOCWK0A++flpqb1nnViCVKCy3ku0Nw==", + "requires": { + "chalk": "^3.0.0", + "form-data": "^3.0.0", + "ky": "^0.16.0", "ky-universal": "^0.3.0", "li": "^1.3.0", - "query-string": "^6.8.3", - "xcase": "^2.0.1", - "yargs": "^14.2.0" + "ora": "^4.0.3", + "query-string": "^6.9.0", + "sywac": "^1.2.2", + "xcase": "^2.0.1" }, "dependencies": { + "ansi-styles": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.0.tgz", + "integrity": "sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg==", + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "requires": { + "delayed-stream": "~1.0.0" + } + }, "form-data": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz", - "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz", + "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==", "requires": { "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", + "combined-stream": "^1.0.8", "mime-types": "^2.1.12" } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "requires": { + "has-flag": "^4.0.0" + } } } }, @@ -5859,9 +5922,9 @@ } }, "gulp-tar": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/gulp-tar/-/gulp-tar-3.0.1.tgz", - "integrity": "sha512-kDtnlk987JBku/f95xAoB4CY75mKw24TgBQI08yq8NxLAEhLh6zr9ytme2KMpMSW60YXpJC+u7E6OZie4+n9iQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/gulp-tar/-/gulp-tar-3.1.0.tgz", + "integrity": "sha512-+Y3ntrDIBBVoxqlAnb0STUdVNx+xceH6YIFXvYMA48avJiwa+a81bFbJ/loz47zSF8nflc15ON0YLX4YgMLAvw==", "dev": true, "requires": { "archiver": "^3.1.1", @@ -6213,15 +6276,6 @@ "sntp": "0.1.x" } }, - "header-case": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/header-case/-/header-case-1.0.1.tgz", - "integrity": "sha1-lTWXMZfBRLCWE81l0xfvGZY70C0=", - "requires": { - "no-case": "^2.2.0", - "upper-case": "^1.1.3" - } - }, "hoek": { "version": "0.7.6", "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz", @@ -6392,9 +6446,9 @@ "integrity": "sha1-Ds2tDFRjMmcte1tRGya7GM5W5z8=" }, "import-fresh": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz", - "integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", + "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", "dev": true, "requires": { "parent-module": "^1.0.0", @@ -6761,13 +6815,10 @@ "is-path-inside": "^1.0.0" } }, - "is-lower-case": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz", - "integrity": "sha1-fhR75HaNxGbbO/shzGCzHmrWk5M=", - "requires": { - "lower-case": "^1.1.0" - } + "is-interactive": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", + "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==" }, "is-negated-glob": { "version": "1.0.0", @@ -6899,14 +6950,6 @@ "unc-path-regex": "^0.1.2" } }, - "is-upper-case": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz", - "integrity": "sha1-jQsfp+eTOh5YSDYA7H2WYcuvdW8=", - "requires": { - "upper-case": "^1.1.0" - } - }, "is-utf8": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", @@ -8541,9 +8584,9 @@ "dev": true }, "ky": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/ky/-/ky-0.15.0.tgz", - "integrity": "sha512-6IlJRPFHq4ZKRRa9lyh6YqHqlmddAkfyXI9CYvZpLQtg7fQvwncPHyHrmtXAHKCqHOilINPMT88eW6FTA3HwkA==" + "version": "0.16.1", + "resolved": "https://registry.npmjs.org/ky/-/ky-0.16.1.tgz", + "integrity": "sha512-olhyGihJ8XOxP8dhdXXDFu1FfowsmkQznI33KNTl4Woa3T/UDBEV/FR8Y8Pe1cJ3ofVnlflcXRUE8a3Phwr3Og==" }, "ky-universal": { "version": "0.3.0", @@ -8718,6 +8761,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, "requires": { "p-locate": "^3.0.0", "path-exists": "^3.0.0" @@ -8726,7 +8770,8 @@ "path-exists": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true } } }, @@ -8938,6 +8983,42 @@ "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=", "dev": true }, + "log-symbols": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", + "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", + "requires": { + "chalk": "^2.4.2" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "long": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/long/-/long-2.4.0.tgz", @@ -8962,19 +9043,6 @@ "signal-exit": "^3.0.0" } }, - "lower-case": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", - "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=" - }, - "lower-case-first": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/lower-case-first/-/lower-case-first-1.0.2.tgz", - "integrity": "sha1-5dp8JvKacHO+AtUrrJmA5ZIq36E=", - "requires": { - "lower-case": "^1.1.2" - } - }, "lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", @@ -9628,14 +9696,6 @@ "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" }, - "no-case": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", - "requires": { - "lower-case": "^1.1.1" - } - }, "node-captions": { "version": "0.4.6", "resolved": "https://registry.npmjs.org/node-captions/-/node-captions-0.4.6.tgz", @@ -10313,6 +10373,115 @@ "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz", "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4=" }, + "ora": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/ora/-/ora-4.0.3.tgz", + "integrity": "sha512-fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg==", + "requires": { + "chalk": "^3.0.0", + "cli-cursor": "^3.1.0", + "cli-spinners": "^2.2.0", + "is-interactive": "^1.0.0", + "log-symbols": "^3.0.0", + "mute-stream": "0.0.8", + "strip-ansi": "^6.0.0", + "wcwidth": "^1.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "ansi-styles": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.0.tgz", + "integrity": "sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg==", + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "requires": { + "restore-cursor": "^3.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + }, + "mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" + }, + "onetime": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "requires": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "ordered-read-streams": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz", @@ -10379,6 +10548,7 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", + "dev": true, "requires": { "p-try": "^2.0.0" } @@ -10387,6 +10557,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, "requires": { "p-limit": "^2.0.0" } @@ -10409,7 +10580,8 @@ "p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true }, "package-json": { "version": "4.0.1", @@ -10439,14 +10611,6 @@ "browserify-package-json": "^1.0.0" } }, - "param-case": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", - "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", - "requires": { - "no-case": "^2.2.0" - } - }, "parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -10533,29 +10697,12 @@ "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==", "dev": true }, - "pascal-case": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-2.0.1.tgz", - "integrity": "sha1-LVeNNFX2YNpl7KGO+VtODekSdh4=", - "requires": { - "camel-case": "^3.0.0", - "upper-case-first": "^1.1.0" - } - }, "pascalcase": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", "dev": true }, - "path-case": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/path-case/-/path-case-2.1.1.tgz", - "integrity": "sha1-lLgDfDctP+KQbkZbtF4l0ibo7qU=", - "requires": { - "no-case": "^2.2.0" - } - }, "path-dirname": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", @@ -11065,9 +11212,9 @@ "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" }, "query-string": { - "version": "6.8.3", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.8.3.tgz", - "integrity": "sha512-llcxWccnyaWlODe7A9hRjkvdCKamEKTh+wH8ITdTc3OhchaqUZteiSCX/2ablWHVrkVIe04dntnaZJ7BdyW0lQ==", + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.9.0.tgz", + "integrity": "sha512-KG4bhCFYapExLsUHrFt+kQVEegF2agm4cpF/VNc6pZVthIfCc/GK8t8VyNIE3nyXG9DK3Tf2EGkxjR6/uRdYsA==", "requires": { "decode-uri-component": "^0.2.0", "split-on-first": "^1.0.0", @@ -11595,7 +11742,8 @@ "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "dev": true }, "require-main-filename": { "version": "1.0.1", @@ -11928,15 +12076,6 @@ } } }, - "sentence-case": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.1.tgz", - "integrity": "sha1-H24t2jnBaL+S0T+G1KkYkz9mftQ=", - "requires": { - "no-case": "^2.2.0", - "upper-case-first": "^1.1.2" - } - }, "server-destroy": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz", @@ -11946,7 +12085,8 @@ "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "dev": true }, "set-value": { "version": "2.0.0", @@ -12146,14 +12286,6 @@ } } }, - "snake-case": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-2.1.0.tgz", - "integrity": "sha1-Qb2xtz8w7GagTU4srRt2OH1NbZ8=", - "requires": { - "no-case": "^2.2.0" - } - }, "snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", @@ -12709,15 +12841,6 @@ "es6-symbol": "^3.1.1" } }, - "swap-case": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz", - "integrity": "sha1-w5IDpFhzhfrTyFCgvRvK+ggZdOM=", - "requires": { - "lower-case": "^1.1.1", - "upper-case": "^1.1.1" - } - }, "symbol-observable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz", @@ -12729,6 +12852,11 @@ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", "dev": true }, + "sywac": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/sywac/-/sywac-1.2.2.tgz", + "integrity": "sha512-Bfyo0Oddco9b/ifXTevNmMCewmWH2EeE06cPKolsahly7nShbYooZmJYZxJc5EN4WFAXvbR8WOx97PUvaYYMEg==" + }, "table": { "version": "5.4.6", "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", @@ -13046,15 +13174,6 @@ "next-tick": "1" } }, - "title-case": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz", - "integrity": "sha1-PhJyFtpY0rxb7PE3q5Ha46fNj6o=", - "requires": { - "no-case": "^2.2.0", - "upper-case": "^1.0.3" - } - }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -13385,9 +13504,9 @@ } }, "type-fest": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz", - "integrity": "sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==", + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", "dev": true }, "typechecker": { @@ -13728,19 +13847,6 @@ } } }, - "upper-case": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", - "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=" - }, - "upper-case-first": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-1.1.2.tgz", - "integrity": "sha1-XXm+3P8UQZUY/S7bCgUHybaFkRU=", - "requires": { - "upper-case": "^1.1.1" - } - }, "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", @@ -14107,6 +14213,14 @@ "typechecker": "^2.0.8" } }, + "wcwidth": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", + "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", + "requires": { + "defaults": "^1.0.3" + } + }, "weak-map": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz", @@ -14133,9 +14247,9 @@ "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==" }, "webtorrent": { - "version": "0.107.16", - "resolved": "https://registry.npmjs.org/webtorrent/-/webtorrent-0.107.16.tgz", - "integrity": "sha512-5fdPZFiZPxwbigAHtMVQ7ZCXbZSQlxgB6JPD77itpc9DdKYPpliFwCLsNiQpj1jmpo91HlHUJk+Xp3ks1fLUQg==", + "version": "0.107.17", + "resolved": "https://registry.npmjs.org/webtorrent/-/webtorrent-0.107.17.tgz", + "integrity": "sha512-Oe7d3+jpmPRDAc645PccIJPYa2w3n3BEiMU7J/Q76QSPF3SDUK8jO7keUCC2qk4ckcbdkb98bYK6/uK7M8vsRA==", "requires": { "addr-to-ip-port": "^1.4.2", "bitfield": "^3.0.0", @@ -14305,9 +14419,9 @@ } }, "simple-peer": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/simple-peer/-/simple-peer-9.6.0.tgz", - "integrity": "sha512-NYqSKPu75xhkZYKGJhCbLCG5kfBtDHf8U9ddk4EKFfYNU7XgIisov+V8wMbVVgyMCfn8pm8uOqQQmE50FPDFWA==", + "version": "9.6.2", + "resolved": "https://registry.npmjs.org/simple-peer/-/simple-peer-9.6.2.tgz", + "integrity": "sha512-EOKoImCaqtNvXIntxT1CBBK/3pVi7tMAoJ3shdyd9qk3zLm3QPiRLb/sPC1G2xvKJkJc5fkQjCXqRZ0AknwTig==", "requires": { "debug": "^4.0.1", "get-browser-rtc": "^1.0.0", @@ -14326,11 +14440,12 @@ } }, "simple-websocket": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/simple-websocket/-/simple-websocket-8.0.1.tgz", - "integrity": "sha512-2QKSRjf+tqFXLVmOQjf95gHeKhuyx2k1ouDjtnE0uKCYw84HfN85HsXo+GmPH+2PIh5BQql++g2AIbHgGAZU4w==", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/simple-websocket/-/simple-websocket-8.1.1.tgz", + "integrity": "sha512-06I3cwOD5Q3LdVd6qfyDGp1U9eau9x9qniSL3b/aDgM5bsJX4nZfCuii2UCFcTfrDq0jCXF4NQ/38qeC8CJZTg==", "requires": { "debug": "^4.1.1", + "queue-microtask": "^1.1.0", "randombytes": "^2.0.3", "readable-stream": "^3.1.1", "ws": "^7.0.0" @@ -14358,9 +14473,9 @@ "integrity": "sha512-H/Z/yCuvZJj1vl1IQHI8dvF2QrUuXRJoptT5DW5967/dsLpXlCg+uyhFR5lfNj5mNaYePUbKtnL+qKWZGXv4Nw==" }, "ws": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.1.2.tgz", - "integrity": "sha512-gftXq3XI81cJCgkUiAVixA0raD9IVmXqsylCrjRygw4+UOOGzPoxnQ6r/CnVL9i+mDncJo94tSkyrtuuQVBmrg==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.0.tgz", + "integrity": "sha512-+SqNqFbwTm/0DC18KYzIsMTnEWpLwJsiasW/O17la4iDRRIO9uaHbvKiAS3AHgTiuuWerK/brj4O6MYZkei9xg==", "requires": { "async-limiter": "^1.0.0" } @@ -14415,7 +14530,8 @@ "which-module": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true }, "wide-align": { "version": "1.1.3", @@ -14539,6 +14655,12 @@ "integrity": "sha1-CvyjDzxudFgFjSigtnPJ3aYiubU=", "dev": true }, + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true + }, "wordwrap": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", @@ -14673,9 +14795,10 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "yargs": { - "version": "14.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.0.tgz", - "integrity": "sha512-/is78VKbKs70bVZH7w4YaZea6xcJWOAwkhbR0CFuZBmYtfTYF0xjGJF43AYd8g2Uii1yJwmS5GR2vBmrc32sbg==", + "version": "14.2.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.2.tgz", + "integrity": "sha512-/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA==", + "dev": true, "requires": { "cliui": "^5.0.0", "decamelize": "^1.2.0", @@ -14693,17 +14816,20 @@ "ansi-regex": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true }, "camelcase": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true }, "find-up": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, "requires": { "locate-path": "^3.0.0" } @@ -14711,22 +14837,26 @@ "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true }, "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true }, "require-main-filename": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true }, "string-width": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, "requires": { "emoji-regex": "^7.0.1", "is-fullwidth-code-point": "^2.0.0", @@ -14737,6 +14867,7 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, "requires": { "ansi-regex": "^4.1.0" } @@ -14744,12 +14875,14 @@ "y18n": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", + "dev": true }, "yargs-parser": { "version": "15.0.0", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.0.tgz", "integrity": "sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ==", + "dev": true, "requires": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" diff --git a/package.json b/package.json index 83a847e1..bf40bb96 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "ajv": "6.10.2", "async": "^3.0.1", "chromecast-js": "git+https://github.com/captainyarr/chromecast-js.git", - "gitlab": "^11.4.2", + "gitlab": "^11.6.1", "i18n": "0.8.3", "iconv-lite": "^0.5.0", "jschardet": "2.1.0", @@ -72,24 +72,24 @@ "underscore": "1.9.1", "upnp-mediarenderer-client": "^1.2.1", "urijs": "^1.19.2", - "webtorrent": "^0.107.16", + "webtorrent": "^0.107.17", "xmlbuilder": "^13.0.2" }, "devDependencies": { "del": "^5.1.0", - "eslint": "^6.6.0", + "eslint": "^6.7.2", "eslint-config-google": "^0.14.0", "gulp": "^4.0.2", "gulp-download": "0.0.1", "gulp-gzip": "^1.4.2", - "gulp-tar": "^3.0.1", + "gulp-tar": "^3.1.0", "gulp-unzip": "^1.1.0", "gulp-zip": "^5.0.1", "jest": "^24.9.0", "merge2": "1.3.0", "nw-builder": "^3.5.7", "nw-gyp": "^3.6.5", - "yargs": "^14.2.0" + "yargs": "^14.2.2" }, "description": "", "author": "" From 48882f090843f2001a5973194605611872e77b7b Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Tue, 10 Dec 2019 22:39:32 -0800 Subject: [PATCH 12/77] =?UTF-8?q?Update=20opensubtitles-api=20to=20the=20l?= =?UTF-8?q?atest=20version=20=F0=9F=9A=80=20(#105)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(package): update opensubtitles-api to version 5.1.0 * chore(package): update lockfile package-lock.json --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index a8a55951..da8ef1bb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10276,9 +10276,9 @@ "integrity": "sha1-QsPhjslUZra/DcQvOilFw/DK2Pw=" }, "opensubtitles-api": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/opensubtitles-api/-/opensubtitles-api-5.0.1.tgz", - "integrity": "sha512-Iurb30SrY5eHoZz/ORxBfuXCApBy5uHkUae7AZ6gfyNgpbRlBnQAvEtHWGu5caOHT/61n98O8Kmh2f2sX+4quQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/opensubtitles-api/-/opensubtitles-api-5.1.0.tgz", + "integrity": "sha512-zhRN46muo7DL7e4USke++rsnEFKpVLvaMFmLYueUuq8sgCNgDydN+9ildUpcuNDwZmd8p5sl6tjigXtvggIM+g==", "requires": { "urijs": "^1.19.1", "xmlrpc": "^1.3.2" diff --git a/package.json b/package.json index bf40bb96..62c180a6 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "node-tvdb": "^4.0.0", "node-webkit-fdialogs": "^0.2.7", "nodecast-js": "^1.0.3", - "opensubtitles-api": "5.0.1", + "opensubtitles-api": "5.1.0", "opensubtitles-ce": "^1.0.0", "os-name": "^3.1.0", "parse-torrent": "^7.0.1", From 8f31b33a364dd9c147257dcc10069277078cd7fd Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 21:42:49 -0800 Subject: [PATCH 13/77] =?UTF-8?q?Update=20semver=20to=20the=20latest=20ver?= =?UTF-8?q?sion=20=F0=9F=9A=80=20(#107)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(package): update semver to version 7.0.0 * chore(package): update lockfile package-lock.json --- package-lock.json | 13 +++++-------- package.json | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index da8ef1bb..6f79a9eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3775,7 +3775,6 @@ "optionator": "^0.8.3", "progress": "^2.0.0", "regexpp": "^2.0.1", - "semver": "^6.1.2", "strip-ansi": "^5.2.0", "strip-json-comments": "^3.0.1", "table": "^5.2.3", @@ -7011,8 +7010,7 @@ "@babel/template": "^7.4.0", "@babel/traverse": "^7.4.3", "@babel/types": "^7.4.0", - "istanbul-lib-coverage": "^2.0.5", - "semver": "^6.0.0" + "istanbul-lib-coverage": "^2.0.5" } }, "istanbul-lib-report": { @@ -8069,8 +8067,7 @@ "jest-resolve": "^24.9.0", "mkdirp": "^0.5.1", "natural-compare": "^1.4.0", - "pretty-format": "^24.9.0", - "semver": "^6.2.0" + "pretty-format": "^24.9.0" }, "dependencies": { "ansi-styles": { @@ -12009,9 +12006,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", + "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==" }, "semver-diff": { "version": "2.1.0", diff --git a/package.json b/package.json index 62c180a6..0660e83e 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "request": "^2.87.0", "rimraf": "^3.0.0", "sanitizer": "^0.1.2", - "semver": "^6.3.0", + "semver": "^7.0.0", "send": "^0.17.1", "strike-api": "0.2.0", "tar": "^5.0.5", From 95f7ff10c5c90ae48f74c611186c402469d251b1 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Mon, 16 Dec 2019 21:44:51 -0800 Subject: [PATCH 14/77] Package update --- package-lock.json | 47 +++++++++++++++++++++++++++++++++++------------ package.json | 4 ++-- 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6f79a9eb..1f37d2c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3775,6 +3775,7 @@ "optionator": "^0.8.3", "progress": "^2.0.0", "regexpp": "^2.0.1", + "semver": "^6.1.2", "strip-ansi": "^5.2.0", "strip-json-comments": "^3.0.1", "table": "^5.2.3", @@ -4014,6 +4015,12 @@ "tslib": "^1.9.0" } }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, "string-width": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", @@ -5921,9 +5928,9 @@ } }, "gulp-tar": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/gulp-tar/-/gulp-tar-3.1.0.tgz", - "integrity": "sha512-+Y3ntrDIBBVoxqlAnb0STUdVNx+xceH6YIFXvYMA48avJiwa+a81bFbJ/loz47zSF8nflc15ON0YLX4YgMLAvw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/gulp-tar/-/gulp-tar-3.0.1.tgz", + "integrity": "sha512-kDtnlk987JBku/f95xAoB4CY75mKw24TgBQI08yq8NxLAEhLh6zr9ytme2KMpMSW60YXpJC+u7E6OZie4+n9iQ==", "dev": true, "requires": { "archiver": "^3.1.1", @@ -7010,7 +7017,16 @@ "@babel/template": "^7.4.0", "@babel/traverse": "^7.4.3", "@babel/types": "^7.4.0", - "istanbul-lib-coverage": "^2.0.5" + "istanbul-lib-coverage": "^2.0.5", + "semver": "^6.0.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } } }, "istanbul-lib-report": { @@ -8067,7 +8083,8 @@ "jest-resolve": "^24.9.0", "mkdirp": "^0.5.1", "natural-compare": "^1.4.0", - "pretty-format": "^24.9.0" + "pretty-format": "^24.9.0", + "semver": "^6.2.0" }, "dependencies": { "ansi-styles": { @@ -8090,6 +8107,12 @@ "supports-color": "^5.3.0" } }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -11485,11 +11508,11 @@ } }, "readdirp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz", - "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz", + "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==", "requires": { - "picomatch": "^2.0.4" + "picomatch": "^2.0.7" } }, "realpath-native": { @@ -12006,9 +12029,9 @@ } }, "semver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", - "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==" + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.0.tgz", + "integrity": "sha512-4P8Vc43MxQL6UKqSiEnf0jZNYx545R9W1HwXP6p65paPp86AUJiafZ8XG81hAbcldKMCUIbeykUTVYG19LB7Cw==" }, "semver-diff": { "version": "2.1.0", diff --git a/package.json b/package.json index 0660e83e..6245d58e 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "peerflix": "^0.39.0", "q": "^2.0.3", "rarbg-api": "git+https://github.com/talas9/rarbg-api.git", - "readdirp": "^3.2.0", + "readdirp": "^3.3.0", "request": "^2.87.0", "rimraf": "^3.0.0", "sanitizer": "^0.1.2", @@ -82,7 +82,7 @@ "gulp": "^4.0.2", "gulp-download": "0.0.1", "gulp-gzip": "^1.4.2", - "gulp-tar": "^3.1.0", + "gulp-tar": "3.0.1", "gulp-unzip": "^1.1.0", "gulp-zip": "^5.0.1", "jest": "^24.9.0", From 792ead819f5961e21f043c6332030c922f392dc5 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Tue, 31 Dec 2019 10:08:34 -0800 Subject: [PATCH 15/77] =?UTF-8?q?Update=20gitlab=20to=20the=20latest=20ver?= =?UTF-8?q?sion=20=F0=9F=9A=80=20(#108)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(package): update gitlab to version 14.0.0 * chore(package): update lockfile package-lock.json --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1f37d2c1..72bdd54f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5504,9 +5504,9 @@ } }, "gitlab": { - "version": "11.6.1", - "resolved": "https://registry.npmjs.org/gitlab/-/gitlab-11.6.1.tgz", - "integrity": "sha512-arPancnbKBFUEVtFH5ksxv+Uz9kQ6/+/iGFgNb/lgm/RSMcG/rFz6uv1vOCWK0A++flpqb1nnViCVKCy3ku0Nw==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/gitlab/-/gitlab-14.0.0.tgz", + "integrity": "sha512-+CUlcawGfg+kCe78CjEr8vHUemQxoM+IY0IM0U48D6F8RmFzK6LPwwUdfEJqtL76RHJdgr6J/DSqzOQU2Gtavw==", "requires": { "chalk": "^3.0.0", "form-data": "^3.0.0", diff --git a/package.json b/package.json index 6245d58e..8abede99 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "ajv": "6.10.2", "async": "^3.0.1", "chromecast-js": "git+https://github.com/captainyarr/chromecast-js.git", - "gitlab": "^11.6.1", + "gitlab": "^14.0.0", "i18n": "0.8.3", "iconv-lite": "^0.5.0", "jschardet": "2.1.0", From 06f57175fa580b003704d25591a7aa0b088d6a11 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Tue, 31 Dec 2019 10:28:35 -0800 Subject: [PATCH 16/77] Uodated Node Env to LTS --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 434f94f0..0df4436f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: build: docker: # specify the version you desire here - - image: circleci/node:12.7.0 + - image: circleci/node:lts # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images From 1c55bff3941c4037312067a7a840400d4e668526 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Tue, 31 Dec 2019 10:35:12 -0800 Subject: [PATCH 17/77] Update CircleCi version to 2.1 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0df4436f..fcf9d7bf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ # # Check https://circleci.com/docs/2.0/language-javascript/ for more details # -version: 2 +version: 2.1 jobs: build: From f9248102b0bf9591edb14aeeab7c68884f740ecb Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Sat, 11 Jan 2020 10:58:04 -0800 Subject: [PATCH 18/77] =?UTF-8?q?Update=20underscore=20to=20the=20latest?= =?UTF-8?q?=20version=20=F0=9F=9A=80=20(#109)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(package): update underscore to version 1.9.2 * chore(package): update lockfile package-lock.json --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 72bdd54f..c5da9818 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13587,9 +13587,9 @@ "dev": true }, "underscore": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz", - "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==" + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz", + "integrity": "sha512-D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ==" }, "undertaker": { "version": "1.2.1", diff --git a/package.json b/package.json index 8abede99..4c73d814 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "tar": "^5.0.5", "temp": "^0.9.1", "torrent-tracker-health": "git+https://github.com/PTCE-Public/torrent-tracker-health.git", - "underscore": "1.9.1", + "underscore": "1.9.2", "upnp-mediarenderer-client": "^1.2.1", "urijs": "^1.19.2", "webtorrent": "^0.107.17", From 03e4a01896f63352cad6e5cd51a3b235431a3189 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sat, 11 Jan 2020 11:04:11 -0800 Subject: [PATCH 19/77] Edit: Updated changelog for dev builds --- CHANGELOG.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d37cbeb..f61decb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,16 @@ -## 0.4.1-18-develop Beta - Popcorn Treats - 24 October 2019 +## 0.4.1-18 Beta - WIP Builds + +New Features: + + +BugFixes: + + +Updated: + + + +## 0.4.1-17.1 Beta - Popcorn Treats - 24 October 2019 New Features: - Added more information to status screen: Active Users, and Total User, Time remaining From 20ee63b07a91fc76c2ee2566e07408f94af89888 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sun, 12 Jan 2020 00:38:58 -0800 Subject: [PATCH 20/77] Feature: Add support to save filter options --- CHANGELOG.md | 1 + src/app/lib/models/filter.js | 30 +++++++++++++++--- src/app/lib/views/browser/filter_bar.js | 42 +++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f61decb5..14219a5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## 0.4.1-18 Beta - WIP Builds New Features: +- Sort By, Genres, Type are now saved when going between Movies and TV Shows. BugFixes: diff --git a/src/app/lib/models/filter.js b/src/app/lib/models/filter.js index 0ea27ca4..8d77ec5c 100644 --- a/src/app/lib/models/filter.js +++ b/src/app/lib/models/filter.js @@ -1,4 +1,4 @@ -(function (App) { +(function(App) { 'use strict'; var Filter = Backbone.Model.extend({ @@ -9,10 +9,30 @@ order: -1 }, - initialize: function () { - this.set('sorter', this.get('sorter') || this.get('sorters')[0]); - this.set('genre', this.get('genre') || this.get('genres')[0]); - this.set('type', this.get('type') || this.get('types')[0]); + initialize: function() { + win.debug(this.get('sorters')); + + switch (App.currentview) { + case 'movies': + this.set('sorter', this.get('sorter') || AdvSettings.get('lastSortMovie') || this.get('sorters')[0]); + this.set('genre', this.get('genre') || AdvSettings.get('lastGenreMovie') || this.get('genres')[0]); + this.set('type', this.get('type') || AdvSettings.get('lastTypeMovie') || this.get('types')[0]); + break; + case 'shows': + this.set('sorter', this.get('sorter') || AdvSettings.get('lastSortTV') || this.get('sorters')[0]); + this.set('genre', this.get('genre') || AdvSettings.get('lastGenreTV') || this.get('genres')[0]); + this.set('type', this.get('type') || AdvSettings.get('lastTypeTV') || this.get('types')[0]); + break; + case 'anime': + this.set('sorter', this.get('sorter') || AdvSettings.get('lastSortAnime') || this.get('sorters')[0]); + this.set('genre', this.get('genre') || AdvSettings.get('lastGenreAnime') || this.get('genres')[0]); + this.set('type', this.get('type') || AdvSettings.get('lastTypeAnime') || this.get('types')[0]); + break; + default: + this.set('sorter', this.get('sorter') || AdvSettings.get('lastSortMovie') || this.get('sorters')[0]); + this.set('genre', this.get('genre') || AdvSettings.get('lastGenreMovie') || this.get('genres')[0]); + this.set('type', this.get('type') || AdvSettings.get('lastTypeMovie') || this.get('types')[0]); + } this.set('order', this.get('order') || -1); } }); diff --git a/src/app/lib/views/browser/filter_bar.js b/src/app/lib/views/browser/filter_bar.js index 2123b2f6..5114f66a 100644 --- a/src/app/lib/views/browser/filter_bar.js +++ b/src/app/lib/views/browser/filter_bar.js @@ -243,6 +243,19 @@ var sorter = $(e.target).attr('data-value'); + switch (App.currentview) { + case 'movies': + AdvSettings.set('lastSortMovie', sorter); + break; + case 'shows': + AdvSettings.set('lastSortTV', sorter); + break; + case 'anime': + AdvSettings.set('lastSortAnime', sorter); + break; + default: + } + if (this.previousSort === sorter) { this.model.set('order', this.model.get('order') * -1); } else if (this.previousSort !== sorter && sorter === 'title') { @@ -266,6 +279,20 @@ $(e.target).addClass('active'); var type = $(e.target).attr('data-value'); + + switch (App.currentview) { + case 'movies': + AdvSettings.set('lastTypeMovie', type); + break; + case 'shows': + AdvSettings.set('lastTypeTV', type); + break; + case 'anime': + AdvSettings.set('lastTypeAnime', type); + break; + default: + } + this.ui.typeValue.text(i18n.__(type)); this.model.set({ @@ -280,6 +307,21 @@ $(e.target).addClass('active'); var genre = $(e.target).attr('data-value'); + + switch (App.currentview) { + case 'movies': + AdvSettings.set('lastGenreMovie', genre); + break; + case 'shows': + AdvSettings.set('lastGenreTV', genre); + break; + case 'anime': + AdvSettings.set('lastGenreAnime', genre); + break; + default: + } + + this.ui.genreValue.text(i18n.__(genre)); this.model.set({ From 15f34df2c5b0ae774dbcd24f06c42b7004ed90ba Mon Sep 17 00:00:00 2001 From: captainyarr Date: Tue, 14 Jan 2020 20:22:22 -0800 Subject: [PATCH 21/77] Remove: Remove gitlab support --- package-lock.json | 331 +----------------------------------- package.json | 1 - src/app/lib/views/about.js | 2 +- src/app/templates/about.tpl | 7 +- 4 files changed, 11 insertions(+), 330 deletions(-) diff --git a/package-lock.json b/package-lock.json index c5da9818..691fd29e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -723,11 +723,6 @@ "@babel/types": "^7.3.0" } }, - "@types/color-name": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" - }, "@types/events": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", @@ -814,14 +809,6 @@ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, - "abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "requires": { - "event-target-shim": "^5.0.0" - } - }, "acorn": { "version": "5.7.3", "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", @@ -2631,11 +2618,6 @@ "restore-cursor": "^2.0.0" } }, - "cli-spinners": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz", - "integrity": "sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==" - }, "cli-width": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", @@ -2714,7 +2696,8 @@ "clone": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", + "dev": true }, "clone-buffer": { "version": "1.0.0", @@ -3163,7 +3146,8 @@ "decode-uri-component": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "dev": true }, "decompress-response": { "version": "3.3.0", @@ -3221,14 +3205,6 @@ "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=", "dev": true }, - "defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "requires": { - "clone": "^1.0.2" - } - }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -4177,11 +4153,6 @@ "es5-ext": "~0.10.14" } }, - "event-target-shim": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" - }, "eventemitter3": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz", @@ -5503,86 +5474,6 @@ "assert-plus": "^1.0.0" } }, - "gitlab": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/gitlab/-/gitlab-14.0.0.tgz", - "integrity": "sha512-+CUlcawGfg+kCe78CjEr8vHUemQxoM+IY0IM0U48D6F8RmFzK6LPwwUdfEJqtL76RHJdgr6J/DSqzOQU2Gtavw==", - "requires": { - "chalk": "^3.0.0", - "form-data": "^3.0.0", - "ky": "^0.16.0", - "ky-universal": "^0.3.0", - "li": "^1.3.0", - "ora": "^4.0.3", - "query-string": "^6.9.0", - "sywac": "^1.2.2", - "xcase": "^2.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.0.tgz", - "integrity": "sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg==", - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "form-data": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz", - "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "glob": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", @@ -6821,11 +6712,6 @@ "is-path-inside": "^1.0.0" } }, - "is-interactive": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", - "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==" - }, "is-negated-glob": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", @@ -8603,27 +8489,6 @@ "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", "dev": true }, - "ky": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/ky/-/ky-0.16.1.tgz", - "integrity": "sha512-olhyGihJ8XOxP8dhdXXDFu1FfowsmkQznI33KNTl4Woa3T/UDBEV/FR8Y8Pe1cJ3ofVnlflcXRUE8a3Phwr3Og==" - }, - "ky-universal": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/ky-universal/-/ky-universal-0.3.0.tgz", - "integrity": "sha512-CM4Bgb2zZZpsprcjI6DNYTaH3oGHXL2u7BU4DK+lfCuC4snkt9/WRpMYeKbBbXscvKkeqBwzzjFX2WwmKY5K/A==", - "requires": { - "abort-controller": "^3.0.0", - "node-fetch": "^2.6.0" - }, - "dependencies": { - "node-fetch": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", - "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" - } - } - }, "last-one-wins": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/last-one-wins/-/last-one-wins-1.0.4.tgz", @@ -8703,11 +8568,6 @@ "type-check": "~0.3.2" } }, - "li": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/li/-/li-1.3.0.tgz", - "integrity": "sha1-IsWbyu+qmo7zWc91l4TkvxBq6hs=" - }, "lie": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", @@ -9003,42 +8863,6 @@ "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=", "dev": true }, - "log-symbols": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", - "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", - "requires": { - "chalk": "^2.4.2" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, "long": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/long/-/long-2.4.0.tgz", @@ -10393,115 +10217,6 @@ "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz", "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4=" }, - "ora": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/ora/-/ora-4.0.3.tgz", - "integrity": "sha512-fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg==", - "requires": { - "chalk": "^3.0.0", - "cli-cursor": "^3.1.0", - "cli-spinners": "^2.2.0", - "is-interactive": "^1.0.0", - "log-symbols": "^3.0.0", - "mute-stream": "0.0.8", - "strip-ansi": "^6.0.0", - "wcwidth": "^1.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" - }, - "ansi-styles": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.0.tgz", - "integrity": "sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg==", - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "requires": { - "restore-cursor": "^3.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" - }, - "mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" - }, - "onetime": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", - "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "requires": { - "ansi-regex": "^5.0.0" - } - }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "ordered-read-streams": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz", @@ -11231,16 +10946,6 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" }, - "query-string": { - "version": "6.9.0", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.9.0.tgz", - "integrity": "sha512-KG4bhCFYapExLsUHrFt+kQVEegF2agm4cpF/VNc6pZVthIfCc/GK8t8VyNIE3nyXG9DK3Tf2EGkxjR6/uRdYsA==", - "requires": { - "decode-uri-component": "^0.2.0", - "split-on-first": "^1.0.0", - "strict-uri-encode": "^2.0.0" - } - }, "queue-microtask": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.1.2.tgz", @@ -12511,11 +12216,6 @@ "through": "2" } }, - "split-on-first": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz", - "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==" - }, "split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", @@ -12638,11 +12338,6 @@ "once": "^1.3.3" } }, - "strict-uri-encode": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", - "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=" - }, "strike-api": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/strike-api/-/strike-api-0.2.0.tgz", @@ -12872,11 +12567,6 @@ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", "dev": true }, - "sywac": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/sywac/-/sywac-1.2.2.tgz", - "integrity": "sha512-Bfyo0Oddco9b/ifXTevNmMCewmWH2EeE06cPKolsahly7nShbYooZmJYZxJc5EN4WFAXvbR8WOx97PUvaYYMEg==" - }, "table": { "version": "5.4.6", "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", @@ -14233,14 +13923,6 @@ "typechecker": "^2.0.8" } }, - "wcwidth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", - "requires": { - "defaults": "^1.0.3" - } - }, "weak-map": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz", @@ -14745,11 +14427,6 @@ } } }, - "xcase": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/xcase/-/xcase-2.0.1.tgz", - "integrity": "sha1-x/pyyqD0QNt4/VZzQyA4rJhEULk=" - }, "xdg-basedir": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz", diff --git a/package.json b/package.json index 4c73d814..047752e4 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,6 @@ "ajv": "6.10.2", "async": "^3.0.1", "chromecast-js": "git+https://github.com/captainyarr/chromecast-js.git", - "gitlab": "^14.0.0", "i18n": "0.8.3", "iconv-lite": "^0.5.0", "jschardet": "2.1.0", diff --git a/src/app/lib/views/about.js b/src/app/lib/views/about.js index 89e760dc..580a8c74 100644 --- a/src/app/lib/views/about.js +++ b/src/app/lib/views/about.js @@ -54,7 +54,7 @@ }, reportIssue: function () { - App.vent.trigger('issue:new'); + App.vent.trigger(); }, closeChangelog: function () { diff --git a/src/app/templates/about.tpl b/src/app/templates/about.tpl index 290da52d..601f931c 100644 --- a/src/app/templates/about.tpl +++ b/src/app/templates/about.tpl @@ -12,8 +12,13 @@ <% } %> -
+ +
+ <%= i18n.__("Report an issue") %>
From 50c36b110e6f2e5ed1f40d11310129c285b437ab Mon Sep 17 00:00:00 2001 From: CaptainYarr24 Date: Wed, 15 Jan 2020 00:26:10 -0800 Subject: [PATCH 22/77] Update Gulp and CircleCI (#110) --- .circleci/config.yml | 292 +++++++++++++++++++++++++++++++++++++++++-- gulpfile.js | 7 +- 2 files changed, 291 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fcf9d7bf..bf8abf49 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,8 +5,8 @@ version: 2.1 jobs: - build: - docker: + checkout: + docker: # specify the version you desire here - image: circleci/node:lts @@ -15,11 +15,57 @@ jobs: # documented at https://circleci.com/docs/2.0/circleci-images/ # - image: circleci/mongo:3.4.4 - working_directory: ~/repo + working_directory: ~/repo + + steps: + - checkout + - save_cache: + key: v1-repo-{{ .Environment.CIRCLE_SHA1 }} + paths: + - ~/repo + + # Download and cache dependencies + - restore_cache: + keys: + - v1-dependencies-{{ checksum "package-lock.json" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- + + # Download and cache node-cache + - restore_cache: + keys: + - v1-nodecache-{{ checksum "gulpfile.js" }} + # fallback to using the latest cache if no exact match is found + - v1-nodecache- + + - run: sudo npm prune + - run: sudo npm install + + #store cache dependencies + - save_cache: + key: v1-dependencies-{{ checksum "package-lock.json" }} + paths: + - node_modules + + #store node cache + - save_cache: + key: v1-nodecache-{{ checksum "gulpfile.js" }} + paths: + - cache + + build_original: + docker: + # specify the version you desire here + - image: circleci/node:lts + + # Specify service dependencies here if necessary + # CircleCI maintains a library of pre-built images + # documented at https://circleci.com/docs/2.0/circleci-images/ + # - image: circleci/mongo:3.4.4 - steps: - - checkout + working_directory: ~/repo + steps: # Download and cache dependencies - restore_cache: keys: @@ -34,8 +80,8 @@ jobs: # fallback to using the latest cache if no exact match is found - v1-nodecache- - - run: npm prune - - run: npm install + - run: sudo npm prune + - run: sudo npm install #- run: sudo npm install -g gulp # run tests! @@ -44,6 +90,49 @@ jobs: - deploy: command: npx gulp zip -p linux32,linux64,win32,win64 + + build_linux64: + docker: + # specify the version you desire here + - image: circleci/node:lts + + # Specify service dependencies here if necessary + # CircleCI maintains a library of pre-built images + # documented at https://circleci.com/docs/2.0/circleci-images/ + # - image: circleci/mongo:3.4.4 + + working_directory: ~/repo + + steps: + - restore_cache: + keys: + - v1-repo-{{ .Environment.CIRCLE_SHA1 }} + - v1-repo- + + # Download and cache dependencies + - restore_cache: + keys: + - v1-dependencies-{{ checksum "package-lock.json" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- + + # Download and cache node-cache + - restore_cache: + keys: + - v1-nodecache-{{ checksum "gulpfile.js" }} + # fallback to using the latest cache if no exact match is found + - v1-nodecache- + + - run: sudo npm prune + - run: sudo npm install + #- run: sudo npm install -g gulp + + # run tests! + #- run: gulp build linux32,linux64,win32,win64,osx64 + - run: npx gulp build -p linux64 + + - deploy: + command: npx gulp zip -p linux64 #store cache dependencies - save_cache: @@ -60,3 +149,192 @@ jobs: - store_artifacts: path: ~/repo/dist + build_linux32: + docker: + # specify the version you desire here + - image: circleci/node:lts + + # Specify service dependencies here if necessary + # CircleCI maintains a library of pre-built images + # documented at https://circleci.com/docs/2.0/circleci-images/ + # - image: circleci/mongo:3.4.4 + + working_directory: ~/repo + + steps: + - restore_cache: + keys: + - v1-repo-{{ .Environment.CIRCLE_SHA1 }} + - v1-repo- + + # Download and cache dependencies + - restore_cache: + keys: + - v1-dependencies-{{ checksum "package-lock.json" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- + + # Download and cache node-cache + - restore_cache: + keys: + - v1-nodecache-{{ checksum "gulpfile.js" }} + # fallback to using the latest cache if no exact match is found + - v1-nodecache- + + - run: sudo npm prune + - run: sudo npm install + + # run tests! + #- run: gulp build linux32,linux64,win32,win64,osx64 + - run: npx gulp build -p linux32 + + - deploy: + command: npx gulp zip -p linux32 + + #store cache dependencies + - save_cache: + key: v1-dependencies-{{ checksum "package-lock.json" }} + paths: + - node_modules + + #store node cache + - save_cache: + key: v1-nodecache-{{ checksum "gulpfile.js" }} + paths: + - cache + + - store_artifacts: + path: ~/repo/dist + + build_win64: + docker: + # specify the version you desire here + - image: circleci/node:lts + + # Specify service dependencies here if necessary + # CircleCI maintains a library of pre-built images + # documented at https://circleci.com/docs/2.0/circleci-images/ + # - image: circleci/mongo:3.4.4 + + working_directory: ~/repo + + steps: + - restore_cache: + keys: + - v1-repo-{{ .Environment.CIRCLE_SHA1 }} + - v1-repo- + + # Download and cache dependencies + - restore_cache: + keys: + - v1-dependencies-{{ checksum "package-lock.json" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- + + # Download and cache node-cache + - restore_cache: + keys: + - v1-nodecache-{{ checksum "gulpfile.js" }} + # fallback to using the latest cache if no exact match is found + - v1-nodecache- + + - run: sudo npm prune + - run: sudo npm install + + # run tests! + #- run: gulp build linux32,linux64,win32,win64,osx64 + - run: npx gulp build -p win64 + + - deploy: + command: npx gulp zip -p win64 + + #store cache dependencies + - save_cache: + key: v1-dependencies-{{ checksum "package-lock.json" }} + paths: + - node_modules + + #store node cache + - save_cache: + key: v1-nodecache-{{ checksum "gulpfile.js" }} + paths: + - cache + + - store_artifacts: + path: ~/repo/dist + + build_win32: + docker: + # specify the version you desire here + - image: circleci/node:lts + + # Specify service dependencies here if necessary + # CircleCI maintains a library of pre-built images + # documented at https://circleci.com/docs/2.0/circleci-images/ + # - image: circleci/mongo:3.4.4 + + working_directory: ~/repo + + steps: + - restore_cache: + keys: + - v1-repo-{{ .Environment.CIRCLE_SHA1 }} + - v1-repo- + + # Download and cache dependencies + - restore_cache: + keys: + - v1-dependencies-{{ checksum "package-lock.json" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- + + # Download and cache node-cache + - restore_cache: + keys: + - v1-nodecache-{{ checksum "gulpfile.js" }} + # fallback to using the latest cache if no exact match is found + - v1-nodecache- + + - run: sudo npm prune + - run: sudo npm install + + # run tests! + #- run: gulp build linux32,linux64,win32,win64,osx64 + - run: npx gulp build -p win32 + + - deploy: + command: npx gulp zip -p win32 + + #store cache dependencies + - save_cache: + key: v1-dependencies-{{ checksum "package-lock.json" }} + paths: + - node_modules + + #store node cache + - save_cache: + key: v1-nodecache-{{ checksum "gulpfile.js" }} + paths: + - cache + + - store_artifacts: + path: ~/repo/dist + + +workflows: + version: 2.1 + build-and-deploy: + jobs: + - checkout + - build_linux64: + requires: + - checkout + - build_linux32: + requires: + - checkout + - build_win32: + requires: + - checkout + - build_win64: + requires: + - checkout diff --git a/gulpfile.js b/gulpfile.js index 21ba3d07..06e61837 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -72,7 +72,12 @@ var buildTask = function () { }; var cleanTask = function () { - return del('build/'); + var item = 0; + + buildplatforms.forEach(item => { + del('build/Popcorn-Time-CE/'+item+'/'); + }); + return del('build/Popcorn-Time-CE/'+item+'/'); } var ffmpegcacheTask = function () { From 3b323c5c39490b4c09d1f2a810af6109a215e66b Mon Sep 17 00:00:00 2001 From: captainyarr Date: Thu, 16 Jan 2020 22:55:38 -0800 Subject: [PATCH 23/77] Fix: Use 'local' as default value when player not pre-selected --- src/app/lib/views/movie_detail.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/lib/views/movie_detail.js b/src/app/lib/views/movie_detail.js index c47765b4..b1fa1910 100644 --- a/src/app/lib/views/movie_detail.js +++ b/src/app/lib/views/movie_detail.js @@ -321,7 +321,11 @@ quality: false, title: this.model.get('title') }); - var tmpPlayer = App.Device.Collection.selected.attributes.id; + + var tmpPlayer = 'local'; + + if(App.Device.Collection.selected != null) + tmpPlayer = App.Device.Collection.selected.attributes.id; App.Device.Collection.setDevice('local'); App.vent.trigger('stream:ready', trailer); App.Device.Collection.setDevice(tmpPlayer); From c0b53fd1ffab2a16cbe80b59745060ebe6a81bce Mon Sep 17 00:00:00 2001 From: captainyarr Date: Wed, 12 Feb 2020 21:38:45 -0800 Subject: [PATCH 24/77] Added WebTrackers --- src/app/settings.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/app/settings.js b/src/app/settings.js index 51cd7397..9cac6229 100644 --- a/src/app/settings.js +++ b/src/app/settings.js @@ -157,6 +157,7 @@ Settings.trackers = [ 'udp://tracker.leechers-paradise.org:6969/announce', 'udp://tracker.internetwarriors.net:1337/announce', 'udp://tracker.openbittorrent.com:80', + 'http://tracker.moxing.party:6969/announce', 'udp://tracker.opentrackr.org:1337/announce', 'udp://tracker.pirateparty.gr:6969/announce', 'udp://tracker.tiny-vps.com:6969/announce', @@ -167,8 +168,11 @@ Settings.trackers = [ 'udp://public.popcorn-tracker.org:6969/announce', 'udp://9.rarbg.to:2710/announce', 'udp://p4p.arenabg.com:1337', - 'wss://tracker.openwebtorrent.com:443/announce', - 'wss://tracker.fastcast.nz:443/announce' + 'https://tracker.bt-hash.com:443/announce', + 'http://explodie.org:6969/announce', + 'wss://tracker.openwebtorrent.com', + 'wss://tracker.btorrent.xyz', + 'wss://tracker.fastcast.nz' ]; // App Settings From 3e4f22512e406e6d6ce3bdc2a44a638566ea0cfd Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sun, 16 Feb 2020 20:47:24 -0800 Subject: [PATCH 25/77] Increase database retention to 14 days --- src/app/database.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/database.js b/src/app/database.js index 03e76609..7df2bd96 100644 --- a/src/app/database.js +++ b/src/app/database.js @@ -7,7 +7,7 @@ async = require('async'), db = {}, data_path = require('nw.gui').App.dataPath, - TTL = 1000 * 60 * 60 * 72; //72 hours + TTL = 1000 * 60 * 60 * 24 * 14; //14 Day retention var startupTime = window.performance.now(); console.debug('Database path: ' + data_path); From 90d4a6564d8e1137af4e6c7da7ca5e453ac09d35 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sun, 16 Feb 2020 20:49:26 -0800 Subject: [PATCH 26/77] Increased sub to 14 day retention --- src/app/lib/providers/opensubtitlesmovies.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/lib/providers/opensubtitlesmovies.js b/src/app/lib/providers/opensubtitlesmovies.js index 34e82369..f216fb0e 100644 --- a/src/app/lib/providers/opensubtitlesmovies.js +++ b/src/app/lib/providers/opensubtitlesmovies.js @@ -11,7 +11,7 @@ useragent: 'Popcorn Time v1' }); - var TTL = 1000 * 60 * 60 * 48; // 48 hours + var TTL = 1000 * 60 * 60 * 24 * 14; // 14 Day retention var OpenSubtitlesMovies = function() { win.debug('OpenSubtitles Init') From e1f2c98ce137450408e603984e1b5a08b3ec3454 Mon Sep 17 00:00:00 2001 From: CaptainYarr24 Date: Mon, 17 Feb 2020 22:16:44 -0800 Subject: [PATCH 27/77] Update config.yml (#121) --- .circleci/config.yml | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bf8abf49..8677a82b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,6 +6,8 @@ version: 2.1 jobs: checkout: + working_directory: ~/repo + docker: # specify the version you desire here - image: circleci/node:lts @@ -15,8 +17,6 @@ jobs: # documented at https://circleci.com/docs/2.0/circleci-images/ # - image: circleci/mongo:3.4.4 - working_directory: ~/repo - steps: - checkout - save_cache: @@ -27,7 +27,7 @@ jobs: # Download and cache dependencies - restore_cache: keys: - - v1-dependencies-{{ checksum "package-lock.json" }} + - v1-dependencies-{{ checksum "package.json" }} # fallback to using the latest cache if no exact match is found - v1-dependencies- @@ -38,12 +38,14 @@ jobs: # fallback to using the latest cache if no exact match is found - v1-nodecache- - - run: sudo npm prune - - run: sudo npm install + #- run: sudo npm prune + - run: + name: update-npm + command: 'sudo npm install' #store cache dependencies - save_cache: - key: v1-dependencies-{{ checksum "package-lock.json" }} + key: v1-dependencies-{{ checksum "package.json" }} paths: - node_modules @@ -69,7 +71,7 @@ jobs: # Download and cache dependencies - restore_cache: keys: - - v1-dependencies-{{ checksum "package-lock.json" }} + - v1-dependencies-{{ checksum "package.json" }} # fallback to using the latest cache if no exact match is found - v1-dependencies- @@ -80,7 +82,7 @@ jobs: # fallback to using the latest cache if no exact match is found - v1-nodecache- - - run: sudo npm prune + #- run: sudo npm prune - run: sudo npm install #- run: sudo npm install -g gulp @@ -112,7 +114,7 @@ jobs: # Download and cache dependencies - restore_cache: keys: - - v1-dependencies-{{ checksum "package-lock.json" }} + - v1-dependencies-{{ checksum "package.json" }} # fallback to using the latest cache if no exact match is found - v1-dependencies- @@ -123,7 +125,7 @@ jobs: # fallback to using the latest cache if no exact match is found - v1-nodecache- - - run: sudo npm prune + #- run: sudo npm prune - run: sudo npm install #- run: sudo npm install -g gulp @@ -136,7 +138,7 @@ jobs: #store cache dependencies - save_cache: - key: v1-dependencies-{{ checksum "package-lock.json" }} + key: v1-dependencies-{{ checksum "package.json" }} paths: - node_modules @@ -170,7 +172,7 @@ jobs: # Download and cache dependencies - restore_cache: keys: - - v1-dependencies-{{ checksum "package-lock.json" }} + - v1-dependencies-{{ checksum "package.json" }} # fallback to using the latest cache if no exact match is found - v1-dependencies- @@ -181,7 +183,7 @@ jobs: # fallback to using the latest cache if no exact match is found - v1-nodecache- - - run: sudo npm prune + #- run: sudo npm prune - run: sudo npm install # run tests! @@ -193,7 +195,7 @@ jobs: #store cache dependencies - save_cache: - key: v1-dependencies-{{ checksum "package-lock.json" }} + key: v1-dependencies-{{ checksum "package.json" }} paths: - node_modules @@ -227,7 +229,7 @@ jobs: # Download and cache dependencies - restore_cache: keys: - - v1-dependencies-{{ checksum "package-lock.json" }} + - v1-dependencies-{{ checksum "package.json" }} # fallback to using the latest cache if no exact match is found - v1-dependencies- @@ -238,7 +240,7 @@ jobs: # fallback to using the latest cache if no exact match is found - v1-nodecache- - - run: sudo npm prune + #- run: sudo npm prune - run: sudo npm install # run tests! @@ -250,7 +252,7 @@ jobs: #store cache dependencies - save_cache: - key: v1-dependencies-{{ checksum "package-lock.json" }} + key: v1-dependencies-{{ checksum "package.json" }} paths: - node_modules @@ -284,7 +286,7 @@ jobs: # Download and cache dependencies - restore_cache: keys: - - v1-dependencies-{{ checksum "package-lock.json" }} + - v1-dependencies-{{ checksum "package.json" }} # fallback to using the latest cache if no exact match is found - v1-dependencies- @@ -295,7 +297,7 @@ jobs: # fallback to using the latest cache if no exact match is found - v1-nodecache- - - run: sudo npm prune + #- run: sudo npm prune - run: sudo npm install # run tests! @@ -307,7 +309,7 @@ jobs: #store cache dependencies - save_cache: - key: v1-dependencies-{{ checksum "package-lock.json" }} + key: v1-dependencies-{{ checksum "package.json" }} paths: - node_modules From a841f5d715a99f07f2c0be5c93d5109edf84155b Mon Sep 17 00:00:00 2001 From: captainyarr Date: Thu, 20 Feb 2020 23:38:02 -0800 Subject: [PATCH 28/77] Fixed Favorites to handle bad movie entries --- src/app/lib/providers/favorites.js | 49 ++++++++++++++++++------------ 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/src/app/lib/providers/favorites.js b/src/app/lib/providers/favorites.js index b55d4206..2ccd7433 100644 --- a/src/app/lib/providers/favorites.js +++ b/src/app/lib/providers/favorites.js @@ -1,46 +1,57 @@ -(function (App) { +(function(App) { 'use strict'; var Q = require('q'); - var Favorites = function () {}; + var Favorites = function() { }; Favorites.prototype.constructor = Favorites; - var queryTorrents = function (filters) { + var queryTorrents = function(filters) { return App.db.getBookmarks(filters) - .then(function (data) { - return data; - }, - function (error) { + .then(function(data) { + return data; + }, + function(error) { return []; }); }; - var formatForPopcorn = function (items) { + var formatForPopcorn = function(items) { var movieList = []; - items.forEach(function (movie) { + items.forEach(function(movie) { var deferred = Q.defer(); // we check if its a movie // or tv show then we extract right data if (movie.type === 'movie') { // its a movie + var _data = movie; Database.getMovie(movie.imdb_id) - .then(function (data) { + .then(function(data) { + if (data) { data.type = 'bookmarkedmovie'; if (/slurm.trakt.us/.test(data.image)) { data.image = data.image.replace(/slurm.trakt.us/, 'walter.trakt.us'); } deferred.resolve(data); - }, - function (err) { + return null; + } else { + throw new Error("Movie IMDB Not Found"); + } + }, + function(err) { deferred.reject(err); - }); + }).then(function(data) {deferred.resolve(data)}, + function(err) { + win.error(err+" "+_data.imdb_id); + Database.deleteBookmark(_data.imdb_id); + deferred.resolve(_data); + }); } else { // its a tv show var _data = null; Database.getTVShowByImdb(movie.imdb_id) - .then(function (data) { + .then(function(data) { data.type = 'bookmarkedshow'; data.imdb = data.imdb_id; // Fallback for old bookmarks without provider in database or marked as Eztv @@ -58,9 +69,9 @@ deferred.resolve(data); return null; } - }, function (err) { + }, function(err) { deferred.reject(err); - }).then(function (data) { + }).then(function(data) { if (data) { // Cache new show and return Database.updateTVShow(data); @@ -69,7 +80,7 @@ data.image = data.images.poster; deferred.resolve(data); } - }, function (err) { + }, function(err) { // Show no longer exists on provider // Scrub bookmark and TV show // But return previous data one last time @@ -86,11 +97,11 @@ return Q.all(movieList); }; - Favorites.prototype.extractIds = function (items) { + Favorites.prototype.extractIds = function(items) { return _.pluck(items, 'imdb_id'); }; - Favorites.prototype.fetch = function (filters) { + Favorites.prototype.fetch = function(filters) { return queryTorrents(filters) .then(formatForPopcorn); }; From 2dbe105c486695d3c86f3f88220504eb53dca7f5 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Fri, 21 Feb 2020 20:25:18 -0800 Subject: [PATCH 29/77] Update promise funtion to reject --- src/app/lib/providers/favorites.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/app/lib/providers/favorites.js b/src/app/lib/providers/favorites.js index 2ccd7433..2d882cd7 100644 --- a/src/app/lib/providers/favorites.js +++ b/src/app/lib/providers/favorites.js @@ -36,17 +36,18 @@ deferred.resolve(data); return null; } else { - throw new Error("Movie IMDB Not Found"); + deferred.reject("Movie IMDB Not Found"); } }, function(err) { deferred.reject(err); - }).then(function(data) {deferred.resolve(data)}, - function(err) { - win.error(err+" "+_data.imdb_id); - Database.deleteBookmark(_data.imdb_id); - deferred.resolve(_data); - }); + }) + .then(function(data) { deferred.resolve(data) }, + function(err) { + win.error(err + " " + _data.imdb_id); + Database.deleteBookmark(_data.imdb_id); + deferred.resolve(_data); + }); } else { // its a tv show var _data = null; From 911411cc2ad78c77e48ad6a8f5d8f2df37a716e5 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sat, 11 Jan 2020 14:48:05 -0800 Subject: [PATCH 30/77] Gulp: Update to 43.4 --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 06e61837..6941231c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -28,7 +28,7 @@ var argv = require('yargs') .argv; //Set Default nw.js version -var nwVersion = '0.41.3'; +var nwVersion = '0.43.4'; var buildDownloadUrl = 'https://dl.nwjs.io/'; nwVersion = argv.nwv ? argv.nwv : nwVersion; From d03e24ba75b4b6f9b1598a11ccd819a4f31a3920 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sun, 26 Jan 2020 10:44:48 -0800 Subject: [PATCH 31/77] Update to 0.43.6 --- gulpfile.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 6941231c..48355b3c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -28,7 +28,7 @@ var argv = require('yargs') .argv; //Set Default nw.js version -var nwVersion = '0.43.4'; +var nwVersion = '0.43.6'; var buildDownloadUrl = 'https://dl.nwjs.io/'; nwVersion = argv.nwv ? argv.nwv : nwVersion; diff --git a/package.json b/package.json index 047752e4..9c98d17b 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "main": "src/app/index.html", "version": "0.4.1-18-develop", "node-remote": "*://*", - "chromium-args": "--password-store=basic", + "chromium-args": "--password-store=basic --remote-debugging-port=9222", "releaseName": "Popcorn Treats", "scripts": { "start": "npx gulp run", From c20d263c6cad41c9a3bdc1cf312025def11bc732 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Mon, 27 Jan 2020 21:50:06 -0800 Subject: [PATCH 32/77] Test 0.44.0 beta1 --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 48355b3c..bc6adf79 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -28,7 +28,7 @@ var argv = require('yargs') .argv; //Set Default nw.js version -var nwVersion = '0.43.6'; +var nwVersion = '0.44.0-beta1'; var buildDownloadUrl = 'https://dl.nwjs.io/'; nwVersion = argv.nwv ? argv.nwv : nwVersion; From bda807b12977ff7fa0f7994e0aa792d44c8dca9b Mon Sep 17 00:00:00 2001 From: captainyarr Date: Mon, 17 Feb 2020 23:24:49 -0800 Subject: [PATCH 33/77] Update nwVersion to 44.1 --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index bc6adf79..7cdfa1a5 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -28,7 +28,7 @@ var argv = require('yargs') .argv; //Set Default nw.js version -var nwVersion = '0.44.0-beta1'; +var nwVersion = '0.44.1'; var buildDownloadUrl = 'https://dl.nwjs.io/'; nwVersion = argv.nwv ? argv.nwv : nwVersion; From 1901b7beef2b0ee1427262204d9139b37746dd26 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Fri, 21 Feb 2020 22:09:19 -0800 Subject: [PATCH 34/77] Updated debug colors --- src/app/app.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/app.js b/src/app/app.js index bcfe98a3..547db1c2 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -39,17 +39,17 @@ win.debug = function() { }; win.info = function() { var params = Array.prototype.slice.call(arguments, 1); - params.unshift('[%cINFO%c] ' + arguments[0], 'color: blue;', 'color: black;'); + params.unshift('%c[%cINFO%c] %c' + arguments[0], 'color: black;','color: blue;', 'color: black;','color: grey;'); console.info.apply(console, params); }; win.warn = function() { var params = Array.prototype.slice.call(arguments, 1); - params.unshift('[%cWARNING%c] ' + arguments[0], 'color: orange;', 'color: black;'); + params.unshift('[%cWARNING%c] %c' + arguments[0], 'color: orange;', 'color: black;','color: grey;'); console.warn.apply(console, params); }; win.error = function() { var params = Array.prototype.slice.call(arguments, 1); - params.unshift('%c[%cERROR%c] ' + arguments[0], 'color: black;', 'color: red;', 'color: black;'); + params.unshift('%c[%cERROR%c] %c' + arguments[0], 'color: black;', 'color: red;', 'color: black;','color: grey;'); console.error.apply(console, params); fs.appendFileSync(path.join(require('nw.gui').App.dataPath, 'logs.txt'), '\n\n' + (arguments[0].stack || arguments[0])); // log errors; }; From 74590e95e377b2f508f0acea82f04a6aa3d60faf Mon Sep 17 00:00:00 2001 From: captainyarr Date: Fri, 28 Feb 2020 23:57:21 -0800 Subject: [PATCH 35/77] Feature: Added Tracker Updater --- package-lock.json | 26 ++++++++++++++++++++++++++ package.json | 1 + src/app/app.js | 1 + src/app/settings.js | 42 ++++++++++++++++++++++++++++++------------ 4 files changed, 58 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 691fd29e..65d2e635 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1601,6 +1601,14 @@ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" }, + "axios": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", + "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", + "requires": { + "follow-redirects": "1.5.10" + } + }, "babel-jest": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz", @@ -4701,6 +4709,24 @@ "readable-stream": "^2.3.6" } }, + "follow-redirects": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "requires": { + "debug": "=3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + } + } + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", diff --git a/package.json b/package.json index 9c98d17b..62c3142e 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "airplay-js": "^0.3.0", "ajv": "6.10.2", "async": "^3.0.1", + "axios": "^0.19.2", "chromecast-js": "git+https://github.com/captainyarr/chromecast-js.git", "i18n": "0.8.3", "iconv-lite": "^0.5.0", diff --git a/src/app/app.js b/src/app/app.js index 547db1c2..2ef70553 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -211,6 +211,7 @@ var initApp = function() { }; App.addInitializer(function(options) { + AdvSettings.updateTrackers(); initTemplates() .then(initApp); }); diff --git a/src/app/settings.js b/src/app/settings.js index 9cac6229..440a073c 100644 --- a/src/app/settings.js +++ b/src/app/settings.js @@ -2,7 +2,8 @@ var Q = require('q'), os = require('os'), path = require('path'), _ = require('underscore'), - data_path = require('nw.gui').App.dataPath; + data_path = require('nw.gui').App.dataPath, + axios = require('axios'); /** Default settings **/ var Settings = {}; @@ -131,7 +132,7 @@ Settings.ytsAPI = [{ }, { url: 'http://yts.ag/', strictSSL: true -},{ +}, { url: 'https://movies.api-fetch.website/', strictSSL: true }]; @@ -148,7 +149,10 @@ Settings.updateEndpoint = { }] }; -Settings.trackersList = ['https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all_udp.txt']; +Settings.trackersList = [ + 'https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_best.txt', + 'https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all_ws.txt' +]; Settings.trackers = [ 'udp://glotorrents.pw:6969/announce', @@ -161,7 +165,6 @@ Settings.trackers = [ 'udp://tracker.opentrackr.org:1337/announce', 'udp://tracker.pirateparty.gr:6969/announce', 'udp://tracker.tiny-vps.com:6969/announce', - 'udp://tracker.vanitycore.co:6969/announce', 'udp://exodus.desync.com:6969/announce', 'udp://p4p.arenabg.ch:1337', 'udp://open.demonii.com:1337/announce', @@ -170,9 +173,7 @@ Settings.trackers = [ 'udp://p4p.arenabg.com:1337', 'https://tracker.bt-hash.com:443/announce', 'http://explodie.org:6969/announce', - 'wss://tracker.openwebtorrent.com', - 'wss://tracker.btorrent.xyz', - 'wss://tracker.fastcast.nz' + 'wss://tracker.openwebtorrent.com' ]; // App Settings @@ -228,9 +229,9 @@ var AdvSettings = { set: function(variable, newValue) { Database.writeSetting({ - key: variable, - value: newValue - }) + key: variable, + value: newValue + }) .then(function() { Settings[variable] = newValue; }); @@ -397,8 +398,8 @@ var AdvSettings = { var cacheDb = openDatabase('cachedb', '', 'Cache database', 50 * 1024 * 1024); cacheDb.transaction(function(tx) { - tx.executeSql('DELETE FROM subtitle',[], function(_, result) {}); - tx.executeSql('DELETE FROM metadata',[], function(_, result) {}); + tx.executeSql('DELETE FROM subtitle', [], function(_, result) { }); + tx.executeSql('DELETE FROM metadata', [], function(_, result) { }); }); // Add an upgrade flag @@ -407,4 +408,21 @@ var AdvSettings = { AdvSettings.set('version', currentVersion); AdvSettings.set('releaseName', gui.App.manifest.releaseName); }, + + updateTrackers: async function() { + + win.info('Update Trackers'); + Settings.trackersList.forEach(async function(item) { + //win.debug('Tracker Started: '+item); + var trackers; + try { + const response = await axios.get(item); + trackers = response.data.split("\n\n"); + Settings.trackers = _.union(Settings.trackers, trackers); + win.debug('Trackers Added: '+item); + } catch (error) { + win.error(error); + } + }) + }, }; \ No newline at end of file From d96ffa0bb9ece0ee48fbadbe2bddeca16fa2f03e Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sun, 1 Mar 2020 23:53:48 -0800 Subject: [PATCH 36/77] Cleaned up trackers --- src/app/settings.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/app/settings.js b/src/app/settings.js index 440a073c..721b7c22 100644 --- a/src/app/settings.js +++ b/src/app/settings.js @@ -155,22 +155,13 @@ Settings.trackersList = [ ]; Settings.trackers = [ - 'udp://glotorrents.pw:6969/announce', - 'udp://tracker.coppersurfer.tk:80', 'udp://tracker.coppersurfer.tk:6969/announce', - 'udp://tracker.leechers-paradise.org:6969/announce', 'udp://tracker.internetwarriors.net:1337/announce', - 'udp://tracker.openbittorrent.com:80', 'http://tracker.moxing.party:6969/announce', 'udp://tracker.opentrackr.org:1337/announce', 'udp://tracker.pirateparty.gr:6969/announce', 'udp://tracker.tiny-vps.com:6969/announce', 'udp://exodus.desync.com:6969/announce', - 'udp://p4p.arenabg.ch:1337', - 'udp://open.demonii.com:1337/announce', - 'udp://public.popcorn-tracker.org:6969/announce', - 'udp://9.rarbg.to:2710/announce', - 'udp://p4p.arenabg.com:1337', 'https://tracker.bt-hash.com:443/announce', 'http://explodie.org:6969/announce', 'wss://tracker.openwebtorrent.com' @@ -417,7 +408,7 @@ var AdvSettings = { var trackers; try { const response = await axios.get(item); - trackers = response.data.split("\n\n"); + trackers = response.data.split("\n\n").filter(function(value,index,arr){ return value != ""}); Settings.trackers = _.union(Settings.trackers, trackers); win.debug('Trackers Added: '+item); } catch (error) { From adcdb3bdb1e4e1c6640ddee49963c1d2b7007884 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Mon, 2 Mar 2020 01:17:26 -0800 Subject: [PATCH 37/77] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 45d53619..fdcd4ff1 100644 --- a/.gitignore +++ b/.gitignore @@ -353,6 +353,7 @@ __pycache__/ #vscode .vscode/ +.code-workspace #snap parts/ From 2cc51688301ff3a6924e65e80f48fef0f3e5c528 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Mon, 2 Mar 2020 01:17:56 -0800 Subject: [PATCH 38/77] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fdcd4ff1..c8535484 100644 --- a/.gitignore +++ b/.gitignore @@ -353,7 +353,7 @@ __pycache__/ #vscode .vscode/ -.code-workspace +*.code-workspace #snap parts/ From 21ff661418a84d075d55b028579cb62b1bec3d40 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Wed, 29 Apr 2020 21:37:51 -0700 Subject: [PATCH 39/77] =?UTF-8?q?Update=20opensubtitles-api=20to=20the=20l?= =?UTF-8?q?atest=20version=20=F0=9F=9A=80=20(#133)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(package): update opensubtitles-api to version 5.1.1 * chore(package): update lockfile package-lock.json Co-authored-by: greenkeeper[bot] <23040076+greenkeeper[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 65d2e635..e0844951 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10146,9 +10146,9 @@ "integrity": "sha1-QsPhjslUZra/DcQvOilFw/DK2Pw=" }, "opensubtitles-api": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/opensubtitles-api/-/opensubtitles-api-5.1.0.tgz", - "integrity": "sha512-zhRN46muo7DL7e4USke++rsnEFKpVLvaMFmLYueUuq8sgCNgDydN+9ildUpcuNDwZmd8p5sl6tjigXtvggIM+g==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/opensubtitles-api/-/opensubtitles-api-5.1.1.tgz", + "integrity": "sha512-FU/tBfMUSisFlmOmvbU8ONaUnAFkN1mb/I75CbjhqNsvKtdZhfEL4eFx+XWswLbX1P1n/K7IY6az5P4bGafiBA==", "requires": { "urijs": "^1.19.1", "xmlrpc": "^1.3.2" diff --git a/package.json b/package.json index 62c3142e..d0fe070e 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "node-tvdb": "^4.0.0", "node-webkit-fdialogs": "^0.2.7", "nodecast-js": "^1.0.3", - "opensubtitles-api": "5.1.0", + "opensubtitles-api": "5.1.1", "opensubtitles-ce": "^1.0.0", "os-name": "^3.1.0", "parse-torrent": "^7.0.1", From f06d6a453b835f9b6f6bacc1bb7a81e0a8248bca Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Wed, 29 Apr 2020 21:40:13 -0700 Subject: [PATCH 40/77] =?UTF-8?q?Update=20webtorrent=20to=20the=20latest?= =?UTF-8?q?=20version=20=F0=9F=9A=80=20(#129)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(package): update webtorrent to version 0.108.0 * chore(package): update lockfile package-lock.json Co-authored-by: greenkeeper[bot] <23040076+greenkeeper[bot]@users.noreply.github.com> --- package-lock.json | 94 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 46 insertions(+), 50 deletions(-) diff --git a/package-lock.json b/package-lock.json index e0844951..8c9a436d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1564,7 +1564,8 @@ "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==" + "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==", + "dev": true }, "async-settle": { "version": "1.0.0", @@ -1913,9 +1914,9 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "readable-stream": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", - "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -2005,9 +2006,9 @@ }, "dependencies": { "readable-stream": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", - "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -2566,9 +2567,9 @@ }, "dependencies": { "readable-stream": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", - "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -2992,9 +2993,9 @@ }, "dependencies": { "readable-stream": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", - "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -4582,9 +4583,9 @@ }, "dependencies": { "readable-stream": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", - "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -9111,9 +9112,9 @@ }, "dependencies": { "readable-stream": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", - "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -9359,9 +9360,9 @@ }, "dependencies": { "readable-stream": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", - "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -9409,9 +9410,9 @@ }, "dependencies": { "readable-stream": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", - "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -11021,9 +11022,9 @@ }, "dependencies": { "readable-stream": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", - "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -13975,9 +13976,9 @@ "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==" }, "webtorrent": { - "version": "0.107.17", - "resolved": "https://registry.npmjs.org/webtorrent/-/webtorrent-0.107.17.tgz", - "integrity": "sha512-Oe7d3+jpmPRDAc645PccIJPYa2w3n3BEiMU7J/Q76QSPF3SDUK8jO7keUCC2qk4ckcbdkb98bYK6/uK7M8vsRA==", + "version": "0.108.0", + "resolved": "https://registry.npmjs.org/webtorrent/-/webtorrent-0.108.0.tgz", + "integrity": "sha512-euLFLpTEU1sIS2Bevc6aYxubC6AYGheqkqKDGBGSCdHFqY03+veoB7Gjat7TYy8zQJ04HOR+g66t5tOVUQfAPg==", "requires": { "addr-to-ip-port": "^1.4.2", "bitfield": "^3.0.0", @@ -13987,7 +13988,7 @@ "chunk-store-stream": "^4.0.0", "create-torrent": "^4.0.0", "debug": "^4.1.0", - "end-of-stream": "^1.1.0", + "end-of-stream": "1.4.1", "escape-html": "^1.0.3", "fs-chunk-store": "^2.0.0", "http-node": "github:feross/http-node#webtorrent", @@ -14017,7 +14018,6 @@ "stream-with-known-length-to-buffer": "^1.0.0", "torrent-discovery": "^9.1.1", "torrent-piece": "^2.0.0", - "uniq": "^1.0.1", "unordered-array-remove": "^1.0.2", "ut_metadata": "^3.3.0", "ut_pex": "^2.0.0" @@ -14046,9 +14046,9 @@ } }, "bittorrent-tracker": { - "version": "9.14.4", - "resolved": "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.14.4.tgz", - "integrity": "sha512-2Y/MNRjYhysD6t4r38z7l1WTT7g23IAqRWZRsj7xnnpciFn4xE4qiKmyFwA4gtbFGAZ14K3DdaqZbiQsC3PEfQ==", + "version": "9.14.5", + "resolved": "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.14.5.tgz", + "integrity": "sha512-Y1ng5r2qGCgDldjd9eYL8Mv1DjCo6eljqC+T6IMcwmYx0h20KNPKTxJkyNT5gaeJkAhM+p+jmhlV7/ty535Txg==", "requires": { "bencode": "^2.0.0", "bittorrent-peerid": "^1.0.2", @@ -14069,16 +14069,15 @@ "simple-peer": "^9.0.0", "simple-websocket": "^8.0.0", "string2compact": "^1.1.1", - "uniq": "^1.0.1", "unordered-array-remove": "^1.0.2", "utf-8-validate": "^5.0.1", "ws": "^7.0.0" } }, "bn.js": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.0.0.tgz", - "integrity": "sha512-bVwDX8AF+72fIUNuARelKAlQUNtPOfG2fRxorbVvFk4zpHbqLrPdOGfVg5vrKwVzLLePqPBiATaOZNELQzmS0A==" + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.1.tgz", + "integrity": "sha512-IUTD/REb78Z2eodka1QZyyEk66pciRcP6Sroka0aI3tG/iwIdYLrBD62RsubR7vqdt3WyX8p4jxeatzmRSphtA==" }, "debug": { "version": "4.1.1", @@ -14137,9 +14136,9 @@ } }, "readable-stream": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", - "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -14201,12 +14200,9 @@ "integrity": "sha512-H/Z/yCuvZJj1vl1IQHI8dvF2QrUuXRJoptT5DW5967/dsLpXlCg+uyhFR5lfNj5mNaYePUbKtnL+qKWZGXv4Nw==" }, "ws": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.0.tgz", - "integrity": "sha512-+SqNqFbwTm/0DC18KYzIsMTnEWpLwJsiasW/O17la4iDRRIO9uaHbvKiAS3AHgTiuuWerK/brj4O6MYZkei9xg==", - "requires": { - "async-limiter": "^1.0.0" - } + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", + "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==" } } }, diff --git a/package.json b/package.json index d0fe070e..32bfc044 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "underscore": "1.9.2", "upnp-mediarenderer-client": "^1.2.1", "urijs": "^1.19.2", - "webtorrent": "^0.107.17", + "webtorrent": "^0.108.0", "xmlbuilder": "^13.0.2" }, "devDependencies": { From cc7833276dd573ef946b6322701d244a9673e7c5 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Wed, 29 Apr 2020 22:09:59 -0700 Subject: [PATCH 41/77] =?UTF-8?q?Update=20i18n=20to=20the=20latest=20versi?= =?UTF-8?q?on=20=F0=9F=9A=80=20(#127)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(package): update i18n to version 0.8.6 * chore(package): update lockfile package-lock.json Co-authored-by: greenkeeper[bot] <23040076+greenkeeper[bot]@users.noreply.github.com> --- package-lock.json | 264 +++++++--------------------------------------- package.json | 2 +- 2 files changed, 39 insertions(+), 227 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8c9a436d..efff13fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -930,43 +930,6 @@ "uri-js": "^4.2.2" } }, - "ambi": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/ambi/-/ambi-2.5.0.tgz", - "integrity": "sha1-fI43K+SIkRV+fOoBy2+RQ9H3QiA=", - "requires": { - "editions": "^1.1.1", - "typechecker": "^4.3.0" - }, - "dependencies": { - "typechecker": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/typechecker/-/typechecker-4.7.0.tgz", - "integrity": "sha512-4LHc1KMNJ6NDGO+dSM/yNfZQRtp8NN7psYrPHUblD62Dvkwsp3VShsbM78kOgpcmMkRTgvwdKOTjctS+uMllgQ==", - "requires": { - "editions": "^2.1.0" - }, - "dependencies": { - "editions": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/editions/-/editions-2.1.3.tgz", - "integrity": "sha512-xDZyVm0A4nLgMNWVVLJvcwMjI80ShiH/27RyLiCnW1L273TcJIA25C4pwJ33AWV01OX6UriP35Xu+lH4S7HWQw==", - "requires": { - "errlop": "^1.1.1", - "semver": "^5.6.0" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - } - } - } - } - } - } - }, "ansi-align": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", @@ -3056,11 +3019,6 @@ "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=", "dev": true }, - "csextends": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/csextends/-/csextends-1.2.0.tgz", - "integrity": "sha512-S/8k1bDTJIwuGgQYmsRoE+8P+ohV32WhQ0l4zqrc0XDdxOhjQQD7/wTZwCzoZX53jSX3V/qwjT+OkPTxWQcmjg==" - }, "css-select": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", @@ -3514,14 +3472,6 @@ "object.defaults": "^1.1.0" } }, - "eachr": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/eachr/-/eachr-2.0.4.tgz", - "integrity": "sha1-Rm98qhBwj2EFCeMsgHqv5X/BIr8=", - "requires": { - "typechecker": "^2.0.8" - } - }, "ecc-jsbn": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", @@ -3532,11 +3482,6 @@ "safer-buffer": "^2.1.0" } }, - "editions": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz", - "integrity": "sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==" - }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -3574,32 +3519,6 @@ "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" }, - "errlop": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/errlop/-/errlop-1.1.1.tgz", - "integrity": "sha512-WX7QjiPHhsny7/PQvrhS5VMizXXKoKCS3udaBp8gjlARdbn+XmK300eKBAAN0hGyRaTCtRpOaxK+xFVPUJ3zkw==", - "requires": { - "editions": "^2.1.2" - }, - "dependencies": { - "editions": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/editions/-/editions-2.1.3.tgz", - "integrity": "sha512-xDZyVm0A4nLgMNWVVLJvcwMjI80ShiH/27RyLiCnW1L273TcJIA25C4pwJ33AWV01OX6UriP35Xu+lH4S7HWQw==", - "requires": { - "errlop": "^1.1.1", - "semver": "^5.6.0" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - } - } - } - } - }, "error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", @@ -4289,21 +4208,6 @@ } } }, - "extendr": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/extendr/-/extendr-2.1.0.tgz", - "integrity": "sha1-MBqgu+pWX00tyPVw8qImEahSe1Y=", - "requires": { - "typechecker": "~2.0.1" - }, - "dependencies": { - "typechecker": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz", - "integrity": "sha1-6D2oS7ZMWEzLNFg4V2xAsDN9uC4=" - } - } - }, "external-editor": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", @@ -4389,21 +4293,6 @@ } } }, - "extract-opts": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/extract-opts/-/extract-opts-2.2.0.tgz", - "integrity": "sha1-H6KOunNSxttID4hc63GkaBC+bX0=", - "requires": { - "typechecker": "~2.0.1" - }, - "dependencies": { - "typechecker": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz", - "integrity": "sha1-6D2oS7ZMWEzLNFg4V2xAsDN9uC4=" - } - } - }, "extract-zip": { "version": "1.6.7", "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz", @@ -5658,11 +5547,6 @@ "url-parse-lax": "^1.0.0" } }, - "graceful-fs": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz", - "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=" - }, "graceful-fs-extra": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/graceful-fs-extra/-/graceful-fs-extra-2.0.0.tgz", @@ -6313,16 +6197,16 @@ } }, "i18n": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/i18n/-/i18n-0.8.3.tgz", - "integrity": "sha1-LYzxwkciYCwgQdAbpq5eqlE4jw4=", + "version": "0.8.6", + "resolved": "https://registry.npmjs.org/i18n/-/i18n-0.8.6.tgz", + "integrity": "sha512-aMsJq8i1XXrb+BBsgmJBwak9mr69zPEIAUPb6c5yw2G/O4k1Q52lBxL+agZdQDN/RGf1ylQzrCswsOOgIiC1FA==", "requires": { "debug": "*", - "make-plural": "^3.0.3", - "math-interval-parser": "^1.1.0", - "messageformat": "^0.3.1", + "make-plural": "^6.0.1", + "math-interval-parser": "^2.0.1", + "messageformat": "^2.3.0", "mustache": "*", - "sprintf-js": ">=1.0.3" + "sprintf-js": "^1.1.2" } }, "iconv-lite": { @@ -6345,20 +6229,6 @@ "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==", "dev": true }, - "ignorefs": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/ignorefs/-/ignorefs-1.2.0.tgz", - "integrity": "sha1-2ln7hYl25KXkNwLM0fKC/byeV1Y=", - "requires": { - "editions": "^1.3.3", - "ignorepatterns": "^1.1.0" - } - }, - "ignorepatterns": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ignorepatterns/-/ignorepatterns-1.1.0.tgz", - "integrity": "sha1-rI9DbyI5td+2bV8NOpBKh6xnzF4=" - }, "immediate": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", @@ -8977,12 +8847,9 @@ } }, "make-plural": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/make-plural/-/make-plural-3.0.6.tgz", - "integrity": "sha1-IDOgO6wpC487uRJY9lud9+iwHKc=", - "requires": { - "minimist": "^1.2.0" - } + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/make-plural/-/make-plural-6.1.0.tgz", + "integrity": "sha512-0ekbPHqxcdRcmjZ43TkRuejK5rXgMF1OjG4FVnVHgCvOcjrexaSX7a0dfAvqhOm1qWPgjYnXtmz3cHpHW5ZewA==" }, "makeerror": { "version": "1.0.11", @@ -9068,12 +8935,9 @@ } }, "math-interval-parser": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/math-interval-parser/-/math-interval-parser-1.1.0.tgz", - "integrity": "sha1-2+2lsGsySZc8bfYXD94jhvCv2JM=", - "requires": { - "xregexp": "^2.0.0" - } + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/math-interval-parser/-/math-interval-parser-2.0.1.tgz", + "integrity": "sha512-VmlAmb0UJwlvMyx8iPhXUDnVW1F9IrGEd9CIOmv+XL8AErCUUuozoDMrgImvnYt2A+53qVX/tPW6YJurMKYsvA==" }, "mdns-js": { "version": "0.5.0", @@ -9180,36 +9044,35 @@ "dev": true }, "messageformat": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/messageformat/-/messageformat-0.3.1.tgz", - "integrity": "sha1-5Y//gkXps5cXmeW0PbWLPpQX9aI=", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/messageformat/-/messageformat-2.3.0.tgz", + "integrity": "sha512-uTzvsv0lTeQxYI2y1NPa1lItL5VRI8Gb93Y2K2ue5gBPyrbJxfDi/EYWxh2PKv5yO42AJeeqblS9MJSh/IEk4w==", "requires": { - "async": "~1.5.2", - "glob": "~6.0.4", - "make-plural": "~3.0.3", - "nopt": "~3.0.6", - "watchr": "~2.4.13" + "make-plural": "^4.3.0", + "messageformat-formatters": "^2.0.1", + "messageformat-parser": "^4.1.2" }, "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" - }, - "glob": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", + "make-plural": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/make-plural/-/make-plural-4.3.0.tgz", + "integrity": "sha512-xTYd4JVHpSCW+aqDof6w/MebaMVNTVYBZhbB/vi513xXdiPT92JMVCo0Jq8W2UZnzYRFeVbQiQ+I25l13JuKvA==", "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "minimist": "^1.2.0" } } } }, + "messageformat-formatters": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/messageformat-formatters/-/messageformat-formatters-2.0.1.tgz", + "integrity": "sha512-E/lQRXhtHwGuiQjI7qxkLp8AHbMD5r2217XNe/SREbBlSawe0lOqsFb7rflZJmlQFSULNLIqlcjjsCPlB3m3Mg==" + }, + "messageformat-parser": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/messageformat-parser/-/messageformat-parser-4.1.2.tgz", + "integrity": "sha512-7dWuifeyldz7vhEuL96Kwq1fhZXBW+TUfbnHN4UCrCxoXQTYjHnR78eI66Gk9LaLLsAvzPNVJBaa66DRfFNaiA==" + }, "methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", @@ -9422,9 +9285,9 @@ } }, "mustache": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/mustache/-/mustache-3.0.1.tgz", - "integrity": "sha512-jFI/4UVRsRYdUbuDTKT7KzfOp7FiD5WzYmmwNwXyUVypC0xjoTL78Fqc0jHUPIvvGD+6DQSPHIt1NE7D1ArsqA==" + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.0.1.tgz", + "integrity": "sha512-yL5VE97+OXn4+Er3THSmTdCFCtx5hHWzrolvH+JObZnUYwuaG7XV+Ch4fR2cIrcYI0tFHxS7iyFYl14bW8y2sA==" }, "mute-stdout": { "version": "1.0.1", @@ -9696,6 +9559,7 @@ "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "dev": true, "requires": { "abbrev": "1" } @@ -11655,14 +11519,6 @@ "ret": "~0.1.10" } }, - "safefs": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/safefs/-/safefs-3.2.2.tgz", - "integrity": "sha1-gXDBRE1wOOCMrqBaN0+uL6NJ4Vw=", - "requires": { - "graceful-fs": "*" - } - }, "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -11750,16 +11606,6 @@ "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz", "integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk=" }, - "scandirectory": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/scandirectory/-/scandirectory-2.5.0.tgz", - "integrity": "sha1-bOA/VKCQtmjjy+2/IO354xBZPnI=", - "requires": { - "ignorefs": "^1.0.0", - "safefs": "^3.1.2", - "taskgroup": "^4.0.5" - } - }, "semver": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.0.tgz", @@ -12693,15 +12539,6 @@ "xtend": "^4.0.0" } }, - "taskgroup": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/taskgroup/-/taskgroup-4.3.1.tgz", - "integrity": "sha1-feGT/r12gnPEV3MElwJNUSwnkVo=", - "requires": { - "ambi": "^2.2.0", - "csextends": "^1.0.3" - } - }, "temp": { "version": "0.9.1", "resolved": "https://registry.npmjs.org/temp/-/temp-0.9.1.tgz", @@ -13246,11 +13083,6 @@ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", "dev": true }, - "typechecker": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/typechecker/-/typechecker-2.1.0.tgz", - "integrity": "sha1-0cIJOlT/ihn1jP+HfuqlTyJC04M=" - }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", @@ -13935,21 +13767,6 @@ "makeerror": "1.0.x" } }, - "watchr": { - "version": "2.4.13", - "resolved": "https://registry.npmjs.org/watchr/-/watchr-2.4.13.tgz", - "integrity": "sha1-10hHu01vkPYf4sdPn2hmKqDgdgE=", - "requires": { - "eachr": "^2.0.2", - "extendr": "^2.1.0", - "extract-opts": "^2.2.0", - "ignorefs": "^1.0.0", - "safefs": "^3.1.2", - "scandirectory": "^2.5.0", - "taskgroup": "^4.2.0", - "typechecker": "^2.0.8" - } - }, "weak-map": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz", @@ -14492,11 +14309,6 @@ } } }, - "xregexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz", - "integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=" - }, "xtend": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", diff --git a/package.json b/package.json index 32bfc044..06853114 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "async": "^3.0.1", "axios": "^0.19.2", "chromecast-js": "git+https://github.com/captainyarr/chromecast-js.git", - "i18n": "0.8.3", + "i18n": "0.8.6", "iconv-lite": "^0.5.0", "jschardet": "2.1.0", "json-rpc2": "^1.0.2", From ad7fec6735b3dd04e556d6308e6692a8f6b28512 Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Wed, 6 May 2020 06:11:56 +0300 Subject: [PATCH 42/77] [Snyk] Upgrade ajv from 6.10.2 to 6.12.2 (#139) * fix: upgrade ajv from 6.10.2 to 6.12.2 Snyk has created this PR to upgrade ajv from 6.10.2 to 6.12.2. See this package in NPM: https://www.npmjs.com/package/ajv See this project in Snyk: https://app.snyk.io/org/captainyarr/project/93cfe595-604d-45b5-a6c9-04ccc80b8ae2?utm_source=github&utm_medium=upgrade-pr * fix: upgrade ajv from 6.10.2 to 6.12.2 Snyk has created this PR to upgrade ajv from 6.10.2 to 6.12.2. See this package in NPM: https://www.npmjs.com/package/ajv See this project in Snyk: https://app.snyk.io/org/captainyarr/project/93cfe595-604d-45b5-a6c9-04ccc80b8ae2?utm_source=github&utm_medium=upgrade-pr --- package-lock.json | 15 +++++++++++---- package.json | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index efff13fb..f11b732a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -920,14 +920,21 @@ } }, "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", + "version": "6.12.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", + "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", "requires": { - "fast-deep-equal": "^2.0.1", + "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" + }, + "dependencies": { + "fast-deep-equal": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", + "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==" + } } }, "ansi-align": { diff --git a/package.json b/package.json index 06853114..8ab8f489 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "dependencies": { "adm-zip": "0.4.13", "airplay-js": "^0.3.0", - "ajv": "6.10.2", + "ajv": "6.12.2", "async": "^3.0.1", "axios": "^0.19.2", "chromecast-js": "git+https://github.com/captainyarr/chromecast-js.git", From 50827522386ac77fab9319e0b95d0dd0ef37d24d Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sun, 15 Mar 2020 01:35:16 -0700 Subject: [PATCH 43/77] Chromecast: Enabled auto discovery of new chromecast device on a set period of time. --- src/app/lib/device/chromecast.js | 14 ++++++++++++++ src/app/lib/providers/opensubtitlesmovies.js | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/app/lib/device/chromecast.js b/src/app/lib/device/chromecast.js index 57e76961..ee4ea91f 100644 --- a/src/app/lib/device/chromecast.js +++ b/src/app/lib/device/chromecast.js @@ -172,5 +172,19 @@ })); }); + setInterval(updateChromecast, 180 * 1000); //seconds * 1000ms + + function updateChromecast() { + win.debug('Scanning: Local Network for updated Chromecast devices'); + + var browser = new chromecast.Browser(); + + browser.on('deviceOn', function(device) { + collection.add(new Chromecast({ + device: device + })); + }); + } + App.Device.Chromecast = Chromecast; })(window.App); diff --git a/src/app/lib/providers/opensubtitlesmovies.js b/src/app/lib/providers/opensubtitlesmovies.js index f216fb0e..1f1fd7a7 100644 --- a/src/app/lib/providers/opensubtitlesmovies.js +++ b/src/app/lib/providers/opensubtitlesmovies.js @@ -175,12 +175,13 @@ _.map(imdbIds, function(id) { var deferred = Q.defer(); setTimeout(function() { - //win.debug("Search Start: "+id); + win.debug("Search Start: "+id); OS.search({ imdbid: id, gzip: false }).then(subtitles => { //win.debug("OS:Subtitles: "+JSON.stringify(subtitles)); + win.debug("Search End: "+id); if (subtitles) { deferred.resolve({ [id]: subtitles From 41e69af42122ea68cf317b67b04e5f635682cae4 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Thu, 20 Feb 2020 22:28:16 -0800 Subject: [PATCH 44/77] Update Debug values --- src/app/language/en.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/language/en.json b/src/app/language/en.json index c560c83a..05793123 100644 --- a/src/app/language/en.json +++ b/src/app/language/en.json @@ -559,5 +559,6 @@ "reality": "reality", "crime": "crime", "action": "action", - "This version of Popcorn Time CE is a fork based on Popcorntime Community.": "This version of Popcorn Time CE is a fork based on Popcorntime Community." + "This version of Popcorn Time CE is a fork based on Popcorntime Community.": "This version of Popcorn Time CE is a fork based on Popcorntime Community.", + "animation": "animation" } \ No newline at end of file From d98a82fb3db94c605b8a05f816d68d51687e6442 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Thu, 21 May 2020 23:14:17 -0700 Subject: [PATCH 45/77] Settings: Updated default endpoints for Movies and TV --- src/app/settings.js | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/app/settings.js b/src/app/settings.js index 721b7c22..7f82a9f8 100644 --- a/src/app/settings.js +++ b/src/app/settings.js @@ -118,25 +118,29 @@ Settings.opensubtitlesAuthenticated = false; Settings.opensubtitlesUsername = ""; Settings.opensubtitlesPassword = ""; -Settings.tvAPI = [{ - url: 'https://api-fetch.website/tv/', +Settings.defaultTvAPI = [{ + url: 'https://tv-v2.api-fetch.sh/', strictSSL: true }, { - url: 'https://tv-v2.api-fetch.website', + url: 'https://tv-v2.api-fetch.am/', + strictSSL: true +}, { + url: 'https://tv-v2.api-fetch.website/', strictSSL: true }]; -Settings.ytsAPI = [{ +Settings.tvAPI = Settings.defaultTvAPI; + +Settings.defaultMovieAPI = [{ url: 'http://yts.am/', strictSSL: true }, { url: 'http://yts.ag/', strictSSL: true -}, { - url: 'https://movies.api-fetch.website/', - strictSSL: true }]; +Settings.ytsAPI = Settings.defaultMovieAPI; + Settings.updateEndpoint = { url: '',//'http://popcorntime.ag/', index: 0, @@ -408,9 +412,9 @@ var AdvSettings = { var trackers; try { const response = await axios.get(item); - trackers = response.data.split("\n\n").filter(function(value,index,arr){ return value != ""}); + trackers = response.data.split("\n\n").filter(function(value, index, arr) { return value != "" }); Settings.trackers = _.union(Settings.trackers, trackers); - win.debug('Trackers Added: '+item); + win.debug('Trackers Added: ' + item); } catch (error) { win.error(error); } From 422adbf3021b9886062800b04646416f08e415d4 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Fri, 22 May 2020 00:43:31 -0700 Subject: [PATCH 46/77] Endpoints: Able to add new endpoint and defaults --- src/app/lib/providers/yts.js | 164 ++++++++++++++++------- src/app/lib/views/settings_container.js | 41 +++--- src/app/settings.js | 5 +- src/app/templates/settings-container.tpl | 4 +- 4 files changed, 139 insertions(+), 75 deletions(-) diff --git a/src/app/lib/providers/yts.js b/src/app/lib/providers/yts.js index c642ed9b..5f4644fd 100644 --- a/src/app/lib/providers/yts.js +++ b/src/app/lib/providers/yts.js @@ -1,8 +1,8 @@ -(function (App) { +(function(App) { 'use strict'; var Q = require('q'); - var request = require('request'); + var axios = require('axios'); var inherits = require('util').inherits; function YTS() { @@ -14,11 +14,11 @@ } inherits(YTS, App.Providers.Generic); - YTS.prototype.extractIds = function (items) { + YTS.prototype.extractIds = function(items) { return _.pluck(items.results, 'imdb_id'); }; - var format = function (data) { + var format = function(data) { /* var results = _.chain(data.movies) .filter(function (movie) { @@ -27,47 +27,47 @@ return torrent.quality !== '3D'; }); })*/ - var tracker_list = ''; + var tracker_list = ''; - Settings.trackers.forEach(function (item) { - tracker_list += '&tr=' + item; - }); + Settings.trackers.forEach(function(item) { + tracker_list += '&tr=' + item; + }); - var results = _.chain(data.movies).map(function (movie) { - return { - type: 'movie', - id: movie.id, - imdb_id: movie.imdb_code, - title: movie.title, - slug: movie.slug, - year: movie.year, - genre: movie.genres, - directors: movie.directors, - cast: movie.cast, - rating: movie.rating, - runtime: movie.runtime, - image: movie.medium_cover_image, - cover: movie.medium_cover_image, //movie.large_cover_image, - backdrop: movie.background_image, - synopsis: movie.synopsis, - trailer: 'https://www.youtube.com/watch?v=' + movie.yt_trailer_code || false, - google_video: movie.google_video || false, - certification: movie.mpa_rating, - torrents: _.reduce(movie.torrents, function (torrents, torrent) { - if (torrent.quality !== '3D') { - torrents[torrent.quality] = { - url: torrent.url, - magnet: 'magnet:?xt=urn:btih:' + torrent.hash + tracker_list, - size: torrent.size_bytes, - filesize: torrent.size, - seed: torrent.seeds, - peer: torrent.peers - }; - } - return torrents; - }, {}) - }; - }).value(); + var results = _.chain(data.movies).map(function(movie) { + return { + type: 'movie', + id: movie.id, + imdb_id: movie.imdb_code, + title: movie.title, + slug: movie.slug, + year: movie.year, + genre: movie.genres, + directors: movie.directors, + cast: movie.cast, + rating: movie.rating, + runtime: movie.runtime, + image: movie.medium_cover_image, + cover: movie.medium_cover_image, //movie.large_cover_image, + backdrop: movie.background_image, + synopsis: movie.synopsis, + trailer: 'https://www.youtube.com/watch?v=' + movie.yt_trailer_code || false, + google_video: movie.google_video || false, + certification: movie.mpa_rating, + torrents: _.reduce(movie.torrents, function(torrents, torrent) { + if (torrent.quality !== '3D') { + torrents[torrent.quality] = { + url: torrent.url, + magnet: 'magnet:?xt=urn:btih:' + torrent.hash + tracker_list, + size: torrent.size_bytes, + filesize: torrent.size, + seed: torrent.seeds, + peer: torrent.peers + }; + } + return torrents; + }, {}) + }; + }).value(); return { results: Common.sanitize(results), @@ -75,7 +75,7 @@ }; }; - YTS.prototype.fetch = function (filters) { + YTS.prototype.fetch = function(filters) { var params = { sort_by: 'seeds', limit: 50, @@ -103,14 +103,14 @@ case 'last added': params.sort_by = 'date_added'; break; - case 'last added & google cloud': + case 'last added & google cloud': params.sort_by = 'google_cloud'; - App.settings['chosenPlayer'] = 'googlecloud'; + App.settings['chosenPlayer'] = 'googlecloud'; break; - case 'downloads': + case 'downloads': params.sort_by = 'download_count'; break; - case 'likes': + case 'likes': params.sort_by = 'like_count'; break; default: @@ -128,15 +128,74 @@ var defer = Q.defer(); + + function getAxios(index) { + + //Convert to axios + var options = { + url: Settings.ytsAPI[index].url + 'api/v2/list_movies.json', + params: params + }; + + win.info("Request to YTS API: " + options.url); + + var req = jQuery.extend(true, {}, Settings.ytsAPI[index], options); + + axios(req).then(function(res) { + if (res.status >= 400 || (res.data && !res.data.data)) { + win.warn('YTS API endpoint \'%s\' failed.', Settings.ytsAPI[index].url); + if (index + 1 >= Settings.ytsAPI.length) { + return defer.reject(err || 'Status Code is above 400'); + } else { + getAxios(index + 1); + } + return; + } else if (!res.data || res.data.status === 'error') { + err = res.data ? res.data.status_message : 'No data returned'; + return defer.reject(err); + } else { + return defer.resolve(format(res.data.data)); + } + + }).catch(function(error) { + if (error.response) { + // The request was made and the server responded with a status code + // that falls out of the range of 2xx + win.error(error.response.status); + } else if (error.request) { + // The request was made but no response was received + // `error.request` is an instance of XMLHttpRequest in the browser and an instance of + // http.ClientRequest in node.js + win.error(error.request); + } else { + // Something happened in setting up the request that triggered an Error + win.error('Error', error.message); + } + + //If error state check if another endpoint is available and retry + if (index + 1 >= Settings.ytsAPI.length) { + return defer.reject(error.message || 'Status Code is above 400'); + } else { + getAxios(index + 1); + } + return; + }); + } + function get(index) { + var options = { uri: Settings.ytsAPI[index].url + 'api/v2/list_movies.json', qs: params, json: true, timeout: 10000 }; + + win.info("Request to YTS API: " + options.uri); + var req = jQuery.extend(true, {}, Settings.ytsAPI[index], options); - request(req, function (err, res, data) { + + request(req, function(err, res, data) { if (err || res.statusCode >= 400 || (data && !data.data)) { win.warn('YTS API endpoint \'%s\' failed.', Settings.ytsAPI[index].url); if (index + 1 >= Settings.ytsAPI.length) { @@ -153,7 +212,10 @@ } }); } - get(0); + + //Get Movie list via request + //get(0); + getAxios(0); return defer.promise; }; @@ -190,7 +252,7 @@ return defer.promise; };*/ - YTS.prototype.detail = function (torrent_id, old_data) { + YTS.prototype.detail = function(torrent_id, old_data) { return Q(old_data); }; diff --git a/src/app/lib/views/settings_container.js b/src/app/lib/views/settings_container.js index d85560e9..1a0d04de 100644 --- a/src/app/lib/views/settings_container.js +++ b/src/app/lib/views/settings_container.js @@ -132,16 +132,10 @@ }, resetMovieAPI: function() { - var value = [{ - url: 'http://yts.am/', - strictSSL: true - }, - { - url: 'https://yts.ag/', - strictSSL: true - } - ]; + var value = App.settings['defaultMovieAPI'].slice(0); + App.settings['ytsAPI'] = value; + //save to db App.db.writeSetting({ key: 'ytsAPI', @@ -154,14 +148,10 @@ }, resetTVShowAPI: function() { - var value = [{ - url: 'https://api-fetch.website/tv/', - strictSSL: true - }, { - url: 'http://eztvapi.ml/', - strictSSL: true - }]; + var value = App.settings['defaultTvAPI'].slice(0); + App.settings['tvAPI'] = value; + //save to db App.db.writeSetting({ key: 'tvAPI', @@ -219,10 +209,15 @@ if (value.substr(0, 8) !== 'https://' && value.substr(0, 7) !== 'http://') { value = 'http://' + value; } - value = [{ + + App.settings['ytsAPI'] = App.settings['defaultMovieAPI'].slice(0); + + App.settings['ytsAPI'].unshift({ url: value, strictSSL: value.substr(0, 8) === 'https://' - }]; + }); + + value = App.settings['ytsAPI']; break; case 'tvAPI': value = field.val(); @@ -232,11 +227,17 @@ if (value.substr(0, 8) !== 'https://' && value.substr(0, 7) !== 'http://') { value = 'http://' + value; } - value = [{ + + App.settings['tvAPI'] = App.settings['defaultTvAPI'].slice(0); + + App.settings['tvAPI'].unshift({ url: value, strictSSL: value.substr(0, 8) === 'https://' - }]; + }); + + value = App.settings['tvAPI']; break; + case 'opensubtitlesUsername': value = field.val(); break; diff --git a/src/app/settings.js b/src/app/settings.js index 7f82a9f8..4c249181 100644 --- a/src/app/settings.js +++ b/src/app/settings.js @@ -129,7 +129,8 @@ Settings.defaultTvAPI = [{ strictSSL: true }]; -Settings.tvAPI = Settings.defaultTvAPI; +Settings.tvAPI = Settings.defaultTvAPI.slice(0); + Settings.defaultMovieAPI = [{ url: 'http://yts.am/', @@ -139,7 +140,7 @@ Settings.defaultMovieAPI = [{ strictSSL: true }]; -Settings.ytsAPI = Settings.defaultMovieAPI; +Settings.ytsAPI = Settings.defaultMovieAPI.slice(0); Settings.updateEndpoint = { url: '',//'http://popcorntime.ag/', diff --git a/src/app/templates/settings-container.tpl b/src/app/templates/settings-container.tpl index 56b0c510..4c7fa288 100644 --- a/src/app/templates/settings-container.tpl +++ b/src/app/templates/settings-container.tpl @@ -469,14 +469,14 @@

<%= i18n.__("Movie API Endpoint") %>

- <% if (Settings.ytsAPI.length <= 1) { %> + <% if (Settings.ytsAPI.length >= 3) { %>    <% } %>

<%= i18n.__("TV Show API Endpoint") %>

- <% if (Settings.tvAPI.length <= 1) { %> + <% if (Settings.tvAPI.length >= 4) { %>    <% } %> From 21e8f960da8f05a6213e3310fe5f200d58a9eaac Mon Sep 17 00:00:00 2001 From: captainyarr Date: Fri, 22 May 2020 00:44:08 -0700 Subject: [PATCH 47/77] CSS: Updated hover state on Movie endpoint reset --- .../Official_-_Black_&_Yellow_theme.css | 22 +++++++++ src/app/themes/Official_-_Dark_theme.css | 45 ++++++++++++++----- src/app/themes/Official_-_FlaX_theme.css | 22 +++++++++ src/app/themes/Official_-_Flat_UI_theme.css | 23 ++++++++++ src/app/themes/Official_-_Light_theme.css | 22 +++++++++ 5 files changed, 123 insertions(+), 11 deletions(-) diff --git a/src/app/themes/Official_-_Black_&_Yellow_theme.css b/src/app/themes/Official_-_Black_&_Yellow_theme.css index 2f85340d..f111fa02 100644 --- a/src/app/themes/Official_-_Black_&_Yellow_theme.css +++ b/src/app/themes/Official_-_Black_&_Yellow_theme.css @@ -4983,6 +4983,7 @@ body, .episode-info { width: 46%; } + .tabs-episodes { width: 38%; } @@ -4992,12 +4993,15 @@ body, .episode-info { width: 36%; } + .tabs-episodes { width: 47%; } + .episode-info-title { font-size: 18px; } + .episode-info-number { top: 36px; } @@ -6890,6 +6894,20 @@ body, transition: all 0.5s; } +.settings-container-contain .settings-container #connection .reset-ytsAPI { + font-size: 13px; + color: #939597; + -webkit-transition: all 0.5s; + transition: all 0.5s; +} + +.settings-container-contain .settings-container #connection .reset-ytsAPI:hover { + cursor: pointer; + color: #fc0; + -webkit-transition: all 0.5s; + transition: all 0.5s; +} + .settings-container-contain .settings-container #cache .open-tmp-folder { font-size: 16px; margin-left: 10px; @@ -7220,6 +7238,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); @@ -7231,6 +7250,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); @@ -7242,6 +7262,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); @@ -7253,6 +7274,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); diff --git a/src/app/themes/Official_-_Dark_theme.css b/src/app/themes/Official_-_Dark_theme.css index 1f7e7c13..8c971652 100644 --- a/src/app/themes/Official_-_Dark_theme.css +++ b/src/app/themes/Official_-_Dark_theme.css @@ -4983,6 +4983,7 @@ body, .episode-info { width: 46%; } + .tabs-episodes { width: 38%; } @@ -4992,12 +4993,15 @@ body, .episode-info { width: 36%; } + .tabs-episodes { width: 47%; } + .episode-info-title { font-size: 18px; } + .episode-info-number { top: 36px; } @@ -6166,24 +6170,25 @@ body, -webkit-transition: opacity 0.1s ease-in; transition: opacity 0.1s ease-in; } + .torrent-collection-container .content .onlinesearch .engine-selector div#kat-icon { - background: url("../images/icons/kickasstorrents.png"); - -webkit-background-size: contain; - background-size: contain; + background: url("../images/icons/kickasstorrents.png"); + -webkit-background-size: contain; + background-size: contain; } .torrent-collection-container .content .onlinesearch .engine-selector div#strike-icon { - -webkit-filter: brightness(1); - background: url("../images/icons/getstrike.png"); - -webkit-background-size: contain; - background-size: contain; + -webkit-filter: brightness(1); + background: url("../images/icons/getstrike.png"); + -webkit-background-size: contain; + background-size: contain; } .torrent-collection-container .content .onlinesearch .engine-selector div#rarbg-icon { - -webkit-filter: brightness(1); - background: url("../images/icons/rarbg.png"); - -webkit-background-size: contain; - background-size: contain; + -webkit-filter: brightness(1); + background: url("../images/icons/rarbg.png"); + -webkit-background-size: contain; + background-size: contain; } .torrent-collection-container .content .onlinesearch .engine-selector div.active { @@ -6875,6 +6880,20 @@ body, padding-right: 8px; } +.settings-container-contain .settings-container #connection .reset-ytsAPI { + font-size: 13px; + color: #939597; + -webkit-transition: all 0.5s; + transition: all 0.5s; +} + +.settings-container-contain .settings-container #connection .reset-ytsAPI:hover { + cursor: pointer; + color: #2468cc; + -webkit-transition: all 0.5s; + transition: all 0.5s; +} + .settings-container-contain .settings-container #connection .reset-tvAPI { font-size: 13px; color: #8a8b8e; @@ -7219,6 +7238,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); @@ -7230,6 +7250,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); @@ -7241,6 +7262,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); @@ -7252,6 +7274,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); diff --git a/src/app/themes/Official_-_FlaX_theme.css b/src/app/themes/Official_-_FlaX_theme.css index 2091d820..330e90f8 100644 --- a/src/app/themes/Official_-_FlaX_theme.css +++ b/src/app/themes/Official_-_FlaX_theme.css @@ -4983,6 +4983,7 @@ body, .episode-info { width: 46%; } + .tabs-episodes { width: 38%; } @@ -4992,12 +4993,15 @@ body, .episode-info { width: 36%; } + .tabs-episodes { width: 47%; } + .episode-info-title { font-size: 18px; } + .episode-info-number { top: 36px; } @@ -6876,6 +6880,20 @@ body, padding-right: 8px; } +.settings-container-contain .settings-container #connection .reset-ytsAPI { + font-size: 13px; + color: #939597; + -webkit-transition: all 0.5s; + transition: all 0.5s; +} + +.settings-container-contain .settings-container #connection .reset-ytsAPI:hover { + cursor: pointer; + color: #d9394b; + -webkit-transition: all 0.5s; + transition: all 0.5s; +} + .settings-container-contain .settings-container #connection .reset-tvAPI { font-size: 13px; color: rgba(228, 233, 242, 0.7); @@ -7220,6 +7238,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); @@ -7231,6 +7250,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); @@ -7242,6 +7262,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); @@ -7253,6 +7274,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); diff --git a/src/app/themes/Official_-_Flat_UI_theme.css b/src/app/themes/Official_-_Flat_UI_theme.css index e2878296..f2533997 100644 --- a/src/app/themes/Official_-_Flat_UI_theme.css +++ b/src/app/themes/Official_-_Flat_UI_theme.css @@ -4983,6 +4983,7 @@ body, .episode-info { width: 46%; } + .tabs-episodes { width: 38%; } @@ -4992,12 +4993,15 @@ body, .episode-info { width: 36%; } + .tabs-episodes { width: 47%; } + .episode-info-title { font-size: 18px; } + .episode-info-number { top: 36px; } @@ -6876,6 +6880,21 @@ body, padding-right: 8px; } +.settings-container-contain .settings-container #connection .reset-ytsAPI { + font-size: 13px; + color: #939597; + -webkit-transition: all 0.5s; + transition: all 0.5s; +} + +.settings-container-contain .settings-container #connection .reset-ytsAPI:hover { + cursor: pointer; + color: #16a085; + -webkit-transition: all 0.5s; + transition: all 0.5s; +} + + .settings-container-contain .settings-container #connection .reset-tvAPI { font-size: 13px; color: #999; @@ -7220,6 +7239,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); @@ -7231,6 +7251,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); @@ -7242,6 +7263,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); @@ -7253,6 +7275,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); diff --git a/src/app/themes/Official_-_Light_theme.css b/src/app/themes/Official_-_Light_theme.css index b15421e7..9bee42bd 100644 --- a/src/app/themes/Official_-_Light_theme.css +++ b/src/app/themes/Official_-_Light_theme.css @@ -4983,6 +4983,7 @@ body, .episode-info { width: 46%; } + .tabs-episodes { width: 38%; } @@ -4992,12 +4993,15 @@ body, .episode-info { width: 36%; } + .tabs-episodes { width: 47%; } + .episode-info-title { font-size: 18px; } + .episode-info-number { top: 36px; } @@ -6876,6 +6880,20 @@ body, padding-right: 8px; } +.settings-container-contain .settings-container #connection .reset-ytsAPI { + font-size: 13px; + color: #939597; + -webkit-transition: all 0.5s; + transition: all 0.5s; +} + +.settings-container-contain .settings-container #connection .reset-ytsAPI:hover { + cursor: pointer; + color: #008f00; + -webkit-transition: all 0.5s; + transition: all 0.5s; +} + .settings-container-contain .settings-container #connection .reset-tvAPI { font-size: 13px; color: #6b6b6b; @@ -7220,6 +7238,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); @@ -7231,6 +7250,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); @@ -7242,6 +7262,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); @@ -7253,6 +7274,7 @@ body, -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); From aa6d513cfebf751ba6af3efdece3eac0405155d2 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Fri, 22 May 2020 22:18:31 -0700 Subject: [PATCH 48/77] Settings: Updated reset value --- src/app/templates/settings-container.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/templates/settings-container.tpl b/src/app/templates/settings-container.tpl index 4c7fa288..82b9755d 100644 --- a/src/app/templates/settings-container.tpl +++ b/src/app/templates/settings-container.tpl @@ -469,14 +469,14 @@

<%= i18n.__("Movie API Endpoint") %>

- <% if (Settings.ytsAPI.length >= 3) { %> + <% if (Settings.ytsAPI.length > Settings.defaultMovieAPI.length) { %>    <% } %>

<%= i18n.__("TV Show API Endpoint") %>

- <% if (Settings.tvAPI.length >= 4) { %> + <% if (Settings.tvAPI.length > Settings.defaultTvAPI.length) { %>    <% } %> From d6c0672ee7b556074354573ca3c12bd19d3f61cf Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sun, 24 May 2020 03:38:22 -0700 Subject: [PATCH 49/77] Fix: Validate trailer information is correct --- src/app/lib/providers/yts.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/app/lib/providers/yts.js b/src/app/lib/providers/yts.js index 5f4644fd..8692f5cd 100644 --- a/src/app/lib/providers/yts.js +++ b/src/app/lib/providers/yts.js @@ -33,6 +33,13 @@ tracker_list += '&tr=' + item; }); + function check_trailer(movie){ + if(movie.yt_trailer_code && movie.yt_trailer_code != ""){ + return 'https://www.youtube.com/watch?v=' + movie.yt_trailer_code + }else + return null; + } + var results = _.chain(data.movies).map(function(movie) { return { type: 'movie', @@ -50,7 +57,7 @@ cover: movie.medium_cover_image, //movie.large_cover_image, backdrop: movie.background_image, synopsis: movie.synopsis, - trailer: 'https://www.youtube.com/watch?v=' + movie.yt_trailer_code || false, + trailer: check_trailer(movie), google_video: movie.google_video || false, certification: movie.mpa_rating, torrents: _.reduce(movie.torrents, function(torrents, torrent) { From 4f6db36f91514be2b7c5ac90350d3f11cccecc3b Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sun, 24 May 2020 03:43:28 -0700 Subject: [PATCH 50/77] FIX: Volume error when player not available --- src/app/vendor/videojs-youtube/src/youtube.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/vendor/videojs-youtube/src/youtube.js b/src/app/vendor/videojs-youtube/src/youtube.js index b0b84b02..9024904b 100644 --- a/src/app/vendor/videojs-youtube/src/youtube.js +++ b/src/app/vendor/videojs-youtube/src/youtube.js @@ -464,7 +464,9 @@ videojs.Youtube.prototype.setVolume = function(percentAsDecimal) { if(typeof(percentAsDecimal) !== 'undefined' && percentAsDecimal !== this.volumeVal) { - this.ytplayer.setVolume(percentAsDecimal * 100.0); + if(typeof(this.ytsplayer) !== 'undefined') { + this.ytplayer.setVolume(percentAsDecimal * 100.0); + } this.volumeVal = percentAsDecimal; this.player_.trigger('volumechange'); } From f47c8b58fdfb5d96987b31564dc59f1618be241d Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sun, 24 May 2020 03:50:40 -0700 Subject: [PATCH 51/77] Revert Trailer volume --- src/app/vendor/videojs-youtube/src/youtube.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/vendor/videojs-youtube/src/youtube.js b/src/app/vendor/videojs-youtube/src/youtube.js index 9024904b..b0b84b02 100644 --- a/src/app/vendor/videojs-youtube/src/youtube.js +++ b/src/app/vendor/videojs-youtube/src/youtube.js @@ -464,9 +464,7 @@ videojs.Youtube.prototype.setVolume = function(percentAsDecimal) { if(typeof(percentAsDecimal) !== 'undefined' && percentAsDecimal !== this.volumeVal) { - if(typeof(this.ytsplayer) !== 'undefined') { - this.ytplayer.setVolume(percentAsDecimal * 100.0); - } + this.ytplayer.setVolume(percentAsDecimal * 100.0); this.volumeVal = percentAsDecimal; this.player_.trigger('volumechange'); } From 47d105a31d881787d65108111eb8a1ad8517480b Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sun, 24 May 2020 02:21:26 -0700 Subject: [PATCH 52/77] Updated request call --- src/app/lib/providers/opensubtitlesmovies.js | 2 +- src/app/lib/providers/yts.js | 39 ++------------------ 2 files changed, 5 insertions(+), 36 deletions(-) diff --git a/src/app/lib/providers/opensubtitlesmovies.js b/src/app/lib/providers/opensubtitlesmovies.js index 1f1fd7a7..fdcf8b9f 100644 --- a/src/app/lib/providers/opensubtitlesmovies.js +++ b/src/app/lib/providers/opensubtitlesmovies.js @@ -2,7 +2,7 @@ 'use strict'; var _ = require('underscore'); - var request = require('request'); + var axios = require('axios'); var Q = require('q'); var OpenSubtitlesApi = require('opensubtitles-api'); diff --git a/src/app/lib/providers/yts.js b/src/app/lib/providers/yts.js index 8692f5cd..b609c3f9 100644 --- a/src/app/lib/providers/yts.js +++ b/src/app/lib/providers/yts.js @@ -136,7 +136,7 @@ var defer = Q.defer(); - function getAxios(index) { + function get(index) { //Convert to axios var options = { @@ -154,7 +154,7 @@ if (index + 1 >= Settings.ytsAPI.length) { return defer.reject(err || 'Status Code is above 400'); } else { - getAxios(index + 1); + get(index + 1); } return; } else if (!res.data || res.data.status === 'error') { @@ -183,46 +183,15 @@ if (index + 1 >= Settings.ytsAPI.length) { return defer.reject(error.message || 'Status Code is above 400'); } else { - getAxios(index + 1); + get(index + 1); } return; }); } - function get(index) { - - var options = { - uri: Settings.ytsAPI[index].url + 'api/v2/list_movies.json', - qs: params, - json: true, - timeout: 10000 - }; - - win.info("Request to YTS API: " + options.uri); - - var req = jQuery.extend(true, {}, Settings.ytsAPI[index], options); - - request(req, function(err, res, data) { - if (err || res.statusCode >= 400 || (data && !data.data)) { - win.warn('YTS API endpoint \'%s\' failed.', Settings.ytsAPI[index].url); - if (index + 1 >= Settings.ytsAPI.length) { - return defer.reject(err || 'Status Code is above 400'); - } else { - get(index + 1); - } - return; - } else if (!data || data.status === 'error') { - err = data ? data.status_message : 'No data returned'; - return defer.reject(err); - } else { - return defer.resolve(format(data.data)); - } - }); - } - //Get Movie list via request //get(0); - getAxios(0); + get(0); return defer.promise; }; From 82f17da8d434781c4623978384c41ae397faba5a Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sun, 24 May 2020 02:28:07 -0700 Subject: [PATCH 53/77] Remove axios variable --- src/app/lib/providers/opensubtitlesmovies.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/lib/providers/opensubtitlesmovies.js b/src/app/lib/providers/opensubtitlesmovies.js index fdcf8b9f..b521eb54 100644 --- a/src/app/lib/providers/opensubtitlesmovies.js +++ b/src/app/lib/providers/opensubtitlesmovies.js @@ -2,7 +2,6 @@ 'use strict'; var _ = require('underscore'); - var axios = require('axios'); var Q = require('q'); var OpenSubtitlesApi = require('opensubtitles-api'); From cce191bcc8dc23e6f96eafb1208313aac95010a5 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sun, 24 May 2020 20:56:37 -0700 Subject: [PATCH 54/77] Update package-lock.json --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index f11b732a..003a605c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6133,9 +6133,9 @@ }, "dependencies": { "readable-stream": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", - "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", From 59fa52c2537c2fe4a0c4c1e566ee2041c0ab691f Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Tue, 14 Jul 2020 10:22:56 +0100 Subject: [PATCH 55/77] [Snyk] Upgrade moment from 2.24.0 to 2.25.3 (#140) * fix: upgrade moment from 2.24.0 to 2.25.3 Snyk has created this PR to upgrade moment from 2.24.0 to 2.25.3. See this package in NPM: https://www.npmjs.com/package/moment See this project in Snyk: https://app.snyk.io/org/captainyarr/project/93cfe595-604d-45b5-a6c9-04ccc80b8ae2?utm_source=github&utm_medium=upgrade-pr * fix: upgrade moment from 2.24.0 to 2.25.3 Snyk has created this PR to upgrade moment from 2.24.0 to 2.25.3. See this package in NPM: https://www.npmjs.com/package/moment See this project in Snyk: https://app.snyk.io/org/captainyarr/project/93cfe595-604d-45b5-a6c9-04ccc80b8ae2?utm_source=github&utm_medium=upgrade-pr --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 003a605c..56a31bd3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9207,9 +9207,9 @@ "dev": true }, "moment": { - "version": "2.24.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", - "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" + "version": "2.25.3", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz", + "integrity": "sha512-PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg==" }, "mp4-box-encoding": { "version": "1.4.1", diff --git a/package.json b/package.json index 8ab8f489..acf6984a 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "markdown": "~0.5.0", "memoizee": "^0.4.4", "mkdirp": "^0.5.1", - "moment": "^2.10.2", + "moment": "^2.25.3", "mv": "^2.0.3", "nedb": "1.8.0", "node-captions": "0.4.6", From cddd4386fa0fe4e61b6cee2afea88ddd24989f8c Mon Sep 17 00:00:00 2001 From: captainyarr Date: Wed, 15 Jul 2020 22:18:32 -0700 Subject: [PATCH 56/77] Updated: Intergrated torrent health into repo --- package-lock.json | 2116 +---------------- package.json | 34 +- .../lib/util/torrent-tracker-health/LICENSE | 23 + .../lib/util/torrent-tracker-health/README.md | 21 + .../lib/util/torrent-tracker-health/index.js | 125 + src/app/lib/views/show_detail.js | 4 +- src/app/lib/views/torrent_collection.js | 5 +- 7 files changed, 289 insertions(+), 2039 deletions(-) create mode 100644 src/app/lib/util/torrent-tracker-health/LICENSE create mode 100644 src/app/lib/util/torrent-tracker-health/README.md create mode 100644 src/app/lib/util/torrent-tracker-health/index.js diff --git a/package-lock.json b/package-lock.json index 56a31bd3..c3310d86 100644 --- a/package-lock.json +++ b/package-lock.json @@ -833,12 +833,6 @@ } } }, - "acorn-jsx": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz", - "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==", - "dev": true - }, "acorn-walk": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz", @@ -1311,23 +1305,6 @@ "readable-stream": "^2.0.6" } }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - }, - "dependencies": { - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - } - } - }, "arr-diff": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", @@ -1508,11 +1485,6 @@ "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", "dev": true }, - "async": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/async/-/async-3.1.0.tgz", - "integrity": "sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ==" - }, "async-done": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz", @@ -1557,11 +1529,6 @@ "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=", "dev": true }, - "aws-sign": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz", - "integrity": "sha1-xVAThWyBlOyFSgy+yQqrWgTOOsU=" - }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -1800,11 +1767,6 @@ "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", "dev": true }, - "binary-search": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/binary-search/-/binary-search-1.3.6.tgz", - "integrity": "sha512-nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA==" - }, "binary-search-tree": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.5.tgz", @@ -1846,60 +1808,6 @@ } } }, - "bittorrent-peerid": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/bittorrent-peerid/-/bittorrent-peerid-1.3.2.tgz", - "integrity": "sha512-3xPhNfklf4xzxFVw9Y7W5dnGNhubVF0r8BK3imIsB6E3aDA4d6WhsceK1Yusos0TiiB9QZrdCsVXVqs26sFMxw==" - }, - "bittorrent-protocol": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.1.1.tgz", - "integrity": "sha512-kthSXghQ9DRQ4Lrjr1ceyIeEMeL5x9WiaSrQyR+5Nrr3g9QY6MvDeq+KLQz17R6094iDmT/LgFbQYAPj09/oUA==", - "requires": { - "bencode": "^2.0.0", - "bitfield": "^3.0.0", - "debug": "^4.1.1", - "randombytes": "^2.0.5", - "readable-stream": "^3.0.0", - "speedometer": "^1.0.0", - "unordered-array-remove": "^1.0.2" - }, - "dependencies": { - "bitfield": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bitfield/-/bitfield-3.0.0.tgz", - "integrity": "sha512-hJmWKucJQfdSkQPDPBKmWogM9s8+NOSzDT9QVbJbjinXaQ0bJKPu/cn98qRWy3PDNWtKw4XaoUP3XruGRIKEgg==" - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, - "speedometer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-1.1.0.tgz", - "integrity": "sha512-z/wAiTESw2XVPssY2XRcme4niTc4S5FkkJ4gknudtVoc33Zil8TdTxHy5torRcgqMqksJV2Yz8HQcvtbsnw0mQ==" - } - } - }, "bittorrent-tracker": { "version": "7.7.0", "resolved": "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-7.7.0.tgz", @@ -1967,26 +1875,6 @@ "inherits": "~2.0.0" } }, - "block-stream2": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/block-stream2/-/block-stream2-2.0.0.tgz", - "integrity": "sha512-1oI+RHHUEo64xomy1ozLgVJetFlHkIfQfJzTBQrj6xWnEMEPooeo2fZoqFjp0yzfHMBrgxwgh70tKp6T17+i3g==", - "requires": { - "readable-stream": "^3.4.0" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, "bluebird": { "version": "3.4.7", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz", @@ -2022,14 +1910,6 @@ "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, - "boom": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/boom/-/boom-0.3.8.tgz", - "integrity": "sha1-yM2wQUNZEnQWKMBE7Mcy0dF8Ceo=", - "requires": { - "hoek": "0.7.x" - } - }, "boxen": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", @@ -2192,11 +2072,6 @@ } } }, - "browserify-package-json": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/browserify-package-json/-/browserify-package-json-1.0.1.tgz", - "integrity": "sha1-mN3oqlxWH9bT/km7qhArdLOW/eo=" - }, "bser": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz", @@ -2282,15 +2157,6 @@ "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=", "dev": true }, - "bufferutil": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.1.tgz", - "integrity": "sha512-xowrxvpxojqkagPcWRQVXZl0YXhRhAtBEIq3VoER1NH5Mw1n1o0ojdspp+GS2J//2gCVyrzQDApQ4unGF+QOoA==", - "optional": true, - "requires": { - "node-gyp-build": "~3.7.0" - } - }, "bufferview": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/bufferview/-/bufferview-1.0.1.tgz", @@ -2527,27 +2393,6 @@ "node-ssdp": "^2.4.0" } }, - "chunk-store-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chunk-store-stream/-/chunk-store-stream-4.1.0.tgz", - "integrity": "sha512-GjkZ16bFKMFnb8LrGZXAPeRoLXZTLu9ges6LCErJe28bMp6zKLxjWuJ7TYzR0jWq9nwo58hXG3BXZYy66Vze0Q==", - "requires": { - "block-stream2": "^2.0.0", - "readable-stream": "^3.4.0" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, "ci-info": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz", @@ -2884,11 +2729,6 @@ "safe-buffer": "~5.1.1" } }, - "cookie-jar": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz", - "integrity": "sha1-ZOzAasl423leS1KQy+SLo3gUAPo=" - }, "cookiejar": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.6.tgz", @@ -2943,46 +2783,6 @@ "capture-stack-trace": "^1.0.0" } }, - "create-torrent": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/create-torrent/-/create-torrent-4.4.1.tgz", - "integrity": "sha512-LuoXnCRMKEo3KR3jEbCRpP3Nu2TUhLTlb/axP9+rl+ouhBpxTaHaTTN1bdUS2x2VK3wWyCBl1OZHyHhlRBntWg==", - "requires": { - "bencode": "^2.0.0", - "block-stream2": "^2.0.0", - "filestream": "^5.0.0", - "is-file": "^1.0.0", - "junk": "^3.1.0", - "minimist": "^1.1.0", - "multistream": "^4.0.0", - "once": "^1.3.0", - "piece-length": "^2.0.1", - "readable-stream": "^3.0.2", - "run-parallel": "^1.0.0", - "simple-sha1": "^3.0.0" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, - "simple-sha1": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/simple-sha1/-/simple-sha1-3.0.1.tgz", - "integrity": "sha512-q7ehqWfHc1VhOm7sW099YDZ4I0yYX7rqyhqqhHV1IYeUTjPOhHyD3mXvv8k2P+rO7+7c8R4/D+8ffzC9BE7Cqg==", - "requires": { - "queue-microtask": "^1.1.2", - "rusha": "^0.8.1" - } - } - } - }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -3012,14 +2812,6 @@ } } }, - "cryptiles": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz", - "integrity": "sha1-GlVnNPBtJLo0hirpy55wmjr7/xw=", - "requires": { - "boom": "0.3.x" - } - }, "crypto-random-string": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", @@ -3358,15 +3150,6 @@ "buffer-indexof": "^1.0.0" } }, - "doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, "dom-serializer": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz", @@ -3649,508 +3432,101 @@ } } }, - "eslint": { - "version": "6.7.2", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.7.2.tgz", - "integrity": "sha512-qMlSWJaCSxDFr8fBPvJM9kJwbazrhNcBU3+DszDW1OlEwKBBRWsJc7NJFelvwQpanHCR14cOLD41x8Eqvo3Nng==", + "eslint-config-google": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/eslint-config-google/-/eslint-config-google-0.14.0.tgz", + "integrity": "sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==", + "dev": true + }, + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "dev": true + }, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true + }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" + }, + "event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", + "requires": { + "d": "1", + "es5-ext": "~0.10.14" + } + }, + "eventemitter3": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz", + "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=" + }, + "exec-sh": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz", + "integrity": "sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==", + "dev": true + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", - "ajv": "^6.10.0", - "chalk": "^2.1.0", - "cross-spawn": "^6.0.5", - "debug": "^4.0.1", - "doctrine": "^3.0.0", - "eslint-scope": "^5.0.0", - "eslint-utils": "^1.4.3", - "eslint-visitor-keys": "^1.1.0", - "espree": "^6.1.2", - "esquery": "^1.0.1", - "esutils": "^2.0.2", - "file-entry-cache": "^5.0.1", - "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.0.0", - "globals": "^12.1.0", - "ignore": "^4.0.6", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "inquirer": "^7.0.0", - "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.3.0", - "lodash": "^4.17.14", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "optionator": "^0.8.3", - "progress": "^2.0.0", - "regexpp": "^2.0.1", - "semver": "^6.1.2", - "strip-ansi": "^5.2.0", - "strip-json-comments": "^3.0.1", - "table": "^5.2.3", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", + "dev": true + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "dev": true, + "requires": { + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { - "ansi-escapes": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz", - "integrity": "sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==", - "dev": true, - "requires": { - "type-fest": "^0.8.1" - } - }, - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "is-descriptor": "^0.1.0" } }, - "chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true - }, - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "restore-cursor": "^3.1.0" - } - }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "dev": true, - "requires": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - } - }, - "figures": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz", - "integrity": "sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, - "glob-parent": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", - "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "globals": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz", - "integrity": "sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==", - "dev": true, - "requires": { - "type-fest": "^0.8.1" - } - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", - "dev": true - }, - "inquirer": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.0.tgz", - "integrity": "sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==", - "dev": true, - "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^2.4.2", - "cli-cursor": "^3.1.0", - "cli-width": "^2.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.15", - "mute-stream": "0.0.8", - "run-async": "^2.2.0", - "rxjs": "^6.4.0", - "string-width": "^4.1.0", - "strip-ansi": "^5.1.0", - "through": "^2.3.6" - } - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", - "dev": true - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "dev": true - }, - "onetime": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", - "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "optionator": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", - "dev": true, - "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "word-wrap": "~1.2.3" - } - }, - "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } - }, - "rxjs": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz", - "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.0" - } - } - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - } - } - }, - "strip-json-comments": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", - "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "eslint-config-google": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/eslint-config-google/-/eslint-config-google-0.14.0.tgz", - "integrity": "sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==", - "dev": true - }, - "eslint-scope": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz", - "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==", - "dev": true, - "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - } - }, - "eslint-utils": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", - "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^1.1.0" - } - }, - "eslint-visitor-keys": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", - "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==", - "dev": true - }, - "espree": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz", - "integrity": "sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==", - "dev": true, - "requires": { - "acorn": "^7.1.0", - "acorn-jsx": "^5.1.0", - "eslint-visitor-keys": "^1.1.0" - }, - "dependencies": { - "acorn": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz", - "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==", - "dev": true - } - } - }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, - "esquery": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz", - "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", - "dev": true, - "requires": { - "estraverse": "^4.0.0" - } - }, - "esrecurse": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", - "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", - "dev": true, - "requires": { - "estraverse": "^4.1.0" - } - }, - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true - }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" - }, - "event-emitter": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", - "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", - "requires": { - "d": "1", - "es5-ext": "~0.10.14" - } - }, - "eventemitter3": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz", - "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=" - }, - "exec-sh": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz", - "integrity": "sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==", - "dev": true - }, - "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", - "dev": true, - "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", - "dev": true - }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "dev": true, - "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "^0.1.0" } } } @@ -4460,36 +3836,6 @@ "escape-string-regexp": "^1.0.5" } }, - "file-entry-cache": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", - "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", - "dev": true, - "requires": { - "flat-cache": "^2.0.1" - } - }, - "filestream": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/filestream/-/filestream-5.0.0.tgz", - "integrity": "sha512-5H3RqSaJp12THfZiNWodYM7TiKfQvrpX+EIOrB1XvCceTys4yvfEIl8wDp+/yI8qj6Bxym8m0NYWwVXDAet/+A==", - "requires": { - "readable-stream": "^3.4.0", - "typedarray-to-buffer": "^3.0.0" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, "fill-keys": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz", @@ -4563,34 +3909,6 @@ "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==", "dev": true }, - "flat-cache": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", - "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", - "dev": true, - "requires": { - "flatted": "^2.0.0", - "rimraf": "2.6.3", - "write": "1.0.3" - }, - "dependencies": { - "rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - } - } - }, - "flatted": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz", - "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==", - "dev": true - }, "flatten": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/flatten/-/flatten-0.0.1.tgz", @@ -4668,28 +3986,11 @@ "map-cache": "^0.2.2" } }, - "freelist": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/freelist/-/freelist-1.0.3.tgz", - "integrity": "sha1-AGd1UJ85NXAXhNPtL8nxLJ3xurI=" - }, "fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, - "fs-chunk-store": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-2.0.1.tgz", - "integrity": "sha512-V9PXz33rhq6E9lFmvmElmLyvEvnSeryU/TzfHnCEIpEU6Y/2Fyc4xEeeneV/pUgKG1mRAKSU+DBtHyO2GQ2EBA==", - "requires": { - "random-access-file": "^2.0.1", - "randombytes": "^2.0.3", - "rimraf": "^3.0.0", - "run-parallel": "^1.1.2", - "thunky": "^1.0.1" - } - }, "fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", @@ -5339,12 +4640,6 @@ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "dev": true - }, "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", @@ -5372,11 +4667,6 @@ "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", "dev": true }, - "get-stdin": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz", - "integrity": "sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==" - }, "get-stream": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", @@ -5870,81 +5160,6 @@ } } }, - "gulp-zip": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-5.0.1.tgz", - "integrity": "sha512-M/IWLh9RvOpuofDZkgDirtiyz9J3yIqnDOJ3muzk2D/XnZ1ruqPlPLRIpXnl/aZU+xXwKPdOIxjRzkUcVEQyZQ==", - "dev": true, - "requires": { - "get-stream": "^5.1.0", - "plugin-error": "^1.0.1", - "through2": "^3.0.1", - "vinyl": "^2.1.0", - "yazl": "^2.5.1" - }, - "dependencies": { - "clone": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", - "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", - "dev": true - }, - "clone-stats": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", - "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=", - "dev": true - }, - "get-stream": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", - "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "replace-ext": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", - "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", - "dev": true - }, - "through2": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz", - "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==", - "dev": true, - "requires": { - "readable-stream": "2 || 3" - } - }, - "vinyl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz", - "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==", - "dev": true, - "requires": { - "clone": "^2.1.1", - "clone-buffer": "^1.0.0", - "clone-stats": "^1.0.0", - "cloneable-readable": "^1.0.0", - "remove-trailing-separator": "^1.0.1", - "replace-ext": "^1.0.0" - } - } - } - }, "gulplog": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", @@ -6080,22 +5295,6 @@ "resolved": "https://registry.npmjs.org/hat/-/hat-0.0.3.tgz", "integrity": "sha1-uwFKnmSzeIrtgAWRdBPU/z1QLYo=" }, - "hawk": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz", - "integrity": "sha1-mzYd7pWpMWQObVBOBWCaj8OsRdI=", - "requires": { - "boom": "0.3.x", - "cryptiles": "0.1.x", - "hoek": "0.7.x", - "sntp": "0.1.x" - } - }, - "hoek": { - "version": "0.7.6", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz", - "integrity": "sha1-YPvZBFV1Qc0rh5Wr8wihs3cOFVo=" - }, "homedir-polyfill": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", @@ -6172,22 +5371,6 @@ "next-line": "^1.1.0" } }, - "http-node": { - "version": "github:feross/http-node#342ef8624495343ffd050bd0808b3750cf0e3974", - "from": "github:feross/http-node#webtorrent", - "requires": { - "chrome-net": "^3.3.3", - "freelist": "^1.0.3", - "http-parser-js": "^0.4.3" - }, - "dependencies": { - "http-parser-js": { - "version": "0.4.13", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.13.tgz", - "integrity": "sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=" - } - } - }, "http-parser-js": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz", @@ -6216,14 +5399,6 @@ "sprintf-js": "^1.1.2" } }, - "iconv-lite": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.0.tgz", - "integrity": "sha512-NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, "ieee754": { "version": "1.1.12", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz", @@ -6246,16 +5421,6 @@ "resolved": "https://registry.npmjs.org/immediate-chunk-store/-/immediate-chunk-store-1.0.8.tgz", "integrity": "sha1-Ds2tDFRjMmcte1tRGya7GM5W5z8=" }, - "import-fresh": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", - "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", - "dev": true, - "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - } - }, "import-lazy": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", @@ -6470,11 +5635,6 @@ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, - "is-ascii": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-ascii/-/is-ascii-1.0.0.tgz", - "integrity": "sha1-8CrQJZoJIc0Zn/Ic4bCeD2tOOSk=" - }, "is-binary-path": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", @@ -6569,11 +5729,6 @@ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true }, - "is-file": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-file/-/is-file-1.0.0.tgz", - "integrity": "sha1-KKRM+9nT2xkwRfIrZfzo7fliBZY=" - }, "is-finite": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", @@ -8116,16 +7271,6 @@ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", "dev": true }, - "js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", @@ -8296,11 +7441,6 @@ "verror": "1.10.0" } }, - "junk": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz", - "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==" - }, "just-debounce": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz", @@ -8393,11 +7533,6 @@ "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", "dev": true }, - "last-one-wins": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/last-one-wins/-/last-one-wins-1.0.4.tgz", - "integrity": "sha1-wb/Qy8tGeQ7JFWuNGu6Py4bNoio=" - }, "last-run": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz", @@ -8502,18 +7637,6 @@ "integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=", "dev": true }, - "load-ip-set": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/load-ip-set/-/load-ip-set-2.1.0.tgz", - "integrity": "sha512-taz7U6B+F7Zq90dfIKwqsB1CrFKelSEmMGC68OUqem8Cgd1QZygQBYb2Fk9i6muBSfH4xwF/Pjt4KKlAdOyWZw==", - "requires": { - "ip-set": "^1.0.0", - "netmask": "^1.0.6", - "once": "^1.3.0", - "simple-get": "^3.0.0", - "split": "^1.0.0" - } - }, "load-json-file": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", @@ -8972,28 +8095,6 @@ "qap": "^3.1.2" } }, - "mediasource": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/mediasource/-/mediasource-2.3.0.tgz", - "integrity": "sha512-fqm86UwHvAnneIv40Uy1sDQaFtAByq/k0SQ3uCtbnEeSQNT1s5TDHCZOD1VmYCHwfY1jL2NjoZVwzZKYqy3L7A==", - "requires": { - "inherits": "^2.0.1", - "readable-stream": "^3.0.0", - "to-arraybuffer": "^1.0.1" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, "memoizee": { "version": "0.4.14", "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz", @@ -9009,11 +8110,6 @@ "timers-ext": "^0.1.5" } }, - "memory-chunk-store": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/memory-chunk-store/-/memory-chunk-store-1.3.0.tgz", - "integrity": "sha512-6LsOpHKKhxYrLhHmOJdBCUtSO7op5rUs1pag0fhjHo0QiXRyna0bwYf4EmQuL7InUeF2J7dUMPr6VMogRyf9NA==" - }, "meow": { "version": "3.7.0", "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", @@ -9211,36 +8307,6 @@ "resolved": "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz", "integrity": "sha512-PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg==" }, - "mp4-box-encoding": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.4.1.tgz", - "integrity": "sha512-2/PRtGGiqPc/VEhbm7xAQ+gbb7yzHjjMAv6MpAifr5pCpbh3fQUdj93uNgwPiTppAGu8HFKe3PeU+OdRyAxStA==", - "requires": { - "uint64be": "^2.0.2" - } - }, - "mp4-stream": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mp4-stream/-/mp4-stream-3.1.0.tgz", - "integrity": "sha512-ZQQjf0VEiqPucwRvmT3e0pfZfMSE3nc5ngGUiN1+2VMxCtrInrlAjZ2K6jpNmxSZ/roiQne/ovYJYTeOvZDXPw==", - "requires": { - "mp4-box-encoding": "^1.3.0", - "next-event": "^1.0.0", - "readable-stream": "^3.0.6" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -9271,26 +8337,6 @@ "duplexer2": "0.0.2" } }, - "multistream": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/multistream/-/multistream-4.0.0.tgz", - "integrity": "sha512-t0C8MAtH/d3Y+5nooEtUMWli92lVw9Jhx4uOhRl5GAwS5vc+YTmp/VXNJNsCBAMeEyK/6zhbk6x9JE3AiCvo4g==", - "requires": { - "readable-stream": "^3.4.0" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, "mustache": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.0.1.tgz", @@ -9406,21 +8452,11 @@ "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", "dev": true }, - "netmask": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz", - "integrity": "sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=" - }, "network-address": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/network-address/-/network-address-1.1.2.tgz", "integrity": "sha1-Sqe/1D8D8LgclwKxPWqFjdsybz4=" }, - "next-event": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/next-event/-/next-event-1.0.0.tgz", - "integrity": "sha1-53eKzeLlWALgrRh5w5z2917aYdg=" - }, "next-line": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/next-line/-/next-line-1.1.0.tgz", @@ -9461,12 +8497,6 @@ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz", "integrity": "sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA==" }, - "node-gyp-build": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.7.0.tgz", - "integrity": "sha512-L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w==", - "optional": true - }, "node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -10236,23 +9266,6 @@ } } }, - "package-json-versionify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/package-json-versionify/-/package-json-versionify-1.0.4.tgz", - "integrity": "sha1-WGBYepRIc6a35tJujlH/siMVvxc=", - "requires": { - "browserify-package-json": "^1.0.0" - } - }, - "parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "requires": { - "callsites": "^3.0.0" - } - }, "parse-filepath": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", @@ -10272,41 +9285,11 @@ "error-ex": "^1.2.0" } }, - "parse-numeric-range": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/parse-numeric-range/-/parse-numeric-range-0.0.2.tgz", - "integrity": "sha1-tPCdQTx6282Yf26SM8e0shDJOOQ=" - }, - "parse-passwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", - "dev": true - }, - "parse-torrent": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/parse-torrent/-/parse-torrent-7.0.1.tgz", - "integrity": "sha512-FdF1kBImRLt+ICV4NTz8L+sI2hFlPXAq1tXuw21gKz8EuThyVUFJ/wPfBEyYQrvnBpmGf7cM/LVSOhMRe8MrKw==", - "requires": { - "bencode": "^2.0.0", - "blob-to-buffer": "^1.2.6", - "get-stdin": "^7.0.0", - "magnet-uri": "^5.1.3", - "simple-get": "^3.0.1", - "simple-sha1": "^3.0.0", - "uniq": "^1.0.1" - }, - "dependencies": { - "simple-sha1": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/simple-sha1/-/simple-sha1-3.0.1.tgz", - "integrity": "sha512-q7ehqWfHc1VhOm7sW099YDZ4I0yYX7rqyhqqhHV1IYeUTjPOhHyD3mXvv8k2P+rO7+7c8R4/D+8ffzC9BE7Cqg==", - "requires": { - "queue-microtask": "^1.1.2", - "rusha": "^0.8.1" - } - } - } + "parse-passwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", + "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", + "dev": true }, "parse-torrent-file": { "version": "2.1.4", @@ -10536,12 +9519,8 @@ "picomatch": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz", - "integrity": "sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==" - }, - "piece-length": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/piece-length/-/piece-length-2.0.1.tgz", - "integrity": "sha512-dBILiDmm43y0JPISWEmVGKBETQjwJe6mSU9GND+P9KW0SJGUwoU/odyH1nbalOP9i8WSYuqf1lQnaj92Bhw+Ug==" + "integrity": "sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==", + "dev": true }, "pify": { "version": "2.3.0", @@ -10844,11 +9823,6 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" }, - "queue-microtask": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.1.2.tgz", - "integrity": "sha512-F9wwNePtXrzZenAB3ax0Y8TSKGvuB7Qw16J30hspEUTbfUM+H827XyN3rlpwhVmtm5wuZtbKIHjOnwDn7MUxWQ==" - }, "random-access-file": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/random-access-file/-/random-access-file-2.1.3.tgz", @@ -10884,26 +9858,6 @@ "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=" }, - "range-slice-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/range-slice-stream/-/range-slice-stream-2.0.0.tgz", - "integrity": "sha512-PPYLwZ63lXi6Tv2EZ8w3M4FzC0rVqvxivaOVS8pXSp5FMIHFnvi4MWHL3UdFLhwSy50aNtJsgjY0mBC6oFL26Q==", - "requires": { - "readable-stream": "^3.0.2" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, "rarbg-api": { "version": "git+https://github.com/talas9/rarbg-api.git#599b6f4404e9f739062ceb3ba17fe9a619f7797a", "from": "git+https://github.com/talas9/rarbg-api.git", @@ -10961,134 +9915,6 @@ "read-pkg": "^1.0.0" } }, - "read-torrent": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/read-torrent/-/read-torrent-1.3.0.tgz", - "integrity": "sha1-Tg71vqbLJNMYQ+tvqFQ60CMqufQ=", - "requires": { - "magnet-uri": "~2.0.0", - "parse-torrent": "^4.0.0", - "request": "~2.16.2", - "xtend": "^4.0.0" - }, - "dependencies": { - "async": { - "version": "0.2.10", - "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", - "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=" - }, - "combined-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz", - "integrity": "sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8=", - "requires": { - "delayed-stream": "0.0.5" - } - }, - "delayed-stream": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz", - "integrity": "sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8=" - }, - "forever-agent": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz", - "integrity": "sha1-4cJcetROCcOPIzh2x2/MJP+EOx8=" - }, - "form-data": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz", - "integrity": "sha1-2zRaU3jYau6x7V1VO4aawZLS9e0=", - "requires": { - "async": "~0.2.7", - "combined-stream": "~0.0.4", - "mime": "~1.2.2" - } - }, - "json-stringify-safe": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz", - "integrity": "sha1-nbew5TDH8onF6MhDKvGRwv91pbM=" - }, - "magnet-uri": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz", - "integrity": "sha1-0zHT3804NlZa3g/DyjFeOSF7sgk=", - "requires": { - "thirty-two": "~0.0.1" - } - }, - "mime": { - "version": "1.2.11", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz", - "integrity": "sha1-WCA+7Ybjpe8XrtK32evUfwpg3RA=" - }, - "node-uuid": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz", - "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=" - }, - "oauth-sign": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz", - "integrity": "sha1-oOahcV2u0GLzIrYit/5a/RA1tuI=" - }, - "parse-torrent": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/parse-torrent/-/parse-torrent-4.1.0.tgz", - "integrity": "sha1-qBS9hQXotY6I64/z4tr/XRmnEbc=", - "requires": { - "magnet-uri": "^4.0.0", - "parse-torrent-file": "^2.0.0" - }, - "dependencies": { - "magnet-uri": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/magnet-uri/-/magnet-uri-4.2.3.tgz", - "integrity": "sha1-ecxtZaALtbfvXCWuYOu7XZp2gag=", - "requires": { - "flatten": "0.0.1", - "thirty-two": "^0.0.2", - "xtend": "^4.0.0" - } - } - } - }, - "qs": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz", - "integrity": "sha1-MbGtBYVnZRxSaSFQa5qHk5EaA4Q=" - }, - "request": { - "version": "2.16.6", - "resolved": "https://registry.npmjs.org/request/-/request-2.16.6.tgz", - "integrity": "sha1-hy/kRa5y3iZrN4edatfclI+gHK0=", - "requires": { - "aws-sign": "~0.2.0", - "cookie-jar": "~0.2.0", - "forever-agent": "~0.2.0", - "form-data": "~0.0.3", - "hawk": "~0.10.2", - "json-stringify-safe": "~3.0.0", - "mime": "~1.2.7", - "node-uuid": "~1.4.0", - "oauth-sign": "~0.2.0", - "qs": "~0.5.4", - "tunnel-agent": "~0.2.0" - } - }, - "thirty-two": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-0.0.2.tgz", - "integrity": "sha1-QlPinYywWPBIAmfFaYwOSSflS2o=" - }, - "tunnel-agent": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz", - "integrity": "sha1-aFPCr7GyEJ5FYp5JK9419Fnqaeg=" - } - } - }, "readable-stream": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", @@ -11110,14 +9936,6 @@ } } }, - "readdirp": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz", - "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==", - "requires": { - "picomatch": "^2.0.7" - } - }, "realpath-native": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz", @@ -11136,11 +9954,6 @@ "resolve": "^1.1.6" } }, - "record-cache": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/record-cache/-/record-cache-1.1.0.tgz", - "integrity": "sha512-u8rbtLEJV7HRacl/ZYwSBFD8NFyB3PfTTfGLP37IW3hftQCwu6z4Q2RLyxo1YJUNRTEzJfpLpGwVuEYdaIkG9Q==" - }, "recursive-readdir-sync": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/recursive-readdir-sync/-/recursive-readdir-sync-1.0.6.tgz", @@ -11181,12 +9994,6 @@ "define-properties": "^1.1.2" } }, - "regexpp": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", - "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", - "dev": true - }, "registry-auth-token": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz", @@ -11233,33 +10040,6 @@ "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", "dev": true }, - "render-media": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/render-media/-/render-media-3.4.0.tgz", - "integrity": "sha512-0BTIvIBS4xdC/qPpoj8ZsdZ/YoQhn+DutUqBkur1yUs5SnDoruiAtaHFJhxle8pREnNN/kT8E8fkftgMkJ8Tvg==", - "requires": { - "debug": "^4.1.1", - "is-ascii": "^1.0.0", - "mediasource": "^2.1.0", - "stream-to-blob-url": "^3.0.0", - "videostream": "^3.2.0" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - } - } - }, "repeat-element": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", @@ -11410,12 +10190,6 @@ "global-modules": "^1.0.0" } }, - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true - }, "resolve-options": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz", @@ -11466,6 +10240,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz", "integrity": "sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==", + "dev": true, "requires": { "glob": "^7.1.3" } @@ -11489,11 +10264,6 @@ "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz", "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==" }, - "run-parallel-limit": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.5.tgz", - "integrity": "sha512-NsY+oDngvrvMxKB3G8ijBzIema6aYbQMD2bHOamvN52BysbIGTnEY2xsNyfrcr9GhY995/t/0nQN3R3oZvaDlg==" - }, "run-series": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/run-series/-/run-series-1.1.8.tgz", @@ -11613,11 +10383,6 @@ "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz", "integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk=" }, - "semver": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.0.tgz", - "integrity": "sha512-4P8Vc43MxQL6UKqSiEnf0jZNYx545R9W1HwXP6p65paPp86AUJiafZ8XG81hAbcldKMCUIbeykUTVYG19LB7Cw==" - }, "semver-diff": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz", @@ -11756,31 +10521,6 @@ "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz", "integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=" }, - "simple-get": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz", - "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==", - "requires": { - "decompress-response": "^4.2.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - }, - "dependencies": { - "decompress-response": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz", - "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==", - "requires": { - "mimic-response": "^2.0.0" - } - }, - "mimic-response": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.0.0.tgz", - "integrity": "sha512-8ilDoEapqA4uQ3TwS0jakGONKXVJqpy+RpM+3b7pLdOjghCrEiGp9SRkFbUHAmZW9vdnrENWHjaweIoTIJExSQ==" - } - } - }, "simple-glob": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/simple-glob/-/simple-glob-0.2.0.tgz", @@ -11863,34 +10603,6 @@ "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", "dev": true }, - "slice-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", - "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.0", - "astral-regex": "^1.0.0", - "is-fullwidth-code-point": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - } - } - }, "snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", @@ -11998,14 +10710,6 @@ } } }, - "sntp": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz", - "integrity": "sha1-XvSBuVGnspr/30r9fyaDj8ESD4Q=", - "requires": { - "hoek": "0.7.x" - } - }, "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", @@ -12088,14 +10792,6 @@ "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz", "integrity": "sha1-mHbb0qFp0xFUAtSObqYynIgWpQ0=" }, - "split": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", - "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", - "requires": { - "through": "2" - } - }, "split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", @@ -12197,27 +10893,6 @@ "any-promise": "^1.1.0" } }, - "stream-to-blob": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/stream-to-blob/-/stream-to-blob-2.0.0.tgz", - "integrity": "sha512-E+YitTtIHo7RQ4Cmgl+EzlMpqvLroTynRgt4t0pI4y5oz/piqlBQB8NFXLIWcjGOsKw+THnImrdpWcOCVxK25Q==" - }, - "stream-to-blob-url": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/stream-to-blob-url/-/stream-to-blob-url-3.0.0.tgz", - "integrity": "sha512-Mu1iPvbBkzdUPCZ+J+XBr/oagjOBfj4vpErHRIe08QzWeILSDtF5LXo6v44HeQFpx7dfqcBKjGUbSNCJ+38zqQ==", - "requires": { - "stream-to-blob": "^2.0.0" - } - }, - "stream-with-known-length-to-buffer": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/stream-with-known-length-to-buffer/-/stream-with-known-length-to-buffer-1.0.3.tgz", - "integrity": "sha512-4Wi2v47HMkNdRWrlFJNlIsrhV6z6nCyVKVAIiq14MAnc7wILEAINmn96IiPWTcXzT8y2S6yfBoX++MUxqiovag==", - "requires": { - "once": "^1.3.3" - } - }, "strike-api": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/strike-api/-/strike-api-0.2.0.tgz", @@ -12447,58 +11122,6 @@ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", "dev": true }, - "table": { - "version": "5.4.6", - "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", - "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", - "dev": true, - "requires": { - "ajv": "^6.10.2", - "lodash": "^4.17.14", - "slice-ansi": "^2.1.0", - "string-width": "^3.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, "tar": { "version": "5.0.5", "resolved": "https://registry.npmjs.org/tar/-/tar-5.0.5.tgz", @@ -12672,12 +11295,6 @@ } } }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", - "dev": true - }, "thenify": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz", @@ -12779,11 +11396,6 @@ "is-negated-glob": "^1.0.0" } }, - "to-arraybuffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=" - }, "to-buffer": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz", @@ -12975,48 +11587,6 @@ } } }, - "torrent-tracker": { - "version": "git+https://github.com/PTCE-Public/torrent-tracker.git#6c2ac5eedec302ea6e0ba5264fdeedbc8dfc0690", - "from": "git+https://github.com/PTCE-Public/torrent-tracker.git", - "requires": { - "bencode": "^0.7.0", - "compact2string": "^1.4.0", - "hat": "0.0.3", - "request": "^2.60.0", - "underscore": "^1.8.3", - "urijs": "^1.17.0" - }, - "dependencies": { - "bencode": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/bencode/-/bencode-0.7.0.tgz", - "integrity": "sha1-gR7WR8ARiUXkG7S7veqaLHihcIM=" - } - } - }, - "torrent-tracker-health": { - "version": "git+https://github.com/PTCE-Public/torrent-tracker-health.git#4d593d415fe114b9f9f02aa2864d91b55086cb14", - "from": "git+https://github.com/PTCE-Public/torrent-tracker-health.git", - "requires": { - "async": "^1.4.0", - "debug": "^2.2.0", - "q": "1.4.1", - "read-torrent": "1.3.0", - "torrent-tracker": "git+https://github.com/PTCE-Public/torrent-tracker.git" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" - }, - "q": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz", - "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=" - } - } - }, "tough-cookie": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", @@ -13052,14 +11622,8 @@ "trim-newlines": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", - "optional": true - }, - "tslib": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", - "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==", - "dev": true + "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", + "optional": true }, "tunnel-agent": { "version": "0.6.0", @@ -13084,25 +11648,11 @@ "prelude-ls": "~1.1.2" } }, - "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true - }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, - "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" - } - }, "uglify-js": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz", @@ -13123,14 +11673,6 @@ } } }, - "uint64be": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/uint64be/-/uint64be-2.0.2.tgz", - "integrity": "sha512-9QqdvpGQTXgxthP+lY4e/gIBy+RuqcBaC6JVwT5I3bDLgT/btL6twZMR0pI3/Fgah9G/pdwzIprE5gL6v9UvyQ==", - "requires": { - "buffer-alloc": "^1.1.0" - } - }, "ultron": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", @@ -13229,11 +11771,6 @@ "crypto-random-string": "^1.0.0" } }, - "unordered-array-remove": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unordered-array-remove/-/unordered-array-remove-1.0.2.tgz", - "integrity": "sha1-xUbo+I4xegzyZEyX7LV9umbSUO8=" - }, "unset-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", @@ -13400,29 +11937,6 @@ "elementtree": "~0.1.6" } }, - "upnp-mediarenderer-client": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/upnp-mediarenderer-client/-/upnp-mediarenderer-client-1.2.4.tgz", - "integrity": "sha1-DGOlGAIIK2sDtZbEdcxk/B4Id8g=", - "requires": { - "debug": "^2.1.3", - "elementtree": "^0.1.6", - "upnp-device-client": "^1.0.0" - }, - "dependencies": { - "upnp-device-client": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/upnp-device-client/-/upnp-device-client-1.0.2.tgz", - "integrity": "sha1-kfhHBfI0m/iQgoVf/04wBqxDUzc=", - "requires": { - "concat-stream": "^1.4.8", - "debug": "^2.1.3", - "elementtree": "~0.1.6", - "network-address": "^1.0.0" - } - } - } - }, "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", @@ -13464,65 +11978,6 @@ "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", "dev": true }, - "ut_metadata": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.5.0.tgz", - "integrity": "sha512-eqiRaDYiDl94uVB9oR8Yor+xl0rSKUovsqDxMt+hXzJt1yLYAo0HksVLlSiPPwkXBGFpERQADPanCi0EGhixnw==", - "requires": { - "bencode": "^2.0.0", - "bitfield": "^3.0.0", - "debug": "^4.0.0", - "simple-sha1": "^3.0.0" - }, - "dependencies": { - "bitfield": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bitfield/-/bitfield-3.0.0.tgz", - "integrity": "sha512-hJmWKucJQfdSkQPDPBKmWogM9s8+NOSzDT9QVbJbjinXaQ0bJKPu/cn98qRWy3PDNWtKw4XaoUP3XruGRIKEgg==" - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "simple-sha1": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/simple-sha1/-/simple-sha1-3.0.1.tgz", - "integrity": "sha512-q7ehqWfHc1VhOm7sW099YDZ4I0yYX7rqyhqqhHV1IYeUTjPOhHyD3mXvv8k2P+rO7+7c8R4/D+8ffzC9BE7Cqg==", - "requires": { - "queue-microtask": "^1.1.2", - "rusha": "^0.8.1" - } - } - } - }, - "ut_pex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ut_pex/-/ut_pex-2.0.0.tgz", - "integrity": "sha512-Uc0IxXGlES1DfeG+ITUISAvCF4Uldj7tt/n7s3TBt0KyXqDViOO26X5WfwXtUpEwn8fyZyerzf/YOK4rIZ2S3Q==", - "requires": { - "bencode": "^2.0.0", - "compact2string": "^1.2.0", - "string2compact": "^1.2.5" - } - }, - "utf-8-validate": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.2.tgz", - "integrity": "sha512-SwV++i2gTD5qh2XqaPzBnNX88N6HdyhQrNNRykvcS0QKvItV9u3vPEJr+X5Hhfb1JC0r0e1alL0iB09rY8+nmw==", - "optional": true, - "requires": { - "node-gyp-build": "~3.7.0" - } - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -13551,12 +12006,6 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" }, - "v8-compile-cache": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz", - "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==", - "dev": true - }, "v8flags": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz", @@ -13591,30 +12040,6 @@ "extsprintf": "^1.2.0" } }, - "videostream": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/videostream/-/videostream-3.2.1.tgz", - "integrity": "sha512-Z4EcsX9aYNJZD1M+0jCeQ0t+5ETlHE88B2SF1fCuVxfn+XxHGJVec6tbHGqpULk4esOOLJEipAScOCDGHk+teQ==", - "requires": { - "binary-search": "^1.3.4", - "mediasource": "^2.2.2", - "mp4-box-encoding": "^1.3.0", - "mp4-stream": "^3.0.0", - "pump": "^3.0.0", - "range-slice-stream": "^2.0.0" - }, - "dependencies": { - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - } - } - }, "vinyl": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", @@ -13799,237 +12224,6 @@ "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==" }, - "webtorrent": { - "version": "0.108.0", - "resolved": "https://registry.npmjs.org/webtorrent/-/webtorrent-0.108.0.tgz", - "integrity": "sha512-euLFLpTEU1sIS2Bevc6aYxubC6AYGheqkqKDGBGSCdHFqY03+veoB7Gjat7TYy8zQJ04HOR+g66t5tOVUQfAPg==", - "requires": { - "addr-to-ip-port": "^1.4.2", - "bitfield": "^3.0.0", - "bittorrent-dht": "^9.0.0", - "bittorrent-protocol": "^3.0.0", - "chrome-net": "^3.3.2", - "chunk-store-stream": "^4.0.0", - "create-torrent": "^4.0.0", - "debug": "^4.1.0", - "end-of-stream": "1.4.1", - "escape-html": "^1.0.3", - "fs-chunk-store": "^2.0.0", - "http-node": "github:feross/http-node#webtorrent", - "immediate-chunk-store": "^2.0.0", - "load-ip-set": "^2.1.0", - "memory-chunk-store": "^1.2.0", - "mime": "^2.4.0", - "multistream": "^4.0.0", - "package-json-versionify": "^1.0.2", - "parse-numeric-range": "^0.0.2", - "parse-torrent": "^7.0.0", - "pump": "^3.0.0", - "random-iterate": "^1.0.1", - "randombytes": "^2.0.3", - "range-parser": "^1.2.0", - "readable-stream": "^3.0.6", - "render-media": "^3.0.0", - "run-parallel": "^1.1.6", - "run-parallel-limit": "^1.0.3", - "simple-concat": "^1.0.0", - "simple-get": "^3.0.1", - "simple-peer": "^9.0.0", - "simple-sha1": "^3.0.1", - "speedometer": "^1.0.0", - "stream-to-blob": "^2.0.0", - "stream-to-blob-url": "^3.0.0", - "stream-with-known-length-to-buffer": "^1.0.0", - "torrent-discovery": "^9.1.1", - "torrent-piece": "^2.0.0", - "unordered-array-remove": "^1.0.2", - "ut_metadata": "^3.3.0", - "ut_pex": "^2.0.0" - }, - "dependencies": { - "bitfield": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bitfield/-/bitfield-3.0.0.tgz", - "integrity": "sha512-hJmWKucJQfdSkQPDPBKmWogM9s8+NOSzDT9QVbJbjinXaQ0bJKPu/cn98qRWy3PDNWtKw4XaoUP3XruGRIKEgg==" - }, - "bittorrent-dht": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-9.0.3.tgz", - "integrity": "sha512-6FISjApL62THEMyptDm0kPTAnInBn8Sft3dK/JZcCI07LRIpIP+3Z6gle6xJUhyRVs6K5HmXAtaRatFsOEySOg==", - "requires": { - "bencode": "^2.0.0", - "debug": "^4.1.1", - "inherits": "^2.0.1", - "k-bucket": "^5.0.0", - "k-rpc": "^5.0.0", - "last-one-wins": "^1.0.4", - "lru": "^3.1.0", - "randombytes": "^2.0.5", - "record-cache": "^1.0.2", - "simple-sha1": "^3.0.0" - } - }, - "bittorrent-tracker": { - "version": "9.14.5", - "resolved": "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.14.5.tgz", - "integrity": "sha512-Y1ng5r2qGCgDldjd9eYL8Mv1DjCo6eljqC+T6IMcwmYx0h20KNPKTxJkyNT5gaeJkAhM+p+jmhlV7/ty535Txg==", - "requires": { - "bencode": "^2.0.0", - "bittorrent-peerid": "^1.0.2", - "bn.js": "^5.0.0", - "bufferutil": "^4.0.0", - "chrome-dgram": "^3.0.2", - "compact2string": "^1.2.0", - "debug": "^4.0.1", - "ip": "^1.0.1", - "lru": "^3.0.0", - "minimist": "^1.1.1", - "once": "^1.3.0", - "random-iterate": "^1.0.1", - "randombytes": "^2.0.3", - "run-parallel": "^1.1.2", - "run-series": "^1.0.2", - "simple-get": "^3.0.0", - "simple-peer": "^9.0.0", - "simple-websocket": "^8.0.0", - "string2compact": "^1.1.1", - "unordered-array-remove": "^1.0.2", - "utf-8-validate": "^5.0.1", - "ws": "^7.0.0" - } - }, - "bn.js": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.1.tgz", - "integrity": "sha512-IUTD/REb78Z2eodka1QZyyEk66pciRcP6Sroka0aI3tG/iwIdYLrBD62RsubR7vqdt3WyX8p4jxeatzmRSphtA==" - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "immediate-chunk-store": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/immediate-chunk-store/-/immediate-chunk-store-2.1.0.tgz", - "integrity": "sha512-QshP0SFpsy/bHQBjYMgzCcnLoqTj6PHFg8ZkPi2WbTw1qddNy0puuPDaFlXyrsZAdWMT3QziPDMzfj+mzCVMYg==", - "requires": { - "queue-microtask": "^1.1.2" - } - }, - "k-bucket": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/k-bucket/-/k-bucket-5.0.0.tgz", - "integrity": "sha512-r/q+wV/Kde62/tk+rqyttEJn6h0jR7x+incdMVSYTqK73zVxVrzJa70kJL49cIKen8XjIgUZKSvk8ktnrQbK4w==", - "requires": { - "randombytes": "^2.0.3" - } - }, - "k-rpc": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/k-rpc/-/k-rpc-5.1.0.tgz", - "integrity": "sha512-FGc+n70Hcjoa/X2JTwP+jMIOpBz+pkRffHnSl9yrYiwUxg3FIgD50+u1ePfJUOnRCnx6pbjmVk5aAeB1wIijuQ==", - "requires": { - "k-bucket": "^5.0.0", - "k-rpc-socket": "^1.7.2", - "randombytes": "^2.0.5" - } - }, - "lru": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lru/-/lru-3.1.0.tgz", - "integrity": "sha1-6n+4VG2DczOWoTCR12z+tMBoN9U=", - "requires": { - "inherits": "^2.0.1" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, - "simple-peer": { - "version": "9.6.2", - "resolved": "https://registry.npmjs.org/simple-peer/-/simple-peer-9.6.2.tgz", - "integrity": "sha512-EOKoImCaqtNvXIntxT1CBBK/3pVi7tMAoJ3shdyd9qk3zLm3QPiRLb/sPC1G2xvKJkJc5fkQjCXqRZ0AknwTig==", - "requires": { - "debug": "^4.0.1", - "get-browser-rtc": "^1.0.0", - "queue-microtask": "^1.1.0", - "randombytes": "^2.0.3", - "readable-stream": "^3.4.0" - } - }, - "simple-sha1": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/simple-sha1/-/simple-sha1-3.0.1.tgz", - "integrity": "sha512-q7ehqWfHc1VhOm7sW099YDZ4I0yYX7rqyhqqhHV1IYeUTjPOhHyD3mXvv8k2P+rO7+7c8R4/D+8ffzC9BE7Cqg==", - "requires": { - "queue-microtask": "^1.1.2", - "rusha": "^0.8.1" - } - }, - "simple-websocket": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/simple-websocket/-/simple-websocket-8.1.1.tgz", - "integrity": "sha512-06I3cwOD5Q3LdVd6qfyDGp1U9eau9x9qniSL3b/aDgM5bsJX4nZfCuii2UCFcTfrDq0jCXF4NQ/38qeC8CJZTg==", - "requires": { - "debug": "^4.1.1", - "queue-microtask": "^1.1.0", - "randombytes": "^2.0.3", - "readable-stream": "^3.1.1", - "ws": "^7.0.0" - } - }, - "speedometer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-1.1.0.tgz", - "integrity": "sha512-z/wAiTESw2XVPssY2XRcme4niTc4S5FkkJ4gknudtVoc33Zil8TdTxHy5torRcgqMqksJV2Yz8HQcvtbsnw0mQ==" - }, - "torrent-discovery": { - "version": "9.2.1", - "resolved": "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.2.1.tgz", - "integrity": "sha512-bjKkbTEkcoZTXF8nhcRu6UWqbkpUsehd/6umoZqjgj/dM8nD3O7wNkPZrmls+vVf+2LT9ejZMlNUvZCqSe8cqg==", - "requires": { - "bittorrent-dht": "^9.0.0", - "bittorrent-tracker": "^9.0.0", - "debug": "^4.0.0", - "run-parallel": "^1.1.2" - } - }, - "torrent-piece": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/torrent-piece/-/torrent-piece-2.0.0.tgz", - "integrity": "sha512-H/Z/yCuvZJj1vl1IQHI8dvF2QrUuXRJoptT5DW5967/dsLpXlCg+uyhFR5lfNj5mNaYePUbKtnL+qKWZGXv4Nw==" - }, - "ws": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", - "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==" - } - } - }, "whatwg-encoding": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", @@ -14203,12 +12397,6 @@ "integrity": "sha1-CvyjDzxudFgFjSigtnPJ3aYiubU=", "dev": true }, - "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true - }, "wordwrap": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", @@ -14229,15 +12417,6 @@ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, - "write": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", - "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", - "dev": true, - "requires": { - "mkdirp": "^0.5.1" - } - }, "write-file-atomic": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz", @@ -14332,102 +12511,6 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, - "yargs": { - "version": "14.2.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.2.tgz", - "integrity": "sha512-/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA==", - "dev": true, - "requires": { - "cliui": "^5.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^15.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", - "dev": true - }, - "yargs-parser": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.0.tgz", - "integrity": "sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - } - } - }, "yargs-parser": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", @@ -14454,15 +12537,6 @@ "fd-slicer": "~1.0.1" } }, - "yazl": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz", - "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==", - "dev": true, - "requires": { - "buffer-crc32": "~0.2.3" - } - }, "zip-stream": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz", diff --git a/package.json b/package.json index acf6984a..dc5660df 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "main": "src/app/index.html", "version": "0.4.1-18-develop", "node-remote": "*://*", - "chromium-args": "--password-store=basic --remote-debugging-port=9222", + "chromium-args": "--password-store=basic --remote-debugging-port=9222 --inspect-brk", "releaseName": "Popcorn Treats", "scripts": { "start": "npx gulp run", @@ -31,21 +31,22 @@ "position": "center" }, "dependencies": { + "URIjs": "^1.16.1", "adm-zip": "0.4.13", "airplay-js": "^0.3.0", "ajv": "6.12.2", - "async": "^3.0.1", + "async": "^3.2.0", "axios": "^0.19.2", "chromecast-js": "git+https://github.com/captainyarr/chromecast-js.git", "i18n": "0.8.6", - "iconv-lite": "^0.5.0", + "iconv-lite": "^0.5.2", "jschardet": "2.1.0", "json-rpc2": "^1.0.2", "kat-api-ce": "^0.0.4", "markdown": "~0.5.0", "memoizee": "^0.4.4", - "mkdirp": "^0.5.1", - "moment": "^2.25.3", + "mkdirp": "^0.5.5", + "moment": "^2.27.0", "mv": "^2.0.3", "nedb": "1.8.0", "node-captions": "0.4.6", @@ -55,41 +56,42 @@ "opensubtitles-api": "5.1.1", "opensubtitles-ce": "^1.0.0", "os-name": "^3.1.0", - "parse-torrent": "^7.0.1", + "parse-torrent": "^7.1.3", "peerflix": "^0.39.0", "q": "^2.0.3", "rarbg-api": "git+https://github.com/talas9/rarbg-api.git", - "readdirp": "^3.3.0", - "request": "^2.87.0", - "rimraf": "^3.0.0", + "read-torrent": "^1.3.1", + "readdirp": "^3.4.0", + "request": "^2.88.2", + "rimraf": "^3.0.2", "sanitizer": "^0.1.2", - "semver": "^7.0.0", + "semver": "^7.3.2", "send": "^0.17.1", "strike-api": "0.2.0", "tar": "^5.0.5", "temp": "^0.9.1", - "torrent-tracker-health": "git+https://github.com/PTCE-Public/torrent-tracker-health.git", + "torrent-tracker": "0.0.9", "underscore": "1.9.2", - "upnp-mediarenderer-client": "^1.2.1", + "upnp-mediarenderer-client": "^1.4.0", "urijs": "^1.19.2", - "webtorrent": "^0.108.0", + "webtorrent": "^0.108.6", "xmlbuilder": "^13.0.2" }, "devDependencies": { "del": "^5.1.0", - "eslint": "^6.7.2", + "eslint": "^6.8.0", "eslint-config-google": "^0.14.0", "gulp": "^4.0.2", "gulp-download": "0.0.1", "gulp-gzip": "^1.4.2", "gulp-tar": "3.0.1", "gulp-unzip": "^1.1.0", - "gulp-zip": "^5.0.1", + "gulp-zip": "^5.0.2", "jest": "^24.9.0", "merge2": "1.3.0", "nw-builder": "^3.5.7", "nw-gyp": "^3.6.5", - "yargs": "^14.2.2" + "yargs": "^14.2.3" }, "description": "", "author": "" diff --git a/src/app/lib/util/torrent-tracker-health/LICENSE b/src/app/lib/util/torrent-tracker-health/LICENSE new file mode 100644 index 00000000..5a3ca391 --- /dev/null +++ b/src/app/lib/util/torrent-tracker-health/LICENSE @@ -0,0 +1,23 @@ +The MIT License (MIT) + +Copyright (c) 2015 Popcorn Time Team & the contributors +Copyright (c) 2014 XeonCore +Original Code Copyright (c) 2014 Eóin Martin + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/src/app/lib/util/torrent-tracker-health/README.md b/src/app/lib/util/torrent-tracker-health/README.md new file mode 100644 index 00000000..8fce3923 --- /dev/null +++ b/src/app/lib/util/torrent-tracker-health/README.md @@ -0,0 +1,21 @@ +torrent-tracker-health +============== + +Get health info for torrents. This library is based on torrent-tracker and returns the number of seeds and peers. + +Based on [torrent-health](https://github.com/SlashmanX/torrent-health). + + var torrentHealth = require('torrent-tracker-health'); + var magnet = 'magnet:?xt=urn:btih:d2310f718eb02f98665266786f7d00b42a20f055&dn=Gone+Girl+(2014)+1080p&tr=udp://tracker.openbittorrent.com:80/announce&tr=udp://open.demonii.com:1337/announce&tr=udp://tracker.coppersurfer.tk:6969'; + + torrentHealth(magnet, { + timeout: 1000 + }) + .then(function (res) { + console.log('seeds:', res.seeds); + console.log('peers:', res.peers); + console.log('ratio:', res.peers > 0 ? res.seeds / res.peers : +res.seeds); + }) + .catch(function (err) { + console.log('error:', err); + }); \ No newline at end of file diff --git a/src/app/lib/util/torrent-tracker-health/index.js b/src/app/lib/util/torrent-tracker-health/index.js new file mode 100644 index 00000000..da279f47 --- /dev/null +++ b/src/app/lib/util/torrent-tracker-health/index.js @@ -0,0 +1,125 @@ + + +var readTorrent = require('read-torrent'), + Q = require('q'), + async = require('async'), + util = require('util'), + //LOG = require('debug')('torrent-tracker-health'), + Tracker = require('torrent-tracker'); + + +module.exports = getHealth; +//exports = getHealth; +//export default getHealth; + +var trackerCache = { + trackers: {}, + get: function(tracker) { + if (tracker in this.trackers) { + return this.trackers[tracker]; + } else { + this.trackers[tracker] = new Tracker(tracker); + return this.trackers[tracker]; + } + } +}; + +function getHealth(uri, options) { + if (!options) { + options = {}; + } + + if (typeof uri === 'object') { + if (!uri.uri) { + throw 'No torrent URI specified'; + } else { + options = uri; + uri = options.uri; + } + } + + var defer = Q.defer(); + + readTorrent(uri, function(err, info) { + if (err) { + //LOG('Error in read-torrent: ' + err.message); + return defer.reject(err); + } else { + if (!util.isArray(info.announce)) { + info.announce = [info.announce]; + } + + if (options.force && util.isArray(options.force)) { + options.force.forEach(function(trUri) { + if (info.announce.indexOf(trUri) === -1) { + // Add the "forced" trackers to the list + info.announce.push(trUri); + } + }); + } + + async.map(info.announce, function(trUri, done) { + // Check the tracker URI isn't blacklisted + if (options.blacklist && options.blacklist.some(function(regex) { + if (typeof regex === 'string') { + regex = new RegExp(regex); + } + return regex.test(trUri); + })) { + // Don't try to scrape it. + return done(null, null); + } + + //LOG('Obtaining tracker for ' + trUri); + var tracker = trackerCache.get(trUri); + tracker.scrape([info.infoHash], { + timeout: options.timeout + }, function(err, data) { + if (err) { + if (err.message === 'timed out' || err.code === 'ETIMEDOUT') { + //LOG('Scrape timed out for ' + trUri); + return done(null, null); + } else { + //LOG('Error in torrent-tracker: ' + err.message); + return done(err, null); + } + } else { + return done(null, { + seeds: data[info.infoHash].seeders, + peers: data[info.infoHash].leechers + }); + } + }); + }, function(err, results) { + if (err) { + //LOG('Error: ' + err.message); + return defer.reject(err); + } else { + var totalSeeds = 0, + totalPeers = 0, + total = 0; + results.forEach(function(result) { + if (!result) { + return; + } + totalSeeds += result.seeds | 0; + totalPeers += result.peers | 0; + total++; + }); + + // Avoid divide-by-zero issues + if (total === 0) { + total = 1; + } + + return defer.resolve({ + seeds: Math.round(totalSeeds / total) | 0, + peers: Math.round(totalPeers / total) | 0 + }); + } + }); + } + }); + + return defer.promise; +} diff --git a/src/app/lib/views/show_detail.js b/src/app/lib/views/show_detail.js index 049805a3..4fe05f8f 100644 --- a/src/app/lib/views/show_detail.js +++ b/src/app/lib/views/show_detail.js @@ -1,7 +1,8 @@ (function (App) { 'use strict'; - var torrentHealth = require('torrent-tracker-health'); + //var torrentHealth = require('torrent-tracker-health'); + var torrentHealth = require('./lib/util/torrent-tracker-health'); var cancelTorrentHealth = function () {}; var torrentHealthRestarted = null; @@ -853,6 +854,7 @@ if (torrent.substring(0, 8) === 'magnet:?') { // if 'magnet:?' is because TVApi sends back links, not magnets + //TODO: Update torrent magnet with full tracker list torrent = torrent.split('&tr')[0] + '&tr=udp://tracker.openbittorrent.com:80/announce' + '&tr=udp://open.demonii.com:1337/announce' + '&tr=udp://tracker.coppersurfer.tk:6969'; torrentHealth(torrent, { diff --git a/src/app/lib/views/torrent_collection.js b/src/app/lib/views/torrent_collection.js index c8c332d8..5ffddf4b 100644 --- a/src/app/lib/views/torrent_collection.js +++ b/src/app/lib/views/torrent_collection.js @@ -248,8 +248,11 @@ '
  • ' + item.title + '
    ' + item.size + '
    • ' ); if (item.seeds === 0) { // recalc the peers/seeds + //TODO: Update tracker list to full var torrent = item.magnet.split('&tr')[0] + '&tr=udp://tracker.openbittorrent.com:80/announce' + '&tr=udp://open.demonii.com:1337/announce' + '&tr=udp://tracker.coppersurfer.tk:6969'; - require('torrent-tracker-health')(torrent, { + + //require('torrent-tracker-health')(torrent, { + require(' ./lib/util/torrent-tracker-health')(torrent, { timeout: 1000 }).then(function (res) { //console.log('torrent index %s: %s -> %s (seeds)', item.index, item.seeds, res.seeds) From 32d36c9e8ad194713b83e57bd3f3b9344ccb89c7 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Thu, 16 Jul 2020 02:16:58 -0700 Subject: [PATCH 57/77] RARBG: Fixed RARBG search support in Torrent Collection RARBG: Updated categories for RARBG to support 4K, Movies, TV Shows, XXX --- package-lock.json | 2423 +++++++++++++++++++--- package.json | 2 +- src/app/language/en.json | 4 +- src/app/lib/providers/torrent_cache.js | 150 +- src/app/lib/views/player/loading.js | 6 + src/app/lib/views/torrent_collection.js | 198 +- src/app/settings.js | 2 +- src/app/templates/torrent_collection.tpl | 2 +- 8 files changed, 2342 insertions(+), 445 deletions(-) diff --git a/package-lock.json b/package-lock.json index c3310d86..b32f80dd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -723,6 +723,12 @@ "@babel/types": "^7.3.0" } }, + "@types/color-name": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", + "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", + "dev": true + }, "@types/events": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", @@ -798,6 +804,11 @@ "integrity": "sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==", "dev": true }, + "URIjs": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/URIjs/-/URIjs-1.16.1.tgz", + "integrity": "sha1-7evGeLi3SyawXStIHhI4P1rgS4s=" + }, "abab": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.2.tgz", @@ -833,6 +844,12 @@ } } }, + "acorn-jsx": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz", + "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==", + "dev": true + }, "acorn-walk": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz", @@ -1305,6 +1322,23 @@ "readable-stream": "^2.0.6" } }, + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "requires": { + "sprintf-js": "~1.0.2" + }, + "dependencies": { + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + } + } + }, "arr-diff": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", @@ -1485,6 +1519,11 @@ "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", "dev": true }, + "async": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", + "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==" + }, "async-done": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz", @@ -1767,6 +1806,11 @@ "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", "dev": true }, + "binary-search": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/binary-search/-/binary-search-1.3.6.tgz", + "integrity": "sha512-nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA==" + }, "binary-search-tree": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.5.tgz", @@ -1808,6 +1852,60 @@ } } }, + "bittorrent-peerid": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/bittorrent-peerid/-/bittorrent-peerid-1.3.2.tgz", + "integrity": "sha512-3xPhNfklf4xzxFVw9Y7W5dnGNhubVF0r8BK3imIsB6E3aDA4d6WhsceK1Yusos0TiiB9QZrdCsVXVqs26sFMxw==" + }, + "bittorrent-protocol": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.1.1.tgz", + "integrity": "sha512-kthSXghQ9DRQ4Lrjr1ceyIeEMeL5x9WiaSrQyR+5Nrr3g9QY6MvDeq+KLQz17R6094iDmT/LgFbQYAPj09/oUA==", + "requires": { + "bencode": "^2.0.0", + "bitfield": "^3.0.0", + "debug": "^4.1.1", + "randombytes": "^2.0.5", + "readable-stream": "^3.0.0", + "speedometer": "^1.0.0", + "unordered-array-remove": "^1.0.2" + }, + "dependencies": { + "bitfield": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bitfield/-/bitfield-3.0.0.tgz", + "integrity": "sha512-hJmWKucJQfdSkQPDPBKmWogM9s8+NOSzDT9QVbJbjinXaQ0bJKPu/cn98qRWy3PDNWtKw4XaoUP3XruGRIKEgg==" + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, + "speedometer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-1.1.0.tgz", + "integrity": "sha512-z/wAiTESw2XVPssY2XRcme4niTc4S5FkkJ4gknudtVoc33Zil8TdTxHy5torRcgqMqksJV2Yz8HQcvtbsnw0mQ==" + } + } + }, "bittorrent-tracker": { "version": "7.7.0", "resolved": "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-7.7.0.tgz", @@ -1875,6 +1973,26 @@ "inherits": "~2.0.0" } }, + "block-stream2": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/block-stream2/-/block-stream2-2.0.0.tgz", + "integrity": "sha512-1oI+RHHUEo64xomy1ozLgVJetFlHkIfQfJzTBQrj6xWnEMEPooeo2fZoqFjp0yzfHMBrgxwgh70tKp6T17+i3g==", + "requires": { + "readable-stream": "^3.4.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, "bluebird": { "version": "3.4.7", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz", @@ -1905,11 +2023,6 @@ "multicast-dns-service-types": "^1.1.0" } }, - "boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" - }, "boxen": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", @@ -2072,6 +2185,11 @@ } } }, + "browserify-package-json": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/browserify-package-json/-/browserify-package-json-1.0.1.tgz", + "integrity": "sha1-mN3oqlxWH9bT/km7qhArdLOW/eo=" + }, "bser": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz", @@ -2157,6 +2275,15 @@ "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=", "dev": true }, + "bufferutil": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.1.tgz", + "integrity": "sha512-xowrxvpxojqkagPcWRQVXZl0YXhRhAtBEIq3VoER1NH5Mw1n1o0ojdspp+GS2J//2gCVyrzQDApQ4unGF+QOoA==", + "optional": true, + "requires": { + "node-gyp-build": "~3.7.0" + } + }, "bufferview": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/bufferview/-/bufferview-1.0.1.tgz", @@ -2285,29 +2412,6 @@ "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz", "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=" }, - "cheerio": { - "version": "0.22.0", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz", - "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=", - "requires": { - "css-select": "~1.2.0", - "dom-serializer": "~0.1.0", - "entities": "~1.1.1", - "htmlparser2": "^3.9.1", - "lodash.assignin": "^4.0.9", - "lodash.bind": "^4.1.4", - "lodash.defaults": "^4.0.1", - "lodash.filter": "^4.4.0", - "lodash.flatten": "^4.2.0", - "lodash.foreach": "^4.3.0", - "lodash.map": "^4.4.0", - "lodash.merge": "^4.4.0", - "lodash.pick": "^4.2.1", - "lodash.reduce": "^4.4.0", - "lodash.reject": "^4.4.0", - "lodash.some": "^4.4.0" - } - }, "chokidar": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz", @@ -2393,6 +2497,27 @@ "node-ssdp": "^2.4.0" } }, + "chunk-store-stream": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chunk-store-stream/-/chunk-store-stream-4.1.0.tgz", + "integrity": "sha512-GjkZ16bFKMFnb8LrGZXAPeRoLXZTLu9ges6LCErJe28bMp6zKLxjWuJ7TYzR0jWq9nwo58hXG3BXZYy66Vze0Q==", + "requires": { + "block-stream2": "^2.0.0", + "readable-stream": "^3.4.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, "ci-info": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz", @@ -2783,6 +2908,46 @@ "capture-stack-trace": "^1.0.0" } }, + "create-torrent": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/create-torrent/-/create-torrent-4.4.2.tgz", + "integrity": "sha512-FRxgYty6AF00xrYKMtpQ14ZJlst+i7mmUhcN4do7TTjktEntqAzfriaOIV6xk27t9GLTtraFnaTxsGgnyFA2eA==", + "requires": { + "bencode": "^2.0.0", + "block-stream2": "^2.0.0", + "filestream": "^5.0.0", + "is-file": "^1.0.0", + "junk": "^3.1.0", + "minimist": "^1.1.0", + "multistream": "^4.0.0", + "once": "^1.3.0", + "piece-length": "^2.0.1", + "readable-stream": "^3.0.2", + "run-parallel": "^1.0.0", + "simple-sha1": "^3.0.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, + "simple-sha1": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/simple-sha1/-/simple-sha1-3.0.1.tgz", + "integrity": "sha512-q7ehqWfHc1VhOm7sW099YDZ4I0yYX7rqyhqqhHV1IYeUTjPOhHyD3mXvv8k2P+rO7+7c8R4/D+8ffzC9BE7Cqg==", + "requires": { + "queue-microtask": "^1.1.2", + "rusha": "^0.8.1" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -2818,22 +2983,6 @@ "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=", "dev": true }, - "css-select": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", - "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", - "requires": { - "boolbase": "~1.0.0", - "css-what": "2.1", - "domutils": "1.5.1", - "nth-check": "~1.0.1" - } - }, - "css-what": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz", - "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==" - }, "cssom": { "version": "0.3.8", "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", @@ -3150,20 +3299,15 @@ "buffer-indexof": "^1.0.0" } }, - "dom-serializer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz", - "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==", + "doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, "requires": { - "domelementtype": "^1.3.0", - "entities": "^1.1.1" + "esutils": "^2.0.2" } }, - "domelementtype": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", - "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" - }, "domexception": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz", @@ -3173,23 +3317,6 @@ "webidl-conversions": "^4.0.2" } }, - "domhandler": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", - "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", - "requires": { - "domelementtype": "1" - } - }, - "domutils": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", - "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", - "requires": { - "dom-serializer": "0", - "domelementtype": "1" - } - }, "dot-prop": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", @@ -3304,11 +3431,6 @@ "once": "^1.4.0" } }, - "entities": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", - "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" - }, "error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", @@ -3432,111 +3554,607 @@ } } }, - "eslint-config-google": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/eslint-config-google/-/eslint-config-google-0.14.0.tgz", - "integrity": "sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==", - "dev": true - }, - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true - }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" - }, - "event-emitter": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", - "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", - "requires": { - "d": "1", - "es5-ext": "~0.10.14" - } - }, - "eventemitter3": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz", - "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=" - }, - "exec-sh": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz", - "integrity": "sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==", - "dev": true - }, - "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", - "dev": true, - "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", - "dev": true - }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "eslint": { + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz", + "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==", "dev": true, "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "@babel/code-frame": "^7.0.0", + "ajv": "^6.10.0", + "chalk": "^2.1.0", + "cross-spawn": "^6.0.5", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "eslint-scope": "^5.0.0", + "eslint-utils": "^1.4.3", + "eslint-visitor-keys": "^1.1.0", + "espree": "^6.1.2", + "esquery": "^1.0.1", + "esutils": "^2.0.2", + "file-entry-cache": "^5.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^5.0.0", + "globals": "^12.1.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "inquirer": "^7.0.0", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.3.0", + "lodash": "^4.17.14", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "optionator": "^0.8.3", + "progress": "^2.0.0", + "regexpp": "^2.0.1", + "semver": "^6.1.2", + "strip-ansi": "^5.2.0", + "strip-json-comments": "^3.0.1", + "table": "^5.2.3", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" }, "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "ansi-escapes": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", + "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "type-fest": "^0.11.0" + }, + "dependencies": { + "type-fest": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", + "dev": true + } } }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "color-convert": "^1.9.0" } - } - } - }, - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", - "dev": true, - "requires": { + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true + }, + "cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "requires": { + "restore-cursor": "^3.1.0" + } + }, + "cli-width": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", + "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", + "dev": true + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "dev": true, + "requires": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + } + }, + "figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.5" + } + }, + "glob-parent": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "globals": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", + "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", + "dev": true, + "requires": { + "type-fest": "^0.8.1" + } + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true + }, + "inquirer": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.2.tgz", + "integrity": "sha512-DF4osh1FM6l0RJc5YWYhSDB6TawiBRlbV9Cox8MWlidU218Tb7fm3lQTULyUJDfJ0tjbzl0W4q651mrCCEM55w==", + "dev": true, + "requires": { + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.16", + "mute-stream": "0.0.8", + "run-async": "^2.4.0", + "rxjs": "^6.6.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "lodash": { + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "dev": true + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "dev": true + }, + "onetime": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", + "dev": true, + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "requires": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + } + }, + "restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "requires": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + } + }, + "run-async": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "dev": true + }, + "rxjs": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.0.tgz", + "integrity": "sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + } + } + }, + "strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "eslint-config-google": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/eslint-config-google/-/eslint-config-google-0.14.0.tgz", + "integrity": "sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==", + "dev": true + }, + "eslint-scope": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz", + "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==", + "dev": true, + "requires": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + } + }, + "eslint-utils": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", + "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, + "eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true + }, + "espree": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz", + "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==", + "dev": true, + "requires": { + "acorn": "^7.1.1", + "acorn-jsx": "^5.2.0", + "eslint-visitor-keys": "^1.1.0" + }, + "dependencies": { + "acorn": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz", + "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==", + "dev": true + } + } + }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true + }, + "esquery": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz", + "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==", + "dev": true, + "requires": { + "estraverse": "^5.1.0" + }, + "dependencies": { + "estraverse": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz", + "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==", + "dev": true + } + } + }, + "esrecurse": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", + "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", + "dev": true, + "requires": { + "estraverse": "^4.1.0" + } + }, + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "dev": true + }, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true + }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" + }, + "event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", + "requires": { + "d": "1", + "es5-ext": "~0.10.14" + } + }, + "eventemitter3": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz", + "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=" + }, + "exec-sh": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz", + "integrity": "sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==", + "dev": true + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "dev": true, + "requires": { + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", + "dev": true + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "dev": true, + "requires": { + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "expand-tilde": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", + "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", + "dev": true, + "requires": { "homedir-polyfill": "^1.0.1" } }, @@ -3686,6 +4304,23 @@ "debug": "2.6.9", "mkdirp": "0.5.1", "yauzl": "2.4.1" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + } } }, "extsprintf": { @@ -3836,6 +4471,36 @@ "escape-string-regexp": "^1.0.5" } }, + "file-entry-cache": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", + "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", + "dev": true, + "requires": { + "flat-cache": "^2.0.1" + } + }, + "filestream": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/filestream/-/filestream-5.0.0.tgz", + "integrity": "sha512-5H3RqSaJp12THfZiNWodYM7TiKfQvrpX+EIOrB1XvCceTys4yvfEIl8wDp+/yI8qj6Bxym8m0NYWwVXDAet/+A==", + "requires": { + "readable-stream": "^3.4.0", + "typedarray-to-buffer": "^3.0.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, "fill-keys": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz", @@ -3909,6 +4574,34 @@ "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==", "dev": true }, + "flat-cache": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", + "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", + "dev": true, + "requires": { + "flatted": "^2.0.0", + "rimraf": "2.6.3", + "write": "1.0.3" + }, + "dependencies": { + "rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + } + } + }, + "flatted": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz", + "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==", + "dev": true + }, "flatten": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/flatten/-/flatten-0.0.1.tgz", @@ -3986,11 +4679,28 @@ "map-cache": "^0.2.2" } }, + "freelist": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/freelist/-/freelist-1.0.3.tgz", + "integrity": "sha1-AGd1UJ85NXAXhNPtL8nxLJ3xurI=" + }, "fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, + "fs-chunk-store": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-2.0.2.tgz", + "integrity": "sha512-4nSngo6KyoGguscb5sTxjcxOvtRiMxuQl4vFK9SnYYMjmy08Nm095ACoM3lxj1KmCuxO4JMnuo4EebMWHlagjQ==", + "requires": { + "random-access-file": "^2.0.1", + "randombytes": "^2.0.3", + "rimraf": "^3.0.0", + "run-parallel": "^1.1.2", + "thunky": "^1.0.1" + } + }, "fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", @@ -4640,6 +5350,12 @@ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, + "functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true + }, "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", @@ -4667,6 +5383,11 @@ "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", "dev": true }, + "get-stdin": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz", + "integrity": "sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==" + }, "get-stream": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", @@ -5160,6 +5881,88 @@ } } }, + "gulp-zip": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-5.0.2.tgz", + "integrity": "sha512-rZd0Ppuc8Bf7J2/WzcdNaeb+lcEXf1R8mV/PJ9Kdu7PmnInWVeLSmiXIka/2QSe6uhAsGVFAMffWSaMzAPGTBg==", + "dev": true, + "requires": { + "get-stream": "^5.1.0", + "plugin-error": "^1.0.1", + "through2": "^3.0.1", + "vinyl": "^2.1.0", + "yazl": "^2.5.1" + }, + "dependencies": { + "clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", + "dev": true + }, + "clone-stats": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", + "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=", + "dev": true + }, + "get-stream": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", + "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "replace-ext": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz", + "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==", + "dev": true + }, + "through2": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz", + "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==", + "dev": true, + "requires": { + "inherits": "^2.0.4", + "readable-stream": "2 || 3" + } + }, + "vinyl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz", + "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==", + "dev": true, + "requires": { + "clone": "^2.1.1", + "clone-buffer": "^1.0.0", + "clone-stats": "^1.0.0", + "cloneable-readable": "^1.0.0", + "remove-trailing-separator": "^1.0.1", + "replace-ext": "^1.0.0" + } + } + } + }, "gulplog": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", @@ -5318,31 +6121,6 @@ "whatwg-encoding": "^1.0.1" } }, - "htmlparser2": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", - "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", - "requires": { - "domelementtype": "^1.3.1", - "domhandler": "^2.3.0", - "domutils": "^1.5.1", - "entities": "^1.1.1", - "inherits": "^2.0.1", - "readable-stream": "^3.1.1" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, "http-errors": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz", @@ -5371,6 +6149,22 @@ "next-line": "^1.1.0" } }, + "http-node": { + "version": "github:feross/http-node#342ef8624495343ffd050bd0808b3750cf0e3974", + "from": "github:feross/http-node#webtorrent", + "requires": { + "chrome-net": "^3.3.3", + "freelist": "^1.0.3", + "http-parser-js": "^0.4.3" + }, + "dependencies": { + "http-parser-js": { + "version": "0.4.13", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.13.tgz", + "integrity": "sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=" + } + } + }, "http-parser-js": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz", @@ -5399,6 +6193,14 @@ "sprintf-js": "^1.1.2" } }, + "iconv-lite": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz", + "integrity": "sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, "ieee754": { "version": "1.1.12", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz", @@ -5421,6 +6223,16 @@ "resolved": "https://registry.npmjs.org/immediate-chunk-store/-/immediate-chunk-store-1.0.8.tgz", "integrity": "sha1-Ds2tDFRjMmcte1tRGya7GM5W5z8=" }, + "import-fresh": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", + "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", + "dev": true, + "requires": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + } + }, "import-lazy": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", @@ -5635,6 +6447,11 @@ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, + "is-ascii": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-ascii/-/is-ascii-1.0.0.tgz", + "integrity": "sha1-8CrQJZoJIc0Zn/Ic4bCeD2tOOSk=" + }, "is-binary-path": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", @@ -5729,6 +6546,11 @@ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true }, + "is-file": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-file/-/is-file-1.0.0.tgz", + "integrity": "sha1-KKRM+9nT2xkwRfIrZfzo7fliBZY=" + }, "is-finite": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", @@ -7271,6 +8093,16 @@ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", "dev": true }, + "js-yaml": { + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", + "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", @@ -7441,6 +8273,11 @@ "verror": "1.10.0" } }, + "junk": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz", + "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==" + }, "just-debounce": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz", @@ -7533,6 +8370,11 @@ "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", "dev": true }, + "last-one-wins": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/last-one-wins/-/last-one-wins-1.0.4.tgz", + "integrity": "sha1-wb/Qy8tGeQ7JFWuNGu6Py4bNoio=" + }, "last-run": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz", @@ -7637,6 +8479,18 @@ "integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=", "dev": true }, + "load-ip-set": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/load-ip-set/-/load-ip-set-2.1.0.tgz", + "integrity": "sha512-taz7U6B+F7Zq90dfIKwqsB1CrFKelSEmMGC68OUqem8Cgd1QZygQBYb2Fk9i6muBSfH4xwF/Pjt4KKlAdOyWZw==", + "requires": { + "ip-set": "^1.0.0", + "netmask": "^1.0.6", + "once": "^1.3.0", + "simple-get": "^3.0.0", + "split": "^1.0.0" + } + }, "load-json-file": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", @@ -7741,20 +8595,11 @@ "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", "dev": true }, - "lodash.assignin": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz", - "integrity": "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=" - }, - "lodash.bind": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz", - "integrity": "sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=" - }, "lodash.defaults": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", - "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=" + "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=", + "dev": true }, "lodash.difference": { "version": "4.5.0", @@ -7771,20 +8616,11 @@ "lodash._root": "^3.0.0" } }, - "lodash.filter": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz", - "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=" - }, "lodash.flatten": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", - "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=" - }, - "lodash.foreach": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz", - "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=" + "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=", + "dev": true }, "lodash.isarguments": { "version": "3.1.0", @@ -7815,42 +8651,12 @@ "lodash.isarray": "^3.0.0" } }, - "lodash.map": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz", - "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=" - }, - "lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" - }, - "lodash.pick": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", - "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=" - }, - "lodash.reduce": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz", - "integrity": "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=" - }, - "lodash.reject": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz", - "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=" - }, "lodash.restparam": { "version": "3.6.1", "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", "dev": true }, - "lodash.some": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz", - "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=" - }, "lodash.sortby": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", @@ -8095,6 +8901,28 @@ "qap": "^3.1.2" } }, + "mediasource": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/mediasource/-/mediasource-2.3.0.tgz", + "integrity": "sha512-fqm86UwHvAnneIv40Uy1sDQaFtAByq/k0SQ3uCtbnEeSQNT1s5TDHCZOD1VmYCHwfY1jL2NjoZVwzZKYqy3L7A==", + "requires": { + "inherits": "^2.0.1", + "readable-stream": "^3.0.0", + "to-arraybuffer": "^1.0.1" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, "memoizee": { "version": "0.4.14", "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz", @@ -8110,6 +8938,11 @@ "timers-ext": "^0.1.5" } }, + "memory-chunk-store": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/memory-chunk-store/-/memory-chunk-store-1.3.0.tgz", + "integrity": "sha512-6LsOpHKKhxYrLhHmOJdBCUtSO7op5rUs1pag0fhjHo0QiXRyna0bwYf4EmQuL7InUeF2J7dUMPr6VMogRyf9NA==" + }, "meow": { "version": "3.7.0", "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", @@ -8282,17 +9115,17 @@ } }, "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "requires": { - "minimist": "0.0.8" + "minimist": "^1.2.5" }, "dependencies": { "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" } } }, @@ -8303,9 +9136,39 @@ "dev": true }, "moment": { - "version": "2.25.3", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz", - "integrity": "sha512-PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg==" + "version": "2.27.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz", + "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==" + }, + "mp4-box-encoding": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.4.1.tgz", + "integrity": "sha512-2/PRtGGiqPc/VEhbm7xAQ+gbb7yzHjjMAv6MpAifr5pCpbh3fQUdj93uNgwPiTppAGu8HFKe3PeU+OdRyAxStA==", + "requires": { + "uint64be": "^2.0.2" + } + }, + "mp4-stream": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mp4-stream/-/mp4-stream-3.1.0.tgz", + "integrity": "sha512-ZQQjf0VEiqPucwRvmT3e0pfZfMSE3nc5ngGUiN1+2VMxCtrInrlAjZ2K6jpNmxSZ/roiQne/ovYJYTeOvZDXPw==", + "requires": { + "mp4-box-encoding": "^1.3.0", + "next-event": "^1.0.0", + "readable-stream": "^3.0.6" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } }, "ms": { "version": "2.0.0", @@ -8337,6 +9200,26 @@ "duplexer2": "0.0.2" } }, + "multistream": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/multistream/-/multistream-4.0.0.tgz", + "integrity": "sha512-t0C8MAtH/d3Y+5nooEtUMWli92lVw9Jhx4uOhRl5GAwS5vc+YTmp/VXNJNsCBAMeEyK/6zhbk6x9JE3AiCvo4g==", + "requires": { + "readable-stream": "^3.4.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, "mustache": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.0.1.tgz", @@ -8452,11 +9335,21 @@ "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", "dev": true }, + "netmask": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz", + "integrity": "sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=" + }, "network-address": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/network-address/-/network-address-1.1.2.tgz", "integrity": "sha1-Sqe/1D8D8LgclwKxPWqFjdsybz4=" }, + "next-event": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/next-event/-/next-event-1.0.0.tgz", + "integrity": "sha1-53eKzeLlWALgrRh5w5z2917aYdg=" + }, "next-line": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/next-line/-/next-line-1.1.0.tgz", @@ -8497,6 +9390,12 @@ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz", "integrity": "sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA==" }, + "node-gyp-build": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.7.0.tgz", + "integrity": "sha512-L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w==", + "optional": true + }, "node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -8657,14 +9556,6 @@ "set-blocking": "~2.0.0" } }, - "nth-check": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", - "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", - "requires": { - "boolbase": "~1.0.0" - } - }, "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", @@ -9266,6 +10157,23 @@ } } }, + "package-json-versionify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/package-json-versionify/-/package-json-versionify-1.0.4.tgz", + "integrity": "sha1-WGBYepRIc6a35tJujlH/siMVvxc=", + "requires": { + "browserify-package-json": "^1.0.0" + } + }, + "parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "requires": { + "callsites": "^3.0.0" + } + }, "parse-filepath": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", @@ -9285,12 +10193,41 @@ "error-ex": "^1.2.0" } }, + "parse-numeric-range": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/parse-numeric-range/-/parse-numeric-range-1.2.0.tgz", + "integrity": "sha512-1q2tXpAOplPxcl8vrIGPWz1dJxxfmdRkCFcpxxMBerDnGuuHalOWF/xj9L8Nn5XoTUoB/6F0CeQBp2fMgkOYFg==" + }, "parse-passwd": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", "dev": true }, + "parse-torrent": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/parse-torrent/-/parse-torrent-7.1.3.tgz", + "integrity": "sha512-to8zT7+o6bVTyP35r2QgG1svuFGMFO1mE6ri1oWHgL9tlgnOtfjmfHmA3mOuP9HTIU/8OiZw0NG5zbyqVLxhvA==", + "requires": { + "bencode": "^2.0.0", + "blob-to-buffer": "^1.2.6", + "get-stdin": "^7.0.0", + "magnet-uri": "^5.1.3", + "simple-get": "^3.0.1", + "simple-sha1": "^3.0.0" + }, + "dependencies": { + "simple-sha1": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/simple-sha1/-/simple-sha1-3.0.1.tgz", + "integrity": "sha512-q7ehqWfHc1VhOm7sW099YDZ4I0yYX7rqyhqqhHV1IYeUTjPOhHyD3mXvv8k2P+rO7+7c8R4/D+8ffzC9BE7Cqg==", + "requires": { + "queue-microtask": "^1.1.2", + "rusha": "^0.8.1" + } + } + } + }, "parse-torrent-file": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-2.1.4.tgz", @@ -9522,6 +10459,11 @@ "integrity": "sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==", "dev": true }, + "piece-length": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/piece-length/-/piece-length-2.0.1.tgz", + "integrity": "sha512-dBILiDmm43y0JPISWEmVGKBETQjwJe6mSU9GND+P9KW0SJGUwoU/odyH1nbalOP9i8WSYuqf1lQnaj92Bhw+Ug==" + }, "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", @@ -9801,7 +10743,8 @@ "punycode": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true }, "q": { "version": "2.0.3", @@ -9823,6 +10766,11 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" }, + "queue-microtask": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.1.3.tgz", + "integrity": "sha512-zC1ZDLKFhZSa8vAdFbkOGouHcOUMgUAI/2/3on/KktpY+BaVqABkzDSsCSvJfmLbICOnrEuF9VIMezZf+T0mBA==" + }, "random-access-file": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/random-access-file/-/random-access-file-2.1.3.tgz", @@ -9858,16 +10806,31 @@ "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=" }, - "rarbg-api": { - "version": "git+https://github.com/talas9/rarbg-api.git#599b6f4404e9f739062ceb3ba17fe9a619f7797a", - "from": "git+https://github.com/talas9/rarbg-api.git", + "range-slice-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/range-slice-stream/-/range-slice-stream-2.0.0.tgz", + "integrity": "sha512-PPYLwZ63lXi6Tv2EZ8w3M4FzC0rVqvxivaOVS8pXSp5FMIHFnvi4MWHL3UdFLhwSy50aNtJsgjY0mBC6oFL26Q==", "requires": { - "cheerio": "0.x.x", - "moment": "2.x.x", - "q": "2.x.x", - "request": "2.x.x" + "readable-stream": "^3.0.2" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } } }, + "rarbg-api": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/rarbg-api/-/rarbg-api-1.1.4.tgz", + "integrity": "sha512-BxhHwCW/h18l8m8nwONfEVcNRN0qt0mBp0eM0yecdDIG6h1VcNMdCViLqyPethZC0UExTCGsioCWvVWbCkBMhg==" + }, "rc": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", @@ -9915,6 +10878,53 @@ "read-pkg": "^1.0.0" } }, + "read-torrent": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/read-torrent/-/read-torrent-1.3.1.tgz", + "integrity": "sha512-TzPdVpK3xEnvsS1yCy94CiOmfzG2/MNuZjpZi64+HJxb9fVZD4nIfFFGZ9T2N/dgwOFumfacw3xCD6rXtgwn2g==", + "requires": { + "magnet-uri": "~2.0.0", + "parse-torrent": "^4.0.0", + "request": "^2.83.0", + "xtend": "^4.0.0" + }, + "dependencies": { + "magnet-uri": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz", + "integrity": "sha1-0zHT3804NlZa3g/DyjFeOSF7sgk=", + "requires": { + "thirty-two": "~0.0.1" + } + }, + "parse-torrent": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/parse-torrent/-/parse-torrent-4.1.0.tgz", + "integrity": "sha1-qBS9hQXotY6I64/z4tr/XRmnEbc=", + "requires": { + "magnet-uri": "^4.0.0", + "parse-torrent-file": "^2.0.0" + }, + "dependencies": { + "magnet-uri": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/magnet-uri/-/magnet-uri-4.2.3.tgz", + "integrity": "sha1-ecxtZaALtbfvXCWuYOu7XZp2gag=", + "requires": { + "flatten": "0.0.1", + "thirty-two": "^0.0.2", + "xtend": "^4.0.0" + } + } + } + }, + "thirty-two": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-0.0.2.tgz", + "integrity": "sha1-QlPinYywWPBIAmfFaYwOSSflS2o=" + } + } + }, "readable-stream": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", @@ -9936,6 +10946,21 @@ } } }, + "readdirp": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", + "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", + "requires": { + "picomatch": "^2.2.1" + }, + "dependencies": { + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" + } + } + }, "realpath-native": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz", @@ -9954,6 +10979,11 @@ "resolve": "^1.1.6" } }, + "record-cache": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/record-cache/-/record-cache-1.1.0.tgz", + "integrity": "sha512-u8rbtLEJV7HRacl/ZYwSBFD8NFyB3PfTTfGLP37IW3hftQCwu6z4Q2RLyxo1YJUNRTEzJfpLpGwVuEYdaIkG9Q==" + }, "recursive-readdir-sync": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/recursive-readdir-sync/-/recursive-readdir-sync-1.0.6.tgz", @@ -9994,6 +11024,12 @@ "define-properties": "^1.1.2" } }, + "regexpp": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", + "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", + "dev": true + }, "registry-auth-token": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz", @@ -10040,6 +11076,33 @@ "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", "dev": true }, + "render-media": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/render-media/-/render-media-3.4.3.tgz", + "integrity": "sha512-Gyk9CYWqGmG2W83ZfQnK8ZGZbmKkrxnHHHiWxF32vH5Afd19IIPZFZADtlmeXVA2petJgCB9L1EbPUc6dS8jDg==", + "requires": { + "debug": "^4.1.1", + "is-ascii": "^1.0.0", + "mediasource": "^2.3.0", + "stream-to-blob-url": "^3.0.2", + "videostream": "^3.2.1" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "repeat-element": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", @@ -10079,9 +11142,9 @@ } }, "request": { - "version": "2.88.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", - "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", "requires": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -10090,7 +11153,7 @@ "extend": "~3.0.2", "forever-agent": "~0.6.1", "form-data": "~2.3.2", - "har-validator": "~5.1.0", + "har-validator": "~5.1.3", "http-signature": "~1.2.0", "is-typedarray": "~1.0.0", "isstream": "~0.1.2", @@ -10100,9 +11163,25 @@ "performance-now": "^2.1.0", "qs": "~6.5.2", "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", + "tough-cookie": "~2.5.0", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" + }, + "dependencies": { + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + }, + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + } } }, "request-progress": { @@ -10190,6 +11269,12 @@ "global-modules": "^1.0.0" } }, + "resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true + }, "resolve-options": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz", @@ -10237,10 +11322,9 @@ } }, "rimraf": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz", - "integrity": "sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==", - "dev": true, + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "requires": { "glob": "^7.1.3" } @@ -10264,6 +11348,11 @@ "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz", "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==" }, + "run-parallel-limit": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.5.tgz", + "integrity": "sha512-NsY+oDngvrvMxKB3G8ijBzIema6aYbQMD2bHOamvN52BysbIGTnEY2xsNyfrcr9GhY995/t/0nQN3R3oZvaDlg==" + }, "run-series": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/run-series/-/run-series-1.1.8.tgz", @@ -10383,6 +11472,11 @@ "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz", "integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk=" }, + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==" + }, "semver-diff": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz", @@ -10521,6 +11615,31 @@ "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz", "integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=" }, + "simple-get": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz", + "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==", + "requires": { + "decompress-response": "^4.2.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + }, + "dependencies": { + "decompress-response": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz", + "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==", + "requires": { + "mimic-response": "^2.0.0" + } + }, + "mimic-response": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz", + "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==" + } + } + }, "simple-glob": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/simple-glob/-/simple-glob-0.2.0.tgz", @@ -10603,6 +11722,34 @@ "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", "dev": true }, + "slice-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", + "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "astral-regex": "^1.0.0", + "is-fullwidth-code-point": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + } + } + }, "snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", @@ -10792,6 +11939,14 @@ "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz", "integrity": "sha1-mHbb0qFp0xFUAtSObqYynIgWpQ0=" }, + "split": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", + "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", + "requires": { + "through": "2" + } + }, "split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", @@ -10893,6 +12048,27 @@ "any-promise": "^1.1.0" } }, + "stream-to-blob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/stream-to-blob/-/stream-to-blob-2.0.1.tgz", + "integrity": "sha512-GXlqXt3svqwIVWoICenix5Poxi4KbCF0BdXXUbpU1X4vq1V8wmjiEIU3aFJzCGNFpKxfbnG0uoowS3nKUgSPYg==" + }, + "stream-to-blob-url": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/stream-to-blob-url/-/stream-to-blob-url-3.0.2.tgz", + "integrity": "sha512-PS6wT2ZyyR38Cy+lE6PBEI1ZmO2HdzZoLeDGG0zZbYikCZd0dh8FUoSeFzgWLItpBYw1WJmPVRLpykRV+lAWLQ==", + "requires": { + "stream-to-blob": "^2.0.0" + } + }, + "stream-with-known-length-to-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/stream-with-known-length-to-buffer/-/stream-with-known-length-to-buffer-1.0.3.tgz", + "integrity": "sha512-4Wi2v47HMkNdRWrlFJNlIsrhV6z6nCyVKVAIiq14MAnc7wILEAINmn96IiPWTcXzT8y2S6yfBoX++MUxqiovag==", + "requires": { + "once": "^1.3.3" + } + }, "strike-api": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/strike-api/-/strike-api-0.2.0.tgz", @@ -11122,6 +12298,58 @@ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", "dev": true }, + "table": { + "version": "5.4.6", + "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", + "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", + "dev": true, + "requires": { + "ajv": "^6.10.2", + "lodash": "^4.17.14", + "slice-ansi": "^2.1.0", + "string-width": "^3.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "lodash": { + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } + } + }, "tar": { "version": "5.0.5", "resolved": "https://registry.npmjs.org/tar/-/tar-5.0.5.tgz", @@ -11295,6 +12523,12 @@ } } }, + "text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "dev": true + }, "thenify": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz", @@ -11396,6 +12630,11 @@ "is-negated-glob": "^1.0.0" } }, + "to-arraybuffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", + "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=" + }, "to-buffer": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz", @@ -11587,10 +12826,24 @@ } } }, + "torrent-tracker": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/torrent-tracker/-/torrent-tracker-0.0.9.tgz", + "integrity": "sha512-hjnhQxuT3B0IErlL6k6omVa6G65ntwifPORHMnDnhyZNQfh6krei9MLdH2O/io1WgpWlb8PLZJl9mag7S286ow==", + "requires": { + "bencode": "^2.0.0", + "compact2string": "^1.4.0", + "hat": "0.0.3", + "request": "^2.88.0", + "underscore": "^1.9.1", + "urijs": "^1.19.1" + } + }, "tough-cookie": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", + "dev": true, "requires": { "psl": "^1.1.24", "punycode": "^1.4.1" @@ -11625,6 +12878,12 @@ "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", "optional": true }, + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "dev": true + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -11648,11 +12907,25 @@ "prelude-ls": "~1.1.2" } }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true + }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, + "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" + } + }, "uglify-js": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz", @@ -11673,6 +12946,14 @@ } } }, + "uint64be": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/uint64be/-/uint64be-2.0.2.tgz", + "integrity": "sha512-9QqdvpGQTXgxthP+lY4e/gIBy+RuqcBaC6JVwT5I3bDLgT/btL6twZMR0pI3/Fgah9G/pdwzIprE5gL6v9UvyQ==", + "requires": { + "buffer-alloc": "^1.1.0" + } + }, "ultron": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", @@ -11771,6 +13052,11 @@ "crypto-random-string": "^1.0.0" } }, + "unordered-array-remove": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unordered-array-remove/-/unordered-array-remove-1.0.2.tgz", + "integrity": "sha1-xUbo+I4xegzyZEyX7LV9umbSUO8=" + }, "unset-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", @@ -11937,6 +13223,29 @@ "elementtree": "~0.1.6" } }, + "upnp-mediarenderer-client": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/upnp-mediarenderer-client/-/upnp-mediarenderer-client-1.4.0.tgz", + "integrity": "sha512-F+C3Yceoz0j3ZWEchz5tpaOEqkbpObRUmeuPGc9+2u2YvC1CDbXGQ6mjbM10MDhnUJ0tTWYTufpj6xsWctnULw==", + "requires": { + "debug": "^2.1.3", + "elementtree": "^0.1.6", + "upnp-device-client": "^1.0.0" + }, + "dependencies": { + "upnp-device-client": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/upnp-device-client/-/upnp-device-client-1.0.2.tgz", + "integrity": "sha1-kfhHBfI0m/iQgoVf/04wBqxDUzc=", + "requires": { + "concat-stream": "^1.4.8", + "debug": "^2.1.3", + "elementtree": "~0.1.6", + "network-address": "^1.0.0" + } + } + } + }, "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", @@ -11952,31 +13261,90 @@ } } }, - "urijs": { - "version": "1.19.2", - "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.2.tgz", - "integrity": "sha512-s/UIq9ap4JPZ7H1EB5ULo/aOUbWqfDi7FKzMC2Nz+0Si8GiT1rIEaprt8hy3Vy2Ex2aJPpOQv4P4DuOZ+K1c6w==" - }, - "urix": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", - "dev": true - }, - "url-parse-lax": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", - "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", - "dev": true, + "urijs": { + "version": "1.19.2", + "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.2.tgz", + "integrity": "sha512-s/UIq9ap4JPZ7H1EB5ULo/aOUbWqfDi7FKzMC2Nz+0Si8GiT1rIEaprt8hy3Vy2Ex2aJPpOQv4P4DuOZ+K1c6w==" + }, + "urix": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", + "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", + "dev": true + }, + "url-parse-lax": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", + "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", + "dev": true, + "requires": { + "prepend-http": "^1.0.1" + } + }, + "use": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", + "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", + "dev": true + }, + "ut_metadata": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.5.0.tgz", + "integrity": "sha512-eqiRaDYiDl94uVB9oR8Yor+xl0rSKUovsqDxMt+hXzJt1yLYAo0HksVLlSiPPwkXBGFpERQADPanCi0EGhixnw==", + "requires": { + "bencode": "^2.0.0", + "bitfield": "^3.0.0", + "debug": "^4.0.0", + "simple-sha1": "^3.0.0" + }, + "dependencies": { + "bitfield": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bitfield/-/bitfield-3.0.0.tgz", + "integrity": "sha512-hJmWKucJQfdSkQPDPBKmWogM9s8+NOSzDT9QVbJbjinXaQ0bJKPu/cn98qRWy3PDNWtKw4XaoUP3XruGRIKEgg==" + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "simple-sha1": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/simple-sha1/-/simple-sha1-3.0.1.tgz", + "integrity": "sha512-q7ehqWfHc1VhOm7sW099YDZ4I0yYX7rqyhqqhHV1IYeUTjPOhHyD3mXvv8k2P+rO7+7c8R4/D+8ffzC9BE7Cqg==", + "requires": { + "queue-microtask": "^1.1.2", + "rusha": "^0.8.1" + } + } + } + }, + "ut_pex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ut_pex/-/ut_pex-2.0.0.tgz", + "integrity": "sha512-Uc0IxXGlES1DfeG+ITUISAvCF4Uldj7tt/n7s3TBt0KyXqDViOO26X5WfwXtUpEwn8fyZyerzf/YOK4rIZ2S3Q==", "requires": { - "prepend-http": "^1.0.1" + "bencode": "^2.0.0", + "compact2string": "^1.2.0", + "string2compact": "^1.2.5" } }, - "use": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", - "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", - "dev": true + "utf-8-validate": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.2.tgz", + "integrity": "sha512-SwV++i2gTD5qh2XqaPzBnNX88N6HdyhQrNNRykvcS0QKvItV9u3vPEJr+X5Hhfb1JC0r0e1alL0iB09rY8+nmw==", + "optional": true, + "requires": { + "node-gyp-build": "~3.7.0" + } }, "util-deprecate": { "version": "1.0.2", @@ -12006,6 +13374,12 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" }, + "v8-compile-cache": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz", + "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==", + "dev": true + }, "v8flags": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz", @@ -12040,6 +13414,30 @@ "extsprintf": "^1.2.0" } }, + "videostream": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/videostream/-/videostream-3.2.1.tgz", + "integrity": "sha512-Z4EcsX9aYNJZD1M+0jCeQ0t+5ETlHE88B2SF1fCuVxfn+XxHGJVec6tbHGqpULk4esOOLJEipAScOCDGHk+teQ==", + "requires": { + "binary-search": "^1.3.4", + "mediasource": "^2.2.2", + "mp4-box-encoding": "^1.3.0", + "mp4-stream": "^3.0.0", + "pump": "^3.0.0", + "range-slice-stream": "^2.0.0" + }, + "dependencies": { + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + } + } + }, "vinyl": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", @@ -12224,6 +13622,301 @@ "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==" }, + "webtorrent": { + "version": "0.108.6", + "resolved": "https://registry.npmjs.org/webtorrent/-/webtorrent-0.108.6.tgz", + "integrity": "sha512-hkwjMQTbBiwdJn3vEVjOyNwKZISp6r4GEl/J0N6Ukw2oeaETIylvAlf7G0o+a9FcFMThBIle0iCPYLTwumCOaQ==", + "requires": { + "addr-to-ip-port": "^1.5.1", + "bitfield": "^3.0.0", + "bittorrent-dht": "^10.0.0", + "bittorrent-protocol": "^3.1.1", + "chrome-net": "^3.3.4", + "chunk-store-stream": "^4.1.0", + "create-torrent": "^4.4.2", + "debug": "^4.1.1", + "end-of-stream": "1.4.1", + "escape-html": "^1.0.3", + "fs-chunk-store": "^2.0.2", + "http-node": "github:feross/http-node#webtorrent", + "immediate-chunk-store": "^2.1.0", + "load-ip-set": "^2.1.0", + "memory-chunk-store": "^1.3.0", + "mime": "^2.4.6", + "multistream": "^4.0.0", + "package-json-versionify": "^1.0.4", + "parse-numeric-range": "^1.2.0", + "parse-torrent": "^7.1.3", + "pump": "^3.0.0", + "random-iterate": "^1.0.1", + "randombytes": "^2.1.0", + "range-parser": "^1.2.1", + "readable-stream": "^3.6.0", + "render-media": "^3.4.3", + "run-parallel": "^1.1.9", + "run-parallel-limit": "^1.0.5", + "simple-concat": "^1.0.0", + "simple-get": "^3.0.1", + "simple-peer": "^9.7.2", + "simple-sha1": "^3.0.1", + "speedometer": "^1.1.0", + "stream-to-blob": "^2.0.1", + "stream-to-blob-url": "^3.0.2", + "stream-with-known-length-to-buffer": "^1.0.3", + "torrent-discovery": "^9.3.0", + "torrent-piece": "^2.0.0", + "unordered-array-remove": "^1.0.2", + "ut_metadata": "^3.5.0", + "ut_pex": "^2.0.0" + }, + "dependencies": { + "bitfield": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bitfield/-/bitfield-3.0.0.tgz", + "integrity": "sha512-hJmWKucJQfdSkQPDPBKmWogM9s8+NOSzDT9QVbJbjinXaQ0bJKPu/cn98qRWy3PDNWtKw4XaoUP3XruGRIKEgg==" + }, + "bittorrent-dht": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-10.0.0.tgz", + "integrity": "sha512-mrM18HMabvd3n/hQa4PYe942nWvBsJCBQb5PfT9kUJLlspNPGiulZYSCgWs7+XarS7nufYrGEp07f9eKTKIrgw==", + "requires": { + "bencode": "^2.0.0", + "debug": "^4.1.1", + "k-bucket": "^5.0.0", + "k-rpc": "^5.0.0", + "last-one-wins": "^1.0.4", + "lru": "^3.1.0", + "randombytes": "^2.0.5", + "record-cache": "^1.0.2", + "simple-sha1": "^3.0.0" + } + }, + "bittorrent-tracker": { + "version": "9.15.0", + "resolved": "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.15.0.tgz", + "integrity": "sha512-5LhLQeGxdVFumJTbveJS16Rc+Vzh/nbC6o80UMj6ZRvSkiVkk+4L782OMYI0VG1JTfUxiRFP4f+CZBFyuclLBg==", + "requires": { + "bencode": "^2.0.1", + "bittorrent-peerid": "^1.3.2", + "bn.js": "^5.1.1", + "bufferutil": "^4.0.1", + "chrome-dgram": "^3.0.4", + "compact2string": "^1.4.1", + "debug": "^4.1.1", + "ip": "^1.1.5", + "lru": "^3.1.0", + "minimist": "^1.2.5", + "once": "^1.4.0", + "random-iterate": "^1.0.1", + "randombytes": "^2.1.0", + "run-parallel": "^1.1.9", + "run-series": "^1.1.8", + "simple-get": "^4.0.0", + "simple-peer": "^9.7.1", + "simple-websocket": "^8.1.1", + "string2compact": "^1.3.0", + "unordered-array-remove": "^1.0.2", + "utf-8-validate": "^5.0.2", + "ws": "^7.3.0" + }, + "dependencies": { + "simple-get": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.0.tgz", + "integrity": "sha512-ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ==", + "requires": { + "decompress-response": "^6.0.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + } + } + } + }, + "bn.js": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz", + "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==" + }, + "chrome-dgram": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/chrome-dgram/-/chrome-dgram-3.0.5.tgz", + "integrity": "sha512-RcCR5Kpn+F7VGmtL3ex78ltB+cuuSTZdGBa4j3fQwUqz/90uOKd5t+WmnJp+QNv017oaHzn5GoMv1mCoRTmehQ==", + "requires": { + "inherits": "^2.0.1", + "run-series": "^1.1.2" + } + }, + "chrome-net": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/chrome-net/-/chrome-net-3.3.4.tgz", + "integrity": "sha512-Jzy2EnzmE+ligqIZUsmWnck9RBXLuUy6CaKyuNMtowFG3ZvLt8d+WBJCTPEludV0DHpIKjAOlwjFmTaEdfdWCw==", + "requires": { + "inherits": "^2.0.1" + } + }, + "compact2string": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/compact2string/-/compact2string-1.4.1.tgz", + "integrity": "sha512-3D+EY5nsRhqnOwDxveBv5T8wGo4DEvYxjDtPGmdOX+gfr5gE92c2RC0w2wa+xEefm07QuVqqcF3nZJUZ92l/og==", + "requires": { + "ipaddr.js": ">= 0.1.5" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "decompress-response": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "requires": { + "mimic-response": "^3.1.0" + } + }, + "immediate-chunk-store": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/immediate-chunk-store/-/immediate-chunk-store-2.1.0.tgz", + "integrity": "sha512-QshP0SFpsy/bHQBjYMgzCcnLoqTj6PHFg8ZkPi2WbTw1qddNy0puuPDaFlXyrsZAdWMT3QziPDMzfj+mzCVMYg==", + "requires": { + "queue-microtask": "^1.1.2" + } + }, + "k-bucket": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/k-bucket/-/k-bucket-5.0.0.tgz", + "integrity": "sha512-r/q+wV/Kde62/tk+rqyttEJn6h0jR7x+incdMVSYTqK73zVxVrzJa70kJL49cIKen8XjIgUZKSvk8ktnrQbK4w==", + "requires": { + "randombytes": "^2.0.3" + } + }, + "k-rpc": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/k-rpc/-/k-rpc-5.1.0.tgz", + "integrity": "sha512-FGc+n70Hcjoa/X2JTwP+jMIOpBz+pkRffHnSl9yrYiwUxg3FIgD50+u1ePfJUOnRCnx6pbjmVk5aAeB1wIijuQ==", + "requires": { + "k-bucket": "^5.0.0", + "k-rpc-socket": "^1.7.2", + "randombytes": "^2.0.5" + } + }, + "lru": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lru/-/lru-3.1.0.tgz", + "integrity": "sha1-6n+4VG2DczOWoTCR12z+tMBoN9U=", + "requires": { + "inherits": "^2.0.1" + } + }, + "mime": { + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz", + "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==" + }, + "mimic-response": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==" + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" + }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, + "simple-peer": { + "version": "9.7.2", + "resolved": "https://registry.npmjs.org/simple-peer/-/simple-peer-9.7.2.tgz", + "integrity": "sha512-xeMyxa9B4V0eA6mf17fVr8nm2QhAYFu+ZZv8zkSFFTjJETGF227CshwobrIYZuspJglMD63egcevQXGOrTIsuA==", + "requires": { + "debug": "^4.0.1", + "get-browser-rtc": "^1.0.0", + "queue-microtask": "^1.1.0", + "randombytes": "^2.0.3", + "readable-stream": "^3.4.0" + } + }, + "simple-sha1": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/simple-sha1/-/simple-sha1-3.0.1.tgz", + "integrity": "sha512-q7ehqWfHc1VhOm7sW099YDZ4I0yYX7rqyhqqhHV1IYeUTjPOhHyD3mXvv8k2P+rO7+7c8R4/D+8ffzC9BE7Cqg==", + "requires": { + "queue-microtask": "^1.1.2", + "rusha": "^0.8.1" + } + }, + "simple-websocket": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/simple-websocket/-/simple-websocket-8.1.1.tgz", + "integrity": "sha512-06I3cwOD5Q3LdVd6qfyDGp1U9eau9x9qniSL3b/aDgM5bsJX4nZfCuii2UCFcTfrDq0jCXF4NQ/38qeC8CJZTg==", + "requires": { + "debug": "^4.1.1", + "queue-microtask": "^1.1.0", + "randombytes": "^2.0.3", + "readable-stream": "^3.1.1", + "ws": "^7.0.0" + } + }, + "speedometer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-1.1.0.tgz", + "integrity": "sha512-z/wAiTESw2XVPssY2XRcme4niTc4S5FkkJ4gknudtVoc33Zil8TdTxHy5torRcgqMqksJV2Yz8HQcvtbsnw0mQ==" + }, + "torrent-discovery": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.3.0.tgz", + "integrity": "sha512-rdOfm+o6d+E+nRjeYiCzXGrM9ou7spkZpxu9xhnfKoTJgtWpSYEHXO4BT9hwVF1uoUpm+hOwNnwgkSfBZNMh7g==", + "requires": { + "bittorrent-dht": "^10.0.0", + "bittorrent-tracker": "^9.0.0", + "debug": "^4.0.0", + "run-parallel": "^1.1.2" + } + }, + "torrent-piece": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/torrent-piece/-/torrent-piece-2.0.0.tgz", + "integrity": "sha512-H/Z/yCuvZJj1vl1IQHI8dvF2QrUuXRJoptT5DW5967/dsLpXlCg+uyhFR5lfNj5mNaYePUbKtnL+qKWZGXv4Nw==" + }, + "ws": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz", + "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==" + } + } + }, "whatwg-encoding": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", @@ -12397,6 +14090,12 @@ "integrity": "sha1-CvyjDzxudFgFjSigtnPJ3aYiubU=", "dev": true }, + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true + }, "wordwrap": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", @@ -12417,6 +14116,15 @@ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, + "write": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", + "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", + "dev": true, + "requires": { + "mkdirp": "^0.5.1" + } + }, "write-file-atomic": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz", @@ -12511,6 +14219,102 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, + "yargs": { + "version": "14.2.3", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz", + "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==", + "dev": true, + "requires": { + "cliui": "^5.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^15.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true + }, + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "y18n": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", + "dev": true + }, + "yargs-parser": { + "version": "15.0.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz", + "integrity": "sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } + } + }, "yargs-parser": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", @@ -12537,6 +14341,15 @@ "fd-slicer": "~1.0.1" } }, + "yazl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz", + "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==", + "dev": true, + "requires": { + "buffer-crc32": "~0.2.3" + } + }, "zip-stream": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz", diff --git a/package.json b/package.json index dc5660df..f35224a2 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "parse-torrent": "^7.1.3", "peerflix": "^0.39.0", "q": "^2.0.3", - "rarbg-api": "git+https://github.com/talas9/rarbg-api.git", + "rarbg-api": "1.1.4", "read-torrent": "^1.3.1", "readdirp": "^3.4.0", "request": "^2.88.2", diff --git a/src/app/language/en.json b/src/app/language/en.json index 05793123..8923d406 100644 --- a/src/app/language/en.json +++ b/src/app/language/en.json @@ -560,5 +560,7 @@ "crime": "crime", "action": "action", "This version of Popcorn Time CE is a fork based on Popcorntime Community.": "This version of Popcorn Time CE is a fork based on Popcorntime Community.", - "animation": "animation" + "animation": "animation", + "4K": "4K", + "XXX": "XXX" } \ No newline at end of file diff --git a/src/app/lib/providers/torrent_cache.js b/src/app/lib/providers/torrent_cache.js index 3b9be7e5..b54188bd 100644 --- a/src/app/lib/providers/torrent_cache.js +++ b/src/app/lib/providers/torrent_cache.js @@ -1,4 +1,4 @@ -(function (App) { +(function(App) { 'use strict'; var peerflix = require('peerflix'), Q = require('q'), @@ -18,18 +18,18 @@ var tpmDir = path.join(App.settings.tmpLocation, 'TorrentCache'), MAGNET_RESOLVE_TIMEOUT = 60 * 1000; // let's give max a minute to resolve a magnet uri - var mod = function () { - this._checkTmpDir(); - }, + var mod = function() { + this._checkTmpDir(); + }, pmod = mod.prototype; - pmod.getTmpDir = function () { + pmod.getTmpDir = function() { return tpmDir; }; - pmod.clearTmpDir = function () { + pmod.clearTmpDir = function() { var self = this; - rimraf(tpmDir, function (err) { + rimraf(tpmDir, function(err) { if (err) { win.error('TorrentCache.clearTmpDir()', err); } @@ -37,15 +37,15 @@ }); }; - pmod._checkTmpDir = function () { - mkdirp(tpmDir, function (err) { + pmod._checkTmpDir = function() { + mkdirp(tpmDir, function(err) { if (err) { win.error('TorrentCache._checkTmpDir()', err); } }); }; - pmod.getType = function (torrent) { + pmod.getType = function(torrent) { if (typeof torrent === 'string') { if (torrent.substring(0, 8) === 'magnet:?') { return 'magnet'; @@ -60,7 +60,7 @@ return 'unknown'; }; - pmod.resolve = function (torrent) { + pmod.resolve = function(torrent) { var type = this.getType(torrent); stateModel = new Backbone.Model({ state: 'Resolving..', @@ -71,37 +71,37 @@ }); App.vent.trigger('stream:started', stateModel); switch (type) { - case 'torrenturl': - case 'torrent': - case 'magnet': - this.checkCache(torrent).then(function (result) { - var filePath = result[0], - exists = result[1]; - if (exists) { - return handlers.handleSuccess(filePath); - } - // try to store this torrent into our cache - handlers['handle' + type](filePath, torrent).then(handlers.handleSuccess); - }.bind(this)); - break; - default: - handlers.handleError('TorrentCache.resolve(): Unknown torrent type', torrent); - return false; + case 'torrenturl': + case 'torrent': + case 'magnet': + this.checkCache(torrent).then(function(result) { + var filePath = result[0], + exists = result[1]; + if (exists) { + return handlers.handleSuccess(filePath); + } + // try to store this torrent into our cache + handlers['handle' + type](filePath, torrent).then(handlers.handleSuccess); + }.bind(this)); + break; + default: + handlers.handleError('TorrentCache.resolve(): Unknown torrent type', torrent); + return false; } return true; }; - pmod._getKey = function (name) { + pmod._getKey = function(name) { return Common.md5(path.basename(name)); }; - pmod.checkCache = function (torrent) { + pmod.checkCache = function(torrent) { var deferred = Q.defer(), name = this._getKey(torrent) + '.torrent', targetPath = path.join(tpmDir, name); // check if file already exists - fs.readdir(tpmDir, function (err, files) { + fs.readdir(tpmDir, function(err, files) { if (err) { handlers.handleError('TorrentCache.checkCache() readdir:' + err, torrent); return deferred.reject(err); @@ -111,7 +111,7 @@ return deferred.resolve([targetPath, false]); } // check if it actually is a file, not dir.. - fs.lstat(targetPath, function (err, stats) { + fs.lstat(targetPath, function(err, stats) { if (err) { handlers.handleError('TorrentCache.checkCache() lstat:' + err, torrent); return deferred.reject(err); @@ -126,15 +126,15 @@ return deferred.promise; }; - pmod.stop = function () { + pmod.stop = function() { stateModel = null; }; var handlers = { - handletorrent: function (filePath, torrent) { + handletorrent: function(filePath, torrent) { // just copy the torrent file var deferred = Q.defer(); - Common.copyFile(torrent, filePath, function (err) { + Common.copyFile(torrent, filePath, function(err) { if (err) { return handlers.handleError('TorrentCache.handletorrent() error: ' + err, torrent); } @@ -142,12 +142,12 @@ }); return deferred.promise; }, - handletorrenturl: function (filePath, torrent) { + handletorrenturl: function(filePath, torrent) { // try to download the file var deferred = Q.defer(), safeTimeoutID = null, doneReached = false; - var done = function (error) { + var done = function(error) { clearTimeout(safeTimeoutID); if (doneReached) { return; @@ -157,7 +157,7 @@ // try unlinking the file in case it was created try { fs.unlink(filePath); - } catch (e) {} + } catch (e) { } return handlers.handleError('TorrentCache.handletorrenturl() error: ' + error, torrent); } deferred.resolve(filePath); @@ -175,38 +175,38 @@ } }, req = request(params) - .on('response', function (resp) { - if (resp.statusCode >= 400) { - return done('Invalid status: ' + resp.statusCode); - } - switch (resp.headers['content-encoding']) { - case 'gzip': - resp.pipe(zlib.createGunzip()).pipe(ws); - break; - case 'deflate': - resp.pipe(zlib.createInflate()).pipe(ws); - break; - default: - resp.pipe(ws); - break; - } - ws - .on('error', done) - .on('close', done); - }) - .on('error', done) - .on('end', function () { - // just to be on the safe side here, set 'huge' amount of time, close event should be triggered on ws long before this one if all goes good. - safeTimeoutID = setTimeout(function () { - done('Waiting for stream to end error: timed out.'); - }, 5 * 1000); - }); + .on('response', function(resp) { + if (resp.statusCode >= 400) { + return done('Invalid status: ' + resp.statusCode); + } + switch (resp.headers['content-encoding']) { + case 'gzip': + resp.pipe(zlib.createGunzip()).pipe(ws); + break; + case 'deflate': + resp.pipe(zlib.createInflate()).pipe(ws); + break; + default: + resp.pipe(ws); + break; + } + ws + .on('error', done) + .on('close', done); + }) + .on('error', done) + .on('end', function() { + // just to be on the safe side here, set 'huge' amount of time, close event should be triggered on ws long before this one if all goes good. + safeTimeoutID = setTimeout(function() { + done('Waiting for stream to end error: timed out.'); + }, 5 * 1000); + }); } catch (e) { done(e); } return deferred.promise; }, - handlemagnet: function (filePath, torrent) { + handlemagnet: function(filePath, torrent) { clearTimeout(safeMagetTID); var deferred = Q.defer(), @@ -218,13 +218,15 @@ // lets wait max a minute // because engine does not report any error on wrong magnet links /*jshint -W120 */ - var currentTID = safeMagetTID = setTimeout(function () { - engine.destroy(); + var currentTID = safeMagetTID = setTimeout(function() { + //engine.destroy(); handlers.handleError('TorrentCache.handlemagnet() error: timed out', torrent); + resolve(); + destroyEngine(); }, MAGNET_RESOLVE_TIMEOUT); - var resolve = function () { + var resolve = function() { // maybe somehow new magnet was pasted in while loading this one if (currentTID !== safeMagetTID) { return; @@ -234,17 +236,17 @@ } deferred.resolve(filePath); }; - var destroyEngine = function () { + var destroyEngine = function() { engine.destroy(); engine = null; }; - engine.on('ready', function () { + engine.on('ready', function() { var resolvedTorrentPath = engine.path; clearTimeout(currentTID); if (resolvedTorrentPath) { // copy resolved path to cache so it will be awailable next time - Common.copyFile(resolvedTorrentPath + '.torrent', filePath, function (err) { + Common.copyFile(resolvedTorrentPath + '.torrent', filePath, function(err) { if (err) { error = err; } @@ -259,7 +261,7 @@ return deferred.promise; }, - handleSuccess: function (filePath) { + handleSuccess: function(filePath) { win.debug('TorrentCache.handleSuccess() ' + filePath + ' stopped: ' + !stateModel); if (!stateModel) { return; @@ -270,11 +272,11 @@ }); App.vent.trigger('stream:start', torrentStart); }, - handleError: function (err, torrent) { + handleError: function(err, torrent) { win.error(err, torrent); handlers.updateState('Error resolving torrent.'); }, - updateState: function (state) { + updateState: function(state) { if (stateModel) { stateModel.set('state', state); } @@ -286,7 +288,7 @@ App.vent.on('torrentcache:stop', singleton.stop); - App.Providers.TorrentCache = function () { + App.Providers.TorrentCache = function() { return singleton; }; diff --git a/src/app/lib/views/player/loading.js b/src/app/lib/views/player/loading.js index 88f7cb10..ed667c7a 100644 --- a/src/app/lib/views/player/loading.js +++ b/src/app/lib/views/player/loading.js @@ -104,6 +104,12 @@ var self = this; var state = this.model.get('state'); var streamInfo = this.model.get('streamInfo'); + + if (typeof streamInfo == 'undefined'){ + win.error('streamInfo is not defined'); + return this.cancelStreaming(); + } + win.info('Loading torrent:', state); this.checkFreeSpace(this.model.get('streamInfo').get('size')); diff --git a/src/app/lib/views/torrent_collection.js b/src/app/lib/views/torrent_collection.js index 5ffddf4b..2fd58dd3 100644 --- a/src/app/lib/views/torrent_collection.js +++ b/src/app/lib/views/torrent_collection.js @@ -1,6 +1,8 @@ -(function (App) { +(function(App) { 'use strict'; + var torrentHealth = require('./lib/util/torrent-tracker-health'); + var clipboard = gui.Clipboard.get(), collection = path.join(require('nw.gui').App.dataPath + '/TorrentCollection/'), files; @@ -26,7 +28,7 @@ 'contextmenu #online-input': 'rightclick_search' }, - initialize: function () { + initialize: function() { if (!fs.existsSync(collection)) { fs.mkdirSync(collection); win.debug('TorrentCollection: data directory created'); @@ -35,8 +37,8 @@ this.searchEngine = Settings.onlineSearchEngine; }, - onShow: function () { - Mousetrap.bind(['esc', 'backspace'], function (e) { + onShow: function() { + Mousetrap.bind(['esc', 'backspace'], function(e) { $('#filterbar-torrent-collection').click(); }); @@ -45,15 +47,15 @@ this.render(); - if(AdvSettings.get('pluginKATsearch')===false && AdvSettings.get('pluginRARBGsearch')===false) - $('.onlinesearch').hide(); - if(AdvSettings.get('pluginKATsearch')===false) - $('#kat-icon').hide(); - if(AdvSettings.get('pluginRARBGsearch')===false) - $('#rarbg-icon').hide(); + if (AdvSettings.get('pluginKATsearch') === false && AdvSettings.get('pluginRARBGsearch') === false) + $('.onlinesearch').hide(); + if (AdvSettings.get('pluginKATsearch') === false) + $('#kat-icon').hide(); + if (AdvSettings.get('pluginRARBGsearch') === false) + $('#rarbg-icon').hide(); }, - onRender: function () { + onRender: function() { $('.engine-icon').removeClass('active'); $('#' + this.searchEngine.toLowerCase() + '-icon').addClass('active'); $('#online-input').focus(); @@ -71,7 +73,7 @@ }); }, - changeEngine: function (e) { + changeEngine: function(e) { e.preventDefault(); Settings.onlineSearchEngine = this.searchEngine = e.currentTarget.dataset.id; @@ -86,7 +88,7 @@ } }, - createMagnetURI: function (torrentHash) { + createMagnetURI: function(torrentHash) { var magnet_uri = 'magnet:?xt=urn:btih:'; var tracker_list = '&tr=udp:\/\/tracker.coppersurfer.tk:6969' + '&tr=udp:\/\/p4p.arenabg.com:1337' @@ -100,15 +102,25 @@ + '&tr=udp:\/\/tracker.coppersurfer.tk:6969' + '&tr=udp:\/\/tracker.leechers-paradise.org:6969' + '&tr=udp:\/\/exodus.desync.com:696931622A'; - - Settings.trackers.forEach(function(item){ - tracker_list += '&tr='+item; + + Settings.trackers.forEach(function(item) { + tracker_list += '&tr=' + item; }); - + return magnet_uri + torrentHash + tracker_list; }, - onlineSearch: function (e) { + updateMagnetURI: function(magnet_uri) { + let tracker_list = ""; + + Settings.trackers.forEach(function(item) { + tracker_list += '&tr=' + item; + }); + + return magnet_uri + tracker_list; + }, + + onlineSearch: function(e) { if (e) { e.preventDefault(); } @@ -116,13 +128,22 @@ var input = $('#online-input').val(); var category = $('.online-categories > select').val(); AdvSettings.set('OnlineSearchCategory', category); - if (category === 'TV Series') { - category = 'tv'; - } else if (category === 'Movies') { - category = 'movies'; - } else if (category === 'Anime') { - category = 'anime'; + + switch (category) { + case 'TV Series': + category = 'tv'; + break; + case 'Movies': + category = "movies"; + break; + case 'XXX': + category = 'xxx'; + break; + case '4K': + category = '4k'; + break; } + var current = $('.onlinesearch-info > ul.file-list').html(); if (input === '' && current === '') { @@ -140,17 +161,26 @@ if (this.searchEngine === 'KAT') { + ga('set', { + page: '/popcorntimece/kat/search?s=' + encodeURI(input) + '&cat=' + encodeURI(category), + title: 'KAT Search Results: ' + input + }); + + ga('send', { + hitType: 'pageview' + }); + var kat = require('kat-api-ce'); kat.search({ query: input, min_seeds: 5, category: category - }).then(function (data) { + }).then(function(data) { win.debug('KAT search: %s results', data.results.length); - data.results.forEach(function (item) { + data.results.forEach(function(item) { var itemModel = { title: item.title, - magnet: item.magnet, + magnet: that.updateMagnetURI(item.magnet), seeds: item.seeds, peers: item.peers, size: Common.fileSize(parseInt(item.size)), @@ -171,7 +201,7 @@ $('.notorrents-info,.torrents-info').hide(); $('.online-search').removeClass('fa-spin fa-spinner').addClass('fa-search'); $('.onlinesearch-info').show(); - }).catch(function (err) { + }).catch(function(err) { win.debug('KAT search failed:', err.message); var error; if (err.message === 'No results') { @@ -187,16 +217,59 @@ }); } else { - //CREDIT to Mohammed Talas - github.com/talas9 + + //GA Track RARBG Search Value + ga('set', { + page: '/popcorntimece/rarbg/search?s=' + encodeURI(input) + '&cat=' + encodeURI(category), + title: 'RARBG Search Results: ' + input + }); + + ga('send', { + hitType: 'pageview' + }); + + //RarBg Search var rarbg = require('rarbg-api'); - rarbg.search(input, category).then(function (result) { - console.debug('rarbg search: %s results', result.results.length); - result.results.forEach(function (item) { + + const defaultParams = { + category: rarbg.CATEGORY.MOVIES, + limit: 100, + sort: 'last', + min_seeders: null, + min_leechers: null, + format: 'json_extended', + ranked: null + } + + switch (category) { + case 'xxx': + defaultParams.category = rarbg.CATEGORY.XXX; + break; + case 'movies': + defaultParams.category = rarbg.CATEGORY.MOVIES; + break; + case 'tv': + defaultParams.category = rarbg.CATEGORY.TV; + break; + case '4k': + defaultParams.category = rarbg.CATEGORY['4K']; + break; + } + + win.debug('rargb search started: %s', input); + rarbg.search(input, defaultParams).then(function(result) { + win.debug('rarbg search: %s results', result.length); + + //TODO: Update tracker list for each magnet + let tracker_list = that.updateMagnetURI(""); + + result.forEach(function(item) { + var itemModel = { title: item.title, - magnet: item.torrentLink, - seeds: item.seeds, - peers: item.leechs, + magnet: item.download,//FIXME tracker_list, + seeds: item.seeders, + peers: item.leechers, size: Common.fileSize(parseInt(item.size)), index: index }; @@ -221,7 +294,7 @@ if (index === 0) { $('.onlinesearch-info>ul.file-list').html('

    ' + i18n.__('No results found') + '
    '); } - }).catch(function (err) { + }).catch(function(err) { console.debug('rarbg search failed:', err.message || err); var error; if (err === 'No torrents found') { @@ -242,19 +315,19 @@ } }, - onlineAddItem: function (item) { + onlineAddItem: function(item) { var ratio = item.peers > 0 ? item.seeds / item.peers : +item.seeds; $('.onlinesearch-info>ul.file-list').append( '
  • ' + item.title + '
    ' + item.size + '
    • ' - ); + ); if (item.seeds === 0) { // recalc the peers/seeds //TODO: Update tracker list to full var torrent = item.magnet.split('&tr')[0] + '&tr=udp://tracker.openbittorrent.com:80/announce' + '&tr=udp://open.demonii.com:1337/announce' + '&tr=udp://tracker.coppersurfer.tk:6969'; - + //require('torrent-tracker-health')(torrent, { - require(' ./lib/util/torrent-tracker-health')(torrent, { + torrentHealth(torrent, { timeout: 1000 - }).then(function (res) { + }).then(function(res) { //console.log('torrent index %s: %s -> %s (seeds)', item.index, item.seeds, res.seeds) ratio = res.peers > 0 ? res.seeds / res.peers : +res.seeds; $('.result-item[data-index=' + item.index + '] i').attr('data-original-title', i18n.__('Ratio:') + ' ' + ratio.toFixed(2) + '
    ' + i18n.__('Seeds:') + ' ' + res.seeds + ' - ' + i18n.__('Peers:') + ' ' + res.peers); @@ -262,45 +335,46 @@ } }, - onlineOpen: function (e) { - var file = $(e.currentTarget).dataset.file; + onlineOpen: function(e) { + //var file = $(e.currentTarget).dataset.file; + var file = e.currentTarget.dataset.file; Settings.droppedMagnet = file; window.handleTorrent(file); }, - onlineClose: function () { + onlineClose: function() { $('.onlinesearch-info>ul.file-list').html(''); $('.onlinesearch-info').hide(); this.render(); }, - rightclick_search: function (e) { + rightclick_search: function(e) { e.stopPropagation(); var search_menu = new this.context_Menu(i18n.__('Cut'), i18n.__('Copy'), i18n.__('Paste')); search_menu.popup(e.originalEvent.x, e.originalEvent.y); }, - context_Menu: function (cutLabel, copyLabel, pasteLabel) { + context_Menu: function(cutLabel, copyLabel, pasteLabel) { var gui = require('nw.gui'), menu = new gui.Menu(), cut = new gui.MenuItem({ label: cutLabel || 'Cut', - click: function () { + click: function() { document.execCommand('cut'); } }), copy = new gui.MenuItem({ label: copyLabel || 'Copy', - click: function () { + click: function() { document.execCommand('copy'); } }), paste = new gui.MenuItem({ label: pasteLabel || 'Paste', - click: function () { + click: function() { var text = clipboard.get('text'); $('#online-input').val(text); } @@ -313,11 +387,11 @@ return menu; }, - openFileSelector: function (e) { + openFileSelector: function(e) { var _file = e.currentTarget.innerText; var file; - if(_file !== undefined) + if (_file !== undefined) file = _file.substring(0, _file.length - 2); // avoid ENOENT else file = ""; @@ -333,7 +407,7 @@ } }, - openMagnet: function (e) { + openMagnet: function(e) { this.$('.tooltip').css('display', 'none'); e.preventDefault(); e.stopPropagation(); @@ -360,7 +434,7 @@ } }, - deleteItem: function (e) { + deleteItem: function(e) { this.$('.tooltip').css('display', 'none'); e.preventDefault(); e.stopPropagation(); @@ -376,7 +450,7 @@ this.render(); }, - renameItem: function (e) { + renameItem: function(e) { this.$('.tooltip').css('display', 'none'); e.preventDefault(); e.stopPropagation(); @@ -416,7 +490,7 @@ this.render(); }, - renameInput: function (oldName) { + renameInput: function(oldName) { var userInput = prompt(i18n.__('Enter new name'), oldName); if (!userInput || userInput === oldName) { return false; @@ -425,43 +499,43 @@ } }, - clearCollection: function () { + clearCollection: function() { deleteFolder(collection); win.debug('Torrent Collection: delete all', collection); App.vent.trigger('torrentCollection:show'); }, - openCollection: function () { + openCollection: function() { win.debug('Opening: ' + collection); gui.Shell.openItem(collection); }, - importItem: function () { + importItem: function() { this.$('.tooltip').css('display', 'none'); var that = this; var input = document.querySelector('.collection-import-hidden'); - input.addEventListener('change', function (evt) { + input.addEventListener('change', function(evt) { var file = $('.collection-import-hidden')[0].files[0]; that.render(); window.ondrop({ dataTransfer: { files: [file] }, - preventDefault: function () { } + preventDefault: function() { } }); }, false); input.click(); }, - onDestroy: function () { + onDestroy: function() { Mousetrap.unbind(['esc', 'backspace']); $('#movie-detail').show(); $('#nav-filters').show(); }, - closeTorrentCollection: function () { + closeTorrentCollection: function() { App.vent.trigger('torrentCollection:close'); } diff --git a/src/app/settings.js b/src/app/settings.js index 4c249181..e8889418 100644 --- a/src/app/settings.js +++ b/src/app/settings.js @@ -87,7 +87,7 @@ Settings.pluginGoogleDrive = true; Settings.pluginHTML5 = true; Settings.pluginVLC = true; Settings.pluginRARBGsearch = true; -Settings.pluginKATsearch = true; +Settings.pluginKATsearch = false; Settings.pluginFakeSkan = false; // Features diff --git a/src/app/templates/torrent_collection.tpl b/src/app/templates/torrent_collection.tpl index 259d937a..571beea2 100644 --- a/src/app/templates/torrent_collection.tpl +++ b/src/app/templates/torrent_collection.tpl @@ -9,7 +9,7 @@
    <% - var arr_categories = ["Movies","TV Series","Anime"]; + var arr_categories = ["4K","Movies","TV Series","XXX"]; var select_category = ""; for(var key in arr_categories) { From c1429df29239a13419159976d6f75ba1af7df94b Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sat, 18 Jul 2020 22:51:52 -0700 Subject: [PATCH 58/77] TorrentCache: fixed error states --- src/app/lib/providers/torrent_cache.js | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/src/app/lib/providers/torrent_cache.js b/src/app/lib/providers/torrent_cache.js index b54188bd..a1dd3372 100644 --- a/src/app/lib/providers/torrent_cache.js +++ b/src/app/lib/providers/torrent_cache.js @@ -81,7 +81,11 @@ return handlers.handleSuccess(filePath); } // try to store this torrent into our cache - handlers['handle' + type](filePath, torrent).then(handlers.handleSuccess); + handlers['handle' + type](filePath, torrent) + .then(handlers.handleSuccess) + .catch(function(error){ + handlers.handleError(error,torrent); + }); }.bind(this)); break; default: @@ -91,8 +95,11 @@ return true; }; - pmod._getKey = function(name) { - return Common.md5(path.basename(name)); + pmod._getKey = function(name) {w + if (name.substring(0, 8) === 'magnet:?') + return Common.md5(name); + else + return Common.md5(path.basename(name)); }; pmod.checkCache = function(torrent) { @@ -220,7 +227,8 @@ /*jshint -W120 */ var currentTID = safeMagetTID = setTimeout(function() { //engine.destroy(); - handlers.handleError('TorrentCache.handlemagnet() error: timed out', torrent); + //handlers.handleError('TorrentCache.handlemagnet() error: timed out', torrent); + error = 'TorrentCache.handlemagnet() error: timed out'; resolve(); destroyEngine(); }, MAGNET_RESOLVE_TIMEOUT); @@ -232,7 +240,8 @@ return; } if (error) { - return handlers.handleError('TorrentCache.handlemagnet() error: ' + error, torrent); + //handlers.handleError('TorrentCache.handlemagnet() error: ' + error, torrent); + return deferred.reject('TorrentCache.handlemagnet() error: ' + error); } deferred.resolve(filePath); }; @@ -262,10 +271,13 @@ return deferred.promise; }, handleSuccess: function(filePath) { - win.debug('TorrentCache.handleSuccess() ' + filePath + ' stopped: ' + !stateModel); + if (!stateModel) { return; } + + win.debug('TorrentCache.handleSuccess() ' + filePath + ' stopped: ' + !stateModel); + var torrentStart = new Backbone.Model({ torrent: filePath, is_file: true @@ -283,7 +295,6 @@ } }; - var singleton = new mod(); App.vent.on('torrentcache:stop', singleton.stop); From 01de5bd1fce2d80818dcff51592596805fc0ec76 Mon Sep 17 00:00:00 2001 From: CaptainYarr24 Date: Sat, 18 Jul 2020 23:04:58 -0700 Subject: [PATCH 59/77] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d88683b1..0fbe3552 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -[Warning! Popcorntime.sh threatens your computer privacy.](http://popcorn-time.is/official-statement.html#Malware2) +[![CircleCI](https://circleci.com/gh/captainyarr/popcorntime-ce-desktop.svg?style=svg)](https://app.circleci.com/pipelines/github/captainyarr/popcorntime-ce-desktop) + # [Popcorn Time Community](https://github.com/PopcornTime-CE/desktop) From 141e8b635392f87094b578dc654dd9973e5ee16f Mon Sep 17 00:00:00 2001 From: CaptainYarr24 Date: Sat, 18 Jul 2020 23:06:52 -0700 Subject: [PATCH 60/77] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0fbe3552..70b9d30a 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,12 @@ -[![CircleCI](https://circleci.com/gh/captainyarr/popcorntime-ce-desktop.svg?style=svg)](https://app.circleci.com/pipelines/github/captainyarr/popcorntime-ce-desktop) +[![CircleCI](https://circleci.com/gh/captainyarr/popcorntime-ce-desktop.svg?style=shield)](https://app.circleci.com/pipelines/github/captainyarr/popcorntime-ce-desktop) # [Popcorn Time Community](https://github.com/PopcornTime-CE/desktop) [![Join the chat at https://gitter.im/PopcornTime-CE/desktop](https://badges.gitter.im/PopcornTime-CE/desktop.svg)](https://gitter.im/PopcornTime-CE/desktop?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![CircleCI](https://circleci.com/gh/captainyarr/popcorntime-ce-desktop.svg?style=shield)](https://app.circleci.com/pipelines/github/captainyarr/popcorntime-ce-desktop) + Allow anyone to easily watch their favorite movies, shows, and anime. ![Popcorn Time](src/app/images/icon.png) From 4be49a163c3d634d999165f63f631b1d2b4abe72 Mon Sep 17 00:00:00 2001 From: CaptainYarr24 Date: Sat, 18 Jul 2020 23:07:32 -0700 Subject: [PATCH 61/77] Update README.md --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 70b9d30a..bf419002 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,6 @@ -[![CircleCI](https://circleci.com/gh/captainyarr/popcorntime-ce-desktop.svg?style=shield)](https://app.circleci.com/pipelines/github/captainyarr/popcorntime-ce-desktop) - - # [Popcorn Time Community](https://github.com/PopcornTime-CE/desktop) -[![Join the chat at https://gitter.im/PopcornTime-CE/desktop](https://badges.gitter.im/PopcornTime-CE/desktop.svg)](https://gitter.im/PopcornTime-CE/desktop?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - -[![CircleCI](https://circleci.com/gh/captainyarr/popcorntime-ce-desktop.svg?style=shield)](https://app.circleci.com/pipelines/github/captainyarr/popcorntime-ce-desktop) +[![Join the chat at https://gitter.im/PopcornTime-CE/desktop](https://badges.gitter.im/PopcornTime-CE/desktop.svg)](https://gitter.im/PopcornTime-CE/desktop?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![CircleCI](https://circleci.com/gh/captainyarr/popcorntime-ce-desktop.svg?style=shield)](https://app.circleci.com/pipelines/github/captainyarr/popcorntime-ce-desktop) Allow anyone to easily watch their favorite movies, shows, and anime. From ec77e30e97b55eb2b80d34aabadd24d2b950080b Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Sun, 19 Jul 2020 09:32:17 +0100 Subject: [PATCH 62/77] fix: package.json & package-lock.json to reduce vulnerabilities (#146) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-AJV-584908 --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index b32f80dd..d53a88b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -931,9 +931,9 @@ } }, "ajv": { - "version": "6.12.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", - "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", + "version": "6.12.3", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", + "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -942,9 +942,9 @@ }, "dependencies": { "fast-deep-equal": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", - "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==" + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" } } }, diff --git a/package.json b/package.json index f35224a2..633286ea 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "URIjs": "^1.16.1", "adm-zip": "0.4.13", "airplay-js": "^0.3.0", - "ajv": "6.12.2", + "ajv": "6.12.3", "async": "^3.2.0", "axios": "^0.19.2", "chromecast-js": "git+https://github.com/captainyarr/chromecast-js.git", From fec5ef102f1d6eb5e69ae8433ade292ef25d9475 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Mon, 20 Jul 2020 23:15:02 -0700 Subject: [PATCH 63/77] Trakt: Authorize Fixed --- package.json | 1 + src/app/lib/providers/trakttv.js | 63 +++++++++++++++++++------------- 2 files changed, 39 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 633286ea..ea10ccc8 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "async": "^3.2.0", "axios": "^0.19.2", "chromecast-js": "git+https://github.com/captainyarr/chromecast-js.git", + "client-oauth2": "^4.3.1", "i18n": "0.8.6", "iconv-lite": "^0.5.2", "jschardet": "2.1.0", diff --git a/src/app/lib/providers/trakttv.js b/src/app/lib/providers/trakttv.js index 2c70d5e4..0f9e7e71 100644 --- a/src/app/lib/providers/trakttv.js +++ b/src/app/lib/providers/trakttv.js @@ -1,17 +1,28 @@ (function(App) { 'use strict'; - var request = require('request'), - URI = require('urijs'), - Q = require('q'), - _ = require('underscore'), - inherits = require('util').inherits; + var request = require('request'); + var URI = require('urijs'); + var Q = require('q'); + var _ = require('underscore'); + var inherits = require('util').inherits; + var ClientOAuth2 = require('client-oauth2'); + var API_ENDPOINT = URI('https://api.trakt.tv'), CLIENT_ID = '3cdac1a63e01706452e6d52c70264cb4c9fe2d95d4c8d315521081c9f14c82ad', CLIENT_SECRET = '5a22c1a5da51bb6f8dcdd2ab57f708c6bccf0e9915e67299d1eeab77ddfd7713', REDIRECT_URI = 'urn:ietf:wg:oauth:2.0:oob'; + var traktAuth = new ClientOAuth2({ + clientId: CLIENT_ID, + clientSecret: CLIENT_SECRET, + accessTokenUri: 'https://api.trakt.tv/oauth/token', + authorizationUri: 'https://api.trakt.tv/oauth/authorize', + redirectUri: REDIRECT_URI + }) + + function TraktTv() { App.Providers.CacheProviderV2.call(this, 'metadata'); @@ -440,14 +451,14 @@ win.debug("trakt:OAUTH: " + OAUTH_URI + '&redirect_uri=' + encodeURIComponent(REDIRECT_URI)); gui.App.addOriginAccessWhitelistEntry(API_URI, 'app', 'host', true); window.loginWindow = gui.Window.open(OAUTH_URI + '&redirect_uri=' + encodeURIComponent(REDIRECT_URI), { - position: 'center', - focus: true, - title: 'Trakt.tv', - icon: 'src/app/images/icon.png', - resizable: false, - width: 600, - height: 600 - }, + position: 'center', + focus: true, + title: 'Trakt.tv', + icon: 'src/app/images/icon.png', + resizable: false, + width: 600, + height: 600 + }, function(new_win) { // And listeners to new window's focus event new_win.on('loaded', function() { @@ -456,7 +467,7 @@ if (url.indexOf('&') === -1 && url.indexOf('auth/signin') === -1) { if (url.indexOf('oauth/authorize/') !== -1) { - url = url.split('/'); + url = url.split('/native?code='); url = url[url.length - 1]; new_win.close(); } else { @@ -465,7 +476,7 @@ } else { url = false; } - win.debug("Trakt Authorize Code:" + url); + win.debug("Trakt Authorize Code: " + url); }); new_win.on('closed', function() { if (url) { @@ -516,7 +527,12 @@ win.debug("Trakt Revoke Access Token"); var defer = Q.defer(); - var postVariables = "token=" + Settings.traktToken; + //var postVariables = "token=" + Settings.traktToken; + var postVariables = { + token: Settings.traktToken, + client_id: CLIENT_ID, + client_secret: CLIENT_SECRET + }; var requestUri = API_ENDPOINT.clone() .segment("oauth/revoke"); @@ -525,10 +541,7 @@ method: 'POST', url: requestUri.toString(), headers: { - 'Content-Type': 'application/x-www-form-urlencode', - 'Authorization': 'Bearer ' + Settings.traktToken, - 'trakt-api-version': '2', - 'trakt-api-key': CLIENT_ID + 'Content-Type': 'application/json' }, body: JSON.stringify(postVariables) }, function(error, response, body) { @@ -685,7 +698,7 @@ case 'database': break; case 'seen': - /* falls through */ + /* falls through */ default: App.Trakt.sync.addToHistory('episode', show.episode_id); break; @@ -698,7 +711,7 @@ case 'database': break; case 'seen': - /* falls through */ + /* falls through */ default: App.Trakt.sync.removeFromHistory('episode', show.episode_id); break; @@ -721,10 +734,10 @@ } $('.watched-toggle').addClass('selected').text(i18n.__('Seen')); App.MovieDetailView.model.set('watched', true); - } catch (e) {} + } catch (e) { } break; case 'seen': - /* falls through */ + /* falls through */ default: App.Trakt.sync.addToHistory('movie', movie.imdb_id); break; @@ -737,7 +750,7 @@ case 'database': break; case 'seen': - /* falls through */ + /* falls through */ default: App.Trakt.sync.removeFromHistory('movie', movie.imdb_id); break; From 45f64b3bf602ca3cbe3cda53326b081aa561f7b4 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Tue, 21 Jul 2020 01:11:42 -0700 Subject: [PATCH 64/77] Remove extra character --- src/app/lib/providers/torrent_cache.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/lib/providers/torrent_cache.js b/src/app/lib/providers/torrent_cache.js index a1dd3372..8b0027da 100644 --- a/src/app/lib/providers/torrent_cache.js +++ b/src/app/lib/providers/torrent_cache.js @@ -95,7 +95,7 @@ return true; }; - pmod._getKey = function(name) {w + pmod._getKey = function(name) { if (name.substring(0, 8) === 'magnet:?') return Common.md5(name); else From c8efeabcf9e5f91ba5ee76daafafb32853a290c5 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sat, 25 Jul 2020 01:06:28 -0700 Subject: [PATCH 65/77] Trakt: Updated Watchlist refresh and trakt clean up Trakt: Added Trak scrobble to ext players --- src/app/language/en.json | 3 +- src/app/lib/device/ext-player.js | 41 +++++++++++++++-- src/app/lib/providers/trakttv.js | 74 ++++++++++++++++++------------ src/app/lib/providers/watchlist.js | 54 +++++++++++----------- 4 files changed, 112 insertions(+), 60 deletions(-) diff --git a/src/app/language/en.json b/src/app/language/en.json index 8923d406..706e21cc 100644 --- a/src/app/language/en.json +++ b/src/app/language/en.json @@ -562,5 +562,6 @@ "This version of Popcorn Time CE is a fork based on Popcorntime Community.": "This version of Popcorn Time CE is a fork based on Popcorntime Community.", "animation": "animation", "4K": "4K", - "XXX": "XXX" + "XXX": "XXX", + "mystery": "mystery" } \ No newline at end of file diff --git a/src/app/lib/device/ext-player.js b/src/app/lib/device/ext-player.js index 26cc6fa6..78d502cd 100644 --- a/src/app/lib/device/ext-player.js +++ b/src/app/lib/device/ext-player.js @@ -8,18 +8,24 @@ var collection = App.Device.Collection; var child = require('child_process'); + var model; //Store current streamModel + var ExtPlayer = App.Device.Generic.extend({ defaults: { type: 'ext-app', name: i18n.__('External Player'), }, + model, + play: function(streamModel) { var options = {}; var args = []; - var url = streamModel.attributes.src; + var url = streamModel.get('src');//streamModel.attributes.src; var cmd; + this.model = streamModel; + if (process.platform == 'win32') { // "" So it behaves when spaces in path //Node.js Format: spawn('"with spaces.cmd"', ['arg with spaces'], { shell: true }); @@ -80,6 +86,8 @@ var player = child.spawn(cmd, args, options); + this.sendToTrakt('start'); + player.stdout.on('data', (data) => { win.info(`stdout: ${data}`); }); @@ -90,6 +98,7 @@ player.on('error', (data) => { win.error("External Player Error" + data); + this.sendToTrakt('stop'); App.vent.trigger('player:close'); App.vent.trigger('stream:stop'); App.vent.trigger('preload:stop'); @@ -101,6 +110,8 @@ // don't stop on exit, because Bomi could be already running in background and the command ends while the stream should continue return; } + this.sendToTrakt('stop'); + App.vent.trigger('player:close'); App.vent.trigger('stream:stop'); App.vent.trigger('preload:stop'); @@ -111,7 +122,29 @@ stop: function() { }, - unpause: function() { } + unpause: function() { }, + + sendToTrakt: function(method) { + var type = this.isMovie(); + var id = type === 'movie' ? this.model.get('imdb_id') : this.model.get('episode_id'); + var progress = 0; //this.video.currentTime() / this.video.duration() * 100 | 0; + + if(method == 'stop') + progress = 100; + + App.Trakt.scrobble(method, type, id, progress); + }, + isMovie: function() { + if (this.model.get('tvdb_id') === undefined) { + if (this.model.get('type') === 'video/youtube' || this.model.get('imdb_id') === undefined) { + return undefined; + } else { + return 'movie'; + } + } else { + return 'episode'; + } + }, }); function getPlayerName(loc) { @@ -174,7 +207,7 @@ }, 'mpv': { type: 'mpv', - switches: '-quiet', + switches: '--quiet', subswitch: '--sub-file=', fs: '--fs' }, @@ -277,7 +310,7 @@ addPath(process.env.LOCALAPPDATA); addPath(process.env.LOCALAPPDATA + '\\Programs'); addPath(process.env.LOCALAPPDATA + '\\Apps\\2.0\\'); - + /* win.debug("SystemDrive:"+process.env.SystemDrive); win.debug("LOCALAPPDATA:"+process.env.LOCALAPPDATA); diff --git a/src/app/lib/providers/trakttv.js b/src/app/lib/providers/trakttv.js index 0f9e7e71..8476e625 100644 --- a/src/app/lib/providers/trakttv.js +++ b/src/app/lib/providers/trakttv.js @@ -1,12 +1,12 @@ (function(App) { 'use strict'; - var request = require('request'); + const axios = require('axios'); var URI = require('urijs'); var Q = require('q'); var _ = require('underscore'); var inherits = require('util').inherits; - var ClientOAuth2 = require('client-oauth2'); + const ClientOAuth2 = require('client-oauth2'); var API_ENDPOINT = URI('https://api.trakt.tv'), @@ -14,7 +14,7 @@ CLIENT_SECRET = '5a22c1a5da51bb6f8dcdd2ab57f708c6bccf0e9915e67299d1eeab77ddfd7713', REDIRECT_URI = 'urn:ietf:wg:oauth:2.0:oob'; - var traktAuth = new ClientOAuth2({ + let traktAuth = new ClientOAuth2({ clientId: CLIENT_ID, clientSecret: CLIENT_SECRET, accessTokenUri: 'https://api.trakt.tv/oauth/token', @@ -96,12 +96,14 @@ getVariables = getVariables || {}; - var requestUri = API_ENDPOINT.clone() .segment(endpoint) .addQuery(getVariables); - request({ + win.debug("Trakt GET: " + requestUri.toString()); + + //Add Axios Version of functions + const options = { method: 'GET', url: requestUri.toString(), headers: { @@ -110,17 +112,20 @@ 'trakt-api-version': '2', 'trakt-api-key': CLIENT_ID } - }, function(error, response, body) { - if (error || !body) { - defer.reject(error); - } else if (response.statusCode >= 400) { + }; + + axios(options).then((response) => { + if (response.status >= 400) { defer.resolve({}); } else { - defer.resolve(Common.sanitize(JSON.parse(body))); + defer.resolve(Common.sanitize(response.data)); + } + }).catch(function(error) { + if (error) { + defer.reject(error); } }); - return defer.promise; }; @@ -132,7 +137,10 @@ var requestUri = API_ENDPOINT.clone() .segment(endpoint); - request({ + win.debug("Trakt POST: " + requestUri.toString()); + + //Add Axios Version of functions + const options = { method: 'POST', url: requestUri.toString(), headers: { @@ -141,18 +149,23 @@ 'trakt-api-version': '2', 'trakt-api-key': CLIENT_ID }, - body: JSON.stringify(postVariables) - }, function(error, response, body) { - if (error || !body) { - defer.reject(error); - } else if (response.statusCode >= 400) { + data: JSON.stringify(postVariables) + }; + + axios(options).then((response) => { + if (response.status >= 400) { defer.resolve({}); } else { - defer.resolve(Common.sanitize(JSON.parse(body))); + defer.resolve(Common.sanitize(response.data)); + } + }).catch(function(error) { + if (error) { + defer.reject(error); } }); return defer.promise; + }; TraktTv.prototype.calendars = { @@ -439,7 +452,7 @@ return defer.promise; }, authorize: function() { - win.debug("trakt authorize started"); + win.debug("Trakt authorize started"); var defer = Q.defer(); var url = false; var loginWindow; @@ -537,25 +550,28 @@ var requestUri = API_ENDPOINT.clone() .segment("oauth/revoke"); - request({ + //Add Axios Version of functions + const options = { method: 'POST', url: requestUri.toString(), headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify(postVariables) - }, function(error, response, body) { - //win.debug('Status:', response.statusCode); - //win.debug('Headers:', JSON.stringify(response.headers)); - //win.debug('Response:', body); - if (error || !body) { - defer.reject(error); - } else if (response.statusCode >= 400) { + data: JSON.stringify(postVariables) + }; + + axios(options).then((response) => { + if (response.status >= 400) { defer.resolve({}); } else { - defer.resolve(Common.sanitize(JSON.parse(body))); + defer.resolve(Common.sanitize(response.data)); + } + }).catch(function(error) { + if (error) { + defer.reject(error); } }); + return defer.promise; } }; diff --git a/src/app/lib/providers/watchlist.js b/src/app/lib/providers/watchlist.js index 648cd21d..fefdcda4 100644 --- a/src/app/lib/providers/watchlist.js +++ b/src/app/lib/providers/watchlist.js @@ -3,8 +3,10 @@ 'use strict'; var Q = require('q'); var TVApi = App.Providers.get('TVApi'); + const WATCHLIST_REFRESH = 2; //Refresh minutes + const TRAKT_SHOWDAYS = 30; //Number of days to retrieve shows Trakt.tv + var Watchlist = function() { }; - var Watchlist = function() {}; Watchlist.prototype.constructor = Watchlist; var queryTorrents = function(filters) { @@ -13,19 +15,19 @@ //Checked when last fetched App.db.getSetting({ - key: 'watchlist-fetched' - }) + key: 'watchlist-fetched' + }) .then(function(doc) { if (doc) { var d = moment.unix(doc.value); - if (Math.abs(now.diff(d, 'hours')) >= 12) { - win.info('Watchlist - last update was %s hour(s) ago', Math.abs(now.diff(d, 'hours'))); + if (Math.abs(now.diff(d, 'minutes')) >= WATCHLIST_REFRESH) { + win.info('Watchlist - last update was %s minute(s) ago', Math.abs(now.diff(d, 'hours'))); fetchWatchlist(true); } else { - // Last fetch is fresh (< 12h) - win.info('Watchlist - next update in %s hour(s)', 12 - Math.abs(now.diff(d, 'hours'))); + // Last fetch is fresh time (< WATCHLIST_REFRESH) + win.info('Watchlist - next update in %s minutes(s)', WATCHLIST_REFRESH - Math.abs(now.diff(d, 'minutes'))); fetchWatchlist(false); } } else { @@ -37,29 +39,29 @@ function fetchWatchlist(update) { App.db.getSetting({ - key: 'watchlist' - }) + key: 'watchlist' + }) .then(function(doc) { if (doc && !update) { // Returning cached watchlist deferred.resolve(doc.value || []); } else { win.info('Watchlist - Fetching new watchlist'); - App.Trakt.calendars.myShows(moment().subtract(30, 'days').format('YYYY-MM-DD'), 30) + App.Trakt.calendars.myShows(moment().subtract(TRAKT_SHOWDAYS, 'days').format('YYYY-MM-DD'), TRAKT_SHOWDAYS) .then(function(data) { - win.debug("trakt watchlist data: " + data); + win.debug("Trakt watchlist data retrieved"); App.db.writeSetting({ - key: 'watchlist', - value: data - }) - .then(function() { - win.debug("trakt watchlist-fetched data: " + data); + key: 'watchlist', + value: data + }) + .then(function() { + win.debug("Trakt watchlist-fetched data retrieved"); App.db.writeSetting({ key: 'watchlist-fetched', value: now.unix() }); }) - .then(function() { + .then(function() { deferred.resolve(data || []); }); }) @@ -81,10 +83,10 @@ if (show.show_id && show.season !== 0) { promisifyDb(db.watched.find({ - imdb_id: show.show_id.toString(), - season: show.season.toString(), - episode: show.episode.toString() - })) + imdb_id: show.show_id.toString(), + season: show.season.toString(), + episode: show.episode.toString() + })) .then(function(data) { if (data != null && data.length > 0) { deferred.resolve(null); @@ -120,7 +122,7 @@ data.imdb = data.imdb_id; data.next_episode = show.next_episode; // Fallback for old bookmarks without provider in database or marked as Eztv - if (typeof(data.provider) === 'undefined' || data.provider === 'Eztv') { + if (typeof (data.provider) === 'undefined' || data.provider === 'Eztv') { data.provider = 'TVApi'; } deferred.resolve(data); @@ -180,12 +182,12 @@ var deferred = Q.defer(); win.info('Watchlist - Fetching new watchlist'); - App.Trakt.calendars.myShows(moment().subtract(30, 'days').format('YYYY-MM-DD'), 30) + App.Trakt.calendars.myShows(moment().subtract(TRAKT_SHOWDAYS, 'days').format('YYYY-MM-DD'), TRAKT_SHOWDAYS) .then(function(data) { App.db.writeSetting({ - key: 'watchlist', - value: data - }) + key: 'watchlist', + value: data + }) .then(function() { App.db.writeSetting({ key: 'watchlist-fetched', From 6ac1b33b6401c2e51e9189d2a8fb3d7dc45fcb35 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Fri, 31 Jul 2020 22:49:24 -0700 Subject: [PATCH 66/77] OpenSubtitles: Updated handling of subtitle search OpenSubtitles: Added performance tests --- package.json | 1 + src/app/lib/providers/opensubtitlesmovies.js | 163 +++++++++++++------ src/app/settings.js | 2 + 3 files changed, 112 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index ea10ccc8..d1326bec 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "ajv": "6.12.3", "async": "^3.2.0", "axios": "^0.19.2", + "bottleneck": "^2.19.5", "chromecast-js": "git+https://github.com/captainyarr/chromecast-js.git", "client-oauth2": "^4.3.1", "i18n": "0.8.6", diff --git a/src/app/lib/providers/opensubtitlesmovies.js b/src/app/lib/providers/opensubtitlesmovies.js index b521eb54..1de999a2 100644 --- a/src/app/lib/providers/opensubtitlesmovies.js +++ b/src/app/lib/providers/opensubtitlesmovies.js @@ -4,12 +4,31 @@ var _ = require('underscore'); var Q = require('q'); var OpenSubtitlesApi = require('opensubtitles-api'); + const Bottleneck = require('bottleneck'); + const { + performance, + PerformanceObserver + } = require('perf_hooks'); + + var osError = false; + + let obs; //Default non-authenicated login var OS = new OpenSubtitlesApi({ useragent: 'Popcorn Time v1' }); + const limiter = new Bottleneck({ + reservoir: 40, // initial value + reservoirRefreshAmount: 40, + reservoirRefreshInterval: 10 * 1000, // must be divisible by 250 + + // also use maxConcurrent and/or minTime for safety + maxConcurrent: 4, + minTime: 250 // pick a value that makes sense for your use case + }); + var TTL = 1000 * 60 * 60 * 24 * 14; // 14 Day retention var OpenSubtitlesMovies = function() { @@ -19,7 +38,7 @@ //Login with Default Values this.authenticated = false; - this.authenticate(App.settings.opensubtitlesUsername,App.settings.opensubtitlesPassword); + this.authenticate(App.settings.opensubtitlesUsername, App.settings.opensubtitlesPassword); }; @@ -73,7 +92,7 @@ OpenSubtitlesMovies.prototype.authenticate = function(username, password, callback) { win.debug("Opensubtitles Authenicate") - + var deferred = Q.defer(); //Login with Default Values @@ -92,7 +111,7 @@ //win.debug(res.userinfo); this.authenticated = true; win.debug("OpenSubtitles API Login Successful"); - + ga('send', { hitType: 'event', eventCategory: 'OpenSubtitles', @@ -113,7 +132,7 @@ hitType: 'event', eventCategory: 'OpenSubtitles', eventAction: 'OpenSubtitles Login Unsuccessful', - eventLabel: 'OpenSubtitles: '+err + eventLabel: 'OpenSubtitles: ' + err }); deferred.resolve(this.authenticated); }); @@ -128,7 +147,7 @@ hitType: 'event', eventCategory: 'OpenSubtitles', eventAction: 'OpenSubtitles Login Anonymous', - eventLabel: 'OpenSubtitles Login Anonymous' + eventLabel: 'OpenSubtitles Login Anonymous' }); deferred.resolve(this.authenticated); } @@ -146,12 +165,47 @@ hitType: 'event', eventCategory: 'OpenSubtitles', eventAction: 'OpenSubtitles Disconnect', - eventLabel: 'OpenSubtitles Disconnect' + eventLabel: 'OpenSubtitles Disconnect' }); callback(); }; + var subtitleSearch = function(id) { + var deferred = Q.defer(); + + if (!osError) { + win.debug("Search Start: " + id); + OS.search({ + imdbid: id, + gzip: false + }).then(subtitles => { + //win.debug("OS:Subtitles: "+JSON.stringify(subtitles)); + win.debug("Search End: " + id); + if (subtitles) { + deferred.resolve({ + [id]: subtitles + }); + } else { + //subtitles is blank + deferred.resolve({}); + } + }).catch(err => { + win.error("OpenSubtitlesMovies API Error: " + id + " " + err); + validateOSError(err); + //subtitles is blank + deferred.resolve({}); + }); + } else { + //subtitles is blank + deferred.resolve({}); + } + return deferred.promise; + }; + + const throttledsubtitleSearch = limiter.wrap(subtitleSearch); + var querySubtitles = function(imdbIds) { + performance.mark('querySubtitles_start'); var deferred = Q.defer(); if (_.isEmpty(imdbIds)) { @@ -160,59 +214,30 @@ return deferred.promise; } + osError = false; //Clear OS error flag + //win.debug("querySubtitles: " + imdbIds); //Cycle through each imdbId then return the sublist //Search for imdbId - var i = _.size(imdbIds); - - if (i < 10) { - i = 0; - } return Q.all( - _.map(imdbIds, function(id) { - var deferred = Q.defer(); - setTimeout(function() { - win.debug("Search Start: "+id); - OS.search({ - imdbid: id, - gzip: false - }).then(subtitles => { - //win.debug("OS:Subtitles: "+JSON.stringify(subtitles)); - win.debug("Search End: "+id); - if (subtitles) { - deferred.resolve({ - [id]: subtitles - }); - } else { - //subtitles is blank - deferred.resolve({}); - } - }).catch(err => { - win.error("OpenSubtitlesMovies API Error: "+id+" " + err); - //subtitles is blank - deferred.resolve({}); - }); - }, 400 * (i)); - //win.debug("Subtitle IMDB ID: " + id + " Time: "+300*i+"ms"); - if (i > 0) { - i = i - 1 - } - return deferred.promise; - })).then(data => { - //Create subtitleList Array and return based on the input list - var subtitleList = {}; - subtitleList.subs = {}; - - _.each(data, function(item) { - for (var name in item) { - //win.debug("Subtitle IMDB ID: " + name); - subtitleList.subs[name] = item[name]; - } + _.map(imdbIds, throttledsubtitleSearch)) + .then(data => { + //Create subtitleList Array and return based on the input list + var subtitleList = {}; + subtitleList.subs = {}; + + _.each(data, function(item) { + for (var name in item) { + //win.debug("Subtitle IMDB ID: " + name); + subtitleList.subs[name] = item[name]; + } + }); + performance.mark('querySubtitles_end'); + performance.measure('querySubtitles', 'querySubtitles_start', 'querySubtitles_end'); + return subtitleList; }); - return subtitleList; - }); }; var normalizeLangCodes = function(data) { @@ -224,6 +249,7 @@ }; var formatForPopcorn = function(data) { + performance.mark('formatForPopcorn_start'); //win.debug("formatForPopcorn:data: " + JSON.stringify(data)); var allSubs = {}; // Iterate each movie @@ -248,12 +274,41 @@ }); //win.debug("Common.santize: " + JSON.stringify(Common.sanitize(allSubs))); - + performance.mark('formatForPopcorn_end'); + performance.measure('formatForPopcorn_subtitles', 'formatForPopcorn_start', 'formatForPopcorn_end'); return Common.sanitize(allSubs); }; + var validateOSError = function(err) { + //Check and process OS errors + switch (err.message) { + case 'API seems offline': + case '401 Unauthorized': + osError = true; + break; + default: + break; + } + + } + + var stopPerformance = function() { + try { + obs.disconnect(); + } catch (e) { + win.error(e) + } + } OpenSubtitlesMovies.prototype.query = function(ids) { - return querySubtitles(ids).then(formatForPopcorn); + obs = new PerformanceObserver((list, observer) => { + const entries = list.getEntries(); + entries.forEach((entry) => { + win.debug('Performance Test: ' + entry.name + ' Duration: ' + entry.duration + 'ms'); + }); + }); + obs.observe({ entryTypes: ['measure'], buffered: true }); + + return querySubtitles(ids).then(formatForPopcorn).finally(stopPerformance); }; App.Providers.OpenSubtitlesMovies = OpenSubtitlesMovies; diff --git a/src/app/settings.js b/src/app/settings.js index e8889418..5fa5b83f 100644 --- a/src/app/settings.js +++ b/src/app/settings.js @@ -169,6 +169,8 @@ Settings.trackers = [ 'udp://exodus.desync.com:6969/announce', 'https://tracker.bt-hash.com:443/announce', 'http://explodie.org:6969/announce', + 'udp://9.rarbg.me:2710', + 'udp://9.rarbg.to:2710', 'wss://tracker.openwebtorrent.com' ]; From 0990798d61994f3940609bf2a43de50eb77c75be Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sat, 1 Aug 2020 01:10:16 -0700 Subject: [PATCH 67/77] Package: Update lock file --- package-lock.json | 167 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) diff --git a/package-lock.json b/package-lock.json index d53a88b8..c1a2863e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -682,6 +682,11 @@ "fastq": "^1.6.0" } }, + "@servie/events": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@servie/events/-/events-1.0.0.tgz", + "integrity": "sha512-sBSO19KzdrJCM3gdx6eIxV8M9Gxfgg6iDQmH5TIAGaUu+X9VDdsINXJOnoiZ1Kx3TrHdH4bt5UVglkjsEGBcvw==" + }, "@types/babel__core": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.3.tgz", @@ -789,6 +794,11 @@ "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==", "dev": true }, + "@types/tough-cookie": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.7.tgz", + "integrity": "sha512-rMQbgMGxnLsdn8e9aPVyuN+zMQLrZ2QW8xlv7eWS1mydfGXN+tsTKffcIzd8rGCcLdmi3xvQw2MDaZI1bBNTaw==" + }, "@types/yargs": { "version": "13.0.3", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.3.tgz", @@ -2023,6 +2033,11 @@ "multicast-dns-service-types": "^1.1.0" } }, + "bottleneck": { + "version": "2.19.5", + "resolved": "https://registry.npmjs.org/bottleneck/-/bottleneck-2.19.5.tgz", + "integrity": "sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw==" + }, "boxen": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", @@ -2294,6 +2309,11 @@ "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=" }, + "byte-length": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/byte-length/-/byte-length-1.0.2.tgz", + "integrity": "sha512-ovBpjmsgd/teRmgcPh23d4gJvxDoXtAzEL9xTfMU8Yc2kqCDb7L9jAG0XHl1nzuGl+h3ebCIF1i62UFyA9V/2Q==" + }, "bytebuffer": { "version": "3.5.5", "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-3.5.5.tgz", @@ -2572,6 +2592,22 @@ "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=" }, + "client-oauth2": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/client-oauth2/-/client-oauth2-4.3.2.tgz", + "integrity": "sha512-3yH4+VkxBlXHL9mmc4WZKf+gu7aj5YiAxZ9ekT6V/tfAJoMDz2TL+aofcV4WXNGhlWY8ht0QPGOJqUxIFehpBg==", + "requires": { + "popsicle": "^12.0.5", + "safe-buffer": "^5.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + } + } + }, "cliui": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", @@ -6393,6 +6429,11 @@ "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=" }, + "ip-regex": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", + "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=" + }, "ip-set": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/ip-set/-/ip-set-1.0.2.tgz", @@ -8773,6 +8814,19 @@ } } }, + "make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==" + }, + "make-error-cause": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/make-error-cause/-/make-error-cause-2.3.0.tgz", + "integrity": "sha512-etgt+n4LlOkGSJbBTV9VROHA5R7ekIPS4vfh+bCAoJgRrJWdqJCBbpS3osRJ/HrT7R68MzMiY3L3sDJ/Fd8aBg==", + "requires": { + "make-error": "^1.3.5" + } + }, "make-iterator": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", @@ -10579,6 +10633,105 @@ "resolved": "https://registry.npmjs.org/pop-iterate/-/pop-iterate-1.0.1.tgz", "integrity": "sha1-zqz9q0q/NT16DyqqLB/Hs/lBO6M=" }, + "popsicle": { + "version": "12.0.5", + "resolved": "https://registry.npmjs.org/popsicle/-/popsicle-12.0.5.tgz", + "integrity": "sha512-PZt2+KfNQVwYXEwaAdJPLsYFJ+j0M25+26GhBovxhq9TZFRJfigAlJ5JfioCf/9R4RcTSu9VeaovJcb20Br7mw==", + "requires": { + "popsicle-content-encoding": "^1.0.0", + "popsicle-cookie-jar": "^1.0.0", + "popsicle-redirects": "^1.1.0", + "popsicle-transport-http": "^1.0.6", + "popsicle-transport-xhr": "^1.0.2", + "popsicle-user-agent": "^1.0.0", + "servie": "^4.3.2", + "throwback": "^4.1.0", + "tough-cookie": "^3.0.1" + }, + "dependencies": { + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + }, + "tough-cookie": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", + "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", + "requires": { + "ip-regex": "^2.1.0", + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + } + } + }, + "popsicle-content-encoding": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/popsicle-content-encoding/-/popsicle-content-encoding-1.0.0.tgz", + "integrity": "sha512-4Df+vTfM8wCCJVTzPujiI6eOl3SiWQkcZg0AMrOkD1enMXsF3glIkFUZGvour1Sj7jOWCsNSEhBxpbbhclHhzw==" + }, + "popsicle-cookie-jar": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/popsicle-cookie-jar/-/popsicle-cookie-jar-1.0.0.tgz", + "integrity": "sha512-vrlOGvNVELko0+J8NpGC5lHWDGrk8LQJq9nwAMIVEVBfN1Lib3BLxAaLRGDTuUnvl45j5N9dT2H85PULz6IjjQ==", + "requires": { + "@types/tough-cookie": "^2.3.5", + "tough-cookie": "^3.0.1" + }, + "dependencies": { + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + }, + "tough-cookie": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", + "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", + "requires": { + "ip-regex": "^2.1.0", + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + } + } + }, + "popsicle-redirects": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/popsicle-redirects/-/popsicle-redirects-1.1.0.tgz", + "integrity": "sha512-XCpzVjVk7tty+IJnSdqWevmOr1n8HNDhL86v7mZ6T1JIIf2KGybxUk9mm7ZFOhWMkGB0e8XkacHip7BV8AQWQA==" + }, + "popsicle-transport-http": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/popsicle-transport-http/-/popsicle-transport-http-1.0.8.tgz", + "integrity": "sha512-5jeUUNSAElwNnFkb6LE1b/YlOHlaFWKN8N8BBdHZWIK6QQzb34nuXkbKJZxn7xK5VrGpCAraHayycQf7KpIJOw==", + "requires": { + "make-error-cause": "^2.2.0", + "pump": "^3.0.0" + }, + "dependencies": { + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + } + } + }, + "popsicle-transport-xhr": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/popsicle-transport-xhr/-/popsicle-transport-xhr-1.0.2.tgz", + "integrity": "sha512-v9eAJnj1tydT4VmDdyKFE1z/+oL01vB7AS3LfSFMAYv33dzqlxtbApKALcYWBQotIqw3FoIqd2FiDR6qJsOxtA==" + }, + "popsicle-user-agent": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/popsicle-user-agent/-/popsicle-user-agent-1.0.0.tgz", + "integrity": "sha512-epKaq3TTfTzXcxBxjpoKYMcTTcAX8Rykus6QZu77XNhJuRHSRxMd+JJrbX/3PFI0opFGSN0BabbAYCbGxbu0mA==" + }, "posix-character-classes": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", @@ -11546,6 +11699,15 @@ "integrity": "sha1-8Tv5KOQrnD55OD5hzDmYtdFObN0=", "optional": true }, + "servie": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/servie/-/servie-4.3.2.tgz", + "integrity": "sha512-1NpFf3LjkDDq4IIuBqtqHfSdPWhXpuyWwuBdwbifZjWSxQd8rCWz5W9AluxNvWfteM1qQ26puODIzWljvBJc5A==", + "requires": { + "@servie/events": "^1.0.0", + "byte-length": "^1.0.2" + } + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -12580,6 +12742,11 @@ "xtend": "~4.0.0" } }, + "throwback": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/throwback/-/throwback-4.1.0.tgz", + "integrity": "sha512-dLFe8bU8SeH0xeqeKL7BNo8XoPC/o91nz9/ooeplZPiso+DZukhoyZcSz9TFnUNScm+cA9qjU1m1853M6sPOng==" + }, "thunky": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz", From 0d66518a6936bddde36c82e63a7a8e24a09fc721 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Sun, 2 Aug 2020 03:02:29 -0700 Subject: [PATCH 68/77] OpenSubtitles: Optimized requests based on ids --- src/app/lib/providers/opensubtitlesmovies.js | 31 ++++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/src/app/lib/providers/opensubtitlesmovies.js b/src/app/lib/providers/opensubtitlesmovies.js index 1de999a2..52421230 100644 --- a/src/app/lib/providers/opensubtitlesmovies.js +++ b/src/app/lib/providers/opensubtitlesmovies.js @@ -19,15 +19,17 @@ useragent: 'Popcorn Time v1' }); - const limiter = new Bottleneck({ - reservoir: 40, // initial value - reservoirRefreshAmount: 40, - reservoirRefreshInterval: 10 * 1000, // must be divisible by 250 + const limiterOptions = { + //reservoir: 40, // initial value + //reservoirRefreshAmount: 40, + //reservoirRefreshInterval: 10 * 1000, // must be divisible by 250 // also use maxConcurrent and/or minTime for safety - maxConcurrent: 4, + maxConcurrent: 10, minTime: 250 // pick a value that makes sense for your use case - }); + }; + + const limiter = new Bottleneck(limiterOptions); var TTL = 1000 * 60 * 60 * 24 * 14; // 14 Day retention @@ -304,10 +306,27 @@ const entries = list.getEntries(); entries.forEach((entry) => { win.debug('Performance Test: ' + entry.name + ' Duration: ' + entry.duration + 'ms'); + ga('send', { + hitType: 'timing', + timingCategory: 'OpenSubtitles', + timingVar: entry.name, + timingValue: entry.duration, + timingLabel: 'OpenSubtitles_'+entry.name, + }); }); + obs.disconnect(); }); obs.observe({ entryTypes: ['measure'], buffered: true }); + let amount = _.size(ids); + + if(amount < 40) + limiter.updateSettings({ + minTime:50 + }) + else + limiter.updateSettings(limiterOptions); + return querySubtitles(ids).then(formatForPopcorn).finally(stopPerformance); }; From 9671af0c07acf6106ca0c39cc9fb15e98f23d165 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Mon, 3 Aug 2020 17:28:20 -0700 Subject: [PATCH 69/77] GA: Update GA code --- src/app/index.html | 2 +- src/app/settings.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/index.html b/src/app/index.html index 9f8b159b..399a51dd 100644 --- a/src/app/index.html +++ b/src/app/index.html @@ -17,7 +17,7 @@ j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f); - })(window, document, 'script', 'dataLayer', 'GTM-ML5LN34'); + })(window, document, 'script', 'dataLayer', 'GTM-WNT4KWR'); diff --git a/src/app/settings.js b/src/app/settings.js index 5fa5b83f..0ed48135 100644 --- a/src/app/settings.js +++ b/src/app/settings.js @@ -188,7 +188,7 @@ Settings.tv_detail_jump_to = 'next'; Settings.rememberRegister = true; //GA Code -Settings.gaCode = 'UA-72854850-1'; //PROD - 1, TEST - 3 +Settings.gaCode = 'UA-174404912-1'; //PROD - 1, TEST - 3 Settings.analytics = true; var ScreenResolution = { From 0bc0586540b990d6049d076104fa05f3ebcb7b42 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Mon, 3 Aug 2020 20:09:14 -0700 Subject: [PATCH 70/77] Updated GA calls Analytics: Fixed (not set) labels --- src/app/index.html | 23 +- src/app/lib/providers/opensubtitlesmovies.js | 81 +++---- src/app/lib/views/main_window.js | 209 ++++++++++--------- src/app/lib/views/settings_container.js | 24 ++- 4 files changed, 192 insertions(+), 145 deletions(-) diff --git a/src/app/index.html b/src/app/index.html index 399a51dd..a011259d 100644 --- a/src/app/index.html +++ b/src/app/index.html @@ -187,6 +187,7 @@ diff --git a/src/app/lib/providers/opensubtitlesmovies.js b/src/app/lib/providers/opensubtitlesmovies.js index 52421230..88c48695 100644 --- a/src/app/lib/providers/opensubtitlesmovies.js +++ b/src/app/lib/providers/opensubtitlesmovies.js @@ -113,13 +113,14 @@ //win.debug(res.userinfo); this.authenticated = true; win.debug("OpenSubtitles API Login Successful"); - - ga('send', { - hitType: 'event', - eventCategory: 'OpenSubtitles', - eventAction: 'OpenSubtitles Login Successful', - eventLabel: 'OpenSubtitles Login Successful' - }); + if (App.settings.analytics) { + ga('send', { + hitType: 'event', + eventCategory: 'OpenSubtitles', + eventAction: 'OpenSubtitles Login Successful', + eventLabel: 'OpenSubtitles Login Successful' + }); + } deferred.resolve(this.authenticated); }) @@ -130,12 +131,14 @@ }); this.authenticated = false; win.debug("OpenSubtitles API Login Unsuccessful"); - ga('send', { - hitType: 'event', - eventCategory: 'OpenSubtitles', - eventAction: 'OpenSubtitles Login Unsuccessful', - eventLabel: 'OpenSubtitles: ' + err - }); + if (App.settings.analytics) { + ga('send', { + hitType: 'event', + eventCategory: 'OpenSubtitles', + eventAction: 'OpenSubtitles Login Unsuccessful', + eventLabel: 'OpenSubtitles: ' + err + }); + } deferred.resolve(this.authenticated); }); @@ -145,12 +148,14 @@ }); this.authenticated = false; win.debug("OpenSubtitles API Login Unsuccessful"); - ga('send', { - hitType: 'event', - eventCategory: 'OpenSubtitles', - eventAction: 'OpenSubtitles Login Anonymous', - eventLabel: 'OpenSubtitles Login Anonymous' - }); + if (App.settings.analytics) { + ga('send', { + hitType: 'event', + eventCategory: 'OpenSubtitles', + eventAction: 'OpenSubtitles Login Anonymous', + eventLabel: 'OpenSubtitles Login Anonymous' + }); + } deferred.resolve(this.authenticated); } return deferred.promise; @@ -163,12 +168,14 @@ }); this.authenticated = false; win.debug("Opensubtitles API Logout"); - ga('send', { - hitType: 'event', - eventCategory: 'OpenSubtitles', - eventAction: 'OpenSubtitles Disconnect', - eventLabel: 'OpenSubtitles Disconnect' - }); + if (App.settings.analytics) { + ga('send', { + hitType: 'event', + eventCategory: 'OpenSubtitles', + eventAction: 'OpenSubtitles Disconnect', + eventLabel: 'OpenSubtitles Disconnect' + }); + } callback(); }; @@ -305,14 +312,16 @@ obs = new PerformanceObserver((list, observer) => { const entries = list.getEntries(); entries.forEach((entry) => { - win.debug('Performance Test: ' + entry.name + ' Duration: ' + entry.duration + 'ms'); - ga('send', { - hitType: 'timing', - timingCategory: 'OpenSubtitles', - timingVar: entry.name, - timingValue: entry.duration, - timingLabel: 'OpenSubtitles_'+entry.name, - }); + win.debug('Performance Test: ' + entry.name + ' Duration: ' + entry.duration.toFixed(2) + 'ms'); + if (App.settings.analytics) { + ga('send', { + hitType: 'timing', + timingCategory: 'OpenSubtitles', + timingVar: entry.name, + timingValue: entry.duration.toFixed(0), + timingLabel: 'OpenSubtitles_'+App.settings.version+'_'+entry.name, + }); + } }); obs.disconnect(); }); @@ -320,13 +329,13 @@ let amount = _.size(ids); - if(amount < 40) + if (amount < 40) limiter.updateSettings({ - minTime:50 + minTime: 50 }) else limiter.updateSettings(limiterOptions); - + return querySubtitles(ids).then(formatForPopcorn).finally(stopPerformance); }; diff --git a/src/app/lib/views/main_window.js b/src/app/lib/views/main_window.js index a93ba5e9..ab67a8e8 100644 --- a/src/app/lib/views/main_window.js +++ b/src/app/lib/views/main_window.js @@ -205,14 +205,13 @@ } //Initialize Google Analytics - if (App.settings.analytics) { - //Set AppVersion - ga('set', 'appName', App.Config.title); - ga('set', 'appVersion', AdvSettings.get('version')); - ga('send', 'screenview', { - screenName: App.Config.title - }); - } + + //Set App Details + ga('set', 'appName', App.Config.title); + ga('set', 'appVersion', AdvSettings.get('version')); + ga('send', 'screenview', { + screenName: App.Config.title + }); that.InitModal.destroy(); @@ -298,13 +297,15 @@ showAnime: function(e) { this.Settings.destroy(); this.MovieDetail.destroy(); - ga('set', { - page: '/popcorntimece/anime/', - title: 'Anime List' - }); - ga('send', { - hitType: 'pageview' - }); + if (App.settings.analytics) { + ga('set', { + page: '/popcorntimece/anime/', + title: 'Anime List' + }); + ga('send', { + hitType: 'pageview' + }); + } this.Content.show(new App.View.AnimeBrowser()); }, @@ -348,13 +349,15 @@ showFavorites: function(e) { this.Settings.destroy(); this.MovieDetail.destroy(); - ga('set', { - page: '/popcorntimece/favorites/', - title: 'Favorites' - }); - ga('send', { - hitType: 'pageview' - }); + if (App.settings.analytics) { + ga('set', { + page: '/popcorntimece/favorites/', + title: 'Favorites' + }); + ga('send', { + hitType: 'pageview' + }); + } this.Content.show(new App.View.FavoriteBrowser()); }, @@ -382,68 +385,79 @@ } } waitForSync(); - - ga('set', { - page: '/popcorntimece/watchlist/', - title: 'Watchlist' - }); - ga('send', { - hitType: 'pageview' - }); + if (App.settings.analytics) { + ga('set', { + page: '/popcorntimece/watchlist/', + title: 'Watchlist' + }); + ga('send', { + hitType: 'pageview' + }); + } }, showDisclaimer: function(e) { - ga('set', { - page: '/popcorntimece/disclaimer/', - title: 'Disclaimer' - }); - ga('send', { - hitType: 'pageview' - }); + if (App.settings.analytics) { + ga('set', { + page: '/popcorntimece/disclaimer/', + title: 'Disclaimer' + }); + ga('send', { + hitType: 'pageview' + }); + } this.Disclaimer.show(new App.View.DisclaimerModal()); }, showRegister: function(e) { - ga('set', { - page: '/popcorntimece/register/', - title: 'Register' - }); - ga('send', { - hitType: 'pageview' - }); + if (App.settings.analytics) { + ga('set', { + page: '/popcorntimece/register/', + title: 'Register' + }); + ga('send', { + hitType: 'pageview' + }); + } this.Register.show(new App.View.RegisterModal()); }, showAbout: function(e) { - ga('set', { - page: '/popcorntimece/about/', - title: 'About' - }); - ga('send', { - hitType: 'pageview' - }); + if (App.settings.analytics) { + ga('set', { + page: '/popcorntimece/about/', + title: 'About' + }); + ga('send', { + hitType: 'pageview' + }); + } this.About.show(new App.View.About()); }, showTorrentCollection: function(e) { - ga('set', { - page: '/popcorntimece/torrentcollection/', - title: 'Torrent Collection' - }); - ga('send', { - hitType: 'pageview' - }); + if (App.settings.analytics) { + ga('set', { + page: '/popcorntimece/torrentcollection/', + title: 'Torrent Collection' + }); + ga('send', { + hitType: 'pageview' + }); + } this.TorrentCollection.show(new App.View.TorrentCollection()); }, showPlugins: function(e) { - ga('set', { - page: '/popcorntimece/plugins/', - title: 'Plugins' - }); - ga('send', { - hitType: 'pageview' - }); + if (App.settings.analytics) { + ga('set', { + page: '/popcorntimece/plugins/', + title: 'Plugins' + }); + ga('send', { + hitType: 'pageview' + }); + } this.Plugins.show(new App.View.Plugins()); }, @@ -460,13 +474,15 @@ }, showHelp: function(e) { - ga('set', { - page: '/popcorntimece/help/', - title: 'Help' - }); - ga('send', { - hitType: 'pageview' - }); + if (App.settings.analytics) { + ga('set', { + page: '/popcorntimece/help/', + title: 'Help' + }); + ga('send', { + hitType: 'pageview' + }); + } this.Help.show(new App.View.Help()); }, @@ -528,13 +544,15 @@ }, showSettings: function(settingsModel) { - ga('set', { - page: '/popcorntimece/settings/', - title: 'Settings' - }); - ga('send', { - hitType: 'pageview' - }); + if (App.settings.analytics) { + ga('set', { + page: '/popcorntimece/settings/', + title: 'Settings' + }); + ga('send', { + hitType: 'pageview' + }); + } this.Settings.show(new App.View.Settings({ model: settingsModel })); @@ -542,13 +560,14 @@ traktAuthenticated: function() { win.info('Trakt: authenticated'); - ga('send', { - hitType: 'event', - eventCategory: 'Trakt', - eventAction: 'Trakt Authenticated', - eventLabel: 'Trakt Authenticated' - }); - + if (App.settings.analytics) { + ga('send', { + hitType: 'event', + eventCategory: 'Trakt', + eventAction: 'Trakt Authenticated', + eventLabel: 'Trakt Authenticated' + }); + } if (Settings.traktSyncOnStart && (Settings.traktLastSync + 1800000 < new Date().valueOf())) { //only refresh every 30min App.Trakt.sync.lastActivities() .then(function(activities) { // check if new activities @@ -556,12 +575,14 @@ if (lastActivities > Settings.traktLastActivities) { AdvSettings.set('traktLastActivities', lastActivities); Database.deleteWatched(); - ga('send', { - hitType: 'event', - eventCategory: 'Trakt', - eventAction: 'Trakt Sync All', - eventLabel: 'Trakt Sync All' - }); + if (App.settings.analytics) { + ga('send', { + hitType: 'event', + eventCategory: 'Trakt', + eventAction: 'Trakt Sync All', + eventLabel: 'Trakt Sync All' + }); + } App.Trakt.syncTrakt.all(); } }); @@ -626,8 +647,8 @@ var that = this; App.db.getSetting({ - key: 'postersWidth' - }) + key: 'postersWidth' + }) .then(function(doc) { var postersWidth = doc.value; var postersHeight = Math.round(postersWidth * Settings.postersSizeRatio); diff --git a/src/app/lib/views/settings_container.js b/src/app/lib/views/settings_container.js index 1a0d04de..f4ceda69 100644 --- a/src/app/lib/views/settings_container.js +++ b/src/app/lib/views/settings_container.js @@ -234,7 +234,7 @@ url: value, strictSSL: value.substr(0, 8) === 'https://' }); - + value = App.settings['tvAPI']; break; @@ -264,7 +264,7 @@ if ($('option:selected', field).val() === 'Last Open') { AdvSettings.set('lastTab', App.currentview); } - /* falls through */ + /* falls through */ case 'watchedCovers': case 'theme': value = $('option:selected', field).val(); @@ -558,12 +558,14 @@ if (value == false) { that.alertMessageFailed(i18n.__("Incorrect Username or Password")); } - ga('send', { - hitType: 'event', - eventCategory: 'Settings', - eventAction: 'OpenSubtitles Login Incorrect', - eventLabel: 'OpenSubtitles Login Incorrect' - }); + if (App.settings.analytics) { + ga('send', { + hitType: 'event', + eventCategory: 'Settings', + eventAction: 'OpenSubtitles Login Incorrect', + eventLabel: 'OpenSubtitles Login Incorrect' + }); + } return value; }).then(function(value) { if (value == true) { @@ -715,18 +717,18 @@ } return location; } catch (err) { - if (err.code !== 'EEXIST'){ + if (err.code !== 'EEXIST') { $('.notification_alert').show().text(i18n.__('Unable to create new Download directory')).delay(5000).fadeOut(400); return this.resetTmpLocation(); } } }, - resetTmpLocation: function(){ + resetTmpLocation: function() { var value = path.join(os.tmpDir(), 'Popcorn-Time'); $('#tmpLocation').val(value); this.render(); - return value; + return value; }, openDatabaseFolder: function() { From 1609abe26415c30e2ecde444f2fcd89b7fb685f4 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Tue, 4 Aug 2020 22:30:42 -0700 Subject: [PATCH 71/77] GA: Disable debug script --- src/app/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/index.html b/src/app/index.html index a011259d..01237740 100644 --- a/src/app/index.html +++ b/src/app/index.html @@ -198,7 +198,7 @@ a.async = 1; a.src = g; m.parentNode.insertBefore(a, m) - })(window, document, 'script', 'https://www.google-analytics.com/analytics_debug.js', 'ga'); + })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga'); window.ga_debug = { trace: true } From 493c8ed1b05e9d4eb1ab05908092467a0c079c2f Mon Sep 17 00:00:00 2001 From: captainyarr Date: Wed, 5 Aug 2020 00:02:34 -0700 Subject: [PATCH 72/77] Updated changelog --- CHANGELOG.md | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14219a5d..246ea2c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,23 @@ ## 0.4.1-18 Beta - WIP Builds New Features: -- Sort By, Genres, Type are now saved when going between Movies and TV Shows. - +- Sort: Sort By, Genres, Type are now saved when going between Movies and TV Shows. +- RARBG: Updated categories for RARBG to support 4K, Movies, TV Shows, XXX +- Tracker: Added Tracker Updater BugFixes: - +- Trakt: Authorize Fixed +- RARBG: Fixed RARBG search support in Torrent Collection +- Trailer: Validate trailer information is correct +- Favorites: Fixed Favorites to handle bad movie entries Updated: - - +- OpenSubtitles: Updated handling of subtitle search +- OpenSubtitles: Added performance tests +- Trakt: Updated Watchlist refresh and trakt clean up +- Trakt: Added Trak scrobble to ext players +- Code: Intergrated torrent health into repo +- Chromecast: Enabled auto discovery of new chromecast device on a set period of time ## 0.4.1-17.1 Beta - Popcorn Treats - 24 October 2019 From 9311ea919e82240a9586ddbca4247e6010e59351 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Thu, 6 Aug 2020 01:59:11 -0700 Subject: [PATCH 73/77] Subtiles: Async loading of subtitles --- src/app/lib/models/generic_collection.js | 40 ++++++++++++++------ src/app/lib/providers/opensubtitlesmovies.js | 37 ++++++++++-------- 2 files changed, 49 insertions(+), 28 deletions(-) diff --git a/src/app/lib/models/generic_collection.js b/src/app/lib/models/generic_collection.js index f7c0cca4..9ca2e6fa 100644 --- a/src/app/lib/models/generic_collection.js +++ b/src/app/lib/models/generic_collection.js @@ -1,11 +1,11 @@ -(function (App) { +(function(App) { 'use strict'; var Q = require('q'); var PopCollection = Backbone.Collection.extend({ popid: 'imdb_id', - initialize: function (models, options) { + initialize: function(models, options) { this.providers = this.getProviders(); options = options || {}; @@ -19,7 +19,7 @@ Backbone.Collection.prototype.initialize.apply(this, arguments); }, - fetch: function () { + fetch: function() { var self = this; if (this.state === 'loading' && !this.hasMore) { @@ -32,6 +32,20 @@ var subtitle = this.providers.subtitle; var torrents = this.providers.torrents; + var updateSubtitles = function(subtitles) { + //win.debug("updateSubtitles"); + _.each(subtitles, function(subtitle,id) { + //win.debug("Update subtitle id: " + id); + var model = self.get(id); + if (model) { + var ts = model.get('subtitle'); + _.extend(ts, subtitle); + model.set('subtitle', ts); + } + }); + self.trigger('sync', self); + } + /* XXX(xaiki): provider hack * * we actually do this to 'save' the provider number, @@ -40,7 +54,7 @@ * provider declare a unique id, and then lookthem up in * a hash. */ - var torrentPromises = _.map(torrents, function (torrentProvider, pid) { //XXX(xaiki): provider hack + var torrentPromises = _.map(torrents, function(torrentProvider, pid) { //XXX(xaiki): provider hack var deferred = Q.defer(); var promises = [torrentProvider.fetch(self.filter)]; @@ -48,13 +62,14 @@ var idsPromise = promises[0].then(_.bind(torrentProvider.extractIds, torrentProvider)); if (subtitle) { - promises.push(idsPromise.then(_.bind(subtitle.fetch, subtitle))); + //promises.push(idsPromise.then(_.bind(subtitle.fetch, subtitle))); + idsPromise.then(_.bind(subtitle.fetch, subtitle)).then(updateSubtitles); } Q.all(promises) - .spread(function (torrents, subtitles) { + .spread(function(torrents, subtitles) { // If a new request was started... - _.each(torrents.results, function (movie) { + _.each(torrents.results, function(movie) { var id = movie[self.popid]; /* XXX(xaiki): check if we already have this * torrent if we do merge our torrents with the @@ -72,12 +87,13 @@ if (subtitles) { movie.subtitle = subtitles[id]; - } + } else + movie.subtitle = {}; }); return deferred.resolve(torrents); }) - .catch(function (err) { + .catch(function(err) { self.state = 'error'; self.trigger('loaded', self, self.state); win.error('PopCollection.fetch() : torrentPromises mapping', err); @@ -86,8 +102,8 @@ return deferred.promise; }); - Q.all(torrentPromises).done(function (torrents) { - _.forEach(torrents, function (t) { + Q.all(torrentPromises).done(function(torrents) { + _.forEach(torrents, function(t) { self.add(t.results); }); self.hasMore = _.pluck(torrents, 'hasMore')[0]; @@ -97,7 +113,7 @@ }); }, - fetchMore: function () { + fetchMore: function() { this.filter.page += 1; this.fetch(); } diff --git a/src/app/lib/providers/opensubtitlesmovies.js b/src/app/lib/providers/opensubtitlesmovies.js index 88c48695..7adaab39 100644 --- a/src/app/lib/providers/opensubtitlesmovies.js +++ b/src/app/lib/providers/opensubtitlesmovies.js @@ -25,7 +25,7 @@ //reservoirRefreshInterval: 10 * 1000, // must be divisible by 250 // also use maxConcurrent and/or minTime for safety - maxConcurrent: 10, + maxConcurrent: 5, minTime: 250 // pick a value that makes sense for your use case }; @@ -219,6 +219,8 @@ if (_.isEmpty(imdbIds)) { //subtitles is blank + performance.mark('querySubtitles_end'); + performance.measure('querySubtitles', 'querySubtitles_start', 'querySubtitles_end'); deferred.resolve({}); return deferred.promise; } @@ -309,22 +311,25 @@ } } OpenSubtitlesMovies.prototype.query = function(ids) { - obs = new PerformanceObserver((list, observer) => { - const entries = list.getEntries(); - entries.forEach((entry) => { - win.debug('Performance Test: ' + entry.name + ' Duration: ' + entry.duration.toFixed(2) + 'ms'); - if (App.settings.analytics) { - ga('send', { - hitType: 'timing', - timingCategory: 'OpenSubtitles', - timingVar: entry.name, - timingValue: entry.duration.toFixed(0), - timingLabel: 'OpenSubtitles_'+App.settings.version+'_'+entry.name, - }); - } + if (typeof (obs) == 'undefined') { + obs = new PerformanceObserver((list, observer) => { + const entries = list.getEntries(); + entries.forEach((entry) => { + win.debug('Performance Test: ' + entry.name + ' Duration: ' + entry.duration.toFixed(2) + 'ms'); + if (App.settings.analytics) { + ga('send', { + hitType: 'timing', + timingCategory: 'OpenSubtitles', + timingVar: entry.name, + timingValue: entry.duration.toFixed(0), + timingLabel: 'OpenSubtitles_' + App.settings.version + '_' + entry.name, + }); + } + }); + performance.clearMarks(); }); - obs.disconnect(); - }); + } + obs.observe({ entryTypes: ['measure'], buffered: true }); let amount = _.size(ids); From 84004c9235d76392d3e8bbe0fa59be25c0386ffa Mon Sep 17 00:00:00 2001 From: captainyarr Date: Fri, 7 Aug 2020 02:27:10 -0700 Subject: [PATCH 74/77] delete: removed greenkeeper file --- greenkeeper.json | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 greenkeeper.json diff --git a/greenkeeper.json b/greenkeeper.json deleted file mode 100644 index b85259a0..00000000 --- a/greenkeeper.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "groups": { - "default": { - "packages": [ - "package.json", - "src/app/vendor/mousetrap/package.json" - ] - } - } -} From f3874937bf7598da4033dca72e26f21d3f174cd7 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Tue, 11 Aug 2020 00:43:22 -0700 Subject: [PATCH 75/77] Add debug env --- package.json | 3 ++- src/app/index.html | 11 +++++++++-- src/app/lib/views/main_window.js | 4 +++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index d1326bec..504056cf 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,8 @@ "releaseName": "Popcorn Treats", "scripts": { "start": "npx gulp run", - "update": "npm prune && npm install" + "update": "npm prune && npm install", + "debug": "NODE_ENV=development npx gulp run" }, "single-instance": false, "window": { diff --git a/src/app/index.html b/src/app/index.html index 01237740..24067eb2 100644 --- a/src/app/index.html +++ b/src/app/index.html @@ -32,7 +32,7 @@ - +
    @@ -187,6 +187,13 @@