diff --git a/.gitignore b/.gitignore
index 21c5f32..b9a3b14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,11 +33,7 @@ client/e2e/*.map
# .NET Core build folders
server/**/bin
server/**/obj
-server/*.user
-
-# Common node modules locations
-server/wwwroot/
-server/.vs
+server/**/*.user
+server/**/.vs
server/RdtClient.Web/wwwroot/
-server/RdtClient.Web/Properties/PublishProfiles/FolderProfile.pubxml.user
-*.user
+
diff --git a/client/package-lock.json b/client/package-lock.json
index 76db1d7..3f8006f 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -5,12 +5,12 @@
"requires": true,
"dependencies": {
"@angular-devkit/architect": {
- "version": "0.901.0",
- "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.0.tgz",
- "integrity": "sha512-SlqEBkPrT40zMCy5344AsUqC76pEPCaGPaAkCIvadaz2dC9vNMzQrvubCPJHViD/TumkSX1kYmLS3iYASVM9GQ==",
+ "version": "0.901.1",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.1.tgz",
+ "integrity": "sha512-foWDAurMfBDYLAJxHpTFkJBub1c2A8+eWHbBjgqIHmT8xadnE7t8nSA9XDl+k/kIoWw/qFU+6IttPirudYc/vw==",
"dev": true,
"requires": {
- "@angular-devkit/core": "9.1.0",
+ "@angular-devkit/core": "9.1.1",
"rxjs": "6.5.4"
},
"dependencies": {
@@ -26,21 +26,21 @@
}
},
"@angular-devkit/build-angular": {
- "version": "0.901.0",
- "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.901.0.tgz",
- "integrity": "sha512-ftJVNlKvIomqRfr5jFVraPqlLSUJu8YyVbFv/aCsvhNpuZGkYpTOMoJDwyywdslSTH608BIoU63IAnIz9PwUdw==",
+ "version": "0.901.1",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.901.1.tgz",
+ "integrity": "sha512-6uEvo5htsJoxQHBVwHOGmM6YWq5q6m9UWMv/ughlek0RtSLFfOt9TZQ/yQHgtGQsCQvscD/jBzVoD0zD5Ax/SQ==",
"dev": true,
"requires": {
- "@angular-devkit/architect": "0.901.0",
- "@angular-devkit/build-optimizer": "0.901.0",
- "@angular-devkit/build-webpack": "0.901.0",
- "@angular-devkit/core": "9.1.0",
+ "@angular-devkit/architect": "0.901.1",
+ "@angular-devkit/build-optimizer": "0.901.1",
+ "@angular-devkit/build-webpack": "0.901.1",
+ "@angular-devkit/core": "9.1.1",
"@babel/core": "7.9.0",
"@babel/generator": "7.9.3",
"@babel/preset-env": "7.9.0",
"@babel/template": "7.8.6",
"@jsdevtools/coverage-istanbul-loader": "3.0.3",
- "@ngtools/webpack": "9.1.0",
+ "@ngtools/webpack": "9.1.1",
"ajv": "6.12.0",
"autoprefixer": "9.7.4",
"babel-loader": "8.0.6",
@@ -82,7 +82,7 @@
"style-loader": "1.1.3",
"stylus": "0.54.7",
"stylus-loader": "3.0.2",
- "terser": "4.6.7",
+ "terser": "4.6.10",
"terser-webpack-plugin": "2.3.5",
"tree-kill": "1.2.2",
"webpack": "4.42.0",
@@ -106,26 +106,34 @@
}
},
"@angular-devkit/build-optimizer": {
- "version": "0.901.0",
- "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.901.0.tgz",
- "integrity": "sha512-Y9sz8uf2zjilhPUVYb0K9Mio6c1d5c+csuDc15CCKzELXJwyyDxilIFgn6Eu+edM0HNQGzbIwkjy4DkR9mtuTQ==",
+ "version": "0.901.1",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.901.1.tgz",
+ "integrity": "sha512-o0A9CcyDQSUnC5CQIKf92VH8amIYRYrMgLf2kdhSMcy0QV+rEJyN81dSvwX/Yxgnr9NbWEAQg7jnyKk06vfhOw==",
"dev": true,
"requires": {
"loader-utils": "2.0.0",
"source-map": "0.7.3",
"tslib": "1.11.1",
- "typescript": "3.8.3",
+ "typescript": "3.6.5",
"webpack-sources": "1.4.3"
+ },
+ "dependencies": {
+ "typescript": {
+ "version": "3.6.5",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.5.tgz",
+ "integrity": "sha512-BEjlc0Z06ORZKbtcxGrIvvwYs5hAnuo6TKdNFL55frVDlB+na3z5bsLhFaIxmT+dPWgBIjMo6aNnTOgHHmHgiQ==",
+ "dev": true
+ }
}
},
"@angular-devkit/build-webpack": {
- "version": "0.901.0",
- "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.901.0.tgz",
- "integrity": "sha512-Oze0VzIvHnoW12C80fiNH4HBu/GWmhJPXdNA7nRkU/tBQlIKnfngf8rQ0QbgecN2qdEXQpZJsP/XclTi3zugsg==",
+ "version": "0.901.1",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.901.1.tgz",
+ "integrity": "sha512-9oNI+wPSk8yECy+f0EebfMx4PH3uDJRrifYZAxcr84IpzEbpfpRuYhE3ecwqd7k0zu2Kdjw1uUrGxBuH4/sbGg==",
"dev": true,
"requires": {
- "@angular-devkit/architect": "0.901.0",
- "@angular-devkit/core": "9.1.0",
+ "@angular-devkit/architect": "0.901.1",
+ "@angular-devkit/core": "9.1.1",
"rxjs": "6.5.4"
},
"dependencies": {
@@ -141,9 +149,9 @@
}
},
"@angular-devkit/core": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.0.tgz",
- "integrity": "sha512-vHTsrB4JaVUQ95FRnKrgo79Y3F6FokImrZdrmwkQmwAThpjXeXmpUEKZS+ZSTFRgesjiIysVGOFijARP4BQ7Bg==",
+ "version": "9.1.1",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.1.tgz",
+ "integrity": "sha512-57MNew2u1QwVb69jxZyhXgdW9kqcGyWyRy2ui/hWCkWLg7RumWtyypmdTs89FNExB4HqtXlQ2eO3JZxfs7QR3w==",
"dev": true,
"requires": {
"ajv": "6.12.0",
@@ -165,12 +173,12 @@
}
},
"@angular-devkit/schematics": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.0.tgz",
- "integrity": "sha512-cb9PSvskMwWlL54fPfCcpJoyNDWAX6Wo7CzL5qpIB2cJCPLAuyfRUYYrkO77YUST+n2HvypHz0cZ5SNGMfaaBQ==",
+ "version": "9.1.1",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.1.tgz",
+ "integrity": "sha512-6wx2HcvafHvEjEa1tjDzW2hXrOiSE8ALqJUArb3+NoO1BDM42aGcqyPo0ODzKtDk12CgSsFXdNKRpQ5AmpSPtw==",
"dev": true,
"requires": {
- "@angular-devkit/core": "9.1.0",
+ "@angular-devkit/core": "9.1.1",
"ora": "4.0.3",
"rxjs": "6.5.4"
},
@@ -187,21 +195,21 @@
}
},
"@angular/animations": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-9.1.0.tgz",
- "integrity": "sha512-o7X3HM+eocoryw3VrDUtG6Wci2KwtzyBFo3KBJXjQ16X6fwdkjTG+hLb7pp2CBFBEJW4tPYEy7cSBmEfMRTqag=="
+ "version": "9.1.1",
+ "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-9.1.1.tgz",
+ "integrity": "sha512-IvKv8sV0ymbzDEX2ZLW+F6nOTQqDYallHexuzRVT9txvNE8TNHyySvLcyC5dTmX9fj9LA72NZ6nFyhxq0LFvtQ=="
},
"@angular/cli": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-9.1.0.tgz",
- "integrity": "sha512-ofum4gPE/W3fKyzuJrpdHeOS0ZL8x0eYCgsrMyUoFodSpb5LWPqeW+56NgDTpIeny+Trx3pM9dr9QTUVTJ0vYg==",
+ "version": "9.1.1",
+ "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-9.1.1.tgz",
+ "integrity": "sha512-sjRAV4UF8M5v+2gw+EwCYSgciBZDc05AbNxQt+uUdxdfR1QU9hifWq8WDxfOR6jdDP5YqMtQsNaFNwrUyjJJoQ==",
"dev": true,
"requires": {
- "@angular-devkit/architect": "0.901.0",
- "@angular-devkit/core": "9.1.0",
- "@angular-devkit/schematics": "9.1.0",
- "@schematics/angular": "9.1.0",
- "@schematics/update": "0.901.0",
+ "@angular-devkit/architect": "0.901.1",
+ "@angular-devkit/core": "9.1.1",
+ "@angular-devkit/schematics": "9.1.1",
+ "@schematics/angular": "9.1.1",
+ "@schematics/update": "0.901.1",
"@yarnpkg/lockfile": "1.1.0",
"ansi-colors": "4.1.1",
"debug": "4.1.1",
@@ -210,7 +218,7 @@
"npm-package-arg": "8.0.1",
"npm-pick-manifest": "6.0.0",
"open": "7.0.3",
- "pacote": "11.1.4",
+ "pacote": "9.5.12",
"read-package-tree": "5.3.1",
"rimraf": "3.0.2",
"semver": "7.1.3",
@@ -234,19 +242,19 @@
}
},
"@angular/common": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/@angular/common/-/common-9.1.0.tgz",
- "integrity": "sha512-6JPLNtMhI03bGTVQJeSwc+dTjV6DtP7M/BAyzIV0InZP1D6XsOh2QahLFIaaN2sSxYA2ClKuwfX1v+rx9AbXQA=="
+ "version": "9.1.1",
+ "resolved": "https://registry.npmjs.org/@angular/common/-/common-9.1.1.tgz",
+ "integrity": "sha512-bS13veMs7//YqYjYJ+JI78ylaCyVcdFKZKikd5SZa6+r6fajcyvLnSKqrKypG3O1BeJ8vOG/Pq54P5gWhbR6eA=="
},
"@angular/compiler": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.1.0.tgz",
- "integrity": "sha512-QHw/JSeTXHiJQ2Ih0EtU7FGsYcOr+0hwZhqwSW3EEn8TtUgA3DS5lXeiDV66f+3DdvNZFPmgiZIvun3ypxn1HA=="
+ "version": "9.1.1",
+ "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.1.1.tgz",
+ "integrity": "sha512-u1IP6IzUgK6lIzrG1cxp96umXgtThyhuFn/KPoyVt7wPxZ6vVR0ZxjM7zycEcrMGzk0nf0nyOKaksJk9sTXTbg=="
},
"@angular/compiler-cli": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-9.1.0.tgz",
- "integrity": "sha512-xZ8mVPmPporSTtvNA+cbFJQymLzuWfMX6HDDgztZ2eZ5WcQJYloRN4CcYMEzDhCxfV1Zw9Tfc2l14jZD8osi6g==",
+ "version": "9.1.1",
+ "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-9.1.1.tgz",
+ "integrity": "sha512-2jGp0ck2kkLNMzXUo/3iJkrQqJ7oGXE8h2tksxBsH2ptnhexRYTHZ626t7Np128tduY5JeC7J1Jxz7MUuYsJ2Q==",
"dev": true,
"requires": {
"canonical-path": "1.0.0",
@@ -337,9 +345,9 @@
}
},
"p-limit": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
- "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"dev": true,
"requires": {
"p-try": "^2.0.0"
@@ -447,35 +455,35 @@
}
},
"@angular/core": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.1.0.tgz",
- "integrity": "sha512-RVlyegdIAij0P1wLY5ObIdsBAzvmHkHfElnmfiNKhaDftP6U/3zRtaKDu0bq0jvn1WCQ8zXxFQ8AWyKZwyFS+w=="
+ "version": "9.1.1",
+ "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.1.1.tgz",
+ "integrity": "sha512-6lDlUlePafr/392hOvvTZZl6xPHT50U6658sHUAVIr0Un4mJ2MHNHKZtO45bpn3hM4gjFcYRQ7Rpd0umW74iTA=="
},
"@angular/forms": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-9.1.0.tgz",
- "integrity": "sha512-5GC8HQlPChPV+168zLlm4yj4syA6N9ChSKV0tmzj1zIfMcub1UAOaB9IYaXRHQsjPFh9OuQXwmkzScyAfhEVjA=="
+ "version": "9.1.1",
+ "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-9.1.1.tgz",
+ "integrity": "sha512-NX+LuK8JFisiq3uHCOK6YoN/yIb2R9Ye5mwiOPkuZA3lZLKCnUXqCHZbM8VHy/WdjIxxeUaFMJc38yV8RVoabg=="
},
"@angular/language-service": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-9.1.0.tgz",
- "integrity": "sha512-2f8ECoXrj40oS1rtIfi+F8T4WPzundcZDs8WMFNBuWYbk14v1S9sTgMEmZyePHGkPjt6IfYiLJKJCvVgrt1nxQ==",
+ "version": "9.1.1",
+ "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-9.1.1.tgz",
+ "integrity": "sha512-T+/0X2VnmgW/vzynqYTVv29qtebNvrCB/yJqtNIlqXvBjcB8XRRwZPDZvRyl5BiwEPSsJnjdRFNH9krQHxYp+g==",
"dev": true
},
"@angular/platform-browser": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.1.0.tgz",
- "integrity": "sha512-OsS/blUjl8ranmDaRADjFAmvnlmwbT6WNU7dVov7FhV0rqesbwaOJ5bR0LSYHYpej7Jaa6oYk0v0XWkaH9LTFg=="
+ "version": "9.1.1",
+ "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.1.1.tgz",
+ "integrity": "sha512-tjALKhdAWPErj0euIIdvx/31AHEZ7is7ADsMu+nYn2NY2gcPUuiqq3RCUJVxBYJ2Cclq1nlF0i2rEDKh7TrBKg=="
},
"@angular/platform-browser-dynamic": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.0.tgz",
- "integrity": "sha512-sMtz/poQ3TYaWZzWjrn9apKUZ/WKql2MYCWbpax7pql3GgC9OoTslc7ZEe7/d3ynfFE/CQqWBBOuWGD71Z0LMQ=="
+ "version": "9.1.1",
+ "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.1.tgz",
+ "integrity": "sha512-kEox5UOwkRLjGKXLh5o5SYopoAylpKgrXtRrKRKTCMmZTpYSe1bLlXMjpwMAMZ9ZFSTvWp9iX94aT5bJDpLrRQ=="
},
"@angular/router": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.0.tgz",
- "integrity": "sha512-cExO1nPnoPFiUJWZ28hTHozPLFoCmqr3xqcM57We0hhKE0esdrO+gRWKRH0EJERukLbU8coPKVhA8daGUpASiQ=="
+ "version": "9.1.1",
+ "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.1.tgz",
+ "integrity": "sha512-OQ5Ctd+swF7ZNlgUxrkGKk2B4yBFqJm0QCxkM86kFDCKQV/4OButZ+4HPy1HxeozBIAmm2pbQA+YjsAUs0VZcQ=="
},
"@babel/code-frame": {
"version": "7.8.3",
@@ -863,13 +871,14 @@
}
},
"@babel/plugin-proposal-object-rest-spread": {
- "version": "7.9.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz",
- "integrity": "sha512-UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow==",
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz",
+ "integrity": "sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==",
"dev": true,
"requires": {
"@babel/helper-plugin-utils": "^7.8.3",
- "@babel/plugin-syntax-object-rest-spread": "^7.8.0"
+ "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+ "@babel/plugin-transform-parameters": "^7.9.5"
}
},
"@babel/plugin-proposal-optional-catch-binding": {
@@ -1023,19 +1032,49 @@
}
},
"@babel/plugin-transform-classes": {
- "version": "7.9.2",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz",
- "integrity": "sha512-TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ==",
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz",
+ "integrity": "sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==",
"dev": true,
"requires": {
"@babel/helper-annotate-as-pure": "^7.8.3",
"@babel/helper-define-map": "^7.8.3",
- "@babel/helper-function-name": "^7.8.3",
+ "@babel/helper-function-name": "^7.9.5",
"@babel/helper-optimise-call-expression": "^7.8.3",
"@babel/helper-plugin-utils": "^7.8.3",
"@babel/helper-replace-supers": "^7.8.6",
"@babel/helper-split-export-declaration": "^7.8.3",
"globals": "^11.1.0"
+ },
+ "dependencies": {
+ "@babel/helper-function-name": {
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
+ "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-get-function-arity": "^7.8.3",
+ "@babel/template": "^7.8.3",
+ "@babel/types": "^7.9.5"
+ }
+ },
+ "@babel/helper-validator-identifier": {
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
+ "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==",
+ "dev": true
+ },
+ "@babel/types": {
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
+ "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.9.5",
+ "lodash": "^4.17.13",
+ "to-fast-properties": "^2.0.0"
+ }
+ }
}
},
"@babel/plugin-transform-computed-properties": {
@@ -1048,9 +1087,9 @@
}
},
"@babel/plugin-transform-destructuring": {
- "version": "7.8.8",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz",
- "integrity": "sha512-eRJu4Vs2rmttFCdhPUM3bV0Yo/xPSdPw6ML9KHs/bjB4bLA5HXlbvYXPOD5yASodGod+krjYx21xm1QmL8dCJQ==",
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz",
+ "integrity": "sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==",
"dev": true,
"requires": {
"@babel/helper-plugin-utils": "^7.8.3"
@@ -1196,9 +1235,9 @@
}
},
"@babel/plugin-transform-parameters": {
- "version": "7.9.3",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz",
- "integrity": "sha512-fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg==",
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz",
+ "integrity": "sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==",
"dev": true,
"requires": {
"@babel/helper-get-function-arity": "^7.8.3",
@@ -1473,12 +1512,12 @@
}
},
"@ngtools/webpack": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.1.0.tgz",
- "integrity": "sha512-kQ+1N/F+5tuUXiiaoqJwhcOIM0I93EEvF3xwpTLRm91wl2i8R1261LvsD/uQPrgLrZNGR6eFhFF1Izn2PnIjQA==",
+ "version": "9.1.1",
+ "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.1.1.tgz",
+ "integrity": "sha512-4RPlk6aIlYhk9isTvXbMaA2G0LhxOzcZ+2iG7zV9Yj/Vm8+lrRexpQ/kC/Dh0GI/oCtKIkVpUzx5LTozYeTLdQ==",
"dev": true,
"requires": {
- "@angular-devkit/core": "9.1.0",
+ "@angular-devkit/core": "9.1.1",
"enhanced-resolve": "4.1.1",
"rxjs": "6.5.4",
"webpack-sources": "1.4.3"
@@ -1495,87 +1534,28 @@
}
}
},
- "@npmcli/ci-detect": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/@npmcli/ci-detect/-/ci-detect-1.2.0.tgz",
- "integrity": "sha512-JtktVH7ASBVIWsQTFlFpeOzhBJskvoBCTfeeRhhZy7ybATcUvwiwotZ8j5rkqUUyB69lIy/AvboiiiGBjYBKBA==",
- "dev": true
- },
- "@npmcli/git": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-2.0.1.tgz",
- "integrity": "sha512-hVatexiBtx71F01Ars38Hr5AFUGmJgHAfQtRlO5fJlnAawRGSXwEFgjB5i3XdUUmElZU/RXy7fefN02dZKxgPw==",
- "dev": true,
- "requires": {
- "@npmcli/promise-spawn": "^1.1.0",
- "mkdirp": "^1.0.3",
- "npm-pick-manifest": "^6.0.0",
- "promise-inflight": "^1.0.1",
- "promise-retry": "^1.1.1",
- "unique-filename": "^1.1.1",
- "which": "^2.0.2"
- },
- "dependencies": {
- "mkdirp": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz",
- "integrity": "sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==",
- "dev": true
- },
- "which": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
- "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
- "dev": true,
- "requires": {
- "isexe": "^2.0.0"
- }
- }
- }
- },
- "@npmcli/installed-package-contents": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.5.tgz",
- "integrity": "sha512-aKIwguaaqb6ViwSOFytniGvLPb9SMCUm39TgM3SfUo7n0TxUMbwoXfpwyvQ4blm10lzbAwTsvjr7QZ85LvTi4A==",
- "dev": true,
- "requires": {
- "npm-bundled": "^1.1.1",
- "npm-normalize-package-bin": "^1.0.1",
- "read-package-json-fast": "^1.1.1",
- "readdir-scoped-modules": "^1.1.0"
- }
- },
- "@npmcli/promise-spawn": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.1.0.tgz",
- "integrity": "sha512-FwbuYN9KXBkloLeIR3xRgI8dyOdfK/KzaJlChszNuwmUXD1lHXfLlSeo4n4KrKt2udIK9K9/TzlnyCA3ubM2fA==",
- "dev": true,
- "requires": {
- "infer-owner": "^1.0.4"
- }
- },
"@schematics/angular": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.0.tgz",
- "integrity": "sha512-qkehaITQ1S1udfnnBY5CXGWnk1iVFI8cZayjLUlRfD5w+6v9if3VIuqPssX96MqvkbjyRu1N214+ieaawzLmuA==",
+ "version": "9.1.1",
+ "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.1.tgz",
+ "integrity": "sha512-V0DcDNgHQ2YR+PGZI6+pf/mUNNxt5SusShkZ1PbwIMk/HUQpzEGkLjm3v1Jw9eIZKiuDx615GNU1xDzQ/KyNRQ==",
"dev": true,
"requires": {
- "@angular-devkit/core": "9.1.0",
- "@angular-devkit/schematics": "9.1.0"
+ "@angular-devkit/core": "9.1.1",
+ "@angular-devkit/schematics": "9.1.1"
}
},
"@schematics/update": {
- "version": "0.901.0",
- "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.901.0.tgz",
- "integrity": "sha512-u2VESL1dgOSGZK/wcWEz0WcCU/yv764zhzCQerCwUtbV1CISSSDZ6x+prVYDXOdxWBGtDos2MbCF3GEJJI1T+w==",
+ "version": "0.901.1",
+ "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.901.1.tgz",
+ "integrity": "sha512-g5B8hjXKCbUNLKCkWQxc5r2D9lOQXRTLZJNIqva+l/ck0AML5MpelxkqQId9ZGLfQqfFk/XjdSHRWgcmUs1WnA==",
"dev": true,
"requires": {
- "@angular-devkit/core": "9.1.0",
- "@angular-devkit/schematics": "9.1.0",
+ "@angular-devkit/core": "9.1.1",
+ "@angular-devkit/schematics": "9.1.1",
"@yarnpkg/lockfile": "1.1.0",
"ini": "1.3.5",
"npm-package-arg": "^8.0.0",
- "pacote": "11.1.4",
+ "pacote": "9.5.12",
"rxjs": "6.5.4",
"semver": "7.1.3",
"semver-intersect": "1.4.0"
@@ -1592,12 +1572,6 @@
}
}
},
- "@tootallnate/once": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.0.0.tgz",
- "integrity": "sha512-KYyTT/T6ALPkIRd2Ge080X/BsXvy9O0hcWTtMWkPvwAwF99+vn6Dv4GzrFT/Nn1LePr+FFDbRXXlqmsy9lw2zA==",
- "dev": true
- },
"@types/color-name": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
@@ -1643,10 +1617,9 @@
"dev": true
},
"@types/node": {
- "version": "13.11.0",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-13.11.0.tgz",
- "integrity": "sha512-uM4mnmsIIPK/yeO+42F2RQhGUIs39K2RFmugcJANppXe6J1nvH87PvzPZYpza7Xhhs8Yn9yIAVdLZ84z61+0xQ==",
- "dev": true
+ "version": "13.11.1",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-13.11.1.tgz",
+ "integrity": "sha512-eWQGP3qtxwL8FGneRrC5DwrJLGN4/dH1clNTuLfN81HCrxVtxRjygDTUoZJ5ASlDEeo0ppYFQjQIlXhtXpOn6g=="
},
"@types/q": {
"version": "1.5.2",
@@ -1879,6 +1852,16 @@
"integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
"dev": true
},
+ "JSONStream": {
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+ "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+ "dev": true,
+ "requires": {
+ "jsonparse": "^1.2.0",
+ "through": ">=2.2.7 <3"
+ }
+ },
"accepts": {
"version": "1.3.7",
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
@@ -1908,22 +1891,20 @@
"dev": true
},
"agent-base": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz",
- "integrity": "sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==",
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+ "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
"dev": true,
"requires": {
- "debug": "4"
+ "es6-promisify": "^5.0.0"
}
},
"agentkeepalive": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.0.tgz",
- "integrity": "sha512-CW/n1wxF8RpEuuiq6Vbn9S8m0VSYDMnZESqaJ6F2cWN9fY8rei2qaxweIaRgq+ek8TqfoFIsUjaGNKGGEHElSg==",
+ "version": "3.5.2",
+ "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
+ "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
"dev": true,
"requires": {
- "debug": "^4.1.0",
- "depd": "^1.1.2",
"humanize-ms": "^1.2.1"
}
},
@@ -2683,28 +2664,6 @@
"isarray": "^1.0.0"
}
},
- "buffer-alloc": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
- "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
- "dev": true,
- "requires": {
- "buffer-alloc-unsafe": "^1.1.0",
- "buffer-fill": "^1.0.0"
- }
- },
- "buffer-alloc-unsafe": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
- "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
- "dev": true
- },
- "buffer-fill": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
- "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
- "dev": true
- },
"buffer-from": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
@@ -2778,9 +2737,9 @@
},
"dependencies": {
"mkdirp": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz",
- "integrity": "sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==",
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
"dev": true
},
"rimraf": {
@@ -2860,9 +2819,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001038",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001038.tgz",
- "integrity": "sha512-zii9quPo96XfOiRD4TrfYGs+QsGZpb2cGiMAzPjtf/hpFgB6zCPZgJb7I1+EATeMw/o+lG8FyRAnI+CWStHcaQ==",
+ "version": "1.0.30001040",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001040.tgz",
+ "integrity": "sha512-Ep0tEPeI5wCvmJNrXjE3etgfI+lkl1fTDU6Y3ZH1mhrjkPlVI9W4pcKbMo+BQLpEWKVYYp2EmYaRsqpPC3k7lQ==",
"dev": true
},
"canonical-path": {
@@ -2991,9 +2950,9 @@
}
},
"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==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.3.0.tgz",
+ "integrity": "sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==",
"dev": true
},
"cli-width": {
@@ -3141,9 +3100,9 @@
}
},
"colors": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
- "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+ "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
"dev": true
},
"combined-stream": {
@@ -3439,9 +3398,9 @@
}
},
"p-limit": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
- "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"dev": true,
"requires": {
"p-try": "^2.0.0"
@@ -3491,12 +3450,12 @@
"dev": true
},
"core-js-compat": {
- "version": "3.6.4",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.4.tgz",
- "integrity": "sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA==",
+ "version": "3.6.5",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
+ "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
"dev": true,
"requires": {
- "browserslist": "^4.8.3",
+ "browserslist": "^4.8.5",
"semver": "7.0.0"
},
"dependencies": {
@@ -3826,6 +3785,15 @@
}
}
},
+ "curray": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/curray/-/curray-1.0.7.tgz",
+ "integrity": "sha512-YBQwAEOdg0/wnmQu7XRzuOFkisEsbcrvc7T2HOUw1sZvreI6YmSDyJCpvyYvYizDtz2yCCnCt/ym29W22UIUOQ==",
+ "requires": {
+ "@types/node": "^13.7.0",
+ "tslib": "^1.10.0"
+ }
+ },
"custom-event": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
@@ -4236,9 +4204,9 @@
"dev": true
},
"electron-to-chromium": {
- "version": "1.3.391",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.391.tgz",
- "integrity": "sha512-WOi6loSnDmfICOqGRrgeK7bZeWDAbGjCptDhI5eyJAqSzWfoeRuOOU1rOTZRL29/9AaxTndZB6Uh8YrxRfZJqw==",
+ "version": "1.3.402",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.402.tgz",
+ "integrity": "sha512-gaCDfX7IUH0s3JmBiHCDPrvVcdnTTP1r4WLJc2dHkYYbLmXZ2XHiJCcGQ9Balf91aKTvuCKCyu2JjJYRykoI1w==",
"dev": true
},
"elliptic": {
@@ -4279,7 +4247,6 @@
"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
"integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
"dev": true,
- "optional": true,
"requires": {
"iconv-lite": "~0.4.13"
}
@@ -4980,9 +4947,9 @@
}
},
"p-limit": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
- "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"dev": true,
"requires": {
"p-try": "^2.0.0"
@@ -5176,6 +5143,12 @@
"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
"dev": true
},
+ "genfun": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
+ "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
+ "dev": true
+ },
"gensync": {
"version": "1.0.0-beta.1",
"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
@@ -5497,9 +5470,9 @@
"dev": true
},
"http-cache-semantics": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
- "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
+ "version": "3.8.1",
+ "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
+ "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
"dev": true
},
"http-deceiver": {
@@ -5547,14 +5520,30 @@
}
},
"http-proxy-agent": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
- "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
+ "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
"dev": true,
"requires": {
- "@tootallnate/once": "1",
- "agent-base": "6",
- "debug": "4"
+ "agent-base": "4",
+ "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==",
+ "dev": true,
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+ "dev": true
+ }
}
},
"http-proxy-middleware": {
@@ -5587,13 +5576,24 @@
"dev": true
},
"https-proxy-agent": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
- "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+ "version": "2.2.4",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+ "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
"dev": true,
"requires": {
- "agent-base": "6",
- "debug": "4"
+ "agent-base": "^4.3.0",
+ "debug": "^3.1.0"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+ "dev": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ }
}
},
"humanize-ms": {
@@ -6055,12 +6055,6 @@
"integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
"dev": true
},
- "is-lambda": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
- "integrity": "sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=",
- "dev": true
- },
"is-number": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -6182,13 +6176,10 @@
"dev": true
},
"isbinaryfile": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
- "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
- "dev": true,
- "requires": {
- "buffer-alloc": "^1.2.0"
- }
+ "version": "4.0.6",
+ "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.6.tgz",
+ "integrity": "sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==",
+ "dev": true
},
"isexe": {
"version": "2.0.0",
@@ -6478,12 +6469,6 @@
"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
"dev": true
},
- "json-parse-even-better-errors": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.2.0.tgz",
- "integrity": "sha512-2tLgY7LRNZ9Hd6gmCuBG5/OjRHQpSgJQqJoYyLLOhUgn8LdOYrjaZLcxkWnDads+AD/haWWioPNziXQcgvQJ/g==",
- "dev": true
- },
"json-schema": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -6509,9 +6494,9 @@
"dev": true
},
"json5": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz",
- "integrity": "sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==",
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
+ "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
"dev": true,
"requires": {
"minimist": "^1.2.5"
@@ -6557,12 +6542,11 @@
}
},
"karma": {
- "version": "4.4.1",
- "resolved": "https://registry.npmjs.org/karma/-/karma-4.4.1.tgz",
- "integrity": "sha512-L5SIaXEYqzrh6b1wqYC42tNsFMx2PWuxky84pK9coK09MvmL7mxii3G3bZBh/0rvD27lqDd0le9jyhzvwif73A==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/karma/-/karma-5.0.1.tgz",
+ "integrity": "sha512-xrDGtZ0mykEQjx1BUHOP1ITi39MDsCGocmSvLJWHxUQpxuKwxk3ZUrC6HI2VWh1plLC6+7cA3B19m12yzO/FRw==",
"dev": true,
"requires": {
- "bluebird": "^3.3.0",
"body-parser": "^1.16.1",
"braces": "^3.0.2",
"chokidar": "^3.0.0",
@@ -6574,28 +6558,136 @@
"glob": "^7.1.1",
"graceful-fs": "^4.1.2",
"http-proxy": "^1.13.0",
- "isbinaryfile": "^3.0.0",
+ "isbinaryfile": "^4.0.2",
"lodash": "^4.17.14",
"log4js": "^4.0.0",
"mime": "^2.3.1",
"minimatch": "^3.0.2",
- "optimist": "^0.6.1",
"qjobs": "^1.1.4",
"range-parser": "^1.2.0",
"rimraf": "^2.6.0",
- "safe-buffer": "^5.0.1",
"socket.io": "2.1.1",
"source-map": "^0.6.1",
"tmp": "0.0.33",
- "useragent": "2.3.0"
+ "ua-parser-js": "0.7.21",
+ "yargs": "^15.3.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==",
+ "dev": true
+ },
+ "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"
+ }
+ },
+ "cliui": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+ "dev": true,
+ "requires": {
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.0",
+ "wrap-ansi": "^6.2.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"
+ }
+ },
+ "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
+ },
+ "find-up": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+ "dev": true,
+ "requires": {
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.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": "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
+ },
+ "locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+ "dev": true,
+ "requires": {
+ "p-locate": "^4.1.0"
+ }
+ },
"mime": {
"version": "2.4.4",
"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
"integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
"dev": true
},
+ "p-limit": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+ "dev": true,
+ "requires": {
+ "p-try": "^2.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+ "dev": true,
+ "requires": {
+ "p-limit": "^2.2.0"
+ }
+ },
+ "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==",
+ "dev": true
+ },
+ "path-exists": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+ "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
+ },
"rimraf": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -6610,6 +6702,66 @@
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"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"
+ }
+ },
+ "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"
+ }
+ },
+ "wrap-ansi": {
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+ "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
+ }
+ },
+ "yargs": {
+ "version": "15.3.1",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
+ "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
+ "dev": true,
+ "requires": {
+ "cliui": "^6.0.0",
+ "decamelize": "^1.2.0",
+ "find-up": "^4.1.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": "^4.2.0",
+ "which-module": "^2.0.0",
+ "y18n": "^4.0.0",
+ "yargs-parser": "^18.1.1"
+ }
+ },
+ "yargs-parser": {
+ "version": "18.1.2",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz",
+ "integrity": "sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==",
+ "dev": true,
+ "requires": {
+ "camelcase": "^5.0.0",
+ "decamelize": "^1.2.0"
+ }
}
}
},
@@ -6910,26 +7062,65 @@
"dev": true
},
"make-fetch-happen": {
- "version": "8.0.4",
- "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.4.tgz",
- "integrity": "sha512-hIFoqGq1db0QMiy/Atr/pI1Rs4rDV+ZdGSey2SQyF3KK3u1z4aj9mS5UdNnZkdQpA+H3pGn0J3KlEwsi2x4EqA==",
+ "version": "5.0.2",
+ "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz",
+ "integrity": "sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==",
"dev": true,
"requires": {
- "agentkeepalive": "^4.1.0",
- "cacache": "^15.0.0",
- "http-cache-semantics": "^4.0.4",
- "http-proxy-agent": "^4.0.1",
- "https-proxy-agent": "^5.0.0",
- "is-lambda": "^1.0.1",
+ "agentkeepalive": "^3.4.1",
+ "cacache": "^12.0.0",
+ "http-cache-semantics": "^3.8.1",
+ "http-proxy-agent": "^2.1.0",
+ "https-proxy-agent": "^2.2.3",
"lru-cache": "^5.1.1",
- "minipass": "^3.0.0",
- "minipass-collect": "^1.0.2",
- "minipass-fetch": "^1.1.2",
- "minipass-flush": "^1.0.5",
- "minipass-pipeline": "^1.2.2",
+ "mississippi": "^3.0.0",
+ "node-fetch-npm": "^2.0.2",
"promise-retry": "^1.1.1",
- "socks-proxy-agent": "^5.0.0",
- "ssri": "^8.0.0"
+ "socks-proxy-agent": "^4.0.0",
+ "ssri": "^6.0.0"
+ },
+ "dependencies": {
+ "cacache": {
+ "version": "12.0.4",
+ "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+ "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+ "dev": true,
+ "requires": {
+ "bluebird": "^3.5.5",
+ "chownr": "^1.1.1",
+ "figgy-pudding": "^3.5.1",
+ "glob": "^7.1.4",
+ "graceful-fs": "^4.1.15",
+ "infer-owner": "^1.0.3",
+ "lru-cache": "^5.1.1",
+ "mississippi": "^3.0.0",
+ "mkdirp": "^0.5.1",
+ "move-concurrently": "^1.0.1",
+ "promise-inflight": "^1.0.1",
+ "rimraf": "^2.6.3",
+ "ssri": "^6.0.1",
+ "unique-filename": "^1.1.1",
+ "y18n": "^4.0.0"
+ }
+ },
+ "rimraf": {
+ "version": "2.7.1",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+ "dev": true,
+ "requires": {
+ "glob": "^7.1.3"
+ }
+ },
+ "ssri": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+ "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+ "dev": true,
+ "requires": {
+ "figgy-pudding": "^3.5.1"
+ }
+ }
}
},
"mamacro": {
@@ -7285,19 +7476,6 @@
"minipass": "^3.0.0"
}
},
- "minipass-fetch": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.2.1.tgz",
- "integrity": "sha512-ssHt0dkljEDaKmTgQ04DQgx2ag6G2gMPxA5hpcsoeTbfDgRf2fC2gNSRc6kISjD7ckCpHwwQvXxuTBK8402fXg==",
- "dev": true,
- "requires": {
- "encoding": "^0.1.12",
- "minipass": "^3.1.0",
- "minipass-pipeline": "^1.2.2",
- "minipass-sized": "^1.0.3",
- "minizlib": "^2.0.0"
- }
- },
"minipass-flush": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
@@ -7307,16 +7485,6 @@
"minipass": "^3.0.0"
}
},
- "minipass-json-stream": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz",
- "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==",
- "dev": true,
- "requires": {
- "jsonparse": "^1.3.1",
- "minipass": "^3.0.0"
- }
- },
"minipass-pipeline": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz",
@@ -7326,15 +7494,6 @@
"minipass": "^3.0.0"
}
},
- "minipass-sized": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
- "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
- "dev": true,
- "requires": {
- "minipass": "^3.0.0"
- }
- },
"minizlib": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz",
@@ -7491,6 +7650,17 @@
"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
"dev": true
},
+ "node-fetch-npm": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz",
+ "integrity": "sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==",
+ "dev": true,
+ "requires": {
+ "encoding": "^0.1.11",
+ "json-parse-better-errors": "^1.0.0",
+ "safe-buffer": "^5.1.1"
+ }
+ },
"node-forge": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
@@ -7622,14 +7792,13 @@
}
},
"npm-packlist": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.1.1.tgz",
- "integrity": "sha512-95TSDvGwujIhqfSpIiRRLodEF+y6mJMopuZdahoGzqtRDFZXGav46S0p6ngeWaiAkb5R72w6eVARhzej0HvZeQ==",
+ "version": "1.4.8",
+ "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
+ "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
"dev": true,
"requires": {
- "glob": "^7.1.6",
- "ignore-walk": "^3.0.3",
- "npm-bundled": "^1.1.1",
+ "ignore-walk": "^3.0.1",
+ "npm-bundled": "^1.0.1",
"npm-normalize-package-bin": "^1.0.1"
}
},
@@ -7645,19 +7814,50 @@
}
},
"npm-registry-fetch": {
- "version": "8.0.0",
- "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.0.0.tgz",
- "integrity": "sha512-975WwLvZjX97y9UWWQ8nAyr7bw02s9xKPHqvEm5T900LQsB1HXb8Gb9ebYtCBLSX+K8gSOrO5KS/9yV/naLZmQ==",
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.3.tgz",
+ "integrity": "sha512-WGvUx0lkKFhu9MbiGFuT9nG2NpfQ+4dCJwRwwtK2HK5izJEvwDxMeUyqbuMS7N/OkpVCqDorV6rO5E4V9F8lJw==",
"dev": true,
"requires": {
- "@npmcli/ci-detect": "^1.0.0",
+ "JSONStream": "^1.3.4",
+ "bluebird": "^3.5.1",
+ "figgy-pudding": "^3.4.1",
"lru-cache": "^5.1.1",
- "make-fetch-happen": "^8.0.2",
- "minipass": "^3.0.0",
- "minipass-fetch": "^1.1.2",
- "minipass-json-stream": "^1.0.1",
- "minizlib": "^2.0.0",
- "npm-package-arg": "^8.0.0"
+ "make-fetch-happen": "^5.0.0",
+ "npm-package-arg": "^6.1.0",
+ "safe-buffer": "^5.2.0"
+ },
+ "dependencies": {
+ "hosted-git-info": {
+ "version": "2.8.8",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+ "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+ "dev": true
+ },
+ "npm-package-arg": {
+ "version": "6.1.1",
+ "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
+ "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+ "dev": true,
+ "requires": {
+ "hosted-git-info": "^2.7.1",
+ "osenv": "^0.1.5",
+ "semver": "^5.6.0",
+ "validate-npm-package-name": "^3.0.0"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+ "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
+ "dev": true
+ },
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ }
}
},
"npm-run-path": {
@@ -7991,6 +8191,12 @@
"integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
"dev": true
},
+ "os-homedir": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+ "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+ "dev": true
+ },
"os-locale": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
@@ -8008,6 +8214,16 @@
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
"dev": true
},
+ "osenv": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+ "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+ "dev": true,
+ "requires": {
+ "os-homedir": "^1.0.0",
+ "os-tmpdir": "^1.0.0"
+ }
+ },
"p-defer": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
@@ -8069,42 +8285,123 @@
"dev": true
},
"pacote": {
- "version": "11.1.4",
- "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.1.4.tgz",
- "integrity": "sha512-eUGJvSSpWFZKn3z8gig/HgnBmUl6gIWByIIaHzSyEr3tOWX0w8tFEADXtpu8HGv5E0ShCeTP6enRq8iHKCHSvw==",
+ "version": "9.5.12",
+ "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.12.tgz",
+ "integrity": "sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ==",
"dev": true,
"requires": {
- "@npmcli/git": "^2.0.1",
- "@npmcli/installed-package-contents": "^1.0.5",
- "@npmcli/promise-spawn": "^1.1.0",
- "cacache": "^15.0.0",
- "chownr": "^1.1.4",
- "fs-minipass": "^2.1.0",
+ "bluebird": "^3.5.3",
+ "cacache": "^12.0.2",
+ "chownr": "^1.1.2",
+ "figgy-pudding": "^3.5.1",
+ "get-stream": "^4.1.0",
+ "glob": "^7.1.3",
"infer-owner": "^1.0.4",
"lru-cache": "^5.1.1",
- "minipass": "^3.0.1",
- "minipass-fetch": "^1.2.1",
- "mkdirp": "^1.0.3",
- "npm-package-arg": "^8.0.1",
- "npm-packlist": "^2.1.0",
- "npm-pick-manifest": "^6.0.0",
- "npm-registry-fetch": "^8.0.0",
+ "make-fetch-happen": "^5.0.0",
+ "minimatch": "^3.0.4",
+ "minipass": "^2.3.5",
+ "mississippi": "^3.0.0",
+ "mkdirp": "^0.5.1",
+ "normalize-package-data": "^2.4.0",
+ "npm-normalize-package-bin": "^1.0.0",
+ "npm-package-arg": "^6.1.0",
+ "npm-packlist": "^1.1.12",
+ "npm-pick-manifest": "^3.0.0",
+ "npm-registry-fetch": "^4.0.0",
+ "osenv": "^0.1.5",
"promise-inflight": "^1.0.1",
"promise-retry": "^1.1.1",
- "read-package-json-fast": "^1.1.3",
- "rimraf": "^2.7.1",
- "semver": "^7.1.3",
- "ssri": "^8.0.0",
- "tar": "^6.0.1",
- "which": "^2.0.2"
+ "protoduck": "^5.0.1",
+ "rimraf": "^2.6.2",
+ "safe-buffer": "^5.1.2",
+ "semver": "^5.6.0",
+ "ssri": "^6.0.1",
+ "tar": "^4.4.10",
+ "unique-filename": "^1.1.1",
+ "which": "^1.3.1"
},
"dependencies": {
- "mkdirp": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz",
- "integrity": "sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==",
+ "cacache": {
+ "version": "12.0.4",
+ "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+ "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+ "dev": true,
+ "requires": {
+ "bluebird": "^3.5.5",
+ "chownr": "^1.1.1",
+ "figgy-pudding": "^3.5.1",
+ "glob": "^7.1.4",
+ "graceful-fs": "^4.1.15",
+ "infer-owner": "^1.0.3",
+ "lru-cache": "^5.1.1",
+ "mississippi": "^3.0.0",
+ "mkdirp": "^0.5.1",
+ "move-concurrently": "^1.0.1",
+ "promise-inflight": "^1.0.1",
+ "rimraf": "^2.6.3",
+ "ssri": "^6.0.1",
+ "unique-filename": "^1.1.1",
+ "y18n": "^4.0.0"
+ }
+ },
+ "fs-minipass": {
+ "version": "1.2.7",
+ "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+ "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+ "dev": true,
+ "requires": {
+ "minipass": "^2.6.0"
+ }
+ },
+ "hosted-git-info": {
+ "version": "2.8.8",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+ "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
"dev": true
},
+ "minipass": {
+ "version": "2.9.0",
+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+ "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "^5.1.2",
+ "yallist": "^3.0.0"
+ }
+ },
+ "minizlib": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+ "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+ "dev": true,
+ "requires": {
+ "minipass": "^2.9.0"
+ }
+ },
+ "npm-package-arg": {
+ "version": "6.1.1",
+ "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
+ "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+ "dev": true,
+ "requires": {
+ "hosted-git-info": "^2.7.1",
+ "osenv": "^0.1.5",
+ "semver": "^5.6.0",
+ "validate-npm-package-name": "^3.0.0"
+ }
+ },
+ "npm-pick-manifest": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz",
+ "integrity": "sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==",
+ "dev": true,
+ "requires": {
+ "figgy-pudding": "^3.5.1",
+ "npm-package-arg": "^6.0.0",
+ "semver": "^5.4.1"
+ }
+ },
"rimraf": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -8114,14 +8411,41 @@
"glob": "^7.1.3"
}
},
- "which": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
- "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ },
+ "ssri": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+ "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
"dev": true,
"requires": {
- "isexe": "^2.0.0"
+ "figgy-pudding": "^3.5.1"
}
+ },
+ "tar": {
+ "version": "4.4.13",
+ "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
+ "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+ "dev": true,
+ "requires": {
+ "chownr": "^1.1.1",
+ "fs-minipass": "^1.2.5",
+ "minipass": "^2.8.6",
+ "minizlib": "^1.2.1",
+ "mkdirp": "^0.5.0",
+ "safe-buffer": "^5.1.2",
+ "yallist": "^3.0.3"
+ }
+ },
+ "yallist": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+ "dev": true
}
}
},
@@ -8342,9 +8666,9 @@
}
},
"p-limit": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
- "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"dev": true,
"requires": {
"p-try": "^2.0.0"
@@ -9045,6 +9369,15 @@
}
}
},
+ "protoduck": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz",
+ "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==",
+ "dev": true,
+ "requires": {
+ "genfun": "^5.0.0"
+ }
+ },
"protractor": {
"version": "5.4.3",
"resolved": "https://registry.npmjs.org/protractor/-/protractor-5.4.3.tgz",
@@ -9231,12 +9564,6 @@
"integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
"dev": true
},
- "pseudomap": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
- "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
- "dev": true
- },
"psl": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
@@ -9449,16 +9776,6 @@
"npm-normalize-package-bin": "^1.0.0"
}
},
- "read-package-json-fast": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-1.1.3.tgz",
- "integrity": "sha512-MmFqiyfCXV2Dmm4jH24DEGhxdkUDFivJQj4oPZQPOKywxR7HWBE6WnMWDAapfFHi3wm1b+mhR+XHlUH0CL8axg==",
- "dev": true,
- "requires": {
- "json-parse-even-better-errors": "^2.0.1",
- "npm-normalize-package-bin": "^1.0.1"
- }
- },
"read-package-tree": {
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz",
@@ -10542,14 +10859,24 @@
}
},
"socks-proxy-agent": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
- "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
+ "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
"dev": true,
"requires": {
- "agent-base": "6",
- "debug": "4",
- "socks": "^2.3.3"
+ "agent-base": "~4.2.1",
+ "socks": "~2.3.2"
+ },
+ "dependencies": {
+ "agent-base": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
+ "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+ "dev": true,
+ "requires": {
+ "es6-promisify": "^5.0.0"
+ }
+ }
}
},
"sort-keys": {
@@ -10681,9 +11008,9 @@
"dev": true
},
"spdy": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz",
- "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==",
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+ "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
"dev": true,
"requires": {
"debug": "^4.1.0",
@@ -10911,9 +11238,9 @@
}
},
"string.prototype.trimend": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz",
- "integrity": "sha512-EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA==",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
+ "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
"dev": true,
"requires": {
"define-properties": "^1.1.3",
@@ -10943,9 +11270,9 @@
}
},
"string.prototype.trimstart": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz",
- "integrity": "sha512-iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w==",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
+ "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
"dev": true,
"requires": {
"define-properties": "^1.1.3",
@@ -11167,17 +11494,17 @@
},
"dependencies": {
"mkdirp": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz",
- "integrity": "sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==",
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
"dev": true
}
}
},
"terser": {
- "version": "4.6.7",
- "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.7.tgz",
- "integrity": "sha512-fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g==",
+ "version": "4.6.10",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.10.tgz",
+ "integrity": "sha512-qbF/3UOo11Hggsbsqm2hPa6+L4w7bkr+09FNseEe8xrcVD3APGLFqE+Oz1ZKAxjYnFsj80rLOfgAtJ0LNJjtTA==",
"dev": true,
"requires": {
"commander": "^2.20.0",
@@ -11237,9 +11564,9 @@
}
},
"p-limit": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
- "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"dev": true,
"requires": {
"p-try": "^2.0.0"
@@ -11510,6 +11837,12 @@
"integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==",
"dev": true
},
+ "ua-parser-js": {
+ "version": "0.7.21",
+ "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz",
+ "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==",
+ "dev": true
+ },
"ultron": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
@@ -11721,34 +12054,6 @@
"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
"dev": true
},
- "useragent": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
- "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
- "dev": true,
- "requires": {
- "lru-cache": "4.1.x",
- "tmp": "0.0.x"
- },
- "dependencies": {
- "lru-cache": {
- "version": "4.1.5",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
- "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
- "dev": true,
- "requires": {
- "pseudomap": "^1.0.2",
- "yallist": "^2.1.2"
- }
- },
- "yallist": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
- "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
- "dev": true
- }
- }
- },
"util": {
"version": "0.11.1",
"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
@@ -13784,9 +14089,9 @@
}
},
"p-limit": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
- "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"dev": true,
"requires": {
"p-try": "^2.0.0"
diff --git a/client/package.json b/client/package.json
index f966442..585c167 100644
--- a/client/package.json
+++ b/client/package.json
@@ -11,33 +11,34 @@
},
"private": true,
"dependencies": {
- "@angular/animations": "~9.1.0",
- "@angular/common": "~9.1.0",
- "@angular/compiler": "~9.1.0",
- "@angular/core": "~9.1.0",
- "@angular/forms": "~9.1.0",
- "@angular/platform-browser": "~9.1.0",
- "@angular/platform-browser-dynamic": "~9.1.0",
- "@angular/router": "~9.1.0",
+ "@angular/animations": "~9.1.1",
+ "@angular/common": "~9.1.1",
+ "@angular/compiler": "~9.1.1",
+ "@angular/core": "~9.1.1",
+ "@angular/forms": "~9.1.1",
+ "@angular/platform-browser": "~9.1.1",
+ "@angular/platform-browser-dynamic": "~9.1.1",
+ "@angular/router": "~9.1.1",
"@fortawesome/fontawesome-free": "^5.13.0",
"bulma": "^0.8.1",
+ "curray": "^1.0.7",
"ngx-filesize": "^2.0.13",
"rxjs": "~6.5.5",
"tslib": "^1.11.1",
"zone.js": "~0.10.3"
},
"devDependencies": {
- "@angular-devkit/build-angular": "~0.901.0",
- "@angular/cli": "~9.1.0",
- "@angular/compiler-cli": "~9.1.0",
- "@angular/language-service": "~9.1.0",
- "@types/node": "^13.11.0",
+ "@angular-devkit/build-angular": "~0.901.1",
+ "@angular/cli": "~9.1.1",
+ "@angular/compiler-cli": "~9.1.1",
+ "@angular/language-service": "~9.1.1",
+ "@types/node": "^13.11.1",
"@types/jasmine": "~3.5.10",
"@types/jasminewd2": "~2.0.8",
"codelyzer": "^5.2.2",
"jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~5.0.1",
- "karma": "~4.4.1",
+ "karma": "~5.0.1",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~2.1.1",
"karma-jasmine": "~3.1.1",
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 02839f2..6390cb1 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -17,6 +17,9 @@ import { TorrentStatusPipe } from './torrent-status.pipe';
import { FileStatusPipe } from './file-status.pipe';
import { LoginComponent } from './login/login.component';
import { AuthInterceptor } from './auth.interceptor';
+import { curray } from 'curray';
+
+curray();
@NgModule({
declarations: [
diff --git a/client/src/app/file-status.pipe.ts b/client/src/app/file-status.pipe.ts
index f81a746..16888d4 100644
--- a/client/src/app/file-status.pipe.ts
+++ b/client/src/app/file-status.pipe.ts
@@ -15,7 +15,11 @@ export class FileStatusPipe implements PipeTransform {
}
if (value.download.status === DownloadStatus.Downloading) {
- return `${value.download.progress}%`;
+ const progress = (
+ (value.download.bytesDownloaded / value.download.bytesSize) *
+ 100
+ ).toFixed(2);
+ return `${progress || 0}%`;
}
if (value.download.status === DownloadStatus.Finished) {
diff --git a/client/src/app/models/download.model.ts b/client/src/app/models/download.model.ts
index 284ac5d..8bfcca3 100644
--- a/client/src/app/models/download.model.ts
+++ b/client/src/app/models/download.model.ts
@@ -9,13 +9,16 @@ export class Download {
public status: DownloadStatus;
- public progress: number;
+ public bytesDownloaded: number;
+
+ public bytesSize: number;
public speed: number;
}
export enum DownloadStatus {
PendingDownload = 0,
- Downloading,
- Finished,
+ Downloading = 1,
+ Unpacking = 2,
+ Finished = 3,
}
diff --git a/client/src/app/models/torrent.model.ts b/client/src/app/models/torrent.model.ts
index 50d7ff4..d065b29 100644
--- a/client/src/app/models/torrent.model.ts
+++ b/client/src/app/models/torrent.model.ts
@@ -19,7 +19,6 @@ export class Torrent {
files: TorrentFile[];
downloads: Download[];
- activeDownload: Download;
}
export class TorrentFile {
@@ -33,9 +32,10 @@ export class TorrentFile {
export enum TorrentStatus {
RealDebrid = 0,
- WaitingForDownload,
- Downloading,
- Finished,
+ WaitingForDownload = 1,
+ DownloadQueued = 2,
+ Downloading = 3,
+ Finished = 4,
Error = 99,
}
diff --git a/client/src/app/torrent-row/torrent-row.component.html b/client/src/app/torrent-row/torrent-row.component.html
index 25a8523..07ceed8 100644
--- a/client/src/app/torrent-row/torrent-row.component.html
+++ b/client/src/app/torrent-row/torrent-row.component.html
@@ -24,4 +24,7 @@
>
+
+
+
diff --git a/client/src/app/torrent-status.pipe.ts b/client/src/app/torrent-status.pipe.ts
index dfe4c9e..b98fd81 100644
--- a/client/src/app/torrent-status.pipe.ts
+++ b/client/src/app/torrent-status.pipe.ts
@@ -1,6 +1,7 @@
import { Pipe, PipeTransform } from '@angular/core';
import { Torrent, TorrentStatus } from './models/torrent.model';
import { FileSizePipe } from 'ngx-filesize';
+import { DownloadStatus } from './models/download.model';
@Pipe({
name: 'status',
@@ -9,23 +10,59 @@ export class TorrentStatusPipe implements PipeTransform {
constructor(private pipe: FileSizePipe) {}
transform(torrent: Torrent): string {
- switch (torrent.status) {
- case TorrentStatus.RealDebrid: {
- const speed = this.pipe.transform(torrent.rdSpeed, 'filesize');
- return `Downloading from RD (${torrent.rdProgress}% - ${speed}/s)`;
+ if (torrent.downloads && torrent.downloads.length > 0) {
+ const allFinished = torrent.downloads.all(
+ (m) => m.status === DownloadStatus.Finished
+ );
+ if (allFinished) {
+ return 'Finished';
}
+
+ const downloading = torrent.downloads.where(
+ (m) => m.status === DownloadStatus.Downloading
+ );
+ const unpacking = torrent.downloads.where(
+ (m) => m.status === DownloadStatus.Unpacking
+ );
+
+ if (downloading.length > 0) {
+ const allBytesDownloaded = torrent.downloads.sum(
+ (m) => m.bytesDownloaded
+ );
+ const allBytesSize = torrent.downloads.sum((m) => m.bytesSize);
+
+ if (allBytesSize > 0) {
+ const progress = ((allBytesDownloaded / allBytesSize) * 100).toFixed(
+ 2
+ );
+
+ const allSpeeds =
+ downloading.sum((m) => m.speed) / downloading.length;
+ const speed = this.pipe.transform(allSpeeds, 'filesize');
+
+ return `Downloading (${progress || 0}% - ${speed}/s)`;
+ }
+
+ return `Preparing download`;
+ }
+
+ if (unpacking.length > 0) {
+ return `Unpacking`;
+ }
+
+ return 'Pending download';
+ }
+
+ switch (torrent.status) {
+ case TorrentStatus.RealDebrid:
+ const speed = this.pipe.transform(torrent.rdSpeed, 'filesize');
+ return `Torrent downloading (${torrent.rdProgress}% - ${speed}/s)`;
case TorrentStatus.WaitingForDownload:
return `Waiting to download`;
- case TorrentStatus.Downloading: {
- if (torrent.activeDownload != null) {
- const speed = this.pipe.transform(
- torrent.activeDownload.speed,
- 'filesize'
- );
- return `Downloading (${torrent.activeDownload.progress}% - ${speed}/s)`;
- }
+ case TorrentStatus.DownloadQueued:
+ return `Download queued`;
+ case TorrentStatus.Downloading:
return `Downloading`;
- }
case TorrentStatus.Finished:
return `Finished`;
case TorrentStatus.Error:
diff --git a/client/src/app/torrent-table/torrent-table.component.html b/client/src/app/torrent-table/torrent-table.component.html
index 211eb04..be60154 100644
--- a/client/src/app/torrent-table/torrent-table.component.html
+++ b/client/src/app/torrent-table/torrent-table.component.html
@@ -1,3 +1,7 @@
+
+ An error has occured: {{ error }}
+ Please refresh the screen after fixing this error.
+
diff --git a/client/src/app/torrent-table/torrent-table.component.ts b/client/src/app/torrent-table/torrent-table.component.ts
index 85eac99..239e949 100644
--- a/client/src/app/torrent-table/torrent-table.component.ts
+++ b/client/src/app/torrent-table/torrent-table.component.ts
@@ -16,7 +16,7 @@ import { DownloadStatus } from '../models/download.model';
})
export class TorrentTableComponent implements OnInit, OnDestroy {
public torrents: Torrent[] = [];
-
+ public error: string;
public showFiles: { [key: string]: boolean } = {};
private timer: any;
@@ -25,18 +25,15 @@ export class TorrentTableComponent implements OnInit, OnDestroy {
ngOnInit(): void {
this.timer = setInterval(() => {
- this.torrentService.getList().subscribe((result) => {
- this.torrents = result;
-
- this.torrents.forEach((torrent) => {
- const activeDownloads = torrent.downloads.filter(
- (m) => m.status === DownloadStatus.Downloading
- );
- if (activeDownloads.length > 0) {
- torrent.activeDownload = activeDownloads[0];
- }
- });
- });
+ this.torrentService.getList().subscribe(
+ (result) => {
+ this.torrents = result;
+ },
+ (err) => {
+ this.error = err.error;
+ clearInterval(this.timer);
+ }
+ );
}, 1000);
}
diff --git a/client/tslint.json b/client/tslint.json
index d92ff5d..41c5486 100644
--- a/client/tslint.json
+++ b/client/tslint.json
@@ -2,10 +2,7 @@
"extends": "tslint:recommended",
"rules": {
"align": {
- "options": [
- "parameters",
- "statements"
- ]
+ "options": ["parameters", "statements"]
},
"array-type": false,
"arrow-return-shorthand": true,
@@ -16,34 +13,16 @@
"component-class-suffix": true,
"contextual-lifecycle": true,
"directive-class-suffix": true,
- "directive-selector": [
- true,
- "attribute",
- "app",
- "camelCase"
- ],
- "component-selector": [
- true,
- "element",
- "app",
- "kebab-case"
- ],
+ "directive-selector": [true, "attribute", "app", "camelCase"],
+ "component-selector": [true, "element", "app", "kebab-case"],
"eofline": true,
- "import-blacklist": [
- true,
- "rxjs/Rx"
- ],
+ "import-blacklist": [true, "rxjs/Rx"],
"import-spacing": true,
"indent": {
- "options": [
- "spaces"
- ]
+ "options": ["spaces"]
},
"max-classes-per-file": false,
- "max-line-length": [
- true,
- 140
- ],
+ "max-line-length": [true, 140],
"member-ordering": [
true,
{
@@ -55,35 +34,17 @@
]
}
],
- "no-console": [
- true,
- "debug",
- "info",
- "time",
- "timeEnd",
- "trace"
- ],
+ "no-console": [true, "debug", "info", "time", "timeEnd", "trace"],
"no-empty": false,
- "no-inferrable-types": [
- true,
- "ignore-params"
- ],
+ "no-inferrable-types": [true, "ignore-params"],
"no-non-null-assertion": true,
"no-redundant-jsdoc": true,
"no-switch-case-fall-through": true,
"no-var-requires": false,
- "object-literal-key-quotes": [
- true,
- "as-needed"
- ],
- "quotemark": [
- true,
- "single"
- ],
+ "object-literal-key-quotes": [true, "as-needed"],
+ "quotemark": [true, "single"],
"semicolon": {
- "options": [
- "always"
- ]
+ "options": ["always"]
},
"space-before-function-paren": {
"options": {
@@ -113,11 +74,7 @@
]
},
"variable-name": {
- "options": [
- "ban-keywords",
- "check-format",
- "allow-pascal-case"
- ]
+ "options": ["ban-keywords", "check-format", "allow-pascal-case"]
},
"whitespace": {
"options": [
@@ -142,7 +99,5 @@
"use-lifecycle-interface": true,
"use-pipe-transform-interface": true
},
- "rulesDirectory": [
- "codelyzer"
- ]
-}
\ No newline at end of file
+ "rulesDirectory": ["codelyzer"]
+}
diff --git a/server/RdtClient.Data/Data/DownloadData.cs b/server/RdtClient.Data/Data/DownloadData.cs
index bd5cddf..ef7c1ad 100644
--- a/server/RdtClient.Data/Data/DownloadData.cs
+++ b/server/RdtClient.Data/Data/DownloadData.cs
@@ -11,6 +11,7 @@ namespace RdtClient.Data.Data
public interface IDownloadData
{
Task> Get();
+ Task> GetForTorrent(Guid torrentId);
Task Add(Guid torrentId, String link);
Task UpdateStatus(Guid downloadId, DownloadStatus status);
Task DeleteForTorrent(Guid torrentId);
@@ -33,6 +34,14 @@ namespace RdtClient.Data.Data
.ToListAsync();
}
+ public async Task> GetForTorrent(Guid torrentId)
+ {
+ return await _dataContext.Downloads
+ .AsNoTracking()
+ .Where(m => m.TorrentId == torrentId)
+ .ToListAsync();
+ }
+
public async Task Add(Guid torrentId, String link)
{
var download = new Download
diff --git a/server/RdtClient.Data/Data/TorrentData.cs b/server/RdtClient.Data/Data/TorrentData.cs
index 0db0d9f..6932a28 100644
--- a/server/RdtClient.Data/Data/TorrentData.cs
+++ b/server/RdtClient.Data/Data/TorrentData.cs
@@ -101,8 +101,6 @@ namespace RdtClient.Data.Data
{
var dbTorrent = await _dataContext.Torrents.FirstOrDefaultAsync(m => m.TorrentId == torrent.TorrentId);
- dbTorrent.Status = torrent.Status;
-
dbTorrent.RdName = torrent.RdName;
dbTorrent.RdSize = torrent.RdSize;
dbTorrent.RdHost = torrent.RdHost;
@@ -114,6 +112,11 @@ namespace RdtClient.Data.Data
dbTorrent.RdSpeed = torrent.RdSpeed;
dbTorrent.RdSeeders = torrent.RdSeeders;
+ if (torrent.Files != null)
+ {
+ dbTorrent.RdFiles = torrent.RdFiles;
+ }
+
await _dataContext.SaveChangesAsync();
}
diff --git a/server/RdtClient.Data/Enums/TorrentStatus.cs b/server/RdtClient.Data/Enums/TorrentStatus.cs
index f89f7cf..bac9dae 100644
--- a/server/RdtClient.Data/Enums/TorrentStatus.cs
+++ b/server/RdtClient.Data/Enums/TorrentStatus.cs
@@ -3,9 +3,10 @@
public enum TorrentStatus
{
RealDebrid = 0,
- WaitingForDownload,
- Downloading,
- Finished,
+ WaitingForDownload = 1,
+ DownloadQueued = 2,
+ Downloading = 3,
+ Finished = 4,
Error = 99
}
diff --git a/server/RdtClient.Data/Migrations/20200407174750_Initial.Designer.cs b/server/RdtClient.Data/Migrations/20200408224831_Initial.Designer.cs
similarity index 98%
rename from server/RdtClient.Data/Migrations/20200407174750_Initial.Designer.cs
rename to server/RdtClient.Data/Migrations/20200408224831_Initial.Designer.cs
index 47df5d9..cbc165d 100644
--- a/server/RdtClient.Data/Migrations/20200407174750_Initial.Designer.cs
+++ b/server/RdtClient.Data/Migrations/20200408224831_Initial.Designer.cs
@@ -9,7 +9,7 @@ using RdtClient.Data.Data;
namespace RdtClient.Data.Migrations
{
[DbContext(typeof(DataContext))]
- [Migration("20200407174750_Initial")]
+ [Migration("20200408224831_Initial")]
partial class Initial
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -277,6 +277,12 @@ namespace RdtClient.Data.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("TEXT");
+ b.Property("AutoDelete")
+ .HasColumnType("INTEGER");
+
+ b.Property("AutoDownload")
+ .HasColumnType("INTEGER");
+
b.Property("Category")
.HasColumnType("TEXT");
diff --git a/server/RdtClient.Data/Migrations/20200407174750_Initial.cs b/server/RdtClient.Data/Migrations/20200408224831_Initial.cs
similarity index 98%
rename from server/RdtClient.Data/Migrations/20200407174750_Initial.cs
rename to server/RdtClient.Data/Migrations/20200408224831_Initial.cs
index f6f2ff1..25aec33 100644
--- a/server/RdtClient.Data/Migrations/20200407174750_Initial.cs
+++ b/server/RdtClient.Data/Migrations/20200408224831_Initial.cs
@@ -66,6 +66,8 @@ namespace RdtClient.Data.Migrations
TorrentId = table.Column(nullable: false),
Hash = table.Column(nullable: true),
Category = table.Column(nullable: true),
+ AutoDownload = table.Column(nullable: false),
+ AutoDelete = table.Column(nullable: false),
Status = table.Column(nullable: false),
RdId = table.Column(nullable: true),
RdName = table.Column(nullable: true),
diff --git a/server/RdtClient.Data/Migrations/DataContextModelSnapshot.cs b/server/RdtClient.Data/Migrations/DataContextModelSnapshot.cs
index 0e6007b..2ddd0bd 100644
--- a/server/RdtClient.Data/Migrations/DataContextModelSnapshot.cs
+++ b/server/RdtClient.Data/Migrations/DataContextModelSnapshot.cs
@@ -275,6 +275,12 @@ namespace RdtClient.Data.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("TEXT");
+ b.Property("AutoDelete")
+ .HasColumnType("INTEGER");
+
+ b.Property("AutoDownload")
+ .HasColumnType("INTEGER");
+
b.Property("Category")
.HasColumnType("TEXT");
diff --git a/server/RdtClient.Data/Models/Data/Download.cs b/server/RdtClient.Data/Models/Data/Download.cs
index 89f7938..462705a 100644
--- a/server/RdtClient.Data/Models/Data/Download.cs
+++ b/server/RdtClient.Data/Models/Data/Download.cs
@@ -22,15 +22,12 @@ namespace RdtClient.Data.Models.Data
public Torrent Torrent { get; set; }
[NotMapped]
- public Int32 Progress { get; set; }
+ public Int64 BytesSize { get; set; }
+
+ [NotMapped]
+ public Int64 BytesDownloaded { get; set; }
[NotMapped]
public Int64 Speed { get; set; }
-
- [NotMapped]
- public DateTime NextUpdate { get; set; }
-
- [NotMapped]
- public Int64 BytesLastUpdate { get; set; }
}
}
diff --git a/server/RdtClient.Data/Models/Data/Torrent.cs b/server/RdtClient.Data/Models/Data/Torrent.cs
index 0b82aad..e313540 100644
--- a/server/RdtClient.Data/Models/Data/Torrent.cs
+++ b/server/RdtClient.Data/Models/Data/Torrent.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Newtonsoft.Json;
-using RDNET.Models;
+using RDNET;
using RdtClient.Data.Enums;
namespace RdtClient.Data.Models.Data
@@ -17,6 +17,10 @@ namespace RdtClient.Data.Models.Data
public String Category { get; set; }
+ public Boolean AutoDownload { get; set; }
+
+ public Boolean AutoDelete { get; set; }
+
public TorrentStatus Status { get; set; }
[InverseProperty("Torrent")]
diff --git a/server/RdtClient.Data/RdtClient.Data.csproj b/server/RdtClient.Data/RdtClient.Data.csproj
index 883337a..3ef9dec 100644
--- a/server/RdtClient.Data/RdtClient.Data.csproj
+++ b/server/RdtClient.Data/RdtClient.Data.csproj
@@ -4,31 +4,6 @@
netcoreapp3.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -39,6 +14,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
+
diff --git a/server/RdtClient.Service/DiConfig.cs b/server/RdtClient.Service/DiConfig.cs
index 8216562..7192a09 100644
--- a/server/RdtClient.Service/DiConfig.cs
+++ b/server/RdtClient.Service/DiConfig.cs
@@ -10,9 +10,10 @@ namespace RdtClient.Service
services.AddScoped();
services.AddScoped();
services.AddScoped();
- services.AddScoped();
services.AddScoped();
services.AddScoped();
+
+ services.AddHostedService();
}
}
}
\ No newline at end of file
diff --git a/server/RdtClient.Service/RdtClient.Service.csproj b/server/RdtClient.Service/RdtClient.Service.csproj
index ed62c6d..dfd1577 100644
--- a/server/RdtClient.Service/RdtClient.Service.csproj
+++ b/server/RdtClient.Service/RdtClient.Service.csproj
@@ -6,9 +6,9 @@
-
+
@@ -16,10 +16,4 @@
-
-
- ..\libs\RDNET.dll
-
-
-
diff --git a/server/RdtClient.Service/Services/DownloadManager.cs b/server/RdtClient.Service/Services/DownloadManager.cs
index 985a28c..96697ff 100644
--- a/server/RdtClient.Service/Services/DownloadManager.cs
+++ b/server/RdtClient.Service/Services/DownloadManager.cs
@@ -1,12 +1,8 @@
using System;
-using System.Collections.Generic;
-using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Net;
using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using RdtClient.Data.Data;
using RdtClient.Data.Enums;
using RdtClient.Data.Models.Data;
using SharpCompress.Common;
@@ -14,32 +10,37 @@ using SharpCompress.Readers;
namespace RdtClient.Service.Services
{
- public static class DownloadManager
+ public class DownloadManager
{
- public static readonly Dictionary ActiveDownloads = new Dictionary();
+ public DownloadStatus? NewStatus { get; set; }
+ public Download Download { get; set; }
+ public Int64 Speed { get; private set; }
+ public Int64 BytesDownloaded { get; private set; }
+ public Int64 BytesSize { get; private set; }
- static DownloadManager()
+ private DateTime _nextUpdate;
+ private Int64 _bytesLastUpdate;
+
+ public DownloadManager()
{
ServicePointManager.Expect100Continue = false;
ServicePointManager.DefaultConnectionLimit = 100;
ServicePointManager.MaxServicePointIdleTime = 1000;
}
- public static async Task Download(Download download, String destinationFolderPath)
+ private DownloadManager ActiveDownload => TaskRunner.ActiveDownloads[Download.DownloadId];
+
+ public async Task Start(String destinationFolderPath)
{
- await UpdateStatus(download.DownloadId, DownloadStatus.Downloading, TorrentStatus.Downloading);
+ ActiveDownload.NewStatus = DownloadStatus.Downloading;
+ ActiveDownload.BytesDownloaded = 0;
+ ActiveDownload.BytesSize = 0;
+ ActiveDownload.Speed = 0;
+
+ _bytesLastUpdate = 0;
+ _nextUpdate = DateTime.UtcNow.AddSeconds(1);
- if (!ActiveDownloads.TryAdd(download.DownloadId, download))
- {
- return;
- }
-
- download.Progress = 0;
- download.BytesLastUpdate = 0;
- download.NextUpdate = DateTime.UtcNow.AddSeconds(1);
- download.Speed = 0;
-
- var fileUrl = download.Link;
+ var fileUrl = Download.Link;
var uri = new Uri(fileUrl);
var filePath = Path.Combine(destinationFolderPath, uri.Segments.Last());
@@ -77,13 +78,15 @@ namespace RdtClient.Service.Services
{
fileStream.Write(buffer, 0, read);
- ActiveDownloads[download.DownloadId].Progress = (Int32) (fileStream.Length * 100 / responseLength);
+ ActiveDownload.BytesDownloaded = fileStream.Length;
+ ActiveDownload.BytesSize = responseLength;
- if (DateTime.UtcNow > ActiveDownloads[download.DownloadId].NextUpdate)
+ if (DateTime.UtcNow > _nextUpdate)
{
- ActiveDownloads[download.DownloadId].Speed = fileStream.Length - ActiveDownloads[download.DownloadId].BytesLastUpdate;
- ActiveDownloads[download.DownloadId].NextUpdate = DateTime.UtcNow.AddSeconds(1);
- ActiveDownloads[download.DownloadId].BytesLastUpdate = fileStream.Length;
+ ActiveDownload.Speed = fileStream.Length - _bytesLastUpdate;
+
+ _nextUpdate = DateTime.UtcNow.AddSeconds(1);
+ _bytesLastUpdate = fileStream.Length;
}
}
else
@@ -93,13 +96,14 @@ namespace RdtClient.Service.Services
}
}
- ActiveDownloads[download.DownloadId].Speed = 0;
+ ActiveDownload.Speed = 0;
+ ActiveDownload.BytesDownloaded = ActiveDownload.BytesSize;
try
{
if (filePath.EndsWith(".rar"))
{
- await UpdateStatus(download.DownloadId, DownloadStatus.Unpacking, TorrentStatus.Downloading);
+ ActiveDownload.NewStatus = DownloadStatus.Unpacking;
await using (Stream stream = File.OpenRead(filePath))
{
@@ -141,43 +145,7 @@ namespace RdtClient.Service.Services
// ignored
}
- await UpdateStatus(download.DownloadId, DownloadStatus.Finished, TorrentStatus.Finished);
-
- ActiveDownloads.Remove(download.DownloadId);
- }
-
- private static async Task UpdateStatus(Guid downloadId, DownloadStatus downloadStatus, TorrentStatus torrentStatus)
- {
- await using var context = new DataContext();
-
- var download = await context.Downloads.FirstOrDefaultAsync(m => m.DownloadId == downloadId);
-
- download.Status = downloadStatus;
-
- await context.SaveChangesAsync();
-
- var torrent = await context.Torrents.FirstOrDefaultAsync(m => m.TorrentId == download.TorrentId);
-
- if (torrentStatus == TorrentStatus.Finished)
- {
- var allDownloads = await context.Downloads.Where(m => m.TorrentId == download.TorrentId)
- .ToListAsync();
-
- if (allDownloads.All(m => m.Status == DownloadStatus.Finished))
- {
- torrent.Status = TorrentStatus.Finished;
- }
- else
- {
- torrent.Status = TorrentStatus.Downloading;
- }
- }
- else
- {
- torrent.Status = torrentStatus;
- }
-
- await context.SaveChangesAsync();
+ ActiveDownload.NewStatus = DownloadStatus.Finished;
}
}
}
\ No newline at end of file
diff --git a/server/RdtClient.Service/Services/Downloads.cs b/server/RdtClient.Service/Services/Downloads.cs
index b407012..803c78c 100644
--- a/server/RdtClient.Service/Services/Downloads.cs
+++ b/server/RdtClient.Service/Services/Downloads.cs
@@ -10,6 +10,7 @@ namespace RdtClient.Service.Services
public interface IDownloads
{
Task> Get();
+ Task> GetForTorrent(Guid torrentId);
Task Add(Guid torrentId, String link);
Task UpdateStatus(Guid downloadId, DownloadStatus status);
Task DeleteForTorrent(Guid torrentId);
@@ -18,12 +19,10 @@ namespace RdtClient.Service.Services
public class Downloads : IDownloads
{
private readonly IDownloadData _downloadData;
- private readonly ISettings _settings;
- public Downloads(IDownloadData downloadData, ISettings settings)
+ public Downloads(IDownloadData downloadData)
{
_downloadData = downloadData;
- _settings = settings;
}
public async Task> Get()
@@ -31,6 +30,11 @@ namespace RdtClient.Service.Services
return await _downloadData.Get();
}
+ public async Task> GetForTorrent(Guid torrentId)
+ {
+ return await _downloadData.GetForTorrent(torrentId);
+ }
+
public async Task Add(Guid torrentId, String link)
{
return await _downloadData.Add(torrentId, link);
diff --git a/server/RdtClient.Service/Services/QBittorrent.cs b/server/RdtClient.Service/Services/QBittorrent.cs
index bf5b7fe..17ebae9 100644
--- a/server/RdtClient.Service/Services/QBittorrent.cs
+++ b/server/RdtClient.Service/Services/QBittorrent.cs
@@ -18,7 +18,7 @@ namespace RdtClient.Service.Services
Task> TorrentInfo();
Task TorrentProperties(String hash);
Task TorrentsDelete(String hash, Boolean deleteFiles);
- Task TorrentsAdd(String url);
+ Task TorrentsAdd(String magnetLink, Boolean autoDownload, Boolean autoDelete);
Task TorrentsSetCategory(String hash, String category);
Task> TorrentsCategories();
}
@@ -363,9 +363,9 @@ namespace RdtClient.Service.Services
}
}
- public async Task TorrentsAdd(String url)
+ public async Task TorrentsAdd(String magnetLink, Boolean autoDownload, Boolean autoDelete)
{
- await _torrents.UploadMagnet(url);
+ await _torrents.UploadMagnet(magnetLink, autoDownload, autoDelete);
}
public async Task TorrentsSetCategory(String hash, String category)
diff --git a/server/RdtClient.Service/Services/Scheduler.cs b/server/RdtClient.Service/Services/Scheduler.cs
deleted file mode 100644
index 98e6767..0000000
--- a/server/RdtClient.Service/Services/Scheduler.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Hangfire;
-using RdtClient.Data.Enums;
-
-namespace RdtClient.Service.Services
-{
- public interface IScheduler
- {
- void Start();
- Task Process();
- }
-
- public class Scheduler : IScheduler
- {
- private readonly IDownloads _downloads;
- private readonly ISettings _settings;
- private readonly ITorrents _torrents;
-
- public Scheduler(ITorrents torrents, IDownloads downloads, ISettings settings)
- {
- _torrents = torrents;
- _downloads = downloads;
- _settings = settings;
- }
-
- public void Start()
- {
- RecurringJob.AddOrUpdate(() => Process(), "* * * * *");
- BackgroundJob.Enqueue(() => Process());
- }
-
- [DisableConcurrentExecution(5)]
- public async Task Process()
- {
- await _torrents.Update();
-
- var downloads = await _downloads.Get();
-
- downloads = downloads.Where(m => m.Status != DownloadStatus.Finished)
- .OrderByDescending(m => m.Status)
- .ThenByDescending(m => m.Added)
- .ToList();
-
- var maxDownloads = await _settings.GetNumber("DownloadLimit");
- var destinationFolderPath = await _settings.GetString("DownloadFolder");
-
- foreach (var download in downloads)
- {
- if (DownloadManager.ActiveDownloads.Count >= maxDownloads)
- {
- return;
- }
-
- download.Torrent = null;
- BackgroundJob.Enqueue(() => DownloadManager.Download(download, destinationFolderPath));
-
- await Task.Delay(1000);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/server/RdtClient.Service/Services/TaskRunner.cs b/server/RdtClient.Service/Services/TaskRunner.cs
new file mode 100644
index 0000000..0ba95f0
--- /dev/null
+++ b/server/RdtClient.Service/Services/TaskRunner.cs
@@ -0,0 +1,180 @@
+using System;
+using System.Collections.Concurrent;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using RdtClient.Data.Enums;
+
+namespace RdtClient.Service.Services
+{
+ public class TaskRunner : IHostedService, IDisposable
+ {
+ public static readonly ConcurrentDictionary ActiveDownloads = new ConcurrentDictionary();
+
+ private readonly ILogger _logger;
+ private readonly IServiceProvider _services;
+
+ private Timer _timer;
+
+ private readonly SemaphoreSlim _semaphoreSlim = new SemaphoreSlim(1, 1);
+
+ public TaskRunner(ILogger logger, IServiceProvider services)
+ {
+ _logger = logger;
+ _services = services;
+ }
+
+ public Task StartAsync(CancellationToken cancellationToken)
+ {
+ _logger.LogInformation("Timed Hosted Service running.");
+
+ _timer = new Timer(DoWork, null, TimeSpan.Zero, TimeSpan.FromSeconds(5));
+
+ return Task.CompletedTask;
+ }
+
+ public Task StopAsync(CancellationToken cancellationToken)
+ {
+ _logger.LogInformation("Timed Hosted Service is stopping.");
+
+ _timer?.Change(Timeout.Infinite, 0);
+
+ return Task.CompletedTask;
+ }
+
+ public void Dispose()
+ {
+ _timer?.Dispose();
+ }
+
+ private async void DoWork(Object state)
+ {
+ // Make sure only 1 process enters the lock
+ var obtainLock = await _semaphoreSlim.WaitAsync(100);
+
+ if (!obtainLock)
+ {
+ return;
+ }
+
+ try
+ {
+ using (var scope = _services.CreateScope())
+ {
+ var downloads = scope.ServiceProvider.GetRequiredService();
+ var settings = scope.ServiceProvider.GetRequiredService();
+ var torrents = scope.ServiceProvider.GetRequiredService();
+
+ var rdKey = await settings.GetString("RealDebridApiKey");
+
+ if (String.IsNullOrWhiteSpace(rdKey))
+ {
+ return;
+ }
+
+ await ProcessAutoDownloads(downloads, settings, torrents);
+ await ProcessDownloads(downloads, settings, torrents);
+ await ProcessStatus(downloads, settings, torrents);
+ }
+ }
+ finally
+ {
+ _semaphoreSlim.Release(1);
+ }
+ }
+
+ private async Task ProcessAutoDownloads(IDownloads downloads, ISettings settings, ITorrents torrents)
+ {
+ await torrents.Update();
+
+ var allTorrents = await torrents.Get();
+
+ allTorrents = allTorrents.Where(m => m.Status == TorrentStatus.WaitingForDownload && m.AutoDownload && m.Downloads.Count == 0)
+ .ToList();
+
+ foreach (var torrent in allTorrents)
+ {
+ await torrents.Download(torrent.TorrentId);
+ }
+ }
+
+ private async Task ProcessDownloads(IDownloads downloads, ISettings settings, ITorrents torrents)
+ {
+ await torrents.Update();
+
+ var allDownloads = await downloads.Get();
+
+ allDownloads = allDownloads.Where(m => m.Status != DownloadStatus.Finished)
+ .OrderByDescending(m => m.Status)
+ .ThenByDescending(m => m.Added)
+ .ToList();
+
+ var maxDownloads = await settings.GetNumber("DownloadLimit");
+ var destinationFolderPath = await settings.GetString("DownloadFolder");
+
+ foreach (var download in allDownloads)
+ {
+ if (ActiveDownloads.ContainsKey(download.DownloadId))
+ {
+ continue;
+ }
+
+ if (ActiveDownloads.Count >= maxDownloads)
+ {
+ return;
+ }
+
+ // Prevent circular references
+ download.Torrent.Downloads = null;
+
+ await Task.Factory.StartNew(async delegate
+ {
+ var downloadManager = new DownloadManager();
+
+ if (ActiveDownloads.TryAdd(download.DownloadId, downloadManager))
+ {
+ downloadManager.Download = download;
+ await downloadManager.Start(destinationFolderPath);
+
+ await torrents.UpdateStatus(download.TorrentId, TorrentStatus.Downloading);
+ }
+ });
+ }
+ }
+
+ private async Task ProcessStatus(IDownloads downloads, ISettings settings, ITorrents torrents)
+ {
+ foreach (var (downloadId, download) in ActiveDownloads)
+ {
+ if (download.NewStatus.HasValue)
+ {
+ download.Download.Status = download.NewStatus.Value;
+ download.NewStatus = null;
+
+ await downloads.UpdateStatus(downloadId, download.Download.Status);
+
+ if (download.Download.Status == DownloadStatus.Finished)
+ {
+ ActiveDownloads.TryRemove(downloadId, out _);
+
+ // Check if all downloads are completed and update the torrent
+ var allDownloads = await downloads.GetForTorrent(download.Download.TorrentId);
+
+ if (allDownloads.All(m => m.Status == DownloadStatus.Finished))
+ {
+ await torrents.UpdateStatus(download.Download.TorrentId, TorrentStatus.Finished);
+
+ if (download.Download.Torrent.AutoDelete)
+ {
+ await torrents.Delete(download.Download.TorrentId);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/server/RdtClient.Service/Services/Torrents.cs b/server/RdtClient.Service/Services/Torrents.cs
index 9f3e530..d68cef1 100644
--- a/server/RdtClient.Service/Services/Torrents.cs
+++ b/server/RdtClient.Service/Services/Torrents.cs
@@ -19,9 +19,10 @@ namespace RdtClient.Service.Services
Task GetById(Guid id);
Task GetByHash(String hash);
Task> Update();
+ Task UpdateStatus(Guid torrentId, TorrentStatus status);
Task UpdateCategory(String hash, String category);
- Task UploadMagnet(String magnetLink);
- Task UploadFile(Byte[] bytes);
+ Task UploadMagnet(String magnetLink, Boolean autoDownload, Boolean autoDelete);
+ Task UploadFile(Byte[] bytes, Boolean autoDownload, Boolean autoDelete);
Task Delete(Guid id);
Task Download(Guid id);
void Reset();
@@ -60,7 +61,7 @@ namespace RdtClient.Service.Services
throw new Exception("RealDebrid API Key not set in the settings");
}
- _rdtClient = new RdNetClient("X245A4XAIBGVM", null, null, null, null, apiKey);
+ _rdtClient = new RdNetClient("X245A4XAIBGVM", null, null, null, apiKey);
}
return _rdtClient;
@@ -82,10 +83,11 @@ namespace RdtClient.Service.Services
{
foreach (var download in torrent.Downloads)
{
- if (DownloadManager.ActiveDownloads.TryGetValue(download.DownloadId, out var activeDownload))
+ if (TaskRunner.ActiveDownloads.TryGetValue(download.DownloadId, out var activeDownload))
{
download.Speed = activeDownload.Speed;
- download.Progress = activeDownload.Progress;
+ download.BytesSize = activeDownload.BytesSize;
+ download.BytesDownloaded = activeDownload.BytesDownloaded;
}
}
}
@@ -99,7 +101,7 @@ namespace RdtClient.Service.Services
if (torrent != null)
{
- var rdTorrent = await RdNetClient.TorrentInfoAsync(torrent.RdId);
+ var rdTorrent = await RdNetClient.GetTorrentInfoAsync(torrent.RdId);
await Update(torrent, rdTorrent);
}
@@ -113,7 +115,7 @@ namespace RdtClient.Service.Services
if (torrent != null)
{
- var rdTorrent = await RdNetClient.TorrentInfoAsync(torrent.RdId);
+ var rdTorrent = await RdNetClient.GetTorrentInfoAsync(torrent.RdId);
await Update(torrent, rdTorrent);
}
@@ -133,7 +135,7 @@ namespace RdtClient.Service.Services
try
{
- var rdTorrents = await RdNetClient.TorrentsAsync(0, 100);
+ var rdTorrents = await RdNetClient.GetTorrentsAsync(0, 100);
foreach (var rdTorrent in rdTorrents)
{
@@ -169,6 +171,11 @@ namespace RdtClient.Service.Services
}
}
+ public async Task UpdateStatus(Guid torrentId, TorrentStatus status)
+ {
+ await _torrentData.UpdateStatus(torrentId, status);
+ }
+
public async Task UpdateCategory(String hash, String category)
{
var torrent = await _torrentData.GetByHash(hash);
@@ -181,22 +188,22 @@ namespace RdtClient.Service.Services
await _torrentData.UpdateCategory(torrent.TorrentId, category);
}
- public async Task UploadMagnet(String magnetLink)
+ public async Task UploadMagnet(String magnetLink, Boolean autoDownload, Boolean autoDelete)
{
var magnet = MagnetLink.Parse(magnetLink);
- var rdTorrent = await RdNetClient.TorrentAddMagnet(magnetLink);
+ var rdTorrent = await RdNetClient.AddTorrentMagnetAsync(magnetLink);
- await Add(rdTorrent.Id, magnet.InfoHash.ToHex());
+ await Add(rdTorrent.Id, magnet.InfoHash.ToHex(), autoDownload, autoDelete);
}
- public async Task UploadFile(Byte[] bytes)
+ public async Task UploadFile(Byte[] bytes, Boolean autoDownload, Boolean autoDelete)
{
var torrent = MonoTorrent.Torrent.Load(bytes);
- var rdTorrent = await RdNetClient.TorrentAddFile(bytes);
+ var rdTorrent = await RdNetClient.AddTorrentFileAsync(bytes);
- await Add(rdTorrent.Id, torrent.InfoHash.ToHex());
+ await Add(rdTorrent.Id, torrent.InfoHash.ToHex(), autoDownload, autoDelete);
}
public async Task Delete(Guid id)
@@ -207,7 +214,7 @@ namespace RdtClient.Service.Services
{
await _downloads.DeleteForTorrent(torrent.TorrentId);
await _torrentData.Delete(id);
- await RdNetClient.TorrentDelete(torrent.RdId);
+ await RdNetClient.DeleteTorrentAsync(torrent.RdId);
}
}
@@ -217,7 +224,9 @@ namespace RdtClient.Service.Services
await _downloads.DeleteForTorrent(id);
- var rdTorrent = await RdNetClient.TorrentInfoAsync(torrent.RdId);
+ await _torrentData.UpdateStatus(id, TorrentStatus.DownloadQueued);
+
+ var rdTorrent = await RdNetClient.GetTorrentInfoAsync(torrent.RdId);
foreach (var link in rdTorrent.Links)
{
@@ -235,7 +244,12 @@ namespace RdtClient.Service.Services
public async Task GetProfile()
{
- var user = await _rdtClient.UserAsync();
+ if (_rdtClient == null)
+ {
+ return new Profile();
+ }
+
+ var user = await _rdtClient.GetUserAsync();
var profile = new Profile
{
@@ -246,11 +260,11 @@ namespace RdtClient.Service.Services
return profile;
}
- private async Task Add(String rdTorrentId, String infoHash)
+ private async Task Add(String rdTorrentId, String infoHash, Boolean autoDownload, Boolean autoDelete)
{
var newTorrent = await _torrentData.Add(rdTorrentId, infoHash);
- var rdTorrent = await RdNetClient.TorrentInfoAsync(rdTorrentId);
+ var rdTorrent = await RdNetClient.GetTorrentInfoAsync(rdTorrentId);
if (rdTorrent.Files != null && rdTorrent.Files.Count > 0)
{
@@ -259,14 +273,14 @@ namespace RdtClient.Service.Services
var fileIds = rdTorrent.Files.Select(m => m.Id.ToString())
.ToArray();
- await RdNetClient.TorrentSelectFiles(rdTorrentId, fileIds);
+ await RdNetClient.SelectTorrentFilesAsync(rdTorrentId, fileIds);
}
}
await Update(newTorrent, rdTorrent);
}
- private async Task Update(Torrent torrent, RDNET.Models.Torrent rdTorrent)
+ private async Task Update(Torrent torrent, RDNET.Torrent rdTorrent)
{
if (!String.IsNullOrWhiteSpace(rdTorrent.Filename))
{
@@ -300,11 +314,13 @@ namespace RdtClient.Service.Services
torrent.RdSpeed = rdTorrent.Speed;
torrent.RdSeeders = rdTorrent.Seeders;
+ await _torrentData.UpdateRdData(torrent);
+
if (torrent.Status == TorrentStatus.RealDebrid)
{
if (torrent.Status == TorrentStatus.RealDebrid && torrent.RdProgress == 100)
{
- torrent.Status = TorrentStatus.WaitingForDownload;
+ await _torrentData.UpdateStatus(torrent.TorrentId, TorrentStatus.WaitingForDownload);
}
else
{
@@ -317,10 +333,10 @@ namespace RdtClient.Service.Services
"dead" => TorrentStatus.Error,
_ => TorrentStatus.RealDebrid
};
+
+ await _torrentData.UpdateStatus(torrent.TorrentId, torrent.Status);
}
}
-
- await _torrentData.UpdateRdData(torrent);
}
}
}
\ No newline at end of file
diff --git a/server/RdtClient.Web/Controllers/QBittorrentController.cs b/server/RdtClient.Web/Controllers/QBittorrentController.cs
index 0a0f854..de47954 100644
--- a/server/RdtClient.Web/Controllers/QBittorrentController.cs
+++ b/server/RdtClient.Web/Controllers/QBittorrentController.cs
@@ -272,7 +272,7 @@ namespace RdtClient.Web.Controllers
foreach (var url in urls)
{
- await _qBittorrent.TorrentsAdd(url.Trim());
+ await _qBittorrent.TorrentsAdd(url.Trim(), true, true);
}
return Ok();
diff --git a/server/RdtClient.Web/Controllers/SettingsController.cs b/server/RdtClient.Web/Controllers/SettingsController.cs
index 2f15ce9..f8b80e2 100644
--- a/server/RdtClient.Web/Controllers/SettingsController.cs
+++ b/server/RdtClient.Web/Controllers/SettingsController.cs
@@ -33,7 +33,7 @@ namespace RdtClient.Web.Controllers
}
catch (Exception ex)
{
- return BadRequest(ex);
+ return BadRequest(ex.Message);
}
}
@@ -50,7 +50,7 @@ namespace RdtClient.Web.Controllers
}
catch (Exception ex)
{
- return BadRequest(ex);
+ return BadRequest(ex.Message);
}
}
@@ -65,7 +65,7 @@ namespace RdtClient.Web.Controllers
}
catch (Exception ex)
{
- return BadRequest(ex);
+ return BadRequest(ex.Message);
}
}
}
diff --git a/server/RdtClient.Web/Controllers/TorrentsController.cs b/server/RdtClient.Web/Controllers/TorrentsController.cs
index adf5a63..10ddc91 100644
--- a/server/RdtClient.Web/Controllers/TorrentsController.cs
+++ b/server/RdtClient.Web/Controllers/TorrentsController.cs
@@ -15,12 +15,10 @@ namespace RdtClient.Web.Controllers
public class TorrentsController : Controller
{
private readonly ITorrents _torrents;
- private readonly IScheduler _scheduler;
- public TorrentsController(ITorrents torrents, IScheduler scheduler)
+ public TorrentsController(ITorrents torrents)
{
_torrents = torrents;
- _scheduler = scheduler;
}
[HttpGet]
@@ -34,7 +32,7 @@ namespace RdtClient.Web.Controllers
}
catch (Exception ex)
{
- return BadRequest(ex);
+ return BadRequest(ex.Message);
}
}
@@ -55,7 +53,7 @@ namespace RdtClient.Web.Controllers
}
catch (Exception ex)
{
- return BadRequest(ex);
+ return BadRequest(ex.Message);
}
}
@@ -78,7 +76,7 @@ namespace RdtClient.Web.Controllers
var bytes = memoryStream.ToArray();
- await _torrents.UploadFile(bytes);
+ await _torrents.UploadFile(bytes, false, false);
return Ok();
}
@@ -94,7 +92,7 @@ namespace RdtClient.Web.Controllers
{
try
{
- await _torrents.UploadMagnet(request.MagnetLink);
+ await _torrents.UploadMagnet(request.MagnetLink, false, false);
return Ok();
}
@@ -127,7 +125,6 @@ namespace RdtClient.Web.Controllers
try
{
await _torrents.Download(id);
- await _scheduler.Process();
return Ok();
}
diff --git a/server/RdtClient.Web/Program.cs b/server/RdtClient.Web/Program.cs
index 0b39dc9..ca6aa2a 100644
--- a/server/RdtClient.Web/Program.cs
+++ b/server/RdtClient.Web/Program.cs
@@ -4,7 +4,6 @@ using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
-using RdtClient.Data.Models.Internal;
namespace RdtClient.Web
{
diff --git a/server/RdtClient.Web/RdtClient.Web.csproj b/server/RdtClient.Web/RdtClient.Web.csproj
index 33a6dd0..6a6dba0 100644
--- a/server/RdtClient.Web/RdtClient.Web.csproj
+++ b/server/RdtClient.Web/RdtClient.Web.csproj
@@ -5,9 +5,6 @@
-
-
-
@@ -17,7 +14,6 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
diff --git a/server/RdtClient.Web/Startup.cs b/server/RdtClient.Web/Startup.cs
index 14dd689..c75094e 100644
--- a/server/RdtClient.Web/Startup.cs
+++ b/server/RdtClient.Web/Startup.cs
@@ -1,6 +1,4 @@
using System.Threading.Tasks;
-using Hangfire;
-using Hangfire.MemoryStorage;
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
@@ -14,7 +12,6 @@ using Microsoft.Extensions.Logging;
using RdtClient.Data;
using RdtClient.Data.Data;
using RdtClient.Data.Models.Internal;
-using RdtClient.Service.Services;
namespace RdtClient.Web
{
@@ -83,19 +80,11 @@ namespace RdtClient.Web
options.Cookie.Name = "SID";
});
- services.AddHangfire(configuration => configuration
- .SetDataCompatibilityLevel(CompatibilityLevel.Version_170)
- .UseSimpleAssemblyNameTypeSerializer()
- .UseRecommendedSerializerSettings()
- .UseMemoryStorage());
-
- services.AddHangfireServer();
-
DiConfig.Config(services);
Service.DiConfig.Config(services);
}
- public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILogger logger, DataContext dataContext, IScheduler scheduler)
+ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILogger logger, DataContext dataContext)
{
if (env.IsDevelopment())
{
@@ -107,9 +96,9 @@ namespace RdtClient.Web
{
await next.Invoke();
- if (context.Response.StatusCode >= 404)
+ if (context.Response.StatusCode != 200)
{
- logger.LogWarning($"404: {context.Request.Path.Value}");
+ logger.LogWarning($"{context.Response.StatusCode}: {context.Request.Path.Value}");
}
});
@@ -118,9 +107,7 @@ namespace RdtClient.Web
app.UseAuthentication();
app.UseAuthorization();
-
- app.UseHangfireServer();
-
+
app.UseEndpoints(endpoints => { endpoints.MapControllers(); });
app.MapWhen(x => !x.Request.Path.Value.StartsWith("/api"), builder =>
@@ -134,8 +121,6 @@ namespace RdtClient.Web
});
dataContext.Migrate();
-
- scheduler.Start();
}
}
}
\ No newline at end of file
diff --git a/server/RdtClient.Web/wwwroot/index.html b/server/RdtClient.Web/wwwroot/index.html
index 5e162dd..fc5ca18 100644
--- a/server/RdtClient.Web/wwwroot/index.html
+++ b/server/RdtClient.Web/wwwroot/index.html
@@ -9,5 +9,5 @@
-
+