@social-mail/social-mail-web-server 1.5.115 → 1.5.117
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/model/entities/AppFile.d.ts.map +1 -1
- package/dist/server/model/entities/AppFile.js +5 -4
- package/dist/server/model/entities/AppFile.js.map +1 -1
- package/dist/server/services/convert/FileConversionService.d.ts +12 -0
- package/dist/server/services/convert/FileConversionService.d.ts.map +1 -1
- package/dist/server/services/convert/FileConversionService.js +46 -1
- package/dist/server/services/convert/FileConversionService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/wwwroot/routes/api/channel/file/{get.d.ts → index.d.ts} +2 -3
- package/dist/wwwroot/routes/api/channel/file/index.d.ts.map +1 -0
- package/dist/wwwroot/routes/api/channel/file/{get.js → index.js} +11 -30
- package/dist/wwwroot/routes/api/channel/file/index.js.map +1 -0
- package/dist/wwwroot/routes/api/emails/attachment/index.d.ts +8 -0
- package/dist/wwwroot/routes/api/emails/attachment/index.d.ts.map +1 -0
- package/dist/wwwroot/routes/api/emails/attachment/index.js +59 -0
- package/dist/wwwroot/routes/api/emails/attachment/index.js.map +1 -0
- package/dist/wwwroot/routes/api/file/index.d.ts +8 -0
- package/dist/wwwroot/routes/api/file/index.d.ts.map +1 -0
- package/dist/wwwroot/routes/api/file/index.js +59 -0
- package/dist/wwwroot/routes/api/file/index.js.map +1 -0
- package/dist/wwwroot/routes/api/files/get.d.ts +1 -2
- package/dist/wwwroot/routes/api/files/get.d.ts.map +1 -1
- package/dist/wwwroot/routes/api/files/get.js +11 -29
- package/dist/wwwroot/routes/api/files/get.js.map +1 -1
- package/package.json +1 -1
- package/src/server/model/entities/AppFile.ts +5 -4
- package/src/server/services/convert/FileConversionService.ts +64 -1
- package/src/wwwroot/routes/api/channel/file/{get.ts → index.ts} +10 -25
- package/src/wwwroot/routes/api/emails/attachment/index.ts +63 -0
- package/src/wwwroot/routes/api/file/index.ts +60 -0
- package/src/wwwroot/routes/api/files/get.ts +10 -23
- package/dist/wwwroot/routes/api/channel/file/get.d.ts.map +0 -1
- package/dist/wwwroot/routes/api/channel/file/get.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppFile.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/AppFile.ts"],"names":[],"mappings":"AAIA,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAI3C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAE9C,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,YAAY,MAAM,mBAAmB,CAAC;AAC7C,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAE/E,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"AppFile.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/AppFile.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,7 @@ import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
|
|
|
21
21
|
import LoginSession from "./LoginSession.js";
|
|
22
22
|
import { apiPath } from "../../../common/globalEnv.js";
|
|
23
23
|
import CheckConstraint from "@entity-access/entity-access/dist/decorators/CheckConstraint.js";
|
|
24
|
+
import { Base36 } from "../../../common/Base36.js";
|
|
24
25
|
const accessTypesEnum = ["create", "read", "write", "delegate"];
|
|
25
26
|
const contentDispositions = ["attachment", "inline"];
|
|
26
27
|
/**
|
|
@@ -36,18 +37,18 @@ const contentDispositions = ["attachment", "inline"];
|
|
|
36
37
|
let AppFile = class AppFile {
|
|
37
38
|
get url() {
|
|
38
39
|
if (this.emailID) {
|
|
39
|
-
return apiPath(`/api/emails/
|
|
40
|
+
return apiPath(`/api/emails/attachment/view/${Base36.encode(this.emailID)}/${Base36.encode(this.appFileID)}/${this.name}`);
|
|
40
41
|
}
|
|
41
|
-
return apiPath(`/api/
|
|
42
|
+
return apiPath(`/api/file/view/${Base36.encode(this.appFileID)}/${Base36.encode(this.fileContentID)}/${this.name}`);
|
|
42
43
|
}
|
|
43
44
|
set url(v) {
|
|
44
45
|
// ignore...
|
|
45
46
|
}
|
|
46
47
|
get downloadUrl() {
|
|
47
48
|
if (this.emailID) {
|
|
48
|
-
return apiPath(`/api/emails/
|
|
49
|
+
return apiPath(`/api/emails/attachment/view/${Base36.encode(this.emailID)}/${Base36.encode(this.appFileID)}/${this.name}`);
|
|
49
50
|
}
|
|
50
|
-
return apiPath(`/api/
|
|
51
|
+
return apiPath(`/api/file/download/${Base36.encode(this.appFileID)}/${Base36.encode(this.fileContentID)}/${this.name}`);
|
|
51
52
|
}
|
|
52
53
|
set downloadUrl(v) {
|
|
53
54
|
// ignore...
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppFile.js","sourceRoot":"","sources":["../../../../src/server/model/entities/AppFile.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,wDAAwD,CAAC;AAC5E,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAC1E,OAAO,YAAY,MAAM,2DAA2D,CAAC;AACrF,OAAO,EAAsB,YAAY,EAAE,oBAAoB,EAAE,MAAO,2DAA2D,CAAC;AACpI,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,wDAAwD,CAAC;AAElF,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,YAAY,MAAM,mBAAmB,CAAC;AAQ7C,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAGvD,OAAO,eAAe,MAAM,iEAAiE,CAAC;
|
|
1
|
+
{"version":3,"file":"AppFile.js","sourceRoot":"","sources":["../../../../src/server/model/entities/AppFile.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,20 @@
|
|
|
1
1
|
import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
|
|
2
|
+
import AppFile from "../../model/entities/AppFile.js";
|
|
3
|
+
interface IDownloadConvertedFile {
|
|
4
|
+
appFile: AppFile;
|
|
5
|
+
fileContentID?: number;
|
|
6
|
+
type: string;
|
|
7
|
+
fileName: string;
|
|
8
|
+
key?: string;
|
|
9
|
+
}
|
|
2
10
|
export default class FileConversionService {
|
|
3
11
|
private tempFileService;
|
|
12
|
+
private cacheService;
|
|
13
|
+
downloadConvertedFile({ appFile, fileContentID, type, fileName, key }: IDownloadConvertedFile): Promise<LocalFile>;
|
|
14
|
+
downloadFileContent(appFile: AppFile, fileContentID?: number): Promise<LocalFile>;
|
|
4
15
|
pdf(file: LocalFile): Promise<LocalFile>;
|
|
5
16
|
html(file: LocalFile): Promise<LocalFile>;
|
|
6
17
|
webm(file: LocalFile): Promise<LocalFile>;
|
|
7
18
|
}
|
|
19
|
+
export {};
|
|
8
20
|
//# sourceMappingURL=FileConversionService.d.ts.map
|
|
@@ -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;
|
|
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;AAI/E,OAAO,OAAO,MAAM,iCAAiC,CAAC;AAMtD,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,GAA0D,EAAE,EAAE,sBAAsB;IAgCnJ,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;CAW7B"}
|
|
@@ -7,12 +7,53 @@ 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
|
-
import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
|
|
10
|
+
import Inject, { RegisterScoped, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
|
|
11
11
|
import TempFileService from "../../storage/TempFileService.js";
|
|
12
12
|
import { Convert } from "./Convert.js";
|
|
13
13
|
import PdfDoc from "../extract/pdf/PdfDoc.js";
|
|
14
14
|
import FFCommand from "./FFCommand.js";
|
|
15
|
+
import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
|
|
16
|
+
import CacheService from "../cache/CacheService.js";
|
|
17
|
+
import ImageConverterService from "../image-converter/ImageConverterService.js";
|
|
18
|
+
import SocialMailContext from "../../model/SocialMailContext.js";
|
|
15
19
|
let FileConversionService = class FileConversionService {
|
|
20
|
+
async downloadConvertedFile({ appFile, fileContentID, type, fileName, key = `/file/${type}/${appFile.fileContentID}/${fileName}` }) {
|
|
21
|
+
let file;
|
|
22
|
+
const ttl = TimeSpan.fromDays(30);
|
|
23
|
+
// transform here...
|
|
24
|
+
if (/^(size|jpg|png|webp|gif|face\-circle)\(/i.test(type)) {
|
|
25
|
+
return await this.cacheService.get({ key, ttl,
|
|
26
|
+
factory: async () => {
|
|
27
|
+
file = await this.downloadFileContent(appFile, fileContentID);
|
|
28
|
+
// resize...
|
|
29
|
+
const ics = ServiceProvider.resolve(this, ImageConverterService);
|
|
30
|
+
return await ics.transform(type, file, fileName);
|
|
31
|
+
}
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
if (/^(pdf|html|webm)$/i.test(type)) {
|
|
35
|
+
return await this.cacheService.get({ key, ttl,
|
|
36
|
+
factory: async () => {
|
|
37
|
+
file = await this.downloadFileContent(appFile, fileContentID);
|
|
38
|
+
const ics = this;
|
|
39
|
+
return await ics[type.toLowerCase()](file, fileName);
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
return await this.downloadFileContent(appFile, fileContentID);
|
|
44
|
+
}
|
|
45
|
+
async downloadFileContent(appFile, fileContentID) {
|
|
46
|
+
if (!fileContentID || fileContentID === appFile.fileContentID) {
|
|
47
|
+
return this.tempFileService.downloadAppFile(appFile);
|
|
48
|
+
}
|
|
49
|
+
const { appFileID } = appFile;
|
|
50
|
+
const db = ServiceProvider.resolve(this, SocialMailContext);
|
|
51
|
+
const fc = await db.fileContents
|
|
52
|
+
.where({ fileContentID, appFileID }, (p) => (x) => x.fileContentID === p.fileContentID
|
|
53
|
+
&& x.versions.some((v) => v.fileID === p.appFileID))
|
|
54
|
+
.firstOrFail();
|
|
55
|
+
return this.tempFileService.downloadFileContent(fc, appFile);
|
|
56
|
+
}
|
|
16
57
|
async pdf(file) {
|
|
17
58
|
if (/pdf/i.test(file.contentType) || /\.pdf$/i.test(file.fileName)) {
|
|
18
59
|
return file;
|
|
@@ -60,6 +101,10 @@ __decorate([
|
|
|
60
101
|
Inject,
|
|
61
102
|
__metadata("design:type", TempFileService)
|
|
62
103
|
], FileConversionService.prototype, "tempFileService", void 0);
|
|
104
|
+
__decorate([
|
|
105
|
+
Inject,
|
|
106
|
+
__metadata("design:type", CacheService)
|
|
107
|
+
], FileConversionService.prototype, "cacheService", void 0);
|
|
63
108
|
FileConversionService = __decorate([
|
|
64
109
|
RegisterScoped
|
|
65
110
|
], 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,MAAM,4CAA4C,CAAC;
|
|
1
|
+
{"version":3,"file":"FileConversionService.js","sourceRoot":"","sources":["../../../../src/server/services/convert/FileConversionService.ts"],"names":[],"mappings":"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"}
|