From 7284924b26db727add2ab83c488151c39e409620 Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Fri, 29 Jul 2022 03:39:05 +0200 Subject: [PATCH] fix(core): update --- package-lock.json | 117 ++++++++++++++++++++++----- package.json | 1 - ts/00_commitinfo_data.ts | 2 +- ts/index.ts | 1 + ts/smartproxy.classes.sslredirect.ts | 32 ++++++++ ts/smartproxy.portproxy.ts | 11 +-- 6 files changed, 135 insertions(+), 29 deletions(-) create mode 100644 ts/smartproxy.classes.sslredirect.ts diff --git a/package-lock.json b/package-lock.json index d76970c..b96e3d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,6 @@ "license": "MIT", "dependencies": { "@pushrocks/lik": "^6.0.0", - "@pushrocks/smartnetwork": "^3.0.0", "@pushrocks/smartpromise": "^3.1.7", "@pushrocks/smartrequest": "^2.0.0", "@pushrocks/smartstring": "^4.0.2", @@ -794,6 +793,7 @@ "version": "2.0.4", "resolved": "https://verdaccio.lossless.one/@leichtgewicht%2fip-codec/-/ip-codec-2.0.4.tgz", "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==", + "dev": true, "license": "MIT" }, "node_modules/@lit/reactive-element": { @@ -1366,6 +1366,7 @@ "version": "3.0.0", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartnetwork/-/smartnetwork-3.0.0.tgz", "integrity": "sha512-UsV5ifrizBIF8UVgZ0BoEuTq+UsRi9CFFwa6ZPOkggREN7L5ZQ66zo5VcumTOE9TC1tPlCekGuUH+CZOUH4KxQ==", + "dev": true, "license": "MIT", "dependencies": { "@pushrocks/smartpromise": "^3.1.7", @@ -1896,6 +1897,7 @@ "version": "0.14.0", "resolved": "https://verdaccio.lossless.one/@sindresorhus%2fis/-/is-0.14.0.tgz", "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -1912,6 +1914,7 @@ "version": "1.1.2", "resolved": "https://verdaccio.lossless.one/@szmarczak%2fhttp-timer/-/http-timer-1.1.2.tgz", "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", + "dev": true, "license": "MIT", "dependencies": { "defer-to-connect": "^1.0.1" @@ -2110,6 +2113,7 @@ "version": "3.0.1", "resolved": "https://verdaccio.lossless.one/@types%2fdefault-gateway/-/default-gateway-3.0.1.tgz", "integrity": "sha512-tpu0hp+AOIzwdAHyZPzLE5pCf9uT0pb+xZ76T4S7MrY2YTVq918Q7Q2VQ3KCVQqYxM7nxuCK/SL3X97jBEIeKQ==", + "dev": true, "license": "MIT" }, "node_modules/@types/express": { @@ -3095,6 +3099,7 @@ "version": "6.1.0", "resolved": "https://verdaccio.lossless.one/cacheable-request/-/cacheable-request-6.1.0.tgz", "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", + "dev": true, "license": "MIT", "dependencies": { "clone-response": "^1.0.2", @@ -3113,6 +3118,7 @@ "version": "5.2.0", "resolved": "https://verdaccio.lossless.one/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, "license": "MIT", "dependencies": { "pump": "^3.0.0" @@ -3128,6 +3134,7 @@ "version": "2.0.0", "resolved": "https://verdaccio.lossless.one/lowercase-keys/-/lowercase-keys-2.0.0.tgz", "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -3343,6 +3350,7 @@ "version": "1.0.3", "resolved": "https://verdaccio.lossless.one/clone-response/-/clone-response-1.0.3.tgz", "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", + "dev": true, "license": "MIT", "dependencies": { "mimic-response": "^1.0.0" @@ -3761,6 +3769,7 @@ "version": "3.3.0", "resolved": "https://verdaccio.lossless.one/decompress-response/-/decompress-response-3.3.0.tgz", "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", + "dev": true, "license": "MIT", "dependencies": { "mimic-response": "^1.0.0" @@ -3780,6 +3789,7 @@ "version": "1.1.3", "resolved": "https://verdaccio.lossless.one/defer-to-connect/-/defer-to-connect-1.1.3.tgz", "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", + "dev": true, "license": "MIT" }, "node_modules/define-lazy-prop": { @@ -3888,6 +3898,7 @@ "version": "5.4.0", "resolved": "https://verdaccio.lossless.one/dns-packet/-/dns-packet-5.4.0.tgz", "integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==", + "dev": true, "license": "MIT", "dependencies": { "@leichtgewicht/ip-codec": "^2.0.1" @@ -3900,6 +3911,7 @@ "version": "4.2.2", "resolved": "https://verdaccio.lossless.one/dns-socket/-/dns-socket-4.2.2.tgz", "integrity": "sha512-BDeBd8najI4/lS00HSKpdFia+OvUMytaVjfzR9n5Lq8MlZRSvtbI+uLtx1+XmQFls5wFU9dssccTmQQ6nfpjdg==", + "dev": true, "license": "MIT", "dependencies": { "dns-packet": "^5.2.4" @@ -3922,6 +3934,7 @@ "version": "0.1.5", "resolved": "https://verdaccio.lossless.one/duplexer3/-/duplexer3-0.1.5.tgz", "integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==", + "dev": true, "license": "BSD-3-Clause" }, "node_modules/ee-first": { @@ -3952,6 +3965,7 @@ "version": "1.4.4", "resolved": "https://verdaccio.lossless.one/end-of-stream/-/end-of-stream-1.4.4.tgz", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dev": true, "license": "MIT", "dependencies": { "once": "^1.4.0" @@ -5106,6 +5120,7 @@ "version": "9.6.0", "resolved": "https://verdaccio.lossless.one/got/-/got-9.6.0.tgz", "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", + "dev": true, "license": "MIT", "dependencies": { "@sindresorhus/is": "^0.14.0", @@ -5128,6 +5143,7 @@ "version": "4.1.0", "resolved": "https://verdaccio.lossless.one/get-stream/-/get-stream-4.1.0.tgz", "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "dev": true, "license": "MIT", "dependencies": { "pump": "^3.0.0" @@ -5299,6 +5315,7 @@ "version": "4.1.0", "resolved": "https://verdaccio.lossless.one/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", + "dev": true, "license": "BSD-2-Clause" }, "node_modules/http-errors": { @@ -5355,6 +5372,7 @@ "version": "2.0.1", "resolved": "https://verdaccio.lossless.one/icmp/-/icmp-2.0.1.tgz", "integrity": "sha512-M7r2J6pjZOwZFSjsFNvYlWvtpVbCckwCd2EQSHc4Mzscwp9X7DUpnPcQiVceKI9YQ42INb53cMmgIzaRs87Jmg==", + "dev": true, "license": "MIT", "dependencies": { "raw-socket": "^1.7.0" @@ -5449,6 +5467,7 @@ "version": "4.3.0", "resolved": "https://verdaccio.lossless.one/ip-regex/-/ip-regex-4.3.0.tgz", "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -5546,6 +5565,7 @@ "version": "3.1.0", "resolved": "https://verdaccio.lossless.one/is-ip/-/is-ip-3.1.0.tgz", "integrity": "sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==", + "dev": true, "license": "MIT", "dependencies": { "ip-regex": "^4.0.0" @@ -5671,6 +5691,7 @@ "version": "1.3.0", "resolved": "https://verdaccio.lossless.one/isopen/-/isopen-1.3.0.tgz", "integrity": "sha512-AN6Q9J0UlqHFl1fN/2xJCHCBLCBCFDjZhpGBO1gh3wzgRPsFSFBUL36I2Lbfd9qkuoj58axmE7j83iejTQsk8Q==", + "dev": true, "license": "MIT" }, "node_modules/istanbul-lib-coverage": { @@ -5765,6 +5786,7 @@ "version": "3.0.0", "resolved": "https://verdaccio.lossless.one/json-buffer/-/json-buffer-3.0.0.tgz", "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", + "dev": true, "license": "MIT" }, "node_modules/jsonfile": { @@ -5797,6 +5819,7 @@ "version": "3.1.0", "resolved": "https://verdaccio.lossless.one/keyv/-/keyv-3.1.0.tgz", "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", + "dev": true, "license": "MIT", "dependencies": { "json-buffer": "3.0.0" @@ -6176,6 +6199,7 @@ "version": "1.0.1", "resolved": "https://verdaccio.lossless.one/lowercase-keys/-/lowercase-keys-1.0.1.tgz", "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -6356,6 +6380,7 @@ "version": "1.0.1", "resolved": "https://verdaccio.lossless.one/mimic-response/-/mimic-response-1.0.1.tgz", "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -6420,6 +6445,7 @@ "version": "2.14.2", "resolved": "https://verdaccio.lossless.one/nan/-/nan-2.14.2.tgz", "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==", + "dev": true, "license": "MIT" }, "node_modules/nanocolors": { @@ -6530,6 +6556,7 @@ "version": "4.5.1", "resolved": "https://verdaccio.lossless.one/normalize-url/-/normalize-url-4.5.1.tgz", "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -6590,6 +6617,7 @@ "version": "1.4.0", "resolved": "https://verdaccio.lossless.one/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, "license": "ISC", "dependencies": { "wrappy": "1" @@ -6666,6 +6694,7 @@ "version": "1.1.0", "resolved": "https://verdaccio.lossless.one/p-cancelable/-/p-cancelable-1.1.0.tgz", "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==", + "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -6930,6 +6959,7 @@ "version": "2.0.0", "resolved": "https://verdaccio.lossless.one/prepend-http/-/prepend-http-2.0.0.tgz", "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", + "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -7005,6 +7035,7 @@ "version": "4.0.4", "resolved": "https://verdaccio.lossless.one/public-ip/-/public-ip-4.0.4.tgz", "integrity": "sha512-EJ0VMV2vF6Cu7BIPo3IMW1Maq6ME+fbR0NcPmqDfpfNGIRPue1X8QrGjrg/rfjDkOsIkKHIf2S5FlEa48hFMTA==", + "dev": true, "license": "MIT", "dependencies": { "dns-socket": "^4.2.2", @@ -7022,6 +7053,7 @@ "version": "3.0.0", "resolved": "https://verdaccio.lossless.one/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, "license": "MIT", "dependencies": { "end-of-stream": "^1.1.0", @@ -7188,6 +7220,7 @@ "version": "1.7.0", "resolved": "https://verdaccio.lossless.one/raw-socket/-/raw-socket-1.7.0.tgz", "integrity": "sha512-mXqWihgwaFNmV5le0dWk5o+03M3A2zBIkC9BNaE6R0CJN9eYot++j2FIqgNSDq6/Vmu32PPI155SiiWNV2yyFQ==", + "dev": true, "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -7322,6 +7355,7 @@ "version": "1.0.2", "resolved": "https://verdaccio.lossless.one/responselike/-/responselike-1.0.2.tgz", "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", + "dev": true, "license": "MIT", "dependencies": { "lowercase-keys": "^1.0.0" @@ -7867,6 +7901,7 @@ "version": "5.12.1", "resolved": "https://verdaccio.lossless.one/systeminformation/-/systeminformation-5.12.1.tgz", "integrity": "sha512-qAV0xSeSJlg0ZHmQ1T2rLrL54SATalBx6v4T8Sd5s17pEm6saX3LKzlPhfPx+EfT91y9yhRYnKhnMoLTFkxbqw==", + "dev": true, "license": "MIT", "os": [ "darwin", @@ -7958,6 +7993,7 @@ "version": "1.0.0", "resolved": "https://verdaccio.lossless.one/to-readable-stream/-/to-readable-stream-1.0.0.tgz", "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==", + "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -8273,6 +8309,7 @@ "version": "3.0.0", "resolved": "https://verdaccio.lossless.one/url-parse-lax/-/url-parse-lax-3.0.0.tgz", "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", + "dev": true, "license": "MIT", "dependencies": { "prepend-http": "^2.0.0" @@ -8438,6 +8475,7 @@ "version": "1.0.2", "resolved": "https://verdaccio.lossless.one/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true, "license": "ISC" }, "node_modules/ws": { @@ -9237,7 +9275,8 @@ "@leichtgewicht/ip-codec": { "version": "2.0.4", "resolved": "https://verdaccio.lossless.one/@leichtgewicht%2fip-codec/-/ip-codec-2.0.4.tgz", - "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==" + "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==", + "dev": true }, "@lit/reactive-element": { "version": "1.3.4", @@ -9767,6 +9806,7 @@ "version": "3.0.0", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartnetwork/-/smartnetwork-3.0.0.tgz", "integrity": "sha512-UsV5ifrizBIF8UVgZ0BoEuTq+UsRi9CFFwa6ZPOkggREN7L5ZQ66zo5VcumTOE9TC1tPlCekGuUH+CZOUH4KxQ==", + "dev": true, "requires": { "@pushrocks/smartpromise": "^3.1.7", "@pushrocks/smartstring": "^4.0.2", @@ -10258,7 +10298,8 @@ "@sindresorhus/is": { "version": "0.14.0", "resolved": "https://verdaccio.lossless.one/@sindresorhus%2fis/-/is-0.14.0.tgz", - "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" + "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", + "dev": true }, "@socket.io/component-emitter": { "version": "3.1.0", @@ -10270,6 +10311,7 @@ "version": "1.1.2", "resolved": "https://verdaccio.lossless.one/@szmarczak%2fhttp-timer/-/http-timer-1.1.2.tgz", "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", + "dev": true, "requires": { "defer-to-connect": "^1.0.1" } @@ -10441,7 +10483,8 @@ "@types/default-gateway": { "version": "3.0.1", "resolved": "https://verdaccio.lossless.one/@types%2fdefault-gateway/-/default-gateway-3.0.1.tgz", - "integrity": "sha512-tpu0hp+AOIzwdAHyZPzLE5pCf9uT0pb+xZ76T4S7MrY2YTVq918Q7Q2VQ3KCVQqYxM7nxuCK/SL3X97jBEIeKQ==" + "integrity": "sha512-tpu0hp+AOIzwdAHyZPzLE5pCf9uT0pb+xZ76T4S7MrY2YTVq918Q7Q2VQ3KCVQqYxM7nxuCK/SL3X97jBEIeKQ==", + "dev": true }, "@types/express": { "version": "4.17.13", @@ -11192,6 +11235,7 @@ "version": "6.1.0", "resolved": "https://verdaccio.lossless.one/cacheable-request/-/cacheable-request-6.1.0.tgz", "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", + "dev": true, "requires": { "clone-response": "^1.0.2", "get-stream": "^5.1.0", @@ -11206,6 +11250,7 @@ "version": "5.2.0", "resolved": "https://verdaccio.lossless.one/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, "requires": { "pump": "^3.0.0" } @@ -11213,7 +11258,8 @@ "lowercase-keys": { "version": "2.0.0", "resolved": "https://verdaccio.lossless.one/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", + "dev": true } } }, @@ -11366,6 +11412,7 @@ "version": "1.0.3", "resolved": "https://verdaccio.lossless.one/clone-response/-/clone-response-1.0.3.tgz", "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", + "dev": true, "requires": { "mimic-response": "^1.0.0" } @@ -11662,6 +11709,7 @@ "version": "3.3.0", "resolved": "https://verdaccio.lossless.one/decompress-response/-/decompress-response-3.3.0.tgz", "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", + "dev": true, "requires": { "mimic-response": "^1.0.0" } @@ -11675,7 +11723,8 @@ "defer-to-connect": { "version": "1.1.3", "resolved": "https://verdaccio.lossless.one/defer-to-connect/-/defer-to-connect-1.1.3.tgz", - "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" + "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", + "dev": true }, "define-lazy-prop": { "version": "2.0.0", @@ -11745,6 +11794,7 @@ "version": "5.4.0", "resolved": "https://verdaccio.lossless.one/dns-packet/-/dns-packet-5.4.0.tgz", "integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==", + "dev": true, "requires": { "@leichtgewicht/ip-codec": "^2.0.1" } @@ -11753,6 +11803,7 @@ "version": "4.2.2", "resolved": "https://verdaccio.lossless.one/dns-socket/-/dns-socket-4.2.2.tgz", "integrity": "sha512-BDeBd8najI4/lS00HSKpdFia+OvUMytaVjfzR9n5Lq8MlZRSvtbI+uLtx1+XmQFls5wFU9dssccTmQQ6nfpjdg==", + "dev": true, "requires": { "dns-packet": "^5.2.4" } @@ -11769,7 +11820,8 @@ "duplexer3": { "version": "0.1.5", "resolved": "https://verdaccio.lossless.one/duplexer3/-/duplexer3-0.1.5.tgz", - "integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==" + "integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==", + "dev": true }, "ee-first": { "version": "1.1.1", @@ -11793,6 +11845,7 @@ "version": "1.4.4", "resolved": "https://verdaccio.lossless.one/end-of-stream/-/end-of-stream-1.4.4.tgz", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dev": true, "requires": { "once": "^1.4.0" } @@ -12500,6 +12553,7 @@ "version": "9.6.0", "resolved": "https://verdaccio.lossless.one/got/-/got-9.6.0.tgz", "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", + "dev": true, "requires": { "@sindresorhus/is": "^0.14.0", "@szmarczak/http-timer": "^1.1.2", @@ -12518,6 +12572,7 @@ "version": "4.1.0", "resolved": "https://verdaccio.lossless.one/get-stream/-/get-stream-4.1.0.tgz", "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "dev": true, "requires": { "pump": "^3.0.0" } @@ -12633,7 +12688,8 @@ "http-cache-semantics": { "version": "4.1.0", "resolved": "https://verdaccio.lossless.one/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" + "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", + "dev": true }, "http-errors": { "version": "2.0.0", @@ -12678,6 +12734,7 @@ "version": "2.0.1", "resolved": "https://verdaccio.lossless.one/icmp/-/icmp-2.0.1.tgz", "integrity": "sha512-M7r2J6pjZOwZFSjsFNvYlWvtpVbCckwCd2EQSHc4Mzscwp9X7DUpnPcQiVceKI9YQ42INb53cMmgIzaRs87Jmg==", + "dev": true, "requires": { "raw-socket": "^1.7.0" } @@ -12739,7 +12796,8 @@ "ip-regex": { "version": "4.3.0", "resolved": "https://verdaccio.lossless.one/ip-regex/-/ip-regex-4.3.0.tgz", - "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==" + "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==", + "dev": true }, "ipaddr.js": { "version": "1.9.1", @@ -12796,6 +12854,7 @@ "version": "3.1.0", "resolved": "https://verdaccio.lossless.one/is-ip/-/is-ip-3.1.0.tgz", "integrity": "sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==", + "dev": true, "requires": { "ip-regex": "^4.0.0" } @@ -12877,7 +12936,8 @@ "isopen": { "version": "1.3.0", "resolved": "https://verdaccio.lossless.one/isopen/-/isopen-1.3.0.tgz", - "integrity": "sha512-AN6Q9J0UlqHFl1fN/2xJCHCBLCBCFDjZhpGBO1gh3wzgRPsFSFBUL36I2Lbfd9qkuoj58axmE7j83iejTQsk8Q==" + "integrity": "sha512-AN6Q9J0UlqHFl1fN/2xJCHCBLCBCFDjZhpGBO1gh3wzgRPsFSFBUL36I2Lbfd9qkuoj58axmE7j83iejTQsk8Q==", + "dev": true }, "istanbul-lib-coverage": { "version": "3.2.0", @@ -12946,7 +13006,8 @@ "json-buffer": { "version": "3.0.0", "resolved": "https://verdaccio.lossless.one/json-buffer/-/json-buffer-3.0.0.tgz", - "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=" + "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", + "dev": true }, "jsonfile": { "version": "6.1.0", @@ -12971,6 +13032,7 @@ "version": "3.1.0", "resolved": "https://verdaccio.lossless.one/keyv/-/keyv-3.1.0.tgz", "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", + "dev": true, "requires": { "json-buffer": "3.0.0" } @@ -13281,7 +13343,8 @@ "lowercase-keys": { "version": "1.0.1", "resolved": "https://verdaccio.lossless.one/lowercase-keys/-/lowercase-keys-1.0.1.tgz", - "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" + "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", + "dev": true }, "lru-cache": { "version": "6.0.0", @@ -13398,7 +13461,8 @@ "mimic-response": { "version": "1.0.1", "resolved": "https://verdaccio.lossless.one/mimic-response/-/mimic-response-1.0.1.tgz", - "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", + "dev": true }, "min-indent": { "version": "1.0.1", @@ -13440,7 +13504,8 @@ "nan": { "version": "2.14.2", "resolved": "https://verdaccio.lossless.one/nan/-/nan-2.14.2.tgz", - "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==" + "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==", + "dev": true }, "nanocolors": { "version": "0.2.13", @@ -13503,7 +13568,8 @@ "normalize-url": { "version": "4.5.1", "resolved": "https://verdaccio.lossless.one/normalize-url/-/normalize-url-4.5.1.tgz", - "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==" + "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==", + "dev": true }, "object-assign": { "version": "4.1.1", @@ -13540,6 +13606,7 @@ "version": "1.4.0", "resolved": "https://verdaccio.lossless.one/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, "requires": { "wrappy": "1" } @@ -13589,7 +13656,8 @@ "p-cancelable": { "version": "1.1.0", "resolved": "https://verdaccio.lossless.one/p-cancelable/-/p-cancelable-1.1.0.tgz", - "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==" + "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==", + "dev": true }, "p-limit": { "version": "2.3.0", @@ -13771,7 +13839,8 @@ "prepend-http": { "version": "2.0.0", "resolved": "https://verdaccio.lossless.one/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", + "dev": true }, "pretty-ms": { "version": "7.0.1", @@ -13824,6 +13893,7 @@ "version": "4.0.4", "resolved": "https://verdaccio.lossless.one/public-ip/-/public-ip-4.0.4.tgz", "integrity": "sha512-EJ0VMV2vF6Cu7BIPo3IMW1Maq6ME+fbR0NcPmqDfpfNGIRPue1X8QrGjrg/rfjDkOsIkKHIf2S5FlEa48hFMTA==", + "dev": true, "requires": { "dns-socket": "^4.2.2", "got": "^9.6.0", @@ -13834,6 +13904,7 @@ "version": "3.0.0", "resolved": "https://verdaccio.lossless.one/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, "requires": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -13935,6 +14006,7 @@ "version": "1.7.0", "resolved": "https://verdaccio.lossless.one/raw-socket/-/raw-socket-1.7.0.tgz", "integrity": "sha512-mXqWihgwaFNmV5le0dWk5o+03M3A2zBIkC9BNaE6R0CJN9eYot++j2FIqgNSDq6/Vmu32PPI155SiiWNV2yyFQ==", + "dev": true, "requires": { "nan": "2.14.*" } @@ -14034,6 +14106,7 @@ "version": "1.0.2", "resolved": "https://verdaccio.lossless.one/responselike/-/responselike-1.0.2.tgz", "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", + "dev": true, "requires": { "lowercase-keys": "^1.0.0" } @@ -14424,7 +14497,8 @@ "systeminformation": { "version": "5.12.1", "resolved": "https://verdaccio.lossless.one/systeminformation/-/systeminformation-5.12.1.tgz", - "integrity": "sha512-qAV0xSeSJlg0ZHmQ1T2rLrL54SATalBx6v4T8Sd5s17pEm6saX3LKzlPhfPx+EfT91y9yhRYnKhnMoLTFkxbqw==" + "integrity": "sha512-qAV0xSeSJlg0ZHmQ1T2rLrL54SATalBx6v4T8Sd5s17pEm6saX3LKzlPhfPx+EfT91y9yhRYnKhnMoLTFkxbqw==", + "dev": true }, "tar-fs": { "version": "2.1.1", @@ -14485,7 +14559,8 @@ "to-readable-stream": { "version": "1.0.0", "resolved": "https://verdaccio.lossless.one/to-readable-stream/-/to-readable-stream-1.0.0.tgz", - "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==" + "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==", + "dev": true }, "to-regex-range": { "version": "5.0.1", @@ -14687,6 +14762,7 @@ "version": "3.0.0", "resolved": "https://verdaccio.lossless.one/url-parse-lax/-/url-parse-lax-3.0.0.tgz", "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", + "dev": true, "requires": { "prepend-http": "^2.0.0" } @@ -14801,7 +14877,8 @@ "wrappy": { "version": "1.0.2", "resolved": "https://verdaccio.lossless.one/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true }, "ws": { "version": "8.8.1", diff --git a/package.json b/package.json index c1b6e5f..7a4e0a4 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ }, "dependencies": { "@pushrocks/lik": "^6.0.0", - "@pushrocks/smartnetwork": "^3.0.0", "@pushrocks/smartpromise": "^3.1.7", "@pushrocks/smartrequest": "^2.0.0", "@pushrocks/smartstring": "^4.0.2", diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index 9217e29..cccda27 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@pushrocks/smartproxy', - version: '3.0.6', + version: '3.0.7', description: 'a proxy for handling high workloads of proxying' } diff --git a/ts/index.ts b/ts/index.ts index 1407a9f..54ee5c3 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -1,2 +1,3 @@ export * from './smartproxy.classes.networkproxy.js'; export * from './smartproxy.portproxy.js'; +export * from './smartproxy.classes.sslredirect.js' \ No newline at end of file diff --git a/ts/smartproxy.classes.sslredirect.ts b/ts/smartproxy.classes.sslredirect.ts new file mode 100644 index 0000000..72fdde3 --- /dev/null +++ b/ts/smartproxy.classes.sslredirect.ts @@ -0,0 +1,32 @@ +import * as plugins from './smartproxy.plugins.js'; + +export class SslRedirect { + httpServer: plugins.http.Server; + port: number; + constructor(portArg: number) { + this.port = portArg; + } + + public async start() { + this.httpServer = plugins.http.createServer((request, response) => { + const requestUrl = new URL(request.url, `http://${request.headers.host}`); + const completeUrlWithoutProtocol = `${requestUrl.host}${requestUrl.pathname}${requestUrl.search}`; + const redirectUrl = `https://${completeUrlWithoutProtocol}`; + console.log(`Got http request for http://${completeUrlWithoutProtocol}`); + console.log(`Redirecting to ${redirectUrl}`); + response.writeHead(302, { + Location: redirectUrl, + }); + response.end(); + }); + this.httpServer.listen(this.port); + } + + public async stop() { + const done = plugins.smartpromise.defer(); + this.httpServer.close(() => { + done.resolve(); + }); + await done.promise; + } +} \ No newline at end of file diff --git a/ts/smartproxy.portproxy.ts b/ts/smartproxy.portproxy.ts index b45a0f0..3552377 100644 --- a/ts/smartproxy.portproxy.ts +++ b/ts/smartproxy.portproxy.ts @@ -1,9 +1,8 @@ import * as plugins from './smartproxy.plugins.js'; import * as net from 'net'; -let netServer: plugins.net.Server; -let httpServer: plugins.http.Server; export class PortProxy { + netServer: plugins.net.Server; fromPort: number; toPort: number; @@ -23,7 +22,7 @@ export class PortProxy { from.destroy(); to.destroy(); }; - netServer = net + this.netServer = net .createServer((from) => { const to = net.createConnection({ host: 'localhost', @@ -63,10 +62,8 @@ export class PortProxy { public async stop() { const done = plugins.smartpromise.defer(); - httpServer.close(() => { - netServer.close(() => { - done.resolve(); - }); + this.netServer.close(() => { + done.resolve(); }); await done.promise; }