@stemy/backend 2.8.6 → 2.9.3

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.
@@ -17,10 +17,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
17
17
  });
18
18
  };
19
19
  import { injectable, Lifecycle, scoped } from "tsyringe";
20
- import { fromStream } from "file-type";
21
20
  import { ObjectId } from "bson";
22
21
  import axios from "axios";
23
- import { bufferToStream, copyStream } from "../utils";
22
+ import { bufferToStream, copyStream, streamToBuffer } from "../utils";
24
23
  import { MongoConnector } from "./mongo-connector";
25
24
  import { AssetProcessor } from "./asset-processor";
26
25
  import { Asset } from "./entities/asset";
@@ -34,56 +33,37 @@ let Assets = class Assets {
34
33
  }
35
34
  write(stream, contentType = null, metadata = null) {
36
35
  return __awaiter(this, void 0, void 0, function* () {
37
- let extension = null;
38
- const fileTypeStream = copyStream(stream);
39
36
  const uploadStream = copyStream(stream);
37
+ const buffer = yield streamToBuffer(stream);
38
+ let fileType = { ext: "", mime: contentType };
40
39
  try {
41
- const fileType = yield fromStream(fileTypeStream);
42
- contentType = fileType.mime;
43
- extension = fileType.ext;
40
+ fileType = yield AssetProcessor.fileTypeFromBuffer(buffer);
44
41
  }
45
42
  catch (e) {
46
- if (!contentType) {
47
- throw `Can't determine content type`;
43
+ if (!fileType.mime) {
44
+ throw `Can't determine mime type`;
48
45
  }
49
- console.log(`Can't determine content type`, e);
46
+ console.log(`Can't determine mime type`, e);
50
47
  }
51
- contentType = contentType.trim();
52
- extension = (extension || "").trim();
53
- metadata = Object.assign({
54
- extension,
55
- downloadCount: 0,
56
- firstDownload: null,
57
- lastDownload: null
58
- }, metadata || {});
59
- metadata.filename = metadata.filename || new ObjectId().toHexString();
60
- return new Promise(((resolve, reject) => {
61
- const uploaderStream = this.bucket.openUploadStream(metadata.filename);
62
- uploadStream.pipe(uploaderStream)
63
- .on("error", error => {
64
- reject(error.message || error);
65
- })
66
- .on("finish", () => {
67
- const asset = new Asset(uploaderStream.id, {
68
- filename: metadata.filename,
69
- contentType,
70
- metadata
71
- }, this.collection, this.bucket);
72
- asset.save().then(() => {
73
- resolve(asset);
74
- }, error => {
75
- reject(error.message || error);
76
- });
77
- });
78
- }));
48
+ metadata = metadata || {};
49
+ return this.upload(uploadStream, fileType, metadata);
79
50
  });
80
51
  }
81
52
  writeBuffer(buffer, metadata = null, contentType = null) {
82
53
  return __awaiter(this, void 0, void 0, function* () {
83
- contentType = yield AssetProcessor.getMimeType(buffer, contentType);
54
+ let fileType = { ext: "", mime: contentType };
55
+ try {
56
+ fileType = yield AssetProcessor.fileTypeFromBuffer(buffer);
57
+ }
58
+ catch (e) {
59
+ if (!fileType.mime) {
60
+ throw `Can't determine mime type`;
61
+ }
62
+ console.log(`Can't determine mime type`, e);
63
+ }
84
64
  metadata = metadata || {};
85
- buffer = yield this.assetProcessor.process(buffer, metadata, contentType);
86
- return this.write(bufferToStream(buffer), contentType, metadata);
65
+ buffer = yield this.assetProcessor.process(buffer, metadata, fileType);
66
+ return this.upload(bufferToStream(buffer), fileType, metadata);
87
67
  });
88
68
  }
89
69
  writeUrl(url, metadata = null) {
@@ -124,6 +104,37 @@ let Assets = class Assets {
124
104
  return asset.unlink();
125
105
  });
126
106
  }
107
+ upload(stream, fileType, metadata) {
108
+ return __awaiter(this, void 0, void 0, function* () {
109
+ const contentType = fileType.mime.trim();
110
+ metadata = Object.assign({
111
+ downloadCount: 0,
112
+ firstDownload: null,
113
+ lastDownload: null
114
+ }, metadata || {});
115
+ metadata.filename = metadata.filename || new ObjectId().toHexString();
116
+ metadata.extension = (fileType.ext || "").trim();
117
+ return new Promise(((resolve, reject) => {
118
+ const uploaderStream = this.bucket.openUploadStream(metadata.filename);
119
+ stream.pipe(uploaderStream)
120
+ .on("error", error => {
121
+ reject(error.message || error);
122
+ })
123
+ .on("finish", () => {
124
+ const asset = new Asset(uploaderStream.id, {
125
+ filename: metadata.filename,
126
+ contentType,
127
+ metadata
128
+ }, this.collection, this.bucket);
129
+ asset.save().then(() => {
130
+ resolve(asset);
131
+ }, error => {
132
+ reject(error.message || error);
133
+ });
134
+ });
135
+ }));
136
+ });
137
+ }
127
138
  };
128
139
  Assets = __decorate([
129
140
  injectable(),
@@ -131,4 +142,4 @@ Assets = __decorate([
131
142
  __metadata("design:paramtypes", [MongoConnector, AssetProcessor])
132
143
  ], Assets);
133
144
  export { Assets };
134
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../src/services/assets.ts"],"names":[],"mappings":"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","sourcesContent":["import {injectable, Lifecycle, scoped} from \"tsyringe\";\r\nimport {fromStream} from \"file-type\";\r\nimport {Readable} from \"stream\";\r\nimport {ObjectId} from \"bson\";\r\nimport {Collection, GridFSBucket} from \"mongodb\";\r\nimport {FilterQuery} from \"mongoose\";\r\nimport axios from \"axios\";\r\n\r\nimport {bufferToStream, copyStream} from \"../utils\";\r\nimport {IAsset, IAssetMeta} from \"../common-types\";\r\nimport {MongoConnector} from \"./mongo-connector\";\r\nimport {AssetProcessor} from \"./asset-processor\";\r\nimport {Asset} from \"./entities/asset\";\r\n\r\n@injectable()\r\n@scoped(Lifecycle.ContainerScoped)\r\nexport class Assets {\r\n\r\n    readonly bucket: GridFSBucket;\r\n    readonly collection: Collection;\r\n\r\n    constructor(readonly connector: MongoConnector, readonly assetProcessor: AssetProcessor) {\r\n        this.bucket = connector.bucket;\r\n        this.collection = connector.database?.collection(\"assets.files\");\r\n    }\r\n\r\n    async write(stream: Readable, contentType: string = null, metadata: IAssetMeta = null): Promise<IAsset> {\r\n        let extension: string = null;\r\n        const fileTypeStream = copyStream(stream);\r\n        const uploadStream = copyStream(stream);\r\n        try {\r\n            const fileType = await fromStream(fileTypeStream);\r\n            contentType = fileType.mime;\r\n            extension = fileType.ext;\r\n        } catch (e) {\r\n            if (!contentType) {\r\n                throw `Can't determine content type`;\r\n            }\r\n            console.log(`Can't determine content type`, e);\r\n        }\r\n        contentType = contentType.trim();\r\n        extension = (extension || \"\").trim();\r\n        metadata = Object.assign({\r\n            extension,\r\n            downloadCount: 0,\r\n            firstDownload: null,\r\n            lastDownload: null\r\n        }, metadata || {});\r\n        metadata.filename = metadata.filename || new ObjectId().toHexString();\r\n        return new Promise<IAsset>(((resolve, reject) => {\r\n            const uploaderStream = this.bucket.openUploadStream(metadata.filename);\r\n            uploadStream.pipe(uploaderStream)\r\n                .on(\"error\", error => {\r\n                    reject(error.message || error);\r\n                })\r\n                .on(\"finish\", () => {\r\n                    const asset = new Asset(uploaderStream.id as ObjectId, {\r\n                        filename: metadata.filename,\r\n                        contentType,\r\n                        metadata\r\n                    }, this.collection, this.bucket);\r\n                    asset.save().then(() => {\r\n                        resolve(asset);\r\n                    }, error => {\r\n                        reject(error.message || error);\r\n                    });\r\n                });\r\n        }));\r\n    }\r\n\r\n    async writeBuffer(buffer: Buffer, metadata: IAssetMeta = null, contentType: string = null): Promise<IAsset> {\r\n        contentType = await AssetProcessor.getMimeType(buffer, contentType);\r\n        metadata = metadata || {};\r\n        buffer = await this.assetProcessor.process(buffer, metadata, contentType);\r\n        return this.write(bufferToStream(buffer), contentType, metadata);\r\n    }\r\n\r\n    async writeUrl(url: string, metadata: IAssetMeta = null): Promise<IAsset> {\r\n        const buffer = (await axios({ url, responseType: \"arraybuffer\" })).data as Buffer;\r\n        return this.writeBuffer(buffer, metadata);\r\n    }\r\n\r\n    async read(id: string): Promise<IAsset> {\r\n        return !id ? null : this.find({_id: new ObjectId(id)});\r\n    }\r\n\r\n    async find(where: FilterQuery<IAsset>): Promise<IAsset> {\r\n        const data = await this.collection.findOne(where);\r\n        return !data ? null : new Asset(data._id, data, this.collection, this.bucket);\r\n    }\r\n\r\n    async findMany(where: FilterQuery<IAsset>): Promise<ReadonlyArray<IAsset>> {\r\n        const cursor = this.collection.find(where);\r\n        const items = await cursor.toArray() || [];\r\n        const result: IAsset[] = [];\r\n        for (let item of items) {\r\n            if (!item) continue;\r\n            result.push(new Asset(item._id, item, this.collection, this.bucket));\r\n        }\r\n        return result;\r\n    }\r\n\r\n    async unlink(id: string): Promise<any> {\r\n        const asset = await this.read(id);\r\n        if (!asset) return null;\r\n        return asset.unlink();\r\n    }\r\n}\r\n"]}
145
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../src/services/assets.ts"],"names":[],"mappings":"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","sourcesContent":["import {injectable, Lifecycle, scoped} from \"tsyringe\";\r\nimport {Readable} from \"stream\";\r\nimport {ObjectId} from \"bson\";\r\nimport {Collection, GridFSBucket} from \"mongodb\";\r\nimport {FilterQuery} from \"mongoose\";\r\nimport axios from \"axios\";\r\n\r\nimport {bufferToStream, copyStream, streamToBuffer} from \"../utils\";\r\nimport {IAsset, IAssetMeta, IFileType} from \"../common-types\";\r\nimport {MongoConnector} from \"./mongo-connector\";\r\nimport {AssetProcessor} from \"./asset-processor\";\r\nimport {Asset} from \"./entities/asset\";\r\n\r\n@injectable()\r\n@scoped(Lifecycle.ContainerScoped)\r\nexport class Assets {\r\n\r\n    readonly bucket: GridFSBucket;\r\n    readonly collection: Collection;\r\n\r\n    constructor(readonly connector: MongoConnector, readonly assetProcessor: AssetProcessor) {\r\n        this.bucket = connector.bucket;\r\n        this.collection = connector.database?.collection(\"assets.files\");\r\n    }\r\n\r\n    async write(stream: Readable, contentType: string = null, metadata: IAssetMeta = null): Promise<IAsset> {\r\n        const uploadStream = copyStream(stream);\r\n        const buffer = await streamToBuffer(stream);\r\n        let fileType = {ext: \"\", mime: contentType} as IFileType;\r\n        try {\r\n            fileType = await AssetProcessor.fileTypeFromBuffer(buffer);\r\n        } catch (e) {\r\n            if (!fileType.mime) {\r\n                throw `Can't determine mime type`;\r\n            }\r\n            console.log(`Can't determine mime type`, e);\r\n        }\r\n        metadata = metadata || {};\r\n        return this.upload(uploadStream, fileType, metadata);\r\n    }\r\n\r\n    async writeBuffer(buffer: Buffer, metadata: IAssetMeta = null, contentType: string = null): Promise<IAsset> {\r\n        let fileType = {ext: \"\", mime: contentType} as IFileType;\r\n        try {\r\n            fileType = await AssetProcessor.fileTypeFromBuffer(buffer);\r\n        } catch (e) {\r\n            if (!fileType.mime) {\r\n                throw `Can't determine mime type`;\r\n            }\r\n            console.log(`Can't determine mime type`, e);\r\n        }\r\n        metadata = metadata || {};\r\n        buffer = await this.assetProcessor.process(buffer, metadata, fileType);\r\n        return this.upload(bufferToStream(buffer), fileType, metadata);\r\n    }\r\n\r\n    async writeUrl(url: string, metadata: IAssetMeta = null): Promise<IAsset> {\r\n        const buffer = (await axios({ url, responseType: \"arraybuffer\" })).data as Buffer;\r\n        return this.writeBuffer(buffer, metadata);\r\n    }\r\n\r\n    async read(id: string): Promise<IAsset> {\r\n        return !id ? null : this.find({_id: new ObjectId(id)});\r\n    }\r\n\r\n    async find(where: FilterQuery<IAsset>): Promise<IAsset> {\r\n        const data = await this.collection.findOne(where);\r\n        return !data ? null : new Asset(data._id, data, this.collection, this.bucket);\r\n    }\r\n\r\n    async findMany(where: FilterQuery<IAsset>): Promise<ReadonlyArray<IAsset>> {\r\n        const cursor = this.collection.find(where);\r\n        const items = await cursor.toArray() || [];\r\n        const result: IAsset[] = [];\r\n        for (let item of items) {\r\n            if (!item) continue;\r\n            result.push(new Asset(item._id, item, this.collection, this.bucket));\r\n        }\r\n        return result;\r\n    }\r\n\r\n    async unlink(id: string): Promise<any> {\r\n        const asset = await this.read(id);\r\n        if (!asset) return null;\r\n        return asset.unlink();\r\n    }\r\n\r\n    protected async upload(stream: Readable, fileType: IFileType, metadata: IAssetMeta): Promise<IAsset> {\r\n        const contentType = fileType.mime.trim();\r\n        metadata = Object.assign({\r\n            downloadCount: 0,\r\n            firstDownload: null,\r\n            lastDownload: null\r\n        }, metadata || {});\r\n        metadata.filename = metadata.filename || new ObjectId().toHexString();\r\n        metadata.extension = (fileType.ext || \"\").trim();\r\n        return new Promise<IAsset>(((resolve, reject) => {\r\n            const uploaderStream = this.bucket.openUploadStream(metadata.filename);\r\n            stream.pipe(uploaderStream)\r\n                .on(\"error\", error => {\r\n                    reject(error.message || error);\r\n                })\r\n                .on(\"finish\", () => {\r\n                    const asset = new Asset(uploaderStream.id as ObjectId, {\r\n                        filename: metadata.filename,\r\n                        contentType,\r\n                        metadata\r\n                    }, this.collection, this.bucket);\r\n                    asset.save().then(() => {\r\n                        resolve(asset);\r\n                    }, error => {\r\n                        reject(error.message || error);\r\n                    });\r\n                });\r\n        }));\r\n    }\r\n}\r\n"]}
@@ -2,7 +2,7 @@ import { dirname, basename, join, resolve } from 'path';
2
2
  import { json } from 'body-parser';
3
3
  import { sign, verify } from 'jsonwebtoken';
4
4
  import { injectable, scoped, Lifecycle, injectAll, singleton, inject, isFactoryProvider, container } from 'tsyringe';
5
- import { createParamDecorator, BadRequestError, HttpError, getMetadataArgsStorage, Authorized, Post, UploadedFile, Body, Get, Param, QueryParams, QueryParam, Res, Controller, CurrentUser, Middleware, useContainer, useExpressServer } from 'routing-controllers';
5
+ import { createParamDecorator, BadRequestError, HttpError, getMetadataArgsStorage, Authorized, Post, UploadedFile, Body, Get, Param, QueryParams, Res, QueryParam, Controller, CurrentUser, Middleware, useContainer, useExpressServer } from 'routing-controllers';
6
6
  import { OnMessage, ConnectedSocket, MessageBody, SocketController, Middleware as Middleware$1, useContainer as useContainer$1, useSocketServer } from 'socket-controllers';
7
7
  import { routingControllersToSpec } from 'routing-controllers-openapi';
8
8
  import { defaultMetadataStorage } from 'class-transformer/storage';
@@ -18,7 +18,7 @@ import { getValue as getValue$1, setValue } from 'mongoose/lib/utils';
18
18
  import { PassThrough, Readable } from 'stream';
19
19
  import { ObjectId } from 'bson';
20
20
  import fontKit_ from 'fontkit';
21
- import { fromBuffer, fromStream } from 'file-type';
21
+ import { fromBuffer } from 'file-type';
22
22
  import sharp_ from 'sharp';
23
23
  import axios from 'axios';
24
24
  import { GridFSBucket } from 'mongodb';
@@ -774,18 +774,24 @@ const fontProps = [
774
774
  "xHeight", "numGlyphs", "characterSet", "availableFeatures"
775
775
  ];
776
776
  let AssetProcessor = AssetProcessor_1 = class AssetProcessor {
777
- static getMimeType(buffer, mimeType) {
777
+ static checkTextFileType(type) {
778
+ return type.mime.indexOf("text") >= 0 || type.mime.indexOf("xml") >= 0;
779
+ }
780
+ static fixTextFileType(type, buffer) {
781
+ const text = buffer.toString("utf8");
782
+ if (text.indexOf("<svg") >= 0) {
783
+ return { ext: "svg", mime: "image/svg+xml" };
784
+ }
785
+ return type;
786
+ }
787
+ static fileTypeFromBuffer(buffer) {
788
+ var _a;
778
789
  return __awaiter$u(this, void 0, void 0, function* () {
779
- try {
780
- mimeType = (yield fromBuffer(buffer)).mime;
790
+ const type = ((_a = yield fromBuffer(buffer)) !== null && _a !== void 0 ? _a : { ext: "txt", mime: "text/plain" });
791
+ if (AssetProcessor_1.checkTextFileType(type)) {
792
+ return AssetProcessor_1.fixTextFileType(type, buffer);
781
793
  }
782
- catch (e) {
783
- if (!mimeType) {
784
- throw `Can't determine mime type`;
785
- }
786
- console.log(`Can't determine mime type`, e);
787
- }
788
- return mimeType;
794
+ return type;
789
795
  });
790
796
  }
791
797
  static extractFontFormat(font) {
@@ -823,12 +829,12 @@ let AssetProcessor = AssetProcessor_1 = class AssetProcessor {
823
829
  metadata[prop] = font[prop];
824
830
  });
825
831
  }
826
- process(buffer, metadata, contentType) {
832
+ process(buffer, metadata, fileType) {
827
833
  return __awaiter$u(this, void 0, void 0, function* () {
828
- if (AssetProcessor_1.isImage(contentType)) {
834
+ if (AssetProcessor_1.isImage(fileType.mime)) {
829
835
  buffer = yield AssetProcessor_1.copyImageMeta(buffer, metadata);
830
836
  }
831
- if (AssetProcessor_1.isFont(contentType)) {
837
+ if (AssetProcessor_1.isFont(fileType.mime)) {
832
838
  AssetProcessor_1.copyFontMeta(buffer, metadata);
833
839
  }
834
840
  return buffer;
@@ -1171,56 +1177,37 @@ let Assets = class Assets {
1171
1177
  }
1172
1178
  write(stream, contentType = null, metadata = null) {
1173
1179
  return __awaiter$q(this, void 0, void 0, function* () {
1174
- let extension = null;
1175
- const fileTypeStream = copyStream(stream);
1176
1180
  const uploadStream = copyStream(stream);
1181
+ const buffer = yield streamToBuffer(stream);
1182
+ let fileType = { ext: "", mime: contentType };
1177
1183
  try {
1178
- const fileType = yield fromStream(fileTypeStream);
1179
- contentType = fileType.mime;
1180
- extension = fileType.ext;
1184
+ fileType = yield AssetProcessor.fileTypeFromBuffer(buffer);
1181
1185
  }
1182
1186
  catch (e) {
1183
- if (!contentType) {
1184
- throw `Can't determine content type`;
1187
+ if (!fileType.mime) {
1188
+ throw `Can't determine mime type`;
1185
1189
  }
1186
- console.log(`Can't determine content type`, e);
1190
+ console.log(`Can't determine mime type`, e);
1187
1191
  }
1188
- contentType = contentType.trim();
1189
- extension = (extension || "").trim();
1190
- metadata = Object.assign({
1191
- extension,
1192
- downloadCount: 0,
1193
- firstDownload: null,
1194
- lastDownload: null
1195
- }, metadata || {});
1196
- metadata.filename = metadata.filename || new ObjectId().toHexString();
1197
- return new Promise(((resolve, reject) => {
1198
- const uploaderStream = this.bucket.openUploadStream(metadata.filename);
1199
- uploadStream.pipe(uploaderStream)
1200
- .on("error", error => {
1201
- reject(error.message || error);
1202
- })
1203
- .on("finish", () => {
1204
- const asset = new Asset(uploaderStream.id, {
1205
- filename: metadata.filename,
1206
- contentType,
1207
- metadata
1208
- }, this.collection, this.bucket);
1209
- asset.save().then(() => {
1210
- resolve(asset);
1211
- }, error => {
1212
- reject(error.message || error);
1213
- });
1214
- });
1215
- }));
1192
+ metadata = metadata || {};
1193
+ return this.upload(uploadStream, fileType, metadata);
1216
1194
  });
1217
1195
  }
1218
1196
  writeBuffer(buffer, metadata = null, contentType = null) {
1219
1197
  return __awaiter$q(this, void 0, void 0, function* () {
1220
- contentType = yield AssetProcessor.getMimeType(buffer, contentType);
1198
+ let fileType = { ext: "", mime: contentType };
1199
+ try {
1200
+ fileType = yield AssetProcessor.fileTypeFromBuffer(buffer);
1201
+ }
1202
+ catch (e) {
1203
+ if (!fileType.mime) {
1204
+ throw `Can't determine mime type`;
1205
+ }
1206
+ console.log(`Can't determine mime type`, e);
1207
+ }
1221
1208
  metadata = metadata || {};
1222
- buffer = yield this.assetProcessor.process(buffer, metadata, contentType);
1223
- return this.write(bufferToStream(buffer), contentType, metadata);
1209
+ buffer = yield this.assetProcessor.process(buffer, metadata, fileType);
1210
+ return this.upload(bufferToStream(buffer), fileType, metadata);
1224
1211
  });
1225
1212
  }
1226
1213
  writeUrl(url, metadata = null) {
@@ -1261,6 +1248,37 @@ let Assets = class Assets {
1261
1248
  return asset.unlink();
1262
1249
  });
1263
1250
  }
1251
+ upload(stream, fileType, metadata) {
1252
+ return __awaiter$q(this, void 0, void 0, function* () {
1253
+ const contentType = fileType.mime.trim();
1254
+ metadata = Object.assign({
1255
+ downloadCount: 0,
1256
+ firstDownload: null,
1257
+ lastDownload: null
1258
+ }, metadata || {});
1259
+ metadata.filename = metadata.filename || new ObjectId().toHexString();
1260
+ metadata.extension = (fileType.ext || "").trim();
1261
+ return new Promise(((resolve, reject) => {
1262
+ const uploaderStream = this.bucket.openUploadStream(metadata.filename);
1263
+ stream.pipe(uploaderStream)
1264
+ .on("error", error => {
1265
+ reject(error.message || error);
1266
+ })
1267
+ .on("finish", () => {
1268
+ const asset = new Asset(uploaderStream.id, {
1269
+ filename: metadata.filename,
1270
+ contentType,
1271
+ metadata
1272
+ }, this.collection, this.bucket);
1273
+ asset.save().then(() => {
1274
+ resolve(asset);
1275
+ }, error => {
1276
+ reject(error.message || error);
1277
+ });
1278
+ });
1279
+ }));
1280
+ });
1281
+ }
1264
1282
  };
1265
1283
  Assets = __decorate$t([
1266
1284
  injectable(),
@@ -2860,40 +2878,42 @@ let AssetsController = class AssetsController {
2860
2878
  }
2861
2879
  });
2862
2880
  }
2863
- getImageRotation(id, params, rotation = 0) {
2864
- var _a;
2881
+ getImageRotation(id, params, res, rotation = 0) {
2865
2882
  return __awaiter$7(this, void 0, void 0, function* () {
2866
- const asset = yield this.assetResolver.resolve(id, params.lazy);
2867
- if (!asset) {
2868
- throw new HttpError(404, `Image with id: '${id}' not found.`);
2869
- }
2870
- if ((_a = asset.metadata) === null || _a === void 0 ? void 0 : _a.classified) {
2871
- throw new HttpError(403, `Image is classified, and can be only downloaded from a custom url.`);
2872
- }
2883
+ const asset = yield this.getAsset("Image", id, params.lazy, res);
2873
2884
  params.rotation = params.rotation || rotation;
2874
2885
  return asset.downloadImage(params);
2875
2886
  });
2876
2887
  }
2877
- getImage(id, params) {
2888
+ getImage(id, params, res) {
2878
2889
  return __awaiter$7(this, void 0, void 0, function* () {
2879
- return this.getImageRotation(id, params);
2890
+ return this.getImageRotation(id, params, res);
2880
2891
  });
2881
2892
  }
2882
2893
  getFile(id, lazy, res) {
2894
+ return __awaiter$7(this, void 0, void 0, function* () {
2895
+ const asset = yield this.getAsset("Asset", id, lazy, res);
2896
+ return asset.download();
2897
+ });
2898
+ }
2899
+ getAsset(type, id, lazy, res) {
2883
2900
  var _a, _b;
2884
2901
  return __awaiter$7(this, void 0, void 0, function* () {
2885
2902
  const asset = yield this.assetResolver.resolve(id, lazy);
2886
2903
  if (!asset) {
2887
- throw new HttpError(404, `File with id: '${id}' not found.`);
2904
+ throw new HttpError(404, `${type} with id: '${id}' not found.`);
2888
2905
  }
2889
2906
  if ((_a = asset.metadata) === null || _a === void 0 ? void 0 : _a.classified) {
2890
- throw new HttpError(403, `Asset is classified, and can be only downloaded from a custom url.`);
2907
+ throw new HttpError(403, `${type} is classified, and can be only downloaded from a custom url.`);
2891
2908
  }
2892
2909
  const ext = (_b = asset.metadata) === null || _b === void 0 ? void 0 : _b.extension;
2893
2910
  if (ext) {
2894
2911
  res.header("content-disposition", `inline; filename=${asset.filename}.${ext}`);
2895
2912
  }
2896
- return asset.download();
2913
+ if (asset.contentType) {
2914
+ res.header("content-type", asset.contentType);
2915
+ }
2916
+ return asset;
2897
2917
  });
2898
2918
  }
2899
2919
  };
@@ -2915,16 +2935,16 @@ __decorate$a([
2915
2935
  ], AssetsController.prototype, "uploadUrl", null);
2916
2936
  __decorate$a([
2917
2937
  Get("/image/:id/:rotation"),
2918
- __param$5(0, Param("id")), __param$5(1, QueryParams()), __param$5(2, Param("rotation")),
2938
+ __param$5(0, Param("id")), __param$5(1, QueryParams()), __param$5(2, Res()), __param$5(3, Param("rotation")),
2919
2939
  __metadata$7("design:type", Function),
2920
- __metadata$7("design:paramtypes", [String, Object, Number]),
2940
+ __metadata$7("design:paramtypes", [String, Object, Object, Number]),
2921
2941
  __metadata$7("design:returntype", Promise)
2922
2942
  ], AssetsController.prototype, "getImageRotation", null);
2923
2943
  __decorate$a([
2924
2944
  Get("/image/:id"),
2925
- __param$5(0, Param("id")), __param$5(1, QueryParams()),
2945
+ __param$5(0, Param("id")), __param$5(1, QueryParams()), __param$5(2, Res()),
2926
2946
  __metadata$7("design:type", Function),
2927
- __metadata$7("design:paramtypes", [String, Object]),
2947
+ __metadata$7("design:paramtypes", [String, Object, Object]),
2928
2948
  __metadata$7("design:returntype", Promise)
2929
2949
  ], AssetsController.prototype, "getImage", null);
2930
2950
  __decorate$a([