@stemy/backend 5.1.1 → 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;
@@ -931,14 +934,10 @@ let MongoConnector = class MongoConnector {
     get database() {
         return this.db;
     }
-    get bucket() {
-        return this.fsBucket;
-    }
     constructor(configuration) {
         this.configuration = configuration;
         this.conn = null;
         this.db = null;
-        this.fsBucket = 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([
@@ -959,18 +957,18 @@ MongoConnector = __decorate([
 
 class BaseEntity {
     get id() {
-        return this.mId.toHexString();
+        return this.oid.toHexString();
     }
-    constructor(mId, data, collection) {
-        this.mId = mId;
+    constructor(oid, data, collection) {
+        this.oid = oid;
         this.data = data;
         this.collection = collection;
     }
     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;
@@ -996,18 +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, bucket) {
+    constructor(id, data, collection, driver) {
         super(id, data, collection);
-        this.bucket = bucket;
+        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) {
@@ -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,7 +1221,9 @@ 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 {
@@ -1240,9 +1257,9 @@ class LazyAsset extends BaseEntity {
     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 });
     }
@@ -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
@@ -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) => {