@futdevpro/nts-dynamo 1.7.1 → 1.7.4

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

@@ -7,7 +7,7 @@ import * as Https from 'https';
 import * as FileSystem from 'fs';
 import * as BodyParser from 'body-parser';
 
-import { Request, Response } from 'express';
+import { ErrorRequestHandler } from 'express';
 
 import { Dynamo_Array, Dynamo_Error, dynamo_error_default, Dynamo_Log, second, wait } from '@futdevpro/fsm-dynamo';
 
@@ -24,7 +24,6 @@ import { DynamoNTS_EndpointParams } from '../../_models/control-models/endpoint-
 import { DynamoNTS_AppSystemControls } from '../../_models/control-models/app-system-controls.control-model';
 
 
-
 /**
  * This will be the MAIN service of our server project,
  * follow the types and type instructions while setting up your project
@@ -198,8 +197,8 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
   private _security: DynamoNTS_RouteSecurity;
   protected get security(): DynamoNTS_RouteSecurity { return this._security; }
 
-  protected _ports: DynamoNTS_PortSettings;
-  protected get ports(): DynamoNTS_PortSettings { return this._ports; }
+  protected _portSettings: DynamoNTS_PortSettings;
+  protected get ports(): DynamoNTS_PortSettings { return this._portSettings; }
 
   private _cert?: DynamoNTS_CertificationSettings;
   protected get cert(): DynamoNTS_CertificationSettings { return this._cert; }
@@ -214,6 +213,11 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
 
   private _routingModules: DynamoNTS_RoutingModule[] = [];
 
+  defaultErrorUserMsg = 
+    `We encountered a Server Error, ` +
+    `\nplease contact the responsible development team.\n` +
+    `\n(Internal Server error)`;
+
   /**
    * setting this value to true, enables this service debug logs
    */
@@ -245,7 +249,10 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
     });
 
     this.asyncConstruct(extended).catch((error: any) => {
-      Dynamo_Log.error(`\nApplication: ${this._params.name} start failed.\n`, error);
+      Dynamo_Log.error(
+        `\nApplication: ${this._params.name} start failed.` +
+        `\n`, error
+      );
     });
   }
 
@@ -253,21 +260,20 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
     if (this.logFn && this.deepLog) console.log('\nfn:. asyncConstruct');
     try {
       this.systemControls.app.init = true;
-      this._params = this.getAppParams();
+      this._params = this.getAppParams();  
 
-      dynamo_error_default.issuerSystem = this._params.systemName;
+      dynamo_error_default.issuerSystem = this._params.systemName;  
       
-      this.overrideDynamoNTSGlobalSettings?.();        
+      this.overrideDynamoNTSGlobalSettings?.();    
 
       this.logSetup = dynamoNTS_globalSettings.logSetup;
       
       this.globalService = DynamoNTS_GlobalService.getInstance();
       DynamoNTS_GlobalService.setServices(this.getGlobalServiceCollection());
       DynamoNTS_GlobalService.setParams(this.params);
-      DynamoNTS_GlobalService.setGlobalErrorHandler(this.getGlobalErrorHandler?.());
 
       if (this.getPortSettings) {
-        this._ports = this.getPortSettings();
+        this._portSettings = this.getPortSettings();
       }
 
       if (this.getCertificationSettings) {
@@ -322,8 +328,12 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
       this.constructErrors.push(error);
       Dynamo_Log.error(`${this._params.name} start failed. ERRORS`, this.constructErrors);
       throw new Dynamo_Error({
+        ...this._getDefaultErrorSettings(
+          'asyncConstruct',
+          error
+        ),
+        
         errorCode: 'NTS-AS0-001',
-        error: error,
         additionalContent: {
           constructErrors: this.constructErrors,
           systemControls: this.systemControls,
@@ -346,7 +356,12 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
     if (this.constructErrors.length) {
       Dynamo_Log.error(`${this._params.name} start failed. ERRORS`, this.constructErrors);
       throw new Dynamo_Error({ 
-        message: `${this._params.name} start failed. ERRORS`,
+        ...this._getDefaultErrorSettings(
+          'ready',
+          new Error(`${this._params.name} start failed. ERRORS`)
+        ),
+
+        errorCode: 'NTS-AS0-R1',
         additionalContent: this.constructErrors.length === 1 ? this.constructErrors[0] : { errors: this.constructErrors },
       });
     }
@@ -370,7 +385,12 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
     if (timeout < +new Date() - start) {
       Dynamo_Log.error(`${this._params.name} start failed. TIMEOUT`, this.constructErrors);
       throw new Dynamo_Error({
-        message: `${this._params.name} start failed. TIMEOUT`,
+        ...this._getDefaultErrorSettings(
+          'ready',
+          new Error(`${this._params.name} start failed. TIMEOUT`)
+        ),
+
+        errorCode: 'NTS-AS0-R2',
         additionalContent: {
           constructErrors: this.constructErrors,
           systemControls: this.systemControls,
@@ -386,7 +406,12 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
     if (this.constructErrors.length) {
       Dynamo_Log.error(`${this._params.name} start failed. ERROR`, this.constructErrors);
       throw new Dynamo_Error({
-        message: `${this._params.name} start failed. ERROR`,
+        ...this._getDefaultErrorSettings(
+          'ready',
+          new Error(`${this._params.name} start failed. ERROR`)
+        ),
+
+        errorCode: 'NTS-AS0-R3',
         additionalContent: this.constructErrors,
       });
     }
@@ -412,8 +437,12 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
 
       Dynamo_Log.error(msg, this.constructErrors);
       throw new Dynamo_Error({ 
-        errorCode: 'NTS-AS0-110',
-        message: msg,
+        ...this._getDefaultErrorSettings(
+          'ready',
+          new Error(msg)
+        ),
+
+        errorCode: 'NTS-AS0-R4',
         additionalContent: {
           constructErrors: this.constructErrors,
           systemControls: this.systemControls,
@@ -435,11 +464,13 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
 
       if (this.systemControls.mongoose.init) {
         this.systemControls.mongoose.started = false;
+
         if (this.mongoose) {
           await Dynamo_Array.asyncForEach(Object.keys(this.mongoose.models), async (modelName) => {
             await this.mongoose.deleteModel(modelName);
           });
           await this.mongoose.disconnect();
+
         } else {
           Dynamo_Log.error(`\nMongoose not found.`);
         }
@@ -491,9 +522,13 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
             Dynamo_Log.error('\nUnable to connect to MongoDB server, ERROR: ', error);
             reject(
               new Dynamo_Error({
-                errorCode: 'NTS-AS0-100',
+                ...this._getDefaultErrorSettings(
+                  'startDB',
+                  error
+                ),
+
+                errorCode: 'NTS-AS0-SDB1',
                 message: `Unable to connect to MongoDB server, ERROR: ${error}`,
-                error: error, 
               })
             );
           })
@@ -520,7 +555,7 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
   private async initExpresses(): Promise<void> {
     if (this.logFn && this.deepLog) console.log('\nfn:. initExpresses');
     if (this._security && this._security !== DynamoNTS_RouteSecurity.secure) {
-      if (!this._ports.httpPort) {
+      if (!this._portSettings.httpPort) {
         let errorMsg: string =
           `\nYou have open routes, but httpPort is not set!` +
           `\nsecurity: ${this._security}` +
@@ -551,7 +586,7 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
     }
 
     if (this._security && this._security !== DynamoNTS_RouteSecurity.open) {
-      if (!this._cert || !this._ports.httpsPort) {
+      if (!this._cert || !this._portSettings.httpsPort) {
         let errorMsg: string =
           `\nYou have secure routes, but the certification paths or httpsPort are not set!` +
           `\nsecurity: ${this._security}` +
@@ -594,8 +629,8 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
   protected async initOpenExpress(): Promise<void> {
     if (this.logFn) console.log('\nfn:. initOpenExpress');
     this.openExpress = Express();    
-    this.openExpress.use(BodyParser.urlencoded({ limit: '50mb', extended: true }));
-    this.openExpress.use(BodyParser.json({ limit: '50mb' }));
+    this.openExpress.use(BodyParser.urlencoded(this._portSettings.httpEncodeSettings));
+    this.openExpress.use(BodyParser.json(this._portSettings.httpJsonSettings));
   }
 
   /**
@@ -604,8 +639,8 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
    protected async initSecureExpress(): Promise<void> {
     if (this.logFn) console.log('\nfn:. initSecureExpress');
     this.secureExpress = Express();    
-    this.secureExpress.use(BodyParser.urlencoded({ limit: '50mb', extended: true }));
-    this.secureExpress.use(BodyParser.json({ limit: '50mb' }));
+    this.secureExpress.use(BodyParser.urlencoded(this._portSettings.httpsEncodeSettings));
+    this.secureExpress.use(BodyParser.json(this._portSettings.httpsJsonSettings));
 
     const options = {
       key: FileSystem.readFileSync(this._cert.keyPath),
@@ -624,9 +659,9 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
         await new Promise<void>((resolve, reject) => {
           this.systemControls.httpsServer.init = true;
           this.httpsServer
-            .listen(this._ports.httpsPort, 'localhost', 0, () => {
+            .listen(this._portSettings.httpsPort, 'localhost', 0, () => {
               this.systemControls.httpsServer.started = true;
-              Dynamo_Log.success(`\nHTTPS (secure) server is listening on port: ${this._ports.httpsPort}`);
+              Dynamo_Log.success(`\nHTTPS (secure) server is listening on port: ${this._portSettings.httpsPort}`);
               resolve();
             })
             .on('error', (error) => {
@@ -635,9 +670,13 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
               Dynamo_Log.error(`\nHTTPS (secure) server ERROR`, error);
               reject(
                 new Dynamo_Error({
-                  errorCode: 'NTS-AS0-001',
+                  ...this._getDefaultErrorSettings(
+                    'startExpresses',
+                    error
+                  ),
+
+                  errorCode: 'NTS-AS0-SE1',
                   message: `HTTPS (secure) server ERROR`,
-                  error: error,
                 })
               );
             })
@@ -645,9 +684,13 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
               Dynamo_Log.warn(
                 `\nHTTPS (secure) server uncaughtException`,
                 new Dynamo_Error({
-                  errorCode: 'NTS-AS0-002',
+                  ...this._getDefaultErrorSettings(
+                    'startExpresses',
+                    ex
+                  ),
+
+                  errorCode: 'NTS-AS0-SE2',
                   message: `HTTPS (secure) server uncaughtException`,
-                  error: ex,
                 })
               );
             });
@@ -658,9 +701,9 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
         this.systemControls.httpServer.init = true;
         await new Promise<void>((resolve, reject) => {
           this.httpServer = this.openExpress
-            .listen(this._ports.httpPort, () => {
+            .listen(this._portSettings.httpPort, () => {
               this.systemControls.httpServer.started = true;
-              Dynamo_Log.success(`\nHTTP (open) server is listening on port: ${this._ports.httpPort}`);
+              Dynamo_Log.success(`\nHTTP (open) server is listening on port: ${this._portSettings.httpPort}`);
               resolve();
             })
             .on('error', (error) => {
@@ -670,9 +713,13 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
               Dynamo_Log.error(`\nHTTP (open) server ERROR`, error);
               reject(
                 new Dynamo_Error({
-                  errorCode: 'NTS-AS0-003',
+                  ...this._getDefaultErrorSettings(
+                    'startExpresses',
+                    error
+                  ),
+
+                  errorCode: 'NTS-AS0-SE3',
                   message: `HTTP (open) server ERROR`,
-                  error: error,
                 })
               );
             })
@@ -680,9 +727,13 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
               Dynamo_Log.warn(
                 `\nHTTP (open) server uncaughtException`,
                 new Dynamo_Error({ 
-                  errorCode: 'NTS-AS0-004',
+                  ...this._getDefaultErrorSettings(
+                    'startExpresses',
+                    ex
+                  ),
+
+                  errorCode: 'NTS-AS0-SE4',
                   message: `HTTP (open) server uncaughtException`, 
-                  error: ex 
                 })
               );
             });
@@ -710,16 +761,20 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
         );
 
         if (1 < existingRoutes.length) {
-          let error = new Error(`ROUTE DUPLICATION: ${module.route}`);
+          let error: Error = new Error(`ROUTE DUPLICATION: ${module.route}`);
           let errorStack: string[] = error.stack.split('\n');
           errorStack.splice(1, 4);
           error.stack = errorStack.join('\n');
   
           Dynamo_Log.error(`ROUTE DUPLICATION: ${module.route}`, error);
           throw new Dynamo_Error({
-            errorCode: 'NTS-AS0-005',
+            ...this._getDefaultErrorSettings(
+              'mountSecureRoutes',
+              error
+            ),
+
+            errorCode: 'NTS-AS0-MSR1',
             message: `ROUTE DUPLICATION: ${module.route}`,
-            error: error,
           });
         }
 
@@ -733,6 +788,18 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
    */
   private async mountOpenRoutes(): Promise<void> {
     if (this.logFn && this.deepLog) console.log('\nfn:. mountOpenRoutes');
+
+    this.openExpress.use((err, req, res, next) => {
+      if (err) {
+        Dynamo_Log.error('openExpress ERROR', err);
+        DynamoNTS_GlobalService.globalErrorHandler?.(err, req, res);
+      } else {
+        Dynamo_Log.H_error('WTF', err, req, res);
+      }
+
+      next();
+    })
+
     await Dynamo_Array.asyncForEach(this._routingModules, async (module: DynamoNTS_RoutingModule) => {
       if (module.security !== DynamoNTS_RouteSecurity.secure) {
         if (this.logSetup) {
@@ -744,16 +811,20 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
         );
 
         if (1 < existingRoutes.length) {
-          let error = new Error(`ROUTE DUPLICATION: ${module.route}`);
+          let error: Error = new Error(`ROUTE DUPLICATION: ${module.route}`);
           let errorStack: string[] = error.stack.split('\n');
           errorStack.splice(1, 4);
           error.stack = errorStack.join('\n');
   
           Dynamo_Log.error(`ROUTE DUPLICATION: ${module.route}`, error);
           throw new Dynamo_Error({
-            errorCode: 'NTS-AS0-006',
+            ...this._getDefaultErrorSettings(
+              'mountOpenRoutes',
+              error
+            ),
+
+            errorCode: 'NTS-AS0-MOR1',
             message: `ROUTE DUPLICATION: ${module.route}`,
-            error: error,
           });
         }
         
@@ -770,8 +841,10 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
     this._routingModules.forEach((module: DynamoNTS_RoutingModule) => {
       if (!module.security) {
         Dynamo_Log.warn(`RoutingModule security is not set for ${module.route}\n`);
+
       } else if (!this._security) {
         this._security = module.security;
+
       } else if (this._security !== module.security) {
         this._security = DynamoNTS_RouteSecurity.both;
       }
@@ -789,6 +862,17 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
       Dynamo_Log.warn(msg);
     }
   }
+    
+  private _getDefaultErrorSettings(fnName: string, error: Error | Dynamo_Error) {
+    return {
+      status: (error as Dynamo_Error)?.___status ?? 500,
+      message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS)`,
+      addECToUserMsg: true,
+      userMessage: this.defaultErrorUserMsg,
+      issuerService: `${this?.constructor?.name}-DynamoNTS_App`,
+      error: error,
+    }
+  }
 
   /**
    * #OUTDATED
@@ -843,39 +927,7 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
   overrideDynamoNTSGlobalSettings?(): void;
 
   /**
-   * #OUTDATED
-   * You must setup endpoints and required services in this function
-   * 
-   * @example
-   * // Setting up Routes
-   * setupRoutingModules(): void {
-   *   this.httpPort = env.httpPort;
-   *   this.httpsPort = env.httpsPort;
-   *
-   *   this.cert = {
-   *     keyPath: Path.join(__dirname, './_assets/cert/ucc.key'),
-   *     certPath: Path.join(__dirname, './_assets/cert/ucc.crt'),
-   *   };
-   *
-   *   this.routingModules = [
-   *     new DynamoBERountingModule({
-   *       route: '/api/account',
-   *       controllers: [
-   *         AccountController.getInstance(),
-   *         PersonalInformationController.getInstance(),
-   *         ...
-   *       ]
-   *     }),
-   *     new DynamoBERountingModule({
-   *       route: '/api/project',
-   *       controllers: [ 
-   *         ProjectController.getInstance(),
-   *         ProjectExtensionController.getInstance(),
-   *       ]
-   *     }),
-   *     ...
-   *   ];
-   * }
+   * MISSING Description (TODO)
    */
   getRoutingModules?(): DynamoNTS_RoutingModule[];
 
@@ -899,9 +951,4 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
    */
   postProcess?(): Promise<void>;
 
-  /**
-   * MISSING Description (TODO)
-   * only implemented for endpoints and global Unhandled Rejection
-   */
-  getGlobalErrorHandler?(): (err: any, req?: Request, res?: Response, issuer?: string) => Promise<void>;
 }

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

@@ -43,7 +43,7 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
       tasks: [
         async () => {
           this._connected = false;
-          Dynamo_Log.warn(`< x >  socket-client(${this.params.name}) disconnected!`);
+          Dynamo_Log.warn(`<x  >  socket-client(${this.params.name}) disconnected!`);
 
           if (this._params.reconnect) {
             await delay(this._params.reconnectDelay);
@@ -57,7 +57,7 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
       eventKey: DynamoNTS_SocketEventKey.subscriptionSuccessful,
       tasks: [
         async () => {
-          Dynamo_Log.success(`<-=->  socket-client(${this.params.name}) subscription successful!`);
+          Dynamo_Log.success(`<=-->  socket-client(${this.params.name}) subscription successful!`);
         }
       ]
     }),
@@ -66,7 +66,7 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
       eventKey: DynamoNTS_SocketEventKey.error,
       tasks: [
         async (content: any) => {
-          Dynamo_Log.error(`--->   socket-client(${this.params.name}) ERROR!:`, content);
+          Dynamo_Log.error(`=-->   socket-client(${this.params.name}) ERROR!:`, content);
         }
       ]
     }),
@@ -178,7 +178,7 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
    */
   protected async emitEvent(eventType: string, content: any): Promise<void> {
     try {
-      Dynamo_Log.log(`<-=-   outgoing socket-client(${this.params.name}) event: ${eventType}`);
+      Dynamo_Log.log(`<=--   outgoing socket-client(${this.params.name}) event: ${eventType}`);
       this.socket.emit(eventType, content);
     } catch (error) {
       Dynamo_Log.error(`socket-client(${this.params.name}) Service Emit Event failed: ${this.params?.name} (${this.params?.port})`, error);

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

@@ -186,11 +186,11 @@ export abstract class DynamoNTS_SocketServerService<
                  */
                 if (dynamoNTS_globalSettings.logSocketEventContent) {
                   Dynamo_Log.log(
-                    `--->   incoming socket(${this.params.name}) event: ${DynamoNTS_SocketEventKey.subscribe};` +
+                    `--=>   incoming socket(${this.params.name}) event: ${DynamoNTS_SocketEventKey.subscribe};` +
                     `\ncontent:`, content
                   );
                 } else {
-                  Dynamo_Log.log(`--->   incoming socket(${this.params.name}) event: ${DynamoNTS_SocketEventKey.subscribe}`);
+                  Dynamo_Log.log(`--=>   incoming socket(${this.params.name}) event: ${DynamoNTS_SocketEventKey.subscribe}`);
                 }
 
                 const presence: T_Presence = await this.getPresenceFromSubscrioptionEventContent(content, socket);
@@ -201,10 +201,13 @@ export abstract class DynamoNTS_SocketServerService<
                 await this.subscriptionEvent.executeEventTasks(content, issuer);
 
                 socket.emit(DynamoNTS_SocketEventKey.subscriptionSuccessful, 'subscribe was successful', error => {
-                  Dynamo_Log.error(`Emitting subscriptionSuccessful event failed!\nerror:`, error);
+                  Dynamo_Log.error(
+                    `Emitting subscriptionSuccessful event failed!` +
+                    `\nerror:`, error
+                  );
                 });
                 
-                Dynamo_Log.success(`<===>  socket(${this.params.name}) subscription successfull (${issuer})`);
+                Dynamo_Log.success(`<-==>  socket(${this.params.name}) subscription successfull (${issuer})`);
               } catch (error) {
                 Dynamo_Log.error(`Socket Subscription failed: ${this.params.name} (${this.params.port}) will disconnect now...`, error);
                 socket.emit(DynamoNTS_SocketEventKey.error, error);
@@ -343,7 +346,7 @@ export abstract class DynamoNTS_SocketServerService<
       }
 
       socket.disconnect();
-      Dynamo_Log.info(`<=x=>  socket(${this.params.name}) unsubscription successfull (${issuer})`);
+      Dynamo_Log.info(`<x==>  socket(${this.params.name}) unsubscription successfull (${issuer})`);
     } catch (error) {
       throw new Dynamo_Error({
         ...this._getDefaultErrorSettings(
@@ -394,9 +397,9 @@ export abstract class DynamoNTS_SocketServerService<
     }
   }
 
-  async emitError(presenceIssuerId: string, error: any): Promise<void> {
+  async emitError(presenceIssuerId: string, error: any, issuer: string): Promise<void> {
     try {
-      await this.sendEventForId(presenceIssuerId, DynamoNTS_SocketEventKey.error, error);
+      await this.sendEventForId(presenceIssuerId, DynamoNTS_SocketEventKey.error, error, issuer);
     } catch (error) {
       throw new Dynamo_Error({
         ...this._getDefaultErrorSettings(
@@ -411,7 +414,7 @@ export abstract class DynamoNTS_SocketServerService<
     }
   }
 
-  async sendEventForId(id: string, event: string, content: any/* , error?: (err: any) => void */): Promise<void> {
+  async sendEventForId(id: string, event: string, content: any, issuer: string): Promise<void> {
     try {
       const presence: DynamoNTS_SocketPresence = this.presences.find((pres: DynamoNTS_SocketPresence) => pres.issuerId === id);
 
@@ -428,12 +431,12 @@ export abstract class DynamoNTS_SocketServerService<
         });
       }
 
-      presence.emitEvent(event, content);
+      presence.emitEvent(event, content, issuer);
 
       if (dynamoNTS_globalSettings.logSocketEventContent) {
-        Dynamo_Log.success(` <---  emitted socket(${this.params.name}) event for presence: ${event}, presenceId: ${id}) \ncontent:`, content);
+        Dynamo_Log.success(` <--=  emitted socket(${this.params.name}) event for presence: ${event}, presenceId: ${id}) \ncontent:`, content);
       } else {
-        Dynamo_Log.success(` <---  emitted socket(${this.params.name}) event for presence: ${event}, presenceId: ${id})`);
+        Dynamo_Log.success(` <--=  emitted socket(${this.params.name}) event for presence: ${event}, presenceId: ${id})`);
       }
     } catch (error) {
       try {
@@ -478,12 +481,12 @@ export abstract class DynamoNTS_SocketServerService<
     }
   }
 
-  broadcastEvent(event: string, content: any): void {
+  broadcastEvent(event: string, content: any, issuer: string): void {
     try {
-      Dynamo_Log.log(` <==-- broadcasting socket(${this.params.name}) event: ${event}`);
+      Dynamo_Log.log(` <=-== broadcasting socket(${this.params.name}) event: ${event}`);
 
       this.presences.forEach((presence: DynamoNTS_SocketPresence) => {
-        presence.emitEvent(event, content);
+        presence.emitEvent(event, content, issuer);
       });
     } catch (error) {
       Dynamo_Log.error(`socket(${this.params.name}) Event Broadcast (${event}) failed`, error);