@futdevpro/nts-dynamo 1.7.1 → 1.7.2

package/package.json

@@ -1,23 +1,22 @@
 {
   "name": "@futdevpro/nts-dynamo",
-  "version": "01.07.01",
+  "version": "01.07.02",
   "description": "Dynamic NodeTS (NodeJS-Typescript), MongoDB Backend System Framework by Future Development Program Ltd.",
   "scripts": {
     "prep": "npm i rimraf nodemon -g",
-
     "start": "npm run prep && nodemon",
 
-    "deploy": "npm run build",
-    "build": "npm run build-simple && jasmine && npm publish",
-    "build-tgz": "npm run build-simple && jasmine && npm pack && move ./*.tgz ../npm-tgz-collection",
+    "deploy": "npm run clean && npm run build-all",
+    "build": "npm run build-base && jasmine && npm publish",
+    "build-tgz": "npm run build-base && jasmine && npm pack && move ./*.tgz ../npm-tgz-collection",
+    "build-all": "npm run build-tgz && npm run build",
 
     "build-base": "npm i && rimraf ./lib && npx tsc",
-    "build-simple": "npm run build-base",
-    "build-clean": "npm run clean && npm run build-base",
+    "clean-build": "npm run clean && npm run build-base",
     "clean": "npm run prep && rimraf ./lib && rimraf package-lock.json && rimraf ./node_modules",
 
-    "test": "npm run build-simple && jasmine",
-    "test-build": "npm run build-clean && jasmine"
+    "test": "npm run build-base && jasmine",
+    "clean-test": "npm run clean-build && jasmine"
   },
   "main": "./lib/index.js",
   "module": "./lib/index.js",
@@ -221,8 +220,8 @@
     "@types/socket.io-client": "^3.0.0",
     "jasmine": "^5.0.2",
     "jasmine-ts": "^0.4.0",
+    "socket.io": "^4.5.2",
     "nodemon": "^3.0.1",
-    "rimraf": "^5.0.1",
-    "socket.io": "^4.5.2"
+    "rimraf": "^5.0.1"
   }
 }

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

@@ -250,8 +250,8 @@ export class DynamoNTS_EndpointParams{
         }
       }
     } catch (error) {
-      console.error(
-        `\n\nDYNAMO MULTILEVEL ERROR:DynamoNTS_EndpointParams:error: (${this.name}, ${this.endpoint})` +
+      Dynamo_Log.error(
+        `\n\nDYNAMO MULTILEVEL ERROR:DynamoNTS_EndpointParams: error: (${this.name}, ${this.endpoint})` +
         `\n(DYNAMO MULTILEVEL ERROR means, that the ERRORHANDLING is ALSO FAILED, and the error message was not sent.)` + 
         `\nERROR:`, error, '\n'
       );

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

@@ -1,10 +1,16 @@
 
+
+
+
+import { Request, Response } from 'express';
+
 import { Dynamo_DataParams } from '@futdevpro/fsm-dynamo';
 
 import { DynamoNTS_ServiceCollection } from '../../_services/core/service-collection.service';
 import { DynamoNTS_EmailService } from '../../_services/core/email.service';
 import { DynamoNTS_AuthService } from '../../_services/core/auth.service';
 
+
 export interface DynamoNTS_GlobalServiceSettings {
   /**
    * You need to setup your Own Auth Service extending the DynamoNTS_AuthService class
@@ -30,5 +36,10 @@ export interface DynamoNTS_GlobalServiceSettings {
    * you can setup socket services by passing a DynamoNTS_SocketServiceCollection list at this point
    */
   /* socketServiceCollection?: DynamoNTS_SocketServiceCollection, */
+
+  /**
+   * you can setup global error handler by passing a function at this point
+   */
+  errorHandler?: (err: any, req?: Request, res?: Response, issuer?: string) => Promise<void>,
 }
 

package/src/_modules/usage/usage.controller.ts

@@ -75,7 +75,6 @@ export class UsageController extends DynamoNTS_Controller {
                 name: 'closeSession',
                 type: DynamoNTS_HttpCallType.get,
                 endpoint: usageModuleSettings.endPoints.closeSession,
-                preProcessess: [ this.authService.authTokenPermAccUsageData ],
                 tasks: [ 
                     async (req: Request, res: Response, issuer: string) => {
                         const usageService = new UsageService({

package/src/_services/core/email.service.ts

@@ -168,7 +168,7 @@ export class DynamoNTS_EmailService {
         });
       });
     } catch (error) {
-      if (error.includes('all recipients were rejected')) {
+      if (error?.includes?.('all recipients were rejected')) {
         throw new Dynamo_Error({
           ...this._getDefaultErrorSettings('sendEmail', error, issuer),
 

package/src/_services/core/global.service.ts

@@ -37,11 +37,8 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
   dbServiceCollection: DynamoNTS_ServiceCollection<DynamoNTS_DBService<any>>; // DynamoNTS_DBServiceCollection;
   emailServiceCollection: DynamoNTS_ServiceCollection<DynamoNTS_EmailService>; // DynamoNTS_EmailServiceCollection;
 
-  private static _globalErrorHandler?: (err: any, req?: Request, res?: Response, issuer?: string) => Promise<void>;
-  static get globalErrorHandler(): (err: any, req?: Request, res?: Response, issuer?: string) => Promise<void> { 
-    return this._globalErrorHandler; 
-  }
-  
+  static globalErrorHandler?: (err: any, req?: Request, res?: Response, issuer?: string) => Promise<void>;
+    
   /**
    * You need to setup global Services through this function
    */
@@ -66,6 +63,7 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
 
       this.instance.authService = set.authService;
       this.instance.emailServiceCollection = set.emailServiceCollection;
+      DynamoNTS_GlobalService.globalErrorHandler = set.errorHandler;
     } catch (error) {
       Dynamo_Log.error(`Failed to create DynamoNTS_GlobalService.`, error);
       /* error = new Dynamo_Error({
@@ -80,10 +78,6 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
     this._params = params;
   }
 
-  static setGlobalErrorHandler(handler?: (err: any, req: Request, res: Response, issuer: string) => Promise<void>): void {
-    this.instance.globalErrorHandler = handler;
-  }
-
   /**
    * 
    * @returns 

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

@@ -264,7 +264,6 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
       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();
@@ -899,9 +898,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);
@@ -204,7 +204,7 @@ export abstract class DynamoNTS_SocketServerService<
                   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 +343,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(
@@ -431,9 +431,9 @@ export abstract class DynamoNTS_SocketServerService<
       presence.emitEvent(event, content);
 
       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 {
@@ -480,7 +480,7 @@ export abstract class DynamoNTS_SocketServerService<
 
   broadcastEvent(event: string, content: any): 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);