@social-mail/social-mail-web-server 1.8.479 → 1.8.481
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/server/services/html/HtmlForEmailService.d.ts +0 -7
- package/dist/server/services/html/HtmlForEmailService.d.ts.map +1 -1
- package/dist/server/services/html/HtmlForEmailService.js +63 -143
- package/dist/server/services/html/HtmlForEmailService.js.map +1 -1
- package/dist/server/services/puppeteer/PuppeteerService.d.ts +2 -1
- package/dist/server/services/puppeteer/PuppeteerService.d.ts.map +1 -1
- package/dist/server/services/puppeteer/PuppeteerService.js +2 -1
- package/dist/server/services/puppeteer/PuppeteerService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/wwwroot/routes/index.d.ts.map +1 -1
- package/dist/wwwroot/routes/index.js +0 -4
- package/dist/wwwroot/routes/index.js.map +1 -1
- package/package.json +1 -1
- package/src/server/services/html/HtmlForEmailService.ts +69 -165
- package/src/server/services/puppeteer/PuppeteerService.ts +2 -0
- package/src/wwwroot/routes/index.tsx +0 -5
|
@@ -1,13 +1,6 @@
|
|
|
1
|
-
import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
|
|
2
1
|
import SiteDiskContentCache from "../files/SiteDiskContentCache.js";
|
|
3
2
|
export default class HtmlForEmailService {
|
|
4
3
|
diskCache: SiteDiskContentCache;
|
|
5
|
-
prepare({ appFile, siteID, path, url }: {
|
|
6
|
-
appFile: LocalFile;
|
|
7
|
-
url: string;
|
|
8
|
-
siteID: any;
|
|
9
|
-
path: string[];
|
|
10
|
-
}): Promise<LocalFile>;
|
|
11
4
|
prepareHtml({ html, siteID, path, url }: {
|
|
12
5
|
html: string;
|
|
13
6
|
url: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HtmlForEmailService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/html/HtmlForEmailService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"HtmlForEmailService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/html/HtmlForEmailService.ts"],"names":[],"mappings":"AACA,OAAO,oBAAoB,MAAM,kCAAkC,CAAC;AAMpE,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAGpC,SAAS,EAAE,oBAAoB,CAAC;IAE1B,WAAW,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,MAAC;QAAC,IAAI,EAAE,MAAM,EAAE,CAAA;KAAE;CAWvG"}
|
|
@@ -7,27 +7,12 @@ 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 eqeqeq */
|
|
11
|
-
/* eslint-disable guard-for-in */
|
|
12
|
-
/* eslint-disable @typescript-eslint/prefer-for-of */
|
|
13
10
|
import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
|
|
14
11
|
import SiteDiskContentCache from "../files/SiteDiskContentCache.js";
|
|
15
|
-
import { join } from "path";
|
|
16
12
|
import { JSDOM } from 'jsdom';
|
|
13
|
+
import { fetch, Agent } from "undici";
|
|
14
|
+
import { lookup } from "dns";
|
|
17
15
|
let HtmlForEmailService = class HtmlForEmailService {
|
|
18
|
-
async prepare({ appFile, siteID, path, url }) {
|
|
19
|
-
return this.diskCache.htmlCache.getOrCreateAsync(join("for-email-10", siteID, ...path), async (dest) => {
|
|
20
|
-
let html = await appFile.readAsText();
|
|
21
|
-
const browser = new JSDOM(html, { url });
|
|
22
|
-
await new Promise((resolve, reject) => {
|
|
23
|
-
browser.window.addEventListener("load", () => {
|
|
24
|
-
void inlineCSS(browser.window, browser.window.document).then(resolve);
|
|
25
|
-
});
|
|
26
|
-
});
|
|
27
|
-
html = browser.window.document.documentElement.outerHTML;
|
|
28
|
-
await dest.writeAllText(html);
|
|
29
|
-
});
|
|
30
|
-
}
|
|
31
16
|
async prepareHtml({ html, siteID, path, url }) {
|
|
32
17
|
const browser = new JSDOM(html, { url });
|
|
33
18
|
await new Promise((resolve, reject) => {
|
|
@@ -48,79 +33,41 @@ HtmlForEmailService = __decorate([
|
|
|
48
33
|
], HtmlForEmailService);
|
|
49
34
|
export default HtmlForEmailService;
|
|
50
35
|
async function inlineCSS(window, document) {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
result += '\uFFFD';
|
|
77
|
-
continue;
|
|
78
|
-
}
|
|
79
|
-
if (
|
|
80
|
-
// If the character is in the range [\1-\1F] (U+0001 to U+001F) or is
|
|
81
|
-
// U+007F, […]
|
|
82
|
-
(codeUnit >= 0x0001 && codeUnit <= 0x001F) || codeUnit == 0x007F ||
|
|
83
|
-
// If the character is the first character and is in the range [0-9]
|
|
84
|
-
// (U+0030 to U+0039), […]
|
|
85
|
-
(index == 0 && codeUnit >= 0x0030 && codeUnit <= 0x0039) ||
|
|
86
|
-
// If the character is the second character and is in the range [0-9]
|
|
87
|
-
// (U+0030 to U+0039) and the first character is a `-` (U+002D), […]
|
|
88
|
-
(index == 1 &&
|
|
89
|
-
codeUnit >= 0x0030 && codeUnit <= 0x0039 &&
|
|
90
|
-
firstCodeUnit == 0x002D)) {
|
|
91
|
-
// https://drafts.csswg.org/cssom/#escape-a-character-as-code-point
|
|
92
|
-
result += '\\' + codeUnit.toString(16) + ' ';
|
|
93
|
-
continue;
|
|
94
|
-
}
|
|
95
|
-
// If the character is not handled by one of the above rules and is
|
|
96
|
-
// greater than or equal to U+0080, is `-` (U+002D) or `_` (U+005F), or
|
|
97
|
-
// is in one of the ranges [0-9] (U+0030 to U+0039), [A-Z] (U+0041 to
|
|
98
|
-
// U+005A), or [a-z] (U+0061 to U+007A), […]
|
|
99
|
-
if (codeUnit >= 0x0080 ||
|
|
100
|
-
codeUnit == 0x002D ||
|
|
101
|
-
codeUnit == 0x005F ||
|
|
102
|
-
codeUnit >= 0x0030 && codeUnit <= 0x0039 ||
|
|
103
|
-
codeUnit >= 0x0041 && codeUnit <= 0x005A ||
|
|
104
|
-
codeUnit >= 0x0061 && codeUnit <= 0x007A) {
|
|
105
|
-
// the character itself
|
|
106
|
-
result += text.charAt(index);
|
|
107
|
-
continue;
|
|
108
|
-
}
|
|
109
|
-
// Otherwise, the escaped character.
|
|
110
|
-
// https://drafts.csswg.org/cssom/#escape-a-character
|
|
111
|
-
result += '\\' + text.charAt(index);
|
|
36
|
+
const dispatcher = new Agent({
|
|
37
|
+
connect: {
|
|
38
|
+
lookup: (hostName, { all }, callback) => {
|
|
39
|
+
const cb = (error, result) => {
|
|
40
|
+
if (all) {
|
|
41
|
+
callback(error, [{
|
|
42
|
+
address: result,
|
|
43
|
+
family: 4
|
|
44
|
+
}]);
|
|
45
|
+
}
|
|
46
|
+
return callback(error, result, 4);
|
|
47
|
+
};
|
|
48
|
+
if (hostName.endsWith(".localhost")) {
|
|
49
|
+
// eslint-disable-next-line no-console
|
|
50
|
+
console.log(`Resolving ${hostName} to 192.168.0.123`);
|
|
51
|
+
cb(null, "192.168.0.123");
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
lookup(hostName, 4, (error, result) => {
|
|
55
|
+
// eslint-disable-next-line no-console
|
|
56
|
+
console.log(`Resolving ${hostName} to ${result}`);
|
|
57
|
+
cb(error, result);
|
|
58
|
+
});
|
|
59
|
+
},
|
|
60
|
+
family: 4
|
|
112
61
|
}
|
|
113
|
-
|
|
114
|
-
};
|
|
62
|
+
});
|
|
115
63
|
let id = Date.now();
|
|
116
64
|
async function flattenStyleSheets() {
|
|
117
|
-
const
|
|
65
|
+
const includes = document.querySelectorAll(`link[rel="stylesheet"]`);
|
|
118
66
|
const tasks = [];
|
|
119
67
|
const remove = [];
|
|
120
|
-
for (
|
|
121
|
-
const
|
|
122
|
-
|
|
123
|
-
tasks.push(fetch(href)
|
|
68
|
+
for (const styleSheet of includes.values()) {
|
|
69
|
+
const href = new URL(styleSheet.getAttribute("href"), window.location.href);
|
|
70
|
+
tasks.push(fetch(href.toString(), { dispatcher })
|
|
124
71
|
.then((x) => x.text())
|
|
125
72
|
.then((text) => ({ styleSheet, text })));
|
|
126
73
|
remove.push(styleSheet);
|
|
@@ -135,10 +82,8 @@ async function inlineCSS(window, document) {
|
|
|
135
82
|
}
|
|
136
83
|
const adoptedStyle = document.createElement("style");
|
|
137
84
|
const map = new Set();
|
|
138
|
-
const all = document.querySelectorAll("*");
|
|
139
85
|
const styles = [];
|
|
140
|
-
for (
|
|
141
|
-
const e = all[i];
|
|
86
|
+
for (const e of document.querySelectorAll(`body,body *`).values()) {
|
|
142
87
|
for (const name of e.getAttributeNames()) {
|
|
143
88
|
if (name.startsWith("styler-")) {
|
|
144
89
|
const v = e.getAttribute(name);
|
|
@@ -155,53 +100,12 @@ async function inlineCSS(window, document) {
|
|
|
155
100
|
remove.push(adoptedStyle);
|
|
156
101
|
return () => remove.forEach((x) => x.remove());
|
|
157
102
|
}
|
|
158
|
-
function css(el) {
|
|
159
|
-
const cs = window.getComputedStyle(el);
|
|
160
|
-
const root = window.getComputedStyle(window.document.documentElement);
|
|
161
|
-
const sheets = document.styleSheets;
|
|
162
|
-
const ret = [];
|
|
163
|
-
el.matches = el.matches || el.webkitMatchesSelector || el.mozMatchesSelector
|
|
164
|
-
|| el.msMatchesSelector || el.oMatchesSelector;
|
|
165
|
-
for (const i in sheets) {
|
|
166
|
-
const sheet = sheets[i];
|
|
167
|
-
try {
|
|
168
|
-
const rules = sheet.cssRules;
|
|
169
|
-
for (const r in rules) {
|
|
170
|
-
const rule = rules[r];
|
|
171
|
-
if (el.matches(rule.selectorText)) {
|
|
172
|
-
const { style } = rule;
|
|
173
|
-
const properties = [];
|
|
174
|
-
for (let n = 0; n < style.length; n++) {
|
|
175
|
-
const key = style[n];
|
|
176
|
-
if (key === "box-sizing") {
|
|
177
|
-
continue;
|
|
178
|
-
}
|
|
179
|
-
let value = style[key];
|
|
180
|
-
if (value) {
|
|
181
|
-
// we need to evaluate every var(--)
|
|
182
|
-
value = value.replace(/(var\(([^\)]+)\))/gm, (m, p1, p2) => {
|
|
183
|
-
const varName = p2.split(",")[0];
|
|
184
|
-
const cssValue = cs.getPropertyValue(varName)
|
|
185
|
-
|| root.getPropertyValue(varName);
|
|
186
|
-
return p1 ? cssValue : m;
|
|
187
|
-
});
|
|
188
|
-
properties.push({ key, value });
|
|
189
|
-
}
|
|
190
|
-
}
|
|
191
|
-
ret.push(...properties);
|
|
192
|
-
}
|
|
193
|
-
}
|
|
194
|
-
}
|
|
195
|
-
catch {
|
|
196
|
-
// do nothing..
|
|
197
|
-
}
|
|
198
|
-
}
|
|
199
|
-
return ret;
|
|
200
|
-
}
|
|
201
103
|
async function flattenStyler(rules) {
|
|
202
|
-
const
|
|
203
|
-
|
|
204
|
-
|
|
104
|
+
const stylerPrefix = "styler-";
|
|
105
|
+
const root = window.getComputedStyle(window.document.documentElement);
|
|
106
|
+
const all = document.querySelectorAll("body,body *");
|
|
107
|
+
for (const e of all.values()) {
|
|
108
|
+
const cs = window.getComputedStyle(e);
|
|
205
109
|
const remove = [];
|
|
206
110
|
for (const name of e.getAttributeNames()) {
|
|
207
111
|
if (!name.startsWith("styler-")) {
|
|
@@ -209,25 +113,41 @@ async function inlineCSS(window, document) {
|
|
|
209
113
|
}
|
|
210
114
|
remove.push(name);
|
|
211
115
|
}
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
const className = "c-" + (id++).toString(36);
|
|
215
|
-
e.classList.add(className);
|
|
216
|
-
rules.push(`.${className} {
|
|
217
|
-
${styles.map((s) => s.key + ":" + s.value).join(";\n")};
|
|
218
|
-
}`);
|
|
116
|
+
if (!remove.length) {
|
|
117
|
+
continue;
|
|
219
118
|
}
|
|
119
|
+
const className = "c-" + (id++).toString(36);
|
|
120
|
+
e.classList.add(className);
|
|
121
|
+
const styles = [];
|
|
220
122
|
for (const n of remove) {
|
|
221
|
-
e.
|
|
123
|
+
let value = e.getAttribute(n);
|
|
124
|
+
if (value) {
|
|
125
|
+
// we need to evaluate every var(--)
|
|
126
|
+
value = value.replace(/(var\(([^\)]+)\))/gm, (m, p1, p2) => {
|
|
127
|
+
const varName = p2.split(",")[0];
|
|
128
|
+
const cssValue = cs.getPropertyValue(varName)
|
|
129
|
+
|| root.getPropertyValue(varName);
|
|
130
|
+
return p1 ? cssValue : m;
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
const cssName = n.substring(stylerPrefix.length);
|
|
134
|
+
styles.push(`${cssName}: ${value}`);
|
|
222
135
|
}
|
|
136
|
+
rules.push(`.${className} {
|
|
137
|
+
${styles.map((s) => s.key + ":" + s.value).join(";\n")};
|
|
138
|
+
}`);
|
|
223
139
|
}
|
|
224
140
|
}
|
|
225
141
|
const defer = await flattenStyleSheets();
|
|
226
142
|
const newRules = [];
|
|
227
143
|
await flattenStyler(newRules);
|
|
228
144
|
const newStyle = document.createElement("style");
|
|
229
|
-
document.
|
|
145
|
+
document.body.insertAdjacentElement("afterbegin", newStyle);
|
|
230
146
|
newStyle.textContent = `* { box-sizing: border-box; }\n${newRules.join("\n")}`;
|
|
231
147
|
defer();
|
|
148
|
+
// remove all scripts
|
|
149
|
+
for (const s of Array.from(document.querySelectorAll("script").values())) {
|
|
150
|
+
s.remove();
|
|
151
|
+
}
|
|
232
152
|
}
|
|
233
153
|
//# sourceMappingURL=HtmlForEmailService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HtmlForEmailService.js","sourceRoot":"","sources":["../../../../src/server/services/html/HtmlForEmailService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"HtmlForEmailService.js","sourceRoot":"","sources":["../../../../src/server/services/html/HtmlForEmailService.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import Page from "@entity-access/server-pages/dist/Page.js";
|
|
|
4
4
|
export default class PuppeteerService {
|
|
5
5
|
siteCache: SiteDiskContentCache;
|
|
6
6
|
authService: AuthorizationService;
|
|
7
|
-
generate({ url, mobile, width, height, deviceScaleFactor, output, packageHash, test, testDelay, timeout, page }: {
|
|
7
|
+
generate({ url, mobile, width, height, deviceScaleFactor, output, packageHash, test, testDelay, timeout, pageEvalScript, page }: {
|
|
8
8
|
url: any;
|
|
9
9
|
mobile?: boolean;
|
|
10
10
|
width?: number;
|
|
@@ -15,6 +15,7 @@ export default class PuppeteerService {
|
|
|
15
15
|
test?: "true" | "window.pageReady";
|
|
16
16
|
testDelay?: number;
|
|
17
17
|
timeout?: number;
|
|
18
|
+
pageEvalScript?: string;
|
|
18
19
|
page?: Page<any, any>;
|
|
19
20
|
}): Promise<import("@entity-access/server-pages/dist/core/LocalFile.js").LocalFile>;
|
|
20
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PuppeteerService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerService.ts"],"names":[],"mappings":"AAMA,OAAO,oBAAoB,MAAM,kCAAkC,CAAC;AACpE,OAAO,oBAAoB,MAAM,mEAAmE,CAAC;AACrG,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAQ5D,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAGjC,SAAS,EAAE,oBAAoB,CAAC;IAGhC,WAAW,EAAE,oBAAoB,CAAC;IAE5B,QAAQ,CAAC,EACX,GAAG,EACH,MAAc,EACd,KAA2B,EAC3B,MAA6B,EAC7B,iBAAkC,EAClC,MAAe,EACf,WAAgC,EAChC,IAA8C,EAC9C,SAAgB,EAChB,OAAe,EACf,IAAqB,EACxB
|
|
1
|
+
{"version":3,"file":"PuppeteerService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerService.ts"],"names":[],"mappings":"AAMA,OAAO,oBAAoB,MAAM,kCAAkC,CAAC;AACpE,OAAO,oBAAoB,MAAM,mEAAmE,CAAC;AACrG,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAQ5D,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAGjC,SAAS,EAAE,oBAAoB,CAAC;IAGhC,WAAW,EAAE,oBAAoB,CAAC;IAE5B,QAAQ,CAAC,EACX,GAAG,EACH,MAAc,EACd,KAA2B,EAC3B,MAA6B,EAC7B,iBAAkC,EAClC,MAAe,EACf,WAAgC,EAChC,IAA8C,EAC9C,SAAgB,EAChB,OAAe,EACf,cAA+B,EAC/B,IAAqB,EACxB;;;;;;;;;;;;;KAAA;CAkEJ"}
|
|
@@ -72,7 +72,7 @@ if (/^\d+$/i.test(port)) {
|
|
|
72
72
|
port = Number(port);
|
|
73
73
|
}
|
|
74
74
|
let PuppeteerService = class PuppeteerService {
|
|
75
|
-
async generate({ url, mobile = false, width = mobile ? 650 : 1200, height = mobile ? 1000 : 1536, deviceScaleFactor = mobile ? 2 : 1, output = "webp", packageHash = globalEnv.serverID, test = "true", testDelay = 1000, timeout = 15000, page = void 0 }) {
|
|
75
|
+
async generate({ url, mobile = false, width = mobile ? 650 : 1200, height = mobile ? 1000 : 1536, deviceScaleFactor = mobile ? 2 : 1, output = "webp", packageHash = globalEnv.serverID, test = "true", testDelay = 1000, timeout = 15000, pageEvalScript = "() => void 0", page = void 0 }) {
|
|
76
76
|
const pageCookies = page?.request?.cookies;
|
|
77
77
|
let cookies = "void 0";
|
|
78
78
|
if (pageCookies) {
|
|
@@ -93,6 +93,7 @@ let PuppeteerService = class PuppeteerService {
|
|
|
93
93
|
test,
|
|
94
94
|
testDelay: testDelay,
|
|
95
95
|
timeout: timeout,
|
|
96
|
+
pageEvalScript,
|
|
96
97
|
output
|
|
97
98
|
});
|
|
98
99
|
if (cookies) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PuppeteerService.js","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"PuppeteerService.js","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerService.ts"],"names":[],"mappings":"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"}
|