@social-mail/social-mail-web-server 1.7.695 → 1.7.697
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/common/Retry.d.ts +4 -0
- package/dist/common/Retry.d.ts.map +1 -0
- package/dist/common/Retry.js +18 -0
- package/dist/common/Retry.js.map +1 -0
- 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/list/get.js.map +1 -1
- 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 +8 -4
- package/dist/wwwroot/routes/social-mail/site/templates/preview/[host]/[type]/[cacheKey]/get.js.map +1 -1
- package/package.json +1 -1
- package/src/common/Retry.ts +18 -0
- 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 +10 -5
|
@@ -60,8 +60,8 @@ export default class default_1 extends Page {
|
|
|
60
60
|
tags: x.webSiteTags?.map((t) => t.tag.name) ?? [],
|
|
61
61
|
name: x.folder.name,
|
|
62
62
|
host,
|
|
63
|
-
preview: `https://${cdn}/social-mail/site/templates/preview/${host}/desktop/
|
|
64
|
-
previewMobile: `https://${cdn}/social-mail/site/templates/preview/${host}/mobile/
|
|
63
|
+
preview: `https://${cdn}/social-mail/site/templates/preview/${host}/desktop/c2-${currentVersionID}/desktop-preview-1.webp`,
|
|
64
|
+
previewMobile: `https://${cdn}/social-mail/site/templates/preview/${host}/mobile/c2-${currentVersionID}/desktop-preview-1.webp`,
|
|
65
65
|
url: `https://${host}`
|
|
66
66
|
};
|
|
67
67
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/site/templates/list/get.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/site/templates/list/get.tsx"],"names":[],"mappings":"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"}
|
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;AAM5D,OAAO,oBAAoB,MAAM,0EAA0E,CAAC;AAC5G,OAAO,qBAAqB,MAAM,2EAA2E,CAAC;AAI9G,OAAO,YAAY,MAAM,kEAAkE,CAAC;AAE5F,OAAO,eAAe,MAAM,8DAA8D,CAAC;
|
|
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;AAM5D,OAAO,oBAAoB,MAAM,0EAA0E,CAAC;AAC5G,OAAO,qBAAqB,MAAM,2EAA2E,CAAC;AAI9G,OAAO,YAAY,MAAM,kEAAkE,CAAC;AAE5F,OAAO,eAAe,MAAM,8DAA8D,CAAC;AAyB3F,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,GAAG,EAAE,qBAAqB,CAAC;IAG3B,SAAS,EAAE,oBAAoB,CAAC;IAGhC,YAAY,EAAE,YAAY,CAAC;IAG3B,GAAG,EAAE,eAAe,CAAC;IAGrB,IAAI,MAAC;IAGL,QAAQ,MAAC;IAGT,IAAI,MAAC;IAEC,GAAG;CAwEZ"}
|
package/dist/wwwroot/routes/social-mail/site/templates/preview/[host]/[type]/[cacheKey]/get.js
CHANGED
|
@@ -73,6 +73,7 @@ import { Route } from "@entity-access/server-pages/dist/core/Route.js";
|
|
|
73
73
|
import CacheService from "../../../../../../../../../server/services/cache/CacheService.js";
|
|
74
74
|
import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
|
|
75
75
|
import TempFileService from "../../../../../../../../../server/storage/TempFileService.js";
|
|
76
|
+
import { Retry } from "../../../../../../../../../common/Retry.js";
|
|
76
77
|
let port = globalEnv.puppeteer.port;
|
|
77
78
|
if (/^\d+$/i.test(port)) {
|
|
78
79
|
port = Number(port);
|
|
@@ -114,11 +115,12 @@ export default class default_1 extends Page {
|
|
|
114
115
|
height = 1000;
|
|
115
116
|
deviceScaleFactor = 2;
|
|
116
117
|
}
|
|
117
|
-
const
|
|
118
|
+
const [fileName = "preview.webp"] = this.childPath;
|
|
119
|
+
const key = `${snapshot.snapshotFolderID}/${packageHash}/${this.cacheKey || "default"}-${width}-${height}-${fileName}`;
|
|
118
120
|
const cf = await this.cacheService.get({
|
|
119
121
|
key,
|
|
120
122
|
ttl: TimeSpan.fromDays(30),
|
|
121
|
-
factory: async (
|
|
123
|
+
factory: (c) => Retry.retry(async () => {
|
|
122
124
|
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
123
125
|
try {
|
|
124
126
|
const _ = __addDisposableResource(env_1, await LockFile.lock("puppeteer-preview-generator"), false);
|
|
@@ -132,6 +134,9 @@ export default class default_1 extends Page {
|
|
|
132
134
|
const r = await fetch(`http://localhost/screen-shot?${query.toString()}`, {
|
|
133
135
|
dispatcher
|
|
134
136
|
});
|
|
137
|
+
if (r.status >= 399) {
|
|
138
|
+
throw new Error(await r.text());
|
|
139
|
+
}
|
|
135
140
|
const buffer = Buffer.from(await r.arrayBuffer());
|
|
136
141
|
const lf = await this.tfs.createTempFile(".webp", "preview.webp", "image/webp");
|
|
137
142
|
await lf.writeAll(buffer);
|
|
@@ -144,9 +149,8 @@ export default class default_1 extends Page {
|
|
|
144
149
|
finally {
|
|
145
150
|
__disposeResources(env_1);
|
|
146
151
|
}
|
|
147
|
-
}
|
|
152
|
+
})
|
|
148
153
|
});
|
|
149
|
-
const [fileName = "preview.webp"] = this.childPath;
|
|
150
154
|
this.cacheControl = "public, max-age=2592000, immutable";
|
|
151
155
|
return new TempFileResult(cf, {
|
|
152
156
|
fileName,
|
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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAE5D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAC;AAC3E,OAAO,oBAAoB,MAAM,0EAA0E,CAAC;AAC5G,OAAO,qBAAqB,MAAM,2EAA2E,CAAC;AAC9G,OAAO,gBAAgB,MAAM,qEAAqE,CAAC;AACnG,OAAO,QAAQ,MAAM,uDAAuD,CAAC;AAC7E,OAAO,EAAE,KAAK,EAAE,MAAM,gDAAgD,CAAC;AACvE,OAAO,YAAY,MAAM,kEAAkE,CAAC;AAC5F,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,eAAe,MAAM,8DAA8D,CAAC;
|
|
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
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
export const Retry = {
|
|
2
|
+
|
|
3
|
+
async retry<T>(fx: () => Promise<T>, max = 3) {
|
|
4
|
+
let lastError;
|
|
5
|
+
for(let i=0; i<max;i++) {
|
|
6
|
+
try {
|
|
7
|
+
lastError = null;
|
|
8
|
+
return await fx();
|
|
9
|
+
} catch (error) {
|
|
10
|
+
lastError = error;
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
if (lastError) {
|
|
14
|
+
throw lastError;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
};
|
|
@@ -77,8 +77,8 @@ export default class extends Page {
|
|
|
77
77
|
tags: x.webSiteTags?.map((t) => t.tag.name) ?? [],
|
|
78
78
|
name: x.folder.name,
|
|
79
79
|
host,
|
|
80
|
-
preview: `https://${cdn}/social-mail/site/templates/preview/${host}/desktop/
|
|
81
|
-
previewMobile: `https://${cdn}/social-mail/site/templates/preview/${host}/mobile/
|
|
80
|
+
preview: `https://${cdn}/social-mail/site/templates/preview/${host}/desktop/c2-${currentVersionID}/desktop-preview-1.webp`,
|
|
81
|
+
previewMobile: `https://${cdn}/social-mail/site/templates/preview/${host}/mobile/c2-${currentVersionID}/desktop-preview-1.webp`,
|
|
82
82
|
url: `https://${host}`
|
|
83
83
|
};
|
|
84
84
|
});
|
package/src/wwwroot/routes/social-mail/site/templates/preview/[host]/[type]/[cacheKey]/get.tsx
CHANGED
|
@@ -13,6 +13,7 @@ import { Route } from "@entity-access/server-pages/dist/core/Route.js";
|
|
|
13
13
|
import CacheService from "../../../../../../../../../server/services/cache/CacheService.js";
|
|
14
14
|
import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
|
|
15
15
|
import TempFileService from "../../../../../../../../../server/storage/TempFileService.js";
|
|
16
|
+
import { Retry } from "../../../../../../../../../common/Retry.js";
|
|
16
17
|
|
|
17
18
|
let port = globalEnv.puppeteer.port as any;
|
|
18
19
|
if (/^\d+$/i.test(port)) {
|
|
@@ -87,12 +88,14 @@ export default class extends Page {
|
|
|
87
88
|
deviceScaleFactor = 2;
|
|
88
89
|
}
|
|
89
90
|
|
|
90
|
-
const
|
|
91
|
+
const [ fileName = "preview.webp" ] = this.childPath as any[];
|
|
92
|
+
|
|
93
|
+
const key = `${snapshot.snapshotFolderID}/${packageHash}/${this.cacheKey || "default"}-${width}-${height}-${fileName}`;
|
|
91
94
|
|
|
92
95
|
const cf = await this.cacheService.get({
|
|
93
96
|
key,
|
|
94
97
|
ttl: TimeSpan.fromDays(30),
|
|
95
|
-
factory: async (
|
|
98
|
+
factory: (c) => Retry.retry(async () => {
|
|
96
99
|
|
|
97
100
|
using _ = await LockFile.lock("puppeteer-preview-generator");
|
|
98
101
|
|
|
@@ -108,6 +111,10 @@ export default class extends Page {
|
|
|
108
111
|
dispatcher
|
|
109
112
|
});
|
|
110
113
|
|
|
114
|
+
if (r.status >= 399) {
|
|
115
|
+
throw new Error(await r.text());
|
|
116
|
+
}
|
|
117
|
+
|
|
111
118
|
const buffer = Buffer.from( await r.arrayBuffer());
|
|
112
119
|
|
|
113
120
|
const lf = await this.tfs.createTempFile(".webp", "preview.webp", "image/webp");
|
|
@@ -115,11 +122,9 @@ export default class extends Page {
|
|
|
115
122
|
await lf.writeAll(buffer);
|
|
116
123
|
|
|
117
124
|
return lf;
|
|
118
|
-
}
|
|
125
|
+
})
|
|
119
126
|
});
|
|
120
127
|
|
|
121
|
-
const [ fileName = "preview.webp" ] = this.childPath as any[];
|
|
122
|
-
|
|
123
128
|
this.cacheControl = "public, max-age=2592000, immutable";
|
|
124
129
|
|
|
125
130
|
return new TempFileResult(cf, {
|