@social-mail/social-mail-web-server 1.16.412 → 1.16.413
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/services/puppeteer/PuppeteerService.d.ts +2 -2
- package/dist/server/services/puppeteer/PuppeteerService.d.ts.map +1 -1
- package/dist/server/services/puppeteer/PuppeteerService.js +2 -2
- package/dist/server/services/puppeteer/PuppeteerService.js.map +1 -1
- package/dist/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.d.ts.map +1 -1
- package/dist/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.js +3 -2
- package/dist/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.js.map +1 -1
- package/package.json +1 -1
- package/src/server/services/puppeteer/PuppeteerService.ts +2 -2
- package/src/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.tsx +4 -2
|
@@ -4,13 +4,13 @@ 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, pageReadyScript, output,
|
|
7
|
+
generate({ url, mobile, width, height, deviceScaleFactor, pageReadyScript, output, cacheKey, test, testDelay, fullPage, timeout, pageEvalScript, page }: {
|
|
8
|
+
cacheKey?: string;
|
|
8
9
|
deviceScaleFactor?: number;
|
|
9
10
|
fullPage?: boolean;
|
|
10
11
|
height?: number;
|
|
11
12
|
mobile?: boolean;
|
|
12
13
|
output?: string;
|
|
13
|
-
packageHash?: string;
|
|
14
14
|
page?: Page<any, any>;
|
|
15
15
|
pageEvalScript?: string;
|
|
16
16
|
pageReadyScript?: any;
|
|
@@ -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,eAAwB,EACxB,MAAe,EACf,
|
|
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,eAAwB,EACxB,MAAe,EACf,QAA6B,EAC7B,IAA8C,EAC9C,SAAgB,EAChB,QAAgB,EAChB,OAAe,EACf,cAA+B,EAC/B,IAAqB,EACxB;;;;;;;;;;;;;;;KAAA,mFA0EA;CAEJ"}
|
|
@@ -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, pageReadyScript = void 0, output = "webp",
|
|
75
|
+
async generate({ url, mobile = false, width = mobile ? 650 : 1200, height = mobile ? 1000 : 1536, deviceScaleFactor = mobile ? 2 : 1, pageReadyScript = void 0, output = "webp", cacheKey = globalEnv.serverID, test = "true", testDelay = 1000, fullPage = false, timeout = 15000, pageEvalScript = "() => void 0", page = void 0 }) {
|
|
76
76
|
const pageCookies = page?.request?.cookies;
|
|
77
77
|
let cookies = "undefined";
|
|
78
78
|
if (pageCookies) {
|
|
@@ -101,7 +101,7 @@ let PuppeteerService = class PuppeteerService {
|
|
|
101
101
|
qs.append("cookies", cookies);
|
|
102
102
|
}
|
|
103
103
|
const query = qs.toString();
|
|
104
|
-
const key = `web-previews/${
|
|
104
|
+
const key = `web-previews/${cacheKey}/${hash("sha256", query, "hex")}.${output}`;
|
|
105
105
|
const file = await this.siteCache.htmlCache.getOrCreateAsync(key, async (lf) => {
|
|
106
106
|
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
107
107
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PuppeteerService.js","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AACpF,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AACjD,OAAO,oBAAoB,MAAM,kCAAkC,CAAC;AACpE,OAAO,oBAAoB,MAAM,mEAAmE,CAAC;AAGrG,IAAI,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,IAAW,CAAC;AAC3C,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACtB,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC;AAGc,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAQjC,KAAK,CAAC,QAAQ,CAAC,EACX,GAAG,EACH,MAAM,GAAG,KAAK,EACd,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAC3B,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAC7B,iBAAiB,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAClC,eAAe,GAAG,KAAK,CAAC,EACxB,MAAM,GAAG,MAAM,EACf,
|
|
1
|
+
{"version":3,"file":"PuppeteerService.js","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.tsx"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAG5D,OAAO,qBAAqB,MAAM,wEAAwE,CAAC;AAG3G,OAAO,YAAY,MAAM,+DAA+D,CAAC;AAEzF,OAAO,eAAe,MAAM,2DAA2D,CAAC;AACxF,OAAO,gBAAgB,MAAM,uEAAuE,CAAC;AAOrG,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,GAAG,EAAE,qBAAqB,CAAC;IAG3B,YAAY,EAAE,YAAY,CAAC;IAG3B,GAAG,EAAE,eAAe,CAAC;IAGrB,gBAAgB,EAAE,gBAAgB,CAAC;IAGnC,IAAI,MAAC;IAGL,QAAQ,MAAC;IAGT,IAAI,MAAC;IAGL,KAAK,MAAC;IAEA,GAAG,
|
|
1
|
+
{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.tsx"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAG5D,OAAO,qBAAqB,MAAM,wEAAwE,CAAC;AAG3G,OAAO,YAAY,MAAM,+DAA+D,CAAC;AAEzF,OAAO,eAAe,MAAM,2DAA2D,CAAC;AACxF,OAAO,gBAAgB,MAAM,uEAAuE,CAAC;AAOrG,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,GAAG,EAAE,qBAAqB,CAAC;IAG3B,YAAY,EAAE,YAAY,CAAC;IAG3B,GAAG,EAAE,eAAe,CAAC;IAGrB,gBAAgB,EAAE,gBAAgB,CAAC;IAGnC,IAAI,MAAC;IAGL,QAAQ,MAAC;IAGT,IAAI,MAAC;IAGL,KAAK,MAAC;IAEA,GAAG,2EAwFR;CACJ"}
|
|
@@ -46,7 +46,8 @@ export default class default_1 extends Page {
|
|
|
46
46
|
deviceScaleFactor = 1;
|
|
47
47
|
}
|
|
48
48
|
const [fileName = "preview.webp"] = this.childPath;
|
|
49
|
-
const
|
|
49
|
+
const { cacheKey } = this;
|
|
50
|
+
const key = `site-preview/${packageHash}/${cacheKey || ("c" + snapshot.snapshotFolderID)}-${width}-${height}-${fileName}`;
|
|
50
51
|
let output = "webp";
|
|
51
52
|
let contentType = "image/webp";
|
|
52
53
|
if (/\.png$/i.test(fileName)) {
|
|
@@ -74,7 +75,7 @@ export default class default_1 extends Page {
|
|
|
74
75
|
height,
|
|
75
76
|
mobile,
|
|
76
77
|
deviceScaleFactor,
|
|
77
|
-
|
|
78
|
+
cacheKey,
|
|
78
79
|
pageReadyScript,
|
|
79
80
|
fullPage: true,
|
|
80
81
|
url,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../../../src/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAC;AACxE,OAAO,qBAAqB,MAAM,wEAAwE,CAAC;AAC3G,OAAO,gBAAgB,MAAM,kEAAkE,CAAC;AAChG,OAAO,EAAE,KAAK,EAAE,MAAM,gDAAgD,CAAC;AACvE,OAAO,YAAY,MAAM,+DAA+D,CAAC;AACzF,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,eAAe,MAAM,2DAA2D,CAAC;AACxF,OAAO,gBAAgB,MAAM,uEAAuE,CAAC;AAErG,IAAI,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,IAAW,CAAC;AAC3C,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACtB,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC;AAED,MAAM,CAAC,OAAO,gBAAO,SAAQ,IAAI;IA0B7B,KAAK,CAAC,GAAG;QAEL,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEpE,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC3B,CAAC;QAED,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;YACrB,6BAA6B;YAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;YAC7B,OAAO,MAAM,gBAAgB,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,SAAS,GAAG,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QACnG,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC;QAGrD,IAAI,KAAK,GAAG,IAAW,CAAC;QACxB,IAAI,MAAM,GAAG,IAAW,CAAC;QAEzB,IAAI,iBAAiB,GAAG,CAAQ,CAAC;QAEjC,IAAI,MAAM,GAAG,KAAK,CAAC;QAEnB,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,KAAK,GAAG,GAAG,CAAC;YACZ,MAAM,GAAG,IAAI,CAAC;YACd,MAAM,GAAG,IAAI,CAAC;YACd,6CAA6C;YAC7C,iBAAiB,GAAG,CAAC,CAAC;QAC1B,CAAC;QAED,MAAM,CAAE,QAAQ,GAAG,cAAc,CAAE,GAAG,IAAI,CAAC,SAAkB,CAAC;QAE9D,MAAM,GAAG,GAAG,gBAAgB,WAAW,IAAI,
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../../../src/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -30,7 +30,7 @@ export default class PuppeteerService {
|
|
|
30
30
|
deviceScaleFactor = mobile ? 2 : 1,
|
|
31
31
|
pageReadyScript = void 0,
|
|
32
32
|
output = "webp",
|
|
33
|
-
|
|
33
|
+
cacheKey = globalEnv.serverID,
|
|
34
34
|
test = "true" as ("true" | "window.pageReady"),
|
|
35
35
|
testDelay = 1000,
|
|
36
36
|
fullPage = false,
|
|
@@ -73,7 +73,7 @@ export default class PuppeteerService {
|
|
|
73
73
|
|
|
74
74
|
const query = qs.toString();
|
|
75
75
|
|
|
76
|
-
const key = `web-previews/${
|
|
76
|
+
const key = `web-previews/${cacheKey}/${hash("sha256",query, "hex")}.${output}`;
|
|
77
77
|
|
|
78
78
|
const file = await this.siteCache.htmlCache.getOrCreateAsync(key, async (lf) => {
|
|
79
79
|
|
|
@@ -75,7 +75,9 @@ export default class extends Page {
|
|
|
75
75
|
|
|
76
76
|
const [ fileName = "preview.webp" ] = this.childPath as any[];
|
|
77
77
|
|
|
78
|
-
const
|
|
78
|
+
const { cacheKey } = this;
|
|
79
|
+
|
|
80
|
+
const key = `site-preview/${packageHash}/${cacheKey || ("c" + snapshot.snapshotFolderID)}-${width}-${height}-${fileName}`;
|
|
79
81
|
|
|
80
82
|
let output = "webp";
|
|
81
83
|
let contentType = "image/webp";
|
|
@@ -109,7 +111,7 @@ export default class extends Page {
|
|
|
109
111
|
height,
|
|
110
112
|
mobile,
|
|
111
113
|
deviceScaleFactor,
|
|
112
|
-
|
|
114
|
+
cacheKey,
|
|
113
115
|
pageReadyScript,
|
|
114
116
|
fullPage: true,
|
|
115
117
|
url,
|