20191006

Author: KloakIT

app/CoNET.d.ts

@@ -165,7 +165,7 @@ interface imapData {
 }
 
 interface requestPoolData {
-    CallBack: ( err?: Error, returnData?: any ) => void
+    
     timeout: any
 }
 
@@ -282,7 +282,7 @@ interface QTGateAPIRequestCommand {
     account?: string
 	error: number
 	requestSerial?: string
-    Args: any[]
+    Args: any
     fingerprint?: string
     dataTransfer?: iTransferData
     requestTimes?: number

app/localWebServer.js

@@ -105,6 +105,7 @@ class localServer {
                 keyID: '',
                 key: ''
             }];
+        this.requestPool = new Map();
         this.expressServer.set('views', Path.join(__dirname, 'views'));
         this.expressServer.set('view engine', 'pug');
         this.expressServer.use(cookieParser());
@@ -149,6 +150,13 @@ class localServer {
             }
         });
     }
+    catchCmd(mail, uuid) {
+        const socket = this.requestPool.get(uuid);
+        if (!socket) {
+            return console.log(`Get cmd that have no matched socket \n\n`, mail);
+        }
+        socket.emit('doingRequest', mail, uuid);
+    }
     tryConnectCoNET(socket, sessionHash) {
         console.log(`doing tryConnectCoNET`);
         //		have CoGate connect
@@ -177,14 +185,6 @@ class localServer {
                 }
             }
         };
-        /**
-         *
-         * @param cmd CoNET server command
-         *
-         */
-        const catchUnSerialCmd = (cmd) => {
-            return console.log(`catchUnSerialCmd: LocalWebServer catch UnSerialCmd!\n\ncmd`);
-        };
         const makeConnect = (sendMail) => {
             if (!this.imapConnectData.sendToQTGate || sendMail) {
                 this.imapConnectData.sendToQTGate = true;
@@ -198,14 +198,14 @@ class localServer {
                         this.socketServer.emit('systemErr', err);
                         return socket.emit('tryConnectCoNETStage', imapErrorCallBack(err.message));
                     }
-                    return this.CoNETConnectCalss = new coNETConnect_1.default(this.imapConnectData, this.socketServer, this.openPgpKeyOption, true, mail => {
-                        return catchUnSerialCmd(mail);
+                    return this.CoNETConnectCalss = new coNETConnect_1.default(this.imapConnectData, this.socketServer, this.openPgpKeyOption, true, (mail, uuid) => {
+                        return this.catchCmd(mail, uuid);
                     }, _exitFunction);
                 });
             }
             console.log(`makeConnect without sendMail`);
-            return this.CoNETConnectCalss = new coNETConnect_1.default(this.imapConnectData, this.socketServer, this.openPgpKeyOption, false, mail => {
-                return catchUnSerialCmd(mail);
+            return this.CoNETConnectCalss = new coNETConnect_1.default(this.imapConnectData, this.socketServer, this.openPgpKeyOption, false, (mail, uuid) => {
+                return this.catchCmd(mail, uuid);
             }, _exitFunction);
         };
         if (!this.CoNETConnectCalss || this.CoNETConnectCalss.alreadyExit) {
@@ -323,7 +323,8 @@ class localServer {
             });
         });
         socket.on('doingRequest', (uuid, request, CallBack) => {
-            console.log(`on doingRequest\n[ ${uuid}]\n${request}`);
+            this.requestPool.set(uuid, socket);
+            saveLog(`doingRequest on ${uuid}`);
             return this.CoNETConnectCalss.requestCoNET_v1(uuid, request, CallBack);
         });
     }

app/localWebServer.ts

@@ -124,12 +124,23 @@ export default class localServer {
 		keyID:'',
 		key: ''
 	}]
+
+	private requestPool: Map < string, SocketIO.Socket > = new Map()
+
+
+	private catchCmd ( mail: string, uuid: string ) {
+		const socket = this.requestPool.get ( uuid )
+		if ( !socket ) {
+			return console.log (`Get cmd that have no matched socket \n\n`, mail )
+		}
+
+		socket.emit ( 'doingRequest', mail, uuid )
+	}
 
 	private tryConnectCoNET ( socket: SocketIO.Socket, sessionHash: string ) {
 		console.log (`doing tryConnectCoNET`)
 		//		have CoGate connect
 
-
 		let sendMail = false
 		const _exitFunction = err => {
 			//console.trace ( `_exitFunction err =`, err )
@@ -160,14 +171,6 @@ export default class localServer {
 
 
 		}
-		/**
-		 * 
-		 * @param cmd CoNET server command
-		 * 
-		 */
-		const catchUnSerialCmd = ( cmd: string ) => {
-			return console.log (`catchUnSerialCmd: LocalWebServer catch UnSerialCmd!\n\ncmd`)
-		}
 
 		const makeConnect = ( sendMail: boolean ) => {
 
@@ -184,15 +187,15 @@ export default class localServer {
 						return socket.emit ( 'tryConnectCoNETStage', imapErrorCallBack ( err.message ))
 					}
 
-					return this.CoNETConnectCalss = new CoNETConnectCalss ( this.imapConnectData, this.socketServer, this.openPgpKeyOption, true, mail => {
-						return catchUnSerialCmd ( mail )
+					return this.CoNETConnectCalss = new CoNETConnectCalss ( this.imapConnectData, this.socketServer, this.openPgpKeyOption, true, ( mail, uuid ) => {
+						return this.catchCmd ( mail, uuid )
 					}, _exitFunction )
 				})
 
 			}
 			console.log ( `makeConnect without sendMail`)
-			return this.CoNETConnectCalss = new CoNETConnectCalss ( this.imapConnectData, this.socketServer, this.openPgpKeyOption, false, mail => {
-				return catchUnSerialCmd ( mail )
+			return this.CoNETConnectCalss = new CoNETConnectCalss ( this.imapConnectData, this.socketServer, this.openPgpKeyOption, false, ( mail, uuid ) => {
+				return this.catchCmd ( mail, uuid )
 			}, _exitFunction )
 
 		}
@@ -334,7 +337,9 @@ export default class localServer {
 		})
 
 		socket.on ( 'doingRequest', ( uuid, request, CallBack ) => {
-			console.log (`on doingRequest\n[ ${ uuid }]\n${ request }`)
+			
+			this.requestPool.set ( uuid, socket )
+			saveLog (`doingRequest on ${ uuid }`)
 			return this.CoNETConnectCalss.requestCoNET_v1 ( uuid, request, CallBack )
 		})
 

app/public/css/page.css

@@ -838,3 +838,16 @@ ul.plan-features {
 {
 	color:#e7bdbc!important
 }
+
+
+.loadingGetResponse::after {
+	border-color: #ab9420d9 transparent transparent!important;
+}
+
+.conetResponse::after {
+	border-color: #36c576d9 transparent transparent!important;
+}
+
+.buttonUnActive {
+	background: #e0e1e288 none!important;
+}

app/public/scripts/CoSearch.ts

@@ -1987,7 +1987,6 @@ const googleVideoSearchClickResult = {
   nextPage: '/search?q=%E9%83%AD%E6%96%87%E8%B2%B4&tbm=vid&ei=BMZ2XbubG46YaczJgcAN&start=10&sa=N&ved=0ahUKEwi7rYW42cTkAhUOTBoKHcxkANgQ8NMDCIMB'
 }
 
-
 module coSearch_layout {
 	  export class coSearch {