@radatek/microserver 3.0.2 → 3.0.4

package/README.md

@@ -0,0 +1,193 @@
+## HTTP MicroServer
+
+Lightweight all-in-one http web server without dependencies
+
+Features:
+  - fast REST API router
+  - form/json body decoder
+  - file upload
+  - websockets
+  - authentication
+  - plain/hashed passwords
+  - virtual hosts
+  - static files
+  - rewrite
+  - redirect
+  - reverse proxy routes
+  - trust ip for reverse proxy
+  - json file storage with autosave
+  - tls with automatic certificate reload
+  - data model with validation and mongodb interface
+  - typescript model schema translation
+  - simple file/memory storage
+  - promises as middleware
+  - controller class
+  - access rights per route
+  - access rights per model field
+
+### Usage examples:
+
+Simple router:
+
+```ts
+import { MicroServer, AccessDenied, StandardPlugins, StaticPlugin } from '@radatek/microserver'
+
+const server = new MicroServer({
+  listen: 8080,
+  auth: {
+    users: {
+      usr: {
+        password: 'secret'
+      }
+    }
+  }
+})
+server.use(StandardPlugins)
+server.use('GET /api/hello/:id',
+  (req: ServerRequset, res: ServerResponse) =>
+    ({message:'Hello ' + req.params.id + '!'}))
+server.use('POST /api/login',
+  (req: ServerRequset, res: ServerResponse) =>
+  {
+    const user = await req.auth.login(req.body.user, req.body.password)
+    return user ? {user} : new AccessDenied()
+  })
+server.use('GET /api/protected', 'acl:auth',
+  (req: ServerRequset, res: ServerResponse) =>
+    ({message:'Secret resource'}))
+server.use(StaticPlugin, {root:'public'})
+```
+
+Using WebSockets
+
+```ts
+import { MicroServer, WebSocketsPlugin } from '@radatek/microserver'
+
+const server = new MicroServer({
+  listen: 8080
+})
+server.use(WebSocketsPlugin)
+server.use('WEBSOCKET /ws', (req: ServerRequset, res: ServerResponse) => {
+  req.websocket.on('message', (data) => console.log(data))
+  req.websocket.on('close', () => console.log('closed'))
+})
+```
+
+Using data schema:
+
+```js
+import { MicroServer, Model, MicroCollection } from '@radatek/microserver'
+
+const db = new MicroCollectionStore('./data')
+// or using MicroDB collection
+//const db = new MicroDB('microdb://data')
+
+const usersCollection = await db.collection('users')
+
+const userProfile = new Model({
+  _id: 'string',
+  name: { type: 'string', required: true },
+  email: { type: 'string', format: 'email' },
+  password: { type: 'string', canRead: false },
+  role: { type: 'string' },
+  acl: { type: 'object' },
+}, { collection: usersCollection, name: 'user' })
+
+const server = new MicroServer({
+  listen:8080,
+  auth: {
+    users: (user, password) => userProfile.get(password ? {_id: user, password } : {_id: user})
+  }
+})
+
+await userProfile.insert({name: 'admin', password: 'secret', role: 'admin', acl: {'user/*': true}})
+
+server.use('POST /login', async (req) => {
+  const user = await req.auth.login(req.body.user, req.body.password)
+  return user ? { user } : 403
+})
+// authenticated user allways has auth access
+server.use('GET /profile', 'acl:auth', req => ({ user: req.user }))
+// get all users if role='admin'
+server.use('GET /admin/users', 'role:admin', userProfile)
+// get user by id if has acl 'user/get'
+server.use('GET /admin/user/:id', 'acl:user/get', userProfile)
+// insert new user if role='admin' and has acl 'user/insert'
+server.use('POST /admin/user', 'role:admin', 'acl:user/insert', userProfile)
+// update user if has acl 'user/update'
+server.use('PUT /admin/user/:id', 'acl:user/update', userProfile)
+// delete user if has acl 'user/update'
+server.use('DELETE /admin/user/:id', 'acl:user/delete', userProfile)
+```
+
+Using controller:
+
+```ts
+const server = new MicroServer({
+  listen: 8080,
+  auth: {
+    users: {
+      usr: {
+        password: 'secret',
+        acl: {
+          user: true,
+          'user/insert': true
+        }
+      }
+    }
+  }
+})
+server.use(StandardPlugins)
+
+new MicroCollectionStore('data') // initialize simple file store for models
+//new MicroCollectionStore() // initialize simple memory store for models
+
+class RestApi extends Controller {
+  static acl = '' // default acl
+
+  gethello(id) { // same as 'GET /hello'
+    return {message:'Hello ' + id + '!'}
+  }
+
+  async post_login() { // same as 'POST /login'
+    const user = await this.auth.login(this.body.user, this.body.password)
+    return user ? {user} : 403
+  }
+
+  static 'acl:protected' = 'user'
+  static 'url:protected' = 'GET /protected'
+  protected() {
+    return {message:'Protected'}
+  }
+}
+
+server.use('/api', RestApi)
+
+const AddressModel = new Model({
+  street: String,
+  city: String
+})
+
+const UserModel = Model.define({
+  name: { type: String, require: true },
+  address: AddressModel
+})
+
+class UserController extends Controller<typeof UserModel> {
+  static model = UserModel
+  static name = 'user'
+
+  static 'acl:get' = 'user/get'
+  async get(id: string) { // same as 'GET user'
+    return {user: await this.model.findOne({id})}
+  }
+
+  static 'acl:insert' = 'user/insert'
+  async insert() { // same as 'POST user'
+    await this.model.insert(this.req.body)
+    return {}
+  }
+}
+
+server.use('/api/user', UserController)
+```

package/microserver.d.ts

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 3.0.2
+ * @version 3.0.3
  * @package @radatek/microserver
  * @copyright Darius Kisonas 2022
  * @license MIT
@@ -32,9 +32,6 @@ export declare class WebSocketError extends Error {
     statusCode: number;
     constructor(text?: string, code?: number);
 }
-type DeferPromise<T = void> = Promise<T> & {
-    resolve: (res?: T | Error) => void;
-};
 /** Middleware */
 export interface Middleware {
     (req: ServerRequest, res: ServerResponse, next: Function): any;
@@ -50,7 +47,7 @@ export declare abstract class Plugin {
     constructor();
 }
 interface PluginClass {
-    new (options?: any, server?: MicroServer): Plugin;
+    new (options: any, server: MicroServer): Plugin;
 }
 export type ServerRequestBody<T = any> = T extends Model<infer U extends ModelSchema> ? ModelDocument<U> : Record<string, any>;
 /** Extended http.IncomingMessage */
@@ -89,12 +86,17 @@ export declare class ServerRequest<T = any> extends http.IncomingMessage {
     rawBody: Buffer[];
     /** Request raw body size */
     rawBodySize: number;
-    _body?: ServerRequestBody<T>;
-    _isReady: DeferPromise | undefined;
     private constructor();
-    static extend(req: http.IncomingMessage, server: MicroServer): ServerRequest;
+    /** Extend http.IncomingMessage */
+    static extend(req: http.IncomingMessage, res: http.ServerResponse, server: MicroServer): ServerRequest;
+    /** Check if request is ready */
     get isReady(): boolean;
+    /** Wait for request to be ready, usualy used to wait for file upload */
     waitReady(): Promise<void>;
+    /** Signal request as ready */
+    setReady(err?: Error): void;
+    /** Set request body */
+    setBody(body: ServerRequestBody<T>): void;
     /** Update request url */
     updateUrl(url: string): this;
     /** Rewrite request url */
@@ -111,9 +113,10 @@ export declare class ServerRequest<T = any> extends http.IncomingMessage {
 /** Extends http.ServerResponse */
 export declare class ServerResponse<T = any> extends http.ServerResponse {
     readonly req: ServerRequest<T>;
+    /** Should response be json */
     isJson: boolean;
-    headersOnly: boolean;
     private constructor();
+    /** Extends http.ServerResponse */
     static extend(res: http.ServerResponse): void;
     /** Send error reponse */
     error(error: string | number | Error): void;
@@ -170,11 +173,13 @@ interface MicroServerEvents {
 }
 /** Lighweight HTTP server */
 export declare class MicroServer extends EventEmitter {
+    /** MicroServer configuration */
     config: MicroServerConfig;
+    /** Authorization object */
     auth?: Auth;
-    /** all sockets */
+    /** All sockets */
     sockets: Set<net.Socket> | undefined;
-    /** server instances */
+    /** Server instances */
     servers: Set<net.Server> | undefined;
     /** @param {MicroServerConfig} [config] MicroServer configuration  */
     constructor(config?: MicroServerConfig);
@@ -187,40 +192,39 @@ export declare class MicroServer extends EventEmitter {
     waitReady(): Promise<void>;
     /** Listen server, should be used only if config.listen is not set */
     listen(config: ListenConfig): Promise<void>;
-    /** 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;
     /** Default server handler */
     handler(req: ServerRequest, res: ServerResponse): void;
-    /** Last request handler */
-    handlerLast(req: ServerRequest, res: ServerResponse, next?: Function): any;
     /** Clear routes and middlewares */
     clear(): this;
     /**
-     * Add middleware route.
+     * Add middleware, plugin or routes to server.
      * Middlewares may return promises for res.jsonSuccess(...), throw errors for res.error(...), return string or {} for res.send(...)
      * RouteURL: 'METHOD /suburl', 'METHOD', '* /suburl'
      */
     use(...args: [
         Middleware | Plugin | ControllerClass | RoutesSet
     ] | [Promise<Middleware | Plugin | ControllerClass | RoutesSet>] | RoutesList | [RouteURL, RoutesSet] | [PluginClass | Promise<PluginClass>, options?: any]): Promise<void>;
+    /** Add middleware to stack, with optional priority */
     addStack(middleware: Middleware): void;
+    /** Get plugin */
     getPlugin(id: string): Plugin | undefined;
+    /** Wait for plugin */
     waitPlugin(id: string): Promise<Plugin>;
-    /** Add route, alias to `server.router.use(url, ...args)` */
+    /** Add route, alias to `server.use(url, ...args)` */
     all(url: `/${string}`, ...args: RoutesMiddleware[]): MicroServer;
-    /** Add route, alias to `server.router.use('GET ' + url, ...args)` */
+    /** Add route, alias to `server.use('GET ' + url, ...args)` */
     get(url: `/${string}`, ...args: RoutesMiddleware[]): MicroServer;
-    /** Add route, alias to `server.router.use('POST ' + url, ...args)` */
+    /** Add route, alias to `server.use('POST ' + url, ...args)` */
     post(url: `/${string}`, ...args: RoutesMiddleware[]): MicroServer;
-    /** Add route, alias to `server.router.use('PUT ' + url, ...args)` */
+    /** Add route, alias to `server.use('PUT ' + url, ...args)` */
     put(url: `/${string}`, ...args: RoutesMiddleware[]): MicroServer;
-    /** Add route, alias to `server.router.use('PATCH ' + url, ...args)` */
+    /** Add route, alias to `server.use('PATCH ' + url, ...args)` */
     patch(url: `/${string}`, ...args: RoutesMiddleware[]): MicroServer;
-    /** Add route, alias to `server.router.use('DELETE ' + url, ...args)` */
+    /** Add route, alias to `server.use('DELETE ' + url, ...args)` */
     delete(url: `/${string}`, ...args: RoutesMiddleware[]): MicroServer;
-    /** Add websocket handler, alias to `server.router.use('WEBSOCKET ' + url, ...args)` */
+    /** Add websocket handler, alias to `server.use('WEBSOCKET ' + url, ...args)` */
     websocket(url: `/${string}`, ...args: RoutesMiddleware[]): MicroServer;
-    /** Add router hook, alias to `server.router.hook(url, ...args)` */
+    /** Add router hook, alias to `server.hook(url, ...args)` */
     hook(url: RouteURL, ...args: RoutesMiddleware[]): MicroServer;
     /** Check if middleware allready added */
     has(mid: Middleware): boolean;
@@ -266,8 +270,6 @@ export declare class CorsPlugin extends Plugin {
 export declare class MethodsPlugin extends Plugin {
     priority: number;
     name: string;
-    _methods: string;
-    _methodsIdx: Record<string, boolean>;
     constructor(methods?: string);
     handler(req: ServerRequest, res: ServerResponse, next: Function): any;
 }
@@ -277,7 +279,6 @@ export interface BodyOptions {
 export declare class BodyPlugin extends Plugin {
     priority: number;
     name: string;
-    _maxBodySize: number;
     constructor(options?: BodyOptions);
     handler(req: ServerRequest, res: ServerResponse, next: () => void): void;
 }
@@ -295,8 +296,6 @@ export interface UploadFile {
 export declare class UploadPlugin extends Plugin {
     priority: number;
     name: string;
-    _maxFileSize: number;
-    _uploadDir?: string;
     constructor(options?: UploadOptions);
     handler(req: ServerRequest, res: ServerResponse, next: () => void): void;
 }
@@ -338,7 +337,6 @@ export declare class WebSocket extends EventEmitter {
     ping(buffer?: Buffer): void;
     /** Send pong frame */
     pong(buffer?: Buffer): void;
-    protected _sendFrame(opcode: number, data: Buffer, cb?: () => void): void;
     on<K extends keyof WebSocketEvents>(event: K, listener: WebSocketEvents[K]): this;
     addListener<K extends keyof WebSocketEvents>(event: K, listener: WebSocketEvents[K]): this;
     once<K extends keyof WebSocketEvents>(event: K, listener: WebSocketEvents[K]): this;
@@ -347,11 +345,9 @@ export declare class WebSocket extends EventEmitter {
 }
 export declare class WebSocketPlugin extends Plugin {
     name: string;
-    _handler: (req: ServerRequest, socket: net.Socket, head: any) => void;
     constructor(options?: any, server?: MicroServer);
-    addUpgradeHandler(srv: http.Server): void;
+    private addUpgradeHandler;
     upgradeHandler(server: MicroServer, req: ServerRequest, socket: net.Socket, head: any): void;
-    static create(req: ServerRequest, options?: WebSocketOptions): WebSocket;
 }
 /** Trust proxy plugin, adds `req.ip` and `req.localip` */
 export declare class TrustProxyPlugin extends Plugin {
@@ -451,6 +447,7 @@ export declare class StaticFilesPlugin extends Plugin {
     constructor(options?: StaticFilesOptions | string, server?: MicroServer);
     /** Default static files handler */
     handler(req: ServerRequest, res: ServerResponse, next: Function): any;
+    /** Send static file */
     serveFile(req: ServerRequest, res: ServerResponse, options: ServeFileOptions): void;
 }
 /** Proxy plugin options */
@@ -709,7 +706,9 @@ export declare class FileStore {
     constructor(options?: FileStoreOptions);
     /** cleanup cache */
     cleanup(): void;
+    /** close store */
     close(): Promise<void>;
+    /** sync data to disk */
     sync(): Promise<void>;
     /** load json file data */
     load(name: string, autosave?: boolean): Promise<any>;
@@ -927,10 +926,12 @@ export declare class MicroCollection<TSchema extends ModelSchema = any> {
     deleteOne(query: Query): Promise<number>;
     /** Delete all matching documents */
     deleteMany(query: Query): Promise<number>;
+    /** Update one matching document */
     updateOne(query: Query, update: Record<string, any>, options?: FindOptions): Promise<{
         upsertedId: any;
         modifiedCount: number;
     }>;
+    /** Update many matching documents */
     updateMany(query: Query, update: Record<string, any>, options?: FindOptions): Promise<{
         upsertedId: any;
         modifiedCount: number;

package/microserver.js

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 3.0.2
+ * @version 3.0.3
  * @package @radatek/microserver
  * @copyright Darius Kisonas 2022
  * @license MIT
@@ -118,11 +118,12 @@ export class ServerRequest extends http.IncomingMessage {
     rawBodySize;
     _body;
     _isReady;
-    constructor(server) {
+    constructor(res, server) {
         super(new net.Socket());
-        ServerRequest.extend(this, server);
+        ServerRequest.extend(this, res, server);
     }
-    static extend(req, server) {
+    /** Extend http.IncomingMessage */
+    static extend(req, res, server) {
         const reqNew = Object.setPrototypeOf(req, ServerRequest.prototype);
         let ip = req.socket.remoteAddress || '::1';
         if (ip.startsWith('::ffff:'))
@@ -141,12 +142,23 @@ export class ServerRequest extends http.IncomingMessage {
             rawBody: [],
             rawBodySize: 0
         });
+        if (req.readable && !req.complete) {
+            reqNew._isReady = deferPromise((err) => {
+                reqNew._isReady = undefined;
+                if (err && res && !res.headersSent) {
+                    res.statusCode = 'statusCode' in err ? err.statusCode : 400;
+                    res.end(http.STATUS_CODES[res.statusCode] || 'Error');
+                }
+            });
+        }
         reqNew.updateUrl(req.url || '/');
         return reqNew;
     }
+    /** Check if request is ready */
     get isReady() {
         return this._isReady === undefined;
     }
+    /** Wait for request to be ready, usualy used to wait for file upload */
     async waitReady() {
         if (this._isReady === undefined)
             return;
@@ -154,6 +166,14 @@ export class ServerRequest extends http.IncomingMessage {
         if (res && res instanceof Error)
             throw res;
     }
+    /** Signal request as ready */
+    setReady(err) {
+        this._isReady?.resolve(err);
+    }
+    /** Set request body */
+    setBody(body) {
+        this._body = body;
+    }
     /** Update request url */
     updateUrl(url) {
         this.url = url;
@@ -190,18 +210,19 @@ export class ServerRequest extends http.IncomingMessage {
 }
 /** Extends http.ServerResponse */
 export class ServerResponse extends http.ServerResponse {
+    /** Should response be json */
     isJson;
-    headersOnly;
     constructor(server) {
-        super(ServerRequest.extend(new http.IncomingMessage(new net.Socket()), server));
+        super(new http.IncomingMessage(new net.Socket()));
+        ServerRequest.extend(this.req, this, server);
         ServerResponse.extend(this);
     }
+    /** Extends http.ServerResponse */
     static extend(res) {
         Object.setPrototypeOf(res, ServerResponse.prototype);
         Object.assign(res, {
             statusCode: 200,
-            isJson: false,
-            headersOnly: false
+            isJson: false
         });
     }
     /** Send error reponse */
@@ -266,7 +287,7 @@ export class ServerResponse extends http.ServerResponse {
                 return (data.pipe(this, { end: true }), void 0);
             if (data instanceof Buffer) {
                 this.setHeader('Content-Length', data.byteLength);
-                if (this.headersOnly)
+                if (this.statusCode === 304 || this.req.method === 'HEAD')
                     this.end();
                 else
                     this.end(data);
@@ -285,7 +306,7 @@ export class ServerResponse extends http.ServerResponse {
                 this.setHeader('Content-Type', 'text/plain');
         }
         this.setHeader('Content-Length', Buffer.byteLength(data, 'utf8'));
-        if (this.headersOnly)
+        if (this.statusCode === 304 || this.req.method === 'HEAD')
             this.end();
         else
             this.end(data, 'utf8');
@@ -340,15 +361,17 @@ export class ServerResponse extends http.ServerResponse {
 }
 /** Lighweight HTTP server */
 export class MicroServer extends EventEmitter {
+    /** MicroServer configuration */
     config;
+    /** Authorization object */
     auth;
     _plugins = {};
     _stack = [];
     _router = new RouterPlugin();
     _worker = new Worker();
-    /** all sockets */
+    /** All sockets */
     sockets;
-    /** server instances */
+    /** Server instances */
     servers;
     /** @param {MicroServerConfig} [config] MicroServer configuration  */
     constructor(config) {
@@ -475,7 +498,7 @@ export class MicroServer extends EventEmitter {
         });
         return this._worker.wait('listen');
     }
-    /** 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 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) {
         if (typeof fn === 'string') {
             let name = fn;
@@ -572,27 +595,9 @@ export class MicroServer extends EventEmitter {
     }
     /** Default server handler */
     handler(req, res) {
-        ServerRequest.extend(req, this);
+        ServerRequest.extend(req, res, this);
         ServerResponse.extend(res);
-        if (req.readable) {
-            req._isReady = deferPromise((err) => {
-                req._isReady = undefined;
-                if (err) {
-                    if (!res.headersSent)
-                        res.error('statusCode' in err ? err.statusCode : 400);
-                }
-            });
-        }
         this._router.walk(this._stack, req, res, () => res.error(404));
-        //this.handlerRouter(req, res, () => this.handlerLast(req, res))
-    }
-    /** Last request handler */
-    handlerLast(req, res, next) {
-        if (res.headersSent || res.closed)
-            return;
-        if (!next)
-            next = () => res.error(404);
-        return next();
     }
     /** Clear routes and middlewares */
     clear() {
@@ -603,7 +608,7 @@ export class MicroServer extends EventEmitter {
         return this;
     }
     /**
-     * Add middleware route.
+     * Add middleware, plugin or routes to server.
      * Middlewares may return promises for res.jsonSuccess(...), throw errors for res.error(...), return string or {} for res.send(...)
      * RouteURL: 'METHOD /suburl', 'METHOD', '* /suburl'
      */
@@ -697,6 +702,7 @@ export class MicroServer extends EventEmitter {
             this._worker.endJob('plugin:' + plugin.name);
         }
     }
+    /** Add middleware to stack, with optional priority */
     addStack(middleware) {
         if (middleware.plugin?.name && this.getPlugin(middleware.plugin.name))
             throw new Error(`Plugin ${middleware.plugin.name} already added`);
@@ -704,9 +710,11 @@ export class MicroServer extends EventEmitter {
         const idx = this._stack.findLastIndex(f => (f.priority || 0) <= priority);
         this._stack.splice(idx + 1, 0, middleware);
     }
+    /** Get plugin */
     getPlugin(id) {
         return this._plugins[id];
     }
+    /** Wait for plugin */
     async waitPlugin(id) {
         const p = this.getPlugin(id);
         if (p)
@@ -715,42 +723,42 @@ export class MicroServer extends EventEmitter {
         await this._worker.wait('plugin:' + id);
         return this.getPlugin(id);
     }
-    /** Add route, alias to `server.router.use(url, ...args)` */
+    /** Add route, alias to `server.use(url, ...args)` */
     all(url, ...args) {
         this.use('* ' + url, ...args);
         return this;
     }
-    /** Add route, alias to `server.router.use('GET ' + url, ...args)` */
+    /** Add route, alias to `server.use('GET ' + url, ...args)` */
     get(url, ...args) {
         this.use('GET ' + url, ...args);
         return this;
     }
-    /** Add route, alias to `server.router.use('POST ' + url, ...args)` */
+    /** Add route, alias to `server.use('POST ' + url, ...args)` */
     post(url, ...args) {
         this.use('POST ' + url, ...args);
         return this;
     }
-    /** Add route, alias to `server.router.use('PUT ' + url, ...args)` */
+    /** Add route, alias to `server.use('PUT ' + url, ...args)` */
     put(url, ...args) {
         this.use('PUT ' + url, ...args);
         return this;
     }
-    /** Add route, alias to `server.router.use('PATCH ' + url, ...args)` */
+    /** Add route, alias to `server.use('PATCH ' + url, ...args)` */
     patch(url, ...args) {
         this.use('PATCH ' + url, ...args);
         return this;
     }
-    /** Add route, alias to `server.router.use('DELETE ' + url, ...args)` */
+    /** Add route, alias to `server.use('DELETE ' + url, ...args)` */
     delete(url, ...args) {
         this.use('DELETE ' + url, ...args);
         return this;
     }
-    /** Add websocket handler, alias to `server.router.use('WEBSOCKET ' + url, ...args)` */
+    /** Add websocket handler, alias to `server.use('WEBSOCKET ' + url, ...args)` */
     websocket(url, ...args) {
         this.use('WEBSOCKET ' + url, ...args);
         return this;
     }
-    /** Add router hook, alias to `server.router.hook(url, ...args)` */
+    /** Add router hook, alias to `server.hook(url, ...args)` */
     hook(url, ...args) {
         const m = url.match(/^([A-Z]+) (.*)/) || ['', 'hook', url];
         this._router.add(m[1], m[2], args.filter(m => m).map(m => this._bind(m)), false);
@@ -793,7 +801,6 @@ class RouterItem {
 class RouterPlugin extends Plugin {
     priority = 100;
     name = 'router';
-    //stack: Middleware[] = []
     _tree = {};
     constructor() {
         super();
@@ -916,7 +923,8 @@ class RouterPlugin extends Plugin {
         this._tree = {};
     }
     handler(req, res, next) {
-        this.walk(this._getStack(req.pathname, ['hook', req.method, '*']), req, res, next);
+        const method = req.method === 'HEAD' ? 'GET' : req.method || 'GET';
+        this.walk(this._getStack(req.pathname, ['hook', method, '*']), req, res, next);
     }
 }
 export class CorsPlugin extends Plugin {
@@ -973,10 +981,6 @@ export class MethodsPlugin extends Plugin {
             res.setHeader('Allow', this._methods);
             return res.status(405).end();
         }
-        if (req.method === 'HEAD') {
-            req.method = 'GET';
-            res.headersOnly = true;
-        }
         return next();
     }
 }
@@ -989,22 +993,11 @@ export class BodyPlugin extends Plugin {
         this._maxBodySize = options?.maxBodySize || defaultMaxBodySize;
     }
     handler(req, res, next) {
-        if (req.complete || req.method === 'GET') {
+        if (req.complete || req.method === 'GET' || req.method === 'HEAD') {
             if (!req.body)
-                req._body = {};
+                req.setBody({});
             return next();
         }
-        req._isReady = deferPromise((err) => {
-            req._isReady = undefined;
-            if (err) {
-                if (!req.complete)
-                    req.pause();
-                if (!res.headersSent)
-                    res.error('statusCode' in err ? err.statusCode : 400);
-            }
-            else if (req.complete)
-                res.removeHeader('Connection');
-        });
         const contentType = req.headers['content-type'] || '';
         if (contentType.startsWith('multipart/form-data')) {
             req.pause();
@@ -1012,44 +1005,35 @@ export class BodyPlugin extends Plugin {
             return next();
         }
         if (parseInt(req.headers['content-length'] || '-1') > this._maxBodySize) {
-            return req._isReady?.resolve(new ResponseError("too big", 413));
+            return req.setReady(new ResponseError("too big", 413));
         }
         req.once('error', () => { })
             .on('data', chunk => {
             req.rawBodySize += chunk.length;
             if (req.rawBodySize >= this._maxBodySize)
-                req._isReady?.resolve(new ResponseError("too big", 413));
+                req.setReady(new ResponseError("too big", 413));
             else
                 req.rawBody.push(chunk);
         })
             .once('end', () => {
-            req._isReady?.resolve();
-            Object.defineProperty(req, 'body', {
-                get: () => {
-                    if (!req._body) {
-                        let charset = contentType.match(/charset=(\S+)/)?.[1];
-                        if (charset !== 'utf8' && charset !== 'latin1' && charset !== 'ascii')
-                            charset = 'utf8';
-                        const bodyString = Buffer.concat(req.rawBody).toString(charset);
-                        if (contentType.startsWith('application/x-www-form-urlencoded')) {
-                            req._body = querystring.parse(bodyString);
-                        }
-                        else if (bodyString.startsWith('{') || bodyString.startsWith('[')) {
-                            try {
-                                req._body = JSON.parse(bodyString);
-                            }
-                            catch {
-                                return res.jsonError(405);
-                            }
-                        }
-                        else
-                            req._body = {};
-                    }
-                    return req._body;
-                },
-                configurable: true,
-                enumerable: true
-            });
+            let charset = contentType.match(/charset=(\S+)/)?.[1];
+            if (charset !== 'utf8' && charset !== 'latin1' && charset !== 'ascii')
+                charset = 'utf8';
+            const bodyString = Buffer.concat(req.rawBody).toString(charset);
+            if (contentType.startsWith('application/x-www-form-urlencoded')) {
+                req.setBody(querystring.parse(bodyString));
+            }
+            else if (bodyString.startsWith('{') || bodyString.startsWith('[')) {
+                try {
+                    req.setBody(JSON.parse(bodyString));
+                }
+                catch {
+                    return res.jsonError(405);
+                }
+            }
+            else
+                req.setBody({});
+            req.setReady();
             return next();
         });
     }
@@ -1065,24 +1049,11 @@ export class UploadPlugin extends Plugin {
         this._uploadDir = options?.uploadDir;
     }
     handler(req, res, next) {
-        if (!req.readable || req.method === 'GET')
+        if (!req.readable || req.method === 'GET' || req.method === 'HEAD')
             return next();
         const contentType = req.headers['content-type'] || '';
         if (!contentType.startsWith('multipart/form-data'))
             return next();
-        if (!req._isReady) {
-            req._isReady = deferPromise((err) => {
-                req._isReady = undefined;
-                if (err) {
-                    req.pause();
-                    if (!res.headersSent)
-                        res.setHeader('Connection', 'close');
-                    res.error('statusCode' in err ? err.statusCode : 400);
-                }
-                else
-                    res.removeHeader('Connection');
-            });
-        }
         req.pause();
         res.setHeader('Connection', 'close');
         if (!this._uploadDir)
@@ -1152,7 +1123,7 @@ export class UploadPlugin extends Plugin {
                         fileStream = undefined;
                         if (buffer[nextBoundaryIndexEnd] === 45) {
                             res.removeHeader('Connection');
-                            req._isReady?.resolve();
+                            req.setReady();
                         }
                         buffer = buffer.subarray(nextBoundaryIndex);
                     }
@@ -1170,7 +1141,7 @@ export class UploadPlugin extends Plugin {
         };
         const _removeTempFiles = () => {
             if (!req.isReady)
-                req._isReady?.resolve(new Error('Upload error'));
+                req.setReady(new Error('Upload error'));
             if (fileStream) {
                 fileStream.close();
                 fileStream = undefined;
@@ -1181,12 +1152,12 @@ export class UploadPlugin extends Plugin {
                 delete f.filePath;
             });
             files.splice(0);
-            req._isReady?.resolve();
+            req.setReady();
         };
         next();
-        req.once('error', () => req._isReady?.resolve(new Error('Upload error')))
+        req.once('error', () => req.setReady(new Error('Upload error')))
             .on('data', chunk => chunkParse(chunk))
-            .once('end', () => req._isReady?.resolve(new Error('Upload error')));
+            .once('end', () => req.setReady(new Error('Upload error')));
         res.once('finish', () => _removeTempFiles());
         res.once('error', () => _removeTempFiles());
         res.once('close', () => _removeTempFiles());
@@ -1230,9 +1201,12 @@ export class WebSocket extends EventEmitter {
             this._options.deflate = true;
         }
         this.ready = true;
-        this._upgrade(key, headers);
+        this._upgrade(key, headers, () => {
+            req.setReady();
+            this.emit('open');
+        });
     }
-    _upgrade(key, headers = []) {
+    _upgrade(key, headers = [], cb) {
         const digest = crypto.createHash('sha1')
             .update(key + '258EAFA5-E914-47DA-95CA-C5AB0DC85B11')
             .digest('base64');
@@ -1245,7 +1219,7 @@ export class WebSocket extends EventEmitter {
             '',
             ''
         ];
-        this._socket.write(headers.join('\r\n'));
+        this._socket.write(headers.join('\r\n'), cb);
         this._socket.on('error', this._errorHandler.bind(this));
         this._socket.on('data', this._dataHandler.bind(this));
         this._socket.on('close', () => this.emit('close'));
@@ -1511,7 +1485,6 @@ export class WebSocketPlugin extends Plugin {
             srv.on('upgrade', this._handler);
     }
     upgradeHandler(server, req, socket, head) {
-        ServerRequest.extend(req, server);
         const host = req.headers.host || '';
         const vhostPlugin = server.getPlugin('vhost');
         const vserver = vhostPlugin?.vhosts?.[host] || server;
@@ -1524,7 +1497,7 @@ export class WebSocketPlugin extends Plugin {
             statusCode: 200,
             socket,
             server,
-            write(data) {
+            end(data) {
                 if (res.headersSent)
                     throw new Error('Headers already sent');
                 let code = res.statusCode || 403;
@@ -1538,7 +1511,7 @@ export class WebSocketPlugin extends Plugin {
                 const headers = [
                     `HTTP/1.1 ${code} ${http.STATUS_CODES[code]}`,
                     'Connection: close',
-                    'Content-Type: text/html',
+                    'Content-Type: text/plain',
                     `Content-Length: ${Buffer.byteLength(data)}`,
                     '',
                     data
@@ -1547,22 +1520,25 @@ export class WebSocketPlugin extends Plugin {
             },
             error(code) {
                 res.statusCode = code || 403;
-                res.write();
-            },
-            end(data) {
-                res.write(data);
+                res.end();
             },
             send(data) {
-                res.write(data);
+                res.end(data);
             },
             getHeader() { },
             setHeader() { }
         };
+        ServerRequest.extend(req, res, server);
+        let _ws;
+        Object.defineProperty(req, 'websocket', {
+            get: () => {
+                if (!_ws)
+                    _ws = new WebSocket(req, server.config.websocket);
+                return _ws;
+            },
+            enumerable: true
+        });
         vserver.handler(req, res);
-        //vserver.handlerRouter(req, res as unknown as ServerResponse, () => res.error(404))
-    }
-    static create(req, options) {
-        return new WebSocket(req, options);
     }
 }
 // #endregion WebSocket
@@ -1731,7 +1707,7 @@ export class StaticFilesPlugin extends Plugin {
     }
     /** Default static files handler */
     handler(req, res, next) {
-        if (req.method !== 'GET')
+        if (req.method !== 'GET' && req.method !== 'HEAD')
             return next();
         if (!('path' in req.params)) { // global handler
             if (req.path.startsWith(this.prefix) && (req.path === this.prefix || req.path[this.prefix.length] === '/')) {
@@ -1772,6 +1748,7 @@ export class StaticFilesPlugin extends Plugin {
             });
         });
     }
+    /** Send static file */
     serveFile(req, res, options) {
         const filePath = path.isAbsolute(options.path) ? options.path : path.join(options.root || this.root, options.path);
         const statRes = (err, stats) => {
@@ -1794,14 +1771,12 @@ export class StaticFilesPlugin extends Plugin {
             res.setHeader('Content-Length', stats.size);
             if (options.etag !== false) {
                 const etag = '"' + etagPrefix + stats.mtime.getTime().toString(32) + '"';
-                if (req.headers['if-none-match'] === etag || req.headers['if-modified-since'] === stats.mtime.toUTCString()) {
+                if (req.headers['if-none-match'] === etag || req.headers['if-modified-since'] === stats.mtime.toUTCString())
                     res.statusCode = 304;
-                    res.headersOnly = true;
-                }
             }
             if (options.maxAge)
                 res.setHeader('Cache-Control', 'max-age=' + options.maxAge);
-            if (res.headersOnly) {
+            if (res.statusCode === 304 || req.method === 'HEAD') {
                 res.end();
                 return;
             }
@@ -2598,11 +2573,13 @@ export class FileStore {
         });
         return p;
     }
+    /** close store */
     async close() {
         await this.sync();
         this._iter = 0;
         this._cache = {};
     }
+    /** sync data to disk */
     async sync() {
         for (const name in this._cache) {
             for (const key in this._cache)
@@ -3334,10 +3311,12 @@ export class MicroCollection {
     async deleteMany(query) {
         return (await this.updateMany(query, {}, { delete: true })).modifiedCount;
     }
+    /** Update one matching document */
     async updateOne(query, update, options) {
         const res = await this.updateMany(query, update, { ...options, limit: 1 });
         return res;
     }
+    /** Update many matching documents */
     async updateMany(query, update, options) {
         let res = { upsertedId: undefined, modifiedCount: 0 };
         if (!query)

package/package.json

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