@social-mail/social-mail-web-server 1.16.231 → 1.16.233
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/.tsbuildinfo +1 -1
- package/dist/protocols/imap/client/ImapClient.d.ts.map +1 -1
- package/dist/protocols/imap/client/ImapClient.js +5 -6
- package/dist/protocols/imap/client/ImapClient.js.map +1 -1
- package/dist/protocols/socket/client/SocketClient.d.ts +1 -1
- package/dist/protocols/socket/client/SocketClient.d.ts.map +1 -1
- package/dist/protocols/socket/client/SocketClient.js +7 -12
- package/dist/protocols/socket/client/SocketClient.js.map +1 -1
- package/dist/server/smtp/server/SmtpServerClient.d.ts +2 -2
- package/dist/server/workflows/sync/SyncMailboxWorkflow.d.ts.map +1 -1
- package/dist/server/workflows/sync/SyncMailboxWorkflow.js +1 -3
- package/dist/server/workflows/sync/SyncMailboxWorkflow.js.map +1 -1
- package/package.json +1 -1
- package/src/protocols/imap/client/ImapClient.ts +5 -6
- package/src/protocols/socket/client/SocketClient.ts +10 -12
- package/src/server/workflows/sync/SyncMailboxWorkflow.ts +1 -3
- package/dist/common/PromiseFactory.d.ts +0 -8
- package/dist/common/PromiseFactory.d.ts.map +0 -1
- package/dist/common/PromiseFactory.js +0 -23
- package/dist/common/PromiseFactory.js.map +0 -1
- package/src/common/PromiseFactory.ts +0 -25
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImapClient.d.ts","sourceRoot":"","sources":["../../../../src/protocols/imap/client/ImapClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ImapClient.d.ts","sourceRoot":"","sources":["../../../../src/protocols/imap/client/ImapClient.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE;QACR,GAAG,CAAC,EAAE,OAAO,CAAC;QACd,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,IAAI,CAAC,EAAE,OAAO,CAAC;QACf,IAAI,CAAC,EAAE,OAAO,CAAC;QACf,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,KAAK,CAAC,EAAE,OAAO,CAAA;KAClB,CAAC;IACF,OAAO,EAAE;QACL,aAAa,CAAC,MAAC;QACf,QAAQ,CAAC,MAAC;QACV,WAAW,CAAC,MAAC;KAChB,CAAA;CACJ;AAED;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;IA2CP,OAAO,CAAC,MAAM;IAAgB,OAAO,CAAC,MAAM;WAzC5C,OAAO,CAAC,EACxB,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,QAAe,EACf,GAAW,EACX,IAAsB,EACtB,MAAqB,EACxB;;;;;;;;KAAA;IAqBD,SAAgB,YAAY,sBAA4B;IAExD,IAAW,OAAO,WAEjB;IACD,IAAW,OAAO,CAAC,CAAC,QAAA,EAEnB;IAED,OAAO,CAAC,EAAE,CAAa;IACvB,OAAO,CAAC,OAAO,CAA0F;IAEzG,OAAO;IAkBP;;OAEG;IACG,IAAI;IAaJ,OAAO,CAAC,MAAM,KAAA;;;;;;;;IAKpB,IAAI;IAIE,oBAAoB;;;;IAcpB,aAAa,CAAC,EAChB,KAA4B,EAC5B,GAA2B,EAC3B,YAAmB,EACnB,IAAW,EACX,KAAY,EACZ,SAAgB,EAAC;;;;;;;KAAK;IA6BpB,cAAc,CAAC,EAAE,KAAA;IASjB,WAAW,CAAC,CAAC,GAAG,aAAa,EAC/B,IAAI,EAAE,MAAM,EACZ,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,aAAa,KAAK,CAAC,EAAE,GAAG,UAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAYnE,CAAC,MAAM,CAAC,OAAO,CAAC;YAIF,eAAe;YAWf,KAAK;CAsFtB"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
/* eslint-disable no-console */
|
|
2
|
-
import PromiseFactory from "../../../common/PromiseFactory.js";
|
|
3
2
|
import { tokenize } from "../../core/tokenizer.js";
|
|
4
3
|
import SocketClient from "../../socket/client/SocketClient.js";
|
|
5
4
|
import { ImapParser } from "../parser/imapParser.js";
|
|
@@ -45,7 +44,7 @@ export default class ImapClient {
|
|
|
45
44
|
for (const p of this.pending.values()) {
|
|
46
45
|
p.reject(error);
|
|
47
46
|
}
|
|
48
|
-
logger?.(
|
|
47
|
+
logger?.(error);
|
|
49
48
|
// this.pending.clear();
|
|
50
49
|
});
|
|
51
50
|
this.start().catch((error) => {
|
|
@@ -53,7 +52,7 @@ export default class ImapClient {
|
|
|
53
52
|
for (const p of this.pending.values()) {
|
|
54
53
|
p.reject(error);
|
|
55
54
|
}
|
|
56
|
-
logger?.(
|
|
55
|
+
logger?.(error);
|
|
57
56
|
// this.pending.clear();
|
|
58
57
|
});
|
|
59
58
|
}
|
|
@@ -129,10 +128,10 @@ export default class ImapClient {
|
|
|
129
128
|
}
|
|
130
129
|
async sendCommand(line, transformer, log = true) {
|
|
131
130
|
const id = `X${(this.id++).toString(16)}`;
|
|
132
|
-
const rp = PromiseFactory.create();
|
|
133
|
-
this.pending.set(id, rp);
|
|
134
131
|
await this.socket.writeLine(`${id} ${line}`, { log });
|
|
135
|
-
const r = await
|
|
132
|
+
const r = await new Promise((resolve, reject) => {
|
|
133
|
+
this.pending.set(id, { resolve, reject });
|
|
134
|
+
});
|
|
136
135
|
if (transformer) {
|
|
137
136
|
return transformer(r);
|
|
138
137
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImapClient.js","sourceRoot":"","sources":["../../../../src/protocols/imap/client/ImapClient.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,
|
|
1
|
+
{"version":3,"file":"ImapClient.js","sourceRoot":"","sources":["../../../../src/protocols/imap/client/ImapClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ export default class SocketClient {
|
|
|
35
35
|
writeLine(line: string, { encoding, log }?: {
|
|
36
36
|
encoding?: BufferEncoding;
|
|
37
37
|
log?: boolean;
|
|
38
|
-
}): Promise<
|
|
38
|
+
}): Promise<void>;
|
|
39
39
|
readLine(encoding?: BufferEncoding, signal?: AbortSignal): Promise<string>;
|
|
40
40
|
readChars(length: number, signal?: AbortSignal): Promise<Buffer<ArrayBufferLike>>;
|
|
41
41
|
upgradeTLS(options?: tls.ConnectionOptions): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SocketClient.d.ts","sourceRoot":"","sources":["../../../../src/protocols/socket/client/SocketClient.ts"],"names":[],"mappings":"AAAA,OAAY,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAClC,OAAO,QAAQ,MAAM,sDAAsD,CAAC;AAC5E,OAAO,GAAkB,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"SocketClient.d.ts","sourceRoot":"","sources":["../../../../src/protocols/socket/client/SocketClient.ts"],"names":[],"mappings":"AAAA,OAAY,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAClC,OAAO,QAAQ,MAAM,sDAAsD,CAAC;AAC5E,OAAO,GAAkB,MAAM,KAAK,CAAC;AAIrC,MAAM,CAAC,OAAO,OAAO,YAAY;IAoFzB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;WAnFJ,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,MAAS;WAI9B,OAAO,CAAC,EAAE,IAAI,EAAE,IAAa,EAAE,UAAmB,EAAE,MAAe,EAAE,GAAY,EAAE,cAAsB,EAAC;;;;;;;KAAA;IA4C9H,UAAU,0BAAsB;IAEhC,WAAW,0BAAsB;IAEjC,IAAI,aAAa,WAEhB;IAED;;OAEG;IACH,IAAI,OAAO,IAGI,MAAM,CADpB;IACD,IAAI,OAAO,CAAC,CAAC,EAAE,MAAM,EAKpB;IAED,IAAI,MAAM,YAET;IAED,OAAO,CAAC,UAAU,CAAC;IACnB,OAAO,CAAC,QAAQ,CAAC;IACjB,OAAO,CAAC,QAAQ,CAAC;IACjB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAoB;IAExC,OAAO,CAAC,QAAQ,CAAiC;IAEjD,OAAO;IAiDP,SAAS,CAAC,EAAE,KAAA;IAIZ,OAAO;IAQP,CAAC,MAAM,CAAC,OAAO,CAAC;IAIV,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,QAAoC,EAAE,GAAU,EAAC;;;KAAK;IAiBhF,QAAQ,CAAC,QAAQ,GAAE,cAAwB,EAAE,MAAM,CAAC,EAAE,WAAW;IAMhE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW;IAIvC,UAAU,CAAC,OAAO,GAAE,GAAG,CAAC,iBAAwB;IAkCjD,kBAAkB,CAAC,OAAO,GAAE,GAAG,CAAC,gBAAuB;CA4BvE"}
|
|
@@ -3,7 +3,6 @@ import EventSet from "@entity-access/entity-access/dist/common/EventSet.js";
|
|
|
3
3
|
import tls, { TLSSocket } from "tls";
|
|
4
4
|
import TimeoutError from "../../../common/errors/TimeoutError.js";
|
|
5
5
|
import { AsyncSocketReader } from "./AsyncSocketReader.js";
|
|
6
|
-
import PromiseFactory from "../../../common/PromiseFactory.js";
|
|
7
6
|
export default class SocketClient {
|
|
8
7
|
static from(socket, logger = void 0) {
|
|
9
8
|
return new SocketClient(socket, logger);
|
|
@@ -16,13 +15,13 @@ export default class SocketClient {
|
|
|
16
15
|
: host ? net.connect({ host, port, timeout: connectTimeout }) : net.connect({ port, timeout: connectTimeout });
|
|
17
16
|
c.once("error", (error) => {
|
|
18
17
|
logger?.(error);
|
|
18
|
+
reject(error);
|
|
19
19
|
try {
|
|
20
20
|
c.destroy(error);
|
|
21
21
|
}
|
|
22
22
|
catch {
|
|
23
23
|
// ignore
|
|
24
24
|
}
|
|
25
|
-
reject(error);
|
|
26
25
|
});
|
|
27
26
|
c.once("close", () => {
|
|
28
27
|
try {
|
|
@@ -35,13 +34,13 @@ export default class SocketClient {
|
|
|
35
34
|
const timeout = () => {
|
|
36
35
|
const e1 = new TimeoutError(`Timeout for ${servername}(${host})`);
|
|
37
36
|
logger?.(e1);
|
|
37
|
+
reject(e1);
|
|
38
38
|
try {
|
|
39
39
|
c.destroy(e1);
|
|
40
40
|
}
|
|
41
41
|
catch {
|
|
42
42
|
// ignore...
|
|
43
43
|
}
|
|
44
|
-
reject(e1);
|
|
45
44
|
};
|
|
46
45
|
c.once("timeout", timeout);
|
|
47
46
|
c.once("connect", () => {
|
|
@@ -141,22 +140,18 @@ export default class SocketClient {
|
|
|
141
140
|
[Symbol.dispose]() {
|
|
142
141
|
this.destroy();
|
|
143
142
|
}
|
|
144
|
-
writeLine(line, { encoding = "ascii", log = true } = {}) {
|
|
143
|
+
async writeLine(line, { encoding = "ascii", log = true } = {}) {
|
|
145
144
|
if (log) {
|
|
146
145
|
this.logger(`>> ${line}`);
|
|
147
146
|
}
|
|
148
147
|
// following double callback will prevent
|
|
149
148
|
// allocating extra buffer
|
|
150
149
|
line += "\r\n";
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
return;
|
|
156
|
-
}
|
|
157
|
-
rp.resolve(void 0);
|
|
150
|
+
await new Promise((resolve, reject) => {
|
|
151
|
+
this.client.write(line, encoding, (error) => error
|
|
152
|
+
? reject(error)
|
|
153
|
+
: resolve());
|
|
158
154
|
});
|
|
159
|
-
return rp.promise;
|
|
160
155
|
}
|
|
161
156
|
async readLine(encoding = "ascii", signal) {
|
|
162
157
|
const line = await this.socketReader.readLineTillCRLF(encoding, signal);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SocketClient.js","sourceRoot":"","sources":["../../../../src/protocols/socket/client/SocketClient.ts"],"names":[],"mappings":"AAAA,OAAO,GAAe,MAAM,KAAK,CAAC;AAClC,OAAO,QAAQ,MAAM,sDAAsD,CAAC;AAC5E,OAAO,GAAG,EAAE,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AACrC,OAAO,YAAY,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"SocketClient.js","sourceRoot":"","sources":["../../../../src/protocols/socket/client/SocketClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,8 +22,8 @@ export default class SmtpServerClient {
|
|
|
22
22
|
commandMAIL(from: string, smtpUtf8: any): Promise<void>;
|
|
23
23
|
commandHELO(name: any): Promise<void>;
|
|
24
24
|
commandEHLO(serverName: any): Promise<void>;
|
|
25
|
-
writeLine(text: string): Promise<
|
|
26
|
-
sendResponse(status: number, text: string): Promise<
|
|
25
|
+
writeLine(text: string): Promise<void>;
|
|
26
|
+
sendResponse(status: number, text: string): Promise<void>;
|
|
27
27
|
destroy(): Promise<void>;
|
|
28
28
|
close(): void;
|
|
29
29
|
processCommands(): Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SyncMailboxWorkflow.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/sync/SyncMailboxWorkflow.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAGjE,OAAO,iBAAiB,MAAM,2CAA2C,CAAC;AAC1E,OAAO,UAAU,EAAE,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AACvF,OAAO,sBAAsB,MAAM,+CAA+C,CAAC;AACnF,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AAKnG,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,UAAU,UAAU;IAChB,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG;YACX,OAAO,EAAE,MAAM,CAAC;YAChB,SAAS,EAAC,MAAM,CAAC;YACjB,WAAW,EAAE,MAAM,CAAC;SACvB,CAAA;KACJ,CAAA;CACJ;AAED,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAE/D,MAAM,CAAC,SAAS,SAAU;WAEZ,YAAY,CAAC,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,MAAM;WAM9C,WAAW,CAAC,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,MAAM;IAKvE,OAAO,CAAC,EAAE,CAAC,CAAoB;IAE/B,OAAO,CAAC,UAAU,CAAC,CAAyB;IAE5C,OAAO,CAAC,OAAO,CAAW;IAE1B,OAAO,CAAC,SAAS,CAAa;IAE9B,OAAO,CAAC,MAAM,CAAoB;IAK5B,GAAG;IAOH,IAAI,CACN,CAAC,EAAE,MAAM,EACD,EAAE,CAAC,EAAE,iBAAiB,EACtB,UAAU,CAAC,EAAE,sBAAsB;IA0CzC,QAAQ,CAAC,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE,UAAU;IAqCzD,cAAc,CAChB,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,WAAW;
|
|
1
|
+
{"version":3,"file":"SyncMailboxWorkflow.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/sync/SyncMailboxWorkflow.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAGjE,OAAO,iBAAiB,MAAM,2CAA2C,CAAC;AAC1E,OAAO,UAAU,EAAE,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AACvF,OAAO,sBAAsB,MAAM,+CAA+C,CAAC;AACnF,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AAKnG,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,UAAU,UAAU;IAChB,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG;YACX,OAAO,EAAE,MAAM,CAAC;YAChB,SAAS,EAAC,MAAM,CAAC;YACjB,WAAW,EAAE,MAAM,CAAC;SACvB,CAAA;KACJ,CAAA;CACJ;AAED,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAE/D,MAAM,CAAC,SAAS,SAAU;WAEZ,YAAY,CAAC,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,MAAM;WAM9C,WAAW,CAAC,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,MAAM;IAKvE,OAAO,CAAC,EAAE,CAAC,CAAoB;IAE/B,OAAO,CAAC,UAAU,CAAC,CAAyB;IAE5C,OAAO,CAAC,OAAO,CAAW;IAE1B,OAAO,CAAC,SAAS,CAAa;IAE9B,OAAO,CAAC,MAAM,CAAoB;IAK5B,GAAG;IAOH,IAAI,CACN,CAAC,EAAE,MAAM,EACD,EAAE,CAAC,EAAE,iBAAiB,EACtB,UAAU,CAAC,EAAE,sBAAsB;IA0CzC,QAAQ,CAAC,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE,UAAU;IAqCzD,cAAc,CAChB,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,WAAW;IAgJvB,SAAS,CAAC,aAAa;YAWT,gBAAgB;YA2BhB,SAAS;YAWT,cAAc;CA4B/B"}
|
|
@@ -206,7 +206,6 @@ class SyncMailboxWorkflow extends Workflow {
|
|
|
206
206
|
// console.log(`Begin sync ${start}`);
|
|
207
207
|
const end = start + step;
|
|
208
208
|
// console.log(`Begin sync ${start} - ${end}`);
|
|
209
|
-
this.syncState.log.push(`Begin sync ${start} - ${end}`);
|
|
210
209
|
const range = await client.uidFetchRange({ start, end });
|
|
211
210
|
// const q = new AsyncQueue();
|
|
212
211
|
// const tasks = [] as { emailID: string, labels: string[], fetchPromise: Promise<IGenericFetchResult>}[];
|
|
@@ -246,7 +245,7 @@ class SyncMailboxWorkflow extends Workflow {
|
|
|
246
245
|
const isDraft = labels?.some((r) => /^\\Draft$/i.test(r));
|
|
247
246
|
const result = await client.uidFetchRFC822(uid);
|
|
248
247
|
syncState.progress = (BigInt(syncState.progress) + 1n).toString();
|
|
249
|
-
|
|
248
|
+
// console.log(`Saving ${uid}`);
|
|
250
249
|
await serializer.saveRFC822(result.rfc822, {
|
|
251
250
|
externalEmailID: emailID,
|
|
252
251
|
localEmailID: existingEmail?.emailID,
|
|
@@ -260,7 +259,6 @@ class SyncMailboxWorkflow extends Workflow {
|
|
|
260
259
|
if (cUID > currentLastUID && cUID < end) {
|
|
261
260
|
currentLastUID = cUID;
|
|
262
261
|
}
|
|
263
|
-
this.syncState.log.push(`Saved ${uid}`);
|
|
264
262
|
// console.log(`Saved ${uid}`);
|
|
265
263
|
}
|
|
266
264
|
// await q.wait();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SyncMailboxWorkflow.js","sourceRoot":"","sources":["../../../../src/server/workflows/sync/SyncMailboxWorkflow.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"SyncMailboxWorkflow.js","sourceRoot":"","sources":["../../../../src/server/workflows/sync/SyncMailboxWorkflow.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
/* eslint-disable no-console */
|
|
2
|
-
import PromiseFactory from "../../../common/PromiseFactory.js";
|
|
3
2
|
import { tokenize } from "../../core/tokenizer.js";
|
|
4
3
|
import SocketClient from "../../socket/client/SocketClient.js";
|
|
5
4
|
import { ImapParser } from "../parser/imapParser.js";
|
|
@@ -82,7 +81,7 @@ export default class ImapClient {
|
|
|
82
81
|
for(const p of this.pending.values()) {
|
|
83
82
|
p.reject(error);
|
|
84
83
|
}
|
|
85
|
-
logger?.(
|
|
84
|
+
logger?.(error);
|
|
86
85
|
// this.pending.clear();
|
|
87
86
|
});
|
|
88
87
|
this.start().catch((error) => {
|
|
@@ -90,7 +89,7 @@ export default class ImapClient {
|
|
|
90
89
|
for(const p of this.pending.values()) {
|
|
91
90
|
p.reject(error);
|
|
92
91
|
}
|
|
93
|
-
logger?.(
|
|
92
|
+
logger?.(error);
|
|
94
93
|
// this.pending.clear();
|
|
95
94
|
});
|
|
96
95
|
}
|
|
@@ -182,10 +181,10 @@ export default class ImapClient {
|
|
|
182
181
|
line: string,
|
|
183
182
|
transformer?: (tx: IImapResponse) => T, log = true): Promise<T> {
|
|
184
183
|
const id = `X${(this.id++).toString(16)}`;
|
|
185
|
-
const rp = PromiseFactory.create();
|
|
186
|
-
this.pending.set(id, rp);
|
|
187
184
|
await this.socket.writeLine(`${id} ${line}`, { log });
|
|
188
|
-
const r = await
|
|
185
|
+
const r = await new Promise((resolve, reject) => {
|
|
186
|
+
this.pending.set(id, { resolve, reject });
|
|
187
|
+
});
|
|
189
188
|
if (transformer) {
|
|
190
189
|
return transformer(r as any);
|
|
191
190
|
}
|
|
@@ -3,7 +3,6 @@ import EventSet from "@entity-access/entity-access/dist/common/EventSet.js";
|
|
|
3
3
|
import tls, { TLSSocket } from "tls";
|
|
4
4
|
import TimeoutError from "../../../common/errors/TimeoutError.js";
|
|
5
5
|
import { AsyncSocketReader } from "./AsyncSocketReader.js";
|
|
6
|
-
import PromiseFactory from "../../../common/PromiseFactory.js";
|
|
7
6
|
|
|
8
7
|
export default class SocketClient {
|
|
9
8
|
|
|
@@ -20,12 +19,12 @@ export default class SocketClient {
|
|
|
20
19
|
|
|
21
20
|
c.once("error", (error) => {
|
|
22
21
|
logger?.(error);
|
|
22
|
+
reject(error);
|
|
23
23
|
try {
|
|
24
24
|
c.destroy(error);
|
|
25
25
|
} catch {
|
|
26
26
|
// ignore
|
|
27
27
|
}
|
|
28
|
-
reject(error);
|
|
29
28
|
});
|
|
30
29
|
c.once("close", () => {
|
|
31
30
|
try {
|
|
@@ -37,12 +36,12 @@ export default class SocketClient {
|
|
|
37
36
|
const timeout = () => {
|
|
38
37
|
const e1 = new TimeoutError(`Timeout for ${servername}(${host})`);
|
|
39
38
|
logger?.(e1);
|
|
39
|
+
reject(e1);
|
|
40
40
|
try {
|
|
41
41
|
c.destroy(e1);
|
|
42
42
|
} catch {
|
|
43
43
|
// ignore...
|
|
44
44
|
}
|
|
45
|
-
reject(e1);
|
|
46
45
|
};
|
|
47
46
|
c.once("timeout", timeout);
|
|
48
47
|
c.once("connect", () => {
|
|
@@ -153,22 +152,21 @@ export default class SocketClient {
|
|
|
153
152
|
this.destroy();
|
|
154
153
|
}
|
|
155
154
|
|
|
156
|
-
writeLine(line: string, { encoding = "ascii" as BufferEncoding, log = true} = {}) {
|
|
155
|
+
async writeLine(line: string, { encoding = "ascii" as BufferEncoding, log = true} = {}) {
|
|
157
156
|
if (log) {
|
|
158
157
|
this.logger(`>> ${line}`);
|
|
159
158
|
}
|
|
160
159
|
// following double callback will prevent
|
|
161
160
|
// allocating extra buffer
|
|
162
161
|
line += "\r\n";
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
162
|
+
await new Promise<void>((resolve, reject) => {
|
|
163
|
+
this.client.write(
|
|
164
|
+
line,
|
|
165
|
+
encoding,
|
|
166
|
+
(error) => error
|
|
167
|
+
? reject(error)
|
|
168
|
+
: resolve());
|
|
170
169
|
});
|
|
171
|
-
return rp.promise;
|
|
172
170
|
}
|
|
173
171
|
|
|
174
172
|
async readLine(encoding: BufferEncoding = "ascii", signal?: AbortSignal) {
|
|
@@ -200,7 +200,6 @@ export default class SyncMailboxWorkflow extends Workflow<any, any> {
|
|
|
200
200
|
const end = start + step;
|
|
201
201
|
|
|
202
202
|
// console.log(`Begin sync ${start} - ${end}`);
|
|
203
|
-
this.syncState.log.push(`Begin sync ${start} - ${end}`);
|
|
204
203
|
const range = await client.uidFetchRange({ start, end});
|
|
205
204
|
|
|
206
205
|
// const q = new AsyncQueue();
|
|
@@ -261,7 +260,7 @@ export default class SyncMailboxWorkflow extends Workflow<any, any> {
|
|
|
261
260
|
|
|
262
261
|
const result = await client.uidFetchRFC822(uid);
|
|
263
262
|
syncState.progress = (BigInt(syncState.progress) + 1n).toString();
|
|
264
|
-
|
|
263
|
+
// console.log(`Saving ${uid}`);
|
|
265
264
|
await serializer.saveRFC822(result.rfc822, {
|
|
266
265
|
externalEmailID: emailID,
|
|
267
266
|
localEmailID: existingEmail?.emailID,
|
|
@@ -275,7 +274,6 @@ export default class SyncMailboxWorkflow extends Workflow<any, any> {
|
|
|
275
274
|
if (cUID > currentLastUID && cUID < end) {
|
|
276
275
|
currentLastUID = cUID;
|
|
277
276
|
}
|
|
278
|
-
this.syncState.log.push(`Saved ${uid}`);
|
|
279
277
|
// console.log(`Saved ${uid}`);
|
|
280
278
|
}
|
|
281
279
|
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"PromiseFactory.d.ts","sourceRoot":"","sources":["../../src/common/PromiseFactory.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,OAAO,cAAc;WAEjB,MAAM,CAAC,CAAC,EAAE,OAAO,SAAQ;iBAEZ,OAAO,CAAC,CAAC,CAAC;iBACV,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI;gBACf,CAAC,CAAC,CAAC,KAAA,KAAK,IAAI;;CAgBzC"}
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
import TimeoutError from "./errors/TimeoutError.js";
|
|
2
|
-
export default class PromiseFactory {
|
|
3
|
-
static create(timeout = 30000) {
|
|
4
|
-
const r = {
|
|
5
|
-
promise: void 0,
|
|
6
|
-
resolve: void 0,
|
|
7
|
-
reject: void 0
|
|
8
|
-
};
|
|
9
|
-
r.promise = new Promise((resolve, reject) => {
|
|
10
|
-
const t = setTimeout(() => reject(new TimeoutError()), timeout);
|
|
11
|
-
r.resolve = (result) => {
|
|
12
|
-
clearTimeout(t);
|
|
13
|
-
resolve(result);
|
|
14
|
-
};
|
|
15
|
-
r.reject = (e) => {
|
|
16
|
-
clearTimeout(t);
|
|
17
|
-
reject(e);
|
|
18
|
-
};
|
|
19
|
-
});
|
|
20
|
-
return r;
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
//# sourceMappingURL=PromiseFactory.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"PromiseFactory.js","sourceRoot":"","sources":["../../src/common/PromiseFactory.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,0BAA0B,CAAC;AAEpD,MAAM,CAAC,OAAO,OAAO,cAAc;IAExB,MAAM,CAAC,MAAM,CAAI,OAAO,GAAG,KAAK;QACnC,MAAM,CAAC,GAAG;YACN,OAAO,EAAE,KAAK,CAAe;YAC7B,OAAO,EAAE,KAAK,CAAmB;YACjC,MAAM,EAAE,KAAK,CAAiB;SACjC,CAAC;QACF,CAAC,CAAC,OAAO,GAAG,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,MAAM,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;YAChE,CAAC,CAAC,OAAO,GAAG,CAAC,MAAM,EAAE,EAAE;gBACnB,YAAY,CAAC,CAAC,CAAC,CAAC;gBAChB,OAAO,CAAC,MAAM,CAAC,CAAC;YACpB,CAAC,CAAC;YACF,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE;gBACb,YAAY,CAAC,CAAC,CAAC,CAAC;gBAChB,MAAM,CAAC,CAAC,CAAC,CAAC;YACd,CAAC,CAAC;QACN,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,CAAC;IACb,CAAC;CAEJ"}
|
|
@@ -1,25 +0,0 @@
|
|
|
1
|
-
import TimeoutError from "./errors/TimeoutError.js";
|
|
2
|
-
|
|
3
|
-
export default class PromiseFactory {
|
|
4
|
-
|
|
5
|
-
public static create<T>(timeout = 30000) {
|
|
6
|
-
const r = {
|
|
7
|
-
promise: void 0 as Promise<T>,
|
|
8
|
-
resolve: void 0 as (x: T) => void,
|
|
9
|
-
reject: void 0 as (e?) => void
|
|
10
|
-
};
|
|
11
|
-
r.promise = new Promise<T>((resolve, reject) => {
|
|
12
|
-
const t = setTimeout(() => reject(new TimeoutError()), timeout);
|
|
13
|
-
r.resolve = (result) => {
|
|
14
|
-
clearTimeout(t);
|
|
15
|
-
resolve(result);
|
|
16
|
-
};
|
|
17
|
-
r.reject = (e) => {
|
|
18
|
-
clearTimeout(t);
|
|
19
|
-
reject(e);
|
|
20
|
-
};
|
|
21
|
-
});
|
|
22
|
-
return r;
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
}
|