@social-mail/social-mail-web-server 1.7.464 → 1.7.466
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/cache/CacheService.js +1 -1
- package/dist/server/services/cache/CacheService.js.map +1 -1
- package/dist/server/services/convert/FileConversionService.d.ts +0 -1
- package/dist/server/services/convert/FileConversionService.d.ts.map +1 -1
- package/dist/server/services/convert/FileConversionService.js +27 -8
- package/dist/server/services/convert/FileConversionService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/wwwroot/routes/api/site/asset/index.d.ts +0 -1
- package/dist/wwwroot/routes/api/site/asset/index.d.ts.map +1 -1
- package/dist/wwwroot/routes/api/site/asset/index.js +0 -6
- package/dist/wwwroot/routes/api/site/asset/index.js.map +1 -1
- package/dist/wwwroot/routes/api/site/snapshot/index.d.ts +0 -1
- package/dist/wwwroot/routes/api/site/snapshot/index.d.ts.map +1 -1
- package/dist/wwwroot/routes/api/site/snapshot/index.js +0 -6
- package/dist/wwwroot/routes/api/site/snapshot/index.js.map +1 -1
- package/dist/wwwroot/routes/social-mail/site/snapshot/[type]/[eSiteID]/[eFileContentID]/index.d.ts +0 -1
- package/dist/wwwroot/routes/social-mail/site/snapshot/[type]/[eSiteID]/[eFileContentID]/index.d.ts.map +1 -1
- package/dist/wwwroot/routes/social-mail/site/snapshot/[type]/[eSiteID]/[eFileContentID]/index.js +0 -6
- package/dist/wwwroot/routes/social-mail/site/snapshot/[type]/[eSiteID]/[eFileContentID]/index.js.map +1 -1
- package/package.json +2 -2
- package/src/server/services/cache/CacheService.ts +1 -1
- package/src/server/services/convert/FileConversionService.ts +15 -8
- package/src/wwwroot/routes/api/site/asset/index.ts +0 -7
- package/src/wwwroot/routes/api/site/snapshot/index.ts +0 -6
- package/src/wwwroot/routes/social-mail/site/snapshot/[type]/[eSiteID]/[eFileContentID]/index.ts +0 -6
|
@@ -179,7 +179,7 @@ let CacheService = class CacheService {
|
|
|
179
179
|
try {
|
|
180
180
|
const { key, ttl, factory } = ck;
|
|
181
181
|
const now = DateTime.now;
|
|
182
|
-
const rl = __addDisposableResource(env_4, await this.rateLimiter.acquireDisposable("0.0.0.0", "file-cache",
|
|
182
|
+
const rl = __addDisposableResource(env_4, await this.rateLimiter.acquireDisposable("0.0.0.0", "file-cache", 10), true);
|
|
183
183
|
const keyHash = await this.cryptoService.hashBuffer(Buffer.from(key, "utf-8"));
|
|
184
184
|
const dbLock = __addDisposableResource(env_4, await this.dbLockService.lock(`ci-${keyHash}`, DateTime.now.addMinutes(5)), true);
|
|
185
185
|
const keys = { key, keyHash };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CacheService.js","sourceRoot":"","sources":["../../../../src/server/services/cache/CacheService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CacheService.js","sourceRoot":"","sources":["../../../../src/server/services/cache/CacheService.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,6 @@ interface IDownloadConvertedFile {
|
|
|
10
10
|
export default class FileConversionService {
|
|
11
11
|
private tempFileService;
|
|
12
12
|
private cacheService;
|
|
13
|
-
private rateLimiterService;
|
|
14
13
|
downloadConvertedFile({ appFile, fileContentID, type, fileName, key }: IDownloadConvertedFile): Promise<any>;
|
|
15
14
|
downloadFileContent(appFile: AppFile, fileContentID?: number): Promise<LocalFile>;
|
|
16
15
|
pdf(file: LocalFile): Promise<LocalFile>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileConversionService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/convert/FileConversionService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAG/E,OAAO,OAAO,MAAM,iCAAiC,CAAC;AAWtD,UAAU,sBAAsB;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB;AAGD,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAGtC,OAAO,CAAC,eAAe,CAAkB;IAGzC,OAAO,CAAC,YAAY,CAAe;
|
|
1
|
+
{"version":3,"file":"FileConversionService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/convert/FileConversionService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAG/E,OAAO,OAAO,MAAM,iCAAiC,CAAC;AAWtD,UAAU,sBAAsB;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB;AAGD,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAGtC,OAAO,CAAC,eAAe,CAAkB;IAGzC,OAAO,CAAC,YAAY,CAAe;IAE7B,qBAAqB,CAAC,EAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,GAA2E,EAAE,EAAE,sBAAsB;IA8CpK,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM;IAe5D,GAAG,CAAC,IAAI,EAAE,SAAS;IAUnB,IAAI,CAAC,IAAI,EAAE,SAAS;IAiCpB,IAAI,CAAC,IAAI,EAAE,SAAS;IAWpB,WAAW,CAAC,IAAI,EAAE,SAAS;CAepC"}
|
|
@@ -64,8 +64,9 @@ import ImageConverterService from "../image-converter/ImageConverterService.js";
|
|
|
64
64
|
import SocialMailContext from "../../model/SocialMailContext.js";
|
|
65
65
|
import Page from "@entity-access/server-pages/dist/Page.js";
|
|
66
66
|
import StringFormat from "../../../common/StringFormat.js";
|
|
67
|
-
import
|
|
67
|
+
import { globalEnv } from "../../../common/globalEnv.js";
|
|
68
68
|
import PdfDoc from "../extract/pdf/PdfDoc.js";
|
|
69
|
+
import LockFile from "../../storage/LockFile.js";
|
|
69
70
|
let FileConversionService = class FileConversionService {
|
|
70
71
|
async downloadConvertedFile({ appFile, fileContentID, type, fileName, key = `/file/${type}/${fileContentID ?? appFile.fileContentID}/${fileName}` }) {
|
|
71
72
|
let file;
|
|
@@ -76,8 +77,8 @@ let FileConversionService = class FileConversionService {
|
|
|
76
77
|
factory: async () => {
|
|
77
78
|
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
78
79
|
try {
|
|
79
|
-
const tx = __addDisposableResource(env_1, await this.rateLimiterService.acquireDisposable("any", "ic" + process.pid, 2), true);
|
|
80
80
|
file = await this.downloadFileContent(appFile, fileContentID);
|
|
81
|
+
const fl = __addDisposableResource(env_1, await LockFile.lock(`${globalEnv.serverID}-img`), true);
|
|
81
82
|
// resize...
|
|
82
83
|
const ics = ServiceProvider.resolve(this, ImageConverterService);
|
|
83
84
|
return await ics.transform(type, file, fileName);
|
|
@@ -94,13 +95,13 @@ let FileConversionService = class FileConversionService {
|
|
|
94
95
|
}
|
|
95
96
|
});
|
|
96
97
|
}
|
|
97
|
-
if (/^(
|
|
98
|
+
if (/^(webm(\-branded)?)$/i.test(type)) {
|
|
98
99
|
return await this.cacheService.get({ key, ttl,
|
|
99
100
|
factory: async () => {
|
|
100
101
|
const env_2 = { stack: [], error: void 0, hasError: false };
|
|
101
102
|
try {
|
|
102
|
-
const tx = __addDisposableResource(env_2, await this.rateLimiterService.acquireDisposable("any", "vc" + process.pid, 1), true);
|
|
103
103
|
file = await this.downloadFileContent(appFile, fileContentID);
|
|
104
|
+
const fl = __addDisposableResource(env_2, await LockFile.lock(`${globalEnv.serverID}-video`), true);
|
|
104
105
|
const ics = this;
|
|
105
106
|
return await ics[StringFormat.toCamelCase(type)](file, fileName);
|
|
106
107
|
}
|
|
@@ -116,6 +117,28 @@ let FileConversionService = class FileConversionService {
|
|
|
116
117
|
}
|
|
117
118
|
});
|
|
118
119
|
}
|
|
120
|
+
if (/^(pdf|html)$/i.test(type)) {
|
|
121
|
+
return await this.cacheService.get({ key, ttl,
|
|
122
|
+
factory: async () => {
|
|
123
|
+
const env_3 = { stack: [], error: void 0, hasError: false };
|
|
124
|
+
try {
|
|
125
|
+
file = await this.downloadFileContent(appFile, fileContentID);
|
|
126
|
+
const fl = __addDisposableResource(env_3, await LockFile.lock(`${globalEnv.serverID}-doc`), true);
|
|
127
|
+
const ics = this;
|
|
128
|
+
return await ics[StringFormat.toCamelCase(type)](file, fileName);
|
|
129
|
+
}
|
|
130
|
+
catch (e_3) {
|
|
131
|
+
env_3.error = e_3;
|
|
132
|
+
env_3.hasError = true;
|
|
133
|
+
}
|
|
134
|
+
finally {
|
|
135
|
+
const result_3 = __disposeResources(env_3);
|
|
136
|
+
if (result_3)
|
|
137
|
+
await result_3;
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
});
|
|
141
|
+
}
|
|
119
142
|
return await this.downloadFileContent(appFile, fileContentID);
|
|
120
143
|
}
|
|
121
144
|
async downloadFileContent(appFile, fileContentID) {
|
|
@@ -193,10 +216,6 @@ __decorate([
|
|
|
193
216
|
Inject,
|
|
194
217
|
__metadata("design:type", CacheService)
|
|
195
218
|
], FileConversionService.prototype, "cacheService", void 0);
|
|
196
|
-
__decorate([
|
|
197
|
-
Inject,
|
|
198
|
-
__metadata("design:type", RateLimiterService)
|
|
199
|
-
], FileConversionService.prototype, "rateLimiterService", void 0);
|
|
200
219
|
FileConversionService = __decorate([
|
|
201
220
|
RegisterScoped
|
|
202
221
|
], FileConversionService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileConversionService.js","sourceRoot":"","sources":["../../../../src/server/services/convert/FileConversionService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACrG,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAE/D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,SAAS,MAAM,gBAAgB,CAAC;AAEvC,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,YAAY,MAAM,0BAA0B,CAAC;AACpD,OAAO,qBAAqB,MAAM,6CAA6C,CAAC;AAChF,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,YAAY,MAAM,iCAAiC,CAAC;AAC3D,OAAO,
|
|
1
|
+
{"version":3,"file":"FileConversionService.js","sourceRoot":"","sources":["../../../../src/server/services/convert/FileConversionService.ts"],"names":[],"mappings":"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"}
|