Skip to content

Commit

Permalink
20191004
Browse files Browse the repository at this point in the history
  • Loading branch information
@KloakIT
KloakIT committed Oct 4, 2019
1 parent 8c2975a commit ac5600c
Show file tree
Hide file tree
Showing 36 changed files with 2,116 additions and 216 deletions.
Binary file added .tsd.json.icloud
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ CoNET平台集成了一系列應用來使用[CoNET](https://github.com/QTGate/Co
## CoNET APPs

### CoSearch
1）Web or Images search/ウェブまたは画像検索/網頁和圖片檢索
1）Web or Images search/ウェブと画像検索/網頁和圖片檢索

2）Get any web page screenshot/任意のWebページへスクリーンショット/抓取任意網站截圖
2）Get any web page screenshot/任意のWebページのスクリーンショット/抓取任意網站截圖

3）Major website media file download support live stream/メーインサイドメディアファイルをダウンロード、ライブストリームを対応/主要多媒體網站視頻音頻文件，直播視頻流下載

Expand Down
2 changes: 2 additions & 0 deletions app/CoNET.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ interface keypair {
delete_btn_click?: () => void
showConform?: KnockoutObservable < boolean >
deleteKeyPairNext?: () => void
_password: string
CoNET_publicKey?: string
keyPairPassword?: KnockoutObservable < keyPairPassword >
showDeleteKeyPairNoite?: KnockoutObservable < boolean >
}
Expand Down
24 changes: 18 additions & 6 deletions app/localWebServer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@ class localServer {
this.CoNETConnectCalss = null;
this.openPgpKeyOption = null;
this.sessionHashPool = [];
this.Pbkdf2Password = null;
this.nodeList = [{
email: '[email protected]',
keyID: '',
key: ''
}];
this.expressServer.set('views', Path.join(__dirname, 'views'));
this.expressServer.set('view engine', 'pug');
this.expressServer.use(cookieParser());
Expand Down Expand Up @@ -178,23 +184,22 @@ class localServer {
this.imapConnectData.sendToQTGate = true;
Tool.saveEncryptoData(Tool.imapDataFileName1, this.imapConnectData, this.config, this.savedPasswrod, () => { });
this.socketServer.emit('tryConnectCoNETStage', null, 3);
this.socketServer.emit('systemErr', 'connectingToCoNET');
return Tool.sendCoNETConnectRequestEmail(this.imapConnectData, this.openPgpKeyOption, this.config.version, this.keyPair.publicKey, (err) => {
this.socketServer.emit('systemErr', 'sendConnectRequestMail');
return Tool.sendCoNETConnectRequestEmail(this.imapConnectData, this.openPgpKeyOption, this.config.version, this.nodeList[0].email, this.keyPair.publicKey, (err) => {
if (err) {
console.log(`sendCoNETConnectRequestEmail callback error`, err);
saveLog(`tryConnectCoNET sendCoNETConnectRequestEmail got error [${err.message ? err.message : JSON.stringify(err)}]`);
this.socketServer.emit('systemErr', err);
return socket.emit('tryConnectCoNETStage', imapErrorCallBack(err.message));
}
socket.emit('tryConnectCoNETStage', null, 3);
this.socketServer.emit('systemErr', 'connectingToCoNET');
return this.CoNETConnectCalss = new coNETConnect_1.default(this.imapConnectData, this.socketServer, this.openPgpKeyOption, true, catchUnSerialCmd, _exitFunction);
});
}
console.log(`makeConnect without sendMail`);
return this.CoNETConnectCalss = new coNETConnect_1.default(this.imapConnectData, this.socketServer, this.openPgpKeyOption, false, catchUnSerialCmd, _exitFunction);
};
if (!this.CoNETConnectCalss || this.CoNETConnectCalss.alreadyExit) {
saveLog(`!this.CoNETConnectCalss || this.CoNETConnectCalss.alreadyExit`);
return makeConnect(false);
}
return this.CoNETConnectCalss.tryConnect1();
Expand Down Expand Up @@ -256,6 +261,7 @@ class localServer {
return this.doingCheckImap(socket);
});
socket.on('tryConnectCoNET', CallBack1 => {
saveLog(`socket on tryConnectCoNET!`);
if (!this.imapConnectData) {
return CallBack1('systemError');
}
Expand Down Expand Up @@ -327,6 +333,9 @@ class localServer {
});
});
});
socket.on('doingRequest', request => {
this.CoNETConnectCalss.trySendToRemote();
});
}
doingCheckImap(socket) {
this.imapConnectData.imapTestResult = false;
Expand Down Expand Up @@ -447,7 +456,10 @@ class localServer {
}
return Async.waterfall([
next => Tool.getPbkdf2(this.config, password, next),
(Pbkdf2Password, next) => Tool.getKeyPairInfo(this.config.keypair.publicKey, this.config.keypair.privateKey, Pbkdf2Password.toString('hex'), next),
(Pbkdf2Password, next) => {
this.Pbkdf2Password = Pbkdf2Password.toString('hex');
Tool.getKeyPairInfo(this.config.keypair.publicKey, this.config.keypair.privateKey, this.Pbkdf2Password, next);
},
(key, next) => {
//console.log ( `checkPemPassword Tool.getKeyPairInfo success!`)
if (!key.passwordOK) {
Expand Down Expand Up @@ -479,7 +491,7 @@ class localServer {
try {
this.imapConnectData = JSON.parse(data);
this.localConnected.set(clientName, clientObj);
return CallBack1(null, this.imapConnectData, sessionHash);
return CallBack1(null, this.imapConnectData, this.Pbkdf2Password, sessionHash);
}
catch (ex) {
return CallBack1();
Expand Down
34 changes: 21 additions & 13 deletions app/localWebServer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,12 @@ export default class localServer {
private CoNETConnectCalss: CoNETConnectCalss = null
private openPgpKeyOption = null
private sessionHashPool = []

private Pbkdf2Password = null
private nodeList = [{
email: '[email protected]',
keyID:'',
key: ''
}]

private tryConnectCoNET ( socket: SocketIO.Socket, sessionHash: string ) {
console.log (`doing tryConnectCoNET`)
Expand Down Expand Up @@ -166,17 +171,15 @@ export default class localServer {
this.imapConnectData.sendToQTGate = true
Tool.saveEncryptoData ( Tool.imapDataFileName1, this.imapConnectData, this.config, this.savedPasswrod, () => {})
this.socketServer.emit ( 'tryConnectCoNETStage', null, 3 )
this.socketServer.emit ( 'systemErr','connectingToCoNET' )
return Tool.sendCoNETConnectRequestEmail ( this.imapConnectData, this.openPgpKeyOption, this.config.version, this.keyPair.publicKey, ( err: Error ) => {
this.socketServer.emit ( 'systemErr','sendConnectRequestMail' )
return Tool.sendCoNETConnectRequestEmail ( this.imapConnectData, this.openPgpKeyOption, this.config.version, this.nodeList[0].email, this.keyPair.publicKey, ( err: Error ) => {
if ( err ) {
console.log (`sendCoNETConnectRequestEmail callback error`, err )
saveLog ( `tryConnectCoNET sendCoNETConnectRequestEmail got error [${ err.message ? err.message : JSON.stringify ( err ) }]`)
this.socketServer.emit ('systemErr', err )
return socket.emit ( 'tryConnectCoNETStage', imapErrorCallBack ( err.message ))
}

socket.emit ( 'tryConnectCoNETStage', null, 3 )
this.socketServer.emit ('systemErr','connectingToCoNET')
return this.CoNETConnectCalss = new CoNETConnectCalss ( this.imapConnectData, this.socketServer, this.openPgpKeyOption, true, catchUnSerialCmd, _exitFunction )
})

Expand All @@ -187,6 +190,7 @@ export default class localServer {
}

if ( !this.CoNETConnectCalss || this.CoNETConnectCalss.alreadyExit ) {
saveLog( `!this.CoNETConnectCalss || this.CoNETConnectCalss.alreadyExit` )
return makeConnect ( false )
}

Expand Down Expand Up @@ -258,10 +262,9 @@ export default class localServer {

return this.doingCheckImap ( socket )
})


socket.on ( 'tryConnectCoNET', CallBack1 => {

saveLog (`socket on tryConnectCoNET!`)
if ( !this.imapConnectData ) {
return CallBack1 ('systemError')

Expand Down Expand Up @@ -348,6 +351,10 @@ export default class localServer {
})
})

socket.on ( 'doingRequest', request => {
this.CoNETConnectCalss.trySendToRemote ( )
})

}

private doingCheckImap ( socket: SocketIO.Socket ) {
Expand Down Expand Up @@ -381,7 +388,6 @@ export default class localServer {

}


private getMedia ( mediaString: string, CallBack ) {
//saveLog (` getMedia mediaString = [${ mediaString }]`)
if ( /^http[s]*\:\/\//.test ( mediaString )) {
Expand Down Expand Up @@ -495,7 +501,10 @@ export default class localServer {

return Async.waterfall ([
next => Tool.getPbkdf2 ( this.config, password, next ),
( Pbkdf2Password: Buffer, next ) => Tool.getKeyPairInfo ( this.config.keypair.publicKey, this.config.keypair.privateKey, Pbkdf2Password.toString('hex'), next ),
( Pbkdf2Password: Buffer, next ) => {
this.Pbkdf2Password = Pbkdf2Password.toString ( 'hex' )
Tool.getKeyPairInfo ( this.config.keypair.publicKey, this.config.keypair.privateKey, this.Pbkdf2Password, next )
},
( key, next ) => {
//console.log ( `checkPemPassword Tool.getKeyPairInfo success!`)
if ( ! key.passwordOK ) {
Expand All @@ -512,6 +521,7 @@ export default class localServer {
( option_KeyOption, next ) => {
//console.log (`checkPemPassword Tool.makeGpgKeyOption success!`)
this.openPgpKeyOption = option_KeyOption

return Tool.readEncryptoFile ( Tool.imapDataFileName1, password, this.config, next )
}], ( err: Error, data: string ) => {
//console.log (`checkPemPassword Async.waterfall success!`)
Expand All @@ -520,10 +530,7 @@ export default class localServer {
CallBack1 ()
return saveLog ( `Tool.makeGpgKeyOption return err [${ err && err.message ? err.message : null }]` )
}

}



this.sessionHashPool.push ( sessionHash = Crypto.randomBytes (10).toString ('hex'))
console.log (`this.sessionHashPool.push!\n${ this.sessionHashPool }\n${ this.sessionHashPool.length }`)
Expand All @@ -532,7 +539,7 @@ export default class localServer {
this.imapConnectData = JSON.parse ( data )
this.localConnected.set ( clientName, clientObj )

return CallBack1 ( null, this.imapConnectData, sessionHash )
return CallBack1 ( null, this.imapConnectData, this.Pbkdf2Password, sessionHash )
} catch ( ex ) {
return CallBack1 ()
}
Expand Down Expand Up @@ -679,6 +686,7 @@ export default class localServer {
console.log (`sessionHashPool have not this [${ sessionHash }]!\n${ this.sessionHashPool }`)
return res.render( 'home', { title: 'home', proxyErr: false })
}

this.socketServer_CoSearch.once ( 'connection', socket => {
return this.socketServer_CoSearchConnected ( socket, sessionHash )
})
Expand Down
Binary file added app/public/images/CoSeaarch.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit ac5600c

Please sign in to comment.