@stemy/backend 5.1.0 → 5.2.0

package/fesm2015/stemy-backend.mjs

@@ -15,7 +15,7 @@ import { exec } from 'child_process';
 import { createHash } from 'crypto';
 import { Subscription, Observable, Subject, from, BehaviorSubject } from 'rxjs';
 import { canReportError } from 'rxjs/internal/util/canReportError';
-import { ObjectId, GridFSBucket } from 'mongodb';
+import { ObjectId } from 'mongodb';
 import mongoose from 'mongoose';
 import { Readable, PassThrough } from 'stream';
 import fileType from 'file-type/core';
@@ -37,6 +37,7 @@ import * as Handlebars from 'handlebars';
 import { CommandsAddon, AnsiCodes } from '@stemy/terminal-commands-addon';
 import { compare } from 'bcrypt';
 import moment from 'moment';
+import { GridFSBucket } from 'mongodb/lib/gridfs';
 import { getModelForClass } from '@typegoose/typegoose';
 import { getValue as getValue$1, setValue } from 'mongoose/lib/utils';
 
@@ -53,6 +54,8 @@ const SOCKET_CONTROLLERS = Symbol.for("socket-controllers-token");
 const PARAMETER = Symbol.for("parameter-token");
 const DI_CONTAINER = Symbol.for("di-container-token");
 const OPENAPI_VALIDATION = Symbol.for("openapi-validation-token");
+const LOCAL_DIR = Symbol.for('asset-local-dir');
+const ASSET_DRIVER = Symbol.for('assets-driver');
 class Parameter {
     constructor(name, defaultValue, resolver = null) {
         this.name = name;
@@ -941,20 +944,16 @@ Configuration = __decorate([
 ], Configuration);
 
 let MongoConnector = class MongoConnector {
-    constructor(configuration) {
-        this.configuration = configuration;
-        this.conn = null;
-        this.db = null;
-        this.fsBucket = null;
-    }
     get connection() {
         return this.conn;
     }
     get database() {
         return this.db;
     }
-    get bucket() {
-        return this.fsBucket;
+    constructor(configuration) {
+        this.configuration = configuration;
+        this.conn = null;
+        this.db = null;
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -966,7 +965,6 @@ let MongoConnector = class MongoConnector {
                 pass: this.configuration.resolve("mongoPassword")
             })).connection;
             this.db = this.conn.db;
-            this.fsBucket = new GridFSBucket(this.db, { bucketName: "assets" });
         });
     }
 };
@@ -976,20 +974,20 @@ MongoConnector = __decorate([
 ], MongoConnector);
 
 class BaseEntity {
-    constructor(mId, data, collection) {
-        this.mId = mId;
+    get id() {
+        return this.oid.toHexString();
+    }
+    constructor(oid, data, collection) {
+        this.oid = oid;
         this.data = data;
         this.collection = collection;
     }
-    get id() {
-        return this.mId.toHexString();
-    }
     save() {
-        return this.collection.updateOne({ _id: this.mId }, { $set: this.toJSON() });
+        return this.collection.updateOne({ _id: this.oid }, { $set: this.toJSON() }, { upsert: true });
     }
     load() {
         return __awaiter(this, void 0, void 0, function* () {
-            const res = yield this.collection.findOne({ _id: this.mId });
+            const res = yield this.collection.findOne({ _id: this.oid });
             this.deleted = !res;
             this.data = res || {};
             return this;
@@ -1006,10 +1004,6 @@ class BaseEntity {
 }
 
 class Asset extends BaseEntity {
-    constructor(id, data, collection, bucket) {
-        super(id, data, collection);
-        this.bucket = bucket;
-    }
     get filename() {
         return this.data.filename;
     }
@@ -1020,17 +1014,34 @@ class Asset extends BaseEntity {
         return this.data.metadata;
     }
     get stream() {
-        return this.bucket.openDownloadStream(this.mId);
+        return this.driver.openDownloadStream(this.oid);
+    }
+    constructor(id, data, collection, driver) {
+        super(id, data, collection);
+        this.driver = driver;
     }
     unlink() {
         return __awaiter(this, void 0, void 0, function* () {
-            return deleteFromBucket(this.bucket, this.mId);
+            try {
+                yield this.driver.delete(this.oid);
+                yield this.collection.deleteOne({ _id: this.oid });
+            }
+            catch (error) {
+                let err = error;
+                if (error) {
+                    err = error.message || error || "";
+                    if (!isString(err) || !err.startsWith("FileNotFound")) {
+                        throw err;
+                    }
+                }
+            }
+            return this.id;
         });
     }
     setMeta(metadata) {
         return __awaiter(this, void 0, void 0, function* () {
             metadata = Object.assign(this.metadata, metadata || {});
-            yield this.collection.updateOne({ _id: this.mId }, { $set: { metadata } });
+            yield this.collection.updateOne({ _id: this.oid }, { $set: { metadata } });
         });
     }
     getBuffer() {
@@ -1044,7 +1055,7 @@ class Asset extends BaseEntity {
                 : metadata.downloadCount + 1;
             metadata.firstDownload = metadata.firstDownload || new Date();
             metadata.lastDownload = new Date();
-            yield this.collection.updateOne({ _id: this.mId }, { $set: { metadata } });
+            yield this.collection.updateOne({ _id: this.oid }, { $set: { metadata } });
             return this.stream;
         });
     }
@@ -1061,6 +1072,9 @@ class Asset extends BaseEntity {
 }
 
 class TempAsset {
+    get stream() {
+        return bufferToStream(this.buffer);
+    }
     constructor(buffer, filename, contentType, metadata) {
         this.buffer = buffer;
         this.filename = filename;
@@ -1068,9 +1082,6 @@ class TempAsset {
         this.metadata = metadata;
         this.id = new ObjectId$1().toHexString();
     }
-    get stream() {
-        return bufferToStream(this.buffer);
-    }
     unlink() {
         return __awaiter(this, void 0, void 0, function* () {
             throw new Error(`Temp asset '${this.id}' can not be removed!`);
@@ -1119,12 +1130,12 @@ class TempAsset {
 }
 
 let Assets = class Assets {
-    constructor(connector, assetProcessor) {
+    constructor(connector, assetProcessor, driver) {
         var _a;
         this.connector = connector;
         this.assetProcessor = assetProcessor;
-        this.bucket = connector.bucket;
-        this.collection = (_a = connector.database) === null || _a === void 0 ? void 0 : _a.collection("assets.files");
+        this.driver = driver;
+        this.collection = (_a = connector.database) === null || _a === void 0 ? void 0 : _a.collection(driver.metaCollection);
     }
     write(stream, contentType = null, metadata = null) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -1204,7 +1215,7 @@ let Assets = class Assets {
     find(where) {
         return __awaiter(this, void 0, void 0, function* () {
             const data = yield this.collection.findOne(where);
-            return !data ? null : new Asset(data._id, data, this.collection, this.bucket);
+            return !data ? null : new Asset(data._id, data, this.collection, this.driver);
         });
     }
     findMany(where) {
@@ -1215,7 +1226,7 @@ let Assets = class Assets {
             for (let item of items) {
                 if (!item)
                     continue;
-                result.push(new Asset(item._id, item, this.collection, this.bucket));
+                result.push(new Asset(item._id, item, this.collection, this.driver));
             }
             return result;
         });
@@ -1245,7 +1256,11 @@ let Assets = class Assets {
             metadata.filename = metadata.filename || new ObjectId$1().toHexString();
             metadata.extension = (fileType.ext || "").trim();
             return new Promise(((resolve, reject) => {
-                const uploaderStream = this.bucket.openUploadStream(metadata.filename);
+                const uploaderStream = this.driver.openUploadStream(metadata.filename, {
+                    chunkSizeBytes: 1048576,
+                    metadata,
+                    contentType: fileType.mime
+                });
                 stream.pipe(uploaderStream)
                     .on("error", error => {
                     reject(error.message || error);
@@ -1255,7 +1270,7 @@ let Assets = class Assets {
                         filename: metadata.filename,
                         contentType,
                         metadata
-                    }, this.collection, this.bucket);
+                    }, this.collection, this.driver);
                     asset.save().then(() => {
                         resolve(asset);
                     }, error => {
@@ -1269,16 +1284,12 @@ let Assets = class Assets {
 Assets = __decorate([
     injectable(),
     scoped(Lifecycle.ContainerScoped),
-    __metadata("design:paramtypes", [MongoConnector, AssetProcessor])
+    __param(2, inject(ASSET_DRIVER)),
+    __metadata("design:paramtypes", [MongoConnector,
+        AssetProcessor, Object])
 ], Assets);
 
 class LazyAsset extends BaseEntity {
-    constructor(id, data, collection, logger, assets, progresses) {
-        super(id, data, collection);
-        this.logger = logger;
-        this.assets = assets;
-        this.progresses = progresses;
-    }
     get jobName() {
         return this.data.jobName;
     }
@@ -1300,13 +1311,19 @@ class LazyAsset extends BaseEntity {
     get assetId() {
         return this.data.assetId;
     }
+    constructor(id, data, collection, logger, assets, progresses) {
+        super(id, data, collection);
+        this.logger = logger;
+        this.assets = assets;
+        this.progresses = progresses;
+    }
     unlink() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.load();
             if (!this.progressId) {
-                yield this.collection.deleteOne({ _id: this.mId });
+                yield this.collection.deleteOne({ _id: this.oid });
             }
-            return deleteFromBucket(this.assets.bucket, new ObjectId$1(this.assetId));
+            return this.assets.unlink(this.assetId);
         });
     }
     startWorking() {
@@ -1355,7 +1372,7 @@ class LazyAsset extends BaseEntity {
             this.data.progressId = (yield this.progresses.create()).id;
             this.data.assetId = null;
             yield this.save();
-            yield deleteFromBucket(this.assets.bucket, oldAsset);
+            yield this.assets.unlink(oldAsset);
             const jobParams = JSON.parse(yield gunzipPromised(this.data.jobParams));
             yield this.progresses.jobMan.enqueueWithName(this.data.jobName, Object.assign(Object.assign({}, jobParams), { lazyId: this.id, fromLoad }));
         });
@@ -1566,9 +1583,6 @@ JobManager = __decorate([
 ], JobManager);
 
 class Progress extends BaseEntity {
-    constructor(id, data, collection) {
-        super(id, data, collection);
-    }
     get current() {
         return this.data.current;
     }
@@ -1590,6 +1604,9 @@ class Progress extends BaseEntity {
     get remaining() {
         return this.max > 0 ? this.max - this.current : 0;
     }
+    constructor(id, data, collection) {
+        super(id, data, collection);
+    }
     setMessageBridge(messageBridge) {
         this.messageBridge = messageBridge || this.messageBridge;
         return this;
@@ -1655,19 +1672,6 @@ class Progress extends BaseEntity {
     }
 }
 class SubProgress {
-    constructor(parent, progressFrom, progressValue, mMax = 100) {
-        this.parent = parent;
-        this.progressFrom = progressFrom;
-        this.progressValue = progressValue;
-        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.mCurrent = 0;
-    }
     get id() {
         return this.parent.id;
     }
@@ -1692,6 +1696,19 @@ class SubProgress {
     get canceled() {
         return !this.parent || this.parent.canceled;
     }
+    constructor(parent, progressFrom, progressValue, mMax = 100) {
+        this.parent = parent;
+        this.progressFrom = progressFrom;
+        this.progressValue = progressValue;
+        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.mCurrent = 0;
+    }
     setMessageBridge(messageBridge) {
         if (!this.parent)
             return this;
@@ -1993,11 +2010,6 @@ IsObjectId = __decorate([
 ], IsObjectId);
 
 let OpenApi = class OpenApi {
-    constructor(container, customValidation) {
-        this.container = container;
-        this.customValidation = customValidation;
-        this.docs = null;
-    }
     get apiDocs() {
         if (!this.docs)
             this.docs = this.createApiDocs();
@@ -2008,6 +2020,11 @@ let OpenApi = class OpenApi {
             this.docsStr = JSON.stringify(this.apiDocs);
         return this.docsStr;
     }
+    constructor(container, customValidation) {
+        this.container = container;
+        this.customValidation = customValidation;
+        this.docs = null;
+    }
     schemaToExample(src, req) {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
@@ -2138,10 +2155,6 @@ Fixtures = __decorate([
 
 const express = express_;
 let BackendProvider = class BackendProvider {
-    constructor(config, container) {
-        this.config = config;
-        this.container = container;
-    }
     get io() {
         this.ioServer = this.ioServer || new Server(this.server, {
             path: "/socket",
@@ -2175,6 +2188,10 @@ let BackendProvider = class BackendProvider {
         this.httpServer = this.httpServer || createServer(this.express);
         return this.httpServer;
     }
+    constructor(config, container) {
+        this.config = config;
+        this.container = container;
+    }
     quickStart() {
         return __awaiter(this, void 0, void 0, function* () {
             const port = this.config.resolve("appPort");
@@ -2670,6 +2687,9 @@ TemplateRenderer = __decorate([
 ], TemplateRenderer);
 
 let MailSender = class MailSender {
+    get translator() {
+        return this.renderer.translator;
+    }
     constructor(config, renderer) {
         this.config = config;
         this.renderer = renderer;
@@ -2682,9 +2702,6 @@ let MailSender = class MailSender {
             }
         });
     }
-    get translator() {
-        return this.renderer.translator;
-    }
     sendMail(language, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const subject = yield this.translator.getTranslation(language, options.subject || "-");
@@ -3430,13 +3447,13 @@ TerminalController$1 = __decorate([
 ], TerminalController$1);
 
 let ErrorHandlerMiddleware = class ErrorHandlerMiddleware {
+    get isDev() {
+        return this.configuration.resolve("nodeEnv") === "development";
+    }
     constructor(configuration, translator) {
         this.configuration = configuration;
         this.translator = translator;
     }
-    get isDev() {
-        return this.configuration.resolve("nodeEnv") === "development";
-    }
     error(error, req, res, next) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -3784,15 +3801,15 @@ CompressionMiddleware = __decorate([
 ], CompressionMiddleware);
 
 class Tree {
+    get parentTree() {
+        return this.container.parent.tree;
+    }
     constructor(container, exists, path) {
         this.container = container;
         this.exists = exists;
         this.path = path;
         this.map = new Map();
     }
-    get parentTree() {
-        return this.container.parent.tree;
-    }
     resolveService() {
         return !this.exists ? null : this.container.resolve(this.path);
     }
@@ -3898,6 +3915,13 @@ class Tree {
 }
 
 class DiContainer {
+    get registeredTokens() {
+        var _a;
+        return (((_a = this.parent) === null || _a === void 0 ? void 0 : _a.registeredTokens) || []).concat(this.tokens);
+    }
+    get tree() {
+        return this.root;
+    }
     constructor(container, parent = null) {
         this.container = container;
         this.parent = parent;
@@ -3906,13 +3930,6 @@ class DiContainer {
         this.tokenSet = new Set();
         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.root;
-    }
     beforeResolution(token, callback, options) {
         this.container.beforeResolution(token, callback, options);
     }
@@ -4075,6 +4092,26 @@ const fixtures = [
     TtlFixture,
 ];
 
+let AssetGridDriver = class AssetGridDriver {
+    constructor(connector) {
+        this.bucket = new GridFSBucket(connector.database, { bucketName: 'assets' });
+        this.metaCollection = "assets.files";
+    }
+    openUploadStream(filename, opts) {
+        return this.bucket.openUploadStream(filename, opts);
+    }
+    openDownloadStream(id) {
+        return this.bucket.openDownloadStream(id);
+    }
+    delete(id) {
+        return this.bucket.delete(id);
+    }
+};
+AssetGridDriver = __decorate([
+    injectable(),
+    __metadata("design:paramtypes", [MongoConnector])
+], AssetGridDriver);
+
 class BaseDoc {
     /**
      * Casts this to DocumentType<this> to allow using document methods in get/set-s
@@ -4146,17 +4183,17 @@ function ResponseType(type, options = {}) {
 }
 
 class LazyAssetGenerator {
-    constructor(assetResolver, progresses, lazyId) {
-        this.assetResolver = assetResolver;
-        this.progresses = progresses;
-        this.lazyId = lazyId;
-    }
     get assets() {
         return this.assetResolver.assets;
     }
     get lazyAssets() {
         return this.assetResolver.lazyAssets;
     }
+    constructor(assetResolver, progresses, lazyId) {
+        this.assetResolver = assetResolver;
+        this.progresses = progresses;
+        this.lazyId = lazyId;
+    }
     process(messaging) {
         return __awaiter(this, void 0, void 0, function* () {
             const lazyAsset = yield this.lazyAssets.read(this.lazyId);
@@ -4605,6 +4642,12 @@ function setupBackend(config, providers, parent) {
         diContainer.register(OPENAPI_VALIDATION, {
             useValue: config.customValidation || (() => null)
         });
+        diContainer.register(LOCAL_DIR, {
+            useValue: config.assetLocalDir || "assets_files"
+        });
+        diContainer.register(ASSET_DRIVER, {
+            useClass: config.assetDriver || AssetGridDriver
+        });
         diContainers.appContainer = diContainers.appContainer || diContainer;
         // Authentication
         restOptions.authorizationChecker = (action, roles) => __awaiter(this, void 0, void 0, function* () {