diff --git a/packages/thrift-client-zipkin-filter/package-lock.json b/packages/thrift-client-zipkin-filter/package-lock.json
index 5d30842c..9d0240d6 100644
--- a/packages/thrift-client-zipkin-filter/package-lock.json
+++ b/packages/thrift-client-zipkin-filter/package-lock.json
@@ -30,51 +30,12 @@
 				"js-tokens": "^4.0.0"
 			}
 		},
-		"@types/caseless": {
-			"version": "0.12.2",
-			"resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz",
-			"integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="
-		},
 		"@types/node": {
 			"version": "12.20.41",
 			"resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.41.tgz",
 			"integrity": "sha512-f6xOqucbDirG7LOzedpvzjP3UTmHttRou3Mosx3vL9wr9AIQGhcPgVnqa8ihpZYnxyM1rxeNCvTyukPKZtq10Q==",
 			"dev": true
 		},
-		"@types/request": {
-			"version": "2.48.8",
-			"resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.8.tgz",
-			"integrity": "sha512-whjk1EDJPcAR2kYHRbFl/lKeeKYTi05A15K9bnLInCVroNDCtXce57xKdI0/rQaA3K+6q0eFyUBPmqfSndUZdQ==",
-			"requires": {
-				"@types/caseless": "*",
-				"@types/node": "*",
-				"@types/tough-cookie": "*",
-				"form-data": "^2.5.0"
-			},
-			"dependencies": {
-				"@types/node": {
-					"version": "17.0.8",
-					"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz",
-					"integrity": "sha512-YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg=="
-				}
-			}
-		},
-		"@types/tough-cookie": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.1.tgz",
-			"integrity": "sha512-Y0K95ThC3esLEYD6ZuqNek29lNX2EM1qxV8y2FTLUB0ff5wWrk7az+mLrnNFUnaXcgKye22+sFBRXOgpPILZNg=="
-		},
-		"ajv": {
-			"version": "6.12.6",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-			"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-styles": {
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -93,34 +54,6 @@
 				"sprintf-js": "~1.0.2"
 			}
 		},
-		"asn1": {
-			"version": "0.2.6",
-			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
-			"integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
-			"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="
-		},
-		"asynckit": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-		},
-		"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="
-		},
-		"aws4": {
-			"version": "1.11.0",
-			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-			"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
-		},
 		"balanced-match": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -132,14 +65,6 @@
 			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
 			"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
 		},
-		"bcrypt-pbkdf": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-			"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-			"requires": {
-				"tweetnacl": "^0.14.3"
-			}
-		},
 		"brace-expansion": {
 			"version": "1.1.11",
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -156,11 +81,6 @@
 			"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
 			"dev": true
 		},
-		"caseless": {
-			"version": "0.12.0",
-			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-		},
 		"chalk": {
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -187,14 +107,6 @@
 			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
 			"dev": true
 		},
-		"combined-stream": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-			"requires": {
-				"delayed-stream": "~1.0.0"
-			}
-		},
 		"commander": {
 			"version": "2.20.3",
 			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -207,39 +119,20 @@
 			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
 			"dev": true
 		},
-		"core-util-is": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-		},
-		"dashdash": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+		"cross-fetch": {
+			"version": "3.1.4",
+			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz",
+			"integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
 			"requires": {
-				"assert-plus": "^1.0.0"
+				"node-fetch": "2.6.1"
 			}
 		},
-		"delayed-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-		},
 		"diff": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
 			"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
 			"dev": true
 		},
-		"ecc-jsbn": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-			"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-			"requires": {
-				"jsbn": "~0.1.0",
-				"safer-buffer": "^2.1.0"
-			}
-		},
 		"escape-string-regexp": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -262,47 +155,12 @@
 			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
 			"dev": true
 		},
-		"extend": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-		},
-		"extsprintf": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-		},
-		"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=="
-		},
 		"fast-diff": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
 			"integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
 			"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=="
-		},
-		"forever-agent": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-		},
-		"form-data": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
-			"integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
-			"requires": {
-				"asynckit": "^0.4.0",
-				"combined-stream": "^1.0.6",
-				"mime-types": "^2.1.12"
-			}
-		},
 		"fs.realpath": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -315,14 +173,6 @@
 			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
 			"dev": true
 		},
-		"getpass": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"requires": {
-				"assert-plus": "^1.0.0"
-			}
-		},
 		"glob": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
@@ -337,20 +187,6 @@
 				"path-is-absolute": "^1.0.0"
 			}
 		},
-		"har-schema": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-		},
-		"har-validator": {
-			"version": "5.1.5",
-			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-			"integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-			"requires": {
-				"ajv": "^6.12.3",
-				"har-schema": "^2.0.0"
-			}
-		},
 		"has": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -366,16 +202,6 @@
 			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
 			"dev": true
 		},
-		"http-signature": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-			"requires": {
-				"assert-plus": "^1.0.0",
-				"jsprim": "^1.2.2",
-				"sshpk": "^1.7.0"
-			}
-		},
 		"inflight": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -406,16 +232,6 @@
 			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
 			"integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
 		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-		},
-		"isstream": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-		},
 		"jest-docblock": {
 			"version": "21.2.0",
 			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz",
@@ -438,56 +254,12 @@
 				"esprima": "^4.0.0"
 			}
 		},
-		"jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
-		},
-		"json-schema": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-			"integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
-		},
-		"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=="
-		},
-		"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="
-		},
-		"jsprim": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
-			"integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
-			"requires": {
-				"assert-plus": "1.0.0",
-				"extsprintf": "1.3.0",
-				"json-schema": "0.4.0",
-				"verror": "1.10.0"
-			}
-		},
 		"lines-and-columns": {
 			"version": "1.2.4",
 			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
 			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
 			"dev": true
 		},
-		"mime-db": {
-			"version": "1.51.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
-			"integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
-		},
-		"mime-types": {
-			"version": "2.1.34",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
-			"integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
-			"requires": {
-				"mime-db": "1.51.0"
-			}
-		},
 		"minimatch": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -512,10 +284,10 @@
 				"minimist": "^1.2.5"
 			}
 		},
-		"oauth-sign": {
-			"version": "0.9.0",
-			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-			"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+		"node-fetch": {
+			"version": "2.6.1",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+			"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
 		},
 		"once": {
 			"version": "1.4.0",
@@ -538,71 +310,12 @@
 			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
 			"dev": true
 		},
-		"performance-now": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-			"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-		},
 		"prettier": {
 			"version": "2.5.1",
 			"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
 			"integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
 			"dev": true
 		},
-		"psl": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-			"integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
-		},
-		"punycode": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-		},
-		"qs": {
-			"version": "6.5.3",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-			"integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="
-		},
-		"request": {
-			"version": "2.88.2",
-			"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-			"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-			"requires": {
-				"aws-sign2": "~0.7.0",
-				"aws4": "^1.8.0",
-				"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"
-			},
-			"dependencies": {
-				"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==",
-					"requires": {
-						"asynckit": "^0.4.0",
-						"combined-stream": "^1.0.6",
-						"mime-types": "^2.1.12"
-					}
-				}
-			}
-		},
 		"resolve": {
 			"version": "1.21.0",
 			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.21.0.tgz",
@@ -623,16 +336,6 @@
 				"glob": "^7.1.3"
 			}
 		},
-		"safe-buffer": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-		},
-		"safer-buffer": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-		},
 		"semver": {
 			"version": "5.7.1",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@@ -645,22 +348,6 @@
 			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
 			"dev": true
 		},
-		"sshpk": {
-			"version": "1.17.0",
-			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
-			"integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
-			"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"
-			}
-		},
 		"supports-color": {
 			"version": "5.5.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -676,15 +363,6 @@
 			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
 			"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==",
-			"requires": {
-				"psl": "^1.1.28",
-				"punycode": "^2.1.1"
-			}
-		},
 		"tslib": {
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
@@ -738,48 +416,12 @@
 				"tslib": "^1.8.1"
 			}
 		},
-		"tunnel-agent": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-			"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="
-		},
 		"typescript": {
 			"version": "4.4.4",
 			"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
 			"integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
 			"dev": true
 		},
-		"uri-js": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-			"requires": {
-				"punycode": "^2.1.0"
-			}
-		},
-		"uuid": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-			"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
-		},
-		"verror": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-			"requires": {
-				"assert-plus": "^1.0.0",
-				"core-util-is": "1.0.2",
-				"extsprintf": "^1.2.0"
-			}
-		},
 		"wrappy": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/packages/thrift-client-zipkin-filter/package.json b/packages/thrift-client-zipkin-filter/package.json
index ccf343f3..a5bfbf57 100644
--- a/packages/thrift-client-zipkin-filter/package.json
+++ b/packages/thrift-client-zipkin-filter/package.json
@@ -44,8 +44,7 @@
         "typescript": "~4.4.4"
     },
     "dependencies": {
-        "@types/request": "^2.48.8",
-        "request": "^2.88.2",
+        "cross-fetch": "^3.1.4",
         "zipkin": "^0.22.0"
     }
 }
diff --git a/packages/thrift-client-zipkin-filter/src/main/ThriftClientZipkinFilter.ts b/packages/thrift-client-zipkin-filter/src/main/ThriftClientZipkinFilter.ts
index 28c1e2d4..b1f4c7cd 100644
--- a/packages/thrift-client-zipkin-filter/src/main/ThriftClientZipkinFilter.ts
+++ b/packages/thrift-client-zipkin-filter/src/main/ThriftClientZipkinFilter.ts
@@ -1,7 +1,5 @@
 import { Instrumentation, TraceId, Tracer } from 'zipkin'
 
-import { CoreOptions } from 'request'
-
 import {
     formatUrl,
     IRequestContext,
@@ -15,6 +13,7 @@ import {
     IThriftClientFilter,
     IThriftRequest,
     NextFunction,
+    RequestOptions,
 } from '@statestitle/thrift-client'
 
 import {
@@ -65,7 +64,7 @@ function readRequestContext(
 }
 
 function readRequestHeaders(
-    request: IThriftRequest<CoreOptions>,
+    request: IThriftRequest<RequestOptions>,
 ): IRequestHeaders {
     if (request.context && request.context.headers) {
         return request.context.headers
@@ -78,7 +77,7 @@ export function ThriftClientZipkinFilter<Context extends IRequest>({
     localServiceName,
     remoteServiceName,
     tracerConfig = {},
-}: IZipkinClientOptions): IThriftClientFilter<CoreOptions> {
+}: IZipkinClientOptions): IThriftClientFilter<RequestOptions> {
     const serviceName: string = remoteServiceName || localServiceName
     const tracer: Tracer = getTracerForService(serviceName, tracerConfig)
     const instrumentation = new Instrumentation.HttpClient({
@@ -90,8 +89,8 @@ export function ThriftClientZipkinFilter<Context extends IRequest>({
     return {
         methods: [],
         handler(
-            request: IThriftRequest<CoreOptions>,
-            next: NextFunction<CoreOptions>,
+            request: IThriftRequest<RequestOptions>,
+            next: NextFunction<RequestOptions>,
         ): Promise<IRequestResponse> {
             const requestHeaders: IRequestHeaders = readRequestHeaders(request)
             const requestContext: IRequestContext = readRequestContext(
diff --git a/packages/thrift-client/package-lock.json b/packages/thrift-client/package-lock.json
index c3251d93..aa63c092 100644
--- a/packages/thrift-client/package-lock.json
+++ b/packages/thrift-client/package-lock.json
@@ -13,12 +13,211 @@
 				"@babel/highlight": "^7.16.7"
 			}
 		},
+		"@babel/compat-data": {
+			"version": "7.16.8",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.8.tgz",
+			"integrity": "sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==",
+			"dev": true
+		},
+		"@babel/core": {
+			"version": "7.16.12",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz",
+			"integrity": "sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.16.7",
+				"@babel/generator": "^7.16.8",
+				"@babel/helper-compilation-targets": "^7.16.7",
+				"@babel/helper-module-transforms": "^7.16.7",
+				"@babel/helpers": "^7.16.7",
+				"@babel/parser": "^7.16.12",
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.16.10",
+				"@babel/types": "^7.16.8",
+				"convert-source-map": "^1.7.0",
+				"debug": "^4.1.0",
+				"gensync": "^1.0.0-beta.2",
+				"json5": "^2.1.2",
+				"semver": "^6.3.0",
+				"source-map": "^0.5.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.5.7",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+					"dev": true
+				}
+			}
+		},
+		"@babel/eslint-parser": {
+			"version": "7.16.5",
+			"resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.16.5.tgz",
+			"integrity": "sha512-mUqYa46lgWqHKQ33Q6LNCGp/wPR3eqOYTUixHFsfrSQqRxH0+WOzca75iEjFr5RDGH1dDz622LaHhLOzOuQRUA==",
+			"dev": true,
+			"requires": {
+				"eslint-scope": "^5.1.1",
+				"eslint-visitor-keys": "^2.1.0",
+				"semver": "^6.3.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/generator": {
+			"version": "7.16.8",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz",
+			"integrity": "sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.8",
+				"jsesc": "^2.5.1",
+				"source-map": "^0.5.0"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.5.7",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+					"dev": true
+				}
+			}
+		},
+		"@babel/helper-compilation-targets": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz",
+			"integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
+			"dev": true,
+			"requires": {
+				"@babel/compat-data": "^7.16.4",
+				"@babel/helper-validator-option": "^7.16.7",
+				"browserslist": "^4.17.5",
+				"semver": "^6.3.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/helper-environment-visitor": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
+			"integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-function-name": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
+			"integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-get-function-arity": "^7.16.7",
+				"@babel/template": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-get-function-arity": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
+			"integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-hoist-variables": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
+			"integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-module-imports": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
+			"integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-module-transforms": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz",
+			"integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-environment-visitor": "^7.16.7",
+				"@babel/helper-module-imports": "^7.16.7",
+				"@babel/helper-simple-access": "^7.16.7",
+				"@babel/helper-split-export-declaration": "^7.16.7",
+				"@babel/helper-validator-identifier": "^7.16.7",
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-simple-access": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz",
+			"integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-split-export-declaration": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
+			"integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
 		"@babel/helper-validator-identifier": {
 			"version": "7.16.7",
 			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
 			"integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
 			"dev": true
 		},
+		"@babel/helper-validator-option": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
+			"integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+			"dev": true
+		},
+		"@babel/helpers": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz",
+			"integrity": "sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==",
+			"dev": true,
+			"requires": {
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			}
+		},
 		"@babel/highlight": {
 			"version": "7.16.7",
 			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.7.tgz",
@@ -30,10 +229,239 @@
 				"js-tokens": "^4.0.0"
 			}
 		},
-		"@types/caseless": {
-			"version": "0.12.2",
-			"resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz",
-			"integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="
+		"@babel/parser": {
+			"version": "7.16.12",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz",
+			"integrity": "sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==",
+			"dev": true
+		},
+		"@babel/template": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
+			"integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.16.7",
+				"@babel/parser": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/traverse": {
+			"version": "7.16.10",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz",
+			"integrity": "sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.16.7",
+				"@babel/generator": "^7.16.8",
+				"@babel/helper-environment-visitor": "^7.16.7",
+				"@babel/helper-function-name": "^7.16.7",
+				"@babel/helper-hoist-variables": "^7.16.7",
+				"@babel/helper-split-export-declaration": "^7.16.7",
+				"@babel/parser": "^7.16.10",
+				"@babel/types": "^7.16.8",
+				"debug": "^4.1.0",
+				"globals": "^11.1.0"
+			}
+		},
+		"@babel/types": {
+			"version": "7.16.8",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz",
+			"integrity": "sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-validator-identifier": "^7.16.7",
+				"to-fast-properties": "^2.0.0"
+			}
+		},
+		"@eslint/eslintrc": {
+			"version": "0.4.3",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+			"integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+			"dev": true,
+			"requires": {
+				"ajv": "^6.12.4",
+				"debug": "^4.1.1",
+				"espree": "^7.3.0",
+				"globals": "^13.9.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.2.1",
+				"js-yaml": "^3.13.1",
+				"minimatch": "^3.0.4",
+				"strip-json-comments": "^3.1.1"
+			},
+			"dependencies": {
+				"globals": {
+					"version": "13.12.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
+					"integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
+					"dev": true,
+					"requires": {
+						"type-fest": "^0.20.2"
+					}
+				}
+			}
+		},
+		"@hapi/boom": {
+			"version": "9.1.4",
+			"resolved": "https://registry.npmjs.org/@hapi/boom/-/boom-9.1.4.tgz",
+			"integrity": "sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw==",
+			"dev": true,
+			"requires": {
+				"@hapi/hoek": "9.x.x"
+			}
+		},
+		"@hapi/bossy": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/@hapi/bossy/-/bossy-5.1.0.tgz",
+			"integrity": "sha512-sVZC6GucPaG2Pugldj476ZtGevkFCOoJSf4Ay9HJXxAOjyyBhb0AnxtxYdrf1tvTBV2hAMytV3RASQXudB3rnQ==",
+			"dev": true,
+			"requires": {
+				"@hapi/boom": "9.x.x",
+				"@hapi/bounce": "2.x.x",
+				"@hapi/bourne": "2.x.x",
+				"@hapi/hoek": "9.x.x",
+				"@hapi/validate": "1.x.x"
+			}
+		},
+		"@hapi/bounce": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@hapi/bounce/-/bounce-2.0.0.tgz",
+			"integrity": "sha512-JesW92uyzOOyuzJKjoLHM1ThiOvHPOLDHw01YV8yh5nCso7sDwJho1h0Ad2N+E62bZyz46TG3xhAi/78Gsct6A==",
+			"dev": true,
+			"requires": {
+				"@hapi/boom": "9.x.x",
+				"@hapi/hoek": "9.x.x"
+			}
+		},
+		"@hapi/bourne": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-2.0.0.tgz",
+			"integrity": "sha512-WEezM1FWztfbzqIUbsDzFRVMxSoLy3HugVcux6KDDtTqzPsLE8NDRHfXvev66aH1i2oOKKar3/XDjbvh/OUBdg==",
+			"dev": true
+		},
+		"@hapi/code": {
+			"version": "8.0.6",
+			"resolved": "https://registry.npmjs.org/@hapi/code/-/code-8.0.6.tgz",
+			"integrity": "sha512-JHFQx8huQn5kROzYJ/NS85f/k95ovF/9ZUbdlvMf/KuZ3NQ7ALIgCqcVEwKlx/1N4HElt70tGa8ZGhqGrnUIqA==",
+			"dev": true,
+			"requires": {
+				"@hapi/hoek": "9.x.x"
+			}
+		},
+		"@hapi/eslint-plugin": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/@hapi/eslint-plugin/-/eslint-plugin-5.1.0.tgz",
+			"integrity": "sha512-D0OvhsjbWW4lhuw0LqERl8vqCIRMnePy9XGYhkf7krzwqzYNEAcBFCafiFsd0gIF6QiQj3O1vYmshRVFZMXdwQ==",
+			"dev": true
+		},
+		"@hapi/hoek": {
+			"version": "9.2.1",
+			"resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.1.tgz",
+			"integrity": "sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw==",
+			"dev": true
+		},
+		"@hapi/lab": {
+			"version": "24.5.1",
+			"resolved": "https://registry.npmjs.org/@hapi/lab/-/lab-24.5.1.tgz",
+			"integrity": "sha512-agGsoikQVntGcnSzyo73e7tVI2FByEzUoLmfLlzlBX2tyvdiYJ0HLB/xKyry0mfiGD5SGb4kkD+b5hbHK0dwdg==",
+			"dev": true,
+			"requires": {
+				"@babel/core": "^7.14.3",
+				"@babel/eslint-parser": "^7.14.3",
+				"@hapi/bossy": "5.x.x",
+				"@hapi/eslint-plugin": "^5.1.0",
+				"@hapi/hoek": "9.x.x",
+				"diff": "4.x.x",
+				"eslint": "7.x.x",
+				"find-rc": "4.x.x",
+				"globby": "10.x.x",
+				"handlebars": "4.x.x",
+				"seedrandom": "3.x.x",
+				"source-map": "0.7.x",
+				"source-map-support": "0.5.x",
+				"supports-color": "7.x.x",
+				"will-call": "1.x.x"
+			},
+			"dependencies": {
+				"has-flag": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "7.2.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^4.0.0"
+					}
+				}
+			}
+		},
+		"@hapi/topo": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
+			"integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
+			"dev": true,
+			"requires": {
+				"@hapi/hoek": "^9.0.0"
+			}
+		},
+		"@hapi/validate": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/@hapi/validate/-/validate-1.1.3.tgz",
+			"integrity": "sha512-/XMR0N0wjw0Twzq2pQOzPBZlDzkekGcoCtzO314BpIEsbXdYGthQUbxgkGDf4nhk1+IPDAsXqWjMohRQYO06UA==",
+			"dev": true,
+			"requires": {
+				"@hapi/hoek": "^9.0.0",
+				"@hapi/topo": "^5.0.0"
+			}
+		},
+		"@humanwhocodes/config-array": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+			"integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+			"dev": true,
+			"requires": {
+				"@humanwhocodes/object-schema": "^1.2.0",
+				"debug": "^4.1.1",
+				"minimatch": "^3.0.4"
+			}
+		},
+		"@humanwhocodes/object-schema": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+			"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+			"dev": true
+		},
+		"@nodelib/fs.scandir": {
+			"version": "2.1.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+			"dev": true,
+			"requires": {
+				"@nodelib/fs.stat": "2.0.5",
+				"run-parallel": "^1.1.9"
+			}
+		},
+		"@nodelib/fs.stat": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+			"dev": true
+		},
+		"@nodelib/fs.walk": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+			"dev": true,
+			"requires": {
+				"@nodelib/fs.scandir": "2.1.5",
+				"fastq": "^1.6.0"
+			}
 		},
 		"@types/generic-pool": {
 			"version": "3.1.10",
@@ -50,39 +478,55 @@
 				}
 			}
 		},
+		"@types/glob": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+			"integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+			"dev": true,
+			"requires": {
+				"@types/minimatch": "*",
+				"@types/node": "*"
+			}
+		},
+		"@types/minimatch": {
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
+			"integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
+			"dev": true
+		},
 		"@types/node": {
 			"version": "12.20.41",
 			"resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.41.tgz",
 			"integrity": "sha512-f6xOqucbDirG7LOzedpvzjP3UTmHttRou3Mosx3vL9wr9AIQGhcPgVnqa8ihpZYnxyM1rxeNCvTyukPKZtq10Q==",
 			"dev": true
 		},
-		"@types/request": {
-			"version": "2.48.8",
-			"resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.8.tgz",
-			"integrity": "sha512-whjk1EDJPcAR2kYHRbFl/lKeeKYTi05A15K9bnLInCVroNDCtXce57xKdI0/rQaA3K+6q0eFyUBPmqfSndUZdQ==",
+		"@types/node-fetch": {
+			"version": "2.5.12",
+			"resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz",
+			"integrity": "sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==",
+			"dev": true,
 			"requires": {
-				"@types/caseless": "*",
 				"@types/node": "*",
-				"@types/tough-cookie": "*",
-				"form-data": "^2.5.0"
-			},
-			"dependencies": {
-				"@types/node": {
-					"version": "17.0.8",
-					"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz",
-					"integrity": "sha512-YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg=="
-				}
+				"form-data": "^3.0.0"
 			}
 		},
-		"@types/tough-cookie": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.1.tgz",
-			"integrity": "sha512-Y0K95ThC3esLEYD6ZuqNek29lNX2EM1qxV8y2FTLUB0ff5wWrk7az+mLrnNFUnaXcgKye22+sFBRXOgpPILZNg=="
+		"acorn": {
+			"version": "7.4.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+			"dev": true
+		},
+		"acorn-jsx": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+			"dev": true
 		},
 		"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",
@@ -90,6 +534,18 @@
 				"uri-js": "^4.2.2"
 			}
 		},
+		"ansi-colors": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+			"dev": true
+		},
+		"ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true
+		},
 		"ansi-styles": {
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -108,33 +564,23 @@
 				"sprintf-js": "~1.0.2"
 			}
 		},
-		"asn1": {
-			"version": "0.2.6",
-			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
-			"integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
-			"requires": {
-				"safer-buffer": "~2.1.0"
-			}
+		"array-union": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+			"dev": true
 		},
-		"assert-plus": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-			"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+		"astral-regex": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+			"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+			"dev": true
 		},
 		"asynckit": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-		},
-		"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="
-		},
-		"aws4": {
-			"version": "1.11.0",
-			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-			"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
+			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+			"dev": true
 		},
 		"balanced-match": {
 			"version": "1.0.2",
@@ -142,14 +588,6 @@
 			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
 			"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=",
-			"requires": {
-				"tweetnacl": "^0.14.3"
-			}
-		},
 		"brace-expansion": {
 			"version": "1.1.11",
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -160,16 +598,51 @@
 				"concat-map": "0.0.1"
 			}
 		},
+		"braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
+			"requires": {
+				"fill-range": "^7.0.1"
+			}
+		},
+		"browserslist": {
+			"version": "4.19.1",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
+			"integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
+			"dev": true,
+			"requires": {
+				"caniuse-lite": "^1.0.30001286",
+				"electron-to-chromium": "^1.4.17",
+				"escalade": "^3.1.1",
+				"node-releases": "^2.0.1",
+				"picocolors": "^1.0.0"
+			}
+		},
+		"buffer-from": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+			"dev": true
+		},
 		"builtin-modules": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
 			"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
 			"dev": true
 		},
-		"caseless": {
-			"version": "0.12.0",
-			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+		"callsites": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+			"dev": true
+		},
+		"caniuse-lite": {
+			"version": "1.0.30001301",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001301.tgz",
+			"integrity": "sha512-csfD/GpHMqgEL3V3uIgosvh+SVIQvCh43SNu9HRbP1lnxkKm1kjDG4f32PP571JplkLjfS+mg2p1gxR7MYrrIA==",
+			"dev": true
 		},
 		"chalk": {
 			"version": "2.4.2",
@@ -201,6 +674,7 @@
 			"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"
 			}
@@ -217,23 +691,54 @@
 			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
 			"dev": true
 		},
-		"core-util-is": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+		"convert-source-map": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+			"integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "~5.1.1"
+			}
 		},
-		"dashdash": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+		"cross-fetch": {
+			"version": "3.1.4",
+			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz",
+			"integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
+			"requires": {
+				"node-fetch": "2.6.1"
+			}
+		},
+		"cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dev": true,
+			"requires": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			}
+		},
+		"debug": {
+			"version": "4.3.3",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+			"integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+			"dev": true,
 			"requires": {
-				"assert-plus": "^1.0.0"
+				"ms": "2.1.2"
 			}
 		},
+		"deep-is": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+			"dev": true
+		},
 		"delayed-stream": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+			"dev": true
 		},
 		"diff": {
 			"version": "4.0.2",
@@ -241,21 +746,189 @@
 			"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
 			"dev": true
 		},
-		"ecc-jsbn": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-			"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+		"dir-glob": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+			"dev": true,
+			"requires": {
+				"path-type": "^4.0.0"
+			}
+		},
+		"doctrine": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+			"dev": true,
 			"requires": {
-				"jsbn": "~0.1.0",
-				"safer-buffer": "^2.1.0"
+				"esutils": "^2.0.2"
 			}
 		},
+		"electron-to-chromium": {
+			"version": "1.4.52",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.52.tgz",
+			"integrity": "sha512-JGkh8HEh5PnVrhU4HbpyyO0O791dVY6k7AdqfDeqbcRMeoGxtNHWT77deR2nhvbLe4dKpxjlDEvdEwrvRLGu2Q==",
+			"dev": true
+		},
+		"emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"dev": true
+		},
+		"enquirer": {
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+			"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+			"dev": true,
+			"requires": {
+				"ansi-colors": "^4.1.1"
+			}
+		},
+		"escalade": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+			"dev": true
+		},
 		"escape-string-regexp": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
 			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
 			"dev": true
 		},
+		"eslint": {
+			"version": "7.32.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+			"integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "7.12.11",
+				"@eslint/eslintrc": "^0.4.3",
+				"@humanwhocodes/config-array": "^0.5.0",
+				"ajv": "^6.10.0",
+				"chalk": "^4.0.0",
+				"cross-spawn": "^7.0.2",
+				"debug": "^4.0.1",
+				"doctrine": "^3.0.0",
+				"enquirer": "^2.3.5",
+				"escape-string-regexp": "^4.0.0",
+				"eslint-scope": "^5.1.1",
+				"eslint-utils": "^2.1.0",
+				"eslint-visitor-keys": "^2.0.0",
+				"espree": "^7.3.1",
+				"esquery": "^1.4.0",
+				"esutils": "^2.0.2",
+				"fast-deep-equal": "^3.1.3",
+				"file-entry-cache": "^6.0.1",
+				"functional-red-black-tree": "^1.0.1",
+				"glob-parent": "^5.1.2",
+				"globals": "^13.6.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.0.0",
+				"imurmurhash": "^0.1.4",
+				"is-glob": "^4.0.0",
+				"js-yaml": "^3.13.1",
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"levn": "^0.4.1",
+				"lodash.merge": "^4.6.2",
+				"minimatch": "^3.0.4",
+				"natural-compare": "^1.4.0",
+				"optionator": "^0.9.1",
+				"progress": "^2.0.0",
+				"regexpp": "^3.1.0",
+				"semver": "^7.2.1",
+				"strip-ansi": "^6.0.0",
+				"strip-json-comments": "^3.1.0",
+				"table": "^6.0.9",
+				"text-table": "^0.2.0",
+				"v8-compile-cache": "^2.0.3"
+			},
+			"dependencies": {
+				"@babel/code-frame": {
+					"version": "7.12.11",
+					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+					"integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+					"dev": true,
+					"requires": {
+						"@babel/highlight": "^7.10.4"
+					}
+				},
+				"ansi-styles": {
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+					"dev": true,
+					"requires": {
+						"color-convert": "^2.0.1"
+					}
+				},
+				"chalk": {
+					"version": "4.1.2",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^4.1.0",
+						"supports-color": "^7.1.0"
+					}
+				},
+				"color-convert": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+					"dev": true,
+					"requires": {
+						"color-name": "~1.1.4"
+					}
+				},
+				"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
+				},
+				"escape-string-regexp": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+					"dev": true
+				},
+				"globals": {
+					"version": "13.12.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
+					"integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
+					"dev": true,
+					"requires": {
+						"type-fest": "^0.20.2"
+					}
+				},
+				"has-flag": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+					"dev": true
+				},
+				"semver": {
+					"version": "7.3.5",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+					"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
+				},
+				"supports-color": {
+					"version": "7.2.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^4.0.0"
+					}
+				}
+			}
+		},
 		"eslint-plugin-prettier": {
 			"version": "2.7.0",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.7.0.tgz",
@@ -266,26 +939,115 @@
 				"jest-docblock": "^21.0.0"
 			}
 		},
+		"eslint-scope": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+			"dev": true,
+			"requires": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^4.1.1"
+			}
+		},
+		"eslint-utils": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+			"integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+			"dev": true,
+			"requires": {
+				"eslint-visitor-keys": "^1.1.0"
+			},
+			"dependencies": {
+				"eslint-visitor-keys": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+					"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+					"dev": true
+				}
+			}
+		},
+		"eslint-visitor-keys": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+			"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+			"dev": true
+		},
+		"espree": {
+			"version": "7.3.1",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+			"integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+			"dev": true,
+			"requires": {
+				"acorn": "^7.4.0",
+				"acorn-jsx": "^5.3.1",
+				"eslint-visitor-keys": "^1.3.0"
+			},
+			"dependencies": {
+				"eslint-visitor-keys": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+					"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+					"dev": true
+				}
+			}
+		},
 		"esprima": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
 			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
 			"dev": true
 		},
-		"extend": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+		"esquery": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+			"dev": true,
+			"requires": {
+				"estraverse": "^5.1.0"
+			},
+			"dependencies": {
+				"estraverse": {
+					"version": "5.3.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+					"dev": true
+				}
+			}
+		},
+		"esrecurse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+			"dev": true,
+			"requires": {
+				"estraverse": "^5.2.0"
+			},
+			"dependencies": {
+				"estraverse": {
+					"version": "5.3.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+					"dev": true
+				}
+			}
+		},
+		"estraverse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+			"dev": true
 		},
-		"extsprintf": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+		"esutils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+			"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=="
+			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+			"dev": true
 		},
 		"fast-diff": {
 			"version": "1.2.0",
@@ -293,23 +1055,88 @@
 			"integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
 			"dev": true
 		},
+		"fast-glob": {
+			"version": "3.2.11",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+			"integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+			"dev": true,
+			"requires": {
+				"@nodelib/fs.stat": "^2.0.2",
+				"@nodelib/fs.walk": "^1.2.3",
+				"glob-parent": "^5.1.2",
+				"merge2": "^1.3.0",
+				"micromatch": "^4.0.4"
+			}
+		},
 		"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=="
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+			"dev": true
+		},
+		"fast-levenshtein": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+			"dev": true
+		},
+		"fastq": {
+			"version": "1.13.0",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+			"integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+			"dev": true,
+			"requires": {
+				"reusify": "^1.0.4"
+			}
+		},
+		"file-entry-cache": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+			"dev": true,
+			"requires": {
+				"flat-cache": "^3.0.4"
+			}
+		},
+		"fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"dev": true,
+			"requires": {
+				"to-regex-range": "^5.0.1"
+			}
+		},
+		"find-rc": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/find-rc/-/find-rc-4.0.1.tgz",
+			"integrity": "sha512-YEox27Ie95/zoqkxm6BYSPguJsvYz9d9G1YuaNKhxjSgZbjMC9q5blmvbL4+Ail8yacQIE0OObhDb+ZwvfJafw==",
+			"dev": true
+		},
+		"flat-cache": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+			"dev": true,
+			"requires": {
+				"flatted": "^3.1.0",
+				"rimraf": "^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="
+		"flatted": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz",
+			"integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==",
+			"dev": true
 		},
 		"form-data": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
-			"integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+			"integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+			"dev": true,
 			"requires": {
 				"asynckit": "^0.4.0",
-				"combined-stream": "^1.0.6",
+				"combined-stream": "^1.0.8",
 				"mime-types": "^2.1.12"
 			}
 		},
@@ -325,18 +1152,22 @@
 			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
 			"dev": true
 		},
+		"functional-red-black-tree": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+			"dev": true
+		},
 		"generic-pool": {
 			"version": "3.8.2",
 			"resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.8.2.tgz",
 			"integrity": "sha512-nGToKy6p3PAbYQ7p1UlWl6vSPwfwU6TMSWK7TTu+WUY4ZjyZQGniGGt2oNVvyNSpyZYSB43zMXVLcBm08MTMkg=="
 		},
-		"getpass": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"requires": {
-				"assert-plus": "^1.0.0"
-			}
+		"gensync": {
+			"version": "1.0.0-beta.2",
+			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+			"dev": true
 		},
 		"glob": {
 			"version": "7.2.0",
@@ -352,18 +1183,64 @@
 				"path-is-absolute": "^1.0.0"
 			}
 		},
-		"har-schema": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+		"glob-parent": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+			"dev": true,
+			"requires": {
+				"is-glob": "^4.0.1"
+			}
+		},
+		"globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"dev": true
+		},
+		"globby": {
+			"version": "10.0.2",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz",
+			"integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==",
+			"dev": true,
+			"requires": {
+				"@types/glob": "^7.1.1",
+				"array-union": "^2.1.0",
+				"dir-glob": "^3.0.1",
+				"fast-glob": "^3.0.3",
+				"glob": "^7.1.3",
+				"ignore": "^5.1.1",
+				"merge2": "^1.2.3",
+				"slash": "^3.0.0"
+			},
+			"dependencies": {
+				"ignore": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+					"integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+					"dev": true
+				}
+			}
 		},
-		"har-validator": {
-			"version": "5.1.5",
-			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-			"integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+		"handlebars": {
+			"version": "4.7.7",
+			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
+			"integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
+			"dev": true,
 			"requires": {
-				"ajv": "^6.12.3",
-				"har-schema": "^2.0.0"
+				"minimist": "^1.2.5",
+				"neo-async": "^2.6.0",
+				"source-map": "^0.6.1",
+				"uglify-js": "^3.1.4",
+				"wordwrap": "^1.0.0"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				}
 			}
 		},
 		"has": {
@@ -381,16 +1258,28 @@
 			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
 			"dev": true
 		},
-		"http-signature": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+		"ignore": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+			"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+			"dev": true
+		},
+		"import-fresh": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+			"dev": true,
 			"requires": {
-				"assert-plus": "^1.0.0",
-				"jsprim": "^1.2.2",
-				"sshpk": "^1.7.0"
+				"parent-module": "^1.0.0",
+				"resolve-from": "^4.0.0"
 			}
 		},
+		"imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+			"dev": true
+		},
 		"inflight": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -416,15 +1305,38 @@
 				"has": "^1.0.3"
 			}
 		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+		"is-extglob": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+			"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
+		},
+		"is-glob": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+			"dev": true,
+			"requires": {
+				"is-extglob": "^2.1.1"
+			}
 		},
-		"isstream": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+		"is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true
+		},
+		"isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+			"dev": true
 		},
 		"jest-docblock": {
 			"version": "21.2.0",
@@ -448,35 +1360,41 @@
 				"esprima": "^4.0.0"
 			}
 		},
-		"jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
-		},
-		"json-schema": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-			"integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
+		"jsesc": {
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+			"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=="
+			"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="
+		"json-stable-stringify-without-jsonify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+			"dev": true
+		},
+		"json5": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+			"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+			"dev": true,
+			"requires": {
+				"minimist": "^1.2.5"
+			}
 		},
-		"jsprim": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
-			"integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
+		"levn": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+			"dev": true,
 			"requires": {
-				"assert-plus": "1.0.0",
-				"extsprintf": "1.3.0",
-				"json-schema": "0.4.0",
-				"verror": "1.10.0"
+				"prelude-ls": "^1.2.1",
+				"type-check": "~0.4.0"
 			}
 		},
 		"lines-and-columns": {
@@ -485,15 +1403,54 @@
 			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
 			"dev": true
 		},
+		"lodash.merge": {
+			"version": "4.6.2",
+			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+			"dev": true
+		},
+		"lodash.truncate": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+			"integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+			"dev": true
+		},
+		"lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"dev": true,
+			"requires": {
+				"yallist": "^4.0.0"
+			}
+		},
+		"merge2": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+			"dev": true
+		},
+		"micromatch": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+			"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+			"dev": true,
+			"requires": {
+				"braces": "^3.0.1",
+				"picomatch": "^2.2.3"
+			}
+		},
 		"mime-db": {
 			"version": "1.51.0",
 			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
-			"integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
+			"integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+			"dev": true
 		},
 		"mime-types": {
 			"version": "2.1.34",
 			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
 			"integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+			"dev": true,
 			"requires": {
 				"mime-db": "1.51.0"
 			}
@@ -522,10 +1479,34 @@
 				"minimist": "^1.2.5"
 			}
 		},
-		"oauth-sign": {
-			"version": "0.9.0",
-			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-			"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+		"ms": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+			"dev": true
+		},
+		"natural-compare": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+			"dev": true
+		},
+		"neo-async": {
+			"version": "2.6.2",
+			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+			"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+			"dev": true
+		},
+		"node-fetch": {
+			"version": "2.6.1",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+			"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
+		},
+		"node-releases": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
+			"integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
+			"dev": true
 		},
 		"once": {
 			"version": "1.4.0",
@@ -536,22 +1517,70 @@
 				"wrappy": "1"
 			}
 		},
+		"optionator": {
+			"version": "0.9.1",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+			"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+			"dev": true,
+			"requires": {
+				"deep-is": "^0.1.3",
+				"fast-levenshtein": "^2.0.6",
+				"levn": "^0.4.1",
+				"prelude-ls": "^1.2.1",
+				"type-check": "^0.4.0",
+				"word-wrap": "^1.2.3"
+			}
+		},
+		"parent-module": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+			"dev": true,
+			"requires": {
+				"callsites": "^3.0.0"
+			}
+		},
 		"path-is-absolute": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
 			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
 			"dev": true
 		},
+		"path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true
+		},
 		"path-parse": {
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
 			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
 			"dev": true
 		},
-		"performance-now": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-			"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+		"path-type": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+			"dev": true
+		},
+		"picocolors": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+			"dev": true
+		},
+		"picomatch": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+			"dev": true
+		},
+		"prelude-ls": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+			"dev": true
 		},
 		"prettier": {
 			"version": "2.5.1",
@@ -559,59 +1588,35 @@
 			"integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
 			"dev": true
 		},
-		"psl": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-			"integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+		"progress": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+			"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=="
-		},
-		"qs": {
-			"version": "6.5.3",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-			"integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="
-		},
-		"request": {
-			"version": "2.88.2",
-			"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-			"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-			"requires": {
-				"aws-sign2": "~0.7.0",
-				"aws4": "^1.8.0",
-				"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"
-			},
-			"dependencies": {
-				"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==",
-					"requires": {
-						"asynckit": "^0.4.0",
-						"combined-stream": "^1.0.6",
-						"mime-types": "^2.1.12"
-					}
-				}
-			}
+			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+			"dev": true
+		},
+		"queue-microtask": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+			"dev": true
+		},
+		"regexpp": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+			"dev": true
+		},
+		"require-from-string": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+			"dev": true
 		},
 		"resolve": {
 			"version": "1.21.0",
@@ -624,6 +1629,18 @@
 				"supports-preserve-symlinks-flag": "^1.0.0"
 			}
 		},
+		"resolve-from": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+			"dev": true
+		},
+		"reusify": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+			"dev": true
+		},
 		"rimraf": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -633,15 +1650,26 @@
 				"glob": "^7.1.3"
 			}
 		},
+		"run-parallel": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+			"dev": true,
+			"requires": {
+				"queue-microtask": "^1.2.2"
+			}
+		},
 		"safe-buffer": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"dev": true
 		},
-		"safer-buffer": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+		"seedrandom": {
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
+			"integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==",
+			"dev": true
 		},
 		"semver": {
 			"version": "5.7.1",
@@ -649,28 +1677,120 @@
 			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
 			"dev": true
 		},
+		"shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dev": true,
+			"requires": {
+				"shebang-regex": "^3.0.0"
+			}
+		},
+		"shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true
+		},
+		"slash": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+			"dev": true
+		},
+		"slice-ansi": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+			"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+			"dev": true,
+			"requires": {
+				"ansi-styles": "^4.0.0",
+				"astral-regex": "^2.0.0",
+				"is-fullwidth-code-point": "^3.0.0"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+					"dev": true,
+					"requires": {
+						"color-convert": "^2.0.1"
+					}
+				},
+				"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
+				}
+			}
+		},
+		"source-map": {
+			"version": "0.7.3",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+			"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+			"dev": true
+		},
+		"source-map-support": {
+			"version": "0.5.21",
+			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+			"dev": true,
+			"requires": {
+				"buffer-from": "^1.0.0",
+				"source-map": "^0.6.0"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				}
+			}
+		},
 		"sprintf-js": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
 			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
 			"dev": true
 		},
-		"sshpk": {
-			"version": "1.17.0",
-			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
-			"integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
+		"string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
+			"requires": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			}
+		},
+		"strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"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"
+				"ansi-regex": "^5.0.1"
 			}
 		},
+		"strip-json-comments": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+			"dev": true
+		},
 		"supports-color": {
 			"version": "5.5.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -686,13 +1806,58 @@
 			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
 			"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==",
+		"table": {
+			"version": "6.8.0",
+			"resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
+			"integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+			"dev": true,
+			"requires": {
+				"ajv": "^8.0.1",
+				"lodash.truncate": "^4.4.2",
+				"slice-ansi": "^4.0.0",
+				"string-width": "^4.2.3",
+				"strip-ansi": "^6.0.1"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "8.9.0",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
+					"integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
+					"dev": true,
+					"requires": {
+						"fast-deep-equal": "^3.1.1",
+						"json-schema-traverse": "^1.0.0",
+						"require-from-string": "^2.0.2",
+						"uri-js": "^4.2.2"
+					}
+				},
+				"json-schema-traverse": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+					"dev": true
+				}
+			}
+		},
+		"text-table": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+			"dev": true
+		},
+		"to-fast-properties": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+			"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+			"dev": true
+		},
+		"to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"dev": true,
 			"requires": {
-				"psl": "^1.1.28",
-				"punycode": "^2.1.1"
+				"is-number": "^7.0.0"
 			}
 		},
 		"tslib": {
@@ -748,18 +1913,20 @@
 				"tslib": "^1.8.1"
 			}
 		},
-		"tunnel-agent": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+		"type-check": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+			"dev": true,
 			"requires": {
-				"safe-buffer": "^5.0.1"
+				"prelude-ls": "^1.2.1"
 			}
 		},
-		"tweetnacl": {
-			"version": "0.14.5",
-			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+		"type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+			"dev": true
 		},
 		"typescript": {
 			"version": "4.4.4",
@@ -767,34 +1934,66 @@
 			"integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
 			"dev": true
 		},
+		"uglify-js": {
+			"version": "3.14.5",
+			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.5.tgz",
+			"integrity": "sha512-qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ==",
+			"dev": true,
+			"optional": true
+		},
 		"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"
 			}
 		},
-		"uuid": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-			"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+		"v8-compile-cache": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+			"dev": true
 		},
-		"verror": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+		"which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
 			"requires": {
-				"assert-plus": "^1.0.0",
-				"core-util-is": "1.0.2",
-				"extsprintf": "^1.2.0"
+				"isexe": "^2.0.0"
 			}
 		},
+		"will-call": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/will-call/-/will-call-1.0.1.tgz",
+			"integrity": "sha512-1hEeV8SfBYhNRc/bNXeQfyUBX8Dl9SCYME3qXh99iZP9wJcnhnlBsoBw8Y0lXVZ3YuPsoxImTzBiol1ouNR/hg==",
+			"dev": true
+		},
+		"word-wrap": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+			"dev": true
+		},
+		"wordwrap": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+			"integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+			"dev": true
+		},
 		"wrappy": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
 			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
 			"dev": true
+		},
+		"yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+			"dev": true
 		}
 	}
 }
diff --git a/packages/thrift-client/package.json b/packages/thrift-client/package.json
index f3b56af2..7ea9f283 100644
--- a/packages/thrift-client/package.json
+++ b/packages/thrift-client/package.json
@@ -25,8 +25,9 @@
         "format": "prettier --write 'src/**/*.ts'",
         "prebuild": "npm run clean && npm run lint && npm run format",
         "build": "tsc",
+        "pretest": "npm run build",
         "test": "npm run test:only",
-        "test:only": "echo 'No tests for thrift-client'; exit 0;"
+        "test:only": "lab --timeout 15000 --verbose -l -S -P spec dist/tests/unit"
     },
     "author": "Credit Karma",
     "license": "Apache-2.0",
@@ -38,8 +39,11 @@
         "@statestitle/thrift-server-core": "0.17.x"
     },
     "devDependencies": {
+        "@hapi/code": "^8.0.5",
+        "@hapi/lab": "^24.5.0",
         "@statestitle/thrift-server-core": "^0.17.2",
         "@types/node": "^12.20.41",
+        "@types/node-fetch": "^2.5.12",
         "prettier": "^2.5.1",
         "rimraf": "^3.0.2",
         "tslint": "^6.1.3",
@@ -49,9 +53,8 @@
     },
     "dependencies": {
         "@types/generic-pool": "^3.1.10",
-        "@types/request": "^2.48.8",
-        "generic-pool": "^3.8.2",
-        "request": "^2.88.2"
+        "cross-fetch": "^3.1.4",
+        "generic-pool": "^3.8.2"
     },
     "publishConfig": {
         "access": "public"
diff --git a/packages/thrift-client/src/main/connections/HttpConnection.ts b/packages/thrift-client/src/main/connections/HttpConnection.ts
index d49c04e9..62c1c5d9 100644
--- a/packages/thrift-client/src/main/connections/HttpConnection.ts
+++ b/packages/thrift-client/src/main/connections/HttpConnection.ts
@@ -1,13 +1,12 @@
-import * as Core from '@statestitle/thrift-server-core'
-
-import * as request from 'request'
 import {
-    Request,
-    RequestAPI,
-    RequestResponse,
-    RequiredUriUrl,
-    UrlOptions,
-} from 'request'
+    getProtocol,
+    getTransport,
+    normalizePath,
+    readThriftMethod,
+    ThriftConnection,
+} from '@statestitle/thrift-server-core'
+
+import { Headers, fetch } from 'cross-fetch'
 
 import {
     IHttpConnectionOptions,
@@ -25,56 +24,62 @@ export const DEFAULT_PATH: string = '/thrift'
 
 export type HttpProtocol = 'http' | 'https'
 
-export type RequestInstance = RequestAPI<
-    Request,
-    RequestOptions,
-    RequiredUriUrl
->
-
-function shouldRetry(
-    response: RequestResponse,
-    retry: boolean,
+// exported for testing
+export function shouldRetry(
+    response: Response,
+    retryAttempt: boolean,
     withEndpointPerMethod: boolean,
 ): boolean {
     return (
         withEndpointPerMethod &&
-        response !== undefined &&
-        response !== null &&
-        response.statusCode !== undefined &&
-        response.statusCode === 404 &&
-        retry === false
+        response.status === 404 &&
+        retryAttempt === false
     )
 }
 
-function hasError(err: any): boolean {
-    return err !== undefined && err !== null
+// exported for testing
+export function isErrorResponse(response: Response): boolean {
+    return response.status < 200 || response.status > 299
 }
 
-function isErrorResponse(response: RequestResponse): boolean {
-    return (
-        response.statusCode !== null &&
-        response.statusCode !== undefined &&
-        (response.statusCode < 200 || response.statusCode > 299)
+// exported for testing
+export function filterHeaders(
+    options: RequestOptions,
+    blockedHeaderKeys: Array<string>,
+): RequestOptions {
+    // create a new Headers instance to create a single interface, since HeadersInit can be many different types
+    const filteredHeaders = new Headers(options.headers)
+    // delete is case-insensitive, so no need to lower case the header key
+    blockedHeaderKeys.forEach((blockedHeaderKey) =>
+        filteredHeaders.delete(blockedHeaderKey),
     )
+
+    options.headers = filteredHeaders
+    return options
 }
 
-function filterHeaders(
-    options: request.CoreOptions,
-    blacklist: Array<string>,
-): request.CoreOptions {
-    options.headers = options.headers || {}
-    blacklist = blacklist.map((next) => next.toLocaleLowerCase())
-    options.headers = Object.keys(options.headers).reduce(
-        (acc: request.Headers, next: string) => {
-            if (blacklist.indexOf(next.toLocaleLowerCase()) === -1) {
-                acc[next] = options.headers![next]
-            }
-            return acc
-        },
-        {},
-    )
+// exported for testing
+export function mergeHeaders(
+    h1: HeadersInit | undefined,
+    h2: HeadersInit | undefined,
+): HeadersInit {
+    const merged = new Headers()
 
-    return options
+    new Headers(h1 ?? {}).forEach((value, key) => merged.set(key, value))
+    new Headers(h2 ?? {}).forEach((value, key) => merged.set(key, value))
+
+    return merged
+}
+
+function mergeOptions(
+    options1: RequestOptions,
+    options2: RequestOptions,
+): RequestOptions {
+    return {
+        ...options1,
+        ...options2,
+        headers: mergeHeaders(options1.headers, options2.headers),
+    }
 }
 
 function applyFilters(
@@ -102,7 +107,7 @@ function applyFilters(
                         data,
                         methodName: currentRequest.methodName,
                         uri: currentRequest.uri,
-                        context: Core.deepMerge(
+                        context: mergeOptions(
                             currentRequest.context,
                             nextOptions || {},
                         ),
@@ -115,7 +120,7 @@ function applyFilters(
     }
 }
 
-export class HttpConnection extends Core.ThriftConnection<RequestOptions> {
+export class HttpConnection extends ThriftConnection<RequestOptions> {
     protected readonly port: number
     protected readonly hostName: string
     protected readonly path: string
@@ -126,7 +131,7 @@ export class HttpConnection extends Core.ThriftConnection<RequestOptions> {
     private readonly requestOptions: RequestOptions
     private readonly serviceName: string | undefined
     private readonly withEndpointPerMethod: boolean
-    private readonly requestImpl: typeof request
+    private readonly requestImpl: typeof fetch
 
     constructor({
         hostName,
@@ -139,15 +144,15 @@ export class HttpConnection extends Core.ThriftConnection<RequestOptions> {
         serviceName,
         withEndpointPerMethod = false,
         headerBlacklist = [],
-        requestImpl = request,
+        requestImpl = fetch,
     }: IHttpConnectionOptions) {
-        super(Core.getTransport(transport), Core.getProtocol(protocol))
+        super(getTransport(transport), getProtocol(protocol))
         this.requestOptions = Object.freeze(
             filterHeaders(requestOptions, headerBlacklist),
         )
         this.port = port
         this.hostName = hostName
-        this.path = Core.normalizePath(path || DEFAULT_PATH)
+        this.path = normalizePath(path || DEFAULT_PATH)
         this.protocol = https === true ? 'https' : 'http'
         this.serviceName = serviceName
         this.basePath = `${this.protocol}://${this.hostName}:${this.port}`
@@ -172,7 +177,7 @@ export class HttpConnection extends Core.ThriftConnection<RequestOptions> {
         dataToSend: Buffer,
         context: RequestOptions = {},
     ): Promise<Buffer> {
-        const requestMethod: string = Core.readThriftMethod(
+        const requestMethod: string = readThriftMethod(
             dataToSend,
             this.Transport,
             this.Protocol,
@@ -188,21 +193,13 @@ export class HttpConnection extends Core.ThriftConnection<RequestOptions> {
             context,
         }
 
-        return applyFilters(
-            thriftRequest,
-            filters,
-            (
-                finalRequest: IThriftRequest<RequestOptions>,
-            ): Promise<IRequestResponse> => {
-                return this.write(
-                    finalRequest.data,
-                    finalRequest.methodName,
-                    finalRequest.context,
-                )
-            },
-        ).then((res: IRequestResponse): Buffer => {
-            return res.body
-        })
+        return applyFilters(thriftRequest, filters, (finalRequest) =>
+            this.write(
+                finalRequest.data,
+                finalRequest.methodName,
+                finalRequest.context,
+            ),
+        ).then((res) => res.body)
     }
 
     private write(
@@ -217,46 +214,39 @@ export class HttpConnection extends Core.ThriftConnection<RequestOptions> {
                 : this.url
 
         // Merge user options with required options
-        const requestOptions: RequestOptions & UrlOptions = Core.overlayObjects(
-            this.requestOptions,
-            options,
+        const requestOptions: RequestOptions = mergeOptions(
+            mergeOptions(this.requestOptions, options),
             {
                 method: 'POST',
                 body: dataToWrite,
-                encoding: null, // Needs to be explicitly set to null to get Buffer in response body
-                url: requestUrl,
                 headers: {
-                    'Content-Length': dataToWrite.length,
                     'Content-Type': 'application/octet-stream',
                 },
             },
         )
 
         return new Promise((resolve, reject) => {
-            this.requestImpl(
-                requestOptions,
-                (err: any, response: RequestResponse, body: Buffer) => {
+            this.requestImpl(requestUrl, requestOptions)
+                .then((response) => {
                     if (
                         shouldRetry(response, retry, this.withEndpointPerMethod)
                     ) {
                         resolve(
                             this.write(dataToWrite, methodName, options, true),
                         )
+                    } else if (isErrorResponse(response)) {
+                        reject(response)
                     } else {
-                        if (hasError(err)) {
-                            reject(err)
-                        } else if (isErrorResponse(response)) {
-                            reject(response)
-                        } else {
+                        response.arrayBuffer().then((arrayBuffer) =>
                             resolve({
-                                statusCode: response.statusCode,
+                                statusCode: response.status,
                                 headers: response.headers,
-                                body,
-                            })
-                        }
+                                body: Buffer.from(arrayBuffer),
+                            }),
+                        )
                     }
-                },
-            )
+                })
+                .catch((e) => reject(e))
         })
     }
 
@@ -264,9 +254,7 @@ export class HttpConnection extends Core.ThriftConnection<RequestOptions> {
         name: string,
     ): Array<RequestHandler<RequestOptions>> {
         return this.filters
-            .filter(filterByMethod<RequestOptions>(name))
-            .map(
-                (filter: IThriftClientFilter<RequestOptions>) => filter.handler,
-            )
+            .filter(filterByMethod(name))
+            .map((filter) => filter.handler)
     }
 }
diff --git a/packages/thrift-client/src/main/connections/index.ts b/packages/thrift-client/src/main/connections/index.ts
index 541e8099..e8fc6e8f 100644
--- a/packages/thrift-client/src/main/connections/index.ts
+++ b/packages/thrift-client/src/main/connections/index.ts
@@ -1,7 +1,6 @@
 import {
     BinaryProtocol,
     BufferedTransport,
-    deepMerge,
     IClientConstructor,
     ThriftClient,
 } from '@statestitle/thrift-server-core'
@@ -55,9 +54,10 @@ export function createHttpClient<TClient extends ThriftClient<RequestOptions>>(
         serviceName = nullClient._serviceName
     }
 
-    const connection: HttpConnection = new HttpConnection(
-        deepMerge(options, { serviceName }),
-    )
+    const connection: HttpConnection = new HttpConnection({
+        ...options,
+        serviceName,
+    })
 
     // Register optional middleware
     connection.register(...(options.register || []))
diff --git a/packages/thrift-client/src/main/types.ts b/packages/thrift-client/src/main/types.ts
index 6b2daa94..56fae04f 100644
--- a/packages/thrift-client/src/main/types.ts
+++ b/packages/thrift-client/src/main/types.ts
@@ -5,12 +5,14 @@ import {
     TransportType,
 } from '@statestitle/thrift-server-core'
 
-import * as GenericPool from 'generic-pool'
+import { fetch } from 'cross-fetch'
+import { Options as PoolOptions } from 'generic-pool'
+import { RequestInit as NodeRequestInit } from 'node-fetch'
+import { TlsOptions } from 'tls'
 
-import * as request from 'request'
-import * as tls from 'tls'
-
-export type RequestOptions = request.CoreOptions
+// Use RequestInit provided by 'node-fetch' which contains a few server-side extensions
+// the 'headers' declaration in 'node-fetch' is slightly different than libdom, so omit it for clarity
+export type RequestOptions = RequestInit & Omit<NodeRequestInit, 'headers'>
 
 export interface IRequestResponse {
     statusCode: number
@@ -38,8 +40,8 @@ export interface IConnectionOptions {
     timeout?: number
     transport?: TransportType
     protocol?: ProtocolType
-    tls?: tls.TlsOptions
-    pool?: GenericPool.Options
+    tls?: TlsOptions
+    pool?: PoolOptions
     logger?: LogFunction
 }
 
@@ -62,7 +64,7 @@ export interface IHttpConnectionOptions {
     requestOptions?: RequestOptions
     withEndpointPerMethod?: boolean
     headerBlacklist?: Array<string>
-    requestImpl?: typeof request
+    requestImpl?: typeof fetch
 }
 
 export interface ICreateHttpClientOptions extends IHttpConnectionOptions {
diff --git a/packages/thrift-client/src/tests/unit/HttpConnection.spec.ts b/packages/thrift-client/src/tests/unit/HttpConnection.spec.ts
new file mode 100644
index 00000000..5448bafb
--- /dev/null
+++ b/packages/thrift-client/src/tests/unit/HttpConnection.spec.ts
@@ -0,0 +1,150 @@
+import { expect } from '@hapi/code'
+import { script } from '@hapi/lab'
+
+import { Headers } from 'cross-fetch'
+
+import {
+    filterHeaders,
+    isErrorResponse,
+    mergeHeaders,
+    shouldRetry,
+} from '../../main/connections/HttpConnection'
+
+export const lab = script()
+
+const describe = lab.describe
+const it = lab.it
+
+describe('HttpConnection', () => {
+    describe('shouldRetry', () => {
+        it('returns false when withEndpointPerMethod is false', () => {
+            expect(
+                shouldRetry({ status: 404 } as Response, false, false),
+            ).to.be.false()
+        })
+        it('returns false when retryAttempt is true', () => {
+            expect(
+                shouldRetry({ status: 404 } as Response, true, true),
+            ).to.be.false()
+        })
+        it('returns false when the status is not 404', () => {
+            expect(
+                shouldRetry({ status: 400 } as Response, false, true),
+            ).to.be.false()
+        })
+        it('returns true when the status is 404, retry is true, and withEndpointPerMethod is true', () => {
+            expect(
+                shouldRetry({ status: 404 } as Response, false, true),
+            ).to.be.true()
+        })
+    })
+
+    describe('isErrorResponse', () => {
+        it('returns false when status is 200', () => {
+            expect(isErrorResponse({ status: 200 } as Response)).to.be.false()
+        })
+        it('returns false when status is 299', () => {
+            expect(isErrorResponse({ status: 299 } as Response)).to.be.false()
+        })
+        it('returns true when status is 199', () => {
+            expect(isErrorResponse({ status: 199 } as Response)).to.be.true()
+        })
+        it('returns true when status is 300', () => {
+            expect(isErrorResponse({ status: 300 } as Response)).to.be.true()
+        })
+    })
+
+    describe('filterHeaders', () => {
+        it('returns an empty object when no headers are present', () => {
+            expect(filterHeaders({}, [])).to.equal({
+                headers: new Headers(),
+            })
+            expect(filterHeaders({}, ['blocked-header'])).to.equal({
+                headers: new Headers(),
+            })
+        })
+        it('returns empty headers when none are defined', () => {
+            expect(filterHeaders({ headers: {} }, [])).to.equal({
+                headers: new Headers(),
+            })
+            expect(filterHeaders({ headers: {} }, ['blocked-header'])).to.equal(
+                { headers: new Headers() },
+            )
+        })
+        it('returns headers when none are blocked', () => {
+            expect(
+                filterHeaders(
+                    { headers: { 'X-DOMA-HEADER': 'some value' } },
+                    [],
+                ),
+            ).to.equal({
+                headers: new Headers({ 'X-DOMA-HEADER': 'some value' }),
+            })
+            expect(
+                filterHeaders({ headers: { 'X-DOMA-HEADER': 'some value' } }, [
+                    'blocked-header',
+                ]),
+            ).to.equal({
+                headers: new Headers({ 'X-DOMA-HEADER': 'some value' }),
+            })
+        })
+        it('blocks headers with case-insensitive lookup', () => {
+            expect(
+                filterHeaders({ headers: { 'X-DOMA-HEADER': 'some value' } }, [
+                    'x-dOma-hEaDer',
+                ]),
+            ).to.equal({
+                headers: new Headers(),
+            })
+        })
+    })
+
+    describe('mergeHeaders', () => {
+        it('returns empty headers when both are undefined', () => {
+            expect(mergeHeaders(undefined, undefined)).to.equal(new Headers())
+        })
+        it('returns the first headers when the second is undefined', () => {
+            expect(
+                mergeHeaders({ 'X-DOMA-HEADER': 'some value' }, undefined),
+            ).to.equal(new Headers({ 'x-doma-header': 'some value' }))
+        })
+        it('returns the second headers when the first is undefined', () => {
+            expect(
+                mergeHeaders(undefined, { 'X-DOMA-HEADER': 'some value' }),
+            ).to.equal(new Headers({ 'x-doma-header': 'some value' }))
+        })
+        it('returns the first and second merged together', () => {
+            expect(
+                mergeHeaders(
+                    { 'X-DOMA-HEADER-1': 'some value1' },
+                    { 'X-DOMA-HEADER-2': 'some value2' },
+                ),
+            ).to.equal(
+                new Headers({
+                    'x-doma-header-1': 'some value1',
+                    'x-doma-header-2': 'some value2',
+                }),
+            )
+        })
+        it('overrides headers from the second argument when present', () => {
+            expect(
+                mergeHeaders(
+                    {
+                        'X-DOMA-HEADER-1': 'some value1',
+                        'X-DOMA-HEADER-3': 'some value3',
+                    },
+                    {
+                        'X-DOMA-HEADER-2': 'some value2',
+                        'X-DOMA-HEADER-3': 'override',
+                    },
+                ),
+            ).to.equal(
+                new Headers({
+                    'x-doma-header-1': 'some value1',
+                    'x-doma-header-2': 'some value2',
+                    'x-doma-header-3': 'override',
+                }),
+            )
+        })
+    })
+})
diff --git a/packages/thrift-integration/package-lock.json b/packages/thrift-integration/package-lock.json
index 24fdad38..e83538f6 100644
--- a/packages/thrift-integration/package-lock.json
+++ b/packages/thrift-integration/package-lock.json
@@ -1371,6 +1371,15 @@
 			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
 			"dev": true
 		},
+		"cross-fetch": {
+			"version": "3.1.4",
+			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz",
+			"integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
+			"dev": true,
+			"requires": {
+				"node-fetch": "2.6.1"
+			}
+		},
 		"cross-spawn": {
 			"version": "7.0.3",
 			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -2505,6 +2514,12 @@
 			"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
 			"dev": true
 		},
+		"node-fetch": {
+			"version": "2.6.1",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+			"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+			"dev": true
+		},
 		"node-int64": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
diff --git a/packages/thrift-integration/package.json b/packages/thrift-integration/package.json
index 3d8f462e..c215ea83 100644
--- a/packages/thrift-integration/package.json
+++ b/packages/thrift-integration/package.json
@@ -39,14 +39,11 @@
         "@types/hapi__hapi": "^20.0.10",
         "@types/hapi__lab": "^22.0.1",
         "@types/node": "^12.20.41",
-        "@types/request": "^2.48.8",
-        "@types/request-promise-native": "^1.0.18",
         "@types/thrift": "^0.10.11",
         "body-parser": "^1.19.1",
+        "cross-fetch": "^3.1.4",
         "express": "^4.17.2",
         "prettier": "^2.5.1",
-        "request": "^2.88.2",
-        "request-promise-native": "^1.0.9",
         "rimraf": "^3.0.2",
         "thrift": "^0.15.0",
         "tslint": "^6.1.3",
diff --git a/packages/thrift-integration/src/client/connections/HttpConnection.spec.ts b/packages/thrift-integration/src/client/connections/HttpConnection.spec.ts
index 96446459..63bd088e 100644
--- a/packages/thrift-integration/src/client/connections/HttpConnection.spec.ts
+++ b/packages/thrift-integration/src/client/connections/HttpConnection.spec.ts
@@ -1,8 +1,6 @@
 import * as thrift from '@statestitle/thrift-server-core'
 import * as Hapi from '@hapi/hapi'
 import * as http from 'http'
-import * as request from 'request'
-import { CoreOptions } from 'request'
 
 import {
     HttpConnection,
@@ -10,6 +8,7 @@ import {
     IRequestResponse,
     IThriftRequest,
     NextFunction,
+    RequestOptions,
 } from '@statestitle/thrift-client'
 
 import {
@@ -22,6 +21,8 @@ import { HAPI_CALC_SERVER_CONFIG } from '../../config'
 import { expect } from '@hapi/code'
 import * as Lab from '@hapi/lab'
 
+import { fetch } from 'cross-fetch'
+
 import { createServer as addService } from '../../hapi-add-service'
 import { createServer as calculatorService } from '../../hapi-calculator-service'
 import {
@@ -127,10 +128,10 @@ describe('HttpConnection', () => {
 
         it('should reject auth request without context', async () => {
             return client.addWithContext(5, 7).then(
-                (response: number) => {
-                    expect(false).to.equal(true)
+                () => {
+                    throw new Error('Should reject with Unauthorized message')
                 },
-                (err: any) => {
+                (err: Error) => {
                     expect(err.message).to.equal('Unauthorized')
                 },
             )
@@ -147,11 +148,11 @@ describe('HttpConnection', () => {
                 new Calculator.Client(badConnection)
 
             return badClient.add(5, 7).then(
-                (response: number) => {
+                () => {
                     throw new Error('Should reject with status 500')
                 },
-                (err: any) => {
-                    expect(err.statusCode).to.equal(500)
+                (err: Response) => {
+                    expect(err.status).to.equal(500)
                 },
             )
         })
@@ -167,11 +168,11 @@ describe('HttpConnection', () => {
                 new Calculator.Client(badConnection)
 
             return badClient.add(5, 7).then(
-                (response: number) => {
+                () => {
                     throw new Error('Should reject with status 400')
                 },
-                (err: any) => {
-                    expect(err.statusCode).to.equal(400)
+                (err: Response) => {
+                    expect(err.status).to.equal(400)
                 },
             )
         })
@@ -189,10 +190,10 @@ describe('HttpConnection', () => {
                 new Calculator.Client(badConnection)
 
             return badClient.add(5, 7).then(
-                (response: number) => {
+                () => {
                     throw new Error('Should reject with host not found')
                 },
-                (err: any) => {
+                (err: Error) => {
                     expect(err).to.exist()
                 },
             )
@@ -200,22 +201,22 @@ describe('HttpConnection', () => {
 
         it('should use request implementation if provided', async () => {
             let ourRequestWasCalled = false
-            const mockRequest = request.defaults({
-                auth: {
-                    bearer: () => {
-                        ourRequestWasCalled = true
-                        return 'token'
-                    },
-                },
-            })
+            const requestSpy = (
+                input: RequestInfo,
+                options?: RequestInit,
+            ): Promise<Response> => {
+                ourRequestWasCalled = true
+                return fetch(input, options)
+            }
 
             const mockedConnection = new HttpConnection({
                 serviceName: 'Calculator',
                 hostName: HAPI_CALC_SERVER_CONFIG.hostName,
                 port: HAPI_CALC_SERVER_CONFIG.port,
                 path: HAPI_CALC_SERVER_CONFIG.path,
-                requestImpl: mockRequest,
+                requestImpl: requestSpy,
             })
+
             const mockedClient = new Calculator.Client(mockedConnection)
             return mockedClient
                 .add(5, 7)
@@ -334,8 +335,8 @@ describe('HttpConnection', () => {
 
             connection.register({
                 handler(
-                    req: IThriftRequest<CoreOptions>,
-                    next: NextFunction<CoreOptions>,
+                    req: IThriftRequest<RequestOptions>,
+                    next: NextFunction<RequestOptions>,
                 ): Promise<IRequestResponse> {
                     if (thrift.readThriftMethod(req.data) === 'add') {
                         return next()
@@ -368,8 +369,8 @@ describe('HttpConnection', () => {
             connection.register({
                 methods: ['add'],
                 handler(
-                    req: IThriftRequest<CoreOptions>,
-                    next: NextFunction<CoreOptions>,
+                    req: IThriftRequest<RequestOptions>,
+                    next: NextFunction<RequestOptions>,
                 ): Promise<IRequestResponse> {
                     if (thrift.readThriftMethod(req.data) === 'add') {
                         return next()
@@ -401,8 +402,8 @@ describe('HttpConnection', () => {
 
             connection.register({
                 handler(
-                    req: IThriftRequest<CoreOptions>,
-                    next: NextFunction<CoreOptions>,
+                    req: IThriftRequest<RequestOptions>,
+                    next: NextFunction<RequestOptions>,
                 ): Promise<IRequestResponse> {
                     if (thrift.readThriftMethod(req.data) === 'nope') {
                         return next()
@@ -444,8 +445,8 @@ describe('HttpConnection', () => {
             connection.register({
                 methods: ['nope'],
                 handler(
-                    req: IThriftRequest<CoreOptions>,
-                    next: NextFunction<CoreOptions>,
+                    req: IThriftRequest<RequestOptions>,
+                    next: NextFunction<RequestOptions>,
                 ): Promise<IRequestResponse> {
                     return Promise.reject(
                         new Error(
@@ -475,8 +476,8 @@ describe('HttpConnection', () => {
 
             connection.register({
                 handler(
-                    req: IThriftRequest<CoreOptions>,
-                    next: NextFunction<CoreOptions>,
+                    req: IThriftRequest<RequestOptions>,
+                    next: NextFunction<RequestOptions>,
                 ): Promise<IRequestResponse> {
                     return next(req.data, {
                         headers: {
@@ -503,8 +504,8 @@ describe('HttpConnection', () => {
             connection.register({
                 methods: ['addWithContext'],
                 handler(
-                    req: IThriftRequest<CoreOptions>,
-                    next: NextFunction<CoreOptions>,
+                    req: IThriftRequest<RequestOptions>,
+                    next: NextFunction<RequestOptions>,
                 ): Promise<IRequestResponse> {
                     return next(req.data, {
                         headers: {
@@ -552,8 +553,8 @@ describe('HttpConnection', () => {
             connection.register({
                 methods: ['add'],
                 handler(
-                    req: IThriftRequest<CoreOptions>,
-                    next: NextFunction<CoreOptions>,
+                    req: IThriftRequest<RequestOptions>,
+                    next: NextFunction<RequestOptions>,
                 ): Promise<IRequestResponse> {
                     return next(req.data, {
                         headers: {
diff --git a/packages/thrift-integration/src/client/connections/index.spec.ts b/packages/thrift-integration/src/client/connections/index.spec.ts
index 160dcd29..7f6571f0 100644
--- a/packages/thrift-integration/src/client/connections/index.spec.ts
+++ b/packages/thrift-integration/src/client/connections/index.spec.ts
@@ -8,10 +8,9 @@ import {
     IRequestResponse,
     IThriftRequest,
     NextFunction,
+    RequestOptions,
 } from '@statestitle/thrift-client'
 
-import { CoreOptions } from 'request'
-
 import {
     APACHE_SERVER_CONFIG,
     HAPI_CALC_SERVER_CONFIG,
@@ -44,7 +43,7 @@ const after = lab.after
 
 describe('createHttpClient', () => {
     describe('Strict Unions', () => {
-        let client: CalculatorStrict.Client<CoreOptions>
+        let client: CalculatorStrict.Client<RequestOptions>
         let calcServer: Hapi.Server
         let addServer: Hapi.Server
 
@@ -95,7 +94,7 @@ describe('createHttpClient', () => {
     })
 
     describe('Basic Usage', () => {
-        let client: Calculator.Client<CoreOptions>
+        let client: Calculator.Client<RequestOptions>
         let calcServer: Hapi.Server
         let addServer: Hapi.Server
 
@@ -260,72 +259,66 @@ describe('createHttpClient', () => {
 
         it('should reject auth request without context', async () => {
             return client.addWithContext(5, 7).then(
-                (response: number) => {
-                    expect(false).to.equal(true)
+                () => {
+                    throw new Error('Should reject with Unauthorized message')
                 },
-                (err: any) => {
+                (err: Error) => {
                     expect(err.message).to.equal('Unauthorized')
                 },
             )
         })
 
         it('should reject for a 500 server response', async () => {
-            const badClient: Calculator.Client<CoreOptions> = createHttpClient(
-                Calculator.Client,
-                {
+            const badClient: Calculator.Client<RequestOptions> =
+                createHttpClient(Calculator.Client, {
                     hostName: HAPI_CALC_SERVER_CONFIG.hostName,
                     port: HAPI_CALC_SERVER_CONFIG.port,
                     path: '/return500',
-                },
-            )
+                })
 
             return badClient.add(5, 7).then(
-                (response: number) => {
+                () => {
                     throw new Error('Should reject with status 500')
                 },
-                (err: any) => {
-                    expect(err.statusCode).to.equal(500)
+                (err: Response) => {
+                    expect(err.status).to.equal(500)
                 },
             )
         })
 
         it('should reject for a 400 server response', async () => {
-            const badClient: Calculator.Client<CoreOptions> = createHttpClient(
-                Calculator.Client,
-                {
+            const badClient: Calculator.Client<RequestOptions> =
+                createHttpClient(Calculator.Client, {
                     hostName: HAPI_CALC_SERVER_CONFIG.hostName,
                     port: HAPI_CALC_SERVER_CONFIG.port,
                     path: '/return400',
-                },
-            )
+                })
 
             return badClient.add(5, 7).then(
-                (response: number) => {
+                () => {
                     throw new Error('Should reject with status 400')
                 },
-                (err: any) => {
-                    expect(err.statusCode).to.equal(400)
+                (err: Response) => {
+                    expect(err.status).to.equal(400)
                 },
             )
         })
 
         it('should reject for a request to a missing service', async () => {
-            const badClient: Calculator.Client<CoreOptions> = createHttpClient(
-                Calculator.Client,
-                {
+            const badClient: Calculator.Client<RequestOptions> =
+                createHttpClient(Calculator.Client, {
                     hostName: 'fakehost',
                     port: 8080,
                     requestOptions: {
                         timeout: 5000,
                     },
-                },
-            )
+                })
 
             return badClient.add(5, 7).then(
-                (response: number) => {
+                () => {
                     throw new Error('Should reject with host not found')
                 },
-                (err: any) => {
+                (err: Error) => {
                     console.log('err: ', err)
                     expect(err).to.exist()
                 },
@@ -334,7 +327,7 @@ describe('createHttpClient', () => {
     })
 
     describe('CompactProtocol', () => {
-        let client: Calculator.Client<CoreOptions>
+        let client: Calculator.Client<RequestOptions>
         let calcServer: Hapi.Server
         let addServer: Hapi.Server
 
@@ -482,72 +475,66 @@ describe('createHttpClient', () => {
 
         it('should reject auth request without context', async () => {
             return client.addWithContext(5, 7).then(
-                (response: number) => {
-                    expect(false).to.equal(true)
+                () => {
+                    throw new Error('Should reject with Unauthorized message')
                 },
-                (err: any) => {
+                (err: Error) => {
                     expect(err.message).to.equal('Unauthorized')
                 },
             )
         })
 
         it('should reject for a 500 server response', async () => {
-            const badClient: Calculator.Client<CoreOptions> = createHttpClient(
-                Calculator.Client,
-                {
+            const badClient: Calculator.Client<RequestOptions> =
+                createHttpClient(Calculator.Client, {
                     hostName: HAPI_CALC_SERVER_CONFIG.hostName,
                     port: HAPI_CALC_SERVER_CONFIG.port,
                     path: '/return500',
-                },
-            )
+                })
 
             return badClient.add(5, 7).then(
-                (response: number) => {
+                () => {
                     throw new Error('Should reject with status 500')
                 },
-                (err: any) => {
-                    expect(err.statusCode).to.equal(500)
+                (err: Response) => {
+                    expect(err.status).to.equal(500)
                 },
             )
         })
 
         it('should reject for a 400 server response', async () => {
-            const badClient: Calculator.Client<CoreOptions> = createHttpClient(
-                Calculator.Client,
-                {
+            const badClient: Calculator.Client<RequestOptions> =
+                createHttpClient(Calculator.Client, {
                     hostName: HAPI_CALC_SERVER_CONFIG.hostName,
                     port: HAPI_CALC_SERVER_CONFIG.port,
                     path: '/return400',
-                },
-            )
+                })
 
             return badClient.add(5, 7).then(
-                (response: number) => {
+                () => {
                     throw new Error('Should reject with status 400')
                 },
-                (err: any) => {
-                    expect(err.statusCode).to.equal(400)
+                (err: Response) => {
+                    expect(err.status).to.equal(400)
                 },
             )
         })
 
         it('should reject for a request to a missing service', async () => {
-            const badClient: Calculator.Client<CoreOptions> = createHttpClient(
-                Calculator.Client,
-                {
+            const badClient: Calculator.Client<RequestOptions> =
+                createHttpClient(Calculator.Client, {
                     hostName: 'fakehost',
                     port: 8080,
                     requestOptions: {
                         timeout: 5000,
                     },
-                },
-            )
+                })
 
             return badClient.add(5, 7).then(
-                (response: number) => {
+                () => {
                     throw new Error('Should reject with host not found')
                 },
-                (err: any) => {
+                (err: Error) => {
                     console.log('err: ', err)
                     expect(err).to.exist()
                 },
@@ -584,8 +571,8 @@ describe('createHttpClient', () => {
                 register: [
                     {
                         handler(
-                            request: IThriftRequest<CoreOptions>,
-                            next: NextFunction<CoreOptions>,
+                            request: IThriftRequest<RequestOptions>,
+                            next: NextFunction<RequestOptions>,
                         ): Promise<IRequestResponse> {
                             return next().then(
                                 (
@@ -622,8 +609,8 @@ describe('createHttpClient', () => {
                     {
                         methods: ['add'],
                         handler(
-                            request: IThriftRequest<CoreOptions>,
-                            next: NextFunction<CoreOptions>,
+                            request: IThriftRequest<RequestOptions>,
+                            next: NextFunction<RequestOptions>,
                         ): Promise<IRequestResponse> {
                             return next().then((response: IRequestResponse) => {
                                 if (readThriftMethod(response.body) === 'add') {
@@ -655,8 +642,8 @@ describe('createHttpClient', () => {
                 register: [
                     {
                         handler(
-                            request: IThriftRequest<CoreOptions>,
-                            next: NextFunction<CoreOptions>,
+                            request: IThriftRequest<RequestOptions>,
+                            next: NextFunction<RequestOptions>,
                         ): Promise<IRequestResponse> {
                             return next().then((res: IRequestResponse) => {
                                 if (readThriftMethod(res.body) === 'nope') {
@@ -698,8 +685,8 @@ describe('createHttpClient', () => {
                     {
                         methods: ['nope'],
                         handler(
-                            request: IThriftRequest<CoreOptions>,
-                            next: NextFunction<CoreOptions>,
+                            request: IThriftRequest<RequestOptions>,
+                            next: NextFunction<RequestOptions>,
                         ): Promise<IRequestResponse> {
                             return next().then(() => {
                                 return Promise.reject(
@@ -750,8 +737,8 @@ describe('createHttpClient', () => {
                 register: [
                     {
                         handler(
-                            request: IThriftRequest<CoreOptions>,
-                            next: NextFunction<CoreOptions>,
+                            request: IThriftRequest<RequestOptions>,
+                            next: NextFunction<RequestOptions>,
                         ): Promise<IRequestResponse> {
                             return next(request.data, {
                                 headers: {
@@ -776,8 +763,8 @@ describe('createHttpClient', () => {
                     {
                         methods: ['addWithContext'],
                         handler(
-                            request: IThriftRequest<CoreOptions>,
-                            next: NextFunction<CoreOptions>,
+                            request: IThriftRequest<RequestOptions>,
+                            next: NextFunction<RequestOptions>,
                         ): Promise<IRequestResponse> {
                             return next(request.data, {
                                 headers: {
@@ -820,8 +807,8 @@ describe('createHttpClient', () => {
                     {
                         methods: ['add'],
                         handler(
-                            request: IThriftRequest<CoreOptions>,
-                            next: NextFunction<CoreOptions>,
+                            request: IThriftRequest<RequestOptions>,
+                            next: NextFunction<RequestOptions>,
                         ): Promise<IRequestResponse> {
                             return next(request.data, {
                                 headers: {
@@ -1013,7 +1000,7 @@ describe('createTcpClient', () => {
                     console.log('res: ', response)
                     throw new Error('Should reject with host not found')
                 },
-                (err: any) => {
+                (err: Error) => {
                     console.log('err: ', err)
                     expect(err).to.exist()
                 },
diff --git a/packages/thrift-integration/src/client/profiler.spec.ts b/packages/thrift-integration/src/client/profiler.spec.ts
index 17ba1128..4a96e98e 100644
--- a/packages/thrift-integration/src/client/profiler.spec.ts
+++ b/packages/thrift-integration/src/client/profiler.spec.ts
@@ -3,7 +3,6 @@
 // import * as Hapi from 'hapi'
 // import * as Lab from '@hapi/lab'
 // import * as net from 'net'
-// import * as rp from 'request-promise-native'
 
 // import { createServer as addService } from './add-service'
 // import { createServer as calculatorService } from './calculator-service'
diff --git a/packages/thrift-integration/src/client/tracing/index.spec.ts b/packages/thrift-integration/src/client/tracing/index.spec.ts
index 0d33003c..66a798f0 100644
--- a/packages/thrift-integration/src/client/tracing/index.spec.ts
+++ b/packages/thrift-integration/src/client/tracing/index.spec.ts
@@ -9,7 +9,8 @@ import { expect } from '@hapi/code'
 import * as Hapi from '@hapi/hapi'
 import * as Lab from '@hapi/lab'
 import * as net from 'net'
-import * as rp from 'request-promise-native'
+
+import { fetch } from 'cross-fetch'
 
 import { CLIENT_CONFIG } from '../../config'
 
@@ -68,14 +69,9 @@ describe('Tracing', () => {
             const traceId_1: string = '4808dde1609f5673'
             const traceId_2: string = 'b82ba1422cf1ec6c'
             Promise.all([
-                rp(
-                    `http://${CLIENT_CONFIG.hostName}:${CLIENT_CONFIG.port}/calculate`,
+                fetch(
+                    `http://${CLIENT_CONFIG.hostName}:${CLIENT_CONFIG.port}/calculate?left=5&op=add&right=9`,
                     {
-                        qs: {
-                            left: 5,
-                            op: 'add',
-                            right: 9,
-                        },
                         headers: {
                             'x-b3-traceid': traceId_1,
                             'x-b3-spanid': traceId_1,
@@ -84,14 +80,9 @@ describe('Tracing', () => {
                         },
                     },
                 ),
-                rp(
-                    `http://${CLIENT_CONFIG.hostName}:${CLIENT_CONFIG.port}/calculate`,
+                fetch(
+                    `http://${CLIENT_CONFIG.hostName}:${CLIENT_CONFIG.port}/calculate?left=8&op=add&right=9`,
                     {
-                        qs: {
-                            left: 8,
-                            op: 'add',
-                            right: 9,
-                        },
                         headers: {
                             'x-b3-traceid': traceId_2,
                             'x-b3-spanid': traceId_2,
@@ -101,8 +92,11 @@ describe('Tracing', () => {
                     },
                 ),
             ]).then(
-                (val: any) => {
-                    expect(val).to.equal(['result: 14', 'result: 17'])
+                async ([response1, response2]) => {
+                    expect([
+                        await response1.text(),
+                        await response2.text(),
+                    ]).to.equal(['result: 14', 'result: 17'])
                     setTimeout(() => {
                         const result = collectServer.traces()
                         expect(result[traceId_1]).to.exist()
@@ -110,7 +104,7 @@ describe('Tracing', () => {
                         resolve()
                     }, 3000)
                 },
-                (err: any) => {
+                (err: Error) => {
                     console.log('err: ', err)
                     reject(err)
                 },
@@ -122,25 +116,20 @@ describe('Tracing', () => {
         return new Promise<void>((resolve, reject) => {
             const traceId_1: string = randomTraceId()
             Promise.all([
-                rp(
-                    `http://${CLIENT_CONFIG.hostName}:${CLIENT_CONFIG.port}/calculate-overwrite`,
+                fetch(
+                    `http://${CLIENT_CONFIG.hostName}:${CLIENT_CONFIG.port}/calculate-overwrite?left=5&op=add&right=9`,
                     {
-                        qs: {
-                            left: 5,
-                            op: 'add',
-                            right: 9,
-                        },
                         headers: {
                             'x-b3-traceid': traceId_1,
                             'x-b3-spanid': traceId_1,
                             'x-b3-parentspanid': traceId_1,
-                            'x-b3-sampled': true,
+                            'x-b3-sampled': 'true',
                         },
                     },
                 ),
             ]).then(
-                (val: any) => {
-                    expect(val).to.equal(['result: 14'])
+                async ([response]) => {
+                    expect([await response.text()]).to.equal(['result: 14'])
                     setTimeout(() => {
                         const result = collectServer.traces()
                         expect(result[traceId_1]).to.exist()
@@ -148,7 +137,7 @@ describe('Tracing', () => {
                         resolve()
                     }, 3000)
                 },
-                (err: any) => {
+                (err: Error) => {
                     console.log('err: ', err)
                     reject(err)
                 },
@@ -161,14 +150,9 @@ describe('Tracing', () => {
             const traceId_1: string = randomTraceId()
             const traceId_2: string = randomTraceId()
             Promise.all([
-                rp(
-                    `http://${CLIENT_CONFIG.hostName}:${CLIENT_CONFIG.port}/calculate`,
+                fetch(
+                    `http://${CLIENT_CONFIG.hostName}:${CLIENT_CONFIG.port}/calculate?left=5&op=add&right=9`,
                     {
-                        qs: {
-                            left: 5,
-                            op: 'add',
-                            right: 9,
-                        },
                         headers: {
                             'l5d-ctx-trace': serializeLinkerdHeader(
                                 traceIdFromTraceId({
@@ -181,14 +165,9 @@ describe('Tracing', () => {
                         },
                     },
                 ),
-                rp(
-                    `http://${CLIENT_CONFIG.hostName}:${CLIENT_CONFIG.port}/calculate`,
+                fetch(
+                    `http://${CLIENT_CONFIG.hostName}:${CLIENT_CONFIG.port}/calculate?left=7&op=add&right=22`,
                     {
-                        qs: {
-                            left: 7,
-                            op: 'add',
-                            right: 22,
-                        },
                         headers: {
                             'l5d-ctx-trace': serializeLinkerdHeader(
                                 traceIdFromTraceId({
@@ -202,8 +181,11 @@ describe('Tracing', () => {
                     },
                 ),
             ]).then(
-                (val: any) => {
-                    expect(val).to.equal(['result: 14', 'result: 29'])
+                async ([response1, response2]) => {
+                    expect([
+                        await response1.text(),
+                        await response2.text(),
+                    ]).to.equal(['result: 14', 'result: 29'])
                     setTimeout(() => {
                         const result = collectServer.traces()
                         expect(result[traceId_1]).to.exist()
@@ -211,7 +193,7 @@ describe('Tracing', () => {
                         resolve()
                     }, 3000)
                 },
-                (err: any) => {
+                (err: Error) => {
                     console.log('err: ', err)
                     reject(err)
                 },
@@ -224,14 +206,9 @@ describe('Tracing', () => {
             const traceId_1: string = randomTraceId()
             const traceId_2: string = randomTraceId()
             Promise.all([
-                rp(
-                    `http://${CLIENT_CONFIG.hostName}:${CLIENT_CONFIG.port}/calculate`,
+                fetch(
+                    `http://${CLIENT_CONFIG.hostName}:${CLIENT_CONFIG.port}/calculate?left=5&op=add&right=9`,
                     {
-                        qs: {
-                            left: 5,
-                            op: 'add',
-                            right: 9,
-                        },
                         headers: {
                             'l5d-ctx-trace': serializeLinkerdHeader(
                                 traceIdFromTraceId({
@@ -249,8 +226,8 @@ describe('Tracing', () => {
                     },
                 ),
             ]).then(
-                (val: any) => {
-                    expect(val).to.equal(['result: 14'])
+                async ([response]) => {
+                    expect([await response.text()]).to.equal(['result: 14'])
                     setTimeout(() => {
                         const result = collectServer.traces()
                         expect(Object.keys(result)[0]).to.equal(traceId_2)
@@ -260,7 +237,7 @@ describe('Tracing', () => {
                         resolve()
                     }, 3000)
                 },
-                (err: any) => {
+                (err: Error) => {
                     console.log('err: ', err)
                     reject(err)
                 },
@@ -284,14 +261,9 @@ describe('Tracing', () => {
                 sampled: true,
             }
             Promise.all([
-                rp(
-                    `http://${CLIENT_CONFIG.hostName}:${CLIENT_CONFIG.port}/calculate`,
+                fetch(
+                    `http://${CLIENT_CONFIG.hostName}:${CLIENT_CONFIG.port}/calculate?left=5&op=add&right=9`,
                     {
-                        qs: {
-                            left: 5,
-                            op: 'add',
-                            right: 9,
-                        },
                         headers: {
                             'l5d-ctx-trace': serializeLinkerdHeader(
                                 traceIdFromTraceId(trace_1),
@@ -299,13 +271,13 @@ describe('Tracing', () => {
                             'x-b3-traceid': trace_2.traceId,
                             'x-b3-spanid': trace_2.spanId,
                             'x-b3-parentspanid': trace_2.parentId,
-                            'x-b3-sampled': true,
+                            'x-b3-sampled': 'true',
                         },
                     },
                 ),
             ]).then(
-                (val: any) => {
-                    expect(val).to.equal(['result: 14'])
+                async ([response]) => {
+                    expect([await response.text()]).to.equal(['result: 14'])
                     setTimeout(() => {
                         const result = collectServer.traces()
                         const piece = result[trace_1.traceId][trace_1.spanId]
@@ -315,7 +287,7 @@ describe('Tracing', () => {
                         resolve()
                     }, 3000)
                 },
-                (err: any) => {
+                (err: Error) => {
                     console.log('err: ', err)
                     reject(err)
                 },
diff --git a/packages/thrift-integration/src/express/index.spec.ts b/packages/thrift-integration/src/express/index.spec.ts
index 03c32fff..b8b0adc9 100644
--- a/packages/thrift-integration/src/express/index.spec.ts
+++ b/packages/thrift-integration/src/express/index.spec.ts
@@ -3,13 +3,13 @@ import * as Hapi from '@hapi/hapi'
 import * as Lab from '@hapi/lab'
 import * as express from 'express'
 import * as net from 'net'
-import { CoreOptions } from 'request'
-import * as rp from 'request-promise-native'
 
-import { createHttpClient } from '@statestitle/thrift-client'
+import { createHttpClient, RequestOptions } from '@statestitle/thrift-client'
 
 import { Int64 } from '@statestitle/thrift-server-core'
 
+import { fetch } from 'cross-fetch'
+
 import { EXPRESS_CALC_SERVER_CONFIG } from '../config'
 
 import { Calculator } from '../generated/calculator-service'
@@ -30,7 +30,7 @@ const after = lab.after
 describe('Thrift Server Express', () => {
     let calcServer: net.Server
     let addServer: Hapi.Server
-    let client: Calculator.Client<CoreOptions>
+    let client: Calculator.Client<RequestOptions>
 
     before(async () => {
         addServer = await createAddServer()
@@ -94,17 +94,17 @@ describe('Thrift Server Express', () => {
                 (response: number) => {
                     throw new Error('Should reject for incorrect context')
                 },
-                (err: any) => {
+                (err: Error) => {
                     expect(err.message).to.equal('Unauthorized')
                 },
             )
     })
 
     it('should handle requests not pointed to thrift service', async () => {
-        return rp(
+        return fetch(
             `http://${EXPRESS_CALC_SERVER_CONFIG.hostName}:${EXPRESS_CALC_SERVER_CONFIG.port}/control`,
-        ).then((val) => {
-            expect(val).to.equal('PASS')
+        ).then(async (response) => {
+            expect(await response.text()).to.equal('PASS')
         })
     })
 })
diff --git a/packages/thrift-integration/src/hapi/index.spec.ts b/packages/thrift-integration/src/hapi/index.spec.ts
index 26d5abb9..c72985ac 100644
--- a/packages/thrift-integration/src/hapi/index.spec.ts
+++ b/packages/thrift-integration/src/hapi/index.spec.ts
@@ -1,12 +1,12 @@
-import { createHttpClient } from '@statestitle/thrift-client'
+import { createHttpClient, RequestOptions } from '@statestitle/thrift-client'
 
 import { Int64, TApplicationException } from '@statestitle/thrift-server-core'
 
 import { expect } from '@hapi/code'
 import * as Hapi from '@hapi/hapi'
 import * as Lab from '@hapi/lab'
-import { CoreOptions } from 'request'
-import * as rp from 'request-promise-native'
+
+import { fetch } from 'cross-fetch'
 
 import { HAPI_CALC_SERVER_CONFIG } from '../config'
 
@@ -28,7 +28,7 @@ const after = lab.after
 describe('Thrift Server Hapi', () => {
     let calcServer: Hapi.Server
     let addServer: Hapi.Server
-    let client: Calculator.Client<CoreOptions>
+    let client: Calculator.Client<RequestOptions>
 
     before(async () => {
         calcServer = await createCalcServer()
@@ -92,17 +92,17 @@ describe('Thrift Server Hapi', () => {
             (response: void) => {
                 throw new Error('Should reject')
             },
-            (err: any) => {
+            (err: Error) => {
                 expect(err).to.be.instanceOf(TApplicationException)
             },
         )
     })
 
     it('should handle requests not pointed to thrift service', async () => {
-        return rp(
+        return fetch(
             `http://${HAPI_CALC_SERVER_CONFIG.hostName}:${HAPI_CALC_SERVER_CONFIG.port}/control`,
-        ).then((val) => {
-            expect(val).to.equal('PASS')
+        ).then(async (response) => {
+            expect(await response.text()).to.equal('PASS')
         })
     })
 })
diff --git a/packages/thrift-server-core/package-lock.json b/packages/thrift-server-core/package-lock.json
index 35de06e3..9afec8cd 100644
--- a/packages/thrift-server-core/package-lock.json
+++ b/packages/thrift-server-core/package-lock.json
@@ -488,11 +488,6 @@
 				"@hapi/lab": "*"
 			}
 		},
-		"@types/lodash": {
-			"version": "4.14.178",
-			"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.178.tgz",
-			"integrity": "sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw=="
-		},
 		"@types/minimatch": {
 			"version": "3.0.5",
 			"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
@@ -1385,11 +1380,6 @@
 			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
 			"dev": true
 		},
-		"lodash": {
-			"version": "4.17.21",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-		},
 		"lodash.merge": {
 			"version": "4.6.2",
 			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
diff --git a/packages/thrift-server-core/package.json b/packages/thrift-server-core/package.json
index f75fab5c..5b454d9a 100644
--- a/packages/thrift-server-core/package.json
+++ b/packages/thrift-server-core/package.json
@@ -45,10 +45,7 @@
         "tslint-plugin-prettier": "^2.3.0",
         "typescript": "~4.4.4"
     },
-    "dependencies": {
-        "@types/lodash": "^4.14.178",
-        "lodash": "^4.17.21"
-    },
+    "dependencies": {},
     "publishConfig": {
         "access": "public"
     }
diff --git a/packages/thrift-server-core/src/main/utils/index.ts b/packages/thrift-server-core/src/main/utils/index.ts
index 3a8ca8cf..1e58bf89 100644
--- a/packages/thrift-server-core/src/main/utils/index.ts
+++ b/packages/thrift-server-core/src/main/utils/index.ts
@@ -1,41 +1,12 @@
-import merge = require('lodash/merge')
-import * as url from 'url'
+import { URL } from 'url'
 
 export * from './appendThriftObject'
 export * from './readThriftObject'
 export * from './readThriftMetadata'
 export * from './normalizePath'
 
-export function deepMerge<Base extends object, Update extends object>(
-    base: Base,
-    update: Update,
-): Base & Update {
-    return merge({}, base, update)
-}
-
-export function overlayObjects<A, B>(a: A, b: B): A & B
-export function overlayObjects<A, B, C>(a: A, b: B, c: C): A & B & C
-export function overlayObjects<A, B, C, D>(
-    a: A,
-    b: B,
-    c: C,
-    d: D,
-): A & B & C & D
-export function overlayObjects<A, B, C, D, E>(
-    a: A,
-    b: B,
-    c: C,
-    d: D,
-    e: E,
-): A & B & B & C & D & E
-export function overlayObjects(...objs: Array<any>): any {
-    return objs.reduce((acc: any, next: any) => {
-        return deepMerge(acc, next)
-    }, {})
-}
-
 export function formatUrl(requestUrl: string): string {
-    const parsed = url.parse(url.format(requestUrl))
+    const parsed = new URL(requestUrl)
 
     if (!parsed.pathname) {
         return `${parsed.hostname || ''}/`
diff --git a/packages/thrift-server-core/src/tests/unit/utils.spec.ts b/packages/thrift-server-core/src/tests/unit/utils.spec.ts
index 520d1a64..451192ca 100644
--- a/packages/thrift-server-core/src/tests/unit/utils.spec.ts
+++ b/packages/thrift-server-core/src/tests/unit/utils.spec.ts
@@ -110,39 +110,6 @@ describe('Utils', () => {
         })
     })
 
-    describe('deepMerge', () => {
-        it('should merge two objects into new object', async () => {
-            const obj1: any = {
-                name: {
-                    first: 'Bob',
-                    last: 'Smith',
-                },
-            }
-            const obj2: any = {
-                name: {
-                    last: 'Murphy',
-                },
-                email: 'bob@fake.com',
-            }
-            const actual = Utils.deepMerge(obj1, obj2)
-            const expected: any = {
-                name: {
-                    first: 'Bob',
-                    last: 'Murphy',
-                },
-                email: 'bob@fake.com',
-            }
-
-            expect(actual).to.equal(expected)
-            expect(obj1).to.equal({
-                name: {
-                    first: 'Bob',
-                    last: 'Smith',
-                },
-            })
-        })
-    })
-
     describe('normalizePath', () => {
         it('should add leading slash to path', async () => {
             const path: string = 'thrift'
diff --git a/packages/zipkin-tracing-express/src/main/ZipkinTracingExpress.ts b/packages/zipkin-tracing-express/src/main/ZipkinTracingExpress.ts
index bb43a05c..8ca248de 100644
--- a/packages/zipkin-tracing-express/src/main/ZipkinTracingExpress.ts
+++ b/packages/zipkin-tracing-express/src/main/ZipkinTracingExpress.ts
@@ -14,17 +14,16 @@ import {
 
 import { Instrumentation, option, TraceId, Tracer } from 'zipkin'
 
-import * as express from 'express'
-import * as url from 'url'
+import { NextFunction, Request, RequestHandler, Response } from 'express'
+import { URL } from 'url'
 
-function formatRequestUrl(req: express.Request): string {
-    const parsed = url.parse(req.originalUrl)
-    return url.format({
-        protocol: req.protocol,
-        host: req.get('host'),
-        pathname: parsed.pathname || '/',
-        search: parsed.search,
-    })
+function formatRequestUrl(req: Request): string {
+    const parsed = new URL(
+        `${req.protocol}://${req.get('host')}${req.originalUrl}`,
+    )
+    parsed.pathname = parsed.pathname || '/'
+
+    return parsed.href
 }
 
 export function ZipkinTracingExpress({
@@ -34,15 +33,11 @@ export function ZipkinTracingExpress({
     transport = 'buffered',
     protocol = 'binary',
     tracerConfig = {},
-}: IZipkinOptions): express.RequestHandler {
+}: IZipkinOptions): RequestHandler {
     const tracer: Tracer = getTracerForService(localServiceName, tracerConfig)
     const instrumentation = new Instrumentation.HttpServer({ tracer, port })
 
-    return (
-        request: express.Request,
-        response: express.Response,
-        next: express.NextFunction,
-    ): void => {
+    return (request: Request, response: Response, next: NextFunction): void => {
         tracer.scoped(() => {
             const requestMethod: string =
                 isThrift === true
diff --git a/packages/zipkin-tracing-hapi/src/main/ZipkinTracingHapi.ts b/packages/zipkin-tracing-hapi/src/main/ZipkinTracingHapi.ts
index 760d94a1..581a8096 100644
--- a/packages/zipkin-tracing-hapi/src/main/ZipkinTracingHapi.ts
+++ b/packages/zipkin-tracing-hapi/src/main/ZipkinTracingHapi.ts
@@ -10,7 +10,6 @@ import {
 } from '@statestitle/zipkin-core'
 
 import * as Hapi from '@hapi/hapi'
-import * as url from 'url'
 import { Instrumentation, option, TraceId } from 'zipkin'
 
 import * as Boom from '@hapi/boom'
@@ -80,7 +79,7 @@ export function ZipkinTracingHapi({
                     return tracer.scoped(() => {
                         const traceId: TraceId = instrumentation.recordRequest(
                             requestMethod,
-                            Core.formatUrl(url.format(request.url)),
+                            Core.formatUrl(request.url.href),
                             (header: string): option.IOption<any> => {
                                 const val = normalHeaders[header.toLowerCase()]
                                 if (val !== null && val !== undefined) {