@stemy/backend 2.7.3 → 2.8.2

package/bundles/stemy-backend.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('path'), require('body-parser'), require('jsonwebtoken'), require('tsyringe'), require('routing-controllers'), require('socket-controllers'), require('routing-controllers-openapi'), require('class-transformer/storage'), require('class-validator'), require('class-validator-jsonschema'), require('child_process'), require('crypto'), require('rxjs'), require('rxjs/internal/util/canReportError'), require('fs'), require('mongoose'), require('mongoose/lib/utils'), require('stream'), require('bson'), require('fontkit'), require('file-type'), require('sharp'), require('mongodb'), require('dotenv'), require('node-resque'), require('node-cron'), require('ioredis'), require('socket.io-client'), require('http'), require('express'), require('socket.io'), require('uuid'), require('nodemailer'), require('handlebars'), require('axios'), require('bcrypt'), require('moment')) :
-    typeof define === 'function' && define.amd ? define('@stemy/backend', ['exports', 'path', 'body-parser', 'jsonwebtoken', 'tsyringe', 'routing-controllers', 'socket-controllers', 'routing-controllers-openapi', 'class-transformer/storage', 'class-validator', 'class-validator-jsonschema', 'child_process', 'crypto', 'rxjs', 'rxjs/internal/util/canReportError', 'fs', 'mongoose', 'mongoose/lib/utils', 'stream', 'bson', 'fontkit', 'file-type', 'sharp', 'mongodb', 'dotenv', 'node-resque', 'node-cron', 'ioredis', 'socket.io-client', 'http', 'express', 'socket.io', 'uuid', 'nodemailer', 'handlebars', 'axios', 'bcrypt', 'moment'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.stemy = global.stemy || {}, global.stemy.backend = {}), global.path, global["body-parser"], global.jsonwebtoken, global.tsyringe, global["routing-controllers"], global["socket-controllers"], global["routing-controllers-openapi"], global["class-transformer/storage"], global["class-validator"], global["class-validator-jsonschema"], global.child_process, global.crypto, global.rxjs, global.rxjs["internal/util/canReportError"], global.fs, global.mongoose, global["mongoose-lib-utils"], global.stream, global.bson, global.fontkit, global["file-type"], global.sharp, global.mongodb, global.dotenv, global["node-resque"], global["node-cron"], global.ioredis, global.socket["io-client"], global.http, global.express, global.socket.io, global.uuid, global.nodemailer, global.handlebars, global.axios, global.bcrypt, global.moment));
-})(this, (function (exports, path, bodyParser, jsonwebtoken, tsyringe, routingControllers, socketControllers, routingControllersOpenapi, storage, classValidator, classValidatorJsonschema, child_process, crypto, rxjs, canReportError, fs, mongoose, utils, stream, bson, fontKit_, fileType, sharp_, mongodb, dotenv, nodeResque, nodeCron, ioredis, socket_io_client, http, express_, socket_io, uuid, nodemailer, Handlebars, axios, bcrypt, moment) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('path'), require('body-parser'), require('jsonwebtoken'), require('tsyringe'), require('routing-controllers'), require('socket-controllers'), require('routing-controllers-openapi'), require('class-transformer/storage'), require('class-validator'), require('class-validator-jsonschema'), require('child_process'), require('crypto'), require('rxjs'), require('rxjs/internal/util/canReportError'), require('fs'), require('mongoose'), require('mongoose/lib/utils'), require('stream'), require('bson'), require('fontkit'), require('file-type'), require('sharp'), require('axios'), require('mongodb'), require('dotenv'), require('node-resque'), require('node-cron'), require('ioredis'), require('socket.io-client'), require('http'), require('express'), require('socket.io'), require('uuid'), require('nodemailer'), require('handlebars'), require('bcrypt'), require('moment')) :
+    typeof define === 'function' && define.amd ? define('@stemy/backend', ['exports', 'path', 'body-parser', 'jsonwebtoken', 'tsyringe', 'routing-controllers', 'socket-controllers', 'routing-controllers-openapi', 'class-transformer/storage', 'class-validator', 'class-validator-jsonschema', 'child_process', 'crypto', 'rxjs', 'rxjs/internal/util/canReportError', 'fs', 'mongoose', 'mongoose/lib/utils', 'stream', 'bson', 'fontkit', 'file-type', 'sharp', 'axios', 'mongodb', 'dotenv', 'node-resque', 'node-cron', 'ioredis', 'socket.io-client', 'http', 'express', 'socket.io', 'uuid', 'nodemailer', 'handlebars', 'bcrypt', 'moment'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.stemy = global.stemy || {}, global.stemy.backend = {}), global.path, global["body-parser"], global.jsonwebtoken, global.tsyringe, global["routing-controllers"], global["socket-controllers"], global["routing-controllers-openapi"], global["class-transformer/storage"], global["class-validator"], global["class-validator-jsonschema"], global.child_process, global.crypto, global.rxjs, global.rxjs["internal/util/canReportError"], global.fs, global.mongoose, global["mongoose-lib-utils"], global.stream, global.bson, global.fontkit, global["file-type"], global.sharp, global.axios, global.mongodb, global.dotenv, global["node-resque"], global["node-cron"], global.ioredis, global.socket["io-client"], global.http, global.express, global.socket.io, global.uuid, global.nodemailer, global.handlebars, global.bcrypt, global.moment));
+})(this, (function (exports, path, bodyParser, jsonwebtoken, tsyringe, routingControllers, socketControllers, routingControllersOpenapi, storage, classValidator, classValidatorJsonschema, child_process, crypto, rxjs, canReportError, fs, mongoose, utils, stream, bson, fontKit_, fileType, sharp_, axios, mongodb, dotenv, nodeResque, nodeCron, ioredis, socket_io_client, http, express_, socket_io, uuid, nodemailer, Handlebars, bcrypt, moment) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -26,13 +26,13 @@
 
     var fontKit___default = /*#__PURE__*/_interopDefaultLegacy(fontKit_);
     var sharp___default = /*#__PURE__*/_interopDefaultLegacy(sharp_);
+    var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
     var dotenv__default = /*#__PURE__*/_interopDefaultLegacy(dotenv);
     var ioredis__default = /*#__PURE__*/_interopDefaultLegacy(ioredis);
     var socket_io_client__default = /*#__PURE__*/_interopDefaultLegacy(socket_io_client);
     var express___default = /*#__PURE__*/_interopDefaultLegacy(express_);
     var socket_io__default = /*#__PURE__*/_interopDefaultLegacy(socket_io);
     var Handlebars__namespace = /*#__PURE__*/_interopNamespace(Handlebars);
-    var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
     var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
 
     /*! *****************************************************************************
@@ -106,7 +106,7 @@
         if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
             return Reflect.metadata(metadataKey, metadataValue);
     }
-    function __awaiter$v(thisArg, _arguments, P, generator) {
+    function __awaiter$w(thisArg, _arguments, P, generator) {
         function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
         return new (P || (P = Promise))(function (resolve, reject) {
             function fulfilled(value) { try {
@@ -353,7 +353,7 @@
         return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
     }
 
-    var __awaiter$u = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    var __awaiter$v = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
         function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
         return new (P || (P = Promise))(function (resolve, reject) {
             function fulfilled(value) { try {
@@ -595,7 +595,7 @@
     }
     function paginateAggregations(model, aggregations, params, metaProjection) {
         if (metaProjection === void 0) { metaProjection = {}; }
-        return __awaiter$u(this, void 0, void 0, function () {
+        return __awaiter$v(this, void 0, void 0, function () {
             var sortField, sortAggregation, result, pagination;
             var _a;
             return __generator(this, function (_b) {
@@ -706,7 +706,7 @@
     }
     function readAndDeleteFile(path, timeout) {
         if (timeout === void 0) { timeout = 5000; }
-        return __awaiter$u(this, void 0, void 0, function () {
+        return __awaiter$v(this, void 0, void 0, function () {
             var data;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -723,7 +723,7 @@
         });
     }
     function writeFile(path$1, data) {
-        return __awaiter$u(this, void 0, void 0, function () {
+        return __awaiter$v(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, mkdirRecursive(path.dirname(path$1))];
@@ -811,7 +811,7 @@
         var paramName = modelName.toLowerCase();
         return routingControllers.createParamDecorator({
             required: false,
-            value: function (action) { return __awaiter$u(_this, void 0, void 0, function () {
+            value: function (action) { return __awaiter$v(_this, void 0, void 0, function () {
                 var req, token, id, query, doc, _a, _b, e_3;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
@@ -1186,7 +1186,7 @@
                     r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
         return c > 3 && r && Object.defineProperty(target, key, r), r;
     };
-    var __awaiter$t = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    var __awaiter$u = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
         function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
         return new (P || (P = Promise))(function (resolve, reject) {
             function fulfilled(value) { try {
@@ -1223,7 +1223,7 @@
         function AssetProcessor() {
         }
         AssetProcessor.getMimeType = function (buffer, mimeType) {
-            return __awaiter$t(this, void 0, void 0, function () {
+            return __awaiter$u(this, void 0, void 0, function () {
                 var e_1;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
@@ -1264,7 +1264,7 @@
             return imageTypes.indexOf(contentType) >= 0;
         };
         AssetProcessor.copyImageMeta = function (buffer, metadata) {
-            return __awaiter$t(this, void 0, void 0, function () {
+            return __awaiter$u(this, void 0, void 0, function () {
                 var output;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
@@ -1288,7 +1288,7 @@
             });
         };
         AssetProcessor.prototype.process = function (buffer, metadata, contentType) {
-            return __awaiter$t(this, void 0, void 0, function () {
+            return __awaiter$u(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -1384,7 +1384,7 @@
         if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
             return Reflect.metadata(k, v);
     };
-    var __awaiter$s = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    var __awaiter$t = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
         function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
         return new (P || (P = Promise))(function (resolve, reject) {
             function fulfilled(value) { try {
@@ -1432,7 +1432,7 @@
             configurable: true
         });
         MongoConnector.prototype.connect = function () {
-            return __awaiter$s(this, void 0, void 0, function () {
+            return __awaiter$t(this, void 0, void 0, function () {
                 var _a;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -1464,6 +1464,65 @@
         __metadata$o("design:paramtypes", [exports.Configuration])
     ], exports.MongoConnector);
 
+    var __awaiter$s = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+        function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+        return new (P || (P = Promise))(function (resolve, reject) {
+            function fulfilled(value) { try {
+                step(generator.next(value));
+            }
+            catch (e) {
+                reject(e);
+            } }
+            function rejected(value) { try {
+                step(generator["throw"](value));
+            }
+            catch (e) {
+                reject(e);
+            } }
+            function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+            step((generator = generator.apply(thisArg, _arguments || [])).next());
+        });
+    };
+    var BaseEntity = /** @class */ (function () {
+        function BaseEntity(mId, data, collection) {
+            this.mId = mId;
+            this.data = data;
+            this.collection = collection;
+        }
+        Object.defineProperty(BaseEntity.prototype, "id", {
+            get: function () {
+                return this.mId.toHexString();
+            },
+            enumerable: false,
+            configurable: true
+        });
+        BaseEntity.prototype.save = function () {
+            return this.collection.updateOne({ _id: this.mId }, { $set: this.toJSON() });
+        };
+        BaseEntity.prototype.load = function () {
+            return __awaiter$s(this, void 0, void 0, function () {
+                var res;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.collection.findOne({ _id: this.mId })];
+                        case 1:
+                            res = _a.sent();
+                            this.deleted = !res;
+                            this.data = res || {};
+                            return [2 /*return*/, this];
+                    }
+                });
+            });
+        };
+        BaseEntity.prototype.toJSON = function () {
+            var ret = Object.assign({}, this.data);
+            delete ret._id;
+            ret.id = this.id;
+            return ret;
+        };
+        return BaseEntity;
+    }());
+
     var __awaiter$r = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
         function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
         return new (P || (P = Promise))(function (resolve, reject) {
@@ -1490,14 +1549,12 @@
         w: "number",
         h: "number"
     };
-    var Asset = /** @class */ (function () {
-        function Asset(fileId, filename, contentType, metadata, bucket, collection) {
-            this.fileId = fileId;
-            this.filename = filename;
-            this.contentType = contentType;
-            this.metadata = metadata;
-            this.bucket = bucket;
-            this.collection = collection;
+    var Asset = /** @class */ (function (_super) {
+        __extends(Asset, _super);
+        function Asset(id, data, collection, bucket) {
+            var _this = _super.call(this, id, data, collection) || this;
+            _this.bucket = bucket;
+            return _this;
         }
         Asset.toCropRegion = function (cropInfo) {
             var crop = cropInfo;
@@ -1612,16 +1669,30 @@
                 });
             });
         };
-        Object.defineProperty(Asset.prototype, "id", {
+        Object.defineProperty(Asset.prototype, "filename", {
             get: function () {
-                return this.fileId.toHexString();
+                return this.data.filename;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(Asset.prototype, "contentType", {
+            get: function () {
+                return this.data.contentType;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(Asset.prototype, "metadata", {
+            get: function () {
+                return this.data.metadata;
             },
             enumerable: false,
             configurable: true
         });
         Object.defineProperty(Asset.prototype, "stream", {
             get: function () {
-                return this.bucket.openDownloadStream(this.fileId);
+                return this.bucket.openDownloadStream(this.mId);
             },
             enumerable: false,
             configurable: true
@@ -1629,7 +1700,7 @@
         Asset.prototype.unlink = function () {
             return __awaiter$r(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
-                    return [2 /*return*/, deleteFromBucket(this.bucket, this.fileId)];
+                    return [2 /*return*/, deleteFromBucket(this.bucket, this.mId)];
                 });
             });
         };
@@ -1647,7 +1718,7 @@
                                 : metadata.downloadCount + 1;
                             metadata.firstDownload = metadata.firstDownload || new Date();
                             metadata.lastDownload = new Date();
-                            return [4 /*yield*/, this.collection.updateOne({ _id: this.fileId }, { $set: { metadata: metadata } })];
+                            return [4 /*yield*/, this.collection.updateOne({ _id: this.mId }, { $set: { metadata: metadata } })];
                         case 1:
                             _a.sent();
                             return [2 /*return*/, this.stream];
@@ -1676,16 +1747,8 @@
                 });
             });
         };
-        Asset.prototype.toJSON = function () {
-            return {
-                id: this.id,
-                filename: this.filename,
-                contentType: this.contentType,
-                metadata: this.metadata
-            };
-        };
         return Asset;
-    }());
+    }(BaseEntity));
 
     var __decorate$t = (this && this.__decorate) || function (decorators, target, key, desc) {
         var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -1773,8 +1836,12 @@
                                         reject(error.message || error);
                                     })
                                         .on("finish", function () {
-                                        var asset = new Asset(uploaderStream.id, metadata.filename, contentType, metadata, _this.bucket, _this.collection);
-                                        _this.collection.updateOne({ _id: uploaderStream.id }, { $set: asset.toJSON() }).then(function () {
+                                        var asset = new Asset(uploaderStream.id, {
+                                            filename: metadata.filename,
+                                            contentType: contentType,
+                                            metadata: metadata
+                                        }, _this.collection, _this.bucket);
+                                        asset.save().then(function () {
                                             resolve(asset);
                                         }, function (error) {
                                             reject(error.message || error);
@@ -1803,6 +1870,20 @@
                 });
             });
         };
+        Assets.prototype.writeUrl = function (url, metadata) {
+            if (metadata === void 0) { metadata = null; }
+            return __awaiter$q(this, void 0, void 0, function () {
+                var buffer;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, axios__default["default"]({ url: url, responseType: "arraybuffer" })];
+                        case 1:
+                            buffer = (_b.sent()).data;
+                            return [2 /*return*/, this.writeBuffer(buffer, metadata)];
+                    }
+                });
+            });
+        };
         Assets.prototype.read = function (id) {
             return __awaiter$q(this, void 0, void 0, function () {
                 return __generator(this, function (_b) {
@@ -1818,7 +1899,39 @@
                         case 0: return [4 /*yield*/, this.collection.findOne(where)];
                         case 1:
                             data = _b.sent();
-                            return [2 /*return*/, !data ? null : new Asset(data._id, data.filename, data.contentType, data.metadata, this.bucket, this.collection)];
+                            return [2 /*return*/, !data ? null : new Asset(data._id, data, this.collection, this.bucket)];
+                    }
+                });
+            });
+        };
+        Assets.prototype.findMany = function (where) {
+            return __awaiter$q(this, void 0, void 0, function () {
+                var cursor, items, result, items_1, items_1_1, item;
+                var e_2, _b;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            cursor = this.collection.find(where);
+                            return [4 /*yield*/, cursor.toArray()];
+                        case 1:
+                            items = (_c.sent()) || [];
+                            result = [];
+                            try {
+                                for (items_1 = __values(items), items_1_1 = items_1.next(); !items_1_1.done; items_1_1 = items_1.next()) {
+                                    item = items_1_1.value;
+                                    if (!item)
+                                        continue;
+                                    result.push(new Asset(item._id, item, this.collection, this.bucket));
+                                }
+                            }
+                            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                            finally {
+                                try {
+                                    if (items_1_1 && !items_1_1.done && (_b = items_1.return)) _b.call(items_1);
+                                }
+                                finally { if (e_2) throw e_2.error; }
+                            }
+                            return [2 /*return*/, result];
                     }
                 });
             });
@@ -1865,36 +1978,46 @@
             step((generator = generator.apply(thisArg, _arguments || [])).next());
         });
     };
-    var LazyAsset = /** @class */ (function () {
-        function LazyAsset(lazyId, jobName, jobParams, jobQue, mProgressId, mAssetId, assets, progresses, jobMan, collection) {
-            this.lazyId = lazyId;
-            this.jobName = jobName;
-            this.jobParams = jobParams;
-            this.jobQue = jobQue;
-            this.mProgressId = mProgressId;
-            this.mAssetId = mAssetId;
-            this.assets = assets;
-            this.progresses = progresses;
-            this.jobMan = jobMan;
-            this.collection = collection;
+    var LazyAsset = /** @class */ (function (_super) {
+        __extends(LazyAsset, _super);
+        function LazyAsset(id, data, collection, assets, progresses, jobMan) {
+            var _this = _super.call(this, id, data, collection) || this;
+            _this.assets = assets;
+            _this.progresses = progresses;
+            _this.jobMan = jobMan;
+            return _this;
         }
-        Object.defineProperty(LazyAsset.prototype, "id", {
+        Object.defineProperty(LazyAsset.prototype, "jobName", {
+            get: function () {
+                return this.data.jobName;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(LazyAsset.prototype, "jobParams", {
             get: function () {
-                return this.lazyId.toHexString();
+                return this.data.jobParams;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(LazyAsset.prototype, "jobQue", {
+            get: function () {
+                return this.data.jobQue;
             },
             enumerable: false,
             configurable: true
         });
         Object.defineProperty(LazyAsset.prototype, "progressId", {
             get: function () {
-                return this.mProgressId;
+                return this.data.progressId;
             },
             enumerable: false,
             configurable: true
         });
         Object.defineProperty(LazyAsset.prototype, "assetId", {
             get: function () {
-                return this.mAssetId;
+                return this.data.assetId;
             },
             enumerable: false,
             configurable: true
@@ -1903,41 +2026,50 @@
             return __awaiter$p(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.collection.deleteOne({ _id: this.lazyId })];
+                        case 0: return [4 /*yield*/, this.load()];
                         case 1:
                             _a.sent();
-                            return [2 /*return*/, deleteFromBucket(this.assets.bucket, new bson.ObjectId(this.mAssetId))];
+                            if (!!this.progressId) return [3 /*break*/, 3];
+                            return [4 /*yield*/, this.collection.deleteOne({ _id: this.mId })];
+                        case 2:
+                            _a.sent();
+                            _a.label = 3;
+                        case 3: return [2 /*return*/, deleteFromBucket(this.assets.bucket, new bson.ObjectId(this.assetId))];
                     }
                 });
             });
         };
         LazyAsset.prototype.startWorking = function () {
             var _this = this;
-            if (this.mProgressId)
-                return;
-            this.startWorkingOnAsset().then(function () {
-                console.log("Started working on lazy asset: " + _this.id);
-            }).catch(function (reason) {
-                console.log("Can't start working on lazy asset: " + _this.id + "\nReason: " + reason);
+            this.load().then(function () {
+                if (_this.deleted)
+                    return;
+                var progressPromise = !_this.progressId ? Promise.resolve(null) : _this.progresses.get(_this.progressId).then(function (p) { return p.cancel(); });
+                progressPromise.then(function () {
+                    _this.startWorkingOnAsset().then(function () {
+                        console.log("Started working on lazy asset: " + _this.id);
+                    }).catch(function (reason) {
+                        console.log("Can't start working on lazy asset: " + _this.id + "\nReason: " + reason);
+                    });
+                });
             });
         };
         LazyAsset.prototype.loadAsset = function () {
             return __awaiter$p(this, void 0, void 0, function () {
-                var data;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0:
-                            if (this.mAssetId) {
-                                return [2 /*return*/, this.assets.read(this.mAssetId)];
-                            }
-                            if (!this.mProgressId) return [3 /*break*/, 3];
-                            return [4 /*yield*/, this.progresses.waitToFinish(this.mProgressId)];
+                        case 0: return [4 /*yield*/, this.load()];
                         case 1:
                             _a.sent();
-                            return [4 /*yield*/, this.collection.findOne({ _id: this.lazyId })];
+                            if (this.deleted)
+                                return [2 /*return*/, null];
+                            if (this.assetId) {
+                                return [2 /*return*/, this.assets.read(this.assetId)];
+                            }
+                            if (!this.progressId) return [3 /*break*/, 3];
+                            return [4 /*yield*/, this.progresses.waitToFinish(this.progressId)];
                         case 2:
-                            data = _a.sent();
-                            this.mAssetId = data.assetId;
+                            _a.sent();
                             return [2 /*return*/, this.loadAsset()];
                         case 3: return [4 /*yield*/, this.startWorkingOnAsset()];
                         case 4:
@@ -1952,7 +2084,7 @@
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            this.mAssetId = asset.id;
+                            this.data.assetId = asset.id;
                             return [4 /*yield*/, this.save()];
                         case 1:
                             _a.sent();
@@ -1961,32 +2093,19 @@
                 });
             });
         };
-        LazyAsset.prototype.save = function () {
-            return this.collection.updateOne({ _id: this.lazyId }, { $set: this.toJSON() });
-        };
-        LazyAsset.prototype.toJSON = function () {
-            return {
-                id: this.id,
-                jobName: this.jobName,
-                jobParams: this.jobParams,
-                jobQue: this.jobQue,
-                progressId: this.progressId,
-                assetId: this.assetId,
-            };
-        };
         LazyAsset.prototype.startWorkingOnAsset = function () {
             return __awaiter$p(this, void 0, void 0, function () {
-                var progress;
+                var id;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0: return [4 /*yield*/, this.progresses.create()];
                         case 1:
-                            progress = _a.sent();
-                            this.mProgressId = progress.id;
+                            id = (_a.sent()).id;
+                            this.data.progressId = id;
                             return [4 /*yield*/, this.save()];
                         case 2:
                             _a.sent();
-                            return [4 /*yield*/, this.jobMan.enqueueWithName(this.jobName, Object.assign(Object.assign({}, this.jobParams), { lazyId: this.id }))];
+                            return [4 /*yield*/, this.jobMan.enqueueWithName(this.data.jobName, Object.assign(Object.assign({}, this.data.jobParams), { lazyId: this.id }))];
                         case 3:
                             _a.sent();
                             return [2 /*return*/];
@@ -1995,7 +2114,7 @@
             });
         };
         return LazyAsset;
-    }());
+    }(BaseEntity));
 
     var __decorate$s = (this && this.__decorate) || function (decorators, target, key, desc) {
         var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -2306,61 +2425,58 @@
             step((generator = generator.apply(thisArg, _arguments || [])).next());
         });
     };
-    var Progress = /** @class */ (function () {
-        function Progress(progressId, mCurrent, mMax, mMessage, mError, client, collection) {
-            this.progressId = progressId;
-            this.mCurrent = mCurrent;
-            this.mMax = mMax;
-            this.mMessage = mMessage;
-            this.mError = mError;
-            this.client = client;
-            this.collection = collection;
+    var Progress = /** @class */ (function (_super) {
+        __extends(Progress, _super);
+        function Progress(id, data, collection, client) {
+            var _this = _super.call(this, id, data, collection) || this;
+            _this.client = client;
+            return _this;
         }
-        Object.defineProperty(Progress.prototype, "id", {
+        Object.defineProperty(Progress.prototype, "current", {
             get: function () {
-                return this.progressId.toHexString();
+                return this.data.current;
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(Progress.prototype, "current", {
+        Object.defineProperty(Progress.prototype, "max", {
             get: function () {
-                return this.mCurrent;
+                return this.data.max;
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(Progress.prototype, "max", {
+        Object.defineProperty(Progress.prototype, "message", {
             get: function () {
-                return this.mMax;
+                return this.data.message;
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(Progress.prototype, "message", {
+        Object.defineProperty(Progress.prototype, "error", {
             get: function () {
-                return this.mMessage;
+                return this.data.error;
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(Progress.prototype, "error", {
+        Object.defineProperty(Progress.prototype, "canceled", {
             get: function () {
-                return this.mError;
+                return this.data.canceled;
             },
             enumerable: false,
             configurable: true
         });
         Object.defineProperty(Progress.prototype, "percent", {
             get: function () {
-                return this.mMax > 0 ? Math.round(this.mCurrent / this.mMax * 100) : 0;
+                return this.max > 0 ? Math.round(this.current / this.max * 100) : 0;
             },
             enumerable: false,
             configurable: true
         });
         Object.defineProperty(Progress.prototype, "remaining", {
             get: function () {
-                return this.mMax > 0 ? this.mMax - this.mCurrent : 0;
+                return this.max > 0 ? this.max - this.current : 0;
             },
             enumerable: false,
             configurable: true
@@ -2377,12 +2493,12 @@
                             _a.label = 2;
                         case 2:
                             if (!(message !== null)) return [3 /*break*/, 4];
-                            this.mMessage = message;
+                            this.data.message = message;
                             return [4 /*yield*/, this.save()];
                         case 3:
                             _a.sent();
                             _a.label = 4;
-                        case 4: return [2 /*return*/, new SubProgress(this, this.mCurrent, progressValue, Math.max(max, 1))];
+                        case 4: return [2 /*return*/, new SubProgress(this, this.current, progressValue, Math.max(max, 1))];
                     }
                 });
             });
@@ -2395,7 +2511,21 @@
                             if (isNaN(max) || max <= 0) {
                                 throw "Max progress value must be bigger than zero";
                             }
-                            this.mMax = max;
+                            this.data.max = max;
+                            return [4 /*yield*/, this.save()];
+                        case 1:
+                            _a.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        Progress.prototype.setMessage = function (message) {
+            return __awaiter$n(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            this.data.message = message;
                             return [4 /*yield*/, this.save()];
                         case 1:
                             _a.sent();
@@ -2409,7 +2539,7 @@
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            this.mError = error;
+                            this.data.error = error;
                             return [4 /*yield*/, this.save()];
                         case 1:
                             _a.sent();
@@ -2427,9 +2557,14 @@
                             if (isNaN(value) || value <= 0) {
                                 throw "Advance value must be bigger than zero";
                             }
-                            this.mCurrent = Math.min(this.mMax, this.mCurrent + value);
-                            return [4 /*yield*/, this.save()];
+                            return [4 /*yield*/, this.load()];
                         case 1:
+                            _a.sent();
+                            if (this.deleted || this.canceled)
+                                return [2 /*return*/, null];
+                            this.data.current = Math.min(this.max, this.current + value);
+                            return [4 /*yield*/, this.save()];
+                        case 2:
                             _a.sent();
                             if (!this.client)
                                 return [2 /*return*/];
@@ -2439,34 +2574,36 @@
                 });
             });
         };
-        Progress.prototype.toJSON = function () {
-            return {
-                id: this.id,
-                current: this.current,
-                max: this.max,
-                message: this.message,
-                error: this.error
-            };
-        };
-        Progress.prototype.save = function () {
-            return this.collection.updateOne({ _id: this.progressId }, { $set: this.toJSON() });
+        Progress.prototype.cancel = function () {
+            return __awaiter$n(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            this.data.canceled = true;
+                            return [4 /*yield*/, this.save()];
+                        case 1:
+                            _a.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            });
         };
         return Progress;
-    }());
+    }(BaseEntity));
     var SubProgress = /** @class */ (function () {
-        function SubProgress(parent, progressFrom, progressValue, max) {
-            if (max === void 0) { max = 100; }
+        function SubProgress(parent, progressFrom, progressValue, mMax) {
+            if (mMax === void 0) { mMax = 100; }
             this.parent = parent;
             this.progressFrom = progressFrom;
             this.progressValue = progressValue;
-            this.max = max;
+            this.mMax = mMax;
             if (progressFrom < 0) {
                 throw "Progress from must be bigger than or zero";
             }
             if (progressValue <= 0) {
                 throw "Progress value must be bigger than zero";
             }
-            this.currentValue = 0;
+            this.mCurrent = 0;
         }
         Object.defineProperty(SubProgress.prototype, "id", {
             get: function () {
@@ -2475,13 +2612,24 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(SubProgress.prototype, "current", {
+            get: function () {
+                return this.mCurrent;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(SubProgress.prototype, "max", {
+            get: function () {
+                return this.mMax;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(SubProgress.prototype, "message", {
             get: function () {
                 return this.parent.message;
             },
-            set: function (value) {
-                this.parent.message = value;
-            },
             enumerable: false,
             configurable: true
         });
@@ -2489,9 +2637,6 @@
             get: function () {
                 return this.parent.error;
             },
-            set: function (value) {
-                this.parent.error = value;
-            },
             enumerable: false,
             configurable: true
         });
@@ -2502,16 +2647,16 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(SubProgress.prototype, "current", {
+        Object.defineProperty(SubProgress.prototype, "remaining", {
             get: function () {
-                return this.currentValue;
+                return this.max - this.mCurrent;
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(SubProgress.prototype, "remaining", {
+        Object.defineProperty(SubProgress.prototype, "canceled", {
             get: function () {
-                return this.max - this.currentValue;
+                return !this.parent || this.parent.canceled;
             },
             enumerable: false,
             configurable: true
@@ -2528,8 +2673,7 @@
                             _a.label = 2;
                         case 2:
                             if (!(message !== null)) return [3 /*break*/, 4];
-                            this.message = message;
-                            return [4 /*yield*/, this.parent.save()];
+                            return [4 /*yield*/, this.setMessage(message)];
                         case 3:
                             _a.sent();
                             _a.label = 4;
@@ -2546,7 +2690,7 @@
                             if (isNaN(max) || max <= 0) {
                                 throw "Max progress value must be bigger than zero";
                             }
-                            this.max = max;
+                            this.mMax = max;
                             return [4 /*yield*/, this.save()];
                         case 1:
                             _a.sent();
@@ -2555,13 +2699,29 @@
                 });
             });
         };
+        SubProgress.prototype.setMessage = function (message) {
+            return __awaiter$n(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            if (!this.parent)
+                                return [2 /*return*/, null];
+                            return [4 /*yield*/, this.parent.setMessage(message)];
+                        case 1:
+                            _a.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
         SubProgress.prototype.setError = function (error) {
             return __awaiter$n(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            this.error = error || null;
-                            return [4 /*yield*/, this.save()];
+                            if (!this.parent)
+                                return [2 /*return*/, null];
+                            return [4 /*yield*/, this.parent.setError(error)];
                         case 1:
                             _a.sent();
                             return [2 /*return*/];
@@ -2578,7 +2738,7 @@
                             if (isNaN(value) || value <= 0) {
                                 throw "Advance value must be bigger than zero";
                             }
-                            this.currentValue = Math.min(this.max, this.currentValue + value);
+                            this.mCurrent = Math.min(this.max, this.mCurrent + value);
                             return [4 /*yield*/, this.save()];
                         case 1:
                             _a.sent();
@@ -2587,13 +2747,28 @@
                 });
             });
         };
+        SubProgress.prototype.cancel = function () {
+            return __awaiter$n(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            if (!this.parent)
+                                return [2 /*return*/, null];
+                            return [4 /*yield*/, this.parent.cancel()];
+                        case 1:
+                            _a.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
         SubProgress.prototype.save = function () {
             return __awaiter$n(this, void 0, void 0, function () {
                 var ratio, newProgress, current;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            ratio = this.max > 0 ? this.currentValue / this.max : 0;
+                            ratio = this.max > 0 ? this.mCurrent / this.max : 0;
                             newProgress = this.progressFrom + Math.round(this.progressValue * ratio);
                             current = this.parent.current;
                             if (newProgress <= current)
@@ -2606,6 +2781,13 @@
                 });
             });
         };
+        SubProgress.prototype.load = function () {
+            return __awaiter$n(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    return [2 /*return*/, null];
+                });
+            });
+        };
         SubProgress.prototype.toJSON = function () {
             return this.parent.toJSON();
         };
@@ -2701,7 +2883,7 @@
                         case 0: return [4 /*yield*/, this.collection.findOne(where)];
                         case 1:
                             data = _a.sent();
-                            return [2 /*return*/, !data ? null : new Progress(data._id, data.current, data.max, data.message, data.error, this.client, this.collection)];
+                            return [2 /*return*/, !data ? null : new Progress(data._id, data, this.collection, this.client)];
                     }
                 });
             });
@@ -2709,20 +2891,24 @@
         Progresses.prototype.create = function (max) {
             if (max === void 0) { max = 100; }
             return __awaiter$m(this, void 0, void 0, function () {
-                var res;
+                var data, res;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             if (isNaN(max) || max <= 0) {
                                 throw "Max progress value must be bigger than zero";
                             }
-                            return [4 /*yield*/, this.collection.insertOne({
-                                    current: 0,
-                                    max: max
-                                })];
+                            data = {
+                                current: 0,
+                                max: max,
+                                message: "",
+                                error: "",
+                                canceled: false
+                            };
+                            return [4 /*yield*/, this.collection.insertOne(data)];
                         case 1:
                             res = _a.sent();
-                            return [2 /*return*/, new Progress(res.insertedId, 0, max, "", "", this.client, this.collection)];
+                            return [2 /*return*/, new Progress(res.insertedId, data, this.collection, this.client)];
                     }
                 });
             });
@@ -2792,19 +2978,25 @@
             if (jobParams === void 0) { jobParams = {}; }
             if (jobQue === void 0) { jobQue = "main"; }
             return __awaiter$l(this, void 0, void 0, function () {
-                var jobName, res;
+                var jobName, data, existingAsset, res;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             jobName = this.jobMan.tryResolve(jobType, Object.assign(Object.assign({}, jobParams), { lazyId: "" }));
-                            return [4 /*yield*/, this.collection.insertOne({
-                                    jobName: jobName,
-                                    jobParams: jobParams,
-                                    jobQue: jobQue
-                                })];
+                            data = {
+                                jobName: jobName,
+                                jobParams: jobParams,
+                                jobQue: jobQue
+                            };
+                            return [4 /*yield*/, this.find(data)];
                         case 1:
+                            existingAsset = _a.sent();
+                            if (existingAsset)
+                                return [2 /*return*/, existingAsset];
+                            return [4 /*yield*/, this.collection.insertOne(data)];
+                        case 2:
                             res = _a.sent();
-                            return [2 /*return*/, new LazyAsset(res.insertedId, jobName, jobParams, jobQue, null, null, this.assets, this.progresses, this.jobMan, this.collection)];
+                            return [2 /*return*/, new LazyAsset(res.insertedId, data, this.collection, this.assets, this.progresses, this.jobMan)];
                     }
                 });
             });
@@ -2826,7 +3018,7 @@
                             data = _a.sent();
                             return [2 /*return*/, !data
                                     ? null
-                                    : new LazyAsset(data._id, data.jobName, data.jobParams, data.jobQue, data.progressId, data.assetId, this.assets, this.progresses, this.jobMan, this.collection)];
+                                    : new LazyAsset(data._id, data, this.collection, this.assets, this.progresses, this.jobMan)];
                     }
                 });
             });
@@ -4330,6 +4522,26 @@
                 });
             });
         };
+        AssetsController.prototype.uploadUrl = function (body) {
+            return __awaiter$7(this, void 0, void 0, function () {
+                var asset, e_2, msg;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            _c.trys.push([0, 2, , 3]);
+                            return [4 /*yield*/, this.assets.writeUrl(body.url, body)];
+                        case 1:
+                            asset = _c.sent();
+                            return [2 /*return*/, asset.toJSON()];
+                        case 2:
+                            e_2 = _c.sent();
+                            msg = (e_2 === null || e_2 === void 0 ? void 0 : e_2.message) || e_2 || "Unknown error";
+                            throw new routingControllers.HttpError(400, "Asset can't be uploaded.\n" + msg);
+                        case 3: return [2 /*return*/];
+                    }
+                });
+            });
+        };
         AssetsController.prototype.getImageRotation = function (id, params, rotation) {
             if (rotation === void 0) { rotation = 0; }
             var _a;
@@ -4393,6 +4605,14 @@
         __metadata$7("design:paramtypes", [Object]),
         __metadata$7("design:returntype", Promise)
     ], AssetsController.prototype, "upload", null);
+    __decorate$a([
+        routingControllers.Authorized(),
+        routingControllers.Post("url"),
+        __param$5(0, routingControllers.Body()),
+        __metadata$7("design:type", Function),
+        __metadata$7("design:paramtypes", [Object]),
+        __metadata$7("design:returntype", Promise)
+    ], 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")),
@@ -5003,8 +5223,9 @@
     ], CompressionMiddleware);
 
     var Tree = /** @class */ (function () {
-        function Tree(container, path) {
+        function Tree(container, exists, path) {
             this.container = container;
+            this.exists = exists;
             this.path = path;
             this.map = new Map();
         }
@@ -5016,7 +5237,7 @@
             configurable: true
         });
         Tree.prototype.resolveService = function () {
-            return this.container.resolve(this.path);
+            return !this.exists ? null : this.container.resolve(this.path);
         };
         Tree.prototype.resolveLeaves = function () {
             var map;
@@ -5058,7 +5279,7 @@
                 parentTree = parentTree.resolveAncestor(path);
             }
             catch (e) {
-                parentTree = new Tree(this.container, "");
+                parentTree = new Tree(this.container, false, "");
             }
             var pathParts = path.split(".");
             var tree = this;
@@ -5092,7 +5313,7 @@
         Tree.prototype.resolvePath = function (path, throwError) {
             if (throwError === void 0) { throwError = true; }
             var absolutePath = !this.path ? path : this.path + "." + path;
-            var tree = new Tree(this.container, absolutePath);
+            var tree = new Tree(this.container, false, absolutePath);
             try {
                 tree = this.resolveAncestor(path);
             }
@@ -5111,29 +5332,21 @@
             return tree;
         };
         Tree.prototype.addPath = function (path) {
-            var e_2, _a;
             if (!isString(path) || path.length == 0) {
                 return this;
             }
             var pathParts = path.split(".");
+            var maxIx = pathParts.length - 1;
             var tree = this;
             path = this.path;
-            try {
-                for (var pathParts_2 = __values(pathParts), pathParts_2_1 = pathParts_2.next(); !pathParts_2_1.done; pathParts_2_1 = pathParts_2.next()) {
-                    var part = pathParts_2_1.value;
-                    if (!tree.map.has(part)) {
-                        tree.map.set(part, new Tree(this.container, !path ? part : path + "." + part));
-                    }
-                    tree = tree.map.get(part);
-                    path = tree.path;
-                }
-            }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-            finally {
-                try {
-                    if (pathParts_2_1 && !pathParts_2_1.done && (_a = pathParts_2.return)) _a.call(pathParts_2);
+            for (var ix = 0; ix <= maxIx; ix++) {
+                var part = pathParts[ix];
+                if (!tree.map.has(part)) {
+                    tree.map.set(part, new Tree(this.container, false, !path ? part : path + "." + part));
                 }
-                finally { if (e_2) throw e_2.error; }
+                tree = tree.map.get(part);
+                tree.exists = tree.exists || ix == maxIx;
+                path = tree.path;
             }
             return this;
         };
@@ -5148,7 +5361,7 @@
             container["wrapperContainer"] = this;
             this.tokens = [];
             this.tokenSet = new Set();
-            this.myTree = new Tree(this, "");
+            this.root = new Tree(this, false, "");
         }
         Object.defineProperty(DiContainer.prototype, "registeredTokens", {
             get: function () {
@@ -5160,7 +5373,7 @@
         });
         Object.defineProperty(DiContainer.prototype, "tree", {
             get: function () {
-                return this.myTree;
+                return this.root;
             },
             enumerable: false,
             configurable: true
@@ -5224,7 +5437,7 @@
             this.tokenSet.add(token);
             this.tokens.push(token);
             if (isString(token)) {
-                this.myTree.addPath(token);
+                this.root.addPath(token);
             }
             return this;
         };
@@ -5328,29 +5541,36 @@
                             return [4 /*yield*/, this.progresses.get(lazyAsset.progressId)];
                         case 2:
                             progress = _a.sent();
+                            if (!progress || progress.canceled)
+                                return [2 /*return*/, null];
                             _a.label = 3;
                         case 3:
-                            _a.trys.push([3, 6, , 8]);
+                            _a.trys.push([3, 7, , 9]);
                             return [4 /*yield*/, this.generate(progress)];
                         case 4:
                             asset = _a.sent();
-                            return [4 /*yield*/, lazyAsset.writeAsset(asset)];
+                            return [4 /*yield*/, progress.load()];
                         case 5:
-                            _a.sent();
-                            return [3 /*break*/, 8];
+                            progress = _a.sent();
+                            if (!progress || progress.canceled)
+                                return [2 /*return*/, null];
+                            return [4 /*yield*/, lazyAsset.writeAsset(asset)];
                         case 6:
+                            _a.sent();
+                            return [3 /*break*/, 9];
+                        case 7:
                             e_1 = _a.sent();
                             return [4 /*yield*/, progress.setError(e_1.message || e_1)];
-                        case 7:
+                        case 8:
                             _a.sent();
                             throw e_1;
-                        case 8:
-                            if (!(progress.remaining > 0)) return [3 /*break*/, 10];
-                            return [4 /*yield*/, progress.advance(progress.remaining)];
                         case 9:
+                            if (!(progress.remaining > 0)) return [3 /*break*/, 11];
+                            return [4 /*yield*/, progress.advance(progress.remaining)];
+                        case 10:
                             _a.sent();
-                            _a.label = 10;
-                        case 10: return [2 /*return*/];
+                            _a.label = 11;
+                        case 11: return [2 /*return*/];
                     }
                 });
             });