@social-mail/social-mail-web-server 1.16.95 → 1.16.98
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/server/workflows/smtp/MailDispatcherService.d.ts +2 -0
- package/dist/server/workflows/smtp/MailDispatcherService.d.ts.map +1 -1
- package/dist/server/workflows/smtp/MailDispatcherService.js +17 -0
- package/dist/server/workflows/smtp/MailDispatcherService.js.map +1 -1
- package/dist/wwwroot/routes/social-mail/api/v1/queue-mail/post.d.ts.map +1 -1
- package/dist/wwwroot/routes/social-mail/api/v1/queue-mail/post.js +1 -0
- package/dist/wwwroot/routes/social-mail/api/v1/queue-mail/post.js.map +1 -1
- package/package.json +1 -1
- package/src/server/workflows/smtp/MailDispatcherService.ts +18 -0
- package/src/wwwroot/routes/social-mail/api/v1/queue-mail/post.tsx +2 -0
|
@@ -8,6 +8,7 @@ import CachedEmailService from "../../smtp/services/CachedEmailService.js";
|
|
|
8
8
|
import EncryptionService from "../../services/encryption/EncryptionService.js";
|
|
9
9
|
import { IMessageEnvelope } from "./IMessageEnvelope.js";
|
|
10
10
|
import BlogContentTransformer from "../../services/dom/BlogContentTransformer.js";
|
|
11
|
+
import EmailParserService from "../../smtp/services/EmailParserService.js";
|
|
11
12
|
export default class MailDispatcherService {
|
|
12
13
|
db: SocialMailContext;
|
|
13
14
|
tfs: TempFileService;
|
|
@@ -17,6 +18,7 @@ export default class MailDispatcherService {
|
|
|
17
18
|
cachedEmailService: CachedEmailService;
|
|
18
19
|
encryptionService: EncryptionService;
|
|
19
20
|
blogContentTransformer: BlogContentTransformer;
|
|
21
|
+
eps: EmailParserService;
|
|
20
22
|
encodeForBulk({ senderID, emailID, recipientAddressID, activityID, accessCode, external, listID, from, saveHeadersOnly }: IMessageEnvelope): Promise<number>;
|
|
21
23
|
signFile({ emailID, senderID, file, recipientID, saveHeadersOnly }: {
|
|
22
24
|
emailID: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MailDispatcherService.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/MailDispatcherService.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAKjE,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,aAAa,MAAM,qCAAqC,CAAC;AAGhE,OAAO,eAAe,MAAM,8CAA8C,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC/E,OAAO,kBAAkB,MAAM,2CAA2C,CAAC;AAI3E,OAAO,iBAAiB,MAAM,gDAAgD,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,sBAAsB,MAAM,8CAA8C,CAAC;
|
|
1
|
+
{"version":3,"file":"MailDispatcherService.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/MailDispatcherService.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAKjE,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,aAAa,MAAM,qCAAqC,CAAC;AAGhE,OAAO,eAAe,MAAM,8CAA8C,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC/E,OAAO,kBAAkB,MAAM,2CAA2C,CAAC;AAI3E,OAAO,iBAAiB,MAAM,gDAAgD,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,sBAAsB,MAAM,8CAA8C,CAAC;AAElF,OAAO,kBAAkB,MAAM,2CAA2C,CAAC;AAG3E,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAGtC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,GAAG,EAAE,eAAe,CAAC;IAGrB,OAAO,EAAE,WAAW,CAAC;IAGrB,eAAe,EAAE,eAAe,CAAC;IAGjC,aAAa,EAAE,aAAa,CAAC;IAG7B,kBAAkB,EAAE,kBAAkB,CAAC;IAGvC,iBAAiB,EAAE,iBAAiB,CAAC;IAGrC,sBAAsB,EAAE,sBAAsB,CAAC;IAG/C,GAAG,EAAE,kBAAkB,CAAC;IAElB,aAAa,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,EAC1H,gBAAgB;IA4Md,QAAQ,CAAC,EACX,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,WAAW,EACX,eAAe,EAClB,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,WAAW,MAAC;QAAC,QAAQ,MAAC;QAAC,IAAI,EAAE,SAAS,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE;IA8BnF,MAAM,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,SAAkB,EAAE;;;;;;;;;KAAA;CA+BlG"}
|
|
@@ -24,6 +24,7 @@ import DomainKeyService from "../../services/domain-keys/DomainKeyService.js";
|
|
|
24
24
|
import EncryptionService from "../../services/encryption/EncryptionService.js";
|
|
25
25
|
import BlogContentTransformer from "../../services/dom/BlogContentTransformer.js";
|
|
26
26
|
import { SafeFileName } from "../../../common/SafeFileName.js";
|
|
27
|
+
import EmailParserService from "../../smtp/services/EmailParserService.js";
|
|
27
28
|
let MailDispatcherService = class MailDispatcherService {
|
|
28
29
|
async encodeForBulk({ senderID, emailID, recipientAddressID, activityID, accessCode, external, listID, from, saveHeadersOnly }) {
|
|
29
30
|
const { db, tfs } = this;
|
|
@@ -46,6 +47,7 @@ let MailDispatcherService = class MailDispatcherService {
|
|
|
46
47
|
const q = db.emails.where({ emailID }, (x, p) => x.emailID === p.emailID);
|
|
47
48
|
const email = await q
|
|
48
49
|
.include((x) => [
|
|
50
|
+
x.mimeFile,
|
|
49
51
|
x.senderEmail.mailbox.emailAddress,
|
|
50
52
|
x.recipients.forEach((r) => r.emailAddress),
|
|
51
53
|
x.attachments.forEach((a) => a.fileContent)
|
|
@@ -159,6 +161,17 @@ let MailDispatcherService = class MailDispatcherService {
|
|
|
159
161
|
if (replyTo) {
|
|
160
162
|
delete headers.replyTo;
|
|
161
163
|
}
|
|
164
|
+
if (email.mimeFile && email.doNotTrack) {
|
|
165
|
+
const ef = await this.emailLogService.load(email.mimeFile);
|
|
166
|
+
const parsed = await this.eps.parse(ef);
|
|
167
|
+
for (const h of parsed.headerLines) {
|
|
168
|
+
if (headers[h.key]) {
|
|
169
|
+
continue;
|
|
170
|
+
}
|
|
171
|
+
headers[h.key] = h.line;
|
|
172
|
+
}
|
|
173
|
+
// we need to copy attachments...
|
|
174
|
+
}
|
|
162
175
|
// prepare transport...
|
|
163
176
|
const mail = new MailComposer({
|
|
164
177
|
from: { name: email.senderName, address: fromAddress },
|
|
@@ -264,6 +277,10 @@ __decorate([
|
|
|
264
277
|
Inject,
|
|
265
278
|
__metadata("design:type", BlogContentTransformer)
|
|
266
279
|
], MailDispatcherService.prototype, "blogContentTransformer", void 0);
|
|
280
|
+
__decorate([
|
|
281
|
+
Inject,
|
|
282
|
+
__metadata("design:type", EmailParserService)
|
|
283
|
+
], MailDispatcherService.prototype, "eps", void 0);
|
|
267
284
|
MailDispatcherService = __decorate([
|
|
268
285
|
RegisterScoped
|
|
269
286
|
], MailDispatcherService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MailDispatcherService.js","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/MailDispatcherService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACrG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAEjE,OAAO,IAAI,MAAM,8BAA8B,CAAC;AAChD,OAAO,YAAY,MAAM,uCAAuC,CAAC;AAEjE,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,aAAa,MAAM,qCAAqC,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,eAAe,MAAM,8CAA8C,CAAC;AAE3E,OAAO,kBAAkB,MAAM,2CAA2C,CAAC;AAC3E,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,gBAAgB,MAAM,gDAAgD,CAAC;AAC9E,OAAO,iBAAiB,MAAM,gDAAgD,CAAC;AAE/E,OAAO,sBAAsB,MAAM,8CAA8C,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"MailDispatcherService.js","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/MailDispatcherService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/api/v1/queue-mail/post.tsx"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AACpF,OAAO,mBAAmB,MAAM,0DAA0D,CAAC;AAC3F,OAAO,eAAe,MAAM,iEAAiE,CAAC;AAC9F,OAAO,kBAAkB,MAAM,8DAA8D,CAAC;AAK9F,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,GAAG,EAAE,mBAAmB,CAAC;IAGzB,GAAG,EAAE,eAAe,CAAC;IAGrB,GAAG,EAAE,kBAAkB,CAAC;IAGlB,GAAG;
|
|
1
|
+
{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/api/v1/queue-mail/post.tsx"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AACpF,OAAO,mBAAmB,MAAM,0DAA0D,CAAC;AAC3F,OAAO,eAAe,MAAM,iEAAiE,CAAC;AAC9F,OAAO,kBAAkB,MAAM,8DAA8D,CAAC;AAK9F,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,GAAG,EAAE,mBAAmB,CAAC;IAGzB,GAAG,EAAE,eAAe,CAAC;IAGrB,GAAG,EAAE,kBAAkB,CAAC;IAGlB,GAAG;CA0EZ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"post.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/api/v1/queue-mail/post.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,wDAAwD,CAAC;AACjF,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AACpF,OAAO,mBAAmB,MAAM,0DAA0D,CAAC;AAC3F,OAAO,eAAe,MAAM,iEAAiE,CAAC;AAC9F,OAAO,kBAAkB,MAAM,8DAA8D,CAAC;AAC9F,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAI5D,gBAAA,KAAM,SAAQ,IAAI;IAe7B,KAAK,CAAC,GAAG;QAEL,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QAElC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QACnC,MAAM,UAAU,GAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtE,8CAA8C;QAE9C,4DAA4D;QAC5D,wCAAwC;QACxC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEhC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;QAE9D,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QAEvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAEhD,MAAM,OAAO,GAAG,EAAE,CAAC;QAEnB,MAAM,WAAW,GAAG;YAChB,kBAAkB;YAClB,uBAAuB;YACvB,aAAa;YACb,aAAa;YACb,UAAU;YACV,0BAA0B;SAC7B,CAAC;QAEF,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,KAAI,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;YACzB,MAAM,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAQ,CAAC;YACvC,IAAI,CAAC,EAAE,CAAC;gBACJ,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;gBAC1B,QAAO,CAAC,EAAE,CAAC;oBACP,KAAK,kBAAkB,CAAC;oBACxB,KAAK,uBAAuB;wBACxB,WAAW,GAAG,IAAI,CAAC;wBACnB,MAAM;gBACd,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO,CAAC,0BAA0B,CAAC,KAAK,KAAK,CAAC;QAE9C,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;QAEzB,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;YAC7B,QAAQ,EAAE,MAAM,CAAC,SAAS;YAC1B,UAAU,EAAE,CAAC,CAAC,KAAK;YACnB,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC;gBAC1D,gBAAgB,EAAE,CAAC;gBACnB,IAAI,EAAE,IAAI;aACb,CAAC,CAAC;YACH,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,WAAW,EAAE,GAAG;YAChB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YAChC,QAAQ,EAAE,MAAM,CAAC,IAAI;YACrB,QAAQ,EAAE,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,UAAU;YAC1C,MAAM,EAAE,WAAW;YACnB,UAAU,EAAE,IAAI;YAChB,WAAW;YACX,QAAQ,EAAE,GAAG;SAChB,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC;QAE5B,OAAO,IAAI,CAAC,IAAI,CAAC;YACb,EAAE,EAAE,KAAK,CAAC,OAAO;SACpB,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;
|
|
1
|
+
{"version":3,"file":"post.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/api/v1/queue-mail/post.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -19,6 +19,7 @@ import EncryptionService from "../../services/encryption/EncryptionService.js";
|
|
|
19
19
|
import { IMessageEnvelope } from "./IMessageEnvelope.js";
|
|
20
20
|
import BlogContentTransformer from "../../services/dom/BlogContentTransformer.js";
|
|
21
21
|
import { SafeFileName } from "../../../common/SafeFileName.js";
|
|
22
|
+
import EmailParserService from "../../smtp/services/EmailParserService.js";
|
|
22
23
|
|
|
23
24
|
@RegisterScoped
|
|
24
25
|
export default class MailDispatcherService {
|
|
@@ -47,6 +48,9 @@ export default class MailDispatcherService {
|
|
|
47
48
|
@Inject
|
|
48
49
|
blogContentTransformer: BlogContentTransformer;
|
|
49
50
|
|
|
51
|
+
@Inject
|
|
52
|
+
eps: EmailParserService;
|
|
53
|
+
|
|
50
54
|
async encodeForBulk({ senderID, emailID, recipientAddressID, activityID, accessCode, external, listID, from, saveHeadersOnly }:
|
|
51
55
|
IMessageEnvelope) {
|
|
52
56
|
const { db, tfs } = this;
|
|
@@ -73,6 +77,7 @@ export default class MailDispatcherService {
|
|
|
73
77
|
|
|
74
78
|
const email = await q
|
|
75
79
|
.include((x) => [
|
|
80
|
+
x.mimeFile,
|
|
76
81
|
x.senderEmail.mailbox.emailAddress,
|
|
77
82
|
x.recipients.forEach((r) => r.emailAddress),
|
|
78
83
|
x.attachments.forEach((a) => a.fileContent)
|
|
@@ -212,6 +217,19 @@ export default class MailDispatcherService {
|
|
|
212
217
|
delete headers.replyTo;
|
|
213
218
|
}
|
|
214
219
|
|
|
220
|
+
if (email.mimeFile && email.doNotTrack) {
|
|
221
|
+
const ef = await this.emailLogService.load(email.mimeFile);
|
|
222
|
+
const parsed = await this.eps.parse(ef);
|
|
223
|
+
for(const h of parsed.headerLines) {
|
|
224
|
+
if(headers[h.key]) {
|
|
225
|
+
continue;
|
|
226
|
+
}
|
|
227
|
+
headers[h.key] = h.line;
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
// we need to copy attachments...
|
|
231
|
+
}
|
|
232
|
+
|
|
215
233
|
// prepare transport...
|
|
216
234
|
const mail = new MailComposer({
|
|
217
235
|
from: { name: email.senderName, address: fromAddress },
|