@futdevpro/nts-dynamo 1.9.21 → 1.9.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@futdevpro/nts-dynamo",
-  "version": "01.09.21",
+  "version": "01.09.24",
   "description": "Dynamic NodeTS (NodeJS-Typescript), MongoDB Backend System Framework by Future Development Program Ltd.",
   "scripts": {
     "prep": "npm i rimraf nodemon -g",
@@ -31,7 +31,7 @@
       "types": "./build/index.d.ts",
       "typings": "./build/index.d.ts"
     },
-    "./custom-data-module": {
+    "./custom-data": {
       "default": "./build/_modules/custom-data/index.js",
       "module": "./build/_modules/custom-data/index.js",
       "types": "./build/_modules/custom-data/index.d.ts",
@@ -43,104 +43,41 @@
       "types": "./build/_mock/index.d.ts",
       "typings": "./build/_mock/index.d.ts"
     },
-    "./test-module": {
+    "./socket": {
+      "default": "./build/_modules/socket/index.js",
+      "module": "./build/_modules/socket/index.js",
+      "types": "./build/_modules/socket/index.d.ts",
+      "typings": "./build/_modules/socket/index.d.ts"
+    },
+    "./test": {
       "default": "./build/_modules/test/index.js",
       "module": "./build/_modules/test/index.js",
       "types": "./build/_modules/test/index.d.ts",
       "typings": "./build/_modules/test/index.d.ts"
     },
-    "./usage-module": {
+    "./usage": {
       "default": "./build/_modules/usage/index.js",
       "module": "./build/_modules/usage/index.js",
       "types": "./build/_modules/usage/index.d.ts",
       "typings": "./build/_modules/usage/index.d.ts"
-    },
-    "./api-service": {
-      "default": "./build/_modules/api-service.index.js",
-      "module": "./build/_modules/api-service.index.js",
-      "types": "./build/_modules/api-service.index.d.ts",
-      "typings": "./build/_modules/api-service.index.d.ts"
-    },
-    "./app": {
-      "default": "./build/_modules/app.index.js",
-      "module": "./build/_modules/app.index.js",
-      "types": "./build/_modules/app.index.d.ts",
-      "typings": "./build/_modules/app.index.d.ts"
-    },
-    "./app-extended": {
-      "default": "./build/_modules/app-extended.index.js",
-      "module": "./build/_modules/app-extended.index.js",
-      "types": "./build/_modules/app-extended.index.d.ts",
-      "typings": "./build/_modules/app-extended.index.d.ts"
-    },
-    "./auth": {
-      "default": "./build/_modules/auth.index.js",
-      "module": "./build/_modules/auth.index.js",
-      "types": "./build/_modules/auth.index.d.ts",
-      "typings": "./build/_modules/auth.index.d.ts"
-    },
-    "./controller": {
-      "default": "./build/_modules/controller.index.js",
-      "module": "./build/_modules/controller.index.js",
-      "types": "./build/_modules/controller.index.d.ts",
-      "typings": "./build/_modules/controller.index.d.ts"
-    },
-    "./data-service": {
-      "default": "./build/_modules/data-service.index.js",
-      "module": "./build/_modules/data-service.index.js",
-      "types": "./build/_modules/data-service.index.d.ts",
-      "typings": "./build/_modules/data-service.index.d.ts"
-    },
-    "./email": {
-      "default": "./build/_modules/email.index.js",
-      "module": "./build/_modules/email.index.js",
-      "types": "./build/_modules/email.index.d.ts",
-      "typings": "./build/_modules/email.index.d.ts"
-    },
-    "./extended": {
-      "default": "./build/_modules/extended.index.js",
-      "module": "./build/_modules/extended.index.js",
-      "types": "./build/_modules/extended.index.d.ts",
-      "typings": "./build/_modules/extended.index.d.ts"
     }
   },
   "typesVersions": {
     "*": {
-      "custom-data-module": [
+      "custom-data": [
         "build/_modules/custom-data/index.d.ts"
       ],
       "mock": [
         "build/_modules/mock/index.d.ts"
       ],
-      "test-module": [
+      "socket": [
+        "build/_modules/socket/index.d.ts"
+      ],
+      "test": [
         "build/_modules/test/index.d.ts"
       ],
-      "usage-module": [
+      "usage": [
         "build/_modules/usage/index.d.ts"
-      ],
-      "app": [
-        "build/_modules/app.index.d.ts"
-      ],
-      "app-extended": [
-        "build/_modules/app-extended.index.d.ts"
-      ],
-      "auth": [
-        "build/_modules/auth.index.d.ts"
-      ],
-      "api-service": [
-        "build/_modules/api-service.index.d.ts"
-      ],
-      "controller": [
-        "build/_modules/controller.index.d.ts"
-      ],
-      "data-service": [
-        "build/_modules/data-service.index.d.ts"
-      ],
-      "email": [
-        "build/_modules/email.index.d.ts"
-      ],
-      "extended": [
-        "build/_modules/extended.index.d.ts"
       ]
     }
   },
@@ -163,10 +100,12 @@
   },
   "homepage": "https:/futdevpro.hu/projects/dynamo",
   "DISABLED": {
-    "emty": ""
+    "@futdevpro/fsm-dynamo": "file:../tgz-collection/dynamo-fsm/futdevpro-fsm-dynamo-01.09.21.tgz",
+    "empty": ""
   },
   "peerDependencies": {
-    "@futdevpro/fsm-dynamo": "~1.9.18",
+    "@futdevpro/fsm-dynamo": "~1.9.21",
+
     "@types/express": "~4.17.17",
     "@types/geoip-lite": "~1.4.1",
     "@types/node": "~20.5.7",
@@ -191,7 +130,6 @@
     "eslint-plugin-unused-imports": "~3.0.0",
     "jasmine": "~5.0.2",
     "jasmine-ts": "~0.4.0",
-    "nodemon": "~3.0.1",
     "socket.io": "~4.5.2",
     "socket.io-client": "~4.7.4",
     "tslib": "~2.6.2",

package/src/_collections/global-settings.const.ts

@@ -1,27 +1,33 @@
 
 import { DyNTS_RouteSecurity } from '../_enums/route-security.enum';
-import { DyNTS_SocketSecurity } from '../_enums/socket-security.enum';
+import { DyNTS_SocketSecurity } from '../_modules/socket/_enums/socket-security.enum';
 import { DyNTS_Global_Settings } from '../_models/interfaces/global-settings.interface';
 
-export const DyNTS_globalSettings: DyNTS_Global_Settings = {
+export const DyNTS_global_settings: DyNTS_Global_Settings = {
   baseUrl: '/api',
   defaultRouteSecurity: DyNTS_RouteSecurity.open,
   defaultSocketSecurity: DyNTS_SocketSecurity.open,
 
-  logSetup: false,
+  log_settings: {
+    highDetailedLogs: false,
+    
+    setup: false,
+  
+    request: true,
+    requestsContent: false,
+    responseContent: false,
+  
+    socket_allEvents: true,
+    socket_mainEvents: true,
+    socket_eventContent: false,
+  
+    api_events: true,
+    api_requestContents: false,
+    api_requestSettings: false,
+    api_responseContents: false,
+  
+    detailedErrors: false,
 
-  logRequest: true,
-  logRequestsContent: false,
-  logResponseContent: false,
-
-  logAllSocketEvent: true,
-  logMainSocketEvents: true,
-  logSocketEventContent: false,
-
-  logApiEvents: true,
-  logApiRequestContents: false,
-  logApiRequestSettings: false,
-  logApiResponseContents: false,
-
-  logDetailedErrors: false,
+    server_debug: false,
+  },
 };

package/src/_models/control-models/endpoint-params.control-model.ts

@@ -2,10 +2,10 @@
 
 import { Request, Response } from 'express';
 
-import { DyFM_Array, DyFM_Error, DyFM_Log } from '@futdevpro/fsm-dynamo';
+import { DyFM_Array, DyFM_Error, DyFM_errorFlag, DyFM_Log } from '@futdevpro/fsm-dynamo';
 import { DyNTS_RouteSecurity } from '../../_enums/route-security.enum';
 import { DyNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
-import { DyNTS_globalSettings } from '../../_collections/global-settings.const';
+import { DyNTS_global_settings } from '../../_collections/global-settings.const';
 import { DyNTS_GlobalService } from '../../_services/core/global.service';
 
 /**
@@ -66,30 +66,38 @@ export class DyNTS_Endpoint_Params {
       tasks: ((req: Request, res: Response, issuer?: string) => Promise<void>)[],
 
       /**
-       * this flag will enable the debug logs on this endpoint
+       * log settings for request and response
        */
       logRequest?: boolean,
       /**
-       * this flag will enable the debug logs on this endpoint's requests
+       * log settings for request params
        */
       logRequestsParams?: boolean,
       /**
-       * this flag will enable the debug logs on this endpoint's requests
+       * log settings for request content
        */
       logRequestsContent?: boolean,
       /**
-       * this flag will enable detailed debug logs on this endpoint's requests
+       * log settings for response content
        */
       logResponseContent?: boolean,
     }
   ) {
     try {
       this.name = set.name ?? set.endpoint;
-      this.security = set.security ?? DyNTS_globalSettings.defaultRouteSecurity;
+      this.security = set.security ?? DyNTS_global_settings.defaultRouteSecurity;
 
       this.type = set.type;
       this.endpoint = set.endpoint;
 
+      this.logRequest = set.logRequest ?? DyNTS_global_settings.log_settings.request;
+      this.logRequestsParams = 
+        set.logRequestsParams ?? DyNTS_global_settings.log_settings.requestsParams;
+      this.logRequestsContent = 
+        set.logRequestsContent ?? DyNTS_global_settings.log_settings.requestsContent;
+      this.logResponseContent = 
+        set.logResponseContent ?? DyNTS_global_settings.log_settings.responseContent;
+
       if (!this.endpoint) {
         throw new DyFM_Error({
           status: 406, 
@@ -105,19 +113,12 @@ export class DyNTS_Endpoint_Params {
 
       let pathParts: string[] = this.endpoint.split('/');
 
-      pathParts = pathParts.filter((part: string): boolean => part[0] === ':');
+      pathParts = pathParts.filter((part: string): boolean => part.startsWith(':'));
       pathParts = pathParts.map((part: string): string => part.replace(':', ''));
       this.pathParams = pathParts;
 
       this.preProcesses = set.preProcesses ?? [];
       this.tasks = set.tasks ?? [];
-
-      this.logRequest = set.logRequest ?? DyNTS_globalSettings.logRequest;
-      this.logRequestsParams = set.logRequestsParams ?? DyNTS_globalSettings.logRequestsParams;
-      this.logRequestsContent = 
-        set.logRequestsContent ?? DyNTS_globalSettings.logRequestsContent;
-      this.logResponseContent = 
-        set.logResponseContent ?? DyNTS_globalSettings.logResponseContent;
     } catch (error) {
       DyFM_Log.error(
         `\nEndpoint params setup failed: name: '${set.name}' ` +
@@ -145,7 +146,11 @@ export class DyNTS_Endpoint_Params {
           msg += `\npathParams: ${params}`;
         }
 
-        if (this.logRequestsContent && req.body && 0 < Object.keys(req.body).length) {
+        if (
+          this.logRequestsContent && 
+          req.body && 
+          0 < Object.keys(req.body).length
+        ) {
           DyFM_Log.info(msg + `\nbody:`, req.body);
         } else {
           DyFM_Log.info(msg);
@@ -217,19 +222,27 @@ export class DyNTS_Endpoint_Params {
       msg += this.getPathParamsLogContent(req);
 
       DyFM_Log.error(msg);
-      DyFM_Log.error(
-        'ERROR:',
-        (error as DyFM_Error)?.flag?.includes('DYNAMO') ? 
-          (error as DyFM_Error).getErrorSimplified() : 
-          error, 
-        '\n'
-      );
+
+      if (
+        DyNTS_global_settings.log_settings.highDetailedLogs ||
+        !(error as DyFM_Error)?.flag?.includes('DYNAMO')
+      ) {
+        DyFM_Log.H_error('ERROR:', error);
+      } else {
+        DyFM_Log.H_error(
+          `ErrorMessage: ${(error as DyFM_Error)._message}`,
+          `\nErrorCode: ${(error as DyFM_Error)._errorCode}`,
+          `\nUserMessage: ${(error as DyFM_Error).__userMessage}`,
+          `\nStack: ${(error as DyFM_Error).error.stack}`
+        );
+      }
 
       if ((error as DyFM_Error)?.flag?.includes('DYNAMO')) {
         if (!(error as DyFM_Error).additionalContent) {
           (error as DyFM_Error).additionalContent = {};
         }
         (error as DyFM_Error).additionalContent.endpointInfo = msg;
+
         DyFM_Log.error(`ErrorMessage: ${(error as DyFM_Error)._message}`);
         DyFM_Log.error(`ErrorCode: ${(error as DyFM_Error)._errorCode}`);
         DyFM_Log.error(`UserMessage: ${(error as DyFM_Error).__userMessage}`);
@@ -276,19 +289,33 @@ export class DyNTS_Endpoint_Params {
       DyFM_Log.error('');
           
     } catch (error) {
-      DyFM_Log.H_error(
-        `\n\nDYNAMO MULTILEVEL ERROR:DyNTS_EndpointParams: error: ` +
-          `(${this.name}, ${this.endpoint})` +
-        `\n(DYNAMO MULTILEVEL ERROR means, that the ERROR HANDLING is ALSO FAILED, ` +
-          `and the error message was not sent.)` + 
-        `\nERROR:`, error, 
-        '\n'
-      );
+      if (DyNTS_global_settings.log_settings.highDetailedLogs) {
+        DyFM_Log.H_error(
+          `\n\nDYNAMO MULTILEVEL ERROR:DyNTS_EndpointParams: error: ` +
+            `(${this.name}, ${this.endpoint})` +
+          `\n(DYNAMO MULTILEVEL ERROR means, that the ERROR HANDLING is ALSO FAILED, ` +
+            `and the error message was not sent.)` + 
+          `\nERROR:`, error, 
+          '\n'
+        );
+      } else {
+        DyFM_Log.H_error(
+          `\n\nDYNAMO MULTILEVEL ERROR:DyNTS_EndpointParams: error: ` +
+            `(${this.name}, ${this.endpoint})` +
+          `\n(DYNAMO MULTILEVEL ERROR means, that the ERROR HANDLING is ALSO FAILED, ` +
+            `and the error message was not sent.)`
+        );
+      }
 
-      if (error?.flag?.includes?.('DYNAMO-ERROR-OBJECT')) {
-        DyFM_Log.error(`ErrorMessage: ${(error as DyFM_Error)._message}`);
-        DyFM_Log.error(`ErrorCode: ${(error as DyFM_Error)._errorCode}`);
-        DyFM_Log.error(`UserMessage: ${(error as DyFM_Error).__userMessage}`);
+      if (error?.flag?.includes?.(DyFM_errorFlag)) {
+        DyFM_Log.error(
+          `ErrorMessage: ${(error as DyFM_Error)._message}`,
+          `\nErrorCode: ${(error as DyFM_Error)._errorCode}`,
+          `\nUserMessage: ${(error as DyFM_Error).__userMessage}`,
+          `\nStack: ${(error as DyFM_Error).error.stack}`
+        );
+      } else {
+        DyFM_Log.error('ERROR:', error);
       }
     }
   }

package/src/_models/interfaces/global-log-settings.interface.ts

@@ -0,0 +1,81 @@
+
+export interface DyNTS_GlobalLog_Settings {
+  /**
+   * this setting will set which logs will be shown
+   */
+  highDetailedLogs?: boolean;
+
+  deep?: boolean;
+
+  /**
+   * this setting will enable debug logs for setting up the application
+   */
+  setup?: boolean;
+
+  /**
+   * this is an application wide default setting for route debug logs
+   */
+  request?: boolean;
+
+  /**
+   * this is an application wide default setting for route debug logs
+   */
+  requestsParams?: boolean;
+
+  /**
+   * this is an application wide default setting for route debug logs
+   */
+  requestsContent?: boolean;
+
+  /**
+   * this is an application wide default setting for route debug logs
+   */
+  responseContent?: boolean;
+  
+
+  /**
+   * this is an application wide default setting for socket debug logs
+   */
+  socket_allEvents?: boolean;
+
+  /**
+   * this is an application wide default setting for socket debug logs
+   */
+  socket_mainEvents?: boolean;
+
+  /**
+   * this is an application wide default setting for socket debug logs
+   */
+  socket_eventContent?: boolean;
+
+
+  /**
+   * this is an application wide default setting for api debug logs
+   */
+  api_events?: boolean;
+
+  /**
+   * this is an application wide default setting for api debug logs
+   */
+  api_requestContents?: boolean;
+
+  /**
+   * this is an application wide default setting for api debug logs
+   */
+  api_requestSettings?: boolean;
+
+  /**
+   * this is an application wide default setting for api debug logs
+   */
+  api_responseContents?: boolean;
+
+
+  /**
+   * this is an application wide default setting for detailed error logs
+   */
+  detailedErrors?: boolean;
+
+  server_debug?: boolean;
+
+  functions?: boolean;
+}

package/src/_models/interfaces/global-settings.interface.ts

@@ -1,5 +1,6 @@
 import { DyNTS_RouteSecurity } from '../../_enums/route-security.enum';
-import { DyNTS_SocketSecurity } from '../../_enums/socket-security.enum';
+import { DyNTS_SocketSecurity } from '../../_modules/socket/_enums/socket-security.enum';
+import { DyNTS_GlobalLog_Settings } from './global-log-settings.interface';
 
 /**
  * 
@@ -25,59 +26,7 @@ export interface DyNTS_Global_Settings {
   defaultSocketSecurity: DyNTS_SocketSecurity;
 
   /**
-   * this setting will enable debug logs for setting up the application
+   * this setting will set which logs will be shown
    */
-  logSetup?: boolean;
-
-  /**
-   * this is an application wide default setting for route debug logs
-   */
-  logRequest?: boolean;
-  /**
-   * this is an application wide default setting for route debug logs
-   */
-  logRequestsParams?: boolean;
-  /**
-   * this is an application wide default setting for route debug logs
-   */
-  logRequestsContent?: boolean;
-  /**
-   * this is an application wide default setting for route debug logs
-   */
-  logResponseContent?: boolean;
-
-  /**
-   * this is an application wide default setting for socket debug logs
-   */
-  logAllSocketEvent?: boolean;
-  /**
-   * this is an application wide default setting for socket debug logs
-   */
-  logMainSocketEvents?: boolean;
-  /**
-   * this is an application wide default setting for socket debug logs
-   */
-  logSocketEventContent?: boolean;
-
-  /**
-   * this is an application wide default setting for api debug logs
-   */
-  logApiEvents?: boolean;
-  /**
-   * this is an application wide default setting for api debug logs
-   */
-  logApiRequestContents?: boolean;
-  /**
-   * this is an application wide default setting for api debug logs
-   */
-  logApiRequestSettings?: boolean;
-  /**
-   * this is an application wide default setting for api debug logs
-   */
-  logApiResponseContents?: boolean;
-
-  /**
-   * this is an application wide default setting for detailed error logs
-   */
-  logDetailedErrors?: boolean;
+  log_settings: DyNTS_GlobalLog_Settings;
 }

package/src/_modules/custom-data/custom-data.controller.ts

@@ -1,7 +1,7 @@
 
 import { Request, Response } from 'express';
 
-import { DyFM_customDataModule_settings } from '@futdevpro/fsm-dynamo';
+import { DyFM_customDataModule_settings } from '@futdevpro/fsm-dynamo/custom-data';
 
 import { DyNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
 import { DyNTS_Controller } from '../../_services/route/controller.service';

package/src/_modules/custom-data/custom-data.data-service.ts

@@ -3,7 +3,7 @@
 
 import { 
   DyFM_customDataModel_params, DyFM_CustomData 
-} from '@futdevpro/fsm-dynamo/custom-data-module';
+} from '@futdevpro/fsm-dynamo/custom-data';
 import { DyNTS_DataService } from '../../_services/base/data.service';
 
 export class DyFM_CustomData_DataService extends DyNTS_DataService<DyFM_CustomData> {

package/src/_modules/custom-data/get-custom-data-routing-module.util.ts

@@ -1,5 +1,6 @@
 
-import { DyFM_customDataModule_settings } from '@futdevpro/fsm-dynamo';
+import { DyFM_customDataModule_settings } from '@futdevpro/fsm-dynamo/custom-data';
+
 import { DyNTS_RouteSecurity } from '../../_enums/route-security.enum';
 import { 
   DyNTS_RoutingModule_Settings 

package/src/_modules/custom-data/index.ts

@@ -3,4 +3,4 @@
 export * from './custom-data.data-service';
 export * from './get-custom-data-routing-module.util';
 export * from './custom-data.controller';
-export * from '@futdevpro/fsm-dynamo/custom-data-module';
+export * from '@futdevpro/fsm-dynamo/custom-data';

package/src/_modules/mock/app-extended-server.mock.ts

@@ -1,8 +1,8 @@
 
 
 import { DyFM_error_defaults } from '@futdevpro/fsm-dynamo';
-import { DyFM_usageSessionModel_params } from '@futdevpro/fsm-dynamo/usage-module';
-import { DyFM_customDataModel_params } from '@futdevpro/fsm-dynamo/custom-data-module';
+import { DyFM_usageSessionModel_params } from '@futdevpro/fsm-dynamo/usage';
+import { DyFM_customDataModel_params } from '@futdevpro/fsm-dynamo/custom-data';
 
 import { DyNTS_App_Params } from '../../_models/control-models/app-params.control-model';
 import { 
@@ -18,11 +18,11 @@ import { dependency_mock_DataParams, dependent_mock_DataParams } from './data-mo
 import { EmailServiceCollection_Mock } from './email-service-collection.mock';
 import { DyNTS_getCustomDataRoutingModule } from '../custom-data';
 import { DyNTS_SingletonService } from '../../_services/base/singleton.service';
-import { DyNTS_AppExtended } from '../../_services/server/app-extended.server';
-import { DyNTS_SocketServerService } from '../../_services/socket/socket-server.service';
+import { DyNTS_AppExtended } from '../socket/_services/app-extended.server';
+import { DyNTS_SocketServerService } from '../socket/_services/socket-server.service';
 import { DyNTS_SocketServer_Mock } from './socket-server.mock';
 import { SocketClient_Mock } from './socket-client.mock';
-import { DyNTS_globalSettings } from '../../_collections/global-settings.const';
+import { DyNTS_global_settings } from '../../_collections/global-settings.const';
 
 /**
  * 
@@ -144,7 +144,7 @@ export class DyNTS_AppWbMock_Mock extends DyNTS_AppExtended {
   }
     
   override overrideDynamoNTSGlobalSettings(): void {
-    DyNTS_globalSettings.logRequestsContent = true;
+    DyNTS_global_settings.log_settings.requestsContent = true;
     DyFM_error_defaults.issuerSystem = '-test-wb-mock-';
   }
 

package/src/_modules/mock/app-server.mock.ts

@@ -1,7 +1,7 @@
 
 
-import { DyFM_usageSessionModel_params } from '@futdevpro/fsm-dynamo/usage-module';
-import { DyFM_customDataModel_params } from '@futdevpro/fsm-dynamo/custom-data-module';
+import { DyFM_usageSessionModel_params } from '@futdevpro/fsm-dynamo/usage';
+import { DyFM_customDataModel_params } from '@futdevpro/fsm-dynamo/custom-data';
 
 import { DyNTS_App_Params } from '../../_models/control-models/app-params.control-model';
 import { 

package/src/_modules/mock/socket-client.mock.ts

@@ -1,8 +1,10 @@
 
 import { DyNTS_SocketEventKey } from '../../_enums/http/socket-event-type.enum';
-import { DyNTS_SocketClientService_Params } from '../../_models/control-models/socket-client-service-params.control-model';
-import { DyNTS_SocketEvent } from '../../_models/control-models/socket-event.control-model';
-import { DyNTS_SocketClientService } from '../../_services/socket/socket-client.service';
+import { 
+  DyNTS_SocketClientService_Params 
+} from '../socket/_models/socket-client-service-params.control-model';
+import { DyNTS_SocketEvent } from '../socket/_models/socket-event.control-model';
+import { DyNTS_SocketClientService } from '../socket/_services/socket-client.service';
 
 export class SocketClient_Mock extends DyNTS_SocketClientService {
 

package/src/_modules/mock/socket-server.mock.ts

@@ -1,12 +1,12 @@
 import { Socket } from 'socket.io';
-import { DyNTS_SocketEvent } from '../../_models/control-models/socket-event.control-model';
+import { DyNTS_SocketEvent } from '../socket/_models/socket-event.control-model';
 import { 
   DyNTS_SocketPresence 
-} from '../../_models/control-models/socket-presence.control-model';
+} from '../socket/_models/socket-presence.control-model';
 import { 
   DyNTS_SocketServerService_Params 
-} from '../../_models/control-models/socket-server-service-params.control-model';
-import { DyNTS_SocketServerService } from '../../_services/socket/socket-server.service';
+} from '../socket/_models/socket-server-service-params.control-model';
+import { DyNTS_SocketServerService } from '../socket/_services/socket-server.service';