@stemy/backend 2.8.5 → 2.9.2

package/esm2015/services/assets.js

@@ -17,10 +17,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { injectable, Lifecycle, scoped } from "tsyringe";
-import { fromStream } from "file-type";
 import { ObjectId } from "bson";
 import axios from "axios";
-import { bufferToStream, copyStream } from "../utils";
+import { bufferToStream, copyStream, streamToBuffer } from "../utils";
 import { MongoConnector } from "./mongo-connector";
 import { AssetProcessor } from "./asset-processor";
 import { Asset } from "./entities/asset";
@@ -34,56 +33,37 @@ let Assets = class Assets {
     }
     write(stream, contentType = null, metadata = null) {
         return __awaiter(this, void 0, void 0, function* () {
-            let extension = null;
-            const fileTypeStream = copyStream(stream);
             const uploadStream = copyStream(stream);
+            const buffer = yield streamToBuffer(stream);
+            let fileType = { ext: "", mime: contentType };
             try {
-                const fileType = yield fromStream(fileTypeStream);
-                contentType = fileType.mime;
-                extension = fileType.ext;
+                fileType = yield AssetProcessor.fileTypeFromBuffer(buffer);
             }
             catch (e) {
-                if (!contentType) {
-                    throw `Can't determine content type`;
+                if (!fileType.mime) {
+                    throw `Can't determine mime type`;
                 }
-                console.log(`Can't determine content type`, e);
+                console.log(`Can't determine mime type`, e);
             }
-            contentType = contentType.trim();
-            extension = (extension || "").trim();
-            metadata = Object.assign({
-                extension,
-                downloadCount: 0,
-                firstDownload: null,
-                lastDownload: null
-            }, metadata || {});
-            metadata.filename = metadata.filename || new ObjectId().toHexString();
-            return new Promise(((resolve, reject) => {
-                const uploaderStream = this.bucket.openUploadStream(metadata.filename);
-                uploadStream.pipe(uploaderStream)
-                    .on("error", error => {
-                    reject(error.message || error);
-                })
-                    .on("finish", () => {
-                    const asset = new Asset(uploaderStream.id, {
-                        filename: metadata.filename,
-                        contentType,
-                        metadata
-                    }, this.collection, this.bucket);
-                    asset.save().then(() => {
-                        resolve(asset);
-                    }, error => {
-                        reject(error.message || error);
-                    });
-                });
-            }));
+            metadata = metadata || {};
+            return this.upload(uploadStream, fileType, metadata);
         });
     }
     writeBuffer(buffer, metadata = null, contentType = null) {
         return __awaiter(this, void 0, void 0, function* () {
-            contentType = yield AssetProcessor.getMimeType(buffer, contentType);
+            let fileType = { ext: "", mime: contentType };
+            try {
+                fileType = yield AssetProcessor.fileTypeFromBuffer(buffer);
+            }
+            catch (e) {
+                if (!fileType.mime) {
+                    throw `Can't determine mime type`;
+                }
+                console.log(`Can't determine mime type`, e);
+            }
             metadata = metadata || {};
-            buffer = yield this.assetProcessor.process(buffer, metadata, contentType);
-            return this.write(bufferToStream(buffer), contentType, metadata);
+            buffer = yield this.assetProcessor.process(buffer, metadata, fileType);
+            return this.upload(bufferToStream(buffer), fileType, metadata);
         });
     }
     writeUrl(url, metadata = null) {
@@ -124,6 +104,38 @@ let Assets = class Assets {
             return asset.unlink();
         });
     }
+    upload(stream, fileType, metadata) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const contentType = fileType.mime.trim();
+            const extension = (fileType.ext || "").trim();
+            metadata = Object.assign({
+                extension,
+                downloadCount: 0,
+                firstDownload: null,
+                lastDownload: null
+            }, metadata || {});
+            metadata.filename = metadata.filename || new ObjectId().toHexString();
+            return new Promise(((resolve, reject) => {
+                const uploaderStream = this.bucket.openUploadStream(metadata.filename);
+                stream.pipe(uploaderStream)
+                    .on("error", error => {
+                    reject(error.message || error);
+                })
+                    .on("finish", () => {
+                    const asset = new Asset(uploaderStream.id, {
+                        filename: metadata.filename,
+                        contentType,
+                        metadata
+                    }, this.collection, this.bucket);
+                    asset.save().then(() => {
+                        resolve(asset);
+                    }, error => {
+                        reject(error.message || error);
+                    });
+                });
+            }));
+        });
+    }
 };
 Assets = __decorate([
     injectable(),
@@ -131,4 +143,4 @@ Assets = __decorate([
     __metadata("design:paramtypes", [MongoConnector, AssetProcessor])
 ], Assets);
 export { Assets };
-//# 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"]}
+//# 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        const extension = (fileType.ext || \"\").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            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"]}

package/fesm2015/stemy-backend.js

@@ -2,7 +2,7 @@ import { dirname, basename, join, resolve } from 'path';
 import { json } from 'body-parser';
 import { sign, verify } from 'jsonwebtoken';
 import { injectable, scoped, Lifecycle, injectAll, singleton, inject, isFactoryProvider, container } from 'tsyringe';
-import { createParamDecorator, BadRequestError, HttpError, getMetadataArgsStorage, Authorized, Post, UploadedFile, Body, Get, Param, QueryParams, QueryParam, Res, Controller, CurrentUser, Middleware, useContainer, useExpressServer } from 'routing-controllers';
+import { createParamDecorator, BadRequestError, HttpError, getMetadataArgsStorage, Authorized, Post, UploadedFile, Body, Get, Param, QueryParams, Res, QueryParam, Controller, CurrentUser, Middleware, useContainer, useExpressServer } from 'routing-controllers';
 import { OnMessage, ConnectedSocket, MessageBody, SocketController, Middleware as Middleware$1, useContainer as useContainer$1, useSocketServer } from 'socket-controllers';
 import { routingControllersToSpec } from 'routing-controllers-openapi';
 import { defaultMetadataStorage } from 'class-transformer/storage';
@@ -18,7 +18,7 @@ import { getValue as getValue$1, setValue } from 'mongoose/lib/utils';
 import { PassThrough, Readable } from 'stream';
 import { ObjectId } from 'bson';
 import fontKit_ from 'fontkit';
-import { fromBuffer, fromStream } from 'file-type';
+import { fromBuffer } from 'file-type';
 import sharp_ from 'sharp';
 import axios from 'axios';
 import { GridFSBucket } from 'mongodb';
@@ -774,18 +774,24 @@ const fontProps = [
     "xHeight", "numGlyphs", "characterSet", "availableFeatures"
 ];
 let AssetProcessor = AssetProcessor_1 = class AssetProcessor {
-    static getMimeType(buffer, mimeType) {
+    static checkTextFileType(type) {
+        return type.mime.indexOf("text") >= 0 || type.mime.indexOf("xml") >= 0;
+    }
+    static fixTextFileType(type, buffer) {
+        const text = buffer.toString("utf8");
+        if (text.indexOf("<svg") >= 0) {
+            return { ext: "svg", mime: "image/svg+xml" };
+        }
+        return type;
+    }
+    static fileTypeFromBuffer(buffer) {
+        var _a;
         return __awaiter$u(this, void 0, void 0, function* () {
-            try {
-                mimeType = (yield fromBuffer(buffer)).mime;
+            const type = ((_a = yield fromBuffer(buffer)) !== null && _a !== void 0 ? _a : { ext: "txt", mime: "text/plain" });
+            if (AssetProcessor_1.checkTextFileType(type)) {
+                return AssetProcessor_1.fixTextFileType(type, buffer);
             }
-            catch (e) {
-                if (!mimeType) {
-                    throw `Can't determine mime type`;
-                }
-                console.log(`Can't determine mime type`, e);
-            }
-            return mimeType;
+            return type;
         });
     }
     static extractFontFormat(font) {
@@ -823,12 +829,12 @@ let AssetProcessor = AssetProcessor_1 = class AssetProcessor {
             metadata[prop] = font[prop];
         });
     }
-    process(buffer, metadata, contentType) {
+    process(buffer, metadata, fileType) {
         return __awaiter$u(this, void 0, void 0, function* () {
-            if (AssetProcessor_1.isImage(contentType)) {
+            if (AssetProcessor_1.isImage(fileType.mime)) {
                 buffer = yield AssetProcessor_1.copyImageMeta(buffer, metadata);
             }
-            if (AssetProcessor_1.isFont(contentType)) {
+            if (AssetProcessor_1.isFont(fileType.mime)) {
                 AssetProcessor_1.copyFontMeta(buffer, metadata);
             }
             return buffer;
@@ -1171,56 +1177,37 @@ let Assets = class Assets {
     }
     write(stream, contentType = null, metadata = null) {
         return __awaiter$q(this, void 0, void 0, function* () {
-            let extension = null;
-            const fileTypeStream = copyStream(stream);
             const uploadStream = copyStream(stream);
+            const buffer = yield streamToBuffer(stream);
+            let fileType = { ext: "", mime: contentType };
             try {
-                const fileType = yield fromStream(fileTypeStream);
-                contentType = fileType.mime;
-                extension = fileType.ext;
+                fileType = yield AssetProcessor.fileTypeFromBuffer(buffer);
             }
             catch (e) {
-                if (!contentType) {
-                    throw `Can't determine content type`;
+                if (!fileType.mime) {
+                    throw `Can't determine mime type`;
                 }
-                console.log(`Can't determine content type`, e);
+                console.log(`Can't determine mime type`, e);
             }
-            contentType = contentType.trim();
-            extension = (extension || "").trim();
-            metadata = Object.assign({
-                extension,
-                downloadCount: 0,
-                firstDownload: null,
-                lastDownload: null
-            }, metadata || {});
-            metadata.filename = metadata.filename || new ObjectId().toHexString();
-            return new Promise(((resolve, reject) => {
-                const uploaderStream = this.bucket.openUploadStream(metadata.filename);
-                uploadStream.pipe(uploaderStream)
-                    .on("error", error => {
-                    reject(error.message || error);
-                })
-                    .on("finish", () => {
-                    const asset = new Asset(uploaderStream.id, {
-                        filename: metadata.filename,
-                        contentType,
-                        metadata
-                    }, this.collection, this.bucket);
-                    asset.save().then(() => {
-                        resolve(asset);
-                    }, error => {
-                        reject(error.message || error);
-                    });
-                });
-            }));
+            metadata = metadata || {};
+            return this.upload(uploadStream, fileType, metadata);
         });
     }
     writeBuffer(buffer, metadata = null, contentType = null) {
         return __awaiter$q(this, void 0, void 0, function* () {
-            contentType = yield AssetProcessor.getMimeType(buffer, contentType);
+            let fileType = { ext: "", mime: contentType };
+            try {
+                fileType = yield AssetProcessor.fileTypeFromBuffer(buffer);
+            }
+            catch (e) {
+                if (!fileType.mime) {
+                    throw `Can't determine mime type`;
+                }
+                console.log(`Can't determine mime type`, e);
+            }
             metadata = metadata || {};
-            buffer = yield this.assetProcessor.process(buffer, metadata, contentType);
-            return this.write(bufferToStream(buffer), contentType, metadata);
+            buffer = yield this.assetProcessor.process(buffer, metadata, fileType);
+            return this.upload(bufferToStream(buffer), fileType, metadata);
         });
     }
     writeUrl(url, metadata = null) {
@@ -1261,6 +1248,38 @@ let Assets = class Assets {
             return asset.unlink();
         });
     }
+    upload(stream, fileType, metadata) {
+        return __awaiter$q(this, void 0, void 0, function* () {
+            const contentType = fileType.mime.trim();
+            const extension = (fileType.ext || "").trim();
+            metadata = Object.assign({
+                extension,
+                downloadCount: 0,
+                firstDownload: null,
+                lastDownload: null
+            }, metadata || {});
+            metadata.filename = metadata.filename || new ObjectId().toHexString();
+            return new Promise(((resolve, reject) => {
+                const uploaderStream = this.bucket.openUploadStream(metadata.filename);
+                stream.pipe(uploaderStream)
+                    .on("error", error => {
+                    reject(error.message || error);
+                })
+                    .on("finish", () => {
+                    const asset = new Asset(uploaderStream.id, {
+                        filename: metadata.filename,
+                        contentType,
+                        metadata
+                    }, this.collection, this.bucket);
+                    asset.save().then(() => {
+                        resolve(asset);
+                    }, error => {
+                        reject(error.message || error);
+                    });
+                });
+            }));
+        });
+    }
 };
 Assets = __decorate$t([
     injectable(),
@@ -2860,40 +2879,42 @@ let AssetsController = class AssetsController {
             }
         });
     }
-    getImageRotation(id, params, rotation = 0) {
-        var _a;
+    getImageRotation(id, params, res, rotation = 0) {
         return __awaiter$7(this, void 0, void 0, function* () {
-            const asset = yield this.assetResolver.resolve(id, params.lazy);
-            if (!asset) {
-                throw new HttpError(404, `Image with id: '${id}' not found.`);
-            }
-            if ((_a = asset.metadata) === null || _a === void 0 ? void 0 : _a.classified) {
-                throw new HttpError(403, `Image is classified, and can be only downloaded from a custom url.`);
-            }
+            const asset = yield this.getAsset("Image", id, params.lazy, res);
             params.rotation = params.rotation || rotation;
             return asset.downloadImage(params);
         });
     }
-    getImage(id, params) {
+    getImage(id, params, res) {
         return __awaiter$7(this, void 0, void 0, function* () {
-            return this.getImageRotation(id, params);
+            return this.getImageRotation(id, params, res);
         });
     }
     getFile(id, lazy, res) {
+        return __awaiter$7(this, void 0, void 0, function* () {
+            const asset = yield this.getAsset("Asset", id, lazy, res);
+            return asset.download();
+        });
+    }
+    getAsset(type, id, lazy, res) {
         var _a, _b;
         return __awaiter$7(this, void 0, void 0, function* () {
             const asset = yield this.assetResolver.resolve(id, lazy);
             if (!asset) {
-                throw new HttpError(404, `File with id: '${id}' not found.`);
+                throw new HttpError(404, `${type} with id: '${id}' not found.`);
             }
             if ((_a = asset.metadata) === null || _a === void 0 ? void 0 : _a.classified) {
-                throw new HttpError(403, `Asset is classified, and can be only downloaded from a custom url.`);
+                throw new HttpError(403, `${type} is classified, and can be only downloaded from a custom url.`);
             }
             const ext = (_b = asset.metadata) === null || _b === void 0 ? void 0 : _b.extension;
             if (ext) {
                 res.header("content-disposition", `inline; filename=${asset.filename}.${ext}`);
             }
-            return asset.download();
+            if (asset.contentType) {
+                res.header("content-type", asset.contentType);
+            }
+            return asset;
         });
     }
 };
@@ -2915,16 +2936,16 @@ __decorate$a([
 ], AssetsController.prototype, "uploadUrl", null);
 __decorate$a([
     Get("/image/:id/:rotation"),
-    __param$5(0, Param("id")), __param$5(1, QueryParams()), __param$5(2, Param("rotation")),
+    __param$5(0, Param("id")), __param$5(1, QueryParams()), __param$5(2, Res()), __param$5(3, Param("rotation")),
     __metadata$7("design:type", Function),
-    __metadata$7("design:paramtypes", [String, Object, Number]),
+    __metadata$7("design:paramtypes", [String, Object, Object, Number]),
     __metadata$7("design:returntype", Promise)
 ], AssetsController.prototype, "getImageRotation", null);
 __decorate$a([
     Get("/image/:id"),
-    __param$5(0, Param("id")), __param$5(1, QueryParams()),
+    __param$5(0, Param("id")), __param$5(1, QueryParams()), __param$5(2, Res()),
     __metadata$7("design:type", Function),
-    __metadata$7("design:paramtypes", [String, Object]),
+    __metadata$7("design:paramtypes", [String, Object, Object]),
     __metadata$7("design:returntype", Promise)
 ], AssetsController.prototype, "getImage", null);
 __decorate$a([