@social-mail/social-mail-web-server 1.8.102 → 1.8.104
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/RegExpExtra.js +1 -1
- package/dist/protocols/core/RegExpExtra.js.map +1 -1
- package/dist/server/services/dom/BlogContentTransformer.d.ts.map +1 -1
- package/dist/server/services/dom/BlogContentTransformer.js +6 -0
- package/dist/server/services/dom/BlogContentTransformer.js.map +1 -1
- package/dist/server/services/dom/HtmlTransform.d.ts +3 -0
- package/dist/server/services/dom/HtmlTransform.d.ts.map +1 -1
- package/dist/server/services/dom/HtmlTransform.js +26 -21
- package/dist/server/services/dom/HtmlTransform.js.map +1 -1
- package/dist/server/smtp/services/CachedEmailService.js +2 -2
- package/dist/server/smtp/services/CachedEmailService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/protocols/core/RegExpExtra.ts +1 -1
- package/src/server/services/dom/BlogContentTransformer.tsx +7 -0
- package/src/server/services/dom/HtmlTransform.tsx +11 -3
- package/src/server/smtp/services/CachedEmailService.ts +2 -2
|
@@ -51,7 +51,7 @@ export const RegExpExtra = {
|
|
|
51
51
|
// }
|
|
52
52
|
const tag = match[4];
|
|
53
53
|
if (tag) {
|
|
54
|
-
return `<a href="/${blog}/tag/${tag.substring(1)}" hash-tag={tag}>${tag}</a>`;
|
|
54
|
+
return `<a href="/${blog}/tag/${tag.substring(1)}" hash-tag="${tag}">${tag}</a>`;
|
|
55
55
|
}
|
|
56
56
|
const t = (m[0].padEnd(m.length, "*") + "@");
|
|
57
57
|
return t;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RegExpExtra.js","sourceRoot":"","sources":["../../../src/protocols/core/RegExpExtra.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAIjE,MAAM,CAAC,MAAM,WAAW,GAAG;IAEvB,UAAU,CAAC,IAAY,EAAE,MAAc,EAAE,WAA2C;QAChF,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,KAAI,MAAM,KAAK,IAAI,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;YAChD,CAAC,IAAI,WAAW,CAAC,KAAY,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,CAAC,CAAC;IACb,CAAC;IAED,YAAY,CAAC,KAAa,EAAE,IAAI,GAAG,EAAE;QACjC,OAAO,WAAW,CAAC,UAAU,CACzB,KAAK,EACL,sHAAsH,EACtH,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;YAChB,IAAI,IAAI,EAAE,CAAC;gBACP,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACnB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACtB,IAAI,IAAI,EAAE,CAAC;gBACP,OAAO,mBAAmB,IAAI,KAAK,CAAC,SAAS,CAAC;YAClD,CAAC;YACD,0BAA0B;YAC1B,4CAA4C;YAC5C,oBAAoB;YACpB,IAAI;YACJ,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACrB,IAAI,GAAG,EAAE,CAAC;gBACN,IAAI,IAAI,EAAE,CAAC;oBACP,OAAO,aAAa,IAAI,QAAQ,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,GAAG,KAAK,GAAG,MAAM,CAAC;gBACrF,CAAC;gBACD,OAAO,aAAa,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,GAAG,KAAK,GAAG,MAAM,CAAC;YACzE,CAAC;YACD,IAAI,CAAC,IAAI,EAAE,CAAC;gBACR,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;YAC7C,OAAO,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACP,CAAC;IAED,mBAAmB,CAAC,KAAa,EAAE,IAAI,GAAG,EAAE;QACxC,OAAO,WAAW,CAAC,UAAU,CACzB,KAAK,EACL,sHAAsH,EACtH,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;YAChB,IAAI,IAAI,EAAE,CAAC;gBACP,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACnB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACtB,IAAI,IAAI,EAAE,CAAC;gBACP,OAAO,mBAAmB,IAAI,KAAK,CAAC,SAAS,CAAC;YAClD,CAAC;YACD,0BAA0B;YAC1B,4CAA4C;YAC5C,oBAAoB;YACpB,IAAI;YACJ,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACrB,IAAI,GAAG,EAAE,CAAC;gBACN,OAAO,aAAa,IAAI,QAAQ,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"RegExpExtra.js","sourceRoot":"","sources":["../../../src/protocols/core/RegExpExtra.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;IA0HK,aAAa,CAAC,OAAO,KAAA,EAAE,GAAG,KAAA;IAQ1B,YAAY,CAAC,CAAC,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE;;;KAAA;CA6B/D"}
|
|
@@ -58,6 +58,12 @@ let BlogContentTransformer = class BlogContentTransformer {
|
|
|
58
58
|
await this.updateStream(c, { emailID, eDomain });
|
|
59
59
|
return;
|
|
60
60
|
}
|
|
61
|
+
const hashTag = element.getAttribute("hash-tag");
|
|
62
|
+
if (hashTag) {
|
|
63
|
+
if (element.tagName === "A") {
|
|
64
|
+
element.setAttribute("href", `/${blog}/tag/${hashTag.replace(/^#+/, "")}`);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
61
67
|
// check for cid:
|
|
62
68
|
for (const a of c.iterateAttributes(["src", "href"])) {
|
|
63
69
|
if (!a.value?.startsWith("cid:")) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BlogContentTransformer.js","sourceRoot":"","sources":["../../../../src/server/services/dom/BlogContentTransformer.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AACpF,OAAO,aAAmC,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,iBAAiB,MAAM,oCAAoC,CAAC;AACnE,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,KAAK,MAAM,gDAAgD,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACnD,OAAO,aAAa,MAAM,0CAA0C,CAAC;AAErE,MAAM,iBAAiB,GAAG,EAAE,GAAC,IAAI,GAAC,IAAI,CAAC;AAGxB,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAA5B;QAWX,UAAK,GAAG,EAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"BlogContentTransformer.js","sourceRoot":"","sources":["../../../../src/server/services/dom/BlogContentTransformer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
export declare class TransformContext {
|
|
2
|
+
protected readonly document: any;
|
|
2
3
|
node: Node;
|
|
3
4
|
get element(): HTMLElement;
|
|
4
5
|
get isTextNode(): boolean;
|
|
5
6
|
get isElement(): boolean;
|
|
6
7
|
get nodeType(): "Element" | "TextNode";
|
|
7
8
|
private queueActions;
|
|
9
|
+
constructor(document: any);
|
|
8
10
|
remove: () => void;
|
|
9
11
|
queue: (x: () => void | Promise<void>) => void;
|
|
10
12
|
iterateAttributes(attributes: string[]): Generator<{
|
|
@@ -37,6 +39,7 @@ export declare class TransformContext {
|
|
|
37
39
|
export default class HtmlTransform {
|
|
38
40
|
readonly url: string;
|
|
39
41
|
readonly root: HTMLElement;
|
|
42
|
+
document: Document;
|
|
40
43
|
get html(): string;
|
|
41
44
|
constructor(html: string, url?: string);
|
|
42
45
|
run(transformer: (c: TransformContext) => void | Promise<void>): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HtmlTransform.d.ts","sourceRoot":"","sources":["../../../../src/server/services/dom/HtmlTransform.tsx"],"names":[],"mappings":"AAQA,qBAAa,gBAAgB;
|
|
1
|
+
{"version":3,"file":"HtmlTransform.d.ts","sourceRoot":"","sources":["../../../../src/server/services/dom/HtmlTransform.tsx"],"names":[],"mappings":"AAQA,qBAAa,gBAAgB;IA2Bb,SAAS,CAAC,QAAQ,CAAC,QAAQ;IAzBhC,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;gBAE7B,QAAQ,KAAA;IAIvC,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;aASY,GAAG;IAP7C,SAAgB,IAAI,EAAE,WAAW,CAAC;IAClC,QAAQ,EAAE,QAAQ,CAAC;IAEnB,IAAW,IAAI,WAEd;gBAEW,IAAI,EAAE,MAAM,EAAkB,GAAG,SAAa;IAUpD,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,gBAAgB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;CAcvE"}
|
|
@@ -56,7 +56,25 @@ import { globalEnv } from "../../../common/globalEnv.js";
|
|
|
56
56
|
import { descendentIterator } from "../../../common/html/Html.js";
|
|
57
57
|
const defaultUrl = `https://${globalEnv.host}`;
|
|
58
58
|
export class TransformContext {
|
|
59
|
-
|
|
59
|
+
get element() {
|
|
60
|
+
return this.node;
|
|
61
|
+
}
|
|
62
|
+
get isTextNode() {
|
|
63
|
+
return this.node.nodeType === 3;
|
|
64
|
+
}
|
|
65
|
+
get isElement() {
|
|
66
|
+
return this.node.nodeType === 1;
|
|
67
|
+
}
|
|
68
|
+
get nodeType() {
|
|
69
|
+
switch (this.node.nodeType) {
|
|
70
|
+
case 1:
|
|
71
|
+
return "TextNode";
|
|
72
|
+
case 3:
|
|
73
|
+
return "Element";
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
constructor(document) {
|
|
77
|
+
this.document = document;
|
|
60
78
|
this.queueActions = [];
|
|
61
79
|
this.remove = () => {
|
|
62
80
|
const node = this.node;
|
|
@@ -86,7 +104,7 @@ export class TransformContext {
|
|
|
86
104
|
this.replaceNodeWithHtml = (html) => {
|
|
87
105
|
const node = this.node;
|
|
88
106
|
this.queue(() => {
|
|
89
|
-
const div =
|
|
107
|
+
const div = this.document.createElement("div");
|
|
90
108
|
div.innerHTML = html;
|
|
91
109
|
const parent = node.parentNode;
|
|
92
110
|
let child = div.firstChild;
|
|
@@ -100,23 +118,6 @@ export class TransformContext {
|
|
|
100
118
|
});
|
|
101
119
|
};
|
|
102
120
|
}
|
|
103
|
-
get element() {
|
|
104
|
-
return this.node;
|
|
105
|
-
}
|
|
106
|
-
get isTextNode() {
|
|
107
|
-
return this.node.nodeType === 3;
|
|
108
|
-
}
|
|
109
|
-
get isElement() {
|
|
110
|
-
return this.node.nodeType === 1;
|
|
111
|
-
}
|
|
112
|
-
get nodeType() {
|
|
113
|
-
switch (this.node.nodeType) {
|
|
114
|
-
case 1:
|
|
115
|
-
return "TextNode";
|
|
116
|
-
case 3:
|
|
117
|
-
return "Element";
|
|
118
|
-
}
|
|
119
|
-
}
|
|
120
121
|
*iterateAttributes(attributes) {
|
|
121
122
|
const element = this.node;
|
|
122
123
|
for (const a of attributes) {
|
|
@@ -170,12 +171,16 @@ export default class HtmlTransform {
|
|
|
170
171
|
this.url = url;
|
|
171
172
|
const window = new JSDOM('', { url }).window;
|
|
172
173
|
const purify = DOMPurify(window);
|
|
173
|
-
this.root = purify.sanitize(html, {
|
|
174
|
+
this.root = purify.sanitize(html, {
|
|
175
|
+
ADD_ATTR: ["hash-tag"],
|
|
176
|
+
RETURN_DOM: true
|
|
177
|
+
});
|
|
178
|
+
this.document = window.document;
|
|
174
179
|
}
|
|
175
180
|
async run(transformer) {
|
|
176
181
|
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
177
182
|
try {
|
|
178
|
-
const c = __addDisposableResource(env_1, new TransformContext(), true);
|
|
183
|
+
const c = __addDisposableResource(env_1, new TransformContext(this.document), true);
|
|
179
184
|
for (const node of descendentIterator(this.root)) {
|
|
180
185
|
c.node = node;
|
|
181
186
|
const r = transformer(c);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HtmlTransform.js","sourceRoot":"","sources":["../../../../src/server/services/dom/HtmlTransform.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,MAAM,UAAU,GAAG,WAAW,SAAS,CAAC,IAAI,EAAE,CAAC;AAE/C,MAAM,OAAO,gBAAgB;
|
|
1
|
+
{"version":3,"file":"HtmlTransform.js","sourceRoot":"","sources":["../../../../src/server/services/dom/HtmlTransform.tsx"],"names":[],"mappings":"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"}
|
|
@@ -66,12 +66,12 @@ let CachedEmailService = class CachedEmailService {
|
|
|
66
66
|
return htmlFile;
|
|
67
67
|
};
|
|
68
68
|
const ef = await this.cacheService.get({
|
|
69
|
-
key: `cached-email-html-
|
|
69
|
+
key: `cached-email-html-b15-${emailID}-${senderDomain}`,
|
|
70
70
|
factory,
|
|
71
71
|
ttl: TimeSpan.fromDays(30)
|
|
72
72
|
});
|
|
73
73
|
return await ef.readAsText();
|
|
74
|
-
return (await factory()).readAsText();
|
|
74
|
+
// return (await factory()).readAsText();
|
|
75
75
|
}
|
|
76
76
|
getHtml(emailID, email) {
|
|
77
77
|
const factory = async () => {
|
|
@@ -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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"}
|