@stemy/backend 2.9.0 → 2.9.4

package/bundles/stemy-backend.umd.js

@@ -1947,18 +1947,17 @@
         };
         Assets.prototype.upload = function (stream, fileType, metadata) {
             return __awaiter$q(this, void 0, void 0, function () {
-                var contentType, extension;
+                var contentType;
                 var _this = this;
                 return __generator(this, function (_b) {
                     contentType = fileType.mime.trim();
-                    extension = (fileType.ext || "").trim();
                     metadata = Object.assign({
-                        extension: extension,
                         downloadCount: 0,
                         firstDownload: null,
                         lastDownload: null
                     }, metadata || {});
                     metadata.filename = metadata.filename || new bson.ObjectId().toHexString();
+                    metadata.extension = (fileType.ext || "").trim();
                     return [2 /*return*/, new Promise((function (resolve, reject) {
                             var uploaderStream = _this.bucket.openUploadStream(metadata.filename);
                             stream.pipe(uploaderStream)
@@ -2890,7 +2889,7 @@
                             }
                             isFinished = progress.percent == 100;
                             if (!!isFinished) return [3 /*break*/, 4];
-                            return [4 /*yield*/, promiseTimeout(150)];
+                            return [4 /*yield*/, promiseTimeout(50)];
                         case 3:
                             _a.sent();
                             _a.label = 4;
@@ -4574,36 +4573,42 @@
                 });
             });
         };
-        AssetsController.prototype.getImageRotation = function (id, params, rotation) {
+        AssetsController.prototype.getImageRotation = function (id, params, res, rotation) {
             if (rotation === void 0) { rotation = 0; }
-            var _a;
             return __awaiter$7(this, void 0, void 0, function () {
                 var asset;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
-                        case 0: return [4 /*yield*/, this.assetResolver.resolve(id, params.lazy)];
+                        case 0: return [4 /*yield*/, this.getAsset("Image", id, params.lazy, res)];
                         case 1:
                             asset = _c.sent();
-                            if (!asset) {
-                                throw new routingControllers.HttpError(404, "Image with id: '" + id + "' not found.");
-                            }
-                            if ((_a = asset.metadata) === null || _a === void 0 ? void 0 : _a.classified) {
-                                throw new routingControllers.HttpError(403, "Image is classified, and can be only downloaded from a custom url.");
-                            }
                             params.rotation = params.rotation || rotation;
                             return [2 /*return*/, asset.downloadImage(params)];
                     }
                 });
             });
         };
-        AssetsController.prototype.getImage = function (id, params) {
+        AssetsController.prototype.getImage = function (id, params, res) {
             return __awaiter$7(this, void 0, void 0, function () {
                 return __generator(this, function (_c) {
-                    return [2 /*return*/, this.getImageRotation(id, params)];
+                    return [2 /*return*/, this.getImageRotation(id, params, res)];
                 });
             });
         };
         AssetsController.prototype.getFile = function (id, lazy, res) {
+            return __awaiter$7(this, void 0, void 0, function () {
+                var asset;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0: return [4 /*yield*/, this.getAsset("Asset", id, lazy, res)];
+                        case 1:
+                            asset = _c.sent();
+                            return [2 /*return*/, asset.download()];
+                    }
+                });
+            });
+        };
+        AssetsController.prototype.getAsset = function (type, id, lazy, res) {
             var _a, _b;
             return __awaiter$7(this, void 0, void 0, function () {
                 var asset, ext;
@@ -4613,10 +4618,10 @@
                         case 1:
                             asset = _c.sent();
                             if (!asset) {
-                                throw new routingControllers.HttpError(404, "File with id: '" + id + "' not found.");
+                                throw new routingControllers.HttpError(404, type + " with id: '" + id + "' not found.");
                             }
                             if ((_a = asset.metadata) === null || _a === void 0 ? void 0 : _a.classified) {
-                                throw new routingControllers.HttpError(403, "Asset is classified, and can be only downloaded from a custom url.");
+                                throw new routingControllers.HttpError(403, type + " is classified, and can be only downloaded from a custom url.");
                             }
                             ext = (_b = asset.metadata) === null || _b === void 0 ? void 0 : _b.extension;
                             if (ext) {
@@ -4625,7 +4630,7 @@
                             if (asset.contentType) {
                                 res.header("content-type", asset.contentType);
                             }
-                            return [2 /*return*/, asset.download()];
+                            return [2 /*return*/, asset];
                     }
                 });
             });
@@ -4650,16 +4655,16 @@
     ], AssetsController.prototype, "uploadUrl", null);
     __decorate$a([
         routingControllers.Get("/image/:id/:rotation"),
-        __param$5(0, routingControllers.Param("id")), __param$5(1, routingControllers.QueryParams()), __param$5(2, routingControllers.Param("rotation")),
+        __param$5(0, routingControllers.Param("id")), __param$5(1, routingControllers.QueryParams()), __param$5(2, routingControllers.Res()), __param$5(3, routingControllers.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([
         routingControllers.Get("/image/:id"),
-        __param$5(0, routingControllers.Param("id")), __param$5(1, routingControllers.QueryParams()),
+        __param$5(0, routingControllers.Param("id")), __param$5(1, routingControllers.QueryParams()), __param$5(2, routingControllers.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([