v0.9.3

Author: Peter Xie

README.md

@@ -16,7 +16,7 @@ QTGATE提供本地Proxy服務器對應HTTP, HTTPS, SOCKS 4,4a,5。其他設備
 このプロジェクトはQTGATE端末用ソフトです.
 QTGATEとは、eMailの通信プロトコルIMAPを使用して、端末とサーバの間に、仮想のネットワークトンネルを構築し、さらにVPNをカプセル化にしたことで、どんな端末からも利用することができます。QTGATEの一番重要な特徴は，端末とサーバの通信がIPアドレスではなく、一つのeMailアカウントを使います。それによって世界中に安全と自由な通信ができるようになります。
 QTGATEはローカルプロキシサーバを提供して、HTTP, HTTPS, SOCKS 4,4a,5をカバーすることで、他のデバイスはローカルプロキシサーバを経由QTGATEサービスをご利用いただきます。
-![http protocol](/resources/startScreen.jpg?raw=true)
+![http protocol](/app/public/html/canada150.html?raw=true)
 
 ![http protocol](/resources/vpn.email11.jpg?raw=true)
 

app/imap.js

@@ -26,6 +26,7 @@ import * as Crypto from 'crypto'
 import * as Util from 'util'
 import { join } from 'path'
 import { homedir }from 'os'
+import { setTimeout, clearTimeout } from 'timers';
 
 const MAX_INT = 9007199254740992
 const debug = true
@@ -158,15 +159,16 @@ class ImapServerSwitchStream extends Stream.Transform {
                         this.doCommandCallback ( null, commandLine )
                         return callback ()
                     }
-                    this.doCommandCallback ( new Error ( cmdArray.slice (2).join(' ')))
+                    const errs = cmdArray.slice (2).join(' ')
+                    this.doCommandCallback ( new Error (errs ))
                     return callback ()
 
                 }
                 default:
                     return this.serverCommandError ( new Error (`_commandPreProcess got switch default error!` ), callback )
             }
         }
-        this.login ( commandLine, cmdArray, _next, callback )
+        return this.login ( commandLine, cmdArray, _next, callback )
     }
 
     private checkFetchEnd () {
@@ -215,11 +217,11 @@ class ImapServerSwitchStream extends Stream.Transform {
                     return
                 }
 
-                const _buf = this._buffer.slice(0, index)
-                if (_buf.length) {
-                    return this.preProcessCommane(_buf.toString(), next, () => {
+                const _buf = this._buffer.slice ( 0, index )
+                if ( _buf.length ) {
+                    return this.preProcessCommane ( _buf.toString (), next, () => {
                         this._buffer = this._buffer.slice ( index + 2 )
-                        return doLine()
+                        return doLine ()
                     })
                 }
                 if (! this.callback ) {
@@ -332,7 +334,7 @@ class ImapServerSwitchStream extends Stream.Transform {
                         this.flagsDeleted ( newMailIds, next )
                     },
                     ( data, next ) => {
-                        saveLog (`Async.waterfall ( data[${ typeof data }], next ${ typeof next}) `)
+                        
                         this.expunge ( next )
                     }
                 ], ( err, newMail ) => {
@@ -459,12 +461,16 @@ class ImapServerSwitchStream extends Stream.Transform {
 
     private login ( text: string, cmdArray: string[], next, _callback ) {
 
-        this.doCommandCallback = ( err ) => {
+        this.doCommandCallback = ( err: Error ) => {
+            
             if ( ! err ) {
+                saveLog (`login this.doCommandCallback no err `)
                 return this.capability ()
             }
-            return this.imapServer.destroyAll( err )
+            
+            return this.imapServer.destroyAll ( err )
         }
+
         this.commandProcess = (  text: string, cmdArray: string[], next, callback ) => {
             switch ( cmdArray[0] ) {
                 case '+':
@@ -475,7 +481,9 @@ class ImapServerSwitchStream extends Stream.Transform {
                 return callback ()
             }
         }
+        
         switch ( cmdArray[0] ) {
+            
             case '*': {                                  /////       *
                 //          check imap server is login ok
                 if ( /^ok$/i.test ( cmdArray [1]) && this.first ) {
@@ -492,6 +500,7 @@ class ImapServerSwitchStream extends Stream.Transform {
                 return _callback ()
             }
             default:
+            
             return this.serverCommandError ( new Error ( `login switch default ERROR!` ), _callback )
         }
 
@@ -806,10 +815,10 @@ class ImapServerSwitchStream extends Stream.Transform {
     }
 
     private expunge ( callback ) {
-        console.trace (callback.toString())
+
         let newSwitchRet = false
         this.doCommandCallback = ( err ) => {
-            console.trace (callback.toString())
+
             return callback ( err, newSwitchRet )
         }
         this.commandProcess = ( text: string, cmdArray: string[], next , _callback ) => {
@@ -919,6 +928,9 @@ export class qtGateImap extends Event.EventEmitter {
     constructor ( public IMapConnect: imapConnect, public listenFolder: string, private isEachMail: boolean, public deleteBoxWhenEnd: boolean, public writeFolder: string, private debug: boolean, public newMail: ( mail ) => void ) {
         super ()
         this.connect ()
+        this.once (`error`, err => {
+            saveLog (`qtGateImap on error [${err.messag}]` )
+        })
         /*
         process.once ( 'uncaughtException', err => {
             console.log ( err )
@@ -1135,21 +1147,20 @@ export const imapAccountTest = ( IMapConnect: imapConnect, CallBack ) => {
 
 }
 
-const pingPongTimeOut = 1000 * 10
+const pingPongTimeOut = 1000 * 15
 
 export class imapPeer extends Event.EventEmitter {
     private mailPool = []
-    private keepConnectTime: NodeJS.Timer = null
     private rImapReady = false
-    private waitingReplyTimeOut = null
-    private lastReplyPongTime = null
+    private waitingReplyTimeOut: NodeJS.Timer = null
     private pingUuid = null
     private doingDestroy = false
     private wImapReady = false
     private peerReady = false
     private sendFirstPing = false
     public newMail: ( data: any ) => void
 
+
     private mail ( email: Buffer ) {
 
         const attr = getMailAttached (  email ).toString ()
@@ -1188,6 +1199,7 @@ export class imapPeer extends Event.EventEmitter {
                         return saveLog (`Invalid ping uuid`)
                     saveLog ( `imapPeer connected`)
                     this.pingUuid = null
+                    clearTimeout ( this.waitingReplyTimeOut )
                     return this.emit ('ready')
                 }
                 return this.newMail (uu )
@@ -1201,9 +1213,12 @@ export class imapPeer extends Event.EventEmitter {
     }
 
     public trySendToRemote ( email: Buffer, CallBack ) {
-        if ( this.wImap ) {
+        if ( this.wImap && this.wImapReady ) {
             return this.wImap.append ( email.toString ( 'base64' ), err => {
-                if ( err ) {
+                if ( err) {
+                    if ( err.message && /TRYCREATE/i.test( err.message )) {
+                        this.emit ('wFolder')
+                    }
                     saveLog (`this.wImap.append ERROR: [${ err.message ? err.message : '' }]`)
                 }
                 return CallBack ( err )
@@ -1223,6 +1238,12 @@ export class imapPeer extends Event.EventEmitter {
             })
         })
     }
+
+    private setTimeOutOfPing () {
+        return this.waitingReplyTimeOut = setTimeout (() => {
+            this.emit ( 'pingTimeOut' )
+        }, pingPongTimeOut)
+    }
 
     public Ping () {
 
@@ -1232,7 +1253,9 @@ export class imapPeer extends Event.EventEmitter {
             if ( err ) {
                 return saveLog ( `Ping enCrypto error: [${ err.message }]`)
             }
-            this.trySendToRemote ( Buffer.from ( data ), () => {})
+            return this.trySendToRemote ( Buffer.from ( data ), () => {
+                return this.setTimeOutOfPing ()
+            })
         })
     }
 
@@ -1252,23 +1275,27 @@ export class imapPeer extends Event.EventEmitter {
     }
 
     private newWriteImap() {
+        saveLog (`newWriteImap`)
         this.wImap = new qtGateImapwrite ( this.imapData, this.writeBox )
 
         this.wImap.once ( 'end', err => {
             saveLog ( `this.wImap.once end ! [${ err && err.message ? err.message : null }]!` )
             this.wImap = null
+            this.wImapReady = false
             if ( this.sendMailPool.length > 0 ) {
                 saveLog ( `this.wImap.once end ! sendMailPool.length > 0 [${ this.sendMailPool.length }] newWriteImap () ` )
                 return this.newWriteImap ()
             }
         })
 
         this.wImap.once ( 'error', err => {
-            if ( err && err.message && /AUTH|certificate/i.test ( err.message )) {
+            if ( err && err.message && /AUTH|certificate|LOGIN/i.test ( err.message )) {
                 return this.destroy (1)
             }
             saveLog ( `imapPeer this.wImap on error [${ err.message }]`)
-            this.wImap.destroyAll(null)
+            this.wImapReady = false
+            this.wImap = null
+            //this.wImap.destroyAll(null)
         })
 
         this.wImap.once ( 'ready', () => {
@@ -1280,18 +1307,21 @@ export class imapPeer extends Event.EventEmitter {
             }
 
             this.sendFirstPing = true
+            this.Ping ()
             if ( /outlook\.com/i.test ( this.imapData.imapServer )) {
                 saveLog ( `outlook support!`)
-                this.once ( 'wFolder', () => {
+                return this.once ( 'wFolder', () => {
                     saveLog ( `this.once ( 'wFolder') do makeWriteFolder!`)
-                    return this.makeWriteFolder ()
+                    return this.makeWriteFolder (() => {
+                        return this.Ping ()
+                    })
                 })
             }
-            return this.Ping ()
         })
     }
 
     private newReadImap() {
+        saveLog (`newReadImap!`)
         this.rImap = new qtGateImapRead ( this.imapData, this.listenBox, false, false, email => {
             this.mail ( email )
             this.rImap.emit ('nextNewMail')
@@ -1309,17 +1339,19 @@ export class imapPeer extends Event.EventEmitter {
         })
         this.rImap.once ( 'error', err => {
             saveLog ( `rImap on Error [${ err.message }]`)
-            if ( err && err.message && /AUTH|certificate/i.test ( err.message )) {
+            if ( err && err.message && /AUTH|certificate|LOGIN/i.test ( err.message )) {
                 return this.destroy (1)
             }
             this.rImap.destroyAll (null)
 
         })
         this.rImap.once ( 'end', err => {
-            saveLog (`rImap.once ( 'end' ) this.doingDestroy [${ this.doingDestroy }]`)
+            
             this.rImap = null
-            if ( !this.doingDestroy )
+            if ( !this.doingDestroy && !err ) {
                 return this.newReadImap ()
+            }
+            this.exit ( err )
         })
     }
 
@@ -1334,25 +1366,27 @@ export class imapPeer extends Event.EventEmitter {
         this.newReadImap ()
     }
 
-    private makeWriteFolder () {
+    private makeWriteFolder (CallBack) {
 
         let uu = new qtGateImapRead ( this.imapData, this.writeBox, false, false, email => {})
         uu.once ( 'ready', () => {
             uu.destroyAll ( null )
             this.pingUuid = null
             this.wImap.destroyAll (null)
+            return CallBack ()
         })
         uu.once ( 'error', err => {
             saveLog ( `makeWriteFolder error! do again!`)
             uu = null
-            return this.makeWriteFolder ()
+            return this.makeWriteFolder ( CallBack )
         })
         uu.once ( 'end', () => {
             uu = null
         })
     }
 
     public destroy ( err?: number ) {
+        console.trace ('destroy')
         if ( this.doingDestroy )
             return
         this.doingDestroy = true

app/imap.ts

@@ -389,6 +389,14 @@ h1>.badge, h2>.badge, h3>.badge, h4>.badge,h5>.badge,h6>.badge {
   margin: 0px;
   display: block;
   width: 100%;
+  position: absolute;
+}
+.coverNextButton {
+  opacity: 0.5;
+  background: cadetblue;
+}
+.coverNextButton:hover {
+  opacity: 0.8;
 }
 .languageText {
   width: 100%;
@@ -400,7 +408,7 @@ h1>.badge, h2>.badge, h3>.badge, h4>.badge,h5>.badge,h6>.badge {
   opacity: 0.4;
 }
 .titleText{
-  top:120px;
+  top: 5em;
   text-align: center;
   z-index: 99;
   position: relative;
@@ -426,7 +434,7 @@ h1>.badge, h2>.badge, h3>.badge, h4>.badge,h5>.badge,h6>.badge {
   color: white!important;
 }
 .VideoBoxButtom {
-  top: 230px;
+  top: 22em;
   position: relative;
   width: 100%;
   z-index: 98;
@@ -438,7 +446,7 @@ h1>.badge, h2>.badge, h3>.badge, h4>.badge,h5>.badge,h6>.badge {
 }
 .company {
   top: -110px;
-  left: 80%;
+  left: 82%;
   width: 130px;
   font-weight: lighter!important;
   color: white;