@stemy/backend 5.1.0 → 5.2.0

package/fesm2020/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;
@@ -925,20 +928,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;
     }
     async connect() {
         if (this.db)
@@ -949,7 +948,6 @@ let MongoConnector = class MongoConnector {
             pass: this.configuration.resolve("mongoPassword")
         })).connection;
         this.db = this.conn.db;
-        this.fsBucket = new GridFSBucket(this.db, { bucketName: "assets" });
     }
 };
 MongoConnector = __decorate([
@@ -958,19 +956,19 @@ 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 });
     }
     async load() {
-        const res = await this.collection.findOne({ _id: this.mId });
+        const res = await this.collection.findOne({ _id: this.oid });
         this.deleted = !res;
         this.data = res || {};
         return this;
@@ -986,10 +984,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;
     }
@@ -1000,14 +994,31 @@ 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;
     }
     async unlink() {
-        return deleteFromBucket(this.bucket, this.mId);
+        try {
+            await this.driver.delete(this.oid);
+            await 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;
     }
     async setMeta(metadata) {
         metadata = Object.assign(this.metadata, metadata || {});
-        await this.collection.updateOne({ _id: this.mId }, { $set: { metadata } });
+        await this.collection.updateOne({ _id: this.oid }, { $set: { metadata } });
     }
     getBuffer() {
         return streamToBuffer(this.stream);
@@ -1019,7 +1030,7 @@ class Asset extends BaseEntity {
             : metadata.downloadCount + 1;
         metadata.firstDownload = metadata.firstDownload || new Date();
         metadata.lastDownload = new Date();
-        await this.collection.updateOne({ _id: this.mId }, { $set: { metadata } });
+        await this.collection.updateOne({ _id: this.oid }, { $set: { metadata } });
         return this.stream;
     }
     async getImage(params = null) {
@@ -1031,6 +1042,9 @@ class Asset extends BaseEntity {
 }
 
 class TempAsset {
+    get stream() {
+        return bufferToStream(this.buffer);
+    }
     constructor(buffer, filename, contentType, metadata) {
         this.buffer = buffer;
         this.filename = filename;
@@ -1038,9 +1052,6 @@ class TempAsset {
         this.metadata = metadata;
         this.id = new ObjectId$1().toHexString();
     }
-    get stream() {
-        return bufferToStream(this.buffer);
-    }
     async unlink() {
         throw new Error(`Temp asset '${this.id}' can not be removed!`);
     }
@@ -1077,11 +1088,11 @@ class TempAsset {
 }
 
 let Assets = class Assets {
-    constructor(connector, assetProcessor) {
+    constructor(connector, assetProcessor, driver) {
         this.connector = connector;
         this.assetProcessor = assetProcessor;
-        this.bucket = connector.bucket;
-        this.collection = connector.database?.collection("assets.files");
+        this.driver = driver;
+        this.collection = connector.database?.collection(driver.metaCollection);
     }
     async write(stream, contentType = null, metadata = null) {
         const uploadStream = copyStream(stream);
@@ -1150,7 +1161,7 @@ let Assets = class Assets {
     }
     async find(where) {
         const data = await 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);
     }
     async findMany(where) {
         const cursor = this.collection.find(where);
@@ -1159,7 +1170,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;
     }
@@ -1183,7 +1194,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);
@@ -1193,7 +1208,7 @@ let Assets = class Assets {
                     filename: metadata.filename,
                     contentType,
                     metadata
-                }, this.collection, this.bucket);
+                }, this.collection, this.driver);
                 asset.save().then(() => {
                     resolve(asset);
                 }, error => {
@@ -1206,16 +1221,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;
     }
@@ -1237,12 +1248,18 @@ 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;
+    }
     async unlink() {
         await this.load();
         if (!this.progressId) {
-            await this.collection.deleteOne({ _id: this.mId });
+            await this.collection.deleteOne({ _id: this.oid });
         }
-        return deleteFromBucket(this.assets.bucket, new ObjectId$1(this.assetId));
+        return this.assets.unlink(this.assetId);
     }
     startWorking() {
         this.load().then(() => {
@@ -1285,7 +1302,7 @@ class LazyAsset extends BaseEntity {
         this.data.progressId = (await this.progresses.create()).id;
         this.data.assetId = null;
         await this.save();
-        await deleteFromBucket(this.assets.bucket, oldAsset);
+        await this.assets.unlink(oldAsset);
         const jobParams = JSON.parse(await gunzipPromised(this.data.jobParams));
         await this.progresses.jobMan.enqueueWithName(this.data.jobName, { ...jobParams, lazyId: this.id, fromLoad });
     }
@@ -1485,9 +1502,6 @@ JobManager = __decorate([
 ], JobManager);
 
 class Progress extends BaseEntity {
-    constructor(id, data, collection) {
-        super(id, data, collection);
-    }
     get current() {
         return this.data.current;
     }
@@ -1509,6 +1523,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;
@@ -1562,19 +1579,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;
     }
@@ -1599,6 +1603,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;
@@ -1862,11 +1879,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();
@@ -1877,6 +1889,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;
+    }
     async schemaToExample(src, req) {
         const maybeRef = src;
         if (maybeRef.$ref) {
@@ -2002,10 +2019,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",
@@ -2039,6 +2052,10 @@ let BackendProvider = class BackendProvider {
         this.httpServer = this.httpServer || createServer(this.express);
         return this.httpServer;
     }
+    constructor(config, container) {
+        this.config = config;
+        this.container = container;
+    }
     async quickStart() {
         const port = this.config.resolve("appPort");
         const isWorker = this.config.resolve("isWorker");
@@ -2504,6 +2521,9 @@ TemplateRenderer = __decorate([
 ], TemplateRenderer);
 
 let MailSender = class MailSender {
+    get translator() {
+        return this.renderer.translator;
+    }
     constructor(config, renderer) {
         this.config = config;
         this.renderer = renderer;
@@ -2516,9 +2536,6 @@ let MailSender = class MailSender {
             }
         });
     }
-    get translator() {
-        return this.renderer.translator;
-    }
     async sendMail(language, options) {
         const subject = await this.translator.getTranslation(language, options.subject || "-");
         const html = await this.renderer.render(options.template, language, options.context);
@@ -3228,13 +3245,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";
-    }
     async error(error, req, res, next) {
         const result = await this.getResult(error, req, res);
         if (this.isDev) {
@@ -3563,15 +3580,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);
     }
@@ -3677,6 +3694,12 @@ class Tree {
 }
 
 class DiContainer {
+    get registeredTokens() {
+        return (this.parent?.registeredTokens || []).concat(this.tokens);
+    }
+    get tree() {
+        return this.root;
+    }
     constructor(container, parent = null) {
         this.container = container;
         this.parent = parent;
@@ -3685,12 +3708,6 @@ class DiContainer {
         this.tokenSet = new Set();
         this.root = new Tree(this, false, "");
     }
-    get registeredTokens() {
-        return (this.parent?.registeredTokens || []).concat(this.tokens);
-    }
-    get tree() {
-        return this.root;
-    }
     beforeResolution(token, callback, options) {
         this.container.beforeResolution(token, callback, options);
     }
@@ -3843,6 +3860,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
@@ -3912,17 +3949,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;
+    }
     async process(messaging) {
         const lazyAsset = await this.lazyAssets.read(this.lazyId);
         let progress = await this.progresses.get(lazyAsset.progressId);
@@ -4373,6 +4410,12 @@ async 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 = async (action, roles) => {