@radatek/microserver 3.0.1 → 3.0.3

package/microserver.d.ts

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 3.0.0
+ * @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,12 @@ 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;
+    static extend(req: http.IncomingMessage, res: http.ServerResponse, server: MicroServer): ServerRequest;
     get isReady(): boolean;
     waitReady(): Promise<void>;
+    setReady(err?: Error): void;
+    setBody(body: ServerRequestBody<T>): void;
     /** Update request url */
     updateUrl(url: string): this;
     /** Rewrite request url */
@@ -351,7 +348,6 @@ export declare class WebSocketPlugin extends Plugin {
     constructor(options?: any, server?: MicroServer);
     addUpgradeHandler(srv: http.Server): void;
     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 {
@@ -392,6 +388,8 @@ export interface StaticFilesOptions {
     etag?: boolean;
     /** Max file age in seconds */
     maxAge?: number;
+    /** static errors file for status code, '*' - default */
+    errors?: Record<string, string>;
 }
 export interface ServeFileOptions {
     /** path */
@@ -445,6 +443,7 @@ export declare class StaticFilesPlugin extends Plugin {
     /** Max file age in seconds (default: 31536000) */
     maxAge?: number;
     prefix: string;
+    errors?: Record<string, string>;
     constructor(options?: StaticFilesOptions | string, server?: MicroServer);
     /** Default static files handler */
     handler(req: ServerRequest, res: ServerResponse, next: Function): any;

package/microserver.js

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 3.0.0
+ * @version 3.0.3
  * @package @radatek/microserver
  * @copyright Darius Kisonas 2022
  * @license MIT
@@ -65,13 +65,10 @@ export class WebSocketError extends Error {
 }
 function deferPromise(cb) {
     let _resolve;
-    const p = new Promise((resolve, reject) => {
+    const p = new Promise((resolve) => {
         _resolve = (res) => {
             cb?.(res);
-            if (res instanceof Error)
-                reject(res);
-            else
-                resolve(res);
+            resolve(res);
         };
     });
     p.resolve = _resolve;
@@ -121,11 +118,11 @@ 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) {
+    static extend(req, res, server) {
         const reqNew = Object.setPrototypeOf(req, ServerRequest.prototype);
         let ip = req.socket.remoteAddress || '::1';
         if (ip.startsWith('::ffff:'))
@@ -144,6 +141,15 @@ 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;
     }
@@ -153,7 +159,15 @@ export class ServerRequest extends http.IncomingMessage {
     async waitReady() {
         if (this._isReady === undefined)
             return;
-        await this._isReady;
+        const res = await this._isReady;
+        if (res && res instanceof Error)
+            throw res;
+    }
+    setReady(err) {
+        this._isReady?.resolve(err);
+    }
+    setBody(body) {
+        this._body = body;
     }
     /** Update request url */
     updateUrl(url) {
@@ -194,7 +208,8 @@ export class ServerResponse extends http.ServerResponse {
     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);
     }
     static extend(res) {
@@ -260,30 +275,31 @@ export class ServerResponse extends http.ServerResponse {
     send(data = '') {
         if (this.headersSent)
             return;
-        if (!this.req.complete) {
-            this.req.pause();
-            this.setHeader('Connection', 'close');
-        }
-        if (data instanceof Readable)
-            return (data.pipe(this, { end: true }), void 0);
-        if (!this.getHeader('Content-Type') && !(data instanceof Buffer)) {
+        if (typeof data === 'object' || this.isJson) {
             if (data instanceof Error)
                 return this.error(data);
-            if (this.isJson || typeof data === 'object') {
-                data = JSON.stringify(typeof data === 'string' ? { message: data } : data);
-                this.setHeader('Content-Type', 'application/json');
-            }
-            else {
-                data = data.toString();
-                if (data[0] === '{' || data[1] === '[')
-                    this.setHeader('Content-Type', 'application/json');
-                else if (data[0] === '<' && (data.startsWith('<!DOCTYPE') || data.startsWith('<html')))
-                    this.setHeader('Content-Type', 'text/html');
+            if (data instanceof Readable)
+                return (data.pipe(this, { end: true }), void 0);
+            if (data instanceof Buffer) {
+                this.setHeader('Content-Length', data.byteLength);
+                if (this.headersOnly)
+                    this.end();
                 else
-                    this.setHeader('Content-Type', 'text/plain');
+                    this.end(data);
+                return;
             }
+            data = JSON.stringify(typeof data === 'string' ? { message: data } : data);
+            this.setHeader('Content-Type', 'application/json');
         }
         data = data.toString();
+        if (!this.getHeader('Content-Type')) {
+            if (data[0] === '{' || data[1] === '[')
+                this.setHeader('Content-Type', 'application/json');
+            else if (data[0] === '<' && (data.startsWith('<!DOCTYPE') || data.startsWith('<html')))
+                this.setHeader('Content-Type', 'text/html');
+            else
+                this.setHeader('Content-Type', 'text/plain');
+        }
         this.setHeader('Content-Length', Buffer.byteLength(data, 'utf8'));
         if (this.headersOnly)
             this.end();
@@ -342,6 +358,7 @@ export class ServerResponse extends http.ServerResponse {
 export class MicroServer extends EventEmitter {
     config;
     auth;
+    _plugins = {};
     _stack = [];
     _router = new RouterPlugin();
     _worker = new Worker();
@@ -571,17 +588,8 @@ 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))
     }
@@ -596,6 +604,7 @@ export class MicroServer extends EventEmitter {
     /** Clear routes and middlewares */
     clear() {
         this._stack = [];
+        this._plugins = {};
         this._router.clear();
         this._plugin(this._router);
         return this;
@@ -689,6 +698,7 @@ export class MicroServer extends EventEmitter {
                 await this.use(routes);
         }
         if (plugin.handler && plugin.name) {
+            this._plugins[plugin.name] = plugin;
             this.emit('plugin', plugin.name);
             this.emit('plugin:' + plugin.name);
             this._worker.endJob('plugin:' + plugin.name);
@@ -702,8 +712,7 @@ export class MicroServer extends EventEmitter {
         this._stack.splice(idx + 1, 0, middleware);
     }
     getPlugin(id) {
-        let p = this._stack.find(m => m.plugin?.name === id);
-        return p?.plugin;
+        return this._plugins[id];
     }
     async waitPlugin(id) {
         const p = this.getPlugin(id);
@@ -989,20 +998,9 @@ export class BodyPlugin extends Plugin {
     handler(req, res, next) {
         if (req.complete || req.method === 'GET') {
             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();
@@ -1010,44 +1008,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();
         });
     }
@@ -1068,19 +1057,6 @@ export class UploadPlugin extends Plugin {
         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)
@@ -1148,8 +1124,10 @@ export class UploadPlugin extends Plugin {
                         fileStream.end();
                         lastFile.size += nextBoundaryIndex - 2;
                         fileStream = undefined;
-                        if (buffer[nextBoundaryIndexEnd] === 45)
-                            req._isReady?.resolve();
+                        if (buffer[nextBoundaryIndexEnd] === 45) {
+                            res.removeHeader('Connection');
+                            req.setReady();
+                        }
                         buffer = buffer.subarray(nextBoundaryIndex);
                     }
                     else {
@@ -1166,7 +1144,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;
@@ -1177,12 +1155,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());
@@ -1226,9 +1204,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');
@@ -1241,7 +1222,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'));
@@ -1507,7 +1488,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;
@@ -1520,7 +1500,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;
@@ -1534,7 +1514,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
@@ -1543,22 +1523,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
@@ -1685,6 +1668,7 @@ export class StaticFilesPlugin extends Plugin {
     /** Max file age in seconds (default: 31536000) */
     maxAge;
     prefix;
+    errors;
     constructor(options, server) {
         super();
         if (!options)
@@ -1695,23 +1679,37 @@ export class StaticFilesPlugin extends Plugin {
         if (server && !server.getPlugin('static'))
             this.name = 'static';
         this.mimeTypes = options.mimeTypes ? { ...StaticFilesPlugin.mimeTypes, ...options.mimeTypes } : Object.freeze(StaticFilesPlugin.mimeTypes);
-        this.root = path.resolve((options.root || options?.path || 'public').replace(/^\//, '')) + path.sep;
+        this.root = (options.root && path.isAbsolute(options.root) ? options.root : path.resolve(options.root || options?.path || 'public')).replace(/[\/\\]$/, '') + path.sep;
         this.ignore = (options.ignore || []).map((p) => path.normalize(path.join(this.root, p)) + path.sep);
         this.index = options.index || 'index.html';
         this.handlers = options.handlers;
         this.lastModified = options.lastModified !== false;
         this.etag = options.etag !== false;
         this.maxAge = options.maxAge;
+        this.errors = options.errors;
         this.prefix = ('/' + (options.path?.replace(/^[.\/]*/, '') || '').replace(/\/$/, '')).replace(/\/$/, '');
-    }
-    /** Default static files handler */
-    handler(req, res, next) {
-        res.file = (path) => {
-            this.serveFile(req, res, typeof path === 'object' ? path : {
+        const defSend = ServerResponse.prototype.send;
+        ServerResponse.prototype.send = function (data) {
+            const plugin = this.req.server.getPlugin('static');
+            if (this.statusCode < 400 || this.isJson || typeof data !== 'string' || !plugin?.errors || this.getHeader('Content-Type'))
+                return defSend.call(this, data);
+            const errFile = plugin.errors[this.statusCode] || plugin.errors['*'];
+            if (errFile)
+                plugin.serveFile(this.req, this, { path: errFile, mimeType: 'text/html' });
+            return defSend.call(this, data);
+        };
+        ServerResponse.prototype.file = function (path) {
+            const plugin = this.req.server.getPlugin('static');
+            if (!plugin)
+                throw new Error('Server error');
+            plugin.serveFile(this.req, this, typeof path === 'object' ? path : {
                 path,
                 mimeType: StaticFilesPlugin.mimeTypes[extname(path)] || 'application/octet-stream'
             });
         };
+    }
+    /** Default static files handler */
+    handler(req, res, next) {
         if (req.method !== 'GET')
             return next();
         if (!('path' in req.params)) { // global handler
@@ -1756,10 +1754,12 @@ export class StaticFilesPlugin extends Plugin {
     serveFile(req, res, options) {
         const filePath = path.isAbsolute(options.path) ? options.path : path.join(options.root || this.root, options.path);
         const statRes = (err, stats) => {
-            if (err)
-                return res.error(err);
-            if (!stats.isFile())
-                return res.error(404);
+            if (err || !stats.isFile()) {
+                if (res.statusCode < 400)
+                    return res.error(404);
+                res.end(res.statusCode + ' ' + http.STATUS_CODES[res.statusCode]);
+                return;
+            }
             if (!res.getHeader('Content-Type')) {
                 if (options.mimeType)
                     res.setHeader('Content-Type', options.mimeType);

package/package.json

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