@radatek/microserver 3.0.1 → 3.0.2

package/microserver.d.ts

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 3.0.0
+ * @version 3.0.2
  * @package @radatek/microserver
  * @copyright Darius Kisonas 2022
  * @license MIT
@@ -392,6 +392,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 +447,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.2
  * @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;
@@ -153,7 +150,9 @@ 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;
     }
     /** Update request url */
     updateUrl(url) {
@@ -260,30 +259,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 +342,7 @@ export class ServerResponse extends http.ServerResponse {
 export class MicroServer extends EventEmitter {
     config;
     auth;
+    _plugins = {};
     _stack = [];
     _router = new RouterPlugin();
     _worker = new Worker();
@@ -596,6 +597,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 +691,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 +705,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);
@@ -1148,8 +1150,10 @@ export class UploadPlugin extends Plugin {
                         fileStream.end();
                         lastFile.size += nextBoundaryIndex - 2;
                         fileStream = undefined;
-                        if (buffer[nextBoundaryIndexEnd] === 45)
+                        if (buffer[nextBoundaryIndexEnd] === 45) {
+                            res.removeHeader('Connection');
                             req._isReady?.resolve();
+                        }
                         buffer = buffer.subarray(nextBoundaryIndex);
                     }
                     else {
@@ -1685,6 +1689,7 @@ export class StaticFilesPlugin extends Plugin {
     /** Max file age in seconds (default: 31536000) */
     maxAge;
     prefix;
+    errors;
     constructor(options, server) {
         super();
         if (!options)
@@ -1695,23 +1700,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 +1775,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.2",
   "description": "HTTP MicroServer",
   "author": "Darius Kisonas",
   "license": "MIT",