@radatek/microserver 2.3.3 → 2.3.5

package/microserver.d.ts

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 2.3.3
+ * @version 2.3.5
  * @package @radatek/microserver
  * @copyright Darius Kisonas 2022
  * @license MIT
@@ -231,7 +231,7 @@ export declare class Router extends EventEmitter {
     /** bind middleware or create one from string like: 'redirect:302,https://redirect.to', 'error:422', 'param:name=value', 'acl:users/get', 'model:User', 'group:Users', 'user:admin' */
     bind(fn: string | Function | object): Function;
     /** Handler */
-    handler(req: ServerRequest, res: ServerResponse, next: Function, method?: string): any;
+    handler(req: ServerRequest, res: ServerResponse, next: Function, method?: string): void;
     /** Clear routes and middlewares */
     clear(): this;
     /**

package/microserver.js

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 2.3.3
+ * @version 2.3.5
  * @package @radatek/microserver
  * @copyright Darius Kisonas 2022
  * @license MIT
@@ -22,7 +22,10 @@ const defaultMaxBodySize = 5 * 1024 * 1024;
 const defaultMethods = 'HEAD,GET,POST,PUT,PATCH,DELETE';
 function NOOP(...args) { }
 function isFunction(fn) {
-    return typeof fn === 'function' && !fn.prototype?.constructor;
+    if (typeof fn !== 'function')
+        return false;
+    const descriptor = Object.getOwnPropertyDescriptor(fn, 'prototype');
+    return !descriptor || descriptor.writable === true;
 }
 export class Warning extends Error {
     constructor(text) {
@@ -1066,13 +1069,10 @@ export class Router extends EventEmitter {
     handler(req, res, next, method) {
         const nextAfter = next;
         next = () => this._walkStack(this._stackAfter, req, res, nextAfter);
-        if (method)
-            return !this._walkTree(this._tree[method], req, res, next) && next();
-        const walk = () => {
-            if (!this._walkTree(this._tree[req.method || 'GET'], req, res, next) &&
-                !this._walkTree(this._tree['*'], req, res, next))
-                next();
-        };
+        const walkTree = (method) => this._walkTree(this._tree[method], req, res, next);
+        const walk = method ?
+            () => { !walkTree(method) && next(); } :
+            () => { !walkTree(req.method || 'GET') && !walkTree('*') && next(); };
         req.rewrite = (url) => {
             if (req.originalUrl)
                 res.error(508);

package/package.json

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