v2.0.1

Author: peter

README.md

@@ -20,7 +20,7 @@
 [WInXP or npm install](https://github.com/QTGate/QTGate-Desktop-Client/wiki/WInXP%E4%BB%A5%E5%8F%8ANPM%E7%92%B0%E5%A2%83%E4%B8%8B%E5%AE%89%E8%A3%9DCoNET)
 
 ## Description
-![http protocol](/resources/CoPlatform2.png?raw=true)
+![http protocol](/resources/CoPlatform3.png?raw=true)
 ### CoNET platform as product of [CoNET](https://github.com/QTGate/CoNET) provides a series of services that allows users to improve their security, privacy and freedom on the Internet
 - All other devices may use CoNET platform service via local website after launching CoNET platform.
 - CoNET platform provide a local DNS server that allowing its users to keep PRIVACY and ENCRYPTION.

app/localWebServer.ts

@@ -474,7 +474,7 @@ export default class localServer {
 		socket.on ( 'getAvaliableRegion', CallBack1 => {
 
 			CallBack1 ()
-
+			console.log (`on getAvaliableRegion`)
 			if ( this.connectCommand && this.connectCommand.length ) {
 				console.log (`getAvaliableRegion have this.connectCommand `)
 				//socket.emit ('getAvaliableRegion', this.regionV1, this.dataTransfer, this.config )
@@ -503,25 +503,12 @@ export default class localServer {
 				}
 				this.dataTransfer = res.dataTransfer
 
-				saveLog ( `getAvaliableRegion got return Args [2] [${ JSON.stringify ( res.Args[2] )}]`)
+				console.log (`dataTransfer `, Util.inspect ( this.dataTransfer, false, 2, true ))
 				socket.emit ( 'getAvaliableRegion', res.Args[2], res.dataTransfer, this.config )
 
 				//		Have gateway connect!
 				//this.saveConfig ()
 
-				if ( res.Args[ 1 ]) {
-					saveLog (`getAvaliableRegion got return Args [1] [${ JSON.stringify ( res.Args[1] )}]`)
-					/*
-					if ( ! this.proxyServer || ! this.connectCommand ) {
-						const arg: IConnectCommand[] = this.connectCommand = res.Args[1]
-						arg.forEach ( n => {
-							n.localServerIp = Encrypto.getLocalInterface ()[0]
-						})
-						this.makeOpnConnect ( arg )
-					}
-					*/
-					return socket.emit ( 'QTGateGatewayConnectRequest', -1, res.Args[ 1 ] )
-				}
 
 				this.regionV1 = res.Args[2]
 			})
@@ -1131,7 +1118,7 @@ export default class localServer {
 		this.localConnected.set ( client, { socket: socket, login: false, listenAfterPasswd: false } )
 
 		socket.once ( 'disconnect', reason => {
-			saveLog ( `socketServerConnected ${ client } on disconnect`)
+			//saveLog ( `socketServerConnected ${ client } on disconnect`)
 			return this.localConnected.delete ( client )
 		})
 
@@ -1387,7 +1374,7 @@ export default class localServer {
 			this.config.newVersion = ver
 			this.config.newVerReady = true
 			return Tool.saveConfig ( this.config, err => {
-				
+
 			})
 		})
 

app/public/scripts/CoGate.ts

@@ -1,6 +1,6 @@
 declare const Cleave
 declare const StripeCheckout
-const Stripe_publicKey = 'pk_test_eVOSOJHeYmAznyxbZ4durBXh'
+const Stripe_publicKey = 'pk_test_uV27MTvcPM147KFo3HazbunU'
 
 class coGateRegion {
 	public QTConnectData = ko.observable ( null )
@@ -460,6 +460,7 @@ class CoGateClass {
 interface PlanArray {
 	name: string
 }
+
 const planArray = [
     {
 		name:'free',
@@ -553,13 +554,21 @@ const planArray = [
 
 
 class planUpgrade {
+
+	public annually: string
+	public annuallyMonth: string 
+	public totalAmount: KnockoutComputed< string >
+	public currentPromoIndex: number
+
+
+
 	public currentPromo: KnockoutObservable < CoPromo > = ko.observable (null) 
 	private plan = planArray[ this.planNumber ]
 	public showNote = ko.observable ( false )
 	public detailArea = ko.observable ( true )
 	public _promo = this.dataTransfer.promo[0]
 	public _promoFor = this._promo.promoFor
-	
+	public currentPlan = ko.observable ( planArray [ planArray.findIndex ( function (n){ return n.name === this.dataTransfer.productionPackage})] )
 
 
 	//public annually = this.promo ? Math.round ( this.promoPrice * this.plan.annually * 100 )/100 : this.plan.annually
@@ -583,15 +592,14 @@ class planUpgrade {
 	public showSuccessPayment = ko.observable ( false )
 	public cardExpirationYearFolder_Error = ko.observable ( false )
 	public cancel_Amount = ko.observable (0)
-	public totalAmount
-	public currentPromoIndex: number
-	public paymentError = ko.observable ( false )
-	
-	public annually: string
-	public annuallyMonth: string 
 	public planExpirationYear = ko.observable ('')
 	public planExpirationMonth = ko.observable ('')
 	public planExpirationDay = ko.observable ('')
+	
+	public paymentError = ko.observable ( false )
+
+	
+	
 
 	private clearPaymentError () {
 		this.cardNumberFolder_Error ( false )
@@ -826,8 +834,9 @@ class CoGateAccount {
 	public username = this.dataTransfer.account
 	public productionPackage = this.dataTransfer.productionPackage
 	public promo = this.dataTransfer.promo[0]
-	public currentPlan = findCurrentPlan ( this.productionPackage )
+	public currentPlan = planArray[findCurrentPlan ( this.productionPackage )]
 	public freeAccount = ko.observable ( /^free$/i.test(this.dataTransfer.productionPackage ))
+	public userPlan = ko.observable ( this.dataTransfer.productionPackage.toUpperCase() )
 	public planArray = ko.observableArray ( planArray )
 	public planUpgrade: KnockoutObservable < planUpgrade > = ko.observable ( null )
 	public promoButton = ko.observable ( false )
@@ -906,9 +915,10 @@ class CoGateAccount {
 	}
 
 	constructor ( private dataTransfer: iTransferData, public exit: () => void ) {
-
-		this.planArray()[ this.currentPlan === 0 ? 1 : this.currentPlan ].tail ( true )
-		for ( let i = this.currentPlan + 1; i < planArray.length; i ++ ) {
+		const plan = findCurrentPlan ( this.productionPackage )
+		
+		this.planArray()[ plan === 0 ? 1 : plan ].tail ( true )
+		for ( let i = plan + 1; i < planArray.length; i ++ ) {
 			this.planArray()[i].showButton ( true )
 		}
 	}

app/public/scripts/twitter.ts

@@ -44,7 +44,7 @@ socketIo.emit11 = function ( eventName: string, ...args ) {
 
     const localTimeOut = setTimeout ( function () {
         let uu = eventName
-        twitter_view.systemError()
+        //twitter_view.systemError()
     }, 10000 )
 
     const _CallBack = function ( err ) {

app/tools/coNETConnect.ts

@@ -106,7 +106,7 @@ export default class extends Imap.imapPeer {
 		console.log (`exit1 cancel already Exit [${ err }]`)
 	}
 
-	constructor ( public imapData: IinputData, private sockerServer: SocketIo.Server, private openKeyOption, public doNetSendConnectMail: boolean,
+	constructor ( public imapData: IinputData, private sockerServer: SocketIO.Server, private openKeyOption, public doNetSendConnectMail: boolean,
 		private cmdResponse: ( cmd: QTGateAPIRequestCommand ) => void, public _exit: ( err ) => void ) {
 		super ( imapData, imapData.clientFolder, imapData.serverFolder, ( encryptText: string, CallBack ) => {