@futdevpro/nts-dynamo 1.6.40 → 1.6.41

package/src/_constants/mocks/app-params.mock.ts

@@ -1,5 +1,5 @@
-import { DynamoNTS_AppParams } from '../../_models';
 
+import { DynamoNTS_AppParams } from '../../_models';
 
 export const DynamoNTS_appParams_mock: DynamoNTS_AppParams = new DynamoNTS_AppParams({
   name: 'test',

package/src/_constants/mocks/app-server.mock.ts

@@ -103,4 +103,77 @@ export class DynamoNTS_AppFull_Mock extends DynamoNTS_App {
   async getRootServices(): Promise<DynamoNTS_SingletonService[]> {
     return [];
   }
-}
+}
+
+////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////
+
+export class DynamoNTS_AppTEST_Mock extends DynamoNTS_App {
+  constructor(
+    overrides: {
+      getAppParams?(): DynamoNTS_AppParams;
+      getGlobalServiceCollection?(): DynamoNTS_GlobalServiceSettings;
+      getPortSettings?(): DynamoNTS_PortSettings;
+      getRoutingModules?(): DynamoNTS_RoutingModule[];
+      getRootServices?(): Promise<DynamoNTS_SingletonService[]>;
+    }
+  ) {
+    if (overrides.getAppParams) {
+      DynamoNTS_App.prototype.getAppParams = overrides.getAppParams;
+    }
+    if (overrides.getGlobalServiceCollection) {
+      DynamoNTS_App.prototype.getGlobalServiceCollection = overrides.getGlobalServiceCollection;
+    }
+    if (overrides.getPortSettings) {
+      DynamoNTS_App.prototype.getPortSettings = overrides.getPortSettings;
+    }
+    if (overrides.getRoutingModules) {
+      DynamoNTS_App.prototype.getRoutingModules = overrides.getRoutingModules;
+    }
+    if (overrides.getRootServices) {
+      DynamoNTS_App.prototype.getRootServices = overrides.getRootServices;
+    }
+
+    super();
+  }
+
+  getAppParams(): DynamoNTS_AppParams {
+    return new DynamoNTS_AppParams({
+      name: 'test-partial',
+      version: 'p.0.1',
+      dbName: 'test-partial',
+    });
+  }
+  
+  overrideDynamoNTSGlobalSettings(): void {}
+
+  getGlobalServiceCollection(): DynamoNTS_GlobalServiceSettings {
+    return {
+      authService: AuthService_Mock.getInstance(),
+      dbModels: [
+        dependency_mock_DataParams,
+        dependent_mock_DataParams,
+
+        usageSessionModelParams,
+        customDataModelParams,
+      ],      
+    };
+  }
+
+  getPortSettings(): DynamoNTS_PortSettings {
+    return {
+      httpPort: 10203,
+    };
+  }
+
+  getRoutingModules(): DynamoNTS_RoutingModule[] {
+    return [];
+  }
+
+  async getRootServices(): Promise<DynamoNTS_SingletonService[]> {
+    return [];
+  }
+}
+
+

package/src/_constants/mocks/data-model.mock.ts

@@ -1,7 +1,7 @@
 import { Dynamo_DataParams, Dynamo_Metadata } from '@futdevpro/fsm-dynamo';
 
 
-export class Depemndency_Mock extends Dynamo_Metadata {
+export class Dependency_Mock extends Dynamo_Metadata {
   string?: string;
   number?: number;
   date?: Date;
@@ -12,7 +12,7 @@ export class Depemndency_Mock extends Dynamo_Metadata {
   objectArrayArray?: any[][];
 
   constructor(
-    set?: Depemndent_Mock
+    set?: Dependent_Mock
   ) {
     super(set);
 
@@ -40,7 +40,7 @@ export const dependency_mock_DataParams = new Dynamo_DataParams({
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 
-export class Depemndent_Mock extends Dynamo_Metadata {
+export class Dependent_Mock extends Dynamo_Metadata {
   dependencyId?: string;
 
   string?: string;
@@ -53,7 +53,7 @@ export class Depemndent_Mock extends Dynamo_Metadata {
   objectArrayArray?: any[][];
 
   constructor(
-    set?: Depemndent_Mock
+    set?: Dependent_Mock
   ) {
     super(set);
 

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

@@ -105,7 +105,7 @@ export class DynamoNTS_EndpointParams{
 
       this.logRequest = set.logRequest ?? dynamoNTS_globalSettings.logRequest;
       this.logRequestsContent = set.logRequestsContent ?? dynamoNTS_globalSettings.logRequestsContent;
-      this.logResponseContent = set.logResponseContent ?? dynamoNTS_globalSettings.logResponseContent;
+      /* this.logResponseContent = set.logResponseContent ?? dynamoNTS_globalSettings.logResponseContent; */
     } catch (error) {
       Dynamo_Log.error(
         `\nEndpoint params setup failed: name: '${set.name}' (security: ${set.security}) endpoint: ${set.endpoint}\nERROR:\n`, error);
@@ -121,21 +121,22 @@ export class DynamoNTS_EndpointParams{
     try {
       if (this.logRequest) {
         if (this.logRequestsContent) {
-          let inputs = '';
+          const params = this.getPathParamsLogContent(req);
+          /* let params = '';
           for(let i = 0; i < this.pathParams.length; i++) {
-            inputs += ` ${this.pathParams[i]}: ${req.params[this.pathParams[i]]}`;
-            if (i + 1 < this.pathParams.length || req.body && `${req.body}` !== '{}') {
-              inputs += ',';
+            params += `\n  ${this.pathParams[i]}: ${req.params[this.pathParams[i]]}`;
+            if (i + 1 < this.pathParams.length) {
+              params += ',';
             }
-          }
+          } */
 
           if (req.body && 0 < Object.keys(req.body).length) {
-            console.log(`==> incoming ${this.name} request...${inputs} body:`, req.body);
+            console.log(`===> incoming ${this.name} request...\npathParams:${params}\nbody:`, req.body);
           } else {
-            console.log(`==> incoming ${this.name} request...${inputs}`);
+            console.log(`===> incoming ${this.name} request...\npathParams:${params}`);
           }
         } else {
-          console.log(`==> incoming ${this.name} request...`);
+          console.log(`===> incoming ${this.name} request...`);
         }
       }
 
@@ -191,17 +192,24 @@ export class DynamoNTS_EndpointParams{
   private error(req: Request, res: Response, error: Error | Dynamo_Error): void {
     try {
       let msg: string = `Endpoint catched an error. ${this.name} (${this.endpoint})`;
-      this.pathParams.forEach((param: string) => {
+      /* this.pathParams.forEach((param: string) => {
         msg += `\n${param}: ${req.params[param]}`;
-      });
+      }); */
+      msg += this.getPathParamsLogContent(req);
       msg += `\nERROR:`;
 
       Dynamo_Log.error(msg);
-      console.log((error as Dynamo_Error)?.flag.includes('DYNAMO') ? (error as Dynamo_Error).getErrorSimplified() : error, '\n');
-      if (this.logRequest && req.body && 0 < Object.keys(req.body).length) {
+      console.log(
+        (error as Dynamo_Error)?.flag.includes('DYNAMO') ? 
+          (error as Dynamo_Error).getErrorSimplified() : 
+          error, 
+        '\n'
+      );
+
+      /* if (this.logRequest && req.body && 0 < Object.keys(req.body).length) {
         console.log('body: ');
         console.log(req.body, '\n');
-      }
+      } */
 
       res.status((error as Dynamo_Error)?.___status ?? 501);
       res.send(error);
@@ -209,14 +217,14 @@ export class DynamoNTS_EndpointParams{
       if (this.logRequest) {
         if (this.logResponseContent) {
           Dynamo_Log.error(
-            `  <<<=====   ${this.name} error sent. ${(error as Dynamo_Error)?._message ?? ''}`
+            `  <<<=====   ${this.name} error sent: ${(error as Dynamo_Error)?._message ?? ''}`
           );
           Dynamo_Log.error(
             'sorry, the logResponseContent is not implemented yet.'
           );
         } else {
           Dynamo_Log.error(
-            `  <<<=====   ${this.name} error sent. ${(error as Dynamo_Error)?._message ?? ''}`
+            `  <<<=====   ${this.name} error sent: ${(error as Dynamo_Error)?._message ?? ''}`
           );
         }
       }
@@ -227,6 +235,16 @@ export class DynamoNTS_EndpointParams{
       );
     }
   }
+
+  private getPathParamsLogContent(req: Request): string {
+    let params: string = '';
+    
+    this.pathParams.forEach((param: string) => {
+      params += `\n${param}: ${req.params[param]}\n`;
+    });
+
+    return params;
+  }
 }
 
 

package/src/_models/control-models/socket-event.control-model.ts

@@ -94,9 +94,9 @@ export class DynamoNTS_SocketEvent<T>{
   private async getPreLog(content: T, issuer?: string): Promise<void> {
     try {
       if (this.logEventContent && this.eventType !== DynamoNTS_SocketEventType.connection) {
-        Dynamo_Log.log(`--> incoming socket(${this.socketName}) event: ${this.eventType}; content:`, content);
+        Dynamo_Log.log(`---> incoming socket(${this.socketName}) event: ${this.eventType};\ncontent:`, content);
       } else {
-        Dynamo_Log.log(`--> incoming socket(${this.socketName}) event: ${this.eventType}...`);
+        Dynamo_Log.log(`---> incoming socket(${this.socketName}) event: ${this.eventType}...`);
       }
     } catch (error) {
       Dynamo_Log.error(`PreLog failed... (socket:  ${this.socketName})`, error);

package/src/_services/base/db.service.spec.ts

@@ -0,0 +1,9 @@
+
+
+
+/* 
+
+xdescribe('DynamoNTS_DBService', () => {
+
+});
+ */

package/src/_services/server/app.server.spec.ts

@@ -1,6 +1,5 @@
 
-import { delay, Dynamo_Log, second } from '@futdevpro/fsm-dynamo';
-import { DynamoNTS_AppExtendedBase_Mock, DynamoNTS_AppExtendedFull_Mock } from '../../_constants/mocks/app-extended-server.mock';
+import { Dynamo_Log } from '@futdevpro/fsm-dynamo';
 import { DynamoNTS_AppBase_Mock, DynamoNTS_AppFull_Mock } from '../../_constants/mocks/app-server.mock';
 
 describe('DynamoNTS_App AND DynamoNTS_AppExtended?;', () => {

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

@@ -54,7 +54,7 @@ export abstract class DynamoNTS_SocketServerService<
   protected logFn: boolean;
 
   defaultErrorUserMsg = 
-    `We encountered an unhandled Socket Error, ` +
+    `We encountered an unhandled Socket Server Error, ` +
     `\nplease contact the responsible development team.`;
 
   constructor(){
@@ -180,7 +180,7 @@ export abstract class DynamoNTS_SocketServerService<
                  * to be able to check content before getPresenceFromSubscrioptionEventContent 
                  */
                 if (dynamoNTS_globalSettings.logMainSocketEvents || dynamoNTS_globalSettings.logAllSocketEvent || dynamoNTS_globalSettings.logSocketEventContent) {
-                  Dynamo_Log.log(`---> incoming socket(${this.params.name}) event: ${DynamoNTS_SocketEventType.subscribe}; content:`, content);
+                  Dynamo_Log.log(`---> incoming socket(${this.params.name}) event: ${DynamoNTS_SocketEventType.subscribe};\ncontent:`, content);
                 } else {
                   Dynamo_Log.log(`---> incoming socket(${this.params.name}) event: ${DynamoNTS_SocketEventType.subscribe}`);
                 }
@@ -191,7 +191,7 @@ export abstract class DynamoNTS_SocketServerService<
                 this.socketSubscription(presence);
                 await this.subscriptionEvent.executeEventTasks(content, issuer);
 
-                Dynamo_Log.success(` <=> socket subscription successfull (${issuer})`);
+                Dynamo_Log.success(`<===> socket subscription successfull (${issuer})`);
               } catch (error) {
                 Dynamo_Log.error(`Socket Subscription failed: ${this.params.name} (${this.params.port}) will disconnect now...`, error);
                 socket.emit(DynamoNTS_SocketEventType.error, error);
@@ -212,7 +212,7 @@ export abstract class DynamoNTS_SocketServerService<
           });
 
           if (dynamoNTS_globalSettings.logMainSocketEvents) {
-            console.log(`Socket (${this.params.name}): new CONNECTION established`);
+            Dynamo_Log.success(`<   > Socket (${this.params.name}): new CONNECTION established`);
           }
         } catch (error) {
           Dynamo_Log.error(`Socket Connection failed: ${this.params.name} (${this.params.port}) will disconnect now...`, error);
@@ -328,7 +328,7 @@ export abstract class DynamoNTS_SocketServerService<
         throw new Dynamo_Error({ 
           ...this.getDefaultErrorSettings(
             'sendEventForId',
-            new Error(`No active socket whit this specific ID: ${id}`),
+            new Error(`No active socket with this specific ID: ${id}`),
             content?.source
           ),