forked from coolaj86/goldilocks.js
		
	Compare commits
	
		
			5 Commits
		
	
	
		
			master
			...
			v1.1-error
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| a254958bf6 | |||
| c2c7ed40d5 | |||
| 4b9db320c0 | |||
| 9eb96be46c | |||
| 089d85df67 | 
							
								
								
									
										16
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								README.md
									
									
									
									
									
								
							| @ -23,13 +23,13 @@ Install Standalone | |||||||
| ### curl | bash | ### curl | bash | ||||||
| 
 | 
 | ||||||
| ```bash | ```bash | ||||||
| curl -fsSL https://git.coolaj86.com/coolaj86/goldilocks.js/raw/v1.1/installer/get.sh | bash | curl -fsSL https://git.daplie.com/Daplie/goldilocks.js/raw/v1.1/installer/get.sh | bash | ||||||
| ``` | ``` | ||||||
| 
 | 
 | ||||||
| ### git | ### git | ||||||
| 
 | 
 | ||||||
| ```bash | ```bash | ||||||
| git clone https://git.coolaj86.com/coolaj86/goldilocks.js | git clone https://git.daplie.com/Daplie/goldilocks.js | ||||||
| pushd goldilocks.js | pushd goldilocks.js | ||||||
| git checkout v1.1 | git checkout v1.1 | ||||||
| bash installer/install.sh | bash installer/install.sh | ||||||
| @ -39,10 +39,10 @@ bash installer/install.sh | |||||||
| 
 | 
 | ||||||
| ```bash | ```bash | ||||||
| # v1 in git (unauthenticated) | # v1 in git (unauthenticated) | ||||||
| npm install -g git+https://git@git.coolaj86.com:coolaj86/goldilocks.js#v1 | npm install -g git+https://git@git.daplie.com:Daplie/goldilocks.js#v1 | ||||||
| 
 | 
 | ||||||
| # v1 in git (via ssh) | # v1 in git (via ssh) | ||||||
| npm install -g git+ssh://git@git.coolaj86.com:coolaj86/goldilocks.js#v1 | npm install -g git+ssh://git@git.daplie.com:Daplie/goldilocks.js#v1 | ||||||
| 
 | 
 | ||||||
| # v1 in npm | # v1 in npm | ||||||
| npm install -g goldilocks@v1 | npm install -g goldilocks@v1 | ||||||
| @ -81,7 +81,7 @@ We have service support for | |||||||
| * launchd (macOS) | * launchd (macOS) | ||||||
| 
 | 
 | ||||||
| ```bash | ```bash | ||||||
| curl https://git.coolaj86.com/coolaj86/goldilocks.js/raw/master/install.sh | bash | curl https://git.daplie.com/Daplie/goldilocks.js/raw/master/install.sh | bash | ||||||
| ``` | ``` | ||||||
| 
 | 
 | ||||||
| Modules & Configuration | Modules & Configuration | ||||||
| @ -412,7 +412,7 @@ sni = vpn.example.com | |||||||
| connect = example.com:443 | connect = example.com:443 | ||||||
| ``` | ``` | ||||||
| 
 | 
 | ||||||
| 3) [Use stunnel.js](https://git.coolaj86.com/coolaj86/tunnel-client.js) as described in the "tunnel_server" section below. | 3) [Use stunnel.js](https://git.daplie.com/Daplie/node-tunnel-client) as described in the "tunnel_server" section below. | ||||||
| 
 | 
 | ||||||
| ### tcp.forward | ### tcp.forward | ||||||
| 
 | 
 | ||||||
| @ -616,7 +616,7 @@ mdns: | |||||||
| You can discover goldilocks with `mdig`. | You can discover goldilocks with `mdig`. | ||||||
| 
 | 
 | ||||||
| ``` | ``` | ||||||
| npm install -g git+https://git.coolaj86.com/coolaj86/mdig.js.git | npm install -g git+https://git.daplie.com/Daplie/mdig.git | ||||||
| 
 | 
 | ||||||
| mdig _cloud._tcp.local | mdig _cloud._tcp.local | ||||||
| ``` | ``` | ||||||
| @ -645,7 +645,7 @@ TODO | |||||||
| * [ ] http - redirect based on domain name (not just path) | * [ ] http - redirect based on domain name (not just path) | ||||||
| * [ ] tcp - bind should be able to specify localhost, uniquelocal, private, or ip | * [ ] tcp - bind should be able to specify localhost, uniquelocal, private, or ip | ||||||
| * [ ] tcp - if destination host is omitted default to localhost, if dst port is missing, default to src | * [ ] tcp - if destination host is omitted default to localhost, if dst port is missing, default to src | ||||||
| * [ ] sys - `curl https://coolaj86.com/goldilocks | bash -s example.com` | * [ ] sys - `curl https://daplie.me/goldilocks | bash -s example.com` | ||||||
| * [ ] oauth3 - `example.com/.well-known/domains@oauth3.org/directives.json` | * [ ] oauth3 - `example.com/.well-known/domains@oauth3.org/directives.json` | ||||||
| * [ ] oauth3 - commandline questionnaire | * [ ] oauth3 - commandline questionnaire | ||||||
| * [x] modules - use consistent conventions (i.e. address vs host + port) | * [x] modules - use consistent conventions (i.e. address vs host + port) | ||||||
|  | |||||||
| @ -7,7 +7,7 @@ set -u | |||||||
| ### IMPORTANT ### | ### IMPORTANT ### | ||||||
| ###  VERSION  ### | ###  VERSION  ### | ||||||
| my_name=goldilocks | my_name=goldilocks | ||||||
| my_app_pkg_name=com.coolaj86.goldilocks.web | my_app_pkg_name=com.daplie.goldilocks.web | ||||||
| my_app_ver="v1.1" | my_app_ver="v1.1" | ||||||
| my_azp_oauth3_ver="v1.2.3" | my_azp_oauth3_ver="v1.2.3" | ||||||
| export NODE_VERSION="v8.9.3" | export NODE_VERSION="v8.9.3" | ||||||
|  | |||||||
| @ -154,6 +154,16 @@ module.exports.create = function (deps, config) { | |||||||
|     } |     } | ||||||
|     conn.once('error', onError); |     conn.once('error', onError); | ||||||
|     conn.once('data', function (chunk) { |     conn.once('data', function (chunk) { | ||||||
|  | //      //Adding this to track problems with error handling TODO: Remove this error handler.
 | ||||||
|  | //      conn.once('error', function(err) {
 | ||||||
|  | //        console.log("Received error in tcpHandler after removing error listener.",
 | ||||||
|  | //          "Number of errorListeners:", conn.listenerCount("error"),
 | ||||||
|  | //          "Error: ", err
 | ||||||
|  | //        );
 | ||||||
|  | //        if(conn.listenerCount("error") <= 1) {
 | ||||||
|  | //          process.nextTick(function() {conn.emit("error", err);});
 | ||||||
|  | //        }
 | ||||||
|  | //      });
 | ||||||
|       conn.removeListener('error', onError); |       conn.removeListener('error', onError); | ||||||
|       peek(conn, chunk, opts); |       peek(conn, chunk, opts); | ||||||
|     }); |     }); | ||||||
|  | |||||||
| @ -56,7 +56,12 @@ module.exports.create = function (deps, config, tcpMods) { | |||||||
| 
 | 
 | ||||||
|       socket.on('error', function (err) { |       socket.on('error', function (err) { | ||||||
|         console.log('wrapped TLS socket error', err); |         console.log('wrapped TLS socket error', err); | ||||||
|         reader.emit('error', err); |         if(reader.listenerCount("error")){ | ||||||
|  |           console.log("There are error handlers that should handle this emiting error."); | ||||||
|  |           reader.emit('error', err); | ||||||
|  |         } else { | ||||||
|  |           console.log('Wrapped TLS socket had no error handlers for error. Socket object: ', reader); | ||||||
|  |         } | ||||||
|       }); |       }); | ||||||
|       writer.on('error', function (err) { |       writer.on('error', function (err) { | ||||||
|         console.error('socket-pair writer error', err); |         console.error('socket-pair writer error', err); | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user