@social-mail/social-mail-web-server 1.8.94 → 1.8.96
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/protocols/core/EmailCommands.d.ts +16 -0
- package/dist/protocols/core/EmailCommands.d.ts.map +1 -0
- package/dist/protocols/core/EmailCommands.js +32 -0
- package/dist/protocols/core/EmailCommands.js.map +1 -0
- package/dist/protocols/core/ReactionExtractor.d.ts.map +1 -1
- package/dist/protocols/core/ReactionExtractor.js +10 -0
- package/dist/protocols/core/ReactionExtractor.js.map +1 -1
- package/dist/server/seed/ui/seed-ui.js +1 -1
- package/dist/server/services/dom/BlogContentTransformer.d.ts +14 -1
- package/dist/server/services/dom/BlogContentTransformer.d.ts.map +1 -1
- package/dist/server/services/dom/BlogContentTransformer.js +92 -6
- package/dist/server/services/dom/BlogContentTransformer.js.map +1 -1
- package/dist/server/services/dom/HtmlTransform.d.ts +1 -1
- package/dist/server/services/dom/HtmlTransform.d.ts.map +1 -1
- package/dist/server/services/dom/HtmlTransform.js.map +1 -1
- package/dist/server/smtp/services/CachedEmailService.d.ts +1 -1
- package/dist/server/smtp/services/CachedEmailService.d.ts.map +1 -1
- package/dist/server/smtp/services/CachedEmailService.js +7 -6
- package/dist/server/smtp/services/CachedEmailService.js.map +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 +31 -10
- package/dist/server/workflows/smtp/MailDispatcherService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/protocols/core/EmailCommands.ts +37 -0
- package/src/protocols/core/ReactionExtractor.ts +15 -0
- package/src/server/seed/ui/seed-ui.ts +1 -1
- package/src/server/services/dom/BlogContentTransformer.tsx +115 -8
- package/src/server/services/dom/HtmlTransform.tsx +2 -2
- package/src/server/smtp/services/CachedEmailService.ts +7 -6
- package/src/server/workflows/smtp/MailDispatcherService.ts +32 -11
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Email Commands is a message id of following format.
|
|
3
|
+
* `{emoji|commands}-k{base36(emailID)}-{messageID}`
|
|
4
|
+
* Command can only be from the following specified commands.
|
|
5
|
+
*/
|
|
6
|
+
export default class EmailCommands {
|
|
7
|
+
static commands: string[];
|
|
8
|
+
static encode({ emoji, command, emailID, kEmailID36, messageID }: {
|
|
9
|
+
emoji: any;
|
|
10
|
+
command?: any;
|
|
11
|
+
emailID?: any;
|
|
12
|
+
kEmailID36?: string;
|
|
13
|
+
messageID: any;
|
|
14
|
+
}): string;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=EmailCommands.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"EmailCommands.d.ts","sourceRoot":"","sources":["../../../src/protocols/core/EmailCommands.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,aAAa;IAC9B,MAAM,CAAC,QAAQ,WAST;IAEN,MAAM,CAAC,MAAM,CAAC,EACV,KAAK,EACL,OAAgB,EAChB,OAAgB,EAChB,UAAmC,EACnC,SAAS,EACZ;;;;;;KAAA;CAWJ"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { Base36 } from "../../common/Base36.js";
|
|
2
|
+
/**
|
|
3
|
+
* Email Commands is a message id of following format.
|
|
4
|
+
* `{emoji|commands}-k{base36(emailID)}-{messageID}`
|
|
5
|
+
* Command can only be from the following specified commands.
|
|
6
|
+
*/
|
|
7
|
+
class EmailCommands {
|
|
8
|
+
static encode({ emoji, command = void 0, emailID = void 0, kEmailID36 = Base36.encode(emailID), messageID }) {
|
|
9
|
+
if (command !== void 0) {
|
|
10
|
+
if (!this.commands.includes(command)) {
|
|
11
|
+
throw new Error("Invalid command " + command);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
else {
|
|
15
|
+
// it has to be valid emoji
|
|
16
|
+
command = emoji;
|
|
17
|
+
}
|
|
18
|
+
return `${command}-k${kEmailID36}-${messageID}`;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
EmailCommands.commands = [
|
|
22
|
+
"approve",
|
|
23
|
+
"publish",
|
|
24
|
+
"unpublish",
|
|
25
|
+
"delete",
|
|
26
|
+
"edit",
|
|
27
|
+
"decline",
|
|
28
|
+
"subscribe",
|
|
29
|
+
"unsubscribe"
|
|
30
|
+
];
|
|
31
|
+
export default EmailCommands;
|
|
32
|
+
//# sourceMappingURL=EmailCommands.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"EmailCommands.js","sourceRoot":"","sources":["../../../src/protocols/core/EmailCommands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD;;;;GAIG;AACH,MAAqB,aAAa;IAY9B,MAAM,CAAC,MAAM,CAAC,EACV,KAAK,EACL,OAAO,GAAG,KAAK,CAAC,EAChB,OAAO,GAAG,KAAK,CAAC,EAChB,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EACnC,SAAS,EACZ;QACG,IAAI,OAAO,KAAK,KAAK,CAAC,EAAE,CAAC;YACrB,IAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBAClC,MAAM,IAAI,KAAK,CAAC,kBAAkB,GAAG,OAAO,CAAC,CAAC;YAClD,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,2BAA2B;YAC3B,OAAO,GAAG,KAAK,CAAC;QACpB,CAAC;QACD,OAAO,GAAG,OAAO,KAAK,UAAU,IAAI,SAAS,EAAE,CAAC;IACpD,CAAC;;AA3BM,sBAAQ,GAAG;IACd,SAAS;IACT,SAAS;IACT,WAAW;IACX,QAAQ;IACR,MAAM;IACN,SAAS;IACT,WAAW;IACX,aAAa;CACZ,CAAC;eAVW,aAAa"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReactionExtractor.d.ts","sourceRoot":"","sources":["../../../src/protocols/core/ReactionExtractor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ReactionExtractor.d.ts","sourceRoot":"","sources":["../../../src/protocols/core/ReactionExtractor.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,iBAAiB;mBAEX;QACX,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,GAAG;YAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAC,CAAA;KACzC,qBAAqB,MAAM,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;gCAI5B;QAC9B,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,GAAG;YAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAC,CAAA;KACzC,qBAAqB,MAAM,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;;;;;;;;;;;;;CAwFjE,CAAC"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import EmailCommands from "./EmailCommands.js";
|
|
2
|
+
const cmd = new RegExp("^(?<engagement>\\p{Emoji}|" + EmailCommands.commands.join("|") + ")-k(?<emailID>[^-]){1,50}-(?<inReplyTo>.+)", "u");
|
|
1
3
|
export const ReactionExtractor = {
|
|
2
4
|
extract(email, attachmentsLoader, forceFullMatch = true) {
|
|
3
5
|
return this.extractWithInReplyTo(email, attachmentsLoader, forceFullMatch).then(({ engagement } = { engagement: void 0 }) => engagement);
|
|
@@ -7,6 +9,14 @@ export const ReactionExtractor = {
|
|
|
7
9
|
let inReplyTo = null;
|
|
8
10
|
let emailID = null;
|
|
9
11
|
let engagement;
|
|
12
|
+
const tokens = cmd.exec(email.subject);
|
|
13
|
+
if (tokens?.length && tokens.groups) {
|
|
14
|
+
const g = tokens.groups;
|
|
15
|
+
engagement = g.engagement;
|
|
16
|
+
emailID = g.emailID;
|
|
17
|
+
inReplyTo = g.inReplyTo;
|
|
18
|
+
return { engagement, inReplyTo, emailID };
|
|
19
|
+
}
|
|
10
20
|
let index = email.subject.indexOf(":");
|
|
11
21
|
if (index > 0 && index <= 50) {
|
|
12
22
|
engagement = email.subject.substring(0, index);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReactionExtractor.js","sourceRoot":"","sources":["../../../src/protocols/core/ReactionExtractor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ReactionExtractor.js","sourceRoot":"","sources":["../../../src/protocols/core/ReactionExtractor.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ export default async function seedUI(config) {
|
|
|
3
3
|
await config.saveVersion(UIPackageConfig, {
|
|
4
4
|
package: "@social-mail/social-mail-client",
|
|
5
5
|
view: "dist/web/AppIndex",
|
|
6
|
-
version: "1.8.
|
|
6
|
+
version: "1.8.276"
|
|
7
7
|
});
|
|
8
8
|
await config.saveVersion(WebComponentsPackageConfig, {
|
|
9
9
|
package: "@social-mail/web-components",
|
|
@@ -1,10 +1,13 @@
|
|
|
1
|
+
import { TransformContext } from "./HtmlTransform.js";
|
|
1
2
|
import SocialMailContext from "../../model/SocialMailContext.js";
|
|
3
|
+
import AppFile from "../../model/entities/AppFile.js";
|
|
2
4
|
import EncryptionService from "../encryption/EncryptionService.js";
|
|
3
5
|
import ChannelUrlService from "../channels/ChannelUrlService.js";
|
|
4
6
|
export default class BlogContentTransformer {
|
|
5
7
|
db: SocialMailContext;
|
|
6
8
|
ec: EncryptionService;
|
|
7
9
|
urlService: ChannelUrlService;
|
|
10
|
+
cache: Record<string, AppFile>;
|
|
8
11
|
/**
|
|
9
12
|
* This method replaces,
|
|
10
13
|
* 1. Images/Videos with absolute urls with CDN.
|
|
@@ -13,12 +16,22 @@ export default class BlogContentTransformer {
|
|
|
13
16
|
* 4. `cid` urls with absolute file url to avoid round trip by client.
|
|
14
17
|
* @param param0
|
|
15
18
|
*/
|
|
16
|
-
sanitizeExternalResources({ emailID, html, prefix, blog, senderDomain }: {
|
|
19
|
+
sanitizeExternalResources({ emailID, kEmailID36, html, prefix, blog, senderDomain, senderEmail, messageID, listID, trackerUrl }: {
|
|
17
20
|
emailID: any;
|
|
21
|
+
kEmailID36?: string;
|
|
18
22
|
html: any;
|
|
19
23
|
prefix: any;
|
|
20
24
|
blog?: any;
|
|
21
25
|
senderDomain?: string;
|
|
26
|
+
senderEmail?: any;
|
|
27
|
+
messageID: any;
|
|
28
|
+
listID?: any;
|
|
29
|
+
trackerUrl?: any;
|
|
22
30
|
}): Promise<string>;
|
|
31
|
+
getAttachment(emailID: any, cid: any): Promise<AppFile>;
|
|
32
|
+
updateStream(c: TransformContext, { emailID, eDomain }: {
|
|
33
|
+
emailID: any;
|
|
34
|
+
eDomain: any;
|
|
35
|
+
}): Promise<void>;
|
|
23
36
|
}
|
|
24
37
|
//# sourceMappingURL=BlogContentTransformer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BlogContentTransformer.d.ts","sourceRoot":"","sources":["../../../../src/server/services/dom/BlogContentTransformer.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BlogContentTransformer.d.ts","sourceRoot":"","sources":["../../../../src/server/services/dom/BlogContentTransformer.tsx"],"names":[],"mappings":"AAEA,OAAsB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAErE,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,OAAO,MAAM,iCAAiC,CAAC;AAEtD,OAAO,iBAAiB,MAAM,oCAAoC,CAAC;AACnE,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAQjE,MAAM,CAAC,OAAO,OAAO,sBAAsB;IAGvC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,EAAE,EAAE,iBAAiB,CAAC;IAGtB,UAAU,EAAE,iBAAiB,CAAC;IAE9B,KAAK,EAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEtC;;;;;;;OAOG;IACG,yBAAyB,CAAC,EAC5B,OAAO,EACP,UAAmC,EACnC,IAAI,EACJ,MAAM,EACN,IAAa,EACb,YAA6B,EAC7B,WAAoB,EACpB,SAAS,EACT,MAAe,EACf,UAAmB,EACtB;;;;;;;;;;;KAAA;IAmHK,aAAa,CAAC,OAAO,KAAA,EAAE,GAAG,KAAA;IAQ1B,YAAY,CAAC,CAAC,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE;;;KAAA;CA6B/D"}
|
|
@@ -7,6 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
+
/* eslint-disable no-console */
|
|
10
11
|
import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
|
|
11
12
|
import HtmlTransform from "./HtmlTransform.js";
|
|
12
13
|
import { RegExpExtra } from "../../../protocols/core/RegExpExtra.js";
|
|
@@ -14,7 +15,14 @@ import SocialMailContext from "../../model/SocialMailContext.js";
|
|
|
14
15
|
import { globalEnv } from "../../../common/globalEnv.js";
|
|
15
16
|
import EncryptionService from "../encryption/EncryptionService.js";
|
|
16
17
|
import ChannelUrlService from "../channels/ChannelUrlService.js";
|
|
18
|
+
import XNode from "@entity-access/server-pages/dist/html/XNode.js";
|
|
19
|
+
import { Base36 } from "../../../common/Base36.js";
|
|
20
|
+
import EmailCommands from "../../../protocols/core/EmailCommands.js";
|
|
21
|
+
const maxAttachmentSize = 25 * 1024 * 1024;
|
|
17
22
|
let BlogContentTransformer = class BlogContentTransformer {
|
|
23
|
+
constructor() {
|
|
24
|
+
this.cache = {};
|
|
25
|
+
}
|
|
18
26
|
/**
|
|
19
27
|
* This method replaces,
|
|
20
28
|
* 1. Images/Videos with absolute urls with CDN.
|
|
@@ -23,7 +31,7 @@ let BlogContentTransformer = class BlogContentTransformer {
|
|
|
23
31
|
* 4. `cid` urls with absolute file url to avoid round trip by client.
|
|
24
32
|
* @param param0
|
|
25
33
|
*/
|
|
26
|
-
async sanitizeExternalResources({ emailID, html, prefix, blog = void 0, senderDomain = globalEnv.host }) {
|
|
34
|
+
async sanitizeExternalResources({ emailID, kEmailID36 = Base36.encode(emailID), html, prefix, blog = void 0, senderDomain = globalEnv.host, senderEmail = void 0, messageID, listID = void 0, trackerUrl = void 0 }) {
|
|
27
35
|
const t = new HtmlTransform(html);
|
|
28
36
|
const eDomain = this.ec.general.encrypt(senderDomain);
|
|
29
37
|
const postID = this.ec.general.encrypt(emailID);
|
|
@@ -46,16 +54,16 @@ let BlogContentTransformer = class BlogContentTransformer {
|
|
|
46
54
|
}
|
|
47
55
|
c.replaceSrc(prefix);
|
|
48
56
|
c.replaceBackground(prefix);
|
|
49
|
-
|
|
57
|
+
if (element.getAttribute("data-stream-enabled")) {
|
|
58
|
+
await this.updateStream(c, { emailID, eDomain });
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
50
61
|
// check for cid:
|
|
51
62
|
for (const a of c.iterateAttributes(["src", "href"])) {
|
|
52
63
|
if (!a.value?.startsWith("cid:")) {
|
|
53
64
|
continue;
|
|
54
65
|
}
|
|
55
|
-
const
|
|
56
|
-
const cidTagged = `<${cid}>`;
|
|
57
|
-
const file = cached[cid] ??= await this.db.appFiles.where({ emailID, cid, cidTagged }, (p) => (x) => x.emailID === p.emailID && (x.contentID === p.cid || x.contentID === p.cidTagged))
|
|
58
|
-
.first();
|
|
66
|
+
const file = await this.getAttachment(emailID, a.value);
|
|
59
67
|
if (!file) {
|
|
60
68
|
continue;
|
|
61
69
|
}
|
|
@@ -64,6 +72,8 @@ let BlogContentTransformer = class BlogContentTransformer {
|
|
|
64
72
|
element.setAttribute(a.name, urlService.toWebMLinkUrl({ eDomain, postID, file }));
|
|
65
73
|
}
|
|
66
74
|
else {
|
|
75
|
+
// add poster url...
|
|
76
|
+
element.setAttribute("poster", urlService.toImageUrl({ eDomain, postID, file }));
|
|
67
77
|
element.setAttribute(a.name, urlService.toWebMUrl({ eDomain, postID, file }));
|
|
68
78
|
}
|
|
69
79
|
}
|
|
@@ -72,8 +82,84 @@ let BlogContentTransformer = class BlogContentTransformer {
|
|
|
72
82
|
}
|
|
73
83
|
}
|
|
74
84
|
});
|
|
85
|
+
if (trackerUrl) {
|
|
86
|
+
const clean = t.root;
|
|
87
|
+
let trackerImg = clean.querySelector(`*[data-social-mail-tracker]`);
|
|
88
|
+
if (!trackerImg) {
|
|
89
|
+
trackerImg = t.root.ownerDocument.createElement("img");
|
|
90
|
+
clean.appendChild(trackerImg);
|
|
91
|
+
}
|
|
92
|
+
trackerImg.setAttribute("data-social-mail-tracker", "tracker");
|
|
93
|
+
trackerImg.src = trackerUrl;
|
|
94
|
+
trackerImg.style.width = "1px";
|
|
95
|
+
trackerImg.style.height = "1px";
|
|
96
|
+
trackerImg.style.margin = "0";
|
|
97
|
+
trackerImg.style.opacity = "0";
|
|
98
|
+
}
|
|
99
|
+
const { root } = t;
|
|
100
|
+
if (listID) {
|
|
101
|
+
try {
|
|
102
|
+
let emojiBar = root.querySelector(`:not(blockquote,details) [data-social-mail-commands="emoji-bar"]`);
|
|
103
|
+
if (!emojiBar) {
|
|
104
|
+
emojiBar = root.ownerDocument.createElement("footer");
|
|
105
|
+
emojiBar.setAttribute("data-social-mail-commands", "emoji-bar");
|
|
106
|
+
root.ownerDocument.body.appendChild(emojiBar);
|
|
107
|
+
}
|
|
108
|
+
emojiBar.setAttribute("style", "border: solid 1px lightgray;border-radius: 9999px;padding: 2px;padding-left: 5px;" +
|
|
109
|
+
"padding-right: 5px;display: table;margin-top: 20px;width: 100%;box-sizing: border-box;");
|
|
110
|
+
const emojiButton = (emoji, label = "", { body = emoji, mail = emoji, style = "" } = {}) => (XNode.create("a", { href: `mailto:${senderEmail}?subject=${EmailCommands.encode({ emoji, kEmailID36, messageID })}&body=${body}&in-reply-to=${messageID}`, title: label, style: "border-radius:9999px;padding:2px;padding-left:5px;padding-right:5px;text-decoration:none;" + style },
|
|
111
|
+
XNode.create("emoji-button", { emoji: emoji },
|
|
112
|
+
emoji,
|
|
113
|
+
label))).render();
|
|
114
|
+
emojiBar.innerHTML = `
|
|
115
|
+
${emojiButton("🙂")}
|
|
116
|
+
${emojiButton("👍")}
|
|
117
|
+
${emojiButton("✅")}
|
|
118
|
+
${emojiButton("💬", "Reply", { body: "" })}
|
|
119
|
+
${emojiButton("❌", "Unsubscribe", { style: "display:table-cell; text-align: right;" })}
|
|
120
|
+
`;
|
|
121
|
+
}
|
|
122
|
+
catch (error) {
|
|
123
|
+
console.error(error);
|
|
124
|
+
}
|
|
125
|
+
}
|
|
75
126
|
return t.html;
|
|
76
127
|
}
|
|
128
|
+
async getAttachment(emailID, cid) {
|
|
129
|
+
cid = cid.split(":").pop();
|
|
130
|
+
const cidTagged = `<${cid}>`;
|
|
131
|
+
return this.cache[cid] ??= await this.db.appFiles.where({ emailID, cid, cidTagged }, (p) => (x) => x.emailID === p.emailID && (x.contentID === p.cid || x.contentID === p.cidTagged))
|
|
132
|
+
.first();
|
|
133
|
+
}
|
|
134
|
+
async updateStream(c, { emailID, eDomain }) {
|
|
135
|
+
const e = c.element;
|
|
136
|
+
if (e.hasAttribute("data-stream-enabled")) {
|
|
137
|
+
const contentID = e.getAttribute("data-content-id");
|
|
138
|
+
if (contentID) {
|
|
139
|
+
const file = await this.getAttachment(emailID, contentID);
|
|
140
|
+
if (file) {
|
|
141
|
+
const { urlService } = this;
|
|
142
|
+
switch (e.tagName) {
|
|
143
|
+
case "A":
|
|
144
|
+
e.setAttribute("href", urlService.toWebMLinkUrl({ eDomain, file }));
|
|
145
|
+
break;
|
|
146
|
+
case "VIDEO":
|
|
147
|
+
if (file.fileSize > maxAttachmentSize) {
|
|
148
|
+
e.setAttribute("src", urlService.toWebMUrl({ eDomain, file }));
|
|
149
|
+
}
|
|
150
|
+
else {
|
|
151
|
+
e.setAttribute("src", `cid:${contentID}`);
|
|
152
|
+
}
|
|
153
|
+
e.setAttribute("poster", urlService.toImageUrl({ eDomain, file }));
|
|
154
|
+
break;
|
|
155
|
+
// case "IMG":
|
|
156
|
+
// e.setAttribute("src", imgUrl);
|
|
157
|
+
// break;
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
}
|
|
77
163
|
};
|
|
78
164
|
__decorate([
|
|
79
165
|
Inject,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BlogContentTransformer.js","sourceRoot":"","sources":["../../../../src/server/services/dom/BlogContentTransformer.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AACpF,OAAO,
|
|
1
|
+
{"version":3,"file":"BlogContentTransformer.js","sourceRoot":"","sources":["../../../../src/server/services/dom/BlogContentTransformer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -36,8 +36,8 @@ export declare class TransformContext {
|
|
|
36
36
|
}
|
|
37
37
|
export default class HtmlTransform {
|
|
38
38
|
readonly url: string;
|
|
39
|
+
readonly root: HTMLElement;
|
|
39
40
|
get html(): string;
|
|
40
|
-
private root;
|
|
41
41
|
constructor(html: string, url?: string);
|
|
42
42
|
run(transformer: (c: TransformContext) => void | Promise<void>): Promise<void>;
|
|
43
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HtmlTransform.d.ts","sourceRoot":"","sources":["../../../../src/server/services/dom/HtmlTransform.tsx"],"names":[],"mappings":"AAQA,qBAAa,gBAAgB;IAElB,IAAI,EAAE,IAAI,CAAC;IAElB,IAAI,OAAO,IACa,WAAW,CAClC;IAED,IAAI,UAAU,YAEb;IAED,IAAI,SAAS,YAEZ;IAED,IAAI,QAAQ,2BAOX;IAED,OAAO,CAAC,YAAY,CAAwC;IAG5D,MAAM,aAGJ;IAEF,KAAK,GAAI,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,UAEpC;IAED,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE;;;;IAWvC;;;;;;;;;;;;;;;;;OAiBG;IACH,mBAAmB,GAAI,SAAI,UAezB;IAEF,iBAAiB,CAAC,MAAM,EAAE,GAAG;IAe7B,UAAU,CAAC,MAAM,EAAE,GAAG;IAchB,CAAC,MAAM,CAAC,YAAY,CAAC;CAQ9B;AAGD,MAAM,CAAC,OAAO,OAAO,aAAa;aAQY,GAAG;IAN7C,
|
|
1
|
+
{"version":3,"file":"HtmlTransform.d.ts","sourceRoot":"","sources":["../../../../src/server/services/dom/HtmlTransform.tsx"],"names":[],"mappings":"AAQA,qBAAa,gBAAgB;IAElB,IAAI,EAAE,IAAI,CAAC;IAElB,IAAI,OAAO,IACa,WAAW,CAClC;IAED,IAAI,UAAU,YAEb;IAED,IAAI,SAAS,YAEZ;IAED,IAAI,QAAQ,2BAOX;IAED,OAAO,CAAC,YAAY,CAAwC;IAG5D,MAAM,aAGJ;IAEF,KAAK,GAAI,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,UAEpC;IAED,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE;;;;IAWvC;;;;;;;;;;;;;;;;;OAiBG;IACH,mBAAmB,GAAI,SAAI,UAezB;IAEF,iBAAiB,CAAC,MAAM,EAAE,GAAG;IAe7B,UAAU,CAAC,MAAM,EAAE,GAAG;IAchB,CAAC,MAAM,CAAC,YAAY,CAAC;CAQ9B;AAGD,MAAM,CAAC,OAAO,OAAO,aAAa;aAQY,GAAG;IAN7C,SAAgB,IAAI,EAAE,WAAW,CAAC;IAElC,IAAW,IAAI,WAEd;gBAEW,IAAI,EAAE,MAAM,EAAkB,GAAG,SAAa;IAMpD,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,gBAAgB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;CAcvE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HtmlTransform.js","sourceRoot":"","sources":["../../../../src/server/services/dom/HtmlTransform.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"HtmlTransform.js","sourceRoot":"","sources":["../../../../src/server/services/dom/HtmlTransform.tsx"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export default class CachedEmailService {
|
|
|
11
11
|
encryptionService: EncryptionService;
|
|
12
12
|
getHtmlForRecipient({ emailID }: {
|
|
13
13
|
emailID: number;
|
|
14
|
-
}, blog?: string, senderDomain?: string): Promise<
|
|
14
|
+
}, blog?: string, senderDomain?: string): Promise<any>;
|
|
15
15
|
getHtml(emailID: number, email?: Email): any;
|
|
16
16
|
getHtmlText(email: Email): Promise<any>;
|
|
17
17
|
getEmailFile(emailID: number): Promise<LocalFile>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CachedEmailService.d.ts","sourceRoot":"","sources":["../../../../src/server/smtp/services/CachedEmailService.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAI/D,OAAO,YAAY,MAAM,sCAAsC,CAAC;AAChE,OAAO,EAAE,KAAK,EAAY,MAAM,+BAA+B,CAAC;AAEhE,OAAO,iBAAiB,MAAM,gDAAgD,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAK/E,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAGnC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,eAAe,EAAE,eAAe,CAAC;IAGjC,YAAY,EAAE,YAAY,CAAC;IAG3B,iBAAiB,EAAE,iBAAiB,CAAC;IAE/B,mBAAmB,CAAC,EAAE,OAAO,EAAE,EAAE;QACnC,OAAO,EAAE,MAAM,CAAA;KAClB,EAAE,IAAI,GAAE,MAAW,EAAE,YAAY,SAAiB;
|
|
1
|
+
{"version":3,"file":"CachedEmailService.d.ts","sourceRoot":"","sources":["../../../../src/server/smtp/services/CachedEmailService.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAI/D,OAAO,YAAY,MAAM,sCAAsC,CAAC;AAChE,OAAO,EAAE,KAAK,EAAY,MAAM,+BAA+B,CAAC;AAEhE,OAAO,iBAAiB,MAAM,gDAAgD,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAK/E,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAGnC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,eAAe,EAAE,eAAe,CAAC;IAGjC,YAAY,EAAE,YAAY,CAAC;IAG3B,iBAAiB,EAAE,iBAAiB,CAAC;IAE/B,mBAAmB,CAAC,EAAE,OAAO,EAAE,EAAE;QACnC,OAAO,EAAE,MAAM,CAAA;KAClB,EAAE,IAAI,GAAE,MAAW,EAAE,YAAY,SAAiB;IAgEnD,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK;IAwChC,WAAW,CAAC,KAAK,EAAE,KAAK;IAKxB,YAAY,CAAC,OAAO,EAAE,MAAM;IAe5B,GAAG,CAAC,OAAO,KAAA;CAIpB"}
|
|
@@ -56,6 +56,7 @@ let CachedEmailService = class CachedEmailService {
|
|
|
56
56
|
const result = await htmlService.sanitizeExternalResources({
|
|
57
57
|
html,
|
|
58
58
|
emailID,
|
|
59
|
+
messageID: void 0,
|
|
59
60
|
senderDomain,
|
|
60
61
|
prefix: `/api/emails/d/${ei}/${emailID}/`,
|
|
61
62
|
blog
|
|
@@ -64,12 +65,12 @@ let CachedEmailService = class CachedEmailService {
|
|
|
64
65
|
await htmlFile.writeAllText(result || "");
|
|
65
66
|
return htmlFile;
|
|
66
67
|
};
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
68
|
+
const ef = await this.cacheService.get({
|
|
69
|
+
key: `cached-email-html-b11-${emailID}-${senderDomain}`,
|
|
70
|
+
factory,
|
|
71
|
+
ttl: TimeSpan.fromDays(30)
|
|
72
|
+
});
|
|
73
|
+
return await ef.readAsText();
|
|
73
74
|
return (await factory()).readAsText();
|
|
74
75
|
}
|
|
75
76
|
getHtml(emailID, email) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CachedEmailService.js","sourceRoot":"","sources":["../../../../src/server/smtp/services/CachedEmailService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CachedEmailService.js","sourceRoot":"","sources":["../../../../src/server/smtp/services/CachedEmailService.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
|
|
|
7
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
|
+
import BlogContentTransformer from "../../services/dom/BlogContentTransformer.js";
|
|
10
11
|
export default class MailDispatcherService {
|
|
11
12
|
db: SocialMailContext;
|
|
12
13
|
tfs: TempFileService;
|
|
@@ -15,6 +16,7 @@ export default class MailDispatcherService {
|
|
|
15
16
|
htmlSanitizer: HtmlSanitizer;
|
|
16
17
|
cachedEmailService: CachedEmailService;
|
|
17
18
|
encryptionService: EncryptionService;
|
|
19
|
+
blogContentTransformer: BlogContentTransformer;
|
|
18
20
|
encodeForBulk({ senderID, emailID, recipientAddressID, activityID, accessCode, external, listID, from, saveHeadersOnly }: IMessageEnvelope): Promise<number>;
|
|
19
21
|
signFile({ emailID, senderID, file, recipientID, saveHeadersOnly }: {
|
|
20
22
|
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;
|
|
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;AAGlF,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;IAEzC,aAAa,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,EAC1H,gBAAgB;IAgLd,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"}
|
|
@@ -22,6 +22,7 @@ import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
|
|
|
22
22
|
import { randomUUID } from "node:crypto";
|
|
23
23
|
import DomainKeyService from "../../services/domain-keys/DomainKeyService.js";
|
|
24
24
|
import EncryptionService from "../../services/encryption/EncryptionService.js";
|
|
25
|
+
import BlogContentTransformer from "../../services/dom/BlogContentTransformer.js";
|
|
25
26
|
let MailDispatcherService = class MailDispatcherService {
|
|
26
27
|
async encodeForBulk({ senderID, emailID, recipientAddressID, activityID, accessCode, external, listID, from, saveHeadersOnly }) {
|
|
27
28
|
const { db, tfs, storage, htmlSanitizer } = this;
|
|
@@ -109,21 +110,37 @@ let MailDispatcherService = class MailDispatcherService {
|
|
|
109
110
|
inReplyTo = `<${inReplyTo}>`;
|
|
110
111
|
}
|
|
111
112
|
}
|
|
113
|
+
const messageID = email.headerMessageID;
|
|
112
114
|
let html = email.htmlBody ?? await this.cachedEmailService.getHtmlText(email);
|
|
113
115
|
if (html) {
|
|
114
|
-
const
|
|
115
|
-
|
|
116
|
+
const kEmailID36 = Base36.encode(emailID);
|
|
117
|
+
html = await this.blogContentTransformer.sanitizeExternalResources({
|
|
118
|
+
senderDomain: domainName,
|
|
119
|
+
emailID,
|
|
120
|
+
kEmailID36,
|
|
121
|
+
html,
|
|
116
122
|
senderEmail,
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
uid: Base36.encode(activityID),
|
|
120
|
-
accessCode,
|
|
121
|
-
postID,
|
|
122
|
-
attachments: email.attachments ?? [],
|
|
123
|
+
messageID,
|
|
124
|
+
prefix: void 0,
|
|
123
125
|
listID,
|
|
124
|
-
trackerUrl: `https://${globalEnv.host}/social-mail/social/t/${
|
|
126
|
+
trackerUrl: `https://${globalEnv.host}/social-mail/social/t/${kEmailID36}/${Base36.encode(activityID)}/`,
|
|
127
|
+
blog: senderEmail
|
|
125
128
|
});
|
|
126
|
-
|
|
129
|
+
// } else {
|
|
130
|
+
// const postID = this.encryptionService.general.encrypt(emailID.toString());
|
|
131
|
+
// const s = htmlSanitizer.sanitize(html, email.textBody, {
|
|
132
|
+
// senderEmail,
|
|
133
|
+
// emailID: Base36.encode(emailID),
|
|
134
|
+
// messageID: email.headerMessageID,
|
|
135
|
+
// uid: Base36.encode(activityID),
|
|
136
|
+
// accessCode,
|
|
137
|
+
// postID,
|
|
138
|
+
// attachments: email.attachments ?? [],
|
|
139
|
+
// listID,
|
|
140
|
+
// trackerUrl: `https://${globalEnv.host}/social-mail/social/t/${Base36.encode(emailID)}/${Base36.encode(activityID)}/`
|
|
141
|
+
// });
|
|
142
|
+
// html = s.html;
|
|
143
|
+
// }
|
|
127
144
|
}
|
|
128
145
|
const fromAddress = from ?? mb.emailAddress.emailAddress;
|
|
129
146
|
if (listID) {
|
|
@@ -231,6 +248,10 @@ __decorate([
|
|
|
231
248
|
Inject,
|
|
232
249
|
__metadata("design:type", EncryptionService)
|
|
233
250
|
], MailDispatcherService.prototype, "encryptionService", void 0);
|
|
251
|
+
__decorate([
|
|
252
|
+
Inject,
|
|
253
|
+
__metadata("design:type", BlogContentTransformer)
|
|
254
|
+
], MailDispatcherService.prototype, "blogContentTransformer", void 0);
|
|
234
255
|
MailDispatcherService = __decorate([
|
|
235
256
|
RegisterScoped
|
|
236
257
|
], 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;
|
|
1
|
+
{"version":3,"file":"MailDispatcherService.js","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/MailDispatcherService.ts"],"names":[],"mappings":"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"}
|