@futdevpro/nts-dynamo 1.5.76 → 1.5.81

package/src/_models/{dynamo-nts-socket-dictionary.ts → dynamo-nts-socket-presence.ts}

@@ -5,26 +5,41 @@ import * as SocketIO from 'socket.io';
 /**
  * socket handling and clarification is under development
  */
-export class DynamoNTS_SocketDictionary {
+export class DynamoNTS_SocketPresence {
   issuerId: string;
   sockets: SocketIO.Socket[];
+  onDestroy: (issuerId: string) => void;
 
   constructor(
-    set?: {
+    set: {
       issuerId: string,
       sockets: SocketIO.Socket[],
+      onDestroy?: (issuerId: string) => void,
     }
   ) {
-    this.issuerId = set.issuerId;
-    if (!set.sockets.length) {
+    if (!set?.issuerId) {
       throw new Dynamo_Error({ 
         status: 406, 
         errorCode: 'NTS-SD0-C00',
         addECToUserMsg: true,
-        message: 'trying to create DynamoNTS_SocketDictionary without a single active socket',
+        message: 'trying to create DynamoNTS_SocketPresence without a valid issuerId!',
+        userMessage: 'We encountered an unhandled Server Error, please contact the responsible development team.'
+      });
+    }
+
+    this.issuerId = set.issuerId;
+    this.onDestroy = set.onDestroy ?? (id => {});
+
+    if (!set?.sockets?.length) {
+      throw new Dynamo_Error({ 
+        status: 406, 
+        errorCode: 'NTS-SD0-C01',
+        addECToUserMsg: true,
+        message: 'trying to create DynamoNTS_SocketPresence without a single active socket!',
         userMessage: 'We encountered an unhandled Server Error, please contact the responsible development team.'
       });
     }
+
     this.sockets = set.sockets;
   }
 
@@ -38,5 +53,6 @@ export class DynamoNTS_SocketDictionary {
       socket.emit(event, content);
     });
   }
+
 }
 

package/src/_models/dynamo-nts-socket-service-params.ts

@@ -30,6 +30,7 @@ export class DynamoNTS_SocketServiceParams {
     
     if (set.getIdFromSubscrioption) {
       this.getIdFromSubscrioption = set.getIdFromSubscrioption;
+      
       if (set.groupActiveSocketsBy) {
         Dynamo_Log.error(
           `setting groupActiveSocketsBy on DynamoNTS_SocketService (${this.name}) won't take effect, ` +

package/src/_models/index.ts

@@ -2,11 +2,11 @@
 
 // MODELS
 export * from './dynamo-nts-api-call-params';
-export * from './dynamo-nts-app-params';
+//export * from './dynamo-nts-app-params';
 export * from './dynamo-nts-endpoint-params';
 export * from './dynamo-nts-global-settings';
 export * from './dynamo-nts-routing-module-settings';
 export * from './dynamo-nts-socket-event-params';
 export * from './dynamo-nts-socket-service-params';
-export * from './dynamo-nts-socket-dictionary';
+export * from './dynamo-nts-socket-presence';
 

package/src/_modules/app-extended.index.ts

@@ -1,17 +1,22 @@
 
 // SERVICES
-export * from '../_services/dynamo-nts-app';
 export * from '../_services/dynamo-nts-app-extended';
 export * from '../_services/dynamo-nts-global.service';
 export * from '../_services/dynamo-nts-routing-module.service';
 export * from '../_services/dynamo-nts-shared.service';
+export * from '../_services/dynamo-nts-socket.service';
+
+// INTERFACES
+export * from '../_interfaces/global-service-settings.interface';
+export * from '../_interfaces/port-settings.interface';
+export * from '../_interfaces/certification-settings.interface';
 
 // MODELS
 export * from '../_models/dynamo-nts-app-params';
 export * from '../_models/dynamo-nts-endpoint-params';
 export * from '../_models/dynamo-nts-global-settings';
 export * from '../_models/dynamo-nts-routing-module-settings';
-export * from '../_models/dynamo-nts-socket-dictionary';
+export * from '../_models/dynamo-nts-socket-presence';
 
 // ENUMS
 export * from '../_enums/dynamo-nts-route-security.enum';

package/src/_modules/app.index.ts

@@ -5,6 +5,11 @@ export * from '../_services/dynamo-nts-global.service';
 export * from '../_services/dynamo-nts-routing-module.service';
 export * from '../_services/dynamo-nts-shared.service';
 
+// INTERFACES
+export * from '../_interfaces/global-service-settings.interface';
+export * from '../_interfaces/port-settings.interface';
+export * from '../_interfaces/certification-settings.interface';
+
 // MODELS
 export * from '../_models/dynamo-nts-app-params';
 export * from '../_models/dynamo-nts-endpoint-params';

package/src/_services/dynamo-nts-app-extended.ts

@@ -2,11 +2,12 @@
 import * as SocketIO from 'socket.io';
 import * as Http from 'http';
 
-import { DynamoNTS_RouteSecurity } from '../_enums/dynamo-nts-route-security.enum';
+import { Dynamo_Log } from '@futdevpro/fsm-dynamo';
+
 import { DynamoNTS_App } from './dynamo-nts-app';
+import { DynamoNTS_RouteSecurity } from '../_enums/dynamo-nts-route-security.enum';
 import { DynamoNTS_SocketService } from './dynamo-nts-socket.service';
 import { DynamoNTS_SocketSecurity } from '../_enums/dynamo-nts-socket-security.enum';
-import { Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
 /**
  * This will be the MAIN service of our server project,
@@ -170,6 +171,7 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
       }
       httpSocketServer = Http.createServer(this.openExpress);
     }
+
     if (this.socketSecurity !== DynamoNTS_RouteSecurity.open) {
       if (!this.httpsServer) {
         if (this.cert) {
@@ -219,9 +221,11 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
       if (service.security === DynamoNTS_SocketSecurity.open) {
         if (this.debugLog) console.log(`\nsocket setup (open): ${service.name}:${service.port}`);
         service.setupSocketServer(new SocketIO.Server(httpSocketServer));
+
       } else if (service.security === DynamoNTS_SocketSecurity.secure) {
         if (this.debugLog) console.log(`\nsocket setup (secure): ${service.name}:${service.port}`);
         service.setupSocketServer(new SocketIO.Server(this.httpsServer));
+        
       } else {
         let error = new Error(`INVALID Socket Service security: ${service.security} on ${service.name}`);
         let errorStack: string[] = error.stack.split('\n');

package/src/_services/dynamo-nts-app.spec.ts

@@ -0,0 +1,14 @@
+
+
+describe('DynamoNTS_App', () => {
+  it('should create an instance', () => {
+    expect(true).toBeTruthy();
+  });
+
+  /* it('should ') */
+
+  xit('should create an instance NOT', () => {
+    expect(false).toBeTruthy();
+  });
+});
+

package/src/_services/dynamo-nts-app.ts

@@ -1,28 +1,22 @@
 
-import { DynamoNTS_AppParams } from '../_models/dynamo-nts-app-params';
 import Mongoose = require("mongoose");
 import Express = require("express");
 import * as Https from 'https';
 import * as FileSystem from 'fs';
 import * as BodyParser from 'body-parser';
 
+import { Dynamo_Log } from '@futdevpro/fsm-dynamo';
+
+import { DynamoNTS_AppParams } from '../_models/dynamo-nts-app-params';
 import { DynamoNTS_SingletonService } from './dynamo-nts-singleton.service';
 import { DynamoNTS_RouteSecurity } from '../_enums/dynamo-nts-route-security.enum';
 import { DynamoNTS_RoutingModule } from './dynamo-nts-routing-module.service';
 import { DynamoNTS_EndpointParams } from '../_models/dynamo-nts-endpoint-params';
-import { dynamoNTS_GlobalSettings } from '../_constants';
-import { Dynamo_Log } from '@futdevpro/fsm-dynamo';
-import { DynamoNTS_GlobalService, DynamoNTS_GlobalServiceSettings } from './dynamo-nts-global.service';
-
-export interface DynamoNTS_CertificationSettings {
-  keyPath: FileSystem.PathLike,
-  certPath: FileSystem.PathLike,
-}
-
-export interface DynamoNTS_PortSettings {
-  httpPort?: number,
-  httpsPort?: number,
-}
+import { DynamoNTS_GlobalService } from './dynamo-nts-global.service';
+import { DynamoNTS_PortSettings } from '../_interfaces/port-settings.interface';
+import { DynamoNTS_CertificationSettings } from '../_interfaces/certification-settings.interface';
+import { DynamoNTS_GlobalServiceSettings } from '../_interfaces/global-service-settings.interface';
+import { dynamoNTS_GlobalSettings } from '../_constants/dynamo-nts-global-settings';
 
 /**
  * This will be the MAIN service of our server project,

package/src/_services/dynamo-nts-auth.service.ts

@@ -1,5 +1,6 @@
 
 import { NextFunction, Request, Response } from 'express';
+
 import { Dynamo_Error } from '@futdevpro/fsm-dynamo';
 
 import { DynamoNTS_SingletonService } from './dynamo-nts-singleton.service';

package/src/_services/dynamo-nts-controller.service.ts

@@ -1,8 +1,9 @@
 
 
 import { Dynamo_Log } from '@futdevpro/fsm-dynamo';
-import { DynamoNTS_EndpointParams } from '../_models/dynamo-nts-endpoint-params';
+
 import { DynamoNTS_SingletonService } from './dynamo-nts-singleton.service';
+import { DynamoNTS_EndpointParams } from '../_models/dynamo-nts-endpoint-params';
 
 /**
  * Basic controller for endpoint handlings

package/src/_services/dynamo-nts-data.service.ts

@@ -31,6 +31,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
 
   depKey?: string;
   depDBServiceKey?: string;
+  depKeyIsUnique?: boolean;
   private depDataDBService: DynamoNTS_DBService<any>;
 
   dataParams: Dynamo_DataParams;
@@ -116,7 +117,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
           status: 417, 
           errorCode: 'NTS-DS0-GI1',
           addECToUserMsg: true,
-          message: `ID is missing! (maybe you wanted to use getDataByDependencyId() instead...) (${this.dataParams.dataName})`,
+          message: `getDataById failed, ID is missing! (maybe you wanted to use getDataByDependencyId() instead...) (${this.dataParams.dataName})`,
           userMessage: this.defaultErrorUserMsg
         });
       }
@@ -155,7 +156,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
           status: 417, 
           errorCode: 'NTS-DS0-GD1',
           addECToUserMsg: true,
-          message: `'dependencyDataIdKey is missing from service! (${this.dataParams.dataName})`,
+          message: `getDataByDependencyId failed, dependencyDataIdKey is missing from service! (${this.dataParams.dataName})`,
           userMessage: this.defaultErrorUserMsg
         });
       }
@@ -165,14 +166,14 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
           status: 417, 
           errorCode: 'NTS-DS0-GD2',
           addECToUserMsg: true,
-          message: `${this.depKey} is missing! (${this.dataParams.dataName})`,
+          message: `getDataByDependencyId failed, ${this.depKey} is missing! (${this.dataParams.dataName})`,
           userMessage: this.defaultErrorUserMsg
         });
       }
 
       const dataExists: T = await this.dataDBService.getDataByDependencyId(dependencyId ?? this.data[this.depKey]).catch(error => {
         if (error?.errorCode === 'NTS-DBS-GD2') {
-          Dynamo_Log.warn(`getDataByDependencyId ${this.dataParams.dataName} (${this.depKey}: ${dependencyId ?? this.data[this.depKey]}) didn't found any.`);
+          Dynamo_Log.warn(`getDataByDependencyId failed; ${this.dataParams.dataName} (${this.depKey}: ${dependencyId ?? this.data[this.depKey]}) didn't found any.`);
           return null;
         } else {
           throw error;
@@ -220,7 +221,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
           status: 417, 
           errorCode: 'NTS-DS0-GLD2',
           addECToUserMsg: true,
-          message: `${this.depKey} is missing (${this.dataParams.dataName})`,
+          message: `getDataListByDependencyId failed, ${this.depKey} is missing (${this.dataParams.dataName})`,
           userMessage: this.defaultErrorUserMsg
         });
       }
@@ -517,7 +518,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
           });
         }
 
-        if (this.dataParams.modelParams.find((key: Dynamo_DataPropertyParams) => key.key === this.depKey).unique) {
+        if (this.depKeyIsUnique) {
           dataExists = await this.getDataByDependencyId(null, true);
 
           if (dataExists) {
@@ -551,7 +552,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
           status: 417, 
           errorCode: 'NTS-DS0-SD0',
           addECToUserMsg: true,
-          message: `modifyData was unsuccessful (${this.dataParams.dataName})`, 
+          message: `saveData was unsuccessful (${this.dataParams.dataName})`, 
           userMessage: this.defaultErrorUserMsg, 
           error: error 
         });
@@ -569,7 +570,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
           status: 417, 
           errorCode: 'NTS-DS0-DD1',
           addECToUserMsg: true,
-          message: `ID is missing! (${this.dataParams.dataName})` ,
+          message: `deleteData failed, ID is missing! (${this.dataParams.dataName})` ,
           userMessage: this.defaultErrorUserMsg, 
         });
       }
@@ -613,7 +614,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
             status: 422, 
             errorCode: 'NTS-DS0-VD1',
             addECToUserMsg: true,
-            message: `${this.dataParams.modelParams[i].key} is missing! (${this.dataParams.modelParams[i].required ? 'required' : 'index'}) (${this.dataParams.dataName})`,
+            message: `validateForSave failed, ${this.dataParams.modelParams[i].key} is missing! (${this.dataParams.modelParams[i].required ? 'required' : 'index'}) (${this.dataParams.dataName})`,
             userMessage: this.defaultValidationErrorUserMsg
           });
         }
@@ -626,7 +627,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
             status: 422, 
             errorCode: 'NTS-DS0-VD2',
             addECToUserMsg: true,
-            message: `${this.dataParams.modelParams[i].key} is not a date! (${this.dataParams.dataName})`,
+            message: `validateForSave failed, ${this.dataParams.modelParams[i].key} is not a date! (${this.dataParams.dataName})`,
             userMessage: this.defaultValidationErrorUserMsg
           });
         }
@@ -661,9 +662,14 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
     const dependencyParam: Dynamo_DataPropertyParams = this.dataParams.modelParams.find((modelParams: Dynamo_DataPropertyParams) => modelParams.isDependencyHook);
     if (dependencyParam) {
       this.depKey = dependencyParam.key;
+
       if (dependencyParam.dependencyDataName) {
         this.depDBServiceKey = dependencyParam.dependencyDataName;
       }
+
+      if (dependencyParam.unique) {
+        this.depKeyIsUnique = true;
+      }
     }
   }
 

package/src/_services/dynamo-nts-db.service.ts

@@ -1,7 +1,10 @@
 
 import * as mongoose from 'mongoose';
 import { Schema } from 'mongoose';
-import { Dynamo_Metadata, Dynamo_DataParams, Dynamo_DataPropertyParams, Dynamo_Error } from '@futdevpro/fsm-dynamo';
+
+import { 
+  Dynamo_Metadata, Dynamo_DataParams, Dynamo_DataPropertyParams, Dynamo_Error 
+} from '@futdevpro/fsm-dynamo';
 
 /**
  * 
@@ -47,7 +50,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata, F extends T = any, U
           status: 204, 
           errorCode: 'NTS-DBS-CD1',
           addECToUserMsg: true,
-          message: `save ${this.dataParams.dbName} result not found! (NTS DB)`,
+          message: `createData failed, save ${this.dataParams.dbName} result not found! (NTS DB)`,
           userMessage: this.defaultErrorUserMsg
         });
       }
@@ -59,7 +62,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata, F extends T = any, U
           status: 422, 
           errorCode: 'NTS-DBS-CD0',
           addECToUserMsg: true,
-          message: `Create new ${this.dataParams.dbName} was unsuccessful (NTS DB)`, 
+          message: `createData failed, Create new ${this.dataParams.dbName} was unsuccessful (NTS DB)`, 
           userMessage: this.defaultErrorUserMsg, 
           error 
         });
@@ -93,7 +96,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata, F extends T = any, U
           status: 204, 
           errorCode: 'NTS-DBS-FU1',
           addECToUserMsg: true,
-          message: `modify ${this.dataParams.dbName} result not found! (NTS DB)`,
+          message: `modifyData failed, modify ${this.dataParams.dbName} result not found! (NTS DB)`,
           userMessage: this.defaultErrorUserMsg,
         });
       }
@@ -102,7 +105,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata, F extends T = any, U
         status: 417, 
         errorCode: 'NTS-DBS-FU0',
         addECToUserMsg: true,
-        message: `modify ${this.dataParams.dbName} was unsuccessful (NTS DB)`, 
+        message: `modifyData ${this.dataParams.dbName} was unsuccessful (NTS DB)`, 
         userMessage: this.defaultErrorUserMsg, 
         error 
       });

package/src/_services/dynamo-nts-email.service.ts

@@ -3,6 +3,7 @@ import * as FileSystem from 'fs';
 import * as Path from 'path';
 import * as NodeMailer from 'nodemailer';
 import { Options as MailOptions, Attachment } from 'nodemailer/lib/mailer';
+
 import { Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
 /**

package/src/_services/dynamo-nts-global.service.ts

@@ -1,7 +1,9 @@
 
 
 import { Dynamo_Metadata, Dynamo_DataParams, Dynamo_Log } from '@futdevpro/fsm-dynamo';
-import { DynamoNTS_AppParams } from '../_models';
+
+import { DynamoNTS_GlobalServiceSettings } from '../_interfaces/global-service-settings.interface';
+import { DynamoNTS_AppParams } from '../_models/dynamo-nts-app-params';
 
 import { DynamoNTS_AuthService } from './dynamo-nts-auth.service';
 import { DynamoNTS_DBServiceCollection } from './dynamo-nts-db-service-collection.service';
@@ -11,23 +13,6 @@ import { DynamoNTS_SingletonService } from './dynamo-nts-singleton.service';
 import { DynamoNTS_SocketServiceCollection } from './dynamo-nts-socket-service-collection.service';
 import { DynamoNTS_SocketService } from './dynamo-nts-socket.service';
 
-export interface DynamoNTS_GlobalServiceSettings {
-  /**
-   * You need to setup your Own Auth Service extending the DynamoBEAuthService class
-   */
-  authService?: DynamoNTS_AuthService,
-
-  /**
-   * You can setup your Own Email Service extending the DynamoBEEmailServiceCollection class
-   */
-  emailServiceCollection?: DynamoNTS_EmailServiceCollection,
-
-  /**
-   * you can setup data tables by passing a DynamoBEDataParams list at this point 
-   */
-  dbModels: Dynamo_DataParams[],
-}
-
 /**
  * This is the main Global/Core Service Collection used by DynamoBE, 
  * you also can use this to access main services as 

package/src/_services/dynamo-nts-routing-module.service.ts

@@ -1,5 +1,6 @@
 
 import { Router } from 'express';
+
 import { Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
 import { dynamoNTS_GlobalSettings } from '../_constants/dynamo-nts-global-settings';

package/src/_services/dynamo-nts-shared.service.spec.ts

@@ -0,0 +1,10 @@
+import { DynamoNTS_Shared } from './dynamo-nts-shared.service';
+
+describe('DynamoNTS_Shared', () => {
+  it('fns should be accessible', () => {
+    expect(DynamoNTS_Shared.getIpFromRequest).toBeTruthy();
+    expect(DynamoNTS_Shared.getLocationDataByRequest).toBeTruthy();
+    expect(DynamoNTS_Shared.getLocationByIp).toBeTruthy();
+    expect(DynamoNTS_Shared.prompt).toBeTruthy();
+  });
+});

package/src/_services/dynamo-nts-shared.service.ts

@@ -1,7 +1,8 @@
 
 import * as ReadLine from 'readline';
-import { Request } from 'express';
 import * as GeoIp from 'geoip-lite';
+import { Request } from 'express';
+
 import { GeoIpLocation, Dynamo_Shared } from '@futdevpro/fsm-dynamo/shared-service';
 
 /**