taon 19.0.48 → 19.0.49

package/browser/lib/constants.d.ts

@@ -5,4 +5,5 @@ import { InjectionToken } from '@angular/core';
 import type { TaonContext } from './create-context';
 declare let TAON_CONTEXT: InjectionToken<TaonContext>;
 declare let CURRENT_HOST_BACKEND_PORT: InjectionToken<number>;
-export { TAON_CONTEXT, CURRENT_HOST_BACKEND_PORT };
+export { TAON_CONTEXT, CURRENT_HOST_BACKEND_PORT };
+export declare const apiPrefix = "api";

package/browser/lib/endpoint-context.d.ts

@@ -31,7 +31,7 @@ export declare class EndpointContext {
     private readonly classInstancesByNameObj;
     private readonly objWithClassesInstancesArr;
     readonly activeRoutes: {
-        routePath: string;
+        expressPath: string;
         method: Models.Http.Rest.HttpMethod;
     }[];
     readonly skipWritingServerRoutes: boolean;
@@ -103,6 +103,27 @@ export declare class EndpointContext {
     initClasses(): Promise<void>;
     isActiveOn(classInstance: object): boolean;
     get uri(): URL;
+    get uriPort(): string | undefined;
+    get uriProtocol(): string | undefined;
+    /**
+     * Examples
+     * http://localhost:3000
+     * https://localhost (from localhost:80)   *
+     */
+    get uriOrigin(): string | undefined;
+    /**
+     * Exampels
+     * http://localhost:3000/path/to/somewhere
+     * https://localhost/path/to/somewhere (from localhost:80)
+     */
+    get uriPathname(): string | undefined;
+    /**
+     * Examples
+     * http://localhost:3000/path/to/somewhere -> '/path/to/somewhere'
+     * http://localhost:3000 -> '' #
+     * https://localhost/path/to/  -> '/path/to/somewhere' # remove last slash
+     */
+    get uriPathnameOrNothingIfRoot(): string;
     /**
      * Port from uri as number
      * @returns {Number | undefined}

package/browser/lib/helpers/class-helpers.d.ts

@@ -15,5 +15,4 @@ export declare namespace ClassHelpers {
     const getControllerConfig: (target: Function) => Models.ControllerConfig | undefined;
     const getMethodsNames: (classOrClassInstance: any, allMethodsNames?: any[]) => string[];
     const getControllerConfigs: (target: Function, configs?: Models.ControllerConfig[], callerTarget?: Function) => Models.RuntimeControllerConfig[];
-    const getCalculatedPathFor: (target: Function) => string;
 }

package/browser/lib/realtime/realtime-core.d.ts

@@ -1,11 +1,11 @@
 // @ts-nocheck
+import { Server } from 'socket.io';
+import { DefaultEventsMap } from 'socket.io/dist/typed-events';
 import { Socket as SocketClient } from 'socket.io-client';
 import type { EndpointContext } from '../endpoint-context';
 import { RealtimeClient } from './realtime-client';
 import { RealtimeServer } from './realtime-server';
 import type { RealtimeStrategy } from './realtime-strategy';
-import { DefaultEventsMap } from 'socket.io/dist/typed-events';
-import { Server } from 'socket.io';
 /**
  * Realtime class
  * - mock (when browser-browser)

package/browser/lib/realtime/realtime-server.d.ts

@@ -1,7 +1,7 @@
 // @ts-nocheck
-import { RealtimeCore } from './realtime-core';
-import type { BaseEntity } from '../base-classes/base-entity';
 import { Observable } from 'rxjs';
+import type { BaseEntity } from '../base-classes/base-entity';
+import { RealtimeCore } from './realtime-core';
 export declare class RealtimeServer {
     private core;
     constructor(core: RealtimeCore);

package/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taon/browser",
-  "version": "19.0.48",
+  "version": "19.0.49",
   "module": "fesm2022/taon.mjs",
   "typings": "index.d.ts",
   "exports": {

package/lib/build-info._auto-generated_.d.ts

@@ -1,4 +1,5 @@
 export declare const BUILD_FRAMEWORK_CLI_NAME = "tnp";
 export declare const APP_ID = "dev.taon.app";
+export declare const BUILD_BASE_HREF = "";
 export declare const PROJECT_NPM_NAME = "taon";
-export declare const CURRENT_PACKAGE_VERSION = "19.0.48";
+export declare const CURRENT_PACKAGE_VERSION = "19.0.49";

package/lib/build-info._auto-generated_.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CURRENT_PACKAGE_VERSION = exports.PROJECT_NPM_NAME = exports.APP_ID = exports.BUILD_FRAMEWORK_CLI_NAME = void 0;
+exports.CURRENT_PACKAGE_VERSION = exports.PROJECT_NPM_NAME = exports.BUILD_BASE_HREF = exports.APP_ID = exports.BUILD_FRAMEWORK_CLI_NAME = void 0;
 // THIS FILE IS GENERATED - DO NOT MODIFY
 exports.BUILD_FRAMEWORK_CLI_NAME = 'tnp';
 exports.APP_ID = 'dev.taon.app';
+exports.BUILD_BASE_HREF = '';
 exports.PROJECT_NPM_NAME = 'taon';
-exports.CURRENT_PACKAGE_VERSION = '19.0.48';
+exports.CURRENT_PACKAGE_VERSION = '19.0.49';
 // THIS FILE IS GENERATED - DO NOT MODIFY
 //# sourceMappingURL=build-info._auto-generated_.js.map

package/lib/build-info._auto-generated_.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-info._auto-generated_.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAAA,yCAAyC;AAC5B,QAAA,wBAAwB,GAAG,KAAK,CAAC;AACjC,QAAA,MAAM,GAAG,cAAc,CAAC;AACxB,QAAA,gBAAgB,GAAG,MAAM,CAAC;AAC1B,QAAA,uBAAuB,GAAG,SAAS,CAAC;AACjD,yCAAyC"}
+{"version":3,"file":"build-info._auto-generated_.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAAA,yCAAyC;AAC5B,QAAA,wBAAwB,GAAG,KAAK,CAAC;AACjC,QAAA,MAAM,GAAG,cAAc,CAAC;AACxB,QAAA,eAAe,GAAG,EAAE,CAAC;AACrB,QAAA,gBAAgB,GAAG,MAAM,CAAC;AAC1B,QAAA,uBAAuB,GAAG,SAAS,CAAC;AACjD,yCAAyC"}

package/lib/constants.d.ts

@@ -5,3 +5,4 @@ import type { TaonContext } from './create-context';
 declare let TAON_CONTEXT: InjectionToken<TaonContext>;
 declare let CURRENT_HOST_BACKEND_PORT: InjectionToken<number>;
 export { TAON_CONTEXT, CURRENT_HOST_BACKEND_PORT };
+export declare const apiPrefix = "api";

package/lib/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CURRENT_HOST_BACKEND_PORT = exports.TAON_CONTEXT = exports.TaonEntityKeysToOmitArr = void 0;
+exports.apiPrefix = exports.CURRENT_HOST_BACKEND_PORT = exports.TAON_CONTEXT = exports.TaonEntityKeysToOmitArr = void 0;
 exports.TaonEntityKeysToOmitArr = [
     'ctrl',
     'clone',
@@ -24,4 +24,5 @@ let TAON_CONTEXT;
 /* */
 /* */
 let CURRENT_HOST_BACKEND_PORT;
+exports.apiPrefix = 'api';
 //# sourceMappingURL=constants.js.map

package/lib/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAmBa,QAAA,uBAAuB,GAA2B;IAC7D,MAAM;IACN,OAAO;IACP,sBAAsB;IACtB,KAAK;IACL,QAAQ;IACR,GAAG;IACH,UAAU;IACV,WAAW;IACX,QAAQ;IACR,YAAY;IACZ,wBAAwB;IACxB,kBAAkB;IAClB,kBAAkB;IAClB,YAAY;IACZ,sBAAsB;IACtB,qBAAqB;IACrB,uBAAuB;CACxB,CAAC;AAMF,IAAI,YAAyC,CAAC;AAC9C,KAAK;AACL,KAAK;AAGL,IAAI,yBAAiD,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAmBa,QAAA,uBAAuB,GAA2B;IAC7D,MAAM;IACN,OAAO;IACP,sBAAsB;IACtB,KAAK;IACL,QAAQ;IACR,GAAG;IACH,UAAU;IACV,WAAW;IACX,QAAQ;IACR,YAAY;IACZ,wBAAwB;IACxB,kBAAkB;IAClB,kBAAkB;IAClB,YAAY;IACZ,sBAAsB;IACtB,qBAAqB;IACrB,uBAAuB;CACxB,CAAC;AAMF,IAAI,YAAyC,CAAC;AAC9C,KAAK;AACL,KAAK;AAGL,IAAI,yBAAiD,CAAC;AASzC,QAAA,SAAS,GAAG,KAAK,CAAC"}

package/lib/endpoint-context.d.ts

@@ -32,7 +32,7 @@ export declare class EndpointContext {
     private readonly classInstancesByNameObj;
     private readonly objWithClassesInstancesArr;
     readonly activeRoutes: {
-        routePath: string;
+        expressPath: string;
         method: Models.Http.Rest.HttpMethod;
     }[];
     repos: Map<string, Repository<any>>;
@@ -105,6 +105,27 @@ export declare class EndpointContext {
     initClasses(): Promise<void>;
     isActiveOn(classInstance: object): boolean;
     get uri(): URL;
+    get uriPort(): string | undefined;
+    get uriProtocol(): string | undefined;
+    /**
+     * Examples
+     * http://localhost:3000
+     * https://localhost (from localhost:80)   *
+     */
+    get uriOrigin(): string | undefined;
+    /**
+     * Exampels
+     * http://localhost:3000/path/to/somewhere
+     * https://localhost/path/to/somewhere (from localhost:80)
+     */
+    get uriPathname(): string | undefined;
+    /**
+     * Examples
+     * http://localhost:3000/path/to/somewhere -> '/path/to/somewhere'
+     * http://localhost:3000 -> '' #
+     * https://localhost/path/to/  -> '/path/to/somewhere' # remove last slash
+     */
+    get uriPathnameOrNothingIfRoot(): string;
     /**
      * Port from uri as number
      * @returns {Number | undefined}

package/lib/endpoint-context.js

@@ -24,6 +24,7 @@ const lib_8 = require("tnp-core/lib");
 const lib_9 = require("tnp-core/lib");
 const lib_10 = require("tnp-core/lib");
 const lib_11 = require("tnp-core/lib");
+const constants_1 = require("./constants");
 const context_db_migrations_1 = require("./context-db-migrations");
 const di_container_1 = require("./dependency-injection/di-container");
 const entity_process_1 = require("./entity-process");
@@ -243,6 +244,10 @@ class EndpointContext {
             }
             this.mode = 'remote-backend(tcp+udp)';
         }
+        // console.log(`
+        //   useIpcWhenElectron: ${this.config.useIpcWhenElectron}
+        //   Helpers.isElectron: ${Helpers.isElectron}
+        //   `)
         if (this.config.useIpcWhenElectron && lib_10.Helpers.isElectron) {
             if (lib_10.Helpers.isWebSQL) {
                 this.mode = 'backend-frontend(websql-electron)';
@@ -251,6 +256,11 @@ class EndpointContext {
                 this.mode = 'backend-frontend(ipc-electron)';
             }
         }
+        // mode === undefined for BaseContext => ok behavior
+        // console.log(`Mode for BE/FE communication: ${this.mode}`);
+        // if(!this.mode) {
+        //   console.log(this.config)
+        // }
         if (!this.mode && !this.config.abstract) {
             lib_10.Helpers.error(`[taon] Context "${this.contextName}": You need to provide host or remoteHost or useIpcWhenElectron`, false, true);
             //#region @backend
@@ -575,10 +585,10 @@ class EndpointContext {
             return await new Promise(resolve => {
                 if (lib_8.UtilsOs.isRunningInDocker()) {
                     // this.displayRoutes(this.expressApp);
-                    this.serverTcpUdp.listen(Number(this.uri.port), '0.0.0.0', () => {
-                        lib_10.Helpers.log(`Express server (inside docker) started 0.0.0.0:${this.uri.port}`);
-                        lib_10.Helpers.log(`[taon][express-server]listening on port: ${this.uri.port}, hostname: ${this.uri.pathname},
-    address: ${this.uri.protocol}//localhost:${this.uri.port}${this.uri.pathname}
+                    this.serverTcpUdp.listen(Number(this.uriPort), '0.0.0.0', () => {
+                        lib_10.Helpers.log(`Express server (inside docker) started 0.0.0.0:${this.uriPort}`);
+                        lib_10.Helpers.log(`[taon][express-server]listening on port: ${this.uriPort}, hostname: ${this.uriPathname},
+    address: ${this.uriProtocol}//localhost:${this.uriPort}${this.uriPathname}
     env: ${this.expressApp.settings.env}
     `);
                         resolve(void 0);
@@ -586,10 +596,10 @@ class EndpointContext {
                 }
                 else {
                     // this.displayRoutes(this.expressApp);
-                    this.serverTcpUdp.listen(Number(this.uri.port), () => {
-                        lib_10.Helpers.log(`Express server (inside nodejs app) started on localhost:${this.uri.port}`);
-                        lib_10.Helpers.log(`[taon][express-server]listening on port: ${this.uri.port}, hostname: ${this.uri.pathname},
-            address: ${this.uri.protocol}//localhost:${this.uri.port}${this.uri.pathname}
+                    this.serverTcpUdp.listen(Number(this.uriPort), () => {
+                        lib_10.Helpers.log(`Express server (inside nodejs app) started on localhost:${this.uriPort}`);
+                        lib_10.Helpers.log(`[taon][express-server]listening on port: ${this.uriPort}, hostname: ${this.uriPathname},
+            address: ${this.uriProtocol}//localhost:${this.uriPort}${this.uriPathname}
             env: ${this.expressApp.settings.env}
             `);
                         resolve(void 0);
@@ -1006,16 +1016,53 @@ class EndpointContext {
         return url;
     }
     //#endregion
+    get uriPort() {
+        return this.uri?.port;
+    }
+    get uriProtocol() {
+        return this.uri?.protocol;
+    }
+    /**
+     * Examples
+     * http://localhost:3000
+     * https://localhost (from localhost:80)   *
+     */
+    get uriOrigin() {
+        return this.uri?.origin;
+    }
+    /**
+     * Exampels
+     * http://localhost:3000/path/to/somewhere
+     * https://localhost/path/to/somewhere (from localhost:80)
+     */
+    // get uriOriginWithPathname(): string | undefined {
+    //   return this.uri?.origin
+    //     ? this.uri?.origin + this.uriPathnameOrNothingIfRoot.replace(/\/$/, '')
+    //     : undefined;
+    // }
+    get uriPathname() {
+        return this.uri?.pathname;
+    }
+    /**
+     * Examples
+     * http://localhost:3000/path/to/somewhere -> '/path/to/somewhere'
+     * http://localhost:3000 -> '' #
+     * https://localhost/path/to/  -> '/path/to/somewhere' # remove last slash
+     */
+    get uriPathnameOrNothingIfRoot() {
+        const isNonRootProperPathName = this.uri?.pathname && this.uri.pathname !== '/';
+        return isNonRootProperPathName ? this.uri.pathname.replace(/\/$/, '') : '';
+    }
     /**
      * Port from uri as number
      * @returns {Number | undefined}
      */
     get port() {
-        return this.uri?.port ? Number(this.uri.port) : undefined;
+        return this.uri?.port ? Number(this.uriPort) : undefined;
     }
     //#region methods & getters / is https server
     get isHttpServer() {
-        return this.uri.protocol === 'https:';
+        return this.uriProtocol === 'https:';
     }
     //#endregion
     //#region methods & getters / public assets
@@ -1218,7 +1265,7 @@ class EndpointContext {
             return;
         }
         const allControllers = this.getClassFunByArr(models_1.Models.ClassType.CONTROLLER);
-        // console.log('allControllers', allControllers)11
+        // console.log('allControllers', allControllers);
         for (const controllerClassFn of allControllers) {
             controllerClassFn[symbols_1.Symbols.classMethodsNames] =
                 class_helpers_1.ClassHelpers.getMethodsNames(controllerClassFn);
@@ -1238,15 +1285,17 @@ class EndpointContext {
                 classConfig.calculatedPath = classConfig.path;
             }
             else {
-                classConfig.calculatedPath =
-                    `${parentscalculatedPath}/${class_helpers_1.ClassHelpers.getName(controllerClassFn)}`
-                        .replace(/\/\//g, '/')
-                        .split('/')
-                        .reduce((acc, bc) => {
-                        return lib_10._.last(acc) === bc ? acc : [...acc, bc];
-                    }, [])
-                        .join('/');
+                classConfig.calculatedPath = (`${this.uriPathnameOrNothingIfRoot}` +
+                    `/${constants_1.apiPrefix}/${this.contextName}/tcp${parentscalculatedPath}/` +
+                    `${class_helpers_1.ClassHelpers.getName(controllerClassFn)}`)
+                    .replace(/\/\//g, '/')
+                    .split('/')
+                    .reduce((acc, bc) => {
+                    return lib_10._.last(acc) === bc ? acc : [...acc, bc];
+                }, [])
+                    .join('/');
             }
+            // console.log('calculatedPath', classConfig.calculatedPath);
             lib_10._.slice(configs, 1).forEach(bc => {
                 const alreadyIs = classConfig.methods;
                 const toMerge = lib_10._.cloneDeep(bc.methods);
@@ -1274,13 +1323,13 @@ class EndpointContext {
                 const expressPath = methodConfig.global
                     ? `/${methodConfig.path?.replace(/\//, '')}`
                     : taon_helpers_1.TaonHelpers.getExpressPath(classConfig, methodConfig);
-                // console.log({ expressPath })
+                // console.log({ expressPath });
                 if (lib_10.Helpers.isNode || lib_10.Helpers.isWebSQL) {
                     //#region @websql
-                    const { routePath, method } = this.initServer(type, methodConfig, classConfig, expressPath, controllerClassFn);
+                    const route = this.initServer(type, methodConfig, classConfig, expressPath, controllerClassFn);
                     this.activeRoutes.push({
-                        routePath,
-                        method,
+                        expressPath: route.expressPath,
+                        method: route.method,
                     });
                     //#endregion
                 }
@@ -1314,21 +1363,21 @@ class EndpointContext {
             this.skipWritingServerRoutes) {
             return;
         }
-        const contexts = [this];
+        // const contexts: EndpointContext[] = [this];
         //#region @websql
         const troutes = lib_8.Utils.uniqArray(this.activeRoutes.map(f => {
-            return `${f.method} ${f.routePath}`;
+            return `${f.method} ${f.expressPath}`;
         })).map(f => {
-            const [method, routePath] = f.split(' ');
-            return (`\n### ${lib_10._.startCase(lib_10._.last(routePath.split('/')))}\n` +
+            const [method, expressPath] = f.split(' ');
+            return (`\n### ${lib_10._.startCase(lib_10._.last(expressPath.split('/')))}\n` +
                 taon_helpers_1.TaonHelpers.fillUpTo(method.toUpperCase() + ' ', 10) +
-                this.uri.href.replace(/\/$/, '') +
-                routePath);
+                this.uriOrigin +
+                expressPath);
             // return `${TaonHelpers.string(method.toUpperCase() + ':')
-            // .fillUpTo(10)}${context.uri.href.replace(/\/$/, '')}${routePath}`
+            // .fillUpTo(10)}${context.uriHref.replace(/\/$/, '')}${expressPath}`
         });
         const routes = [
-            ...['', `#  ROUTES FOR HOST ${this.uri.href} `],
+            ...['', `#  ROUTES FOR HOST ${this.uriOrigin} `],
             ...troutes,
         ].join('\n');
         const fileName = (0, lib_9.crossPlatformPath)([
@@ -1457,7 +1506,7 @@ class EndpointContext {
                 next();
             };
         //#endregion
-        const url = this.uri;
+        // const url = this.uri;
         //#region get result
         const getResult = async (resolvedParams, req, res) => {
             const response = methodConfig.descriptor.value.apply(
@@ -1473,22 +1522,19 @@ class EndpointContext {
             return result;
         };
         //#endregion
-        url.pathname = url.pathname.replace(/\/$/, '');
-        expressPath = url.pathname.startsWith('/')
-            ? `${url.pathname}${expressPath}`
-            : expressPath;
-        expressPath = expressPath.replace(/\/\//g, '/');
-        // console.log(`BACKEND: expressPath: ${ expressPath } `)
+        // console.log(`BACKEND: expressPath: "${expressPath}" `);
         //#endregion
         if (lib_10.Helpers.isElectron) {
             //#region @backend
             const ipcKeyName = taon_helpers_1.TaonHelpers.ipcKeyNameRequest(target, methodConfig, expressPath);
             electron_1.ipcMain.on(ipcKeyName, async (event, paramsFromBrowser) => {
                 const responseJsonData = await getResult(paramsFromBrowser, void 0, void 0);
-                event.sender.send(taon_helpers_1.TaonHelpers.ipcKeyNameResponse(target, methodConfig, expressPath), responseJsonData);
+                const sendToIpsMainOn = taon_helpers_1.TaonHelpers.ipcKeyNameResponse(target, methodConfig, expressPath);
+                // console.log({ sendToIpsMainOn });
+                event.sender.send(sendToIpsMainOn, responseJsonData);
             });
             return {
-                routePath: expressPath,
+                expressPath,
                 method: methodConfig.type,
             };
             //#endregion
@@ -1679,7 +1725,7 @@ class EndpointContext {
             //#endregion
         }
         return {
-            routePath: expressPath,
+            expressPath: expressPath,
             method: methodConfig.type,
         };
     }
@@ -1906,37 +1952,37 @@ class EndpointContext {
             //#region resolve frontend parameters
             if (!storage[symbols_1.Symbols.old.ENDPOINT_META_CONFIG])
                 storage[symbols_1.Symbols.old.ENDPOINT_META_CONFIG] = {};
-            if (!storage[symbols_1.Symbols.old.ENDPOINT_META_CONFIG][ctx.uri.href])
-                storage[symbols_1.Symbols.old.ENDPOINT_META_CONFIG][ctx.uri.href] = {};
+            if (!storage[symbols_1.Symbols.old.ENDPOINT_META_CONFIG][ctx.uriOrigin])
+                storage[symbols_1.Symbols.old.ENDPOINT_META_CONFIG][ctx.uriOrigin] = {};
             const endpoints = storage[symbols_1.Symbols.old.ENDPOINT_META_CONFIG];
             let rest;
-            if (!endpoints[ctx.uri.href][expressPath]) {
+            if (!endpoints[ctx.uriOrigin][expressPath]) {
                 let headers = {};
                 if (methodConfig.contentType && !methodConfig.responseType) {
-                    rest = lib_3.Resource.create(ctx.uri.href, expressPath, symbols_1.Symbols.old.MAPPING_CONFIG_HEADER, symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY, lib_3.RestHeaders.from({
+                    rest = lib_3.Resource.create(ctx.uriOrigin, expressPath, symbols_1.Symbols.old.MAPPING_CONFIG_HEADER, symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY, lib_3.RestHeaders.from({
                         'Content-Type': methodConfig.contentType,
                         Accept: methodConfig.contentType,
                     }));
                 }
                 else if (methodConfig.contentType && methodConfig.responseType) {
-                    rest = lib_3.Resource.create(ctx.uri.href, expressPath, symbols_1.Symbols.old.MAPPING_CONFIG_HEADER, symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY, lib_3.RestHeaders.from({
+                    rest = lib_3.Resource.create(ctx.uriOrigin, expressPath, symbols_1.Symbols.old.MAPPING_CONFIG_HEADER, symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY, lib_3.RestHeaders.from({
                         'Content-Type': methodConfig.contentType,
                         Accept: methodConfig.contentType,
                         responsetypeaxios: methodConfig.responseType,
                     }));
                 }
                 else if (!methodConfig.contentType && methodConfig.responseType) {
-                    rest = lib_3.Resource.create(ctx.uri.href, expressPath, symbols_1.Symbols.old.MAPPING_CONFIG_HEADER, symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY, lib_3.RestHeaders.from({
+                    rest = lib_3.Resource.create(ctx.uriOrigin, expressPath, symbols_1.Symbols.old.MAPPING_CONFIG_HEADER, symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY, lib_3.RestHeaders.from({
                         responsetypeaxios: methodConfig.responseType,
                     }));
                 }
                 else {
-                    rest = lib_3.Resource.create(ctx.uri.href, expressPath, symbols_1.Symbols.old.MAPPING_CONFIG_HEADER, symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY);
+                    rest = lib_3.Resource.create(ctx.uriOrigin, expressPath, symbols_1.Symbols.old.MAPPING_CONFIG_HEADER, symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY);
                 }
-                endpoints[ctx.uri.href][expressPath] = rest;
+                endpoints[ctx.uriOrigin][expressPath] = rest;
             }
             else {
-                rest = endpoints[ctx.uri.href][expressPath];
+                rest = endpoints[ctx.uriOrigin][expressPath];
             }
             const method = type.toLowerCase();
             const isWithBody = method === 'put' || method === 'post';