@stemy/backend 2.7.4 → 2.8.3

package/fesm2015/stemy-backend.js

@@ -36,7 +36,7 @@ import * as Handlebars from 'handlebars';
 import { compare } from 'bcrypt';
 import moment from 'moment';
 
-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 { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -238,7 +238,7 @@ function hydratePopulated(modelType, json) {
     return object;
 }
 function paginateAggregations(model, aggregations, params, metaProjection = {}) {
-    return __awaiter$u(this, void 0, void 0, function* () {
+    return __awaiter$v(this, void 0, void 0, function* () {
         const sortField = !isString(params.sort) || !params.sort ? null : (params.sort.startsWith("-") ? params.sort.substr(1) : params.sort);
         const sortAggregation = !sortField ? [] : [{
                 $sort: { [sortField]: sortField == params.sort ? 1 : -1 }
@@ -337,7 +337,7 @@ function readFile(path) {
     });
 }
 function readAndDeleteFile(path, timeout = 5000) {
-    return __awaiter$u(this, void 0, void 0, function* () {
+    return __awaiter$v(this, void 0, void 0, function* () {
         const data = yield readFile(path);
         setTimeout(() => {
             unlink(path, () => {
@@ -347,7 +347,7 @@ function readAndDeleteFile(path, timeout = 5000) {
     });
 }
 function writeFile(path, data) {
-    return __awaiter$u(this, void 0, void 0, function* () {
+    return __awaiter$v(this, void 0, void 0, function* () {
         yield mkdirRecursive(dirname(path));
         return new Promise((res, rej) => {
             writeFile$1(path, data, err => {
@@ -426,7 +426,7 @@ function ResolveEntity(model, extraCheck) {
     const paramName = modelName.toLowerCase();
     return createParamDecorator({
         required: false,
-        value: (action) => __awaiter$u(this, void 0, void 0, function* () {
+        value: (action) => __awaiter$v(this, void 0, void 0, function* () {
             const req = action.request;
             const token = req.header(`x-${paramName}-token`);
             const id = req.params[`${paramName}Id`];
@@ -750,7 +750,7 @@ var __decorate$w = (this && this.__decorate) || function (decorators, target, ke
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) 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 { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -775,7 +775,7 @@ const fontProps = [
 ];
 let AssetProcessor = AssetProcessor_1 = class AssetProcessor {
     static getMimeType(buffer, mimeType) {
-        return __awaiter$t(this, void 0, void 0, function* () {
+        return __awaiter$u(this, void 0, void 0, function* () {
             try {
                 mimeType = (yield fromBuffer(buffer)).mime;
             }
@@ -807,7 +807,7 @@ let AssetProcessor = AssetProcessor_1 = class AssetProcessor {
         return imageTypes.indexOf(contentType) >= 0;
     }
     static copyImageMeta(buffer, metadata) {
-        return __awaiter$t(this, void 0, void 0, function* () {
+        return __awaiter$u(this, void 0, void 0, function* () {
             const output = yield sharp$3(buffer).rotate().toBuffer({ resolveWithObject: true });
             Object.assign(metadata, output.info);
             return output.data;
@@ -824,7 +824,7 @@ let AssetProcessor = AssetProcessor_1 = class AssetProcessor {
         });
     }
     process(buffer, metadata, contentType) {
-        return __awaiter$t(this, void 0, void 0, function* () {
+        return __awaiter$u(this, void 0, void 0, function* () {
             if (AssetProcessor_1.isImage(contentType)) {
                 buffer = yield AssetProcessor_1.copyImageMeta(buffer, metadata);
             }
@@ -876,9 +876,11 @@ let Configuration = class Configuration {
         }).replace(/\./gi, "_").replace(/^_/, "").toUpperCase();
         const envValue = process.env[envName];
         if (typeof envValue !== "undefined") {
-            return isFunction(param.resolver)
+            const value = isFunction(param.resolver)
                 ? param.resolver(envValue)
                 : convertValue(envValue, getType(param.defaultValue));
+            console.log(`Processing param value`, name, envName, envValue, value);
+            return value;
         }
         return param.defaultValue;
     }
@@ -899,7 +901,7 @@ var __decorate$u = (this && this.__decorate) || function (decorators, target, ke
 var __metadata$o = (this && this.__metadata) || function (k, v) {
     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 { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -925,7 +927,7 @@ let MongoConnector = class MongoConnector {
         return this.fsBucket;
     }
     connect() {
-        return __awaiter$s(this, void 0, void 0, function* () {
+        return __awaiter$t(this, void 0, void 0, function* () {
             if (this.db)
                 return this.db;
             this.conn = (yield connect(this.configuration.resolve("mongoUri"), {
@@ -946,6 +948,43 @@ MongoConnector = __decorate$u([
     __metadata$o("design:paramtypes", [Configuration])
 ], 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());
+    });
+};
+class BaseEntity {
+    constructor(mId, data, collection) {
+        this.mId = mId;
+        this.data = data;
+        this.collection = collection;
+    }
+    get id() {
+        return this.mId.toHexString();
+    }
+    save() {
+        return this.collection.updateOne({ _id: this.mId }, { $set: this.toJSON() });
+    }
+    load() {
+        return __awaiter$s(this, void 0, void 0, function* () {
+            const res = yield this.collection.findOne({ _id: this.mId });
+            this.deleted = !res;
+            this.data = res || {};
+            return this;
+        });
+    }
+    toJSON() {
+        const ret = Object.assign({}, this.data);
+        delete ret._id;
+        ret.id = this.id;
+        return ret;
+    }
+}
+
 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) {
@@ -962,14 +1001,10 @@ const cropInterface = {
     w: "number",
     h: "number"
 };
-class Asset {
-    constructor(fileId, filename, contentType, metadata, bucket, collection) {
-        this.fileId = fileId;
-        this.filename = filename;
-        this.contentType = contentType;
-        this.metadata = metadata;
+class Asset extends BaseEntity {
+    constructor(id, data, collection, bucket) {
+        super(id, data, collection);
         this.bucket = bucket;
-        this.collection = collection;
     }
     static toCropRegion(cropInfo) {
         let crop = cropInfo;
@@ -1064,15 +1099,21 @@ class Asset {
             }
         });
     }
-    get id() {
-        return this.fileId.toHexString();
+    get filename() {
+        return this.data.filename;
+    }
+    get contentType() {
+        return this.data.contentType;
+    }
+    get metadata() {
+        return this.data.metadata;
     }
     get stream() {
-        return this.bucket.openDownloadStream(this.fileId);
+        return this.bucket.openDownloadStream(this.mId);
     }
     unlink() {
         return __awaiter$r(this, void 0, void 0, function* () {
-            return deleteFromBucket(this.bucket, this.fileId);
+            return deleteFromBucket(this.bucket, this.mId);
         });
     }
     getBuffer() {
@@ -1086,7 +1127,7 @@ class Asset {
                 : metadata.downloadCount + 1;
             metadata.firstDownload = metadata.firstDownload || new Date();
             metadata.lastDownload = new Date();
-            yield this.collection.updateOne({ _id: this.fileId }, { $set: { metadata } });
+            yield this.collection.updateOne({ _id: this.mId }, { $set: { metadata } });
             return this.stream;
         });
     }
@@ -1100,14 +1141,6 @@ class Asset {
             return Asset.toImage(yield this.download(metadata), this.metadata, params);
         });
     }
-    toJSON() {
-        return {
-            id: this.id,
-            filename: this.filename,
-            contentType: this.contentType,
-            metadata: this.metadata
-        };
-    }
 }
 
 var __decorate$t = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -1168,8 +1201,12 @@ let Assets = class Assets {
                     reject(error.message || error);
                 })
                     .on("finish", () => {
-                    const asset = new Asset(uploaderStream.id, metadata.filename, contentType, metadata, this.bucket, this.collection);
-                    this.collection.updateOne({ _id: uploaderStream.id }, { $set: asset.toJSON() }).then(() => {
+                    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);
@@ -1200,7 +1237,20 @@ let Assets = class Assets {
     find(where) {
         return __awaiter$q(this, void 0, void 0, function* () {
             const data = yield this.collection.findOne(where);
-            return !data ? null : new Asset(data._id, data.filename, data.contentType, data.metadata, this.bucket, this.collection);
+            return !data ? null : new Asset(data._id, data, this.collection, this.bucket);
+        });
+    }
+    findMany(where) {
+        return __awaiter$q(this, void 0, void 0, function* () {
+            const cursor = this.collection.find(where);
+            const items = (yield cursor.toArray()) || [];
+            const result = [];
+            for (let item of items) {
+                if (!item)
+                    continue;
+                result.push(new Asset(item._id, item, this.collection, this.bucket));
+            }
+            return result;
         });
     }
     unlink(id) {
@@ -1227,52 +1277,61 @@ var __awaiter$p = (this && this.__awaiter) || function (thisArg, _arguments, P,
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-class LazyAsset {
-    constructor(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;
+class LazyAsset extends BaseEntity {
+    constructor(id, data, collection, assets, progresses, jobMan) {
+        super(id, data, collection);
         this.assets = assets;
         this.progresses = progresses;
         this.jobMan = jobMan;
-        this.collection = collection;
     }
-    get id() {
-        return this.lazyId.toHexString();
+    get jobName() {
+        return this.data.jobName;
+    }
+    get jobParams() {
+        return this.data.jobParams;
+    }
+    get jobQue() {
+        return this.data.jobQue;
     }
     get progressId() {
-        return this.mProgressId;
+        return this.data.progressId;
     }
     get assetId() {
-        return this.mAssetId;
+        return this.data.assetId;
     }
     unlink() {
         return __awaiter$p(this, void 0, void 0, function* () {
-            yield this.collection.deleteOne({ _id: this.lazyId });
-            return deleteFromBucket(this.assets.bucket, new ObjectId(this.mAssetId));
+            yield this.load();
+            if (!this.progressId) {
+                yield this.collection.deleteOne({ _id: this.mId });
+            }
+            return deleteFromBucket(this.assets.bucket, new ObjectId(this.assetId));
         });
     }
     startWorking() {
-        if (this.mProgressId)
-            return;
-        this.startWorkingOnAsset().then(() => {
-            console.log(`Started working on lazy asset: ${this.id}`);
-        }).catch(reason => {
-            console.log(`Can't start working on lazy asset: ${this.id}\nReason: ${reason}`);
+        this.load().then(() => {
+            if (this.deleted)
+                return;
+            const progressPromise = !this.progressId ? Promise.resolve(null) : this.progresses.get(this.progressId).then(p => p.cancel());
+            progressPromise.then(() => {
+                this.startWorkingOnAsset().then(() => {
+                    console.log(`Started working on lazy asset: ${this.id}`);
+                }).catch(reason => {
+                    console.log(`Can't start working on lazy asset: ${this.id}\nReason: ${reason}`);
+                });
+            });
         });
     }
     loadAsset() {
         return __awaiter$p(this, void 0, void 0, function* () {
-            if (this.mAssetId) {
-                return this.assets.read(this.mAssetId);
+            yield this.load();
+            if (this.deleted)
+                return null;
+            if (this.assetId) {
+                return this.assets.read(this.assetId);
             }
-            if (this.mProgressId) {
-                yield this.progresses.waitToFinish(this.mProgressId);
-                const data = yield this.collection.findOne({ _id: this.lazyId });
-                this.mAssetId = data.assetId;
+            if (this.progressId) {
+                yield this.progresses.waitToFinish(this.progressId);
                 return this.loadAsset();
             }
             yield this.startWorkingOnAsset();
@@ -1281,30 +1340,17 @@ class LazyAsset {
     }
     writeAsset(asset) {
         return __awaiter$p(this, void 0, void 0, function* () {
-            this.mAssetId = asset.id;
+            this.data.assetId = asset.id;
             yield this.save();
             return asset;
         });
     }
-    save() {
-        return this.collection.updateOne({ _id: this.lazyId }, { $set: this.toJSON() });
-    }
-    toJSON() {
-        return {
-            id: this.id,
-            jobName: this.jobName,
-            jobParams: this.jobParams,
-            jobQue: this.jobQue,
-            progressId: this.progressId,
-            assetId: this.assetId,
-        };
-    }
     startWorkingOnAsset() {
         return __awaiter$p(this, void 0, void 0, function* () {
-            const progress = yield this.progresses.create();
-            this.mProgressId = progress.id;
+            const { id } = yield this.progresses.create();
+            this.data.progressId = id;
             yield this.save();
-            yield this.jobMan.enqueueWithName(this.jobName, Object.assign(Object.assign({}, this.jobParams), { lazyId: this.id }));
+            yield this.jobMan.enqueueWithName(this.data.jobName, Object.assign(Object.assign({}, this.data.jobParams), { lazyId: this.id }));
         });
     }
 }
@@ -1513,36 +1559,31 @@ var __awaiter$n = (this && this.__awaiter) || function (thisArg, _arguments, P,
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-class Progress {
-    constructor(progressId, mCurrent, mMax, mMessage, mError, client, collection) {
-        this.progressId = progressId;
-        this.mCurrent = mCurrent;
-        this.mMax = mMax;
-        this.mMessage = mMessage;
-        this.mError = mError;
+class Progress extends BaseEntity {
+    constructor(id, data, collection, client) {
+        super(id, data, collection);
         this.client = client;
-        this.collection = collection;
-    }
-    get id() {
-        return this.progressId.toHexString();
     }
     get current() {
-        return this.mCurrent;
+        return this.data.current;
     }
     get max() {
-        return this.mMax;
+        return this.data.max;
     }
     get message() {
-        return this.mMessage;
+        return this.data.message;
     }
     get error() {
-        return this.mError;
+        return this.data.error;
+    }
+    get canceled() {
+        return this.data.canceled;
     }
     get percent() {
-        return this.mMax > 0 ? Math.round(this.mCurrent / this.mMax * 100) : 0;
+        return this.max > 0 ? Math.round(this.current / this.max * 100) : 0;
     }
     get remaining() {
-        return this.mMax > 0 ? this.mMax - this.mCurrent : 0;
+        return this.max > 0 ? this.max - this.current : 0;
     }
     createSubProgress(progressValue, max, message) {
         return __awaiter$n(this, void 0, void 0, function* () {
@@ -1550,10 +1591,10 @@ class Progress {
                 yield this.advance(progressValue);
             }
             if (message !== null) {
-                this.mMessage = message;
+                this.data.message = message;
                 yield this.save();
             }
-            return new SubProgress(this, this.mCurrent, progressValue, Math.max(max, 1));
+            return new SubProgress(this, this.current, progressValue, Math.max(max, 1));
         });
     }
     setMax(max) {
@@ -1561,13 +1602,19 @@ class Progress {
             if (isNaN(max) || max <= 0) {
                 throw "Max progress value must be bigger than zero";
             }
-            this.mMax = max;
+            this.data.max = max;
+            yield this.save();
+        });
+    }
+    setMessage(message) {
+        return __awaiter$n(this, void 0, void 0, function* () {
+            this.data.message = message;
             yield this.save();
         });
     }
     setError(error) {
         return __awaiter$n(this, void 0, void 0, function* () {
-            this.mError = error;
+            this.data.error = error;
             yield this.save();
         });
     }
@@ -1576,63 +1623,60 @@ class Progress {
             if (isNaN(value) || value <= 0) {
                 throw "Advance value must be bigger than zero";
             }
-            this.mCurrent = Math.min(this.mMax, this.mCurrent + value);
+            yield this.load();
+            if (this.deleted || this.canceled)
+                return null;
+            this.data.current = Math.min(this.max, this.current + value);
             yield this.save();
             if (!this.client)
                 return;
             this.client.emit("background-progress", this.id);
         });
     }
-    toJSON() {
-        return {
-            id: this.id,
-            current: this.current,
-            max: this.max,
-            message: this.message,
-            error: this.error
-        };
-    }
-    save() {
-        return this.collection.updateOne({ _id: this.progressId }, { $set: this.toJSON() });
+    cancel() {
+        return __awaiter$n(this, void 0, void 0, function* () {
+            this.data.canceled = true;
+            yield this.save();
+        });
     }
 }
 class SubProgress {
-    constructor(parent, progressFrom, progressValue, max = 100) {
+    constructor(parent, progressFrom, progressValue, 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;
     }
     get id() {
         return this.parent.id;
     }
+    get current() {
+        return this.mCurrent;
+    }
+    get max() {
+        return this.mMax;
+    }
     get message() {
         return this.parent.message;
     }
-    set message(value) {
-        this.parent.message = value;
-    }
     get error() {
         return this.parent.error;
     }
-    set error(value) {
-        this.parent.error = value;
-    }
     get percent() {
         return this.parent.percent;
     }
-    get current() {
-        return this.currentValue;
-    }
     get remaining() {
-        return this.max - this.currentValue;
+        return this.max - this.mCurrent;
+    }
+    get canceled() {
+        return !this.parent || this.parent.canceled;
     }
     createSubProgress(progressValue, max, message) {
         return __awaiter$n(this, void 0, void 0, function* () {
@@ -1640,8 +1684,7 @@ class SubProgress {
                 yield this.advance(progressValue);
             }
             if (message !== null) {
-                this.message = message;
-                yield this.parent.save();
+                yield this.setMessage(message);
             }
             return new SubProgress(this, this.current, progressValue, Math.max(max, 1));
         });
@@ -1651,14 +1694,22 @@ class SubProgress {
             if (isNaN(max) || max <= 0) {
                 throw "Max progress value must be bigger than zero";
             }
-            this.max = max;
+            this.mMax = max;
             yield this.save();
         });
     }
+    setMessage(message) {
+        return __awaiter$n(this, void 0, void 0, function* () {
+            if (!this.parent)
+                return null;
+            yield this.parent.setMessage(message);
+        });
+    }
     setError(error) {
         return __awaiter$n(this, void 0, void 0, function* () {
-            this.error = error || null;
-            yield this.save();
+            if (!this.parent)
+                return null;
+            yield this.parent.setError(error);
         });
     }
     advance(value = 1) {
@@ -1666,13 +1717,20 @@ class SubProgress {
             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);
             yield this.save();
         });
     }
+    cancel() {
+        return __awaiter$n(this, void 0, void 0, function* () {
+            if (!this.parent)
+                return null;
+            yield this.parent.cancel();
+        });
+    }
     save() {
         return __awaiter$n(this, void 0, void 0, function* () {
-            const ratio = this.max > 0 ? this.currentValue / this.max : 0;
+            const ratio = this.max > 0 ? this.mCurrent / this.max : 0;
             const newProgress = this.progressFrom + Math.round(this.progressValue * ratio);
             const current = this.parent.current;
             if (newProgress <= current)
@@ -1680,6 +1738,11 @@ class SubProgress {
             yield this.parent.advance(newProgress);
         });
     }
+    load() {
+        return __awaiter$n(this, void 0, void 0, function* () {
+            return null;
+        });
+    }
     toJSON() {
         return this.parent.toJSON();
     }
@@ -1740,7 +1803,7 @@ let Progresses = class Progresses {
     find(where) {
         return __awaiter$m(this, void 0, void 0, function* () {
             const data = yield this.collection.findOne(where);
-            return !data ? null : new Progress(data._id, data.current, data.max, data.message, data.error, this.client, this.collection);
+            return !data ? null : new Progress(data._id, data, this.collection, this.client);
         });
     }
     create(max = 100) {
@@ -1748,11 +1811,15 @@ let Progresses = class Progresses {
             if (isNaN(max) || max <= 0) {
                 throw "Max progress value must be bigger than zero";
             }
-            const res = yield this.collection.insertOne({
+            const data = {
                 current: 0,
-                max
-            });
-            return new Progress(res.insertedId, 0, max, "", "", this.client, this.collection);
+                max: max,
+                message: "",
+                error: "",
+                canceled: false
+            };
+            const res = yield this.collection.insertOne(data);
+            return new Progress(res.insertedId, data, this.collection, this.client);
         });
     }
     remove(id) {
@@ -1797,12 +1864,16 @@ let LazyAssets = class LazyAssets {
     create(jobType, jobParams = {}, jobQue = "main") {
         return __awaiter$l(this, void 0, void 0, function* () {
             const jobName = this.jobMan.tryResolve(jobType, Object.assign(Object.assign({}, jobParams), { lazyId: "" }));
-            const res = yield this.collection.insertOne({
+            const data = {
                 jobName,
                 jobParams,
                 jobQue
-            });
-            return new LazyAsset(res.insertedId, jobName, jobParams, jobQue, null, null, this.assets, this.progresses, this.jobMan, this.collection);
+            };
+            const existingAsset = yield this.find(data);
+            if (existingAsset)
+                return existingAsset;
+            const res = yield this.collection.insertOne(data);
+            return new LazyAsset(res.insertedId, data, this.collection, this.assets, this.progresses, this.jobMan);
         });
     }
     read(id) {
@@ -1815,7 +1886,7 @@ let LazyAssets = class LazyAssets {
             const data = yield this.collection.findOne(where);
             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);
         });
     }
     unlink(id) {
@@ -3285,8 +3356,9 @@ CompressionMiddleware = __decorate([
 ], CompressionMiddleware);
 
 class Tree {
-    constructor(container, path) {
+    constructor(container, exists, path) {
         this.container = container;
+        this.exists = exists;
         this.path = path;
         this.map = new Map();
     }
@@ -3294,7 +3366,7 @@ class Tree {
         return this.container.parent.tree;
     }
     resolveService() {
-        return this.container.resolve(this.path);
+        return !this.exists ? null : this.container.resolve(this.path);
     }
     resolveLeaves() {
         let map;
@@ -3335,7 +3407,7 @@ class Tree {
             parentTree = parentTree.resolveAncestor(path);
         }
         catch (e) {
-            parentTree = new Tree(this.container, "");
+            parentTree = new Tree(this.container, false, "");
         }
         const pathParts = path.split(".");
         let tree = this;
@@ -3358,7 +3430,7 @@ class Tree {
     }
     resolvePath(path, throwError = true) {
         const absolutePath = !this.path ? path : `${this.path}.${path}`;
-        let tree = new Tree(this.container, absolutePath);
+        let tree = new Tree(this.container, false, absolutePath);
         try {
             tree = this.resolveAncestor(path);
         }
@@ -3381,13 +3453,16 @@ class Tree {
             return this;
         }
         const pathParts = path.split(".");
+        const maxIx = pathParts.length - 1;
         let tree = this;
         path = this.path;
-        for (let part of pathParts) {
+        for (let ix = 0; ix <= maxIx; ix++) {
+            const part = pathParts[ix];
             if (!tree.map.has(part)) {
-                tree.map.set(part, new Tree(this.container, !path ? part : `${path}.${part}`));
+                tree.map.set(part, new Tree(this.container, false, !path ? part : `${path}.${part}`));
             }
             tree = tree.map.get(part);
+            tree.exists = tree.exists || ix == maxIx;
             path = tree.path;
         }
         return this;
@@ -3401,14 +3476,14 @@ class DiContainer {
         container["wrapperContainer"] = this;
         this.tokens = [];
         this.tokenSet = new Set();
-        this.myTree = new Tree(this, "");
+        this.root = new Tree(this, false, "");
     }
     get registeredTokens() {
         var _a;
         return (((_a = this.parent) === null || _a === void 0 ? void 0 : _a.registeredTokens) || []).concat(this.tokens);
     }
     get tree() {
-        return this.myTree;
+        return this.root;
     }
     beforeResolution(token, callback, options) {
         this.container.beforeResolution(token, callback, options);
@@ -3469,7 +3544,7 @@ class DiContainer {
         this.tokenSet.add(token);
         this.tokens.push(token);
         if (isString(token)) {
-            this.myTree.addPath(token);
+            this.root.addPath(token);
         }
         return this;
     }
@@ -3527,9 +3602,14 @@ class LazyAssetGenerator {
     process() {
         return __awaiter$1(this, void 0, void 0, function* () {
             const lazyAsset = yield this.lazyAssets.read(this.lazyId);
-            const progress = yield this.progresses.get(lazyAsset.progressId);
+            let progress = yield this.progresses.get(lazyAsset.progressId);
+            if (!progress || progress.canceled)
+                return null;
             try {
                 const asset = yield this.generate(progress);
+                progress = yield progress.load();
+                if (!progress || progress.canceled)
+                    return null;
                 yield lazyAsset.writeAsset(asset);
             }
             catch (e) {