v1.2.6

Author: peter

app/proxyServer.ts

@@ -462,9 +462,10 @@ export class proxyServer {
 
 		const index = this.multipleGateway.findIndex ( n => { return n.containerUUID === data.containerUUID })
 		if ( index < 0 ) {
-			return saveLog (`on changeDocker [${ data.containerUUID }] but can't find this uuid`)
+			this.multipleGateway.push ( data )
+			return saveLog (`on changeDocker [${ data.containerUUID }] Add it`)
 		}
-		this.multipleGateway [ index ]= data
+		this.multipleGateway [ index ] = data
 	}
 
 }

app/public/scripts/home.js

@@ -3711,25 +3711,12 @@ var view_layout;
             socketIo.on('qtGateConnect', (data) => {
                 return this.qtGateConnectEvent(data);
             });
-            //          gateway disconnect!
-            socketIo.on('disconnectClickCallBack', resopn => {
-                this.disconnecting(true);
-                if (this.selectedQTGateRegion()) {
-                    this.selectedQTGateRegion().showConnectedArea(false);
-                    this.ConnectGatewayShow(false);
-                    this.disconnecting(false);
-                    return this.selectedQTGateRegionCancel();
-                }
-            });
             socketIo.once('reconnect_error', err => {
                 if (this.modalContent().length)
                     return;
                 this.modalContent(infoDefine[this.languageIndex()].emailConform.formatError[10]);
                 return $('.ui.basic.modal').modal('setting', 'closable', false).modal('show');
             });
-            socketIo.on('disconnectClickCallBack', () => {
-                return this.desconnectCallBack();
-            });
             socketIo.on('QTGateGatewayConnectRequest', (err, data) => {
                 return this.QTGateGatewayConnectRequestCallBack(this, err, data);
             });
@@ -4299,7 +4286,11 @@ var view_layout;
             return clearTimeout(this.doingProcessBarTime);
         }
         getAvaliableRegion() {
+            if (this.pingCheckLoading()) {
+                return;
+            }
             this.pingCheckLoading(true);
+            this.showRegionData(false);
             socketIo.emit('getAvaliableRegion', (region, dataTransfer, config) => {
                 if (region && region.length)
                     return this.getAvaliableRegionCallBack(region, dataTransfer, config);
@@ -4310,12 +4301,13 @@ var view_layout;
             this.ConnectGatewayShow(false);
             this.selectedQTGateRegionCancel();
             this.disconnecting(false);
-            socketIo.emit('getAvaliableRegion', (region, dataTransfer, config) => {
-                return this.getAvaliableRegionCallBack(region, dataTransfer, config);
-            });
+            return this.getAvaliableRegion();
         }
         disconnectClick() {
             this.disconnecting(true);
+            socketIo.once('disconnectClickCallBack', () => {
+                return this.desconnectCallBack();
+            });
             return socketIo.emit('disconnectClick');
         }
         exit() {

app/public/scripts/home.ts

@@ -3809,18 +3809,6 @@ module view_layout {
 
             })
 
-            //          gateway disconnect!
-            socketIo.on ( 'disconnectClickCallBack', resopn => {
-                this.disconnecting ( true )
-                if ( this.selectedQTGateRegion()) {
-                    this.selectedQTGateRegion().showConnectedArea( false )
-                    this.ConnectGatewayShow ( false )
-                    this.disconnecting ( false )
-                    return this.selectedQTGateRegionCancel () 
-                }
-
-            })
-
 
             socketIo.once ( 'reconnect_error', err => {
                 if ( this.modalContent().length )
@@ -3829,9 +3817,6 @@ module view_layout {
                 return $( '.ui.basic.modal').modal ('setting', 'closable', false).modal ( 'show' )
             })
 
-            socketIo.on ( 'disconnectClickCallBack', () => {
-                return this.desconnectCallBack ()
-            })
 
             socketIo.on ( 'QTGateGatewayConnectRequest', ( err, data ) => {
                 return this.QTGateGatewayConnectRequestCallBack ( this, err, data )
@@ -4549,7 +4534,11 @@ module view_layout {
         }
 
         public getAvaliableRegion () {
-            this.pingCheckLoading( true )
+            if ( this.pingCheckLoading ( )) {
+                return
+            }
+            this.pingCheckLoading ( true )
+            this.showRegionData ( false )
             socketIo.emit ( 'getAvaliableRegion', ( region: string [], dataTransfer: iTransferData, config: install_config ) => {
                 if ( region && region.length )
                     return this.getAvaliableRegionCallBack ( region, dataTransfer, config )
@@ -4561,10 +4550,7 @@ module view_layout {
             this.ConnectGatewayShow ( false )
             this.selectedQTGateRegionCancel () 
             this.disconnecting ( false )
-            socketIo.emit ( 'getAvaliableRegion', ( region: string [], dataTransfer: iTransferData, config: install_config ) => {
-            
-                return this.getAvaliableRegionCallBack ( region, dataTransfer, config )
-            })
+            return this.getAvaliableRegion ()
         }
 
         public getCurrentPlan = ko.computed (() => {
@@ -4604,6 +4590,10 @@ module view_layout {
 
         public disconnectClick () {
             this.disconnecting ( true )
+
+            socketIo.once ( 'disconnectClickCallBack', () => {
+                return this.desconnectCallBack ()
+            })
             return socketIo.emit ( 'disconnectClick')
         }
 

app/server.js

@@ -662,6 +662,7 @@ class localServer {
                 error: null,
                 requestSerial: Crypto1.randomBytes(8).toString('hex')
             };
+            console.log(`socket.on ( 'getAvaliableRegion')`);
             return this.QTClass.request(com, (err, res) => {
                 if (err) {
                     console.log(err);
@@ -671,7 +672,6 @@ class localServer {
                     this.config.freeUser = /free/i.test(res.dataTransfer.productionPackage);
                 }
                 CallBack(res.Args[0], res.dataTransfer, this.config);
-                saveLog(`getAvaliableRegion ${JSON.stringify(res)} `);
                 //		Have gateway connect!
                 this.saveConfig();
                 if (res.Args[1]) {

app/server.ts

@@ -701,6 +701,9 @@ export class localServer {
 				error: null,
 				requestSerial: Crypto1.randomBytes(8).toString('hex')
 			}
+
+			console.log (`socket.on ( 'getAvaliableRegion')`)
+
 			return this.QTClass.request ( com, ( err: number, res: QTGateAPIRequestCommand ) => {
 				if ( err ) {
 					console.log ( err )
@@ -711,7 +714,6 @@ export class localServer {
 				}
 
 				CallBack ( res.Args[0], res.dataTransfer, this.config )
-				saveLog ( `getAvaliableRegion ${ JSON.stringify ( res )} `)
 
 				//		Have gateway connect!
 				this.saveConfig ()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "qtgate",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "license": "MIT",
   "description": "QTGate desktop client",
   "scripts": {