diff --git a/package-lock.json b/package-lock.json index 574693ad..795f573c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,9 +21,8 @@ "devDependencies": { "jasmine": "^3.5.0", "jshint": "^2.10.2", + "node-fetch": "^2.7.0", "nyc": "^15.0.0", - "request": "^2.87.0", - "request-promise-native": "^1.0.4", "ws": "^8.4.0" }, "engines": { @@ -467,22 +466,6 @@ "node": ">=8" } }, - "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, "node_modules/ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -531,65 +514,17 @@ "sprintf-js": "~1.0.2" } }, - "node_modules/asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "dev": true, - "dependencies": { - "safer-buffer": "~2.1.0" - } - }, - "node_modules/assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true, - "engines": { - "node": ">=0.8" - } - }, "node_modules/async": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, - "node_modules/aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/aws4": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", - "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", - "dev": true - }, "node_modules/balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true }, - "node_modules/bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dev": true, - "dependencies": { - "tweetnacl": "^0.14.3" - } - }, "node_modules/bintrees": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz", @@ -629,12 +564,6 @@ "node": ">=6" } }, - "node_modules/caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true - }, "node_modules/chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -722,18 +651,6 @@ "text-hex": "1.0.x" } }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/commander": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", @@ -798,18 +715,6 @@ "node": ">= 8" } }, - "node_modules/dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0" - }, - "engines": { - "node": ">=0.10" - } - }, "node_modules/date-now": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", @@ -837,15 +742,6 @@ "node": ">=8" } }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/dom-serializer": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", @@ -902,16 +798,6 @@ "domelementtype": "1" } }, - "node_modules/ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "dev": true, - "dependencies": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -971,33 +857,6 @@ "node": ">= 0.8.0" } }, - "node_modules/extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, - "node_modules/extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true, - "engines": [ - "node >=0.6.0" - ] - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, "node_modules/fecha": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", @@ -1070,29 +929,6 @@ "node": ">=8.0.0" } }, - "node_modules/forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 0.12" - } - }, "node_modules/fromentries": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz", @@ -1146,15 +982,6 @@ "node": ">=8.0.0" } }, - "node_modules/getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0" - } - }, "node_modules/glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", @@ -1190,29 +1017,6 @@ "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==", "dev": true }, - "node_modules/har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/har-validator": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", - "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "deprecated": "this library is no longer supported", - "dev": true, - "dependencies": { - "ajv": "^6.12.3", - "har-schema": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -1294,21 +1098,6 @@ "node": ">=8.0.0" } }, - "node_modules/http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - }, - "engines": { - "node": ">=0.8", - "npm": ">=1.3.7" - } - }, "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -1385,12 +1174,6 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, - "node_modules/isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, "node_modules/istanbul-lib-coverage": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", @@ -1577,12 +1360,6 @@ "js-yaml": "bin/js-yaml.js" } }, - "node_modules/jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true - }, "node_modules/jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -1613,24 +1390,6 @@ "jshint": "bin/jshint" } }, - "node_modules/json-schema": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", - "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", - "dev": true - }, - "node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "node_modules/json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true - }, "node_modules/json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", @@ -1643,21 +1402,6 @@ "node": ">=6" } }, - "node_modules/jsprim": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", - "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", - "dev": true, - "dependencies": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.4.0", - "verror": "1.10.0" - }, - "engines": { - "node": ">=0.6.0" - } - }, "node_modules/kuler": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", @@ -1718,27 +1462,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/mime-db": { - "version": "1.46.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz", - "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.29", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz", - "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==", - "dev": true, - "dependencies": { - "mime-db": "1.46.0" - }, - "engines": { - "node": ">= 0.6" - } - }, "node_modules/minimatch": { "version": "3.0.8", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz", @@ -1756,6 +1479,27 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, + "node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/node-preload": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", @@ -1809,15 +1553,6 @@ "node": ">=8.9" } }, - "node_modules/oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "dev": true, - "engines": { - "node": "*" - } - }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -1925,12 +1660,6 @@ "node": ">=8" } }, - "node_modules/performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true - }, "node_modules/pkg-dir": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", @@ -1966,30 +1695,6 @@ "node": ">=10" } }, - "node_modules/psl": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", - "dev": true - }, - "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/qs": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", - "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", - "dev": true, - "engines": { - "node": ">=0.6" - } - }, "node_modules/readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", @@ -2015,71 +1720,6 @@ "node": ">=4" } }, - "node_modules/request": { - "version": "2.88.2", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", - "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", - "dev": true, - "dependencies": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/request-promise-core": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz", - "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==", - "dev": true, - "dependencies": { - "lodash": "^4.17.19" - }, - "engines": { - "node": ">=0.10.0" - }, - "peerDependencies": { - "request": "^2.34" - } - }, - "node_modules/request-promise-native": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz", - "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==", - "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142", - "dev": true, - "dependencies": { - "request-promise-core": "1.1.4", - "stealthy-require": "^1.1.1", - "tough-cookie": "^2.3.3" - }, - "engines": { - "node": ">=0.12.0" - }, - "peerDependencies": { - "request": "^2.34" - } - }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -2151,12 +1791,6 @@ "node": ">=10" } }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, "node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -2239,31 +1873,6 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, - "node_modules/sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "dev": true, - "dependencies": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - }, - "bin": { - "sshpk-conv": "bin/sshpk-conv", - "sshpk-sign": "bin/sshpk-sign", - "sshpk-verify": "bin/sshpk-verify" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/stack-trace": { "version": "0.0.10", "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", @@ -2272,15 +1881,6 @@ "node": "*" } }, - "node_modules/stealthy-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", - "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/strftime": { "version": "0.10.3", "resolved": "https://registry.npmjs.org/strftime/-/strftime-0.10.3.tgz", @@ -2392,18 +1992,12 @@ "node": ">=4" } }, - "node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", "dev": true, - "dependencies": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=0.8" - } + "license": "MIT" }, "node_modules/triple-beam": { "version": "1.4.1", @@ -2413,24 +2007,6 @@ "node": ">= 14.0.0" } }, - "node_modules/tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, - "dependencies": { - "safe-buffer": "^5.0.1" - }, - "engines": { - "node": "*" - } - }, - "node_modules/tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true - }, "node_modules/type-fest": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", @@ -2449,15 +2025,6 @@ "is-typedarray": "^1.0.0" } }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "dependencies": { - "punycode": "^2.1.0" - } - }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -2473,18 +2040,22 @@ "uuid": "bin/uuid" } }, - "node_modules/verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", "dev": true, - "engines": [ - "node >=0.6.0" - ], + "license": "BSD-2-Clause" + }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dev": true, + "license": "MIT", "dependencies": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" } }, "node_modules/which": { @@ -3023,18 +2594,6 @@ "indent-string": "^4.0.0" } }, - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -3074,59 +2633,17 @@ "sprintf-js": "~1.0.2" } }, - "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "dev": true, - "requires": { - "safer-buffer": "~2.1.0" - } - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - }, "async": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true - }, - "aws4": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", - "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", - "dev": true - }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true }, - "bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dev": true, - "requires": { - "tweetnacl": "^0.14.3" - } - }, "bintrees": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz", @@ -3160,12 +2677,6 @@ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true - }, "chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -3244,15 +2755,6 @@ "text-hex": "1.0.x" } }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } - }, "commander": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", @@ -3313,15 +2815,6 @@ "which": "^2.0.1" } }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, "date-now": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", @@ -3343,12 +2836,6 @@ "strip-bom": "^4.0.0" } }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true - }, "dom-serializer": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", @@ -3398,16 +2885,6 @@ "domelementtype": "1" } }, - "ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "dev": true, - "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -3454,30 +2931,6 @@ "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", "dev": true }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, "fecha": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", @@ -3524,23 +2977,6 @@ "signal-exit": "^3.0.2" } }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true - }, - "form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - } - }, "fromentries": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz", @@ -3571,15 +3007,6 @@ "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", "dev": true }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, "glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", @@ -3606,22 +3033,6 @@ "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==", "dev": true }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true - }, - "har-validator": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", - "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "dev": true, - "requires": { - "ajv": "^6.12.3", - "har-schema": "^2.0.0" - } - }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -3693,17 +3104,6 @@ "requires-port": "^1.0.0" } }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -3765,12 +3165,6 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, "istanbul-lib-coverage": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", @@ -3917,12 +3311,6 @@ "esprima": "^4.0.0" } }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true - }, "jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -3944,42 +3332,12 @@ "strip-json-comments": "1.0.x" } }, - "json-schema": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", - "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true - }, "json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true }, - "jsprim": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", - "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", - "dev": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.4.0", - "verror": "1.10.0" - } - }, "kuler": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", @@ -4028,21 +3386,6 @@ "semver": "^6.0.0" } }, - "mime-db": { - "version": "1.46.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz", - "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==", - "dev": true - }, - "mime-types": { - "version": "2.1.29", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz", - "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==", - "dev": true, - "requires": { - "mime-db": "1.46.0" - } - }, "minimatch": { "version": "3.0.8", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz", @@ -4057,6 +3400,15 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, + "node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, + "requires": { + "whatwg-url": "^5.0.0" + } + }, "node-preload": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", @@ -4101,12 +3453,6 @@ "yargs": "^15.0.2" } }, - "oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "dev": true - }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -4187,12 +3533,6 @@ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true - }, "pkg-dir": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", @@ -4219,24 +3559,6 @@ "tdigest": "^0.1.1" } }, - "psl": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", - "dev": true - }, - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true - }, - "qs": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", - "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", - "dev": true - }, "readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", @@ -4256,54 +3578,6 @@ "es6-error": "^4.0.1" } }, - "request": { - "version": "2.88.2", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", - "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "dev": true, - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - } - }, - "request-promise-core": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz", - "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==", - "dev": true, - "requires": { - "lodash": "^4.17.19" - } - }, - "request-promise-native": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz", - "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==", - "dev": true, - "requires": { - "request-promise-core": "1.1.4", - "stealthy-require": "^1.1.1", - "tough-cookie": "^2.3.3" - } - }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -4346,12 +3620,6 @@ "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz", "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==" }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, "semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -4419,34 +3687,11 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, - "sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "dev": true, - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - } - }, "stack-trace": { "version": "0.0.10", "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=" }, - "stealthy-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", - "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", - "dev": true - }, "strftime": { "version": "0.10.3", "resolved": "https://registry.npmjs.org/strftime/-/strftime-0.10.3.tgz", @@ -4531,36 +3776,17 @@ "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", "dev": true }, - "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, - "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - } + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "dev": true }, "triple-beam": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz", "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==" }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true - }, "type-fest": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", @@ -4576,15 +3802,6 @@ "is-typedarray": "^1.0.0" } }, - "uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "requires": { - "punycode": "^2.1.0" - } - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -4596,15 +3813,20 @@ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", "dev": true }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "dev": true + }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", "dev": true, "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" } }, "which": { diff --git a/package.json b/package.json index 816e84bb..7dc5e0c3 100644 --- a/package.json +++ b/package.json @@ -18,9 +18,8 @@ "devDependencies": { "jasmine": "^3.5.0", "jshint": "^2.10.2", + "node-fetch": "^2.7.0", "nyc": "^15.0.0", - "request": "^2.87.0", - "request-promise-native": "^1.0.4", "ws": "^8.4.0" }, "engines": { @@ -40,7 +39,7 @@ "scripts": { "lint": "jshint bin/ lib/ test/", "fmt": "pre-commit run --all-files", - "test": "FORCE_COLOR=3 nyc node test/jasmine.js", + "test": "NODE_TLS_REJECT_UNAUTHORIZED=0 FORCE_COLOR=3 nyc node test/jasmine.js", "coverage-html": "nyc report --reporter=html", "codecov": "nyc report --reporter=lcov && codecov" } diff --git a/test/api_spec.js b/test/api_spec.js index 58fd467b..c396cbb5 100644 --- a/test/api_spec.js +++ b/test/api_spec.js @@ -2,9 +2,8 @@ "use strict"; var util = require("../lib/testutil"); -var extend = require("util")._extend; -var request = require("request-promise-native"); var log = require("winston"); +var fetch = require("node-fetch"); // disable logging during tests log.remove(log.transports.Console); @@ -23,12 +22,20 @@ describe("API Tests", function () { proxy = newProxy; }) .then(function () { - r = request.defaults({ - method: "GET", - headers: { Authorization: "token " + proxy.authToken }, - port: apiPort, - url: apiUrl, - }); + r = (path, options) => { + options = options || {}; + path = path || ""; + const url = `${options.url || apiUrl}${path}`; + delete options.url; + const fetchOptions = { + method: "GET", + headers: { + Authorization: `token ${proxy.authToken}`, + }, + ...options, + }; + return fetch(url, fetchOptions); + }; }) .then(function () { callback(); @@ -74,9 +81,9 @@ describe("API Tests", function () { }); it("GET /api/routes fetches the routing table", function (done) { - r(apiUrl) - .then(function (body) { - var reply = JSON.parse(body); + r() + .then((res) => res.json()) + .then(function (reply) { var keys = Object.keys(reply); expect(keys.length).toEqual(1); expect(keys).toContain("/"); @@ -90,24 +97,22 @@ describe("API Tests", function () { proxy .addRoute(path, { target: url }) .then(function () { - return r(apiUrl + path); + return r(path); }) - .then(function (body) { - var reply = JSON.parse(body); + .then((res) => res.json()) + .then(function (reply) { var keys = Object.keys(reply); expect(keys).toContain("target"); expect(reply.target).toEqual(url); }) + .catch(done.fail) .then(done); }); it("GET /api/routes[/path] fetches a single route (404 if missing)", function (done) { - r(apiUrl + "/path") - .then((body) => { - done.fail("Expected a 404"); - }) - .catch((error) => { - expect(error.statusCode).toEqual(404); + r("/path") + .then((res) => { + expect(res.status).toEqual(404); }) .then(done); }); @@ -116,10 +121,11 @@ describe("API Tests", function () { var port = 8998; var target = "http://127.0.0.1:" + port; - r.post({ - url: apiUrl + "/user/foo", + r("/user/foo", { + method: "POST", body: JSON.stringify({ target: target }), }) + .then((res) => res.text()) .then((body) => { expect(body).toEqual(""); }) @@ -128,16 +134,18 @@ describe("API Tests", function () { expect(route.target).toEqual(target); expect(typeof route.last_activity).toEqual("object"); }) + .catch(done.fail) .then(done); }); it("POST /api/routes[/foo%20bar] handles URI escapes", function (done) { var port = 8998; var target = "http://127.0.0.1:" + port; - r.post({ - url: apiUrl + "/user/foo%40bar", + r("/user/foo%40bar", { + method: "POST", body: JSON.stringify({ target: target }), }) + .then((res) => res.text()) .then((body) => { expect(body).toEqual(""); }) @@ -156,10 +164,11 @@ describe("API Tests", function () { it("POST /api/routes creates a new root route", function (done) { var port = 8998; var target = "http://127.0.0.1:" + port; - r.post({ - url: apiUrl, + r("", { + method: "POST", body: JSON.stringify({ target: target }), }) + .then((res) => res.text()) .then((body) => { expect(body).toEqual(""); return proxy._routes.get("/"); @@ -180,7 +189,8 @@ describe("API Tests", function () { .addTarget(proxy, path, port, null, null) .then(() => proxy._routes.get(path)) .then((route) => expect(route.target).toEqual(target)) - .then(() => r.del(apiUrl + path)) + .then(() => r(path, { url: apiUrl, method: "DELETE" })) + .then((res) => res.text()) .then((body) => expect(body).toEqual("")) .then(() => proxy._routes.get(path)) .then((deletedRoute) => expect(deletedRoute).toBe(undefined)) @@ -188,9 +198,8 @@ describe("API Tests", function () { }); it("GET /api/routes?inactiveSince= with bad value returns a 400", function (done) { - r.get(apiUrl + "?inactiveSince=endoftheuniverse") - .then(() => done.fail("Expected 400")) - .catch((err) => expect(err.statusCode).toEqual(400)) + r("?inactiveSince=endoftheuniverse") + .then((res) => expect(res.status).toEqual(400)) .then(done); }); @@ -228,28 +237,29 @@ describe("API Tests", function () { var seen = 0; var doReq = function (i) { var t = tests[i]; - return r.get(apiUrl + "?inactiveSince=" + t.since.toISOString()).then(function (body) { - var routes = JSON.parse(body); - var routeKeys = Object.keys(routes); - var expectedKeys = Object.keys(t.expected); + return r("?inactiveSince=" + t.since.toISOString()) + .then((res) => res.json()) + .then(function (routes) { + var routeKeys = Object.keys(routes); + var expectedKeys = Object.keys(t.expected); - routeKeys.forEach(function (key) { - // check that all routes are expected - expect(expectedKeys).toContain(key); - }); + routeKeys.forEach(function (key) { + // check that all routes are expected + expect(expectedKeys).toContain(key); + }); - expectedKeys.forEach(function (key) { - // check that all expected routes are found - expect(routeKeys).toContain(key); - }); + expectedKeys.forEach(function (key) { + // check that all expected routes are found + expect(routeKeys).toContain(key); + }); - seen += 1; - if (seen === tests.length) { - done(); - } else { - return doReq(seen); - } - }); + seen += 1; + if (seen === tests.length) { + done(); + } else { + return doReq(seen); + } + }); }; proxy diff --git a/test/cli_spec.js b/test/cli_spec.js index 3519eb60..dfb3e297 100644 --- a/test/cli_spec.js +++ b/test/cli_spec.js @@ -1,9 +1,9 @@ // jshint jasmine: true "use strict"; -const http = require("http"); +var http = require("http"); +var fetch = require("node-fetch"); var spawn = require("child_process").spawn; -var request = require("request-promise-native"); // utility functions function executeCLI(execCmd = "bin/configurable-http-proxy", args = []) { @@ -97,13 +97,6 @@ describe("CLI Tests", function () { var redirectUrl = "http://127.0.0.1:" + redirectPort; var redirectToUrl = "https://127.0.0.1:" + redirectToPort; - var r = request.defaults({ - method: "GET", - //url: proxyUrl, - followRedirect: false, - strictSSL: false, - }); - beforeEach(function (callback) { childProcess = null; addServer("default", testPort).then(callback); @@ -125,15 +118,16 @@ describe("CLI Tests", function () { var args = ["--ip", "127.0.0.1", "--port", port, "--default-target", testUrl]; executeCLI(execCmd, args).then((cliProcess) => { childProcess = cliProcess; - r(proxyUrl).then((body) => { - body = JSON.parse(body); - expect(body).toEqual( - jasmine.objectContaining({ - name: "default", - }) - ); - done(); - }); + fetch(proxyUrl) + .then((res) => res.json()) + .then((body) => { + expect(body).toEqual( + jasmine.objectContaining({ + name: "default", + }) + ); + done(); + }); }); }); @@ -152,15 +146,19 @@ describe("CLI Tests", function () { ]; executeCLI(execCmd, args).then((cliProcess) => { childProcess = cliProcess; - r(SSLproxyUrl).then((body) => { - body = JSON.parse(body); - expect(body).toEqual( - jasmine.objectContaining({ - name: "default", - }) - ); - done(); - }); + fetch(SSLproxyUrl) + .then((res) => res.json()) + .then((body) => { + expect(body).toEqual( + jasmine.objectContaining({ + name: "default", + }) + ); + done(); + }) + .catch((err) => { + done.fail(err); + }); }); }); @@ -182,23 +180,20 @@ describe("CLI Tests", function () { ]; executeCLI(execCmd, args).then((cliProcess) => { childProcess = cliProcess; - r(redirectUrl) - .then(() => { - fail("A 301 redirect should have been thrown."); - }) - .catch((requestError) => { - expect(requestError.statusCode).toEqual(301); - expect(requestError.response.headers.location).toContain(SSLproxyUrl); - }); - r({ url: redirectUrl, followRedirect: true }).then((body) => { - body = JSON.parse(body); - expect(body).toEqual( - jasmine.objectContaining({ - name: "default", - }) - ); - done(); + fetch(redirectUrl, { redirect: "manual" }).then((res) => { + expect(res.status).toEqual(301); + expect(res.headers.get("location")).toContain(SSLproxyUrl); }); + fetch(redirectUrl, { redirect: "follow" }) + .then((res) => res.json()) + .then((body) => { + expect(body).toEqual( + jasmine.objectContaining({ + name: "default", + }) + ); + done(); + }); }); }); @@ -222,15 +217,11 @@ describe("CLI Tests", function () { ]; executeCLI(execCmd, args).then((cliProcess) => { childProcess = cliProcess; - r(redirectUrl) - .then(() => { - fail("A 301 redirect should have been thrown."); - }) - .catch((requestError) => { - expect(requestError.statusCode).toEqual(301); - expect(requestError.response.headers.location).toContain(redirectToUrl); - done(); - }); + fetch(redirectUrl, { redirect: "manual" }).then((res) => { + expect(res.status).toEqual(301); + expect(res.headers.get("location")).toContain(redirectToUrl); + done(); + }); }); }); @@ -253,16 +244,17 @@ describe("CLI Tests", function () { ]; executeCLI(execCmd, args).then((cliProcess) => { childProcess = cliProcess; - r(SSLproxyUrl).then((body) => { - body = JSON.parse(body); - expect(body.headers).toEqual( - jasmine.objectContaining({ - k1: "v1", - k2: "host:123", - }) - ); - done(); - }); + fetch(SSLproxyUrl) + .then((res) => res.json()) + .then((body) => { + expect(body.headers).toEqual( + jasmine.objectContaining({ + k1: "v1", + k2: "host:123", + }) + ); + done(); + }); }); }); it("invalid-custom-header", function (done) { diff --git a/test/proxy_spec.js b/test/proxy_spec.js index 46ae514d..efca8319 100644 --- a/test/proxy_spec.js +++ b/test/proxy_spec.js @@ -1,13 +1,12 @@ // jshint jasmine: true "use strict"; -var http = require("http"); -var path = require("path"); -var util = require("../lib/testutil"); -var request = require("request-promise-native"); -var WebSocket = require("ws"); +const fetch = require("node-fetch"); +const path = require("path"); +const util = require("../lib/testutil"); +const WebSocket = require("ws"); -var ConfigurableProxy = require("../lib/configproxy").ConfigurableProxy; +const { ConfigurableProxy } = require("../lib/configproxy"); jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000; @@ -19,12 +18,6 @@ describe("Proxy Tests", function () { var hostTest = "test.localhost.jovyan.org"; var hostUrl = "http://" + hostTest + ":" + port; - var r = request.defaults({ - method: "GET", - url: proxyUrl, - followRedirect: false, - }); - beforeEach(function (callback) { util.setupProxy(port).then(function (newProxy) { proxy = newProxy; @@ -37,20 +30,21 @@ describe("Proxy Tests", function () { }); it("basic HTTP request", function (done) { - r(proxyUrl).then((body) => { - body = JSON.parse(body); - expect(body).toEqual( - jasmine.objectContaining({ - path: "/", - }) - ); - - // check last_activity was updated - return proxy._routes.get("/").then((route) => { - expect(route.last_activity).toBeGreaterThan(proxy._setup_timestamp); - done(); + fetch(proxyUrl) + .then((res) => res.json()) + .then((body) => { + expect(body).toEqual( + jasmine.objectContaining({ + path: "/", + }) + ); + + // check last_activity was updated + return proxy._routes.get("/").then((route) => { + expect(route.last_activity).toBeGreaterThan(proxy._setup_timestamp); + done(); + }); }); - }); }); it("basic WebSocket request", function (done) { @@ -88,18 +82,19 @@ describe("Proxy Tests", function () { }); it("keep-alive proxy request", function (done) { - var agent = new http.Agent({ keepAlive: true }); - r(proxyUrl, { agent: agent, resolveWithFullResponse: true }).then((res) => { - agent.destroy(); - var body = JSON.parse(res.body); - expect(body).toEqual( - jasmine.objectContaining({ - path: "/", - }) - ); - expect(res.headers["connection"]).toEqual("keep-alive"); - done(); - }); + fetch(proxyUrl) + .then((res) => { + expect(res.headers.get("connection")).toEqual("keep-alive"); + return res.json(); + }) + .then((body) => { + expect(body).toEqual( + jasmine.objectContaining({ + path: "/", + }) + ); + done(); + }); }); it("proxyRequest event can modify headers", function (done) { @@ -109,18 +104,21 @@ describe("Proxy Tests", function () { called.proxyRequest = true; }); - r(proxyUrl) + fetch(proxyUrl) + .then((res) => { + expect(res.status).toBe(200); + return res.json(); + }) .then(function (body) { - body = JSON.parse(body); - expect(called.proxyRequest).toBe(true); - expect(body).toEqual( + expect(body.headers).toEqual( jasmine.objectContaining({ - path: "/", + testing: "Test Passed", }) ); - expect(body.headers).toEqual( + expect(called.proxyRequest).toBe(true); + expect(body).toEqual( jasmine.objectContaining({ - testing: "Test Passed", + path: "/", }) ); }) @@ -130,9 +128,9 @@ describe("Proxy Tests", function () { it("target path is prepended by default", function (done) { util .addTarget(proxy, "/bar", testPort, false, "/foo") - .then(() => r(proxyUrl + "/bar/rest/of/it")) + .then(() => fetch(proxyUrl + "/bar/rest/of/it")) + .then((res) => res.json()) .then((body) => { - body = JSON.parse(body); expect(body).toEqual( jasmine.objectContaining({ path: "/bar", @@ -146,9 +144,9 @@ describe("Proxy Tests", function () { it("/prefix?query is proxied correctly", function (done) { util .addTarget(proxy, "/bar", testPort, null, "/foo") - .then(() => r(proxyUrl + "/bar?query=foo")) + .then(() => fetch(proxyUrl + "/bar?query=foo")) + .then((res) => res.json()) .then((body) => { - body = JSON.parse(body); expect(body).toEqual( jasmine.objectContaining({ target: "http://127.0.0.1:" + testPort + "/foo", @@ -163,9 +161,9 @@ describe("Proxy Tests", function () { it("handle URI encoding", function (done) { util .addTarget(proxy, "/b@r/b r", testPort, false, "/foo") - .then(() => r(proxyUrl + "/b%40r/b%20r/rest/of/it")) + .then(() => fetch(proxyUrl + "/b%40r/b%20r/rest/of/it")) + .then((res) => res.json()) .then((body) => { - body = JSON.parse(body); expect(body).toEqual( jasmine.objectContaining({ path: "/b@r/b r", @@ -179,9 +177,9 @@ describe("Proxy Tests", function () { it("handle @ in URI same as %40", function (done) { util .addTarget(proxy, "/b@r/b r", testPort, false, "/foo") - .then(() => r(proxyUrl + "/b@r/b%20r/rest/of/it")) + .then(() => fetch(proxyUrl + "/b@r/b%20r/rest/of/it")) + .then((res) => res.json()) .then((body) => { - body = JSON.parse(body); expect(body).toEqual( jasmine.objectContaining({ path: "/b@r/b r", @@ -196,9 +194,9 @@ describe("Proxy Tests", function () { proxy.proxy.options.prependPath = false; util .addTarget(proxy, "/bar", testPort, false, "/foo") - .then(() => r(proxyUrl + "/bar/rest/of/it")) + .then(() => fetch(proxyUrl + "/bar/rest/of/it")) + .then((res) => res.json()) .then((body) => { - body = JSON.parse(body); expect(body).toEqual( jasmine.objectContaining({ path: "/bar", @@ -213,9 +211,9 @@ describe("Proxy Tests", function () { proxy.includePrefix = false; util .addTarget(proxy, "/bar", testPort, false, "/foo") - .then(() => r(proxyUrl + "/bar/rest/of/it")) + .then(() => fetch(proxyUrl + "/bar/rest/of/it")) + .then((res) => res.json()) .then((body) => { - body = JSON.parse(body); expect(body).toEqual( jasmine.objectContaining({ path: "/bar", @@ -265,9 +263,9 @@ describe("Proxy Tests", function () { proxy.proxy.options.prependPath = false; util .addTarget(proxy, "/bar", testPort, false, "/foo") - .then(() => r(proxyUrl + "/bar/rest/of/it")) + .then(() => fetch(proxyUrl + "/bar/rest/of/it")) + .then((res) => res.json()) .then((body) => { - body = JSON.parse(body); expect(body).toEqual( jasmine.objectContaining({ path: "/bar", @@ -282,9 +280,9 @@ describe("Proxy Tests", function () { proxy.hostRouting = true; util .addTarget(proxy, "/" + hostTest, testPort, false, null) - .then(() => r(hostUrl + "/some/path")) + .then(() => fetch(hostUrl + "/some/path")) + .then((res) => res.json()) .then((body) => { - body = JSON.parse(body); expect(body).toEqual( jasmine.objectContaining({ target: "http://127.0.0.1:" + testPort, @@ -315,10 +313,9 @@ describe("Proxy Tests", function () { proxy._routes.update("/missing", { last_activity: firstActivity }); }) // fail a web request - .then(() => r(hostUrl + "/missing/prefix")) - .then((body) => done.fail("Expected 503")) - .catch((err) => { - expect(err.statusCode).toEqual(503); + .then(() => fetch(hostUrl + "/missing/prefix")) + .then((res) => { + expect(res.status).toEqual(503); }) // check that activity was not updated .then(expectNoActivity) @@ -343,12 +340,14 @@ describe("Proxy Tests", function () { var proxyPort = 55550; util .setupProxy(proxyPort, { errorTarget: "http://127.0.0.1:55565" }, []) - .then(() => r("http://127.0.0.1:" + proxyPort + "/foo/bar")) - .then((body) => done.fail("Expected 404")) - .catch((err) => { - expect(err.statusCode).toEqual(404); - expect(err.response.headers["content-type"]).toEqual("text/plain"); - expect(err.response.body).toEqual("/foo/bar"); + .then(() => fetch("http://127.0.0.1:" + proxyPort + "/foo/bar")) + .then((res) => { + expect(res.status).toEqual(404); + expect(res.headers.get("content-type")).toEqual("text/plain"); + return res.text(); + }) + .then((body) => { + expect(body).toEqual("/foo/bar"); }) .then(done); }); @@ -358,19 +357,23 @@ describe("Proxy Tests", function () { proxy .removeRoute("/") .then(() => proxy.addRoute("/missing", { target: "https://127.0.0.1:54321" })) - .then(() => r(hostUrl + "/nope")) - .then((body) => done.fail("Expected 404")) - .catch((err) => { - expect(err.statusCode).toEqual(404); - expect(err.response.headers["content-type"]).toEqual("text/html"); - expect(err.response.body).toMatch(/404'D/); + .then(() => fetch(hostUrl + "/nope")) + .then((res) => { + expect(res.status).toEqual(404); + expect(res.headers.get("content-type")).toEqual("text/html"); + return res.text(); }) - .then(() => r(hostUrl + "/missing/prefix")) - .then((body) => done.fail("Expected 503")) - .catch((err) => { - expect(err.statusCode).toEqual(503); - expect(err.response.headers["content-type"]).toEqual("text/html"); - expect(err.response.body).toMatch(/UNKNOWN/); + .then((body) => { + expect(body).toMatch(/404'D/); + }) + .then(() => fetch(hostUrl + "/missing/prefix")) + .then((res) => { + expect(res.status).toEqual(503); + expect(res.headers.get("content-type")).toEqual("text/html"); + return res.text(); + }) + .then((body) => { + expect(body).toMatch(/UNKNOWN/); }) .then(done); }); @@ -379,19 +382,23 @@ describe("Proxy Tests", function () { proxy.removeRoute("/"); proxy .addRoute("/missing", { target: "https://127.0.0.1:54321" }) - .then(() => r(hostUrl + "/nope")) - .then((body) => done.fail("Expected 404")) - .catch((err) => { - expect(err.statusCode).toEqual(404); - expect(err.response.headers["content-type"]).toEqual("text/html"); - expect(err.response.body).toMatch(/404:/); + .then(() => fetch(hostUrl + "/nope")) + .then((res) => { + expect(res.status).toEqual(404); + expect(res.headers.get("content-type")).toEqual("text/html"); + return res.text(); }) - .then(() => r(hostUrl + "/missing/prefix")) - .then((body) => done.fail("Expected 503")) - .catch((err) => { - expect(err.statusCode).toEqual(503); - expect(err.response.headers["content-type"]).toEqual("text/html"); - expect(err.response.body).toMatch(/503:/); + .then((body) => { + expect(body).toMatch(/404:/); + }) + .then(() => fetch(hostUrl + "/missing/prefix")) + .then((res) => { + expect(res.status).toEqual(503); + expect(res.headers.get("content-type")).toEqual("text/html"); + return res.text(); + }) + .then((body) => { + expect(body).toMatch(/503:/); }) .then(done); }); @@ -400,12 +407,14 @@ describe("Proxy Tests", function () { var proxyPort = 55550; util .setupProxy(proxyPort, { errorTarget: "http://127.0.0.1:55565" }, []) - .then(() => r("http://127.0.0.1:" + proxyPort + "/%")) - .then((body) => done.fail("Expected 500")) - .catch((err) => { - expect(err.statusCode).toEqual(500); - expect(err.response.headers["content-type"]).toEqual("text/plain"); - expect(err.response.body).toEqual("/%"); + .then(() => fetch("http://127.0.0.1:" + proxyPort + "/%")) + .then((res) => { + expect(res.status).toEqual(500); + expect(res.headers.get("content-type")).toEqual("text/plain"); + return res.text(); + }) + .then((body) => { + expect(body).toEqual("/%"); }) .then(done); }); @@ -414,11 +423,10 @@ describe("Proxy Tests", function () { var redirectTo = "http://foo.com:12345/whatever"; util .addTargetRedirecting(proxy, "/external/urlpath/", testPort, "/internal/urlpath/", redirectTo) - .then(() => r(proxyUrl + "/external/urlpath/rest/of/it")) - .then((body) => done.fail("Expected 301")) - .catch((err) => { - expect(err.statusCode).toEqual(301); - expect(err.response.headers.location).toEqual(redirectTo); + .then(() => fetch(proxyUrl + "/external/urlpath/rest/of/it", { redirect: "manual" })) + .then((res) => { + expect(res.status).toEqual(301); + expect(res.headers.get("location")).toEqual(redirectTo); }) .then(done); }); @@ -446,20 +454,25 @@ describe("Proxy Tests", function () { redirectTo ) ) - .then(() => r("http://127.0.0.1:" + proxyPort + "/external/urlpath/")) - .then((body) => done.fail("Expected 301")) + .then(() => + fetch("http://127.0.0.1:" + proxyPort + "/external/urlpath/", { redirect: "manual" }) + ) + .then((res) => { + expect(res.status).toEqual(301); + expect(res.headers.get("location")).toEqual(expectedRedirect); + }) .catch((err) => { - expect(err.statusCode).toEqual(301); - expect(err.response.headers.location).toEqual(expectedRedirect); + done.fail(err); }) .then(done); }); it("health check request", function (done) { - r(proxyUrl + "/_chp_healthz").then((body) => { - body = JSON.parse(body); - expect(body).toEqual({ status: "OK" }); - done(); - }); + fetch(proxyUrl + "/_chp_healthz") + .then((res) => res.json()) + .then((body) => { + expect(body).toEqual({ status: "OK" }); + done(); + }); }); });