@futdevpro/nts-dynamo 1.9.26 → 1.9.29

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

@@ -156,12 +156,24 @@ export class DyNTS_Endpoint_Params {
           DyFM_Log.info(msg);
         }
       }
-
     } catch (error) {
       this.error(req, res, error, issuer);
     }
   }
 
+  private logStackLocation(): void {
+    let stack: string = new Error().stack ?? '';
+
+    DyFM_Log.info(`\nTRYING TO FIND STACK LOCATION FOR: ${this.name}`);
+    DyFM_Log.info(`\n..."${stack}"`);
+
+    stack = stack.split('\n').filter(
+      (line: string): boolean => !line.includes('node_modules')
+    ).join('\n');
+    stack = stack.replace('    at ', '');
+    DyFM_Log.H_info(`\n             stack location: "${stack}"`);
+  }
+
   /**
    * 
    * @returns 
@@ -177,6 +189,10 @@ export class DyNTS_Endpoint_Params {
           await this.preLog(req, res, issuer);
         }
 
+        if (DyNTS_global_settings.log_settings.requestStackLocation) {
+          this.logStackLocation();
+        }
+
         await DyFM_Array.asyncForEach(this.preProcesses, 
           async (preProcess: (req: Request, res: Response) => Promise<void>): Promise<void> => {
             await preProcess(req, res);
@@ -283,37 +299,41 @@ export class DyNTS_Endpoint_Params {
       DyFM_Log.error('');
           
     } catch (error) {
-      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.)`
-        );
-      }
+      this.multiLevelError(error);
+    }
+  }
 
-      if (
-        DyNTS_global_settings.log_settings.highDetailedLogs ||
-        !(error instanceof DyFM_Error)
-      ) {
-        DyFM_Log.H_error(
-          `Endpoint "${this.endpoint}" caught an error and FAILED TO RESOLVE. (${this.name})`,
-          '\n    ERROR:', error
-        );
-      } else {
-        error.logSimple(
-          `Endpoint "${this.endpoint}" caught an error and FAILED TO RESOLVE. (${this.name})`
-        );
-      }
+  private multiLevelError(error: any): void {
+    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 (
+      DyNTS_global_settings.log_settings.highDetailedLogs ||
+      !(error instanceof DyFM_Error)
+    ) {
+      DyFM_Log.H_error(
+        `Endpoint "${this.endpoint}" caught an error and FAILED TO RESOLVE. (${this.name})`,
+        '\n    ERROR:', error
+      );
+    } else {
+      error.logSimple(
+        `Endpoint "${this.endpoint}" caught an error and FAILED TO RESOLVE. (${this.name})`
+      );
     }
   }
 

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

@@ -31,6 +31,11 @@ export interface DyNTS_GlobalLog_Settings {
    * this is an application wide default setting for route debug logs
    */
   responseContent?: boolean;
+
+  /**
+   * this is an application wide default setting for route debug logs
+   */
+  requestStackLocation?: boolean;
   
 
   /**

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

@@ -1,12 +1,12 @@
 
-import { DyNTS_SocketEventKey } from '../socket/_enums/socket-event-key.enum';
+import { DyFM_SocketEvent, DyFM_SocketEvent_Key } from '@futdevpro/fsm-dynamo/socket';
+
 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';
+import { DyNTS_SocketClient_ServiceBase } from '../socket/_services/socket-client.service';
 
-export class SocketClient_Mock extends DyNTS_SocketClientService {
+export class SocketClient_Mock extends DyNTS_SocketClient_ServiceBase {
 
   private constructor() {
     super();
@@ -16,11 +16,11 @@ export class SocketClient_Mock extends DyNTS_SocketClientService {
     return SocketClient_Mock.getSingletonInstance();
   }
 
-  getIncomingEvents(): DyNTS_SocketEvent<any>[] {
+  getIncomingEvents(): DyFM_SocketEvent<any>[] {
     return [
-      new DyNTS_SocketEvent({
+      new DyFM_SocketEvent({
         name: 'connect',
-        eventKey: DyNTS_SocketEventKey.connect,
+        eventKey: DyFM_SocketEvent_Key.connect,
         tasks: [
           async (content: any, issuer: string) => {
             console.log('SocketClient_Mock: connect event received');

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

@@ -1,5 +1,6 @@
 import { Socket } from 'socket.io';
-import { DyNTS_SocketEvent } from '../socket/_models/socket-event.control-model';
+import { DyFM_SocketEvent } from '@futdevpro/fsm-dynamo/socket';
+
 import { 
   DyNTS_SocketPresence 
 } from '../socket/_models/socket-presence.control-model';
@@ -24,16 +25,16 @@ export class DyNTS_SocketServer_Mock extends
     });
   }
 
-  getIncomingEvents(): DyNTS_SocketEvent<any>[] {
+  getIncomingEvents(): DyFM_SocketEvent<any>[] {
     return [];
   }
 
-  protected async getPresenceFromSubscrioptionEventContent(
+  protected async getPresenceFromSubscriptionEventContent(
     socketSubscription: any, 
     socket: Socket
   ): Promise<DyNTS_SocketPresence> {
     return new DyNTS_SocketPresence({ 
-      issuerId: socketSubscription.issuerId, 
+      issuerLocalId: socketSubscription.issuerId, 
       sockets: [ socket ],
       issuer: 'ISSUER socketServer_Mock',
     });

package/src/_modules/socket/_models/socket-client-service-params.control-model.ts

@@ -1,29 +1,20 @@
 
 import * as SocketIO from 'socket.io-client';
 
-import { second } from '@futdevpro/fsm-dynamo';
+import { DyFM_Log, second } from '@futdevpro/fsm-dynamo';
+import { DyFM_SocketClient_Params } from '@futdevpro/fsm-dynamo/socket';
 
 /**
  * socket handling and clarification is under development
  */
-export class DyNTS_SocketClientService_Params {
-  service: string;
-  name: string;
-  address?: string = 'ws://localhost';
-  port: number;
-  reconnectDelay?: number = second * 10;
-  reconnect?: boolean = true;
-  socketOptions?: Partial<SocketIO.ManagerOptions & SocketIO.SocketOptions>;
+export class DyNTS_SocketClientService_Params extends DyFM_SocketClient_Params {
+  override address?: string = 'ws://localhost';
 
   constructor(
     set: DyNTS_SocketClientService_Params
   ) {
-    Object.assign(this, set);
+    super(set);
 
-    this.reconnect = !!this.reconnectDelay;
-    
-    if (this.socketOptions?.autoConnect || this.socketOptions?.reconnection) {
-      this.reconnect = false;
-    }
+    DyFM_Log.H_info('T1000 (test this with custom address!)', this.address);
   }
 }

package/src/_modules/socket/_models/socket-presence.control-model.ts

@@ -9,10 +9,11 @@ import * as SocketIO from 'socket.io';
  */
 export class DyNTS_SocketPresence {
   /** 
-   * this is the presence ID which is used to getand handle the presence 
-   * usually the service master identifier such as userID
+   * this is the presence ID which is used to get and handle the presence 
+   * usually the service master identifier such as userID 
+   * (issuerLocalId != issuer which is the main master identifier usually the accountID)
    * */
-  issuerId: string;
+  issuerLocalId: string;
   serviceName?: string = 'unknown';
   onDestroy?: (issuerId: string) => void = (): void => {};
   
@@ -28,7 +29,7 @@ export class DyNTS_SocketPresence {
        * this is the presence ID which is used to get and set handle the presence/sockets
        * usually the service master identifier such as userID
        * */
-      issuerId: string,
+      issuerLocalId: string,
       serviceName?: string,
       onDestroy?: (issuerId: string) => void,
 
@@ -37,27 +38,28 @@ export class DyNTS_SocketPresence {
 
       /**
        * this is the issuer ID which is used to register data changes,
-       * usually the main master identifier such as accountID
+       * USUALLY the main master identifier such as accountID
        */
       issuer: string,
     }
   ) {
-    if (!set?.issuerId) {
+    if (!set?.issuerLocalId) {
       throw new DyFM_Error({ 
         ...this._getDefaultErrorSettings(
           'constructor',
           new Error(
-            `trying to create DyNTS_SocketPresence without a valid issuerId!` +
-            `\nset: ${JSON.stringify(set)}`
+            `trying to create DyNTS_SocketPresence without a valid issuerLocalId!`/*  +
+            `\nset: ${JSON.stringify(set)}` */
           ),
           set?.issuer
         ),
 
         errorCode: 'NTS-SD0-C00',
+        additionalContent: { set: set },
       });
     }
 
-    this.issuerId = set.issuerId;
+    this.issuerLocalId = set.issuerLocalId;
     
     if (set.serviceName) {
       this.serviceName = set.serviceName;
@@ -77,7 +79,7 @@ export class DyNTS_SocketPresence {
           'constructor',
           new Error(
             `trying to create DyNTS_SocketPresence without a single active socket!` +
-            `\nissuerId: ${this.issuerId}`
+            `\nissuerId: ${this.issuerLocalId}`
           ),
           set?.issuer
         ),
@@ -194,7 +196,7 @@ export class DyNTS_SocketPresence {
   ): DyFM_Error_Settings {
     return {
       status: (error as DyFM_Error)?.___status ?? 406,
-      message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS; ${this.serviceName})`,
+      message: (error as Error)?.message ?? `${fnName} was UNSUCCESSFUL (NTS; ${this.serviceName})`,
       userMessage: (error as DyFM_Error)?.__userMessage ?? this.defaultErrorUserMsg,
       issuerService: this.serviceName + ` (${this?.constructor?.name}-DyNTS_SocketPresence)`,
       addECToUserMsg: !(error as DyFM_Error)?.__userMessage,

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

@@ -1,28 +1,28 @@
 
 
 
-import * as SocketIO from 'socket.io-client';
+import * as SocketIOClient from 'socket.io-client';
 
-import { DyNTS_SingletonService } from '../../../_services/base/singleton.service';
 import { 
   DyFM_Error, DyFM_Log, DyFM_delay, DyFM_Array, DyFM_errorFlag 
 } from '@futdevpro/fsm-dynamo';
+import { DyFM_SocketEvent, DyFM_SocketEvent_Key } from '@futdevpro/fsm-dynamo/socket';
+
+import { DyNTS_SingletonService } from '../../../_services/base/singleton.service';
+import { DyNTS_global_settings } from '../../../_collections/global-settings.const';
 import { 
   DyNTS_SocketClientService_Params 
 } from '../_models/socket-client-service-params.control-model';
-import { DyNTS_global_settings } from '../../../_collections/global-settings.const';
-import { DyNTS_SocketEvent } from '../_models/socket-event.control-model';
-import { DyNTS_SocketEventKey } from '../_enums/socket-event-key.enum';
 
-export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
+export abstract class DyNTS_SocketClient_ServiceBase extends DyNTS_SingletonService /* DyFM_SocketClient_ServiceBase */ {
 
   private _params: DyNTS_SocketClientService_Params;
   protected get params(): DyNTS_SocketClientService_Params { return this._params; }
   get name(): string { return this.params.name; }
 
-  protected socket: SocketIO.Socket;
+  protected socket: SocketIOClient.Socket;
   
-  protected incomingEvents: DyNTS_SocketEvent<any>[];
+  protected incomingEvents: DyFM_SocketEvent<any>[];
   
   protected _connected: boolean = false;
   get connected(): boolean { return this._connected; }
@@ -30,9 +30,9 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
   protected debugLog: boolean = DyNTS_global_settings.log_settings.setup;
   protected logFn: boolean = DyNTS_global_settings.log_settings.functions;
 
-  private defaultEvents: DyNTS_SocketEvent<any>[] = [
-    new DyNTS_SocketEvent<any>({
-      eventKey: DyNTS_SocketEventKey.connect,
+  private defaultEvents: DyFM_SocketEvent<any>[] = [
+    new DyFM_SocketEvent<any>({
+      eventKey: DyFM_SocketEvent_Key.connect,
       tasks: [
         async () => {
           this._connected = true;
@@ -41,8 +41,8 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
       ],
     }),
 
-    new DyNTS_SocketEvent<any>({
-      eventKey: DyNTS_SocketEventKey.disconnect,
+    new DyFM_SocketEvent<any>({
+      eventKey: DyFM_SocketEvent_Key.disconnect,
       tasks: [
         async () => {
           this._connected = false;
@@ -56,8 +56,8 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
       ],
     }),
 
-    new DyNTS_SocketEvent<any>({
-      eventKey: DyNTS_SocketEventKey.subscriptionSuccessful,
+    new DyFM_SocketEvent<any>({
+      eventKey: DyFM_SocketEvent_Key.subscriptionSuccessful,
       tasks: [
         async () => {
           DyFM_Log.success(`<=-->  socket-client(${this.params.name}) subscription successful!`);
@@ -65,8 +65,8 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
       ],
     }),
 
-    new DyNTS_SocketEvent<any>({
-      eventKey: DyNTS_SocketEventKey.error,
+    new DyFM_SocketEvent<any>({
+      eventKey: DyFM_SocketEvent_Key.error,
       tasks: [
         async (content: any) => {
           DyFM_Log.error(`=-->   socket-client(${this.params.name}) ERROR!:`, content);
@@ -101,7 +101,14 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
     try {
       this._params = this.getParams();
       this.incomingEvents = this.getIncomingEvents() ?? [];
-      this.socket = SocketIO.io(`${this.params.address}:${this.params.port}`);
+      this.socket = SocketIOClient.io(
+        `${this.params.address}:${this.params.port}`,
+        {
+          reconnection: this.params.reconnect,
+          reconnectionDelay: this.params.reconnectDelay,
+          ...this.params.socketOptions,
+        }
+      );
       
       await this.setupDefaultEvents();
 
@@ -124,10 +131,10 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
     try {
       if (this.logFn) console.log('\nFn:. setupDefaultEvents');
 
-      this.defaultEvents.forEach((defaultEvent: DyNTS_SocketEvent<any>) => {
+      this.defaultEvents.forEach((defaultEvent: DyFM_SocketEvent<any>) => {
         defaultEvent.serviceName = this.params.name;
         const eventDeclared = this.incomingEvents.find(
-          (event: DyNTS_SocketEvent<any>) => event.eventKey === defaultEvent.eventKey
+          (event: DyFM_SocketEvent<any>) => event.eventKey === defaultEvent.eventKey
         );
 
         if (!eventDeclared) {
@@ -152,14 +159,14 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
 
       await DyFM_Array.asyncForEach(
         this.incomingEvents, 
-        async (event: DyNTS_SocketEvent<any>) => {
+        async (event: DyFM_SocketEvent<any>) => {
           event.serviceName = this.params.name;
           this.socket.on(event.eventKey, async (content: any) => { 
             try {
               await event.executeEventTasks(content, this.params.service);
             } catch (error) {
               DyFM_Log.error(`socket-client(${this.params.name}) Event failed, ERROR:`, error);
-              await this.emitEvent(DyNTS_SocketEventKey.error, error);
+              await this.emitEvent(DyFM_SocketEvent_Key.error, error);
             }
           });
         }
@@ -241,5 +248,5 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
   /**
    * You must setup events and required services in this function
    */
-  abstract getIncomingEvents(): DyNTS_SocketEvent<any>[];
+  abstract getIncomingEvents(): DyFM_SocketEvent<any>[];
 }