v0.9.0

Author: Peter Xie

app/gateway.ts

@@ -62,29 +62,38 @@ class hostLookupResponse extends Stream.Writable {
 export default class gateWay {
 
 	private userAgent = null
+	private currentGatewayPoint = 0
+	private currentgateway: multipleGateway
+	
+	private request ( str: string, gateway: multipleGateway ) {
+		return Buffer.from ( otherRequestForNet ( str, gateway.gateWayIpAddress, gateway.gateWayPort, this.userAgent ), 'utf8' )
+	}
 
-	private request ( str: string ) {
-		return Buffer.from ( otherRequestForNet ( str, this.serverIp, this.serverPort, this.userAgent ), 'utf8' )
+	private getCurrentGateway () {
+		if ( ++ this.currentGatewayPoint > this.multipleGateway.length - 1 ) {
+			this.currentGatewayPoint = 0
+		}
+		return this.multipleGateway [ this.currentGatewayPoint ]
 	}
 
-	constructor ( public serverIp: string, public serverPort: number, private password: string ) {
+	constructor ( private multipleGateway: multipleGateway[]) {
 	}
 
 	public hostLookup ( hostName: string, userAgent: string, CallBack: ( err?: Error, hostIp?: domainData ) => void ) {
 
 
 		const _data = new Buffer ( JSON.stringify ({ hostName: hostName }), 'utf8' )
-		
-		const encrypt = new Compress.encryptStream ( this.password, 3000, ( str: string ) => {
-			return this.request ( str )
+		const gateway = this.getCurrentGateway ()
+		const encrypt = new Compress.encryptStream ( gateway.password, 3000, ( str: string ) => {
+			return this.request ( str, gateway )
 		})
 
 		const finish = new hostLookupResponse ( CallBack )
 		const httpBlock = new Compress.getDecryptClientStreamFromHttp ()
-		const decrypt = new Compress.decryptStream ( this.password )
+		const decrypt = new Compress.decryptStream ( gateway.password )
 
 
-		const _socket = Net.createConnection ({ port: this.serverPort, host: this.serverIp }, () => {
+		const _socket = Net.createConnection ({ port: gateway.gateWayPort, host: gateway.gateWayIpAddress }, () => {
 			encrypt.write ( _data )
 		})
 
@@ -107,41 +116,20 @@ export default class gateWay {
 
 	public requestGetWay ( id: string, uuuu: VE_IPptpStream, userAgent: string, socket: Net.Socket ) {
 		this.userAgent = userAgent
-		const decrypt = new Compress.decryptStream ( this.password )
-		const encrypt = new Compress.encryptStream ( this.password, 3000, ( str: string ) => {
-			return this.request ( str )
+		const gateway = this.getCurrentGateway ()
+		const decrypt = new Compress.decryptStream ( gateway.password )
+		const encrypt = new Compress.encryptStream ( gateway.password, 3000, ( str: string ) => {
+			return this.request ( str, gateway )
 		})
 		const httpBlock = new Compress.getDecryptClientStreamFromHttp ()
 		httpBlock.once ( 'error', err => {
 			socket.end ( res._HTTP_404 )
 		})
-		const _socket = Net.createConnection ({ port: this.serverPort, host: this.serverIp }, () => {
+		const _socket = Net.createConnection ({ port: gateway.gateWayPort||80, host: gateway.gateWayIpAddress }, () => {
 
 			encrypt.write ( Buffer.from ( JSON.stringify ( uuuu ), 'utf8' ))
 		})
 		encrypt.pipe ( _socket ).pipe ( httpBlock ).pipe ( decrypt ).pipe ( socket ).pipe ( encrypt )
-
-	}
-
-	public requestGetWayTest ( id: string, uuuu: VE_IPptpStream, userAgent: string, socket: Net.Socket ) {
-		console.log ('connect to test port!')
-		const _socket = Net.createConnection ({ port: this.serverPort + 1, host: this.serverIp })
-		
-		_socket.on ( 'connect', () => {
-			const ls = new Compress.printStream ('>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
-			const ls1 = new Compress.printStream ('<<<<<<<<<<<<<<<<<<<<<<<<<<<<')
-			_socket.pipe ( socket ).pipe ( _socket )
-			const _buf = Buffer.from ( otherRequestForNet ( Buffer.from ( JSON.stringify ( uuuu ), 'utf8' ).toString ( 'base64' ), this.serverIp, this.serverPort, this.userAgent ), 'utf8' )
-			_socket.write ( _buf )
-			
-		})
-		
-		_socket.on ( 'end', () => {
-			return console.log ( 'test gateway END' )
-		})
-
-		_socket.on ( 'error', error => {
-			return console.log ( 'test gateway ERROR:', error.message )
-		})
+		console.log (`new requestGetWay use gateway[${ gateway.gateWayIpAddress }]`)
 	}
 }

app/proxyServer.ts

@@ -295,7 +295,7 @@ const httpProxy = ( clientSocket: Net.Socket, buffer: Buffer, useGatWay: boolean
 		const isIp = Net.isIP ( hostName )
 		const hostIp: domainData = ! isIp ? domainListPool.get ( hostName ) : { dns: [{ family: isIp, address: hostName, expire: null, connect: [] }], expire: null }
 
-        if ( ! hostIp ) {
+        if ( ! hostIp && ! this.useGatWay ) {
 
 			return isAllBlackedByFireWall ( hostName,  ip6, gatway, userAgent, domainListPool, ( err, _hostIp ) => {
 				if ( err ) {
@@ -361,7 +361,8 @@ export class proxyServer {
 	private hostGlobalIpV6: string = null
 	private network = false
 	private getGlobalIpRunning = false
-	public gateway = new gateWay ( this.serverIp, this.serverPort, this.password )
+	public gateway = new gateWay ( this.multipleGateway )
+	
 	private saveWhiteIpList () {
 		if ( this.whiteIpList.length > 0 )
 			Fs.writeFile ( Path.join( __dirname, whiteIpFile ), JSON.stringify( this.whiteIpList ), { encoding: 'utf8' }, err => {
@@ -393,16 +394,15 @@ export class proxyServer {
 
 			const domain = data
 			if ( ! domain )
-				return console.log ( `[${ gateWay.serverIp } : ${ gateWay.serverPort }] Gateway connect Error!` )
-			console.log ( `[${ gateWay.serverIp } : ${ gateWay.serverPort }] Gateway connect success!` )
+				return console.log ( `[] Gateway connect Error!` )
 			console.log ( '****************************************' )
 
 		})
 
 	}
 
 	constructor ( public whiteIpList: string[], public domainListPool: Map < string, domainData >, private localProxyServerIP: string, 
-		private port: number, private securityPath: string, private serverIp: string, private serverPort: number, private password: string, public checkAgainTimeOut: number, 
+		private port: number, private securityPath: string,  public checkAgainTimeOut: number, private multipleGateway: multipleGateway[],
 		public connectHostTimeOut: number, public useGatWay: boolean, public domainBlackList: string[] ) {
 		this.getGlobalIp ( this.gateway )
 		let socks = null
@@ -451,24 +451,20 @@ export class proxyServer {
 		})
 
 		server.listen ( port, () => {
-			console.log (`remote server: [${ serverIp }]:[${ serverPort }]`)
 			return console.log ( 'proxy start success on port :', port, 'security path = ', securityPath )
-
 		})
 
 
 
 	}
 
 	public changeDocker ( data: IConnectCommand ) {
-		if ( !data.gateWayIpAddress || !data.gateWayPort || !data.imapData.randomPassword ) {
-			return saveLog (`ERROR: changeDocker data ERROR: gateWayIpAddress [${ data.gateWayIpAddress }] gateWayPort [${ data.gateWayPort }] data.imapData.randomPassword [${ data.imapData.randomPassword }]`)
+		if ( !data.requestMultipleGateway && (!data.gateWayIpAddress || !data.gateWayPort || !data.imapData.randomPassword ) || data.requestMultipleGateway > 1 && ( !data.multipleGateway || data.multipleGateway.length !== data.requestMultipleGateway )) {
+			return saveLog ( `ERROR: changeDocker data ERROR: gateWayIpAddress [${ data.gateWayIpAddress }] gateWayPort [${ data.gateWayPort }] data.imapData.randomPassword [${ data.imapData.randomPassword }]`)
 		}
-		this.serverIp = data.gateWayIpAddress
-		this.serverPort = data.gateWayPort
-		this.password = data.imapData.randomPassword
-		this.gateway = new gateWay ( this.serverIp, this.serverPort, this.password )
-		saveLog (`changeDocker gateWayIpAddress [${ data.gateWayIpAddress }] gateWayPort [${ data.gateWayPort }] data.imapData.randomPassword [${ data.imapData.randomPassword }]`)
+		this.multipleGateway = data.multipleGateway
+		this.gateway = new gateWay ( this.multipleGateway )
+		saveLog (`changeDocker [${ JSON.stringify ( this.multipleGateway )}]`)
 	}
 
 }
@@ -494,14 +490,11 @@ const saveLog = ( log: string ) => {
 let server: proxyServer = null
 remote.getCurrentWindow().once ( 'firstCallBack', ( data: IConnectCommand ) => {
 	saveLog ( `************************** start proxyServer *****************************\r\n ${ JSON.stringify( data )}\r\n` )
-	server = new proxyServer ([], new Map(), data.localServerIp, data.localServerPort, 'pac', data.gateWayIpAddress, data.gateWayPort, data.imapData.randomPassword,
-		 5000, 50000, data.AllDataToGateway, [] )
-	
+	console.log (`with gateway = [${data.multipleGateway}]`)
+	server = new proxyServer ( [], new Map(), data.localServerIp, data.localServerPort, 'pac', 5000, data.multipleGateway, 50000, data.AllDataToGateway, [] )
 })
 remote.getCurrentWindow().on( 'changeDocker', ( data: IConnectCommand ) => {
 	saveLog ( `got changeDocker event! data [${ JSON.stringify ( data )}]`)
 	server.changeDocker ( data )
 })
-
-
 remote.getCurrentWindow().emit ( 'first' )

app/public/scripts/home.js

@@ -596,6 +596,7 @@ const infoDefine = [
             unavailable: '准备中',
             proxyDomain: '域名解释全程使用QTGate代理服务器端',
             setupCardTitle: '使用连接技术:',
+            MultipleGateway: '同时使用代理服务器数：',
             dataTransfer: '数据通讯：',
             dataTransfer_datail: ['全程使用代理服务器', '当本地不能够到达目标主机时使用'],
             proxyDataCache: '浏览数据本地缓存:',
@@ -1141,6 +1142,7 @@ const infoDefine = [
             unavailable: '準備しています',
             proxyDomain: 'ドメイン検索はQTGateゲットウェイ側に依頼します。',
             setupCardTitle: '接続技術:',
+            MultipleGateway: '同時使用ゲットウェイ数：',
             dataTransfer: '通信データは：',
             dataTransfer_datail: ['全てのデータをOPN経由', 'ターゲットサーバ到達不能時だけ'],
             proxyDataCache: 'Webキャッシュ:',
@@ -1332,7 +1334,7 @@ const infoDefine = [
             proxyServerIp: '<p>Proxy setup: <span style="color: red;">Automatic or Auto-Config</span></p>',
             proxyServerPort: 'HTTP & HTTPS proxy setup:',
             proxyServerPassword: 'SOCKS proxy setup:',
-            title: 'Local proxy server is running at background. MacOS and windows user may close this window. All other devices can doing internet via local proxy setup use the QTGate system.',
+            title: 'Local proxy server is running at background. MacOS and windows user may close this window. All other devices can access internet via local proxy setup to use the QTGate OPN.',
             title1: 'MacOS proxy setup',
             info: [{
                     title: 'Open the control panel, click on network.',
@@ -1491,12 +1493,12 @@ const infoDefine = [
             emailNotVerifi: 'Key pair has not been signed by QTGate yet.',
             emailVerified: 'Key pair signed by QTGate.',
             NickName: 'Nick name：',
-            creatDate: 'Key pair creation date：',
-            keyLength: 'Key pair bit Length：',
+            creatDate: 'Creation date：',
+            keyLength: 'Bit Length：',
             password: '5-character minimum password.',
             password1: 'Key pair password.',
             logout: 'Logout',
-            keyID: 'Key pair ID：',
+            keyID: 'ID：',
             deleteKeyPairInfo: 'Note: By deleting your key pair, you will lose your current account settings. You will need to set up QTGate account settings again. If your email address is the same as the one used previously, you may restore your QTGate account balance.',
             delete: 'Delete',
             locked: 'Please enter your key pair password to continue.',
@@ -1585,9 +1587,10 @@ const infoDefine = [
             unavailable: 'Unavailable',
             proxyDomain: 'Domain lookup via QTGate gateway side.',
             setupCardTitle: 'connecting with:',
+            MultipleGateway: 'Gateway count:',
             dataViaGateway: 'All internet data transfered via QTGate gateway.',
             dataTransfer: 'Data:',
-            dataTransfer_datail: ['All data on QTGate gateway.', `Data on QTGate gateway only when cannot connect to target server.`],
+            dataTransfer_datail: ['All data on QTGate gateway.', `Only when cannot connect to target server.`],
             proxyDataCache: 'Web cache:',
             proxyDataCache_detail: ['Yes', 'No'],
             clearCache: 'Delete all cache now',
@@ -2000,6 +2003,7 @@ const infoDefine = [
             unavailable: '準備中',
             proxyDomain: '域名解釋全程使用QTGate代理伺服器端',
             setupCardTitle: '使用連接技術:',
+            MultipleGateway: '同時使用代理服務器數：',
             connectQTGate: '正在獲得代理伺服器區域信息...',
             dataTransfer: '數據通訊:',
             dataTransfer_datail: ['全程使用QTGate代理伺服器', '當本地不能夠到達目標伺服器時使用'],
@@ -2294,7 +2298,9 @@ const dummyIConnectCommand = {
     connectPeer: null,
     connectType: null,
     localServerIp: null,
-    localServerPort: null
+    localServerPort: null,
+    account: null,
+    AllDataToGateway: null,
 };
 var view_layout;
 (function (view_layout) {
@@ -2787,6 +2793,8 @@ var view_layout;
             this.QTGateRegionInfo = ko.observable(false);
             this.QTGateConnect_SelectTech = ko.observable(-1);
             this.QTGateConnect1 = ko.observable('');
+            this.QTGateMultipleGateway = ko.observable(1);
+            this.QTGateMultipleGatewayPool = ko.observableArray([1, 2]);
             this.QTGateConnect2 = ko.observable(false);
             this.QTGateConnectSelectImap = ko.observable(-1);
             this.QTGateAllData = ko.observable(false);
@@ -3475,7 +3483,7 @@ var view_layout;
             this.ConnectGatewayShow(true);
             const body = $("html, body");
             body.stop().animate({ scrollTop: 0 }, 100, 'swing', () => {
-                return this.overflowShow(false);
+                return this.overflowShow(true);
             });
             return $('.popupField').popup({
                 on: 'click',
@@ -3512,7 +3520,9 @@ var view_layout;
                     AllDataToGateway: !this.QTGateConnect2(),
                     error: null,
                     fingerprint: null,
-                    localServerIp: null
+                    localServerIp: null,
+                    multipleGateway: [],
+                    requestMultipleGateway: this.QTGateMultipleGateway()
                 };
                 data.error(-1);
                 //root.QTGateConnectRegionActive ( false )