@radatek/microserver 2.3.8 → 2.3.10

package/microserver.d.ts

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 2.3.8
+ * @version 2.3.10
  * @package @radatek/microserver
  * @copyright Darius Kisonas 2022
  * @license MIT
@@ -120,7 +120,7 @@ export declare class ServerResponse<T = any> extends http.ServerResponse {
     redirect(code: number | string, url?: string): void;
     /** Set status code */
     status(code: number): this;
-    download(path: string, filename?: string): void;
+    file(path: string, filename?: string): void;
 }
 /** WebSocket options */
 export interface WebSocketOptions {
@@ -551,6 +551,8 @@ export interface AuthOptionsInternal extends AuthOptions {
     };
     /** Expire time in seconds */
     expire: number;
+    /** Use object token instead of user id */
+    objectToken: boolean;
     /** Authentication mode */
     mode: 'cookie' | 'token';
     /** Authentication realm for basic authentication */
@@ -782,8 +784,12 @@ export declare class Model<TSchema extends ModelSchema> {
     insert(data: Record<string, any>, options?: ModelContextOptions): Promise<ModelDocument<TSchema>>;
     /** Update one matching document */
     update(query: Record<string, any>, options?: ModelContextOptions): Promise<ModelDocument<TSchema>>;
+    /** Update many matching documents */
+    updateMany(query: Record<string, any>, update: Record<string, any>, options?: ModelContextOptions): Promise<ModelDocument<TSchema>>;
     /** Delete one matching document */
-    delete(query: Query, options?: ModelContextOptions): Promise<void>;
+    delete(query: Query, options?: ModelContextOptions): Promise<number>;
+    /** Delete many matching documents */
+    deleteMany(query: Query, options?: ModelContextOptions): Promise<number>;
     /** Microserver middleware */
     handler(req: ServerRequest, res: ServerResponse): any;
 }

package/microserver.js

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 2.3.8
+ * @version 2.3.10
  * @package @radatek/microserver
  * @copyright Darius Kisonas 2022
  * @license MIT
@@ -438,7 +438,7 @@ export class ServerResponse extends http.ServerResponse {
         this.statusCode = code;
         return this;
     }
-    download(path, filename) {
+    file(path, filename) {
         StaticPlugin.serveFile(this.req, this, {
             path: path,
             filename: filename || basename(path),
@@ -987,7 +987,7 @@ export class Router extends EventEmitter {
                 idx = 5;
             }
             if (name === 'json')
-                return (req, res) => res.isJson = true;
+                return (req, res, next) => { res.isJson = true; return next(); };
             if (idx >= 0) {
                 const v = name.slice(idx + 1);
                 const type = name.slice(0, idx);
@@ -2109,7 +2109,7 @@ export class Auth {
         if (usrInfo?.id || usrInfo?._id) {
             const expire = Math.min(34560000, options?.expire || this.options.expire || defaultExpire);
             const expireTime = new Date().getTime() + expire * 1000;
-            const token = await this.token((usrInfo?.id || usrInfo?._id), undefined, expire);
+            const token = await this.token(this.options.objectToken ? JSON.stringify(usrInfo) : (usrInfo?.id || usrInfo?._id), undefined, expire);
             if (token && this.res && this.req) {
                 const oldToken = this.req.tokenId;
                 if (oldToken)
@@ -2313,14 +2313,14 @@ class AuthPlugin extends Plugin {
             }
             return next();
         }
-        const cookie = req.headers.cookie, cookies = cookie ? cookie.split(/;\s+/g) : [];
+        const cookie = req.headers.cookie, cookies = cookie ? cookie.split(/;\s*/g) : [];
         const sid = cookies.find(s => s.startsWith('token='));
         let token = '';
         if (authorization.startsWith('Bearer '))
             token = authorization.slice(7);
         if (sid)
             token = sid.slice(sid.indexOf('=') + 1);
-        if (!token)
+        if (req.query.token)
             token = req.query.token;
         if (token) {
             const now = new Date().getTime();
@@ -2913,8 +2913,6 @@ export class Model {
     /** Find one document */
     async findOne(query, options) {
         const collection = await this.collection;
-        if (!collection)
-            throw new AccessDenied('Database not configured');
         options = { readOnly: true, ...this.options, ...options };
         const doc = await collection.findOne(this.getFilter(query, options));
         return doc ? this.document(doc, options) : undefined;
@@ -2922,8 +2920,6 @@ export class Model {
     /** Find many documents */
     async findMany(query, options) {
         const collection = await this.collection;
-        if (!collection)
-            throw new AccessDenied('Database not configured');
         const res = [];
         options = { readOnly: true, ...this.options, ...options };
         await collection.find(this.getFilter(query || {}, options)).forEach((doc) => res.push(this.document(doc, options)));
@@ -2936,8 +2932,6 @@ export class Model {
     /** Update one matching document */
     async update(query, options) {
         const collection = await this.collection;
-        if (!collection)
-            throw new AccessDenied('Database not configured');
         options = { ...this.options, ...options };
         if (options?.validate !== false)
             query = this.document(query, options);
@@ -2954,13 +2948,34 @@ export class Model {
             throw new NotFound('Document not found');
         return res;
     }
+    /** Update many matching documents */
+    async updateMany(query, update, options) {
+        const collection = await this.collection;
+        options = { ...this.options, ...options };
+        if (options?.validate !== false)
+            update = this.document(update, options);
+        const unset = query.$unset || {};
+        for (const n in update) {
+            if (update[n] === undefined || update[n] === null) {
+                update.$unset = unset;
+                unset[n] = 1;
+                delete update[n];
+            }
+        }
+        const res = await collection.updateMany(this.getFilter(query, { primaryKey: true, validate: false }), update);
+        if (!res)
+            throw new NotFound('Document not found');
+        return res;
+    }
     /** Delete one matching document */
     async delete(query, options) {
         const collection = await this.collection;
-        if (!collection)
-            throw new AccessDenied('Database not configured');
-        if (query._id)
-            await collection.deleteOne(this.getFilter(query, { ...this.options, ...options }));
+        return await collection.deleteOne(this.getFilter(query, { ...this.options, ...options }));
+    }
+    /** Delete many matching documents */
+    async deleteMany(query, options) {
+        const collection = await this.collection;
+        return await collection.deleteMany(this.getFilter(query, { ...this.options, ...options }));
     }
     /** Microserver middleware */
     handler(req, res) {

package/package.json

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