@futdevpro/nts-dynamo 1.10.6 → 1.10.8

package/src/_models/control-models/api-call-params.control-model.ts

@@ -1,5 +1,7 @@
 
 import { DyFM_HttpCallType, DyFM_HttpResponseType, DyFM_Log, } from '@futdevpro/fsm-dynamo';
+import { DyNTS_global_settings } from '../../_collections/global-settings.const';
+import { DyNTS_getStackLocation } from '../../_collections/stack.util';
 
 /**
  * API call params,
@@ -16,7 +18,7 @@ export class DyNTS_ApiCall_Params {
   /**
    * type of the call as; HttpCallType .get, .post, ...ect
    */
-  type: DyFM_HttpCallType;
+  type: DyFM_HttpCallType = DyFM_HttpCallType.get;
   /**
    * the endpoint of the API, without the baseUrl:
    * '/user/get/:userId',
@@ -27,65 +29,64 @@ export class DyNTS_ApiCall_Params {
    * baseUrl of the API;
    * 'https://futdevpro.hu/api'
    */
-  endPoint: string;
+  endpoint: string;
 
   /**
    * if this value is true, the call will return the full HTTP call response in raw
    */
-  getFullResponse: boolean;
+  getFullResponse: boolean = false;
   /**
    * this setting will be passed to the axios http call
    */
-  httpOptions: any;
+  httpOptions: any = {};
+
+  pathParamKeys: string[] = [];
+  
+  readonly stack: string;
 
   constructor(
     /**
      * set of options necessary for setting up an API call
      */
-    set: {
-      /**
-       * name the call to be able to identify it when debugging
-       */
-      name: string,
-      /**
-       * set type as; HttpCallType .get, .post, ...ect
-       */
-      type: DyFM_HttpCallType,
-      /**
-       * the endpoint of the API, without the baseUrl:
-       * '/user/get/:userId',
-       * where the parts starting with ':', will be used as pathParam
-       */
-      endPoint: string,
-      /**
-       * baseUrl of the API;
-       * 'https://futdevpro.hu/api'
-       */
-      baseUrl: string,
-      /**
-       * setting this value to true, will return the full HTTP call response in raw
-       */
-      getFullResponse?: boolean,
-      /**
-       * this setting will pass any kind of http setting used by the axios http messaging package
-       */
-      httpOptions?: DyNTS_HttpOptions,
-    }
+    set: Partial<DyNTS_ApiCall_Params>
   ) {
-    this.name = set.name;
-    this.type = set.type;
-    
-    if (set.endPoint.includes('{')) {
+    this.stack = DyNTS_getStackLocation();
+
+    if (!set.name) {
       DyFM_Log.warn(
-        `using {param} bracets in endpoint definitions will be deprecated... (${set.endPoint})` +
+        'DyNTS_ApiCall_Params: name is not provided, using stack location!',
+        '\nstack:', this.stack
+      );
+      this.name = this.stack;
+    }
+
+    if (!set.baseUrl) {
+      DyFM_Log.error(
+        'DyNTS_ApiCall_Params: baseUrl is not provided, using global baseUrl!',
+        '\nstack:', this.stack
+      );
+      this.baseUrl = DyNTS_global_settings.baseUrl;
+    }
+
+    if (!set.endpoint) {
+      DyFM_Log.error(
+        'DyNTS_ApiCall_Params: endpoint is not provided, using global endPoint!',
+        '\nstack:', this.stack
+      );
+      this.endpoint = '';
+    } else if (set.endpoint.includes('{')) {
+      DyFM_Log.warn(
+        `using {param} bracets in endpoint definitions will be deprecated... (${set.endpoint})` +
         'use :param instead ({pathparam} --> :pathparam)'
       );
-      set.endPoint.replace(/{/g, ':').replace(/}/g, '');
+      set.endpoint = set.endpoint.replace(/{/g, ':').replace(/}/g, '');
+    } else {
+      this.pathParamKeys = set.endpoint.split('/')
+        .filter(part => part.startsWith(':'))
+        .map(part => part.slice(1));
     }
-    this.endPoint = set.endPoint;
-    this.baseUrl = set.baseUrl;
-    this.getFullResponse = !!set.getFullResponse;
-    this.httpOptions = set.httpOptions ? set.httpOptions : {};
+
+    Object.assign(this, set);
   }
 }
 

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

@@ -9,6 +9,7 @@ import {
 import { DyNTS_global_settings } from '../../_collections/global-settings.const';
 import { DyNTS_RouteSecurity } from '../../_enums/route-security.enum';
 import { DyNTS_GlobalService } from '../../_services/core/global.service';
+import { DyNTS_getStackLocation } from '../../_collections/stack.util';
 
 /**
  * High level endpoint for API
@@ -139,7 +140,7 @@ export class DyNTS_Endpoint_Params<
       this.preProcesses = set.preProcesses ?? [];
       this.tasks = set.tasks ?? [];
       
-      this.stack = this.getStackLocation();
+      this.stack = DyNTS_getStackLocation();
     } catch (error) {
       DyFM_Log.error(
         `\nEndpoint params setup failed: name: '${set.name}' ` +
@@ -182,16 +183,6 @@ export class DyNTS_Endpoint_Params<
     }
   }
 
-  private getStackLocation(): string {
-    let stack: string = new Error().stack;
-
-    stack = stack?.split('\n')?.[3]?.replace('    at ', '');
-    stack = stack?.replace('.setupEndpoints (', ': ');
-    stack = stack?.replace(')', '');
-
-    return stack;
-  }
-
   /**
    * 
    * @returns 
@@ -323,7 +314,13 @@ export class DyNTS_Endpoint_Params<
         }
       }
 
-      res.status((error as DyFM_Error)?.___status ?? 501);
+      const status = (error as DyFM_Error)?.___status;
+      if (status && !isNaN(status)) {
+        res.status(status);
+      } else {
+        res.status(501);
+      }
+
       res.send(error);
 
       if (this.logRequest) {
@@ -368,21 +365,31 @@ export class DyNTS_Endpoint_Params<
     }
   ): void {
     if (DyNTS_global_settings.log_settings.highDetailedLogs) {
-      DyFM_Log.H_error(
+      const msg = 
         `\n\nDYNAMO MULTILEVEL ERROR:DyNTS_Endpoint_Params: 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:`, errorLvl2, 
-        '\n'
-      );
+        `\nthisEndpointStackLocation: ${this.stack}`;
+
+      if (errorLvl2 instanceof DyFM_Error) {
+        errorLvl2.logSimple(msg);
+      } else {
+        DyFM_Log.H_error(msg, '\nERROR:', errorLvl2, '\n');
+      }
     } else {
-      DyFM_Log.H_error(
+      const msg = 
         `\n\nDYNAMO MULTILEVEL ERROR:DyNTS_Endpoint_Params: error: ` +
           `(${this.name}, ${this.endpoint})` +
+        `\nthisEndpointStackLocation: ${this.stack}` +
         `\n(DYNAMO MULTILEVEL ERROR means, that the ERROR HANDLING is ALSO FAILED, ` +
-          `and the error message was not sent.)`
-      );
+          `and the error message was not sent.)`;
+
+      if (errorLvl2 instanceof DyFM_Error) {
+        errorLvl2.logSimple(msg);
+      } else {
+        DyFM_Log.H_error(msg, '\nERROR:', errorLvl2, '\n');
+      }
     }
 
     try {

package/src/_modules/mock/data-model.mock.spec.ts

@@ -93,7 +93,6 @@ xdescribe('DyFM_DataModel_Params for Dependent_Mock', () => {
         type: 'string',
         unique: true,
         required: true,
-        isDependencyHook: true,
         dependencyDataName: dependency_mock_DataParams.dataName,
       },
       string: { type: 'string' },

package/src/_modules/mock/data-model.mock.ts

@@ -68,7 +68,6 @@ export const dependent_mock_DataParams = new DyFM_DataModel_Params<Dependent_Moc
   properties: {
     dependencyId: { type: 'string',
       unique: true, required: true,
-      isDependencyHook: true,
       dependencyDataName:  dependency_mock_DataParams.dataName,
     },
     string: { type: 'string' },

package/src/_modules/socket/_services/socket-client.service.ts

@@ -30,7 +30,7 @@ export abstract class DyNTS_SocketClient_ServiceBase extends DyNTS_SingletonServ
   protected debugLog: boolean = DyNTS_global_settings.log_settings.setup;
   protected logFn: boolean = DyNTS_global_settings.log_settings.functions;
 
-  private defaultEvents: DyFM_SocketEvent<any>[] = [
+  private readonly defaultEvents: DyFM_SocketEvent<any>[] = [
     new DyFM_SocketEvent<any>({
       eventKey: DyFM_SocketEvent_Key.connect,
       tasks: [

package/src/_modules/socket/_services/socket-server.service.ts

@@ -20,6 +20,7 @@ import {
 import {
   DyNTS_SocketServerService_Params
 } from '../_models/socket-server-service-params.control-model';
+import { DyNTS_getStackLocation } from '../../../_collections/stack.util';
 
 /**
  * You need to define the following functions:
@@ -64,9 +65,13 @@ export abstract class DyNTS_SocketServerService<
     `We encountered an unhandled Socket Server Error, ` +
     `\nplease contact the responsible development team.`;
 
+  /* readonly thisLocationStack: string; */
+
   protected constructor(){
     super();
 
+    /* this.thisLocationStack = DyNTS_getStackLocation(); */
+
     this.asyncConstructor().catch((error: any) => {
       DyFM_Log.error(
         `Socket Server Service setup failed: "${this.params?.name}" (${this.params?.port})`, 
@@ -308,19 +313,27 @@ export abstract class DyNTS_SocketServerService<
                     `<-==>  socket(${this.params.name}) subscription successful (${issuer})`
                   );
                 } catch (error) {
-                  if (DyNTS_global_settings.log_settings.socket_eventContent) {
+                  if (error instanceof DyFM_Error) {
+                    error.logSimple(
+                      `Socket Subscription failed: "${this.params.name}" ` +
+                      `(${this.params.port}) will disconnect now...`
+                    )
+                  } else if (DyNTS_global_settings.log_settings.socket_eventContent) {
                     DyFM_Log.error(
-                      `Socket Subscription failed: "${this.params.name}" ` ,
+                      `Socket Subscription failed: "${this.params.name}" ` +
                       `(${this.params.port}) will disconnect now...`, 
+                      /* `${this.thisLocationStack}`, */
                       error
                     );
                   } else {
                     DyFM_Log.error(
                       `Socket Subscription failed: "${this.params.name}" ` ,
-                      `(${this.params.port}) will disconnect now...`
+                      `(${this.params.port}) will disconnect now...`,
+                      /* `${this.thisLocationStack}` */
                     );
                   }
                   socket.emit(DyFM_SocketEvent_Key.error, error);
+                  socket.emit(DyFM_SocketEvent_Key.disconnect);
                   socket.disconnect();
                 }
               }
@@ -367,7 +380,12 @@ export abstract class DyNTS_SocketServerService<
                     `< x >  socket(${this.params.name}) unsubscribe successful (${issuer})`
                   );
                 } catch (error) {
-                  if (DyNTS_global_settings.log_settings.socket_eventContent) {
+                  if (error instanceof DyFM_Error) {
+                    error.logSimple(
+                      `Socket Unsubscription failed: "${this.params.name}" ` +
+                      `(${this.params.port}) will disconnect now...`
+                    )
+                  } else if (DyNTS_global_settings.log_settings.socket_eventContent) {
                     DyFM_Log.error(
                       `Socket unsubscribe failed: "${this.params.name}" ` ,
                       `(${this.params.port}) will disconnect now...`, 
@@ -392,10 +410,16 @@ export abstract class DyNTS_SocketServerService<
                 try {
                   await event.executeEventTasks(content, issuer);
                 } catch (error) {
-                  DyFM_Log.error(
-                    `Socket Event failed: "${this.params.name}" (${this.params.port})`, 
-                    error
-                  );
+                  if (error instanceof DyFM_Error) {
+                    error.logSimple(
+                      `Socket Event failed: "${this.params.name}" (${this.params.port})`
+                    )
+                  } else {
+                    DyFM_Log.error(
+                      `Socket Event failed: "${this.params.name}" (${this.params.port})`, 
+                      error
+                    );
+                  }
                   socket.emit(DyFM_SocketEvent_Key.error, error);
                 }
               }
@@ -406,11 +430,18 @@ export abstract class DyNTS_SocketServerService<
             DyFM_Log.success(`<   >  socket(${this.params.name}): new CONNECTION established`);
           }
         } catch (error) {
-          DyFM_Log.error(
-            `Socket Connection failed: "${this.params.name}" ` +
-            `(${this.params.port}) will disconnect now...`, 
-            error
-          );
+          if (error instanceof DyFM_Error) {
+            error.logSimple(
+              `Socket Connection failed: "${this.params.name}" ` +
+              `(${this.params.port}) will disconnect now...`
+            )
+          } else {
+            DyFM_Log.error(
+              `Socket Connection failed: "${this.params.name}" ` +
+              `(${this.params.port}) will disconnect now...`, 
+              error
+            );
+          }
           socket.emit(DyFM_SocketEvent_Key.error, error);
           socket.disconnect();
         }
@@ -435,11 +466,18 @@ export abstract class DyNTS_SocketServerService<
         return this.secureSocketServer;
       }
     } catch (error) {
-      DyFM_Log.error(
-        `Socket Server Service - Deep Setup failed: "${this.params?.name}" ` +
-        `(${this.params?.port})`, 
-        error
-      );
+      if (error instanceof DyFM_Error) {
+        error.logSimple(
+          `Socket Server Service - Deep Setup failed: "${this.params?.name}" ` +
+          `(${this.params?.port})`
+        )
+      } else {
+        DyFM_Log.error(
+          `Socket Server Service - Deep Setup failed: "${this.params?.name}" ` +
+          `(${this.params?.port})`, 
+          error
+        );
+      }
 
       throw error;
     }
@@ -457,14 +495,20 @@ export abstract class DyNTS_SocketServerService<
         this.presences.push(newPresence);
       }
     } catch (error) {
-      if (DyNTS_global_settings.log_settings.socket_eventContent) {
+      if (error instanceof DyFM_Error) {
+        error.logSimple(
+          `Socket Subscription failed: "${this.params?.name}" (${this.params?.port})`
+        )
+      } else if (DyNTS_global_settings.log_settings.socket_eventContent) {
         DyFM_Log.error(
-          `Socket Subscription failed: "${this.params?.name}" (${this.params?.port})`, 
+          `Socket Subscription failed: "${this.params?.name}" (${this.params?.port})`,
+          /* `${this.thisLocationStack}`, */
           error
         );
       } else {
         DyFM_Log.error(
-          `Socket Subscription failed: "${this.params?.name}" (${this.params?.port})`
+          `Socket Subscription failed: "${this.params?.name}" (${this.params?.port})`,
+          /* `${this.thisLocationStack}` */
         );
       }
 

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

@@ -486,6 +486,13 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
         async (service: DyNTS_SocketServerService<any>): Promise<void> => {
           try {
             this.systemControlsExt.httpSocketServer.init = true;
+            
+            if (!service.port) {
+              throw new Error(
+                `PORT NOT SET: "${service.name}"`
+              );
+            }
+
             const existingPorts: DyNTS_SocketServerService<any>[] = this.socketServices.filter(
               (mod: DyNTS_SocketServerService<any>): boolean => mod.port === service.port
             );
@@ -495,7 +502,12 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
               this.portSettings.httpPort === service.port || 
               this.portSettings.httpsPort === service.port
             ) {
-              const error = new Error(`PORT DUPLICATION: ${service.port}`);
+              const error = new Error(
+                `PORT DUPLICATION: "${service.port}"` +
+                `\n  same ports at: ${existingPorts.map(
+                  (sss: DyNTS_SocketServerService<any>): string => sss.name
+                ).join(', ')}`
+              );
               const errorStack: string[] = error.stack?.split('\n');
 
               errorStack.splice(1, 4);
@@ -562,11 +574,14 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
               throw error;
             }
           } catch (error) {
-            DyFM_Log.error(
-              `\nSocket Server service setup failed. (${service?.name})\n`, 
-              error, 
-              '\n'
-            );
+            if (error instanceof DyFM_Error) {
+              error.logSimple(`\nSocket Server service setup failed. (${service?.name})`)
+            } else {
+              DyFM_Log.error(
+                `\nSocket Server service setup failed. (${service?.name})`,
+                error,
+              );
+            }
 
             throw error;
           }

package/src/_modules/test/test.controller.ts

@@ -2,7 +2,7 @@
 import { Request, Response } from 'express';
 
 import { DyFM_HttpCallType } from '@futdevpro/fsm-dynamo';
-import { DyFM_testModule_settings } from '@futdevpro/fsm-dynamo/test';
+import { DyFM_testModule_settings, DyFM_TestRoute } from '@futdevpro/fsm-dynamo/test';
 
 import {
   DyNTS_Endpoint_Params
@@ -22,7 +22,7 @@ export class DyNTS_Test_Controller extends DyNTS_Controller {
       new DyNTS_Endpoint_Params({
         name: 'testGet',
         type: DyFM_HttpCallType.get,
-        endpoint: DyFM_testModule_settings.endPoints.testGet,
+        endpoint: DyFM_testModule_settings.endPoints[DyFM_TestRoute.testGet],
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
             res.send({
@@ -37,7 +37,7 @@ export class DyNTS_Test_Controller extends DyNTS_Controller {
       new DyNTS_Endpoint_Params({
         name: 'testPost',
         type: DyFM_HttpCallType.post,
-        endpoint: DyFM_testModule_settings.endPoints.testPost,
+        endpoint: DyFM_testModule_settings.endPoints[DyFM_TestRoute.testPost],
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
             res.send({
@@ -52,7 +52,7 @@ export class DyNTS_Test_Controller extends DyNTS_Controller {
       /* new DyNTS_Endpoint_Params({
         name: 'testPut',
         type: DyFM_HttpCallType.put,
-        endpoint: DyFM_testModule_settings.endPoints.testPut,
+        endpoint: DyFM_testModule_settings.endPoints[DyFM_TestRoute.testPut],
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
             res.send({
@@ -67,7 +67,7 @@ export class DyNTS_Test_Controller extends DyNTS_Controller {
       /* new DyNTS_Endpoint_Params({
         name: 'testPatch',
         type: DyFM_HttpCallType.patch,
-        endpoint: DyFM_testModule_settings.endPoints.testPatch,
+        endpoint: DyFM_testModule_settings.endPoints[DyFM_TestRoute.testPatch],
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
             res.send({
@@ -82,7 +82,7 @@ export class DyNTS_Test_Controller extends DyNTS_Controller {
       new DyNTS_Endpoint_Params({
         name: 'testDelete',
         type: DyFM_HttpCallType.delete,
-        endpoint: DyFM_testModule_settings.endPoints.testDelete,
+        endpoint: DyFM_testModule_settings.endPoints[DyFM_TestRoute.testDelete],
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
             res.send({
@@ -97,7 +97,7 @@ export class DyNTS_Test_Controller extends DyNTS_Controller {
       new DyNTS_Endpoint_Params({
         name: 'getServerStatus',
         type: DyFM_HttpCallType.get,
-        endpoint: DyFM_testModule_settings.endPoints.getServerStatus,
+        endpoint: DyFM_testModule_settings.endPoints[DyFM_TestRoute.getServerStatus],
         tasks: [
           async (req: Request, res: Response): Promise<void> => {
 

package/src/_services/base/data.service.ts

@@ -1787,8 +1787,28 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
   private lookForDependencyDataSettings(): void {
     const dependencyParam: DyFM_DataProperty_Params<any> = 
       Object.values(this.dataParams.properties).find(
-        (modelParams: DyFM_DataProperty_Params<any>): boolean => modelParams.isDependencyHook
+        (modelParams: DyFM_DataProperty_Params<any>): boolean => 
+          Boolean(modelParams.dependencyDataName)
       );
+    
+    if (
+      Object.values(this.dataParams.properties).filter(
+        (modelParams: DyFM_DataProperty_Params<any>): boolean => 
+          Boolean(modelParams.dependencyDataName)
+      ).length > 1
+    ) {
+      throw new DyFM_Error({
+        ...this._getDefaultErrorSettings(
+          'lookForDependencyDataSettings',
+          new Error(
+            `Multiple "dependencyDataName" found for this dataModel (${this.dataParams.dataName}) ` +
+            `(NTS DataService)` +
+            `\nSorry, but this is not supported yet! (Donate to Dynamo to get this feature!)`
+          )
+        ),
+        errorCode: 'NTS-DS0-LFDD0',
+      });
+    }
 
     if (dependencyParam) {
       this.depKey = dependencyParam.key;