@social-mail/social-mail-web-server 1.7.702 → 1.7.704
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/puppeteer/PuppeteerService.d.ts.map +1 -1
- package/dist/server/services/puppeteer/PuppeteerService.js +1 -17
- package/dist/server/services/puppeteer/PuppeteerService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/wwwroot/routes/social-mail/site/templates/list/get.js +2 -2
- package/dist/wwwroot/routes/social-mail/site/templates/preview/[host]/[type]/[cacheKey]/get.d.ts.map +1 -1
- package/dist/wwwroot/routes/social-mail/site/templates/preview/[host]/[type]/[cacheKey]/get.js +3 -0
- package/dist/wwwroot/routes/social-mail/site/templates/preview/[host]/[type]/[cacheKey]/get.js.map +1 -1
- package/package.json +1 -1
- package/src/server/services/puppeteer/PuppeteerService.ts +1 -18
- package/src/wwwroot/routes/social-mail/site/templates/list/get.tsx +2 -2
- package/src/wwwroot/routes/social-mail/site/templates/preview/[host]/[type]/[cacheKey]/get.tsx +4 -0
|
@@ -62,8 +62,8 @@ export default class default_1 extends Page {
|
|
|
62
62
|
tags: x.webSiteTags?.map((t) => t.tag.name) ?? [],
|
|
63
63
|
name: x.folder.name,
|
|
64
64
|
host,
|
|
65
|
-
preview: `https://${cdn}/social-mail/site/templates/preview/${host}/desktop/
|
|
66
|
-
previewMobile: `https://${cdn}/social-mail/site/templates/preview/${host}/mobile/
|
|
65
|
+
preview: `https://${cdn}/social-mail/site/templates/preview/${host}/desktop/c6-${currentVersionID}/desktop-preview-1.webp`,
|
|
66
|
+
previewMobile: `https://${cdn}/social-mail/site/templates/preview/${host}/mobile/c6-${currentVersionID}/desktop-preview-1.webp`,
|
|
67
67
|
url: `https://${host}`
|
|
68
68
|
};
|
|
69
69
|
});
|
package/dist/wwwroot/routes/social-mail/site/templates/preview/[host]/[type]/[cacheKey]/get.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../../../../../src/wwwroot/routes/social-mail/site/templates/preview/[host]/[type]/[cacheKey]/get.tsx"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAO5D,OAAO,qBAAqB,MAAM,2EAA2E,CAAC;AAI9G,OAAO,YAAY,MAAM,kEAAkE,CAAC;AAE5F,OAAO,eAAe,MAAM,8DAA8D,CAAC;AAE3F,OAAO,gBAAgB,MAAM,0EAA0E,CAAC;AAOxG,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;IAEC,GAAG;
|
|
1
|
+
{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../../../../../src/wwwroot/routes/social-mail/site/templates/preview/[host]/[type]/[cacheKey]/get.tsx"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAO5D,OAAO,qBAAqB,MAAM,2EAA2E,CAAC;AAI9G,OAAO,YAAY,MAAM,kEAAkE,CAAC;AAE5F,OAAO,eAAe,MAAM,8DAA8D,CAAC;AAE3F,OAAO,gBAAgB,MAAM,0EAA0E,CAAC;AAOxG,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;IAEC,GAAG;CA8DZ"}
|
package/dist/wwwroot/routes/social-mail/site/templates/preview/[host]/[type]/[cacheKey]/get.js
CHANGED
|
@@ -38,9 +38,11 @@ export default class default_1 extends Page {
|
|
|
38
38
|
let width = 1200;
|
|
39
39
|
let height = 1536;
|
|
40
40
|
let deviceScaleFactor = 1;
|
|
41
|
+
let mobile = false;
|
|
41
42
|
if (/mobile/i.test(this.type)) {
|
|
42
43
|
width = 650;
|
|
43
44
|
height = 1000;
|
|
45
|
+
mobile = true;
|
|
44
46
|
deviceScaleFactor = 2;
|
|
45
47
|
}
|
|
46
48
|
const [fileName = "preview.webp"] = this.childPath;
|
|
@@ -53,6 +55,7 @@ export default class default_1 extends Page {
|
|
|
53
55
|
return await this.puppeteerService.generate({
|
|
54
56
|
width,
|
|
55
57
|
height,
|
|
58
|
+
mobile,
|
|
56
59
|
deviceScaleFactor,
|
|
57
60
|
packageHash,
|
|
58
61
|
url,
|
package/dist/wwwroot/routes/social-mail/site/templates/preview/[host]/[type]/[cacheKey]/get.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../../../../src/wwwroot/routes/social-mail/site/templates/preview/[host]/[type]/[cacheKey]/get.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../../../../src/wwwroot/routes/social-mail/site/templates/preview/[host]/[type]/[cacheKey]/get.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -28,7 +28,7 @@ export default class PuppeteerService {
|
|
|
28
28
|
packageHash = globalEnv.serverID
|
|
29
29
|
}) {
|
|
30
30
|
|
|
31
|
-
const key = `previews/${packageHash}/preview-${hash("sha256", url, "hex")}.${output}`;
|
|
31
|
+
const key = `previews/${packageHash}/${mobile? "mobile" : "desktop"}/preview-${hash("sha256", url, "hex")}.${output}`;
|
|
32
32
|
|
|
33
33
|
const file = await this.siteCache.htmlCache.getOrCreateAsync(key, async (lf) => {
|
|
34
34
|
|
|
@@ -45,23 +45,6 @@ export default class PuppeteerService {
|
|
|
45
45
|
|
|
46
46
|
console.log(`Fetching: ${url}`);
|
|
47
47
|
|
|
48
|
-
// const dispatcher = new Agent({
|
|
49
|
-
// connect: (options, callback) => {
|
|
50
|
-
// try {
|
|
51
|
-
// const s= connect({
|
|
52
|
-
// port,
|
|
53
|
-
// host: globalEnv.puppeteer.host
|
|
54
|
-
// }, () => callback(null, s));
|
|
55
|
-
// s.on("error", (e) => {
|
|
56
|
-
// console.error(e);
|
|
57
|
-
// callback(e, null);
|
|
58
|
-
// });
|
|
59
|
-
// } catch (error) {
|
|
60
|
-
// callback(error, null);
|
|
61
|
-
// }
|
|
62
|
-
// }
|
|
63
|
-
// });
|
|
64
|
-
|
|
65
48
|
const fetchUrl = `http://${globalEnv.puppeteer.host}:${port}/screen-shot?${query.toString()}`;
|
|
66
49
|
|
|
67
50
|
const r = await fetch(fetchUrl, {
|
|
@@ -83,8 +83,8 @@ export default class extends Page {
|
|
|
83
83
|
tags: x.webSiteTags?.map((t) => t.tag.name) ?? [],
|
|
84
84
|
name: x.folder.name,
|
|
85
85
|
host,
|
|
86
|
-
preview: `https://${cdn}/social-mail/site/templates/preview/${host}/desktop/
|
|
87
|
-
previewMobile: `https://${cdn}/social-mail/site/templates/preview/${host}/mobile/
|
|
86
|
+
preview: `https://${cdn}/social-mail/site/templates/preview/${host}/desktop/c6-${currentVersionID}/desktop-preview-1.webp`,
|
|
87
|
+
previewMobile: `https://${cdn}/social-mail/site/templates/preview/${host}/mobile/c6-${currentVersionID}/desktop-preview-1.webp`,
|
|
88
88
|
url: `https://${host}`
|
|
89
89
|
};
|
|
90
90
|
});
|
package/src/wwwroot/routes/social-mail/site/templates/preview/[host]/[type]/[cacheKey]/get.tsx
CHANGED
|
@@ -66,9 +66,12 @@ export default class extends Page {
|
|
|
66
66
|
|
|
67
67
|
let deviceScaleFactor = 1 as any;
|
|
68
68
|
|
|
69
|
+
let mobile = false;
|
|
70
|
+
|
|
69
71
|
if (/mobile/i.test(this.type)) {
|
|
70
72
|
width = 650;
|
|
71
73
|
height = 1000;
|
|
74
|
+
mobile = true;
|
|
72
75
|
deviceScaleFactor = 2;
|
|
73
76
|
}
|
|
74
77
|
|
|
@@ -86,6 +89,7 @@ export default class extends Page {
|
|
|
86
89
|
return await this.puppeteerService.generate({
|
|
87
90
|
width,
|
|
88
91
|
height,
|
|
92
|
+
mobile,
|
|
89
93
|
deviceScaleFactor,
|
|
90
94
|
packageHash,
|
|
91
95
|
url,
|