@futdevpro/nts-dynamo 1.6.39 → 1.6.41

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

@@ -531,15 +531,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       });
     });
 
-    if (data && (typeof data._id !== 'string' || typeof data._id === 'object')) {
-      data._id = `${data._id}`;
-      if (typeof data._id !== 'string' || typeof data._id === 'object') {
-        data = JSON.parse(JSON.stringify(data));
-        if (typeof data._id !== 'string' || typeof data._id === 'object') {
-          Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.findOne)')
-        }
-      }  
-    }
+    data = this.stringifyDataId(data);
 
     return data;
   }
@@ -830,6 +822,25 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
 
   // ----------------------------------------------------------------------------------
   // ----------------------------------------------------------------------------------
+  // ----------------------------------------------------------------------------------
+  // PRIVATE FUNCTIONS
+
+  private stringifyDataId(data: T): T {
+    if (data && (typeof data._id !== 'string' || typeof data._id === 'object')) {
+      data._id = `${data._id}`;
+
+      if (typeof data._id !== 'string' || typeof data._id === 'object') {
+        data = JSON.parse(JSON.stringify(data));
+
+        if (typeof data._id !== 'string' || typeof data._id === 'object') {
+          Dynamo_Log.error('data._id stringifying failed! Please notfiy the developers!', new Error());
+        }
+      }  
+    }
+
+    return data;    
+  }
+
   // ----------------------------------------------------------------------------------
   // PRIVATE BUILD FUNCTIONS
 

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/server/app.server.ts

@@ -6,7 +6,7 @@ import * as Https from 'https';
 import * as FileSystem from 'fs';
 import * as BodyParser from 'body-parser';
 
-import { Dynamo_Array, Dynamo_Error, Dynamo_Log, second, wait } from '@futdevpro/fsm-dynamo';
+import { Dynamo_Array, Dynamo_Error, dynamo_error_default, Dynamo_Log, second, wait } from '@futdevpro/fsm-dynamo';
 
 import { DynamoNTS_SingletonService } from '../base/singleton.service';
 import { DynamoNTS_RouteSecurity } from '../../_enums/route-security.enum';
@@ -230,13 +230,13 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
     if (this.logFn && this.deepLog) console.log('\nfn:. asyncConstruct');
     try {
       this.systemControls.app.init = true;
-      this.logSetup = dynamoNTS_globalSettings.logSetup;
       this._params = this.getAppParams();
-      
+      dynamo_error_default.issuerSystem = this._params.name;
       
       if (this.overrideDynamoNTSGlobalSettings) {
         this.overrideDynamoNTSGlobalSettings();        
       } 
+      this.logSetup = dynamoNTS_globalSettings.logSetup;
       
       this.globalService = DynamoNTS_GlobalService.getInstance();
       DynamoNTS_GlobalService.setServices(this.getGlobalServiceCollection());

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);
@@ -320,23 +320,30 @@ export abstract class DynamoNTS_SocketServerService<
   async sendEventForId(id: string, event: string, content: any/* , error?: (err: any) => void */): Promise<void> {
     try {
       const presence: DynamoNTS_SocketPresence = this.presences.find((pres: DynamoNTS_SocketPresence) => pres.issuerId === id);
+
       if (presence) {
         Dynamo_Log.log(` <--- emitting socket event for presence: ${event} (${this.params.name}, presenceId: ${id})`);
         presence.emitEvent(event, content);
       } else {
-        /* if (error) { */
         throw new Dynamo_Error({ 
+          ...this.getDefaultErrorSettings(
+            'sendEventForId',
+            new Error(`No active socket with this specific ID: ${id}`),
+            content?.source
+          ),
+
           status: 404, 
-          errorCode: 'NTS-S99-001',
-          addECToUserMsg: true,
-          message: `No active socket whit this specific ID: ${id}`,
-          userMessage: this.defaultErrorUserMsg
+          errorCode: 'NTS-SSS-301',
         });
-        /* } */
       }
     } catch (error) {
-      Dynamo_Log.error(`Socket Event Emit for id (${id}, ${event}) failed: ${this.params?.name} (${this.params?.port})`, error);
-      throw error;
+      throw new Dynamo_Error({
+        ...this.getDefaultErrorSettings('sendEventForId', error, content?.source),
+
+        errorCode: 'NTS-SSS-300',
+        message: `Socket Event Emit for id (${id}, ${event}) failed: ${this.params?.name} (${this.params?.port})`,
+        error
+      });
     }
   }
 
@@ -347,7 +354,25 @@ export abstract class DynamoNTS_SocketServerService<
       });
     } catch (error) {
       Dynamo_Log.error(`Socket Event Broadcast (${event}) failed: ${this.params?.name} (${this.params?.port})`, error);
-      throw error;
+      throw new Dynamo_Error({
+        ...this.getDefaultErrorSettings('broadcastEvent', error),
+        
+        errorCode: 'NTS-SSS-400',
+        message: `Socket Event Broadcast (${event}) failed: ${this.params?.name} (${this.params?.port})`,
+        error
+      });
+    }
+  }
+
+  private getDefaultErrorSettings(fnName: string, error: Error | Dynamo_Error, issuer?: string) {
+    return {
+      status: 417,
+      message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS)`,
+      addECToUserMsg: true,
+      userMessage: this.defaultErrorUserMsg,
+      issuer: issuer,
+      issuerService: this.constructor?.name,
+      error: error,
     }
   }