Compare commits
22 Commits
Author | SHA1 | Date | |
---|---|---|---|
58ec01526a | |||
1c3619040c | |||
0eabdcde28 | |||
3f935b3a03 | |||
c7b8b6ff66 | |||
a9815c61d2 | |||
82730877ce | |||
b68b143a3f | |||
3e7416574d | |||
7f843bef50 | |||
360c31c6b6 | |||
4ca748ec93 | |||
6dd3e473c6 | |||
3856a1d7fb | |||
fb76ecfd8a | |||
6c84406574 | |||
945065279f | |||
07a8d9bec6 | |||
2c55a6b819 | |||
8f4421fbc3 | |||
5eebc434bb | |||
ed03c3ec4b |
@ -1,18 +1,16 @@
|
|||||||
# gitzone ci_default
|
# gitzone ci_default
|
||||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||||
variables:
|
|
||||||
GIT_STRATEGY: clone
|
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
paths:
|
paths:
|
||||||
- .npmci_cache/
|
- .npmci_cache/
|
||||||
key: "$CI_BUILD_STAGE"
|
key: '$CI_BUILD_STAGE'
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- security
|
- security
|
||||||
- test
|
- test
|
||||||
- release
|
- release
|
||||||
- metadata
|
- metadata
|
||||||
|
|
||||||
# ====================
|
# ====================
|
||||||
# security stage
|
# security stage
|
||||||
@ -20,21 +18,23 @@ stages:
|
|||||||
mirror:
|
mirror:
|
||||||
stage: security
|
stage: security
|
||||||
script:
|
script:
|
||||||
- npmci git mirror
|
- npmci git mirror
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- lossless
|
||||||
- notpriv
|
- docker
|
||||||
|
- notpriv
|
||||||
|
|
||||||
snyk:
|
snyk:
|
||||||
|
image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
|
||||||
stage: security
|
stage: security
|
||||||
script:
|
script:
|
||||||
- npmci npm prepare
|
- npmci npm prepare
|
||||||
- npmci command npm install -g snyk
|
|
||||||
- npmci command npm install --ignore-scripts
|
- npmci command npm install --ignore-scripts
|
||||||
- npmci command snyk test
|
- npmci command snyk test
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- lossless
|
||||||
- notpriv
|
- docker
|
||||||
|
- notpriv
|
||||||
|
|
||||||
# ====================
|
# ====================
|
||||||
# test stage
|
# test stage
|
||||||
@ -43,37 +43,40 @@ snyk:
|
|||||||
testStable:
|
testStable:
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- npmci npm prepare
|
- npmci npm prepare
|
||||||
- npmci node install stable
|
- npmci node install stable
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci npm test
|
- npmci npm test
|
||||||
coverage: /\d+.?\d+?\%\s*coverage/
|
coverage: /\d+.?\d+?\%\s*coverage/
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- lossless
|
||||||
- priv
|
- docker
|
||||||
|
- priv
|
||||||
|
|
||||||
testBuild:
|
testBuild:
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- npmci npm prepare
|
- npmci npm prepare
|
||||||
- npmci node install lts
|
- npmci node install stable
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command npm run build
|
- npmci command npm run build
|
||||||
coverage: /\d+.?\d+?\%\s*coverage/
|
coverage: /\d+.?\d+?\%\s*coverage/
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- lossless
|
||||||
- notpriv
|
- docker
|
||||||
|
- notpriv
|
||||||
|
|
||||||
release:
|
release:
|
||||||
stage: release
|
stage: release
|
||||||
script:
|
script:
|
||||||
- npmci node install lts
|
- npmci node install stable
|
||||||
- npmci npm publish
|
- npmci npm publish
|
||||||
only:
|
only:
|
||||||
- tags
|
- tags
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- lossless
|
||||||
- notpriv
|
- docker
|
||||||
|
- notpriv
|
||||||
|
|
||||||
# ====================
|
# ====================
|
||||||
# metadata stage
|
# metadata stage
|
||||||
@ -83,33 +86,35 @@ codequality:
|
|||||||
allow_failure: true
|
allow_failure: true
|
||||||
script:
|
script:
|
||||||
- npmci command npm install -g tslint typescript
|
- npmci command npm install -g tslint typescript
|
||||||
|
- npmci npm prepare
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
|
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- lossless
|
||||||
- priv
|
- docker
|
||||||
|
- priv
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
stage: metadata
|
stage: metadata
|
||||||
script:
|
script:
|
||||||
- npmci trigger
|
- npmci trigger
|
||||||
only:
|
only:
|
||||||
- tags
|
- tags
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- lossless
|
||||||
- notpriv
|
- docker
|
||||||
|
- notpriv
|
||||||
|
|
||||||
pages:
|
pages:
|
||||||
image: hosttoday/ht-docker-dbase:npmci
|
|
||||||
services:
|
|
||||||
- docker:18-dind
|
|
||||||
stage: metadata
|
stage: metadata
|
||||||
script:
|
script:
|
||||||
|
- npmci node install lts
|
||||||
- npmci command npm install -g @gitzone/tsdoc
|
- npmci command npm install -g @gitzone/tsdoc
|
||||||
- npmci npm prepare
|
- npmci npm prepare
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command tsdoc
|
- npmci command tsdoc
|
||||||
tags:
|
tags:
|
||||||
|
- lossless
|
||||||
- docker
|
- docker
|
||||||
- notpriv
|
- notpriv
|
||||||
only:
|
only:
|
||||||
@ -117,5 +122,5 @@ pages:
|
|||||||
artifacts:
|
artifacts:
|
||||||
expire_in: 1 week
|
expire_in: 1 week
|
||||||
paths:
|
paths:
|
||||||
- public
|
- public
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
|
26
.vscode/settings.json
vendored
Normal file
26
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"json.schemas": [
|
||||||
|
{
|
||||||
|
"fileMatch": ["/npmextra.json"],
|
||||||
|
"schema": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"npmci": {
|
||||||
|
"type": "object",
|
||||||
|
"description": "settings for npmci"
|
||||||
|
},
|
||||||
|
"gitzone": {
|
||||||
|
"type": "object",
|
||||||
|
"description": "settings for gitzone",
|
||||||
|
"properties": {
|
||||||
|
"projectType": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": ["website", "element", "service", "npm"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
"gitzone": {
|
"gitzone": {
|
||||||
|
"projectType": "npm",
|
||||||
"module": {
|
"module": {
|
||||||
"githost": "gitlab.com",
|
"githost": "gitlab.com",
|
||||||
"gitscope": "pushrocks",
|
"gitscope": "pushrocks",
|
||||||
|
969
package-lock.json
generated
969
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
36
package.json
36
package.json
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@pushrocks/smartproxy",
|
"name": "@pushrocks/smartproxy",
|
||||||
"version": "1.0.26",
|
"version": "1.0.37",
|
||||||
"private": false,
|
"private": false,
|
||||||
"description": "a proxy for handling high workloads of proxying",
|
"description": "a proxy for handling high workloads of proxying",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
@ -14,29 +14,31 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@gitzone/tsbuild": "^2.1.17",
|
"@gitzone/tsbuild": "^2.1.17",
|
||||||
"@gitzone/tstest": "^1.0.15",
|
"@gitzone/tstest": "^1.0.28",
|
||||||
"@pushrocks/tapbundle": "^3.0.13",
|
"@pushrocks/tapbundle": "^3.2.0",
|
||||||
"@types/node": "^12.7.5",
|
"@types/node": "^13.7.0",
|
||||||
"tslint": "^5.20.0",
|
"tslint": "^6.0.0",
|
||||||
"tslint-config-prettier": "^1.15.0"
|
"tslint-config-prettier": "^1.15.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@pushrocks/smartnetwork": "^1.1.14",
|
"@pushrocks/lik": "^3.0.16",
|
||||||
"@pushrocks/smartpromise": "^3.0.5",
|
"@pushrocks/smartnetwork": "^1.1.18",
|
||||||
"@pushrocks/smartrequest": "^1.1.27",
|
"@pushrocks/smartpromise": "^3.0.6",
|
||||||
|
"@pushrocks/smartrequest": "^1.1.47",
|
||||||
"@pushrocks/smartspawn": "^2.0.9",
|
"@pushrocks/smartspawn": "^2.0.9",
|
||||||
|
"@pushrocks/smartstring": "^3.0.18",
|
||||||
"@pushrocks/smartsystem": "^2.0.9",
|
"@pushrocks/smartsystem": "^2.0.9",
|
||||||
"@tsclass/tsclass": "^2.0.6",
|
"@tsclass/tsclass": "^3.0.3",
|
||||||
"@types/ws": "^6.0.3",
|
"@types/ws": "^7.2.1",
|
||||||
"ws": "^7.1.2"
|
"ws": "^7.2.1"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"ts/*",
|
"ts/**/*",
|
||||||
"ts_web/*",
|
"ts_web/**/*",
|
||||||
"dist/*",
|
"dist/**/*",
|
||||||
"dist_web/*",
|
"dist_web/**/*",
|
||||||
"dist_ts_web/*",
|
"dist_ts_web/**/*",
|
||||||
"assets/*",
|
"assets/**/*",
|
||||||
"cli.js",
|
"cli.js",
|
||||||
"npmextra.json",
|
"npmextra.json",
|
||||||
"readme.md"
|
"readme.md"
|
||||||
|
@ -8,7 +8,7 @@ a proxy for handling high workloads of proxying
|
|||||||
* [docs (typedoc)](https://pushrocks.gitlab.io/smartproxy/)
|
* [docs (typedoc)](https://pushrocks.gitlab.io/smartproxy/)
|
||||||
|
|
||||||
## Status for master
|
## Status for master
|
||||||
[](https://gitlab.com/pushrocks/smartproxy/commits/master)
|
[](https://gitlab.com/pushrocks/smartproxy/commits/master)
|
||||||
[](https://gitlab.com/pushrocks/smartproxy/commits/master)
|
[](https://gitlab.com/pushrocks/smartproxy/commits/master)
|
||||||
[](https://www.npmjs.com/package/@pushrocks/smartproxy)
|
[](https://www.npmjs.com/package/@pushrocks/smartproxy)
|
||||||
[](https://snyk.io/test/npm/@pushrocks/smartproxy)
|
[](https://snyk.io/test/npm/@pushrocks/smartproxy)
|
||||||
@ -18,6 +18,11 @@ a proxy for handling high workloads of proxying
|
|||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
|
|
||||||
|
## Contribution
|
||||||
|
|
||||||
|
We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
|
||||||
|
|
||||||
For further information read the linked docs at the top of this readme.
|
For further information read the linked docs at the top of this readme.
|
||||||
|
|
||||||
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
|
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
|
||||||
|
20
test/test.ts
20
test/test.ts
@ -4,7 +4,7 @@ import * as smartproxy from '../ts/index';
|
|||||||
let testProxy: smartproxy.SmartProxy;
|
let testProxy: smartproxy.SmartProxy;
|
||||||
|
|
||||||
tap.test('first test', async () => {
|
tap.test('first test', async () => {
|
||||||
testProxy = new smartproxy.SmartProxy();
|
testProxy = new smartproxy.SmartProxy({});
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should start the testproxy', async () => {
|
tap.test('should start the testproxy', async () => {
|
||||||
@ -12,11 +12,12 @@ tap.test('should start the testproxy', async () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should supply reverse proxy config', async () => {
|
tap.test('should supply reverse proxy config', async () => {
|
||||||
testProxy.updateReversConfigs([{
|
testProxy.updateReversConfigs([
|
||||||
destinationIp: 'localhost',
|
{
|
||||||
destinationPort: '8080',
|
destinationIp: 'localhost',
|
||||||
hostName: 'central.eu',
|
destinationPort: '3000',
|
||||||
privateKey: `-----BEGIN PRIVATE KEY-----
|
hostName: 'push.rocks',
|
||||||
|
privateKey: `-----BEGIN PRIVATE KEY-----
|
||||||
MIIJRQIBADANBgkqhkiG9w0BAQEFAASCCS8wggkrAgEAAoICAQDi2F/0kQr96mhe
|
MIIJRQIBADANBgkqhkiG9w0BAQEFAASCCS8wggkrAgEAAoICAQDi2F/0kQr96mhe
|
||||||
3yEWvy2mRHOZoSSBtIqg6Bre4ZcMu901/cHNIjFnynNGFl9Se61yZbW2F3PfCt7+
|
3yEWvy2mRHOZoSSBtIqg6Bre4ZcMu901/cHNIjFnynNGFl9Se61yZbW2F3PfCt7+
|
||||||
kQlHug1Cx+LFssvz+hLlB5cqJQZfRKx92DhbROygtxG9r7UBmx/fwx+JQ+HOHX9R
|
kQlHug1Cx+LFssvz+hLlB5cqJQZfRKx92DhbROygtxG9r7UBmx/fwx+JQ+HOHX9R
|
||||||
@ -69,7 +70,7 @@ h+7fBVO49PLL0NWy+8GT8y7a04calFfLvZEA2UMaunBis3dE1KMFfJL/0JO+sKnF
|
|||||||
2TkK01XDDJURK5Lhuvc7WrK2rSJ/fK+0GA==
|
2TkK01XDDJURK5Lhuvc7WrK2rSJ/fK+0GA==
|
||||||
-----END PRIVATE KEY-----
|
-----END PRIVATE KEY-----
|
||||||
`,
|
`,
|
||||||
publicKey: `-----BEGIN CERTIFICATE-----
|
publicKey: `-----BEGIN CERTIFICATE-----
|
||||||
MIIEljCCAn4CCQDY+ZbC9FASVjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJE
|
MIIEljCCAn4CCQDY+ZbC9FASVjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJE
|
||||||
RTAeFw0xOTA5MjAxNjAxNDRaFw0yMDA5MTkxNjAxNDRaMA0xCzAJBgNVBAYTAkRF
|
RTAeFw0xOTA5MjAxNjAxNDRaFw0yMDA5MTkxNjAxNDRaMA0xCzAJBgNVBAYTAkRF
|
||||||
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4thf9JEK/epoXt8hFr8t
|
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4thf9JEK/epoXt8hFr8t
|
||||||
@ -97,11 +98,12 @@ r8d9QwrK+WaqVi2ofbMfMByVF72jgeJNa4nxwT9bVbu/Q1T2Lt+YPb4pQ7yCoUgS
|
|||||||
JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
|
JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
|
||||||
-----END CERTIFICATE-----
|
-----END CERTIFICATE-----
|
||||||
`
|
`
|
||||||
}]);
|
}
|
||||||
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should wait for 60 seconds', async tools => {
|
tap.test('should wait for 60 seconds', async tools => {
|
||||||
await tools.delayFor(60000);
|
await tools.delayFor(10000);
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should close the testproxy', async () => {
|
tap.test('should close the testproxy', async () => {
|
||||||
|
@ -3,17 +3,25 @@ import * as plugins from './smartproxy.plugins';
|
|||||||
import { SmartproxyRouter } from './smartproxy.classes.router';
|
import { SmartproxyRouter } from './smartproxy.classes.router';
|
||||||
|
|
||||||
export class ProxyWorker {
|
export class ProxyWorker {
|
||||||
public hostCandidates: plugins.tsclass.network.IReverseProxyConfig[] = [];
|
public proxyConfigs: plugins.tsclass.network.IReverseProxyConfig[] = [];
|
||||||
public httpsServer: plugins.https.Server; // | plugins.http.Server;
|
public httpsServer: plugins.https.Server; // | plugins.http.Server;
|
||||||
public port = 8001;
|
public port = 8001;
|
||||||
public router = new SmartproxyRouter();
|
public router = new SmartproxyRouter();
|
||||||
|
public socketMap = new plugins.lik.Objectmap<plugins.net.Socket>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* starts the proxyInstance
|
* starts the proxyInstance
|
||||||
*/
|
*/
|
||||||
public async start() {
|
public async start() {
|
||||||
this.httpsServer = plugins.https.createServer({
|
this.httpsServer = plugins.https.createServer(
|
||||||
key: `-----BEGIN PRIVATE KEY-----
|
// ================
|
||||||
|
// Spotted this keypair in the code?
|
||||||
|
// Don't get exited:
|
||||||
|
// It is an invalid default keypair.
|
||||||
|
// For proper requests custom domain level keypairs are used that are provided in the reverse config
|
||||||
|
// ================
|
||||||
|
{
|
||||||
|
key: `-----BEGIN PRIVATE KEY-----
|
||||||
MIIJRQIBADANBgkqhkiG9w0BAQEFAASCCS8wggkrAgEAAoICAQDi2F/0kQr96mhe
|
MIIJRQIBADANBgkqhkiG9w0BAQEFAASCCS8wggkrAgEAAoICAQDi2F/0kQr96mhe
|
||||||
3yEWvy2mRHOZoSSBtIqg6Bre4ZcMu901/cHNIjFnynNGFl9Se61yZbW2F3PfCt7+
|
3yEWvy2mRHOZoSSBtIqg6Bre4ZcMu901/cHNIjFnynNGFl9Se61yZbW2F3PfCt7+
|
||||||
kQlHug1Cx+LFssvz+hLlB5cqJQZfRKx92DhbROygtxG9r7UBmx/fwx+JQ+HOHX9R
|
kQlHug1Cx+LFssvz+hLlB5cqJQZfRKx92DhbROygtxG9r7UBmx/fwx+JQ+HOHX9R
|
||||||
@ -66,7 +74,7 @@ h+7fBVO49PLL0NWy+8GT8y7a04calFfLvZEA2UMaunBis3dE1KMFfJL/0JO+sKnF
|
|||||||
2TkK01XDDJURK5Lhuvc7WrK2rSJ/fK+0GA==
|
2TkK01XDDJURK5Lhuvc7WrK2rSJ/fK+0GA==
|
||||||
-----END PRIVATE KEY-----
|
-----END PRIVATE KEY-----
|
||||||
`,
|
`,
|
||||||
cert: `-----BEGIN CERTIFICATE-----
|
cert: `-----BEGIN CERTIFICATE-----
|
||||||
MIIEljCCAn4CCQDY+ZbC9FASVjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJE
|
MIIEljCCAn4CCQDY+ZbC9FASVjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJE
|
||||||
RTAeFw0xOTA5MjAxNjAxNDRaFw0yMDA5MTkxNjAxNDRaMA0xCzAJBgNVBAYTAkRF
|
RTAeFw0xOTA5MjAxNjAxNDRaFw0yMDA5MTkxNjAxNDRaMA0xCzAJBgNVBAYTAkRF
|
||||||
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4thf9JEK/epoXt8hFr8t
|
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4thf9JEK/epoXt8hFr8t
|
||||||
@ -94,38 +102,101 @@ r8d9QwrK+WaqVi2ofbMfMByVF72jgeJNa4nxwT9bVbu/Q1T2Lt+YPb4pQ7yCoUgS
|
|||||||
JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
|
JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
|
||||||
-----END CERTIFICATE-----
|
-----END CERTIFICATE-----
|
||||||
`
|
`
|
||||||
}, async (req, res) => {
|
},
|
||||||
console.log('got request');
|
async (req, res) => {
|
||||||
const destinationConfig = this.router.routeReq(req);
|
console.log('got request');
|
||||||
const response = await plugins.smartrequest.request(
|
const destinationConfig = this.router.routeReq(req);
|
||||||
`http://${destinationConfig.destinationIp}:${destinationConfig.destinationPort}${req.url}`,
|
|
||||||
{
|
|
||||||
method: req.method,
|
|
||||||
headers: req.headers
|
|
||||||
},
|
|
||||||
true // lets make this streaming
|
|
||||||
);
|
|
||||||
res.statusCode = response.statusCode;
|
|
||||||
for (const header of Object.keys(response.headers)) {
|
|
||||||
res.setHeader(header, response.headers[header]);
|
|
||||||
}
|
|
||||||
response.on('data', data => {
|
|
||||||
res.write(data);
|
|
||||||
});
|
|
||||||
response.on('end', () => {
|
|
||||||
res.end();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
const Websocket = await import('ws');
|
// endRequest function
|
||||||
|
const endRequest = (
|
||||||
|
statusArg: number = 404,
|
||||||
|
messageArg: string = 'This route is not available on this server.',
|
||||||
|
headers: plugins.http.OutgoingHttpHeaders = {}
|
||||||
|
) => {
|
||||||
|
res.writeHead(statusArg, messageArg);
|
||||||
|
res.end(messageArg);
|
||||||
|
};
|
||||||
|
|
||||||
|
// authentication
|
||||||
|
if (destinationConfig.authentication) {
|
||||||
|
const authInfo = destinationConfig.authentication;
|
||||||
|
switch (authInfo.type) {
|
||||||
|
case 'Basic':
|
||||||
|
const authHeader = req.headers.authorization;
|
||||||
|
if (authHeader) {
|
||||||
|
if (!authHeader.includes('Basic ')) {
|
||||||
|
return endRequest(401, 'Authentication required', {
|
||||||
|
'WWW-Authenticate': 'Basic realm="Access to the staging site", charset="UTF-8"'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
const authStringBase64 = req.headers.authorization.replace('Basic ', '');
|
||||||
|
const authString: string = plugins.smartstring.base64.decode(authStringBase64);
|
||||||
|
const userPassArray = authString.split(':');
|
||||||
|
const user = userPassArray[0];
|
||||||
|
const pass = userPassArray[1];
|
||||||
|
if (user === authInfo.user && pass === authInfo.pass) {
|
||||||
|
console.log('request successfully authenticated');
|
||||||
|
} else {
|
||||||
|
return endRequest(403, 'Forbidden: Wrong credentials');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return endRequest(
|
||||||
|
403,
|
||||||
|
'Forbidden: unsupported authentication method configured. Please report to the admin.'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let destinationUrl: string;
|
||||||
|
if (destinationConfig) {
|
||||||
|
destinationUrl = `http://${destinationConfig.destinationIp}:${destinationConfig.destinationPort}${req.url}`;
|
||||||
|
} else {
|
||||||
|
return endRequest();
|
||||||
|
}
|
||||||
|
console.log(destinationUrl);
|
||||||
|
const response = await plugins.smartrequest.request(
|
||||||
|
destinationUrl,
|
||||||
|
{
|
||||||
|
method: req.method,
|
||||||
|
headers: req.headers
|
||||||
|
},
|
||||||
|
true, // lets make this streaming
|
||||||
|
request => {
|
||||||
|
req.on('data', data => {
|
||||||
|
request.write(data);
|
||||||
|
});
|
||||||
|
req.on('end', data => {
|
||||||
|
request.end();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
);
|
||||||
|
res.statusCode = response.statusCode;
|
||||||
|
console.log(response.statusCode);
|
||||||
|
for (const header of Object.keys(response.headers)) {
|
||||||
|
res.setHeader(header, response.headers[header]);
|
||||||
|
}
|
||||||
|
response.on('data', data => {
|
||||||
|
res.write(data);
|
||||||
|
});
|
||||||
|
response.on('end', () => {
|
||||||
|
res.end();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
// Enable websockets
|
// Enable websockets
|
||||||
const wss = new plugins.ws.Server({ server: this.httpsServer });
|
const wss = new plugins.ws.Server({ server: this.httpsServer });
|
||||||
wss.on('connection', function connection(ws) {
|
wss.on('connection', (ws: plugins.wsDefault) => {
|
||||||
console.log('got connection for wsc');
|
console.log('got connection for wsc');
|
||||||
const wscConnected = plugins.smartpromise.defer();
|
const wscConnected = plugins.smartpromise.defer();
|
||||||
|
|
||||||
const wsc = new Websocket.default(`${ws.url}`);
|
const wsc = new plugins.wsDefault(this.router.routeWs(ws), {
|
||||||
|
headers: {
|
||||||
|
Host: ws.url
|
||||||
|
}
|
||||||
|
});
|
||||||
wsc.on('open', () => {
|
wsc.on('open', () => {
|
||||||
wscConnected.resolve();
|
wscConnected.resolve();
|
||||||
});
|
});
|
||||||
@ -146,19 +217,28 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
|
|||||||
ws.close();
|
ws.close();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
this.httpsServer.keepAliveTimeout = 61000;
|
||||||
|
this.httpsServer.headersTimeout = 65000;
|
||||||
|
|
||||||
|
this.httpsServer.on('connection', connection => {
|
||||||
|
this.socketMap.add(connection);
|
||||||
|
connection.on('close', () => {
|
||||||
|
this.socketMap.remove(connection);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
this.httpsServer.listen(this.port);
|
this.httpsServer.listen(this.port);
|
||||||
console.log(`OK: now listening for new connections on port ${this.port}`);
|
console.log(`ProxyWorker -> OK: now listening for new connections on port ${this.port}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async updateCandidates(arrayOfReverseCandidates: plugins.tsclass.IReverseProxyConfig[]) {
|
public async updateProxyConfigs(proxyConfigsArg: plugins.tsclass.IReverseProxyConfig[]) {
|
||||||
this.hostCandidates = arrayOfReverseCandidates;
|
this.proxyConfigs = proxyConfigsArg;
|
||||||
this.router.setNewCandidates(arrayOfReverseCandidates);
|
this.router.setNewProxyConfigs(proxyConfigsArg);
|
||||||
for (const hostCandidate of this.hostCandidates) {
|
for (const hostCandidate of this.proxyConfigs) {
|
||||||
// console.log(hostCandidate);
|
// console.log(hostCandidate);
|
||||||
this.httpsServer.addContext(hostCandidate.hostName, {
|
this.httpsServer.addContext(hostCandidate.hostName, {
|
||||||
cert: hostCandidate.publicKey,
|
cert: hostCandidate.publicKey,
|
||||||
key: hostCandidate.privateKey,
|
key: hostCandidate.privateKey
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
/* this.httpsServer.close();
|
/* this.httpsServer.close();
|
||||||
@ -170,6 +250,9 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
|
|||||||
this.httpsServer.close(() => {
|
this.httpsServer.close(() => {
|
||||||
done.resolve();
|
done.resolve();
|
||||||
});
|
});
|
||||||
|
await this.socketMap.forEach(async socket => {
|
||||||
|
socket.destroy();
|
||||||
|
});
|
||||||
await done.promise;
|
await done.promise;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -185,7 +268,7 @@ const proxyWorkerCalls = {
|
|||||||
await proxyWorkerInstance.start();
|
await proxyWorkerInstance.start();
|
||||||
},
|
},
|
||||||
updateReverseConfigs: async (configArray: plugins.tsclass.network.IReverseProxyConfig[]) => {
|
updateReverseConfigs: async (configArray: plugins.tsclass.network.IReverseProxyConfig[]) => {
|
||||||
await proxyWorkerInstance.updateCandidates(configArray);
|
await proxyWorkerInstance.updateProxyConfigs(configArray);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,20 +1,32 @@
|
|||||||
import * as plugins from './smartproxy.plugins';
|
import * as plugins from './smartproxy.plugins';
|
||||||
|
|
||||||
export class SmartproxyRouter {
|
export class SmartproxyRouter {
|
||||||
public reverseCandidates: plugins.tsclass.network.IReverseProxyConfig[] = [];
|
public reverseProxyConfigs: plugins.tsclass.network.IReverseProxyConfig[] = [];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* sets a new set of reverse configs to be routed to
|
* sets a new set of reverse configs to be routed to
|
||||||
* @param reverseCandidatesArg
|
* @param reverseCandidatesArg
|
||||||
*/
|
*/
|
||||||
public setNewCandidates(reverseCandidatesArg: plugins.tsclass.network.IReverseProxyConfig[]) {
|
public setNewProxyConfigs(reverseCandidatesArg: plugins.tsclass.network.IReverseProxyConfig[]) {
|
||||||
this.reverseCandidates = reverseCandidatesArg;
|
this.reverseProxyConfigs = reverseCandidatesArg;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* routes a request
|
||||||
|
*/
|
||||||
public routeReq(req: plugins.http.IncomingMessage): plugins.tsclass.network.IReverseProxyConfig {
|
public routeReq(req: plugins.http.IncomingMessage): plugins.tsclass.network.IReverseProxyConfig {
|
||||||
const originalHost = req.headers.host;
|
const originalHost = req.headers.host;
|
||||||
const correspodingReverseProxyConfig = this.reverseCandidates.find(reverseConfig => {
|
const correspodingReverseProxyConfig = this.reverseProxyConfigs.find(reverseConfig => {
|
||||||
return reverseConfig.hostName === originalHost;
|
return reverseConfig.hostName === originalHost;
|
||||||
});
|
});
|
||||||
return correspodingReverseProxyConfig;
|
return correspodingReverseProxyConfig;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public routeWs(ws: plugins.wsDefault) {
|
||||||
|
const originalHost = plugins.url.parse(ws.url).host;
|
||||||
|
const correspodingReverseProxyConfig = this.reverseProxyConfigs.find(reverseConfig => {
|
||||||
|
return reverseConfig.hostName === originalHost;
|
||||||
|
});
|
||||||
|
return correspodingReverseProxyConfig.destinationIp;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,12 +3,22 @@ import * as plugins from './smartproxy.plugins';
|
|||||||
import { TProxyWorkerCalls } from './smartproxy.classes.proxyworker';
|
import { TProxyWorkerCalls } from './smartproxy.classes.proxyworker';
|
||||||
import { TPortProxyCalls } from './smartproxy.portproxy';
|
import { TPortProxyCalls } from './smartproxy.portproxy';
|
||||||
|
|
||||||
|
export interface ISmartProxyOptions {
|
||||||
|
port?: number;
|
||||||
|
}
|
||||||
|
|
||||||
export class SmartProxy {
|
export class SmartProxy {
|
||||||
public smartsystem = new plugins.smartsystem.Smartsystem();
|
public smartsystem = new plugins.smartsystem.Smartsystem();
|
||||||
public reverseConfigs: plugins.tsclass.network.IReverseProxyConfig[] = [];
|
public reverseConfigs: plugins.tsclass.network.IReverseProxyConfig[] = [];
|
||||||
public proxyWorkerFunctions: plugins.smartspawn.ModuleThread<TProxyWorkerCalls>;
|
public proxyWorkerFunctions: plugins.smartspawn.ModuleThread<TProxyWorkerCalls>;
|
||||||
public portProxyFunctions: plugins.smartspawn.ModuleThread<TPortProxyCalls>;
|
public portProxyFunctions: plugins.smartspawn.ModuleThread<TPortProxyCalls>;
|
||||||
|
|
||||||
|
public options: ISmartProxyOptions;
|
||||||
|
|
||||||
|
constructor(optionsArg: ISmartProxyOptions = {}) {
|
||||||
|
this.options = optionsArg;
|
||||||
|
}
|
||||||
|
|
||||||
public async updateReversConfigs(
|
public async updateReversConfigs(
|
||||||
reverseConfigsArg: plugins.tsclass.network.IReverseProxyConfig[]
|
reverseConfigsArg: plugins.tsclass.network.IReverseProxyConfig[]
|
||||||
) {
|
) {
|
||||||
@ -28,6 +38,8 @@ export class SmartProxy {
|
|||||||
this.portProxyFunctions = await plugins.smartspawn.spawn<TPortProxyCalls>(
|
this.portProxyFunctions = await plugins.smartspawn.spawn<TPortProxyCalls>(
|
||||||
new plugins.smartspawn.Worker('./smartproxy.portproxy')
|
new plugins.smartspawn.Worker('./smartproxy.portproxy')
|
||||||
);
|
);
|
||||||
|
|
||||||
|
await this.portProxyFunctions.start(this.options.port);
|
||||||
await this.proxyWorkerFunctions.start();
|
await this.proxyWorkerFunctions.start();
|
||||||
|
|
||||||
console.log('successfully spawned portproxy and proxyworkers!');
|
console.log('successfully spawned portproxy and proxyworkers!');
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
// node native scope
|
// node native scope
|
||||||
import * as http from 'http';
|
import * as http from 'http';
|
||||||
import * as https from 'https';
|
import * as https from 'https';
|
||||||
|
import * as net from 'net';
|
||||||
|
import * as url from 'url';
|
||||||
|
|
||||||
export { http, https };
|
export { http, https, net, url };
|
||||||
|
|
||||||
// tsclass scope
|
// tsclass scope
|
||||||
import * as tsclass from '@tsclass/tsclass';
|
import * as tsclass from '@tsclass/tsclass';
|
||||||
@ -10,14 +12,17 @@ import * as tsclass from '@tsclass/tsclass';
|
|||||||
export { tsclass };
|
export { tsclass };
|
||||||
|
|
||||||
// pushrocks scope
|
// pushrocks scope
|
||||||
|
import * as lik from '@pushrocks/lik';
|
||||||
import * as smartpromise from '@pushrocks/smartpromise';
|
import * as smartpromise from '@pushrocks/smartpromise';
|
||||||
import * as smartrequest from '@pushrocks/smartrequest';
|
import * as smartrequest from '@pushrocks/smartrequest';
|
||||||
import * as smartspawn from '@pushrocks/smartspawn';
|
import * as smartspawn from '@pushrocks/smartspawn';
|
||||||
|
import * as smartstring from '@pushrocks/smartstring';
|
||||||
import * as smartsystem from '@pushrocks/smartsystem';
|
import * as smartsystem from '@pushrocks/smartsystem';
|
||||||
|
|
||||||
export { smartrequest, smartpromise, smartspawn, smartsystem };
|
export { lik, smartrequest, smartpromise, smartspawn, smartstring, smartsystem };
|
||||||
|
|
||||||
// third party scope
|
// third party scope
|
||||||
import * as ws from 'ws';
|
import * as ws from 'ws';
|
||||||
|
import wsDefault from 'ws';
|
||||||
|
|
||||||
export { ws };
|
export { wsDefault, ws };
|
||||||
|
@ -1,21 +1,25 @@
|
|||||||
import * as plugins from './smartproxy.plugins';
|
import * as plugins from './smartproxy.plugins';
|
||||||
import { expose } from '@pushrocks/smartspawn';
|
import { expose } from '@pushrocks/smartspawn';
|
||||||
import * as net from 'net';
|
import * as net from 'net';
|
||||||
const server = net
|
let netServer: plugins.net.Server;
|
||||||
.createServer(from => {
|
|
||||||
const to = net.createConnection({
|
|
||||||
host: 'localhost',
|
|
||||||
port: 8001
|
|
||||||
});
|
|
||||||
from.pipe(to);
|
|
||||||
to.pipe(from);
|
|
||||||
})
|
|
||||||
.listen(8000);
|
|
||||||
|
|
||||||
const portProxyCalls = {
|
const portProxyCalls = {
|
||||||
|
start: async (portArg = 8000) => {
|
||||||
|
netServer = net
|
||||||
|
.createServer(from => {
|
||||||
|
const to = net.createConnection({
|
||||||
|
host: 'localhost',
|
||||||
|
port: 8001
|
||||||
|
});
|
||||||
|
from.pipe(to);
|
||||||
|
to.pipe(from);
|
||||||
|
})
|
||||||
|
.listen(portArg);
|
||||||
|
console.log(`PortProxy -> OK: Now listening on port ${portArg}`);
|
||||||
|
},
|
||||||
stop: async () => {
|
stop: async () => {
|
||||||
const done = plugins.smartpromise.defer();
|
const done = plugins.smartpromise.defer();
|
||||||
server.close(() => {
|
netServer.close(() => {
|
||||||
done.resolve();
|
done.resolve();
|
||||||
});
|
});
|
||||||
await done.promise;
|
await done.promise;
|
||||||
|
Reference in New Issue
Block a user