@radatek/microserver 2.3.9 → 2.3.11

package/microserver.d.ts

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 2.3.9
+ * @version 2.3.11
  * @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 */

package/microserver.js

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 2.3.9
+ * @version 2.3.11
  * @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);
@@ -1114,6 +1114,7 @@ export class Router extends EventEmitter {
         return rnext();
     }
     _walkTree(item, req, res, next) {
+        // TODO: walk recursively and add to stack all possibilities: /api/user/:id, /api/:last*. set params and paramsList pro stack record
         req.params = {};
         req.paramsList = [];
         const rstack = [];
@@ -1139,7 +1140,7 @@ export class Router extends EventEmitter {
                     done = true;
             }
             else {
-                item = item.last || item.tree[name] || item.param;
+                item = item.tree[name] || item.param || item.last;
                 if (item && item.name) {
                     req.params[item.name] = name;
                     req.paramsList.push(name);
@@ -2109,7 +2110,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 +2314,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();

package/package.json

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