@radatek/microserver 2.0.0 → 2.0.2

package/dist/microserver.d.ts

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 2.0.0
+ * @version 2.0.2
  * @package @radatek/microserver
  * @copyright Darius Kisonas 2022
  * @license MIT
@@ -31,9 +31,17 @@ export declare class WebSocketError extends Error {
     statusCode: number;
     constructor(text?: string, code?: number);
 }
+export type Routes = () => {
+    [key: string]: Array<any>;
+} | {
+    [key: string]: Array<any>;
+};
 export declare abstract class Plugin {
+    name?: string;
     priority?: number;
     handler?(req: ServerRequest, res: ServerResponse, next: Function): void;
+    controller?: typeof Controller;
+    routes?: () => Routes | Routes;
     constructor(router: Router, ...args: any);
 }
 interface PluginClass {
@@ -215,6 +223,9 @@ export interface Middleware {
 export declare class Router extends EventEmitter {
     server: MicroServer;
     auth?: Auth;
+    plugins: {
+        [key: string]: Plugin;
+    };
     /** @param {MicroServer} server  */
     constructor(server: MicroServer);
     /** Handler */
@@ -272,7 +283,7 @@ export declare class Router extends EventEmitter {
      * @param { {[key: string]: Array<any>} } routes list with subroutes: 'METHOD /suburl': [...middlewares]
      * @return {Router} current router
      */
-    add(...args: any): Router;
+    use(...args: any): Router;
     /** Add hook */
     hook(url: string, ...mid: Middleware[]): Router;
     /** Check if middleware allready added */
@@ -353,7 +364,7 @@ export declare class MicroServer extends EventEmitter {
     static plugins: {
         [key: string]: PluginClass;
     };
-    plugins: {
+    get plugins(): {
         [key: string]: Plugin;
     };
     constructor(config: MicroServerConfig);
@@ -576,7 +587,7 @@ export declare class FileStore {
     /** load json file data */
     load(name: string, autosave?: boolean): Promise<any>;
     /** save data */
-    save(name: string, data: any): Promise<void>;
+    save(name: string, data: any): Promise<any>;
     /** load all files in directory */
     all(name: string, autosave?: boolean): Promise<{
         [key: string]: any;

package/dist/microserver.js

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 2.0.0
+ * @version 2.0.2
  * @package @radatek/microserver
  * @copyright Darius Kisonas 2022
  * @license MIT
@@ -897,6 +897,7 @@ export class Router extends EventEmitter {
     /** @param {MicroServer} server  */
     constructor(server) {
         super();
+        this.plugins = {};
         this._stack = [];
         this._stackAfter = [];
         this._tree = {};
@@ -1096,32 +1097,26 @@ export class Router extends EventEmitter {
      * @param { {[key: string]: Array<any>} } routes list with subroutes: 'METHOD /suburl': [...middlewares]
      * @return {Router} current router
      */
-    add(...args) {
+    use(...args) {
         if (!args[0])
             return this;
-        // add(plugin)
+        // use(plugin)
         if (args[0] instanceof Plugin)
             return this._plugin(args[0]);
-        // add(pluginid, ...args)
+        // use(pluginid, ...args)
         if (typeof args[0] === 'string' && MicroServer.plugins[args[0]]) {
             const constructor = MicroServer.plugins[args[0]];
             const plugin = new constructor(this, ...args.slice(1));
             return this._plugin(plugin);
         }
+        // use(PluginClass, ...args)
         if (args[0].prototype instanceof Plugin) {
             const plugin = new args[0](this, ...args.slice(1));
             return this._plugin(plugin);
         }
+        // use(middleware)
         if (typeof args[0] === 'function') {
-            class Middleware extends Plugin {
-                constructor() {
-                    super(...arguments);
-                    this.priority = args[0].priority;
-                }
-            }
-            const middleware = new Middleware(this);
-            middleware.handler = args[0];
-            return this._plugin(middleware);
+            return this._middleware(args[0]);
         }
         let method = '*', url = '/';
         if (typeof args[0] === 'string') {
@@ -1134,13 +1129,13 @@ export class Router extends EventEmitter {
                 throw new Error(`Invalid url ${url}`);
             args = args.slice(1);
         }
-        // add('/url', ControllerClass)
+        // use('/url', ControllerClass)
         if (typeof args[0] === 'function' && args[0].prototype instanceof Controller) {
             const routes = args[0].routes();
             if (routes)
                 args[0] = routes;
         }
-        // add('/url', [ ['METHOD /url', ...], {'METHOD } ])
+        // use('/url', [ ['METHOD /url', ...], {'METHOD } ])
         if (Array.isArray(args[0])) {
             if (method !== '*')
                 throw new Error('Invalid router usage');
@@ -1149,25 +1144,25 @@ export class Router extends EventEmitter {
                     // [methodUrl, ...middlewares]
                     if (typeof item[0] !== 'string' || !item[0].match(/^(\w+ )?\//))
                         throw new Error('Url expected');
-                    return this.add(item[0].replace(/\//, (url === '/' ? '' : url) + '/'), ...item.slice(1));
+                    return this.use(item[0].replace(/\//, (url === '/' ? '' : url) + '/'), ...item.slice(1));
                 }
                 else
                     throw new Error('Invalid param');
             });
             return this;
         }
-        // add('/url', {'METHOD /url': [...middlewares], ... } ])
+        // use('/url', {'METHOD /url': [...middlewares], ... } ])
         if (typeof args[0] === 'object' && args[0].constructor === Object) {
             if (method !== '*')
                 throw new Error('Invalid router usage');
             for (const [subUrl, subArgs] of Object.entries(args[0])) {
                 if (!subUrl.match(/^(\w+ )?\//))
                     throw new Error('Url expected');
-                this.add(subUrl.replace(/\//, (url === '/' ? '' : url) + '/'), ...(Array.isArray(subArgs) ? subArgs : [subArgs]));
+                this.use(subUrl.replace(/\//, (url === '/' ? '' : url) + '/'), ...(Array.isArray(subArgs) ? subArgs : [subArgs]));
             }
             return this;
         }
-        // add('/url', ...middleware)
+        // use('/url', ...middleware)
         return this._add(method, url, 'next', args.filter((o) => o));
     }
     _middleware(middleware) {
@@ -1176,17 +1171,30 @@ export class Router extends EventEmitter {
         const priority = (middleware?.priority || 0) - 1;
         const stack = priority < -1 ? this._stackAfter : this._stack;
         const idx = stack.findIndex(f => 'priority' in f
-            && priority > (f.priority || 0));
+            && priority >= (f.priority || 0));
         stack.splice(idx < 0 ? stack.length : idx, 0, middleware);
         return this;
     }
     _plugin(plugin) {
+        if (plugin.name) {
+            if (this.plugins[plugin.name])
+                throw new Error(`Plugin ${plugin.name} already added`);
+            this.plugins[plugin.name] = plugin;
+        }
         if (plugin.handler) {
             const middleware = plugin.handler.bind(plugin);
             middleware.plugin = plugin;
             middleware.priority = plugin.priority;
             return this._middleware(middleware);
         }
+        if (plugin.routes) {
+            if (typeof plugin.routes === 'function')
+                this.use(plugin.routes());
+            else
+                this.use(plugin.routes);
+        }
+        if (plugin.controller)
+            this.use(plugin.controller);
         return this;
     }
     /** Add hook */
@@ -1203,10 +1211,10 @@ export class Router extends EventEmitter {
     }
 }
 export class MicroServer extends EventEmitter {
+    get plugins() { return this.router.plugins; }
     constructor(config) {
         super();
         this._ready = false;
-        this.plugins = {};
         this._methods = {};
         let promise = Promise.resolve();
         this._init = (f, ...args) => {
@@ -1226,7 +1234,7 @@ export class MicroServer extends EventEmitter {
             this.use(config.routes);
         for (const key in MicroServer.plugins) {
             if (config[key])
-                this.router.add(MicroServer.plugins[key], config[key]);
+                this.router.use(MicroServer.plugins[key], config[key]);
         }
         if (config.listen)
             this._init(() => {
@@ -1432,7 +1440,7 @@ export class MicroServer extends EventEmitter {
     }
     /** Add middleware, routes, etc.. see {Router.add} */
     use(...args) {
-        this.router.add(...args);
+        this.router.use(...args);
         return this;
     }
     /** Default server handler */
@@ -1581,32 +1589,32 @@ export class MicroServer extends EventEmitter {
     }
     /** Add route, alias to `server.router.add('GET ' + url, ...args)` */
     get(url, ...args) {
-        this.router.add('GET ' + url, ...args);
+        this.router.use('GET ' + url, ...args);
         return this;
     }
     /** Add route, alias to `server.router.add('POST ' + url, ...args)` */
     post(url, ...args) {
-        this.router.add('POST ' + url, ...args);
+        this.router.use('POST ' + url, ...args);
         return this;
     }
     /** Add route, alias to `server.router.add('PUT ' + url, ...args)` */
     put(url, ...args) {
-        this.router.add('PUT ' + url, ...args);
+        this.router.use('PUT ' + url, ...args);
         return this;
     }
     /** Add route, alias to `server.router.add('PATCH ' + url, ...args)` */
     patch(url, ...args) {
-        this.router.add('PATCH ' + url, ...args);
+        this.router.use('PATCH ' + url, ...args);
         return this;
     }
     /** Add route, alias to `server.router.add('DELETE ' + url, ...args)` */
     delete(url, ...args) {
-        this.router.add('DELETE ' + url, ...args);
+        this.router.use('DELETE ' + url, ...args);
         return this;
     }
     /** Add websocket handler, alias to `server.router.add('WEBSOCKET ' + url, ...args)` */
     websocket(url, ...args) {
-        this.router.add('WEBSOCKET ' + url, ...args);
+        this.router.use('WEBSOCKET ' + url, ...args);
         return this;
     }
     /** Add router hook, alias to `server.router.hook(url, ...args)` */
@@ -1621,6 +1629,7 @@ class TrustProxyPlugin extends Plugin {
     constructor(router, options) {
         super(router);
         this.priority = 110;
+        this.name = 'trustProxy';
         this.trustProxy = [];
         this.trustProxy = options || [];
     }
@@ -1651,14 +1660,16 @@ class VHostPlugin extends Plugin {
         super(router);
         this.priority = 100;
         const server = router.server;
-        if (!server.vhosts)
+        if (!server.vhosts) {
             server.vhosts = {};
+            this.name = 'vhost';
+        }
         else
             this.handler = undefined;
         for (const host in options) {
             if (!server.vhosts[host])
                 server.vhosts[host] = new Router(server);
-            server.vhosts[host].add(options[host]);
+            server.vhosts[host].use(options[host]);
         }
     }
     handler(req, res, next) {
@@ -1694,7 +1705,7 @@ class StaticPlugin extends Plugin {
         this.lastModified = options.lastModified !== false;
         this.etag = options.etag !== false;
         this.maxAge = options.maxAge;
-        router.add('GET /' + (options.path?.replace(/^[.\/]*/, '') || '').replace(/\/$/, '') + '/:path*', this.staticHandler.bind(this));
+        router.use('GET /' + (options.path?.replace(/^[.\/]*/, '') || '').replace(/\/$/, '') + '/:path*', this.staticHandler.bind(this));
     }
     /** Default static files handler */
     staticHandler(req, res, next) {
@@ -1780,7 +1791,7 @@ export class ProxyPlugin extends Plugin {
         this.validHeaders = { ...ProxyPlugin.validHeaders, ...options?.validHeaders };
         if (options.path && options.path !== '/') {
             this.handler = undefined;
-            router.add(options.path + '/:path*', this.proxyHandler.bind(this));
+            router.use(options.path + '/:path*', this.proxyHandler.bind(this));
         }
     }
     /** Default proxy handler */
@@ -1816,8 +1827,7 @@ export class ProxyPlugin extends Plugin {
         }
         if (this.headers)
             Object.assign(reqOptions.headers, this.headers);
-        if (!reqOptions.headers.Host && !reqOptions.headers.host)
-            reqOptions.headers.Host = reqOptions.host;
+        reqOptions.setHost = true;
         const conn = this.remoteUrl.protocol === 'https:' ? https.request(reqOptions) : http.request(reqOptions);
         conn.on('response', (response) => {
             res.statusCode = response.statusCode || 502;
@@ -2144,6 +2154,7 @@ async function login (username, password, salt) {
 class AuthPlugin extends Plugin {
     constructor(router, options) {
         super(router);
+        this.name = 'auth';
         if (router.auth)
             throw new Error('Auth plugin already initialized');
         this.options = {
@@ -2331,7 +2342,7 @@ export class FileStore {
             data: data
         };
         this._cache[name] = item;
-        return this._sync(async () => {
+        this._sync(async () => {
             if (this._cache[name] === item) {
                 this.cleanup();
                 try {
@@ -2341,6 +2352,7 @@ export class FileStore {
                 }
             }
         });
+        return data;
     }
     /** load all files in directory */
     async all(name, autosave = false) {
@@ -2924,11 +2936,12 @@ export class MicroCollection {
             });
             return count;
         }
-        let oldData = this.queryDocument(options.query, this.data[id]);
-        if (!oldData) {
+        let doc = this.queryDocument(options.query, this.data[id]);
+        if (!doc) {
             if (!options.upsert && !options.new)
                 throw new InvalidData(`Document not found`);
-            oldData = { _id: id };
+            doc = { _id: id };
+            this.data[id] = doc;
         }
         else {
             if (options.new)
@@ -2937,15 +2950,15 @@ export class MicroCollection {
         if (options.update) {
             for (const n in options.update) {
                 if (!n.startsWith('$'))
-                    oldData[n] = options.update[n];
+                    doc[n] = options.update[n];
             }
             if (options.update.$unset) {
                 for (const n in options.update.$unset)
-                    delete oldData[n];
+                    delete doc[n];
             }
         }
         if (this._save)
-            this.data[id] = await this._save(id, this.data[id], this) || this.data[id];
+            this.data[id] = await this._save(id, doc, this) || doc;
         return 1;
     }
     /** Insert one document */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radatek/microserver",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "HTTP MicroServer",
   "author": "Darius Kisonas",
   "license": "MIT",
@@ -20,11 +20,5 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/radateklt/microserver.git"
-  },
-  "devDependencies": {
-    "@types/node": "^22.14.1"
-  },
-  "scripts": {
-    "build": "pnpm --package typescript dlx tsc -d -m nodenext -t es2021 microserver.ts --outDir dist && sed -Ei 's/\\\"use strict\\\";\\n\\n//g' dist/microserver.js && sed -Ei ':a;N;$!ba;s/\\n +private _[^\\n]+//g;s/export \\{\\};//g' dist/microserver.d.ts"
   }
 }