v1.3.3

Author: peter

README.md

@@ -5,17 +5,17 @@
 
 ## Download 下載 ダウンロード
 
-### [The latest 最新版 v1.3.2](https://github.com/QTGate/QTGate-Desktop-Client/releases/latest/)
+### [The latest 最新版 v1.3.3](https://github.com/QTGate/QTGate-Desktop-Client/releases/latest/)
 
-[windows32](https://github.com/QTGate/QTGate-Desktop-Client/releases/download/v1.3.2/qtgate.Setup.1.3.2.ia32.exe)
+[windows32](https://github.com/QTGate/QTGate-Desktop-Client/releases/download/v1.3.3/qtgate.Setup.1.3.3.ia32.exe)
 
-[windows64](https://github.com/QTGate/QTGate-Desktop-Client/releases/download/v1.3.2/qtgate.Setup.1.3.2.exe)
+[windows64](https://github.com/QTGate/QTGate-Desktop-Client/releases/download/v1.3.3/qtgate.Setup.1.3.3.exe)
 
-[MacOS](https://github.com/QTGate/QTGate-Desktop-Client/releases/download/v1.3.2/qtgate-1.3.2.dmg)
+[MacOS](https://github.com/QTGate/QTGate-Desktop-Client/releases/download/v1.3.3/qtgate-1.3.3.dmg)
 
-[Linux deb](https://github.com/QTGate/QTGate-Desktop-Client/releases/download/v1.3.2/qtgate_1.3.2_amd64.deb)
+[Linux deb](https://github.com/QTGate/QTGate-Desktop-Client/releases/download/v1.3.3/qtgate_1.3.3_amd64.deb)
 
-[Linux pacman](https://github.com/QTGate/QTGate-Desktop-Client/releases/download/v1.3.2/qtgate-1.3.2.pacman)
+[Linux pacman](https://github.com/QTGate/QTGate-Desktop-Client/releases/download/v1.3.3/qtgate-1.3.3.pacman)
 
 ## Description 項目概要
 

app/ImapConnect.ts

@@ -18,8 +18,8 @@
 import * as Imap from './imap'
 import * as Encrypt from './encrypt'
 import localServer from './localServer'
-import * as Async from 'async'
 import * as Util from 'util'
+import * as Async from 'async'
 import * as SaveLog from './saveLog'
 const saveLog = SaveLog.saveLog
 

app/encrypt.ts

@@ -5,16 +5,20 @@ import * as Async from 'async'
 import * as Http from 'http'
 import * as Https from 'https'
 import * as Net from 'net'
-const openpgp = require ( 'openpgp' )
 import * as Crypto from 'crypto'
-const keyServer = 'https://pgp.mit.edu'
+import * as SaveLog from './saveLog'
+
 const QTGateSignKeyID = /3acbe3cbd3c1caa9/i
+const openpgp = require ( 'openpgp' )
+const keyServer = 'https://pgp.mit.edu'
+
+const QTGateFolder = Path.join ( Os.homedir(), '.QTGate' )
+const configPath = Path.join ( QTGateFolder, 'config.json' )
 
-declare const feedbackFilePath
-declare const saveLog
-declare const testPingTimes
-declare const port
-declare const remote
+const feedbackFilePath = Path.join ( QTGateFolder,'.feedBack.json')
+
+const testPingTimes = 5
+const saveLog = SaveLog.saveLog
 
 export const encryptWithKey = ( data: string, targetKey: string, privateKey: string, password: string, CallBack ) => {
 	if (!data || !data.length || !targetKey || !targetKey.length || !privateKey || !privateKey.length ) {
@@ -364,10 +368,6 @@ export const InitConfig = ( first: boolean, version, port ) => {
 	return ret
 }
 
-export const _doUpdate = ( tag: string  ) => {
-	saveLog ( `_doUpdate tag = [${ tag }]` )
-	remote.getCurrentWindow()._doUpdate ( tag, port )
-}
 
 export const checkKey = ( keyID: string, CallBack ) => {
 	const hkp = new openpgp.HKP( keyServer )

app/imapClass.ts

@@ -16,8 +16,8 @@
  */
 
 import * as Imap from './imap'
-import * as Async from 'async'
 import * as Net from 'net'
+import * as Async from 'async'
 import * as Crypto from 'crypto'
 import * as Stream from 'stream'
 import * as Dns from 'dns'

app/localServer.ts

@@ -326,20 +326,19 @@ export default class localServer {
 
 			return this.QTClass.request ( com, ( err: number, res: QTGateAPIRequestCommand ) => {
 				if ( err ) {
-					console.log ( err )
-					return saveLog ( 'getAvaliableRegion QTClass.request callback error! STOP')
+					return saveLog ( `getAvaliableRegion QTClass.request callback error! STOP [${ err }]`)
 				}
 				if ( res && res.dataTransfer && res.dataTransfer.productionPackage ) {
 					this.config.freeUser = /free/i.test ( res.dataTransfer.productionPackage )
 				}
-					
+				saveLog (`getAvaliableRegion got return Args [0] [${ JSON.stringify ( res.Args[0] )}]`)
 				CallBack ( res.Args[0], 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 => {
@@ -349,7 +348,7 @@ export default class localServer {
 					}
 					return socket.emit ( 'QTGateGatewayConnectRequest', -1, res.Args[ 1 ] )
 				}
-
+				saveLog (`getAvaliableRegion got return Args [2] [${ JSON.stringify ( res.Args[2] )}]`)
 				this.regionV1 = res.Args[2]
 			})
 		})
@@ -895,7 +894,7 @@ export default class localServer {
 
 			socket.once ( 'newVersionInstall', ( CallBack: any ) => {
 				if ( this.config.newVerReady )
-					return Encrypto._doUpdate ( this.config.newVersion )
+					return _doUpdate ( this.config.newVersion, this.port )
 			})
 
 			socket.on ( 'checkPemPassword', ( password: string, callBack: any ) => {
@@ -1600,4 +1599,10 @@ export default class localServer {
 		this.httpServer.close ()
 	}
 
+}
+
+
+const _doUpdate = ( tag: string, port: number  ) => {
+	saveLog ( `_doUpdate tag = [${ tag }]` )
+	remote.getCurrentWindow()._doUpdate ( tag, port )
 }

app/public/scripts/twitter.ts

@@ -584,18 +584,18 @@ module twitter_layout {
             }
             this.showAccountMenu ( true )
             this.bottomEventLoader ( true )
-            /*
+            
             this.requestNewTimelinesCount = 0
             setTimeout (() => {
                 this.bottomEventLoader ( false )
             }, 1000 * 120 )
             this.showCurrentTimelines ( true )
             this.currentTimelines([])
-            /*
+            
             return socketIo.emit ( 'getTimelines', this.twitterData()[0], err => {
                 return this.getTimeLineCallBack ( err )
             })
-            */
+            
         }
 
         public getTimeLineCallBack ( err: Error[] ) {

app/server.js

@@ -6,7 +6,6 @@ const SaveLog = require("./saveLog");
 const localServer_1 = require("./localServer");
 const { remote } = require('electron');
 const QTGatePongReplyTime = 1000 * 30;
-const testPingTimes = 5;
 let mainWindow = null;
 const reqtestTimeOut = 1000 * 30;
 const port = remote.getCurrentWindow().rendererSidePort;

app/server.ts

@@ -23,7 +23,7 @@ import serviceServer from './serviceServer'
 const { remote } = require ( 'electron' )
 
 const QTGatePongReplyTime = 1000 * 30
-const testPingTimes = 5
+
 let mainWindow = null
 
 const reqtestTimeOut = 1000 * 30

app/twitter.ts

@@ -687,15 +687,16 @@ export default class twitter1 {
 				error: null,
 				requestSerial: Crypto.randomBytes( 10 ).toString ( 'hex' )
 			}
+			/*
 			Imap.imapGetMediaFilesFromString ( this.localServer.QTClass.imapData, postData.videoFileName, QTGateVideo, ( err1, data ) => {
 				if ( err1 ) {
 					saveLog ( `Imap.imapGetMediaFilesFromString got error [${ err }]`)
 				}
 				saveLog ( `Imap.imapGetMediaFilesFromString success! [${ data }]`)
 			})
-			/*
-			return this.localServer.QTClass.request ( com, Callback )
 			*/
+			return this.localServer.QTClass.request ( com, Callback )
+			
 		}
 		if ( postData.images && postData.images.length ) {
 			return this.QT_PictureMediaUpload ( postData, post )