@radatek/microserver 2.3.7 → 2.3.8

package/microserver.d.ts

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 2.3.7
+ * @version 2.3.8
  * @package @radatek/microserver
  * @copyright Darius Kisonas 2022
  * @license MIT
@@ -495,8 +495,10 @@ export declare class ProxyPlugin extends Plugin {
 }
 /** User info */
 export interface UserInfo {
+    /** User _id */
+    _id?: string;
     /** User id */
-    id: string;
+    id?: string;
     /** User password plain or hash */
     password?: string;
     /** ACL options */

package/microserver.js

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 2.3.7
+ * @version 2.3.8
  * @package @radatek/microserver
  * @copyright Darius Kisonas 2022
  * @license MIT
@@ -2912,23 +2912,21 @@ export class Model {
     }
     /** Find one document */
     async findOne(query, options) {
-        if (this.collection instanceof Promise)
-            this.collection = await this.collection;
-        if (!this.collection)
+        const collection = await this.collection;
+        if (!collection)
             throw new AccessDenied('Database not configured');
         options = { readOnly: true, ...this.options, ...options };
-        const doc = await this.collection.findOne(this.getFilter(query, options));
+        const doc = await collection.findOne(this.getFilter(query, options));
         return doc ? this.document(doc, options) : undefined;
     }
     /** Find many documents */
     async findMany(query, options) {
-        if (this.collection instanceof Promise)
-            this.collection = await this.collection;
-        if (!this.collection)
+        const collection = await this.collection;
+        if (!collection)
             throw new AccessDenied('Database not configured');
         const res = [];
         options = { readOnly: true, ...this.options, ...options };
-        await this.collection.find(this.getFilter(query || {}, options)).forEach((doc) => res.push(this.document(doc, options)));
+        await collection.find(this.getFilter(query || {}, options)).forEach((doc) => res.push(this.document(doc, options)));
         return res;
     }
     /** Insert a new document */
@@ -2937,9 +2935,8 @@ export class Model {
     }
     /** Update one matching document */
     async update(query, options) {
-        if (this.collection instanceof Promise)
-            this.collection = await this.collection;
-        if (!this.collection)
+        const collection = await this.collection;
+        if (!collection)
             throw new AccessDenied('Database not configured');
         options = { ...this.options, ...options };
         if (options?.validate !== false)
@@ -2952,19 +2949,18 @@ export class Model {
                 delete query[n];
             }
         }
-        const res = await this.collection.findAndModify({ query: this.getFilter(query, { primaryKey: true, validate: false }), update: query, upsert: options?.insert });
+        const res = await collection.findAndModify({ query: this.getFilter(query, { primaryKey: true, validate: false }), update: query, upsert: options?.insert });
         if (!res)
             throw new NotFound('Document not found');
         return res;
     }
     /** Delete one matching document */
     async delete(query, options) {
-        if (this.collection instanceof Promise)
-            this.collection = await this.collection;
-        if (!this.collection)
+        const collection = await this.collection;
+        if (!collection)
             throw new AccessDenied('Database not configured');
         if (query._id)
-            await this.collection.deleteOne(this.getFilter(query, { ...this.options, ...options }));
+            await collection.deleteOne(this.getFilter(query, { ...this.options, ...options }));
     }
     /** Microserver middleware */
     handler(req, res) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radatek/microserver",
-  "version": "2.3.7",
+  "version": "2.3.8",
   "description": "HTTP MicroServer",
   "author": "Darius Kisonas",
   "license": "MIT",