@radatek/microserver 3.0.4 → 3.0.5

package/microserver.d.ts

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 3.0.3
+ * @version 3.0.5
  * @package @radatek/microserver
  * @copyright Darius Kisonas 2022
  * @license MIT

package/microserver.js

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 3.0.3
+ * @version 3.0.5
  * @package @radatek/microserver
  * @copyright Darius Kisonas 2022
  * @license MIT
@@ -695,7 +695,9 @@ export class MicroServer extends EventEmitter {
             if (routes)
                 await this.use(routes);
         }
-        if (plugin.handler && plugin.name) {
+        if (plugin.name) {
+            if (this._plugins[plugin.name])
+                throw new Error(`Plugin ${plugin.name} already added`);
             this._plugins[plugin.name] = plugin;
             this.emit('plugin', plugin.name);
             this.emit('plugin:' + plugin.name);
@@ -1672,9 +1674,6 @@ export class StaticFilesPlugin extends Plugin {
             options = {};
         if (typeof options === 'string')
             options = { root: options };
-        // allow multiple instances
-        if (server && !server.getPlugin('static'))
-            this.name = 'static';
         this.mimeTypes = options.mimeTypes ? { ...StaticFilesPlugin.mimeTypes, ...options.mimeTypes } : Object.freeze(StaticFilesPlugin.mimeTypes);
         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);
@@ -1686,24 +1685,28 @@ export class StaticFilesPlugin extends Plugin {
         this.errors = options.errors;
         this.prefix = ('/' + (options.path?.replace(/^[.\/]*/, '') || '').replace(/\/$/, '')).replace(/\/$/, '');
         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'))
+        if (server && !server.getPlugin('static')) {
+            this.name = 'static'; // only first plugin instance is registered as
+            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);
-            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'
-            });
-        };
+            };
+            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) {

package/package.json

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