Skip to content

Commit 470dbfa

Browse files
committed
v3.05
1 parent 6b459dd commit 470dbfa

File tree

13 files changed

+335
-1116
lines changed

13 files changed

+335
-1116
lines changed

app/localWebServer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ class localServer {
295295
if (err) {
296296
return CallBack(err);
297297
}
298-
console.log(`******************** getFilesFromImap success all fies!\n\n${ret.length}\n\n`);
298+
console.log(`******************** getFilesFromImap success all [${ret.length}] fies!\n\n${ret}\n\n`);
299299
return CallBack(null, ret);
300300
});
301301
});

app/localWebServer.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,6 @@ export default class localServer {
301301
const _files = files.split (',')
302302
console.log (`socket.on ('getFilesFromImap') _files = [${ _files }] _files.length = [${ _files.length }]` )
303303

304-
305-
306304
let ret = ''
307305
return Async.eachSeries ( _files, ( n, next ) => {
308306
console.log (`Async.eachSeries _files[${ n }]`)
@@ -318,7 +316,7 @@ export default class localServer {
318316
return CallBack ( err )
319317
}
320318

321-
console.log (`******************** getFilesFromImap success all fies!\n\n${ ret.length }\n\n`)
319+
console.log (`******************** getFilesFromImap success all [${ ret.length }] fies!\n\n${ ret }\n\n`)
322320

323321

324322
return CallBack ( null, ret )

app/package.json

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"name": "conet",
3+
"version": "3.0.5",
4+
"license": "MIT",
5+
"description": "CoNET",
6+
"repository": {
7+
"type": "git",
8+
"url": "git+https://github.com/QTGate/CoNET.git"
9+
},
10+
"author": {
11+
"name": "CoNET Technology Inc.",
12+
"email": "[email protected]"
13+
},
14+
"main": "./core/main",
15+
"bugs": {
16+
"url": "https://github.com/QTGate/CoNET/issues"
17+
},
18+
"homepage": "https://www.CoNETTech.ca",
19+
"dependencies": {
20+
"async": "^3.1.0",
21+
"cookie-parser": "^1.4.4",
22+
"express": "^4.17.1",
23+
"jimp": "^0.8.5",
24+
"jszip": "^3.2.2",
25+
"mime-types": "^2.1.24",
26+
"node-uuid": "^1.4.8",
27+
"nodemailer": "^6.3.1",
28+
"openpgp": "^4.6.2",
29+
"portastic": "^1.0.1",
30+
"pug": "^2.0.4",
31+
"socket.io": "^2.3.0",
32+
"socket.io-client": "^2.3.0"
33+
},
34+
"scripts": {
35+
"start": "node main false true"
36+
},
37+
"devDependencies": {
38+
"@types/async": "^2.4.2",
39+
"@types/cleave.js": "^1.4.0",
40+
"@types/cookie-parser": "^1.4.1",
41+
"@types/express": "^4.17.0",
42+
"@types/jcanvas": "^15.2.2",
43+
"@types/jquery": "^3.3.30",
44+
"@types/jquery.cookie": "^1.4.31",
45+
"@types/knockout": "^3.4.66",
46+
"@types/openpgp": "0.0.29",
47+
"@types/semantic-ui": "^2.2.7",
48+
"@types/socket.io": "^1.4.40",
49+
"@types/socket.io-client": "^1.4.32",
50+
"istanbul": "^0.4.5",
51+
"nyc": "^11.9.0",
52+
"source-map-support": "^0.5.12"
53+
}
54+
}

app/render/newKeyPair.html

Lines changed: 0 additions & 8 deletions
This file was deleted.

app/tools/coNETConnect.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,13 @@ class default_1 extends Imap.imapPeer {
160160
}
161161
const rImap = new Imap.qtGateImapRead(this.imapData, fileName, true, mail => {
162162
const attr = Imap.getMailAttached(mail);
163-
console.log(`====================================>\n\nImap.imapPeer getFile return new mail ==> [${mail.length}] attr ==> [${attr.length}]\n\n`);
164163
CallBack(null, attr);
165164
callback = true;
166165
return rImap.destroyAll(null);
167166
});
168167
rImap.once('error', err => {
169-
if (!callback) {
170-
return CallBack(err);
171-
}
168+
rImap.destroyAll(null);
169+
return this.getFile(fileName, CallBack);
172170
});
173171
rImap.once('end', () => {
174172
return console.log(`Connect Class GetFile_rImap on end!`);

app/tools/coNETConnect.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -187,23 +187,19 @@ export default class extends Imap.imapPeer {
187187
return CallBack ( new Error ('alreadyExit'))
188188
}
189189

190-
const rImap = new Imap.qtGateImapRead ( this.imapData, fileName, true, mail => {
190+
const rImap: Imap.qtGateImapRead = new Imap.qtGateImapRead ( this.imapData, fileName, true, mail => {
191191

192192

193193
const attr = Imap.getMailAttached ( mail )
194-
195-
console.log (`====================================>\n\nImap.imapPeer getFile return new mail ==> [${ mail.length }] attr ==> [${ attr.length }]\n\n`)
196194

197195
CallBack ( null, attr )
198196
callback = true
199197
return rImap.destroyAll( null )
200198
})
201199

202200
rImap.once ( 'error', err => {
203-
if ( !callback ) {
204-
return CallBack ( err )
205-
}
206-
201+
rImap.destroyAll( null )
202+
return this.getFile ( fileName, CallBack )
207203
})
208204

209205
rImap.once( 'end', () => {

0 commit comments

Comments
 (0)