taon 19.0.50 → 19.0.52

package/lib/create-context.d.ts

@@ -5,13 +5,14 @@ import { Models } from './models';
  * Context function can be used to dynamically
  * create context with specific configuration.
  */
-export declare const createContextTemplate: <CTX extends Record<string, object>, CTRL extends Record<string, new (...args: any[]) => any>, ENTITY extends Record<string, new (...args: any[]) => any>, REPO extends Record<string, new (...args: any[]) => any>, PROVIDER extends Record<string, new (...args: any[]) => any>, SUBSCRIBER extends Record<string, new (...args: any[]) => any>, MIGRATION extends Record<string, new (...args: any[]) => any>>(configFn: (env: any) => Models.ContextOptions<CTX, CTRL, ENTITY, REPO, PROVIDER, SUBSCRIBER, MIGRATION>) => () => {
+export declare const createContextTemplate: <CTX extends Record<string, object>, CTRL extends Record<string, new (...args: any[]) => any>, ENTITY extends Record<string, new (...args: any[]) => any>, REPO extends Record<string, new (...args: any[]) => any>, PROVIDER extends Record<string, new (...args: any[]) => any>, SUBSCRIBER extends Record<string, new (...args: any[]) => any>, MIGRATION extends Record<string, new (...args: any[]) => any>, MIDDLEWARE extends Record<string, new (...args: any[]) => any>>(configFn: (env: any) => Models.ContextOptions<CTX, CTRL, ENTITY, REPO, PROVIDER, SUBSCRIBER, MIGRATION, MIDDLEWARE>) => () => {
     types: {
         readonly controllers: any;
         readonly repositories: any;
         readonly providers: any;
         readonly subscribers: any;
         readonly migrations: any;
+        readonly middlewares: any;
     };
     readonly contexts: any;
     readonly contextName: string;
@@ -51,13 +52,14 @@ export declare const createContextTemplate: <CTX extends Record<string, object>,
  * REQURIED PROPERTY:
  * - contextName
  */
-export declare const createContext: <CTX extends Record<string, object>, CTRL extends Record<string, new (...args: any[]) => any>, ENTITY extends Record<string, new (...args: any[]) => any>, REPO extends Record<string, new (...args: any[]) => any>, PROVIDER extends Record<string, new (...args: any[]) => any>, SUBSCRIBER extends Record<string, new (...args: any[]) => any>, MIGRATION extends Record<string, new (...args: any[]) => any>>(configFn: (env: any) => Models.ContextOptions<CTX, CTRL, ENTITY, REPO, PROVIDER, SUBSCRIBER, MIGRATION>) => {
+export declare const createContext: <CTX extends Record<string, object>, CTRL extends Record<string, new (...args: any[]) => any>, ENTITY extends Record<string, new (...args: any[]) => any>, REPO extends Record<string, new (...args: any[]) => any>, PROVIDER extends Record<string, new (...args: any[]) => any>, SUBSCRIBER extends Record<string, new (...args: any[]) => any>, MIGRATION extends Record<string, new (...args: any[]) => any>, MIDDLEWARES extends Record<string, new (...args: any[]) => any>>(configFn: (env: any) => Models.ContextOptions<CTX, CTRL, ENTITY, REPO, PROVIDER, SUBSCRIBER, MIGRATION, MIDDLEWARES>) => {
     types: {
         readonly controllers: any;
         readonly repositories: any;
         readonly providers: any;
         readonly subscribers: any;
         readonly migrations: any;
+        readonly middlewares: any;
     };
     readonly contexts: any;
     readonly contextName: string;

package/lib/create-context.js

@@ -65,6 +65,9 @@ const createContext = (configFn) => {
             get migrations() {
                 return config.migrations; // TODO QUICK_FIX new typescript generated wrong types
             },
+            get middlewares() {
+                return config.middlewares; // TODO QUICK_FIX new typescript generated wrong types
+            },
         },
         //#endregion
         //#region contexts
@@ -159,42 +162,43 @@ const createContext = (configFn) => {
                     endpointContextRef.writeActiveRoutes();
                     //#endregion
                     await endpointContextRef.initClasses();
-                    let keepWebsqlDbDataAfterReload = false;
-                    /* */
-                    /* */
-                    /* */
-                    if (!lib_1.Helpers.isNode && keepWebsqlDbDataAfterReload) {
-                        !lib_1.UtilsOs.isRunningInCliMode() &&
-                            lib_1.Helpers.info(`[taon] Keeping websql data after reload ` +
-                                `(context=${endpointContextRef.contextName}).`);
-                    }
-                    else {
-                        !lib_1.UtilsOs.isRunningInCliMode() &&
-                            lib_1.Helpers.info(`[taon] Dropping all tables and data ` +
-                                `(context=${endpointContextRef.contextName}).`);
-                        await endpointContextRef.reinitControllers();
-                    }
-                    //#region TODO this may be usefull but for now
-                    // 2 separate contexts are fine
-                    // const shouldStartRemoteHost = endpointContextRef.mode !== 'remote-backend(tcp+udp)';
-                    // if(shouldStartRemoteHost) {
-                    //   const endpointContextRemoteHostRef = new EndpointContext(config, configFn);
-                    //   await endpointContextRemoteHostRef.init({
-                    //     overrideRemoteHost: endpointContextRef.host,
-                    //     overrideHost: null,
-                    //   });
-                    //   endpointContextRemoteHostRef.initMetadata();
-                    //   endpointContextRef.__contextForControllerInstanceAccess = endpointContextRemoteHostRef;
-                    // }
-                    //#endregion
-                    if (endpointContextRef.onlyMigrationRun) {
-                        await endpointContextRef.dbMigrations.runAllNotCompletedMigrations();
-                    }
-                    else if (endpointContextRef.onlyMigrationRevertToTimestamp) {
-                        await endpointContextRef.dbMigrations.revertMigrationToTimestamp(endpointContextRef.onlyMigrationRevertToTimestamp);
-                    }
-                    else {
-                        await endpointContextRef.dbMigrations.runAllNotCompletedMigrations();
+                    if (endpointContextRef.databaseConfig) {
+                        let keepWebsqlDbDataAfterReload = false;
+                        /* */
+                        /* */
+                        /* */
+                        if (!lib_1.Helpers.isNode && keepWebsqlDbDataAfterReload) {
+                            !lib_1.UtilsOs.isRunningInCliMode() &&
+                                lib_1.Helpers.info(`[taon] Keeping websql data after reload ` +
+                                    `(context=${endpointContextRef.contextName}).`);
+                        }
+                        else {
+                            !lib_1.UtilsOs.isRunningInCliMode() &&
+                                lib_1.Helpers.info(`[taon] Dropping all tables and data ` +
+                                    `(context=${endpointContextRef.contextName}).`);
+                        }
+                        //#region TODO this may be usefull but for now
+                        // 2 separate contexts are fine
+                        // const shouldStartRemoteHost = endpointContextRef.mode !== 'remote-backend(tcp+udp)';
+                        // if(shouldStartRemoteHost) {
+                        //   const endpointContextRemoteHostRef = new EndpointContext(config, configFn);
+                        //   await endpointContextRemoteHostRef.init({
+                        //     overrideRemoteHost: endpointContextRef.host,
+                        //     overrideHost: null,
+                        //   });
+                        //   endpointContextRemoteHostRef.initMetadata();
+                        //   endpointContextRef.__contextForControllerInstanceAccess = endpointContextRemoteHostRef;
+                        // }
+                        //#endregion
+                        if (endpointContextRef.onlyMigrationRun) {
+                            await endpointContextRef.dbMigrations.runAllNotCompletedMigrations();
+                        }
+                        else if (endpointContextRef.onlyMigrationRevertToTimestamp) {
+                            await endpointContextRef.dbMigrations.revertMigrationToTimestamp(endpointContextRef.onlyMigrationRevertToTimestamp);
+                        }
+                        else {
+                            await endpointContextRef.dbMigrations.runAllNotCompletedMigrations();
+                        }
                     }
                     resolve(endpointContextRef);
                 });

package/lib/create-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-context.js","sourceRoot":"","sources":[""],"names":[],"mappings":"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"}
+{"version":3,"file":"create-context.js","sourceRoot":"","sources":[""],"names":[],"mappings":"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"}

package/lib/decorators/classes/middleware-decorator.d.ts

@@ -0,0 +1,7 @@
+import { Models } from '../../models';
+/**
+ * Provider decorator
+ */
+export declare function TaonMiddleware<T = any>(options?: TaonMiddlewareOptions<T>): (constructor: Function) => void;
+export declare class TaonMiddlewareOptions<T = any> extends Models.DecoratorAbstractOpt {
+}

package/lib/decorators/classes/middleware-decorator.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TaonMiddlewareOptions = void 0;
+exports.TaonMiddleware = TaonMiddleware;
+const class_helpers_1 = require("../../helpers/class-helpers");
+const models_1 = require("../../models");
+const symbols_1 = require("../../symbols");
+/**
+ * Provider decorator
+ */
+function TaonMiddleware(options) {
+    return function (constructor) {
+        Reflect.defineMetadata(symbols_1.Symbols.metadata.options.provider, options, constructor);
+        Reflect.defineMetadata(symbols_1.Symbols.metadata.className, options?.className || constructor.name, constructor);
+        class_helpers_1.ClassHelpers.setName(constructor, options?.className || constructor.name);
+    };
+}
+class TaonMiddlewareOptions extends models_1.Models.DecoratorAbstractOpt {
+}
+exports.TaonMiddlewareOptions = TaonMiddlewareOptions;
+//# sourceMappingURL=middleware-decorator.js.map

package/lib/decorators/classes/middleware-decorator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"middleware-decorator.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAOA,wCAcC;AArBD,+DAA2D;AAC3D,yCAAsC;AACtC,2CAAwC;AAExC;;GAEG;AACH,SAAgB,cAAc,CAAU,OAAkC;IACxE,OAAO,UAAU,WAAqB;QACpC,OAAO,CAAC,cAAc,CACpB,iBAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EACjC,OAAO,EACP,WAAW,CACZ,CAAC;QACF,OAAO,CAAC,cAAc,CACpB,iBAAO,CAAC,QAAQ,CAAC,SAAS,EAC1B,OAAO,EAAE,SAAS,IAAI,WAAW,CAAC,IAAI,EACtC,WAAW,CACZ,CAAC;QACF,4BAAY,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,SAAS,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;IAC5E,CAAC,CAAC;AACJ,CAAC;AAED,MAAa,qBAEX,SAAQ,eAAM,CAAC,oBAAoB;CAEpC;AAJD,sDAIC"}

package/lib/decorators/classes/provider-decorator.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaonProviderOptions = void 0;
 exports.TaonProvider = TaonProvider;
 const class_helpers_1 = require("../../helpers/class-helpers");
-const symbols_1 = require("../../symbols");
 const models_1 = require("../../models");
+const symbols_1 = require("../../symbols");
 /**
  * Provider decorator
  */

package/lib/decorators/classes/provider-decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider-decorator.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAOA,oCAcC;AArBD,+DAA2D;AAC3D,2CAAwC;AACxC,yCAAsC;AAEtC;;GAEG;AACH,SAAgB,YAAY,CAAU,OAAgC;IACpE,OAAO,UAAU,WAAqB;QACpC,OAAO,CAAC,cAAc,CACpB,iBAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EACjC,OAAO,EACP,WAAW,CACZ,CAAC;QACF,OAAO,CAAC,cAAc,CACpB,iBAAO,CAAC,QAAQ,CAAC,SAAS,EAC1B,OAAO,EAAE,SAAS,IAAI,WAAW,CAAC,IAAI,EACtC,WAAW,CACZ,CAAC;QACF,4BAAY,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,SAAS,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;IAC5E,CAAC,CAAC;AACJ,CAAC;AAED,MAAa,mBAEX,SAAQ,eAAM,CAAC,oBAAoB;CAEpC;AAJD,kDAIC"}
+{"version":3,"file":"provider-decorator.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAOA,oCAcC;AArBD,+DAA2D;AAC3D,yCAAsC;AACtC,2CAAwC;AAExC;;GAEG;AACH,SAAgB,YAAY,CAAU,OAAgC;IACpE,OAAO,UAAU,WAAqB;QACpC,OAAO,CAAC,cAAc,CACpB,iBAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EACjC,OAAO,EACP,WAAW,CACZ,CAAC;QACF,OAAO,CAAC,cAAc,CACpB,iBAAO,CAAC,QAAQ,CAAC,SAAS,EAC1B,OAAO,EAAE,SAAS,IAAI,WAAW,CAAC,IAAI,EACtC,WAAW,CACZ,CAAC;QACF,4BAAY,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,SAAS,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;IAC5E,CAAC,CAAC;AACJ,CAAC;AAED,MAAa,mBAEX,SAAQ,eAAM,CAAC,oBAAoB;CAEpC;AAJD,kDAIC"}

package/lib/endpoint-context.d.ts

@@ -5,6 +5,7 @@ import type { Application } from 'express';
 import type { Repository } from 'taon-typeorm';
 import { DataSource } from 'taon-typeorm';
 import type { BaseInjector } from './base-classes/base-injector';
+export type { TaonMiddlewareInterceptOptions } from './base-classes/base-middleware';
 import { ContextDbMigrations } from './context-db-migrations';
 import { Models } from './models';
 export declare class EndpointContext {
@@ -55,7 +56,7 @@ export declare class EndpointContext {
     /**
      * available after init()
      */
-    config: Models.ContextOptions<any, any, any, any, any, any, any>;
+    config: Models.ContextOptions<any, any, any, any, any, any, any, any>;
     get logHttp(): boolean;
     get logRealtime(): boolean;
     get logFramework(): boolean;
@@ -65,7 +66,7 @@ export declare class EndpointContext {
      * Inside docker there is not need for https secure server
      */
     private isRunningInsideDocker;
-    constructor(originalConfig: Models.ContextOptions<any, any, any, any, any, any, any>, configFn: (env: any) => Models.ContextOptions<any, any, any, any, any, any, any>);
+    constructor(originalConfig: Models.ContextOptions<any, any, any, any, any, any, any, any>, configFn: (env: any) => Models.ContextOptions<any, any, any, any, any, any, any, any>);
     init(options?: {
         initFromRecrusiveContextResovle?: boolean;
         overrideHost?: string | null;
@@ -99,13 +100,12 @@ export declare class EndpointContext {
     isCLassType(classType: Models.ClassType, classFn: Function): boolean;
     /**
      * Only for injectable types
-     * Only for classType: CONTROLLER, REPOSITORY, PROVIDER
+     * Only for classType: CONTROLLER, REPOSITORY, PROVIDER, MIDDLEWARES
      */
     getClassFunByClassName(className: string): Function;
     getClassFunByClass(classFunction: Function): Function;
     getClassFunByArr(classType: Models.ClassType): Function[];
     private createInstances;
-    reinitControllers(): Promise<void>;
     initClasses(): Promise<void>;
     isActiveOn(classInstance: object): boolean;
     get frontendHostUri(): URL;
@@ -158,7 +158,8 @@ export declare class EndpointContext {
     initControllers(): Promise<void>;
     writeActiveRoutes(): void;
     get middlewares(): Models.MiddlewareType[];
-    private initMiddlewares;
+    private initFrontnedMiddlewares;
+    private initBackendMiddlewares;
     private initServer;
     /**
      * client can be browser or nodejs (when remote host)

package/lib/endpoint-context.js

@@ -97,6 +97,7 @@ class EndpointContext {
     injectableTypesfromContexts = [
         models_1.Models.ClassType.CONTROLLER,
         models_1.Models.ClassType.PROVIDER,
+        models_1.Models.ClassType.MIDDLEWARE,
         models_1.Models.ClassType.REPOSITORY,
         models_1.Models.ClassType.SUBSCRIBER,
         models_1.Models.ClassType.MIGRATION,
@@ -336,6 +337,10 @@ class EndpointContext {
             ...(await this.getRecrusiveClassesfromContextsObj(models_1.Models.ClassType.PROVIDER)),
             ...this.config.providers,
         };
+        this.config.middlewares = {
+            ...(await this.getRecrusiveClassesfromContextsObj(models_1.Models.ClassType.MIDDLEWARE)),
+            ...this.config.middlewares,
+        };
         this.config.subscribers = {
             ...(await this.getRecrusiveClassesfromContextsObj(models_1.Models.ClassType.SUBSCRIBER)),
             ...this.config.subscribers,
@@ -370,6 +375,12 @@ class EndpointContext {
             ctx: this,
             classType: models_1.Models.ClassType.PROVIDER,
         });
+        this.config.middlewares = this.cloneClassesObjWithNewMetadata({
+            classesInput: this.config.middlewares,
+            config: this.config,
+            ctx: this,
+            classType: models_1.Models.ClassType.MIDDLEWARE,
+        });
         this.config.subscribers = this.cloneClassesObjWithNewMetadata({
             classesInput: this.config.subscribers,
             config: this.config,
@@ -397,7 +408,7 @@ class EndpointContext {
             if (this.mode === 'backend-frontend(tcp+udp)' && !this.config.abstract) {
                 //#region @backend
                 this.expressApp = express();
-                this.initMiddlewares();
+                await this.initBackendMiddlewares();
                 const shouldStartHttpsSecureServer = this.isHttpServer && !this.isRunningInsideDocker;
                 this.logFramework &&
                     lib_10.Helpers.info(`
@@ -415,6 +426,7 @@ class EndpointContext {
                     this.expressApp.use(asset.serverPath, express.static(asset.locationOnDisk));
                 });
                 //#endregion
+                await this.initFrontnedMiddlewares();
             }
             //#endregion
             //#region prepare realtime
@@ -526,7 +538,7 @@ class EndpointContext {
                     //#region @backend
                     if (lib_8.UtilsOs.isElectron) {
                         dbLocationInOs = (0, lib_9.crossPlatformPath)([
-                            lib_7.os.userInfo().homedir,
+                            lib_8.UtilsOs.getRealHomeDir(),
                             `.taon/databases-for-electron-apps/${this.appId || lib_10._.snakeCase(process.cwd()).replace(/\_/, '.')}/${this.contextName}.sqlite`,
                         ]);
                         if (!lib_10.Helpers.exists(lib_11.path.dirname(dbLocationInOs))) {
@@ -893,6 +905,8 @@ class EndpointContext {
                 return this.config.entities;
             case models_1.Models.ClassType.PROVIDER:
                 return this.config.providers;
+            case models_1.Models.ClassType.MIDDLEWARE:
+                return this.config.middlewares;
             case models_1.Models.ClassType.REPOSITORY:
                 return this.config.repositories;
             case models_1.Models.ClassType.SUBSCRIBER:
@@ -906,7 +920,7 @@ class EndpointContext {
     }
     /**
      * Only for injectable types
-     * Only for classType: CONTROLLER, REPOSITORY, PROVIDER
+     * Only for classType: CONTROLLER, REPOSITORY, PROVIDER, MIDDLEWARES
      */
     getClassFunByClassName(className) {
         for (const classTypeName of this.allTypesfromContexts) {
@@ -946,25 +960,7 @@ class EndpointContext {
         }
     }
     //#endregion
-    //#region methods & getters / reinit controllers db example data
-    async reinitControllers() {
-        if (this.remoteHost || Object.keys(this.config.migrations).length > 0) {
-            return;
-        }
-        // Helpers.taskStarted(
-        //   `[taon] REINITING CONTROLLERS ${this.contextName} STARTED`,
-        // );
-        const controllers = this.getClassesInstancesArrBy(models_1.Models.ClassType.CONTROLLER);
-        // console.log('CONTROLLERS TO REINIT', controllers);
-        for (const ctrl of controllers) {
-            if (lib_10._.isFunction(ctrl.initExampleDbData)) {
-                await ctrl.initExampleDbData();
-            }
-        }
-        // Helpers.taskDone(
-        //   `[taon] REINITING CONTROLLERS ${this.contextName} DONE`,
-        // );
-    }
+    //#region methods & getters / init classes
     async initClasses() {
         if (this.remoteHost) {
             return;
@@ -976,6 +972,7 @@ class EndpointContext {
         }
         //#endregion
         for (const classTypeName of [
+            models_1.Models.ClassType.MIDDLEWARE,
             models_1.Models.ClassType.PROVIDER,
             models_1.Models.ClassType.REPOSITORY,
             models_1.Models.ClassType.CONTROLLER,
@@ -991,6 +988,7 @@ class EndpointContext {
             //#endregion
         }
         for (const classTypeName of [
+            models_1.Models.ClassType.MIDDLEWARE,
             models_1.Models.ClassType.PROVIDER,
             models_1.Models.ClassType.REPOSITORY,
             models_1.Models.ClassType.CONTROLLER,
@@ -1191,7 +1189,7 @@ class EndpointContext {
     //#region methods & getters / init connection
     async initDatabaseConnection() {
         //#region @websqlFunc
-        if (this.remoteHost) {
+        if (this.remoteHost || !this.databaseConfig) {
             return;
         }
         const entities = this.getClassFunByArr(models_1.Models.ClassType.ENTITY).map(entityFn => {
@@ -1434,15 +1432,67 @@ class EndpointContext {
     }
     //#endregion
     //#region methods & getters / init middlewares
-    initMiddlewares() {
+    async initFrontnedMiddlewares() {
+        const middlewares = this.getClassesInstancesArrBy(models_1.Models.ClassType.MIDDLEWARE);
+        for (const middleware of middlewares) {
+            const middlewareInstance = middleware;
+            if (lib_10._.isFunction(middlewareInstance.intercept)) {
+                ((instance, contextName, apiPart, uriPathnameOrNothingIfRoot) => {
+                    const interceptorName = `${contextName}-${class_helpers_1.ClassHelpers.getName(instance)}`;
+                    lib_3.Resource.request.interceptors.set(interceptorName, async (req) => {
+                        console.log('request', req);
+                        const url = new url_1.URL(req.url);
+                        if (url.pathname.startsWith(`${uriPathnameOrNothingIfRoot}/${apiPart}/${contextName}/`)) {
+                            await instance.intercept({
+                                client: {
+                                    req,
+                                },
+                            });
+                        }
+                        else {
+                            // console.log('not fit frontend', url.href);
+                        }
+                        return req;
+                    });
+                })(middlewareInstance, this.contextName, constants_1.apiPrefix, this.uriPathnameOrNothingIfRoot);
+            }
+        }
+    }
+    async initBackendMiddlewares() {
         //#region @backend
         const app = this.expressApp;
-        if (this.middlewares) {
-            this.middlewares.forEach(m => {
-                const [fun, args] = m;
-                app.use(fun.apply(null, args));
-            });
+        const middlewares = this.getClassesInstancesArrBy(models_1.Models.ClassType.MIDDLEWARE);
+        for (const middleware of middlewares) {
+            const middlewareInstance = middleware;
+            if (lib_10._.isFunction(middlewareInstance.intercept)) {
+                ((instance, contextName, apiPart, uriPathnameOrNothingIfRoot) => {
+                    const asyncHandler = fn => (req, res, next) => {
+                        Promise.resolve(fn(req, res, next)).catch(next);
+                    };
+                    const middlewareFn = asyncHandler(async (req, res, next) => {
+                        if (req.originalUrl.startsWith(`${uriPathnameOrNothingIfRoot}/${apiPart}/${contextName}/`)) {
+                            await instance.intercept({
+                                server: {
+                                    req,
+                                    res,
+                                },
+                            });
+                        }
+                        else {
+                            // console.log('not fit backend', url.href);
+                        }
+                        next();
+                    });
+                    app.use(middlewareFn);
+                })(middlewareInstance, this.contextName, constants_1.apiPrefix, this.uriPathnameOrNothingIfRoot);
+            }
         }
+        // if (this.middlewares) {
+        //   this.middlewares.forEach(m => {
+        //     const [fun, args] = m;
+        //     app.use(fun.apply(null, args));
+        //   });
+        // }
         this.expressApp.get('/helloworld', (req, res) => {
             res.send(`Hello, world from context ${this.contextName}`);
         });