@futdevpro/nts-dynamo 1.5.77 → 1.5.83

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

@@ -1,7 +1,7 @@
 
 import { Dynamo_Metadata, Dynamo_DataParams, Dynamo_DataPropertyParams, Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
-import { DynamoNTS_DBService } from './dynamo-nts-db.service';
+import { DynamoNTS_DBFilter, DynamoNTS_DBService, DynamoNTS_DBUpdate } from './dynamo-nts-db.service';
 import { DynamoNTS_GlobalService } from './dynamo-nts-global.service';
 
 /**
@@ -117,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
         });
       }
@@ -156,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
         });
       }
@@ -166,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;
@@ -221,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
         });
       }
@@ -285,9 +285,9 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
    * //
    * @returns {T} data: T
    */
-  async findData(findBy: any, dontSetToService?: boolean): Promise<T> {
+  async findData(filterBy: DynamoNTS_DBFilter<T>, dontSetToService?: boolean): Promise<T> {
     try {
-      const dataExists: T = await this.dataDBService.findOne(findBy).catch(error => {
+      const dataExists: T = await this.dataDBService.findOne(filterBy).catch(error => {
         if (error?.errorCode === 'NTS-DBS-FO1') {
           Dynamo_Log.warn(`findData ${this.dataParams.dataName} didn't found any.`);
           return null;
@@ -342,9 +342,9 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
    * //
    * @returns {T[]} dataList: T[]
    */
-  async findDatas(findBy: any, dontSetToService?: boolean): Promise<T[]> {
+  async findDatas(filterBy: DynamoNTS_DBFilter<T>, dontSetToService?: boolean): Promise<T[]> {
     try {
-      const dataListExists: T[] = await this.dataDBService.find(findBy).catch(error => {
+      const dataListExists: T[] = await this.dataDBService.find(filterBy).catch(error => {
         if (error?.errorCode === 'NTS-DBS-F1') {
           Dynamo_Log.warn(`findDatas ${this.dataParams.dataName} didn't found any.`);
           return [];
@@ -425,14 +425,14 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
    * $unset:       // Removes the specified field from a document. (set: "" to value)
    * //
    */
-  async updateData(set: { updateBy?: any, update: any }): Promise<void> {
+  async updateData(set: { filterBy?: DynamoNTS_DBFilter<T>, update: DynamoNTS_DBUpdate<T> }): Promise<void> {
     try {
-      if (set.updateBy) {
-        await this.dataDBService.updateOne(set.updateBy, set.update, this.issuer);
+      if (set.filterBy) {
+        await this.dataDBService.updateOne(set.filterBy, set.update, this.issuer);
       } else if (this.data._id) {
-        await this.dataDBService.updateOne({ _id: this.data._id }, set.update, this.issuer);
+        await this.dataDBService.updateOne({ _id: this.data._id } as DynamoNTS_DBFilter<T>, set.update, this.issuer);
       } else if (this.depKey && this.data[this.depKey]) {
-        await this.dataDBService.updateOne({ [this.depKey]: this.data[this.depKey] }, set.update, this.issuer);
+        await this.dataDBService.updateOne({ [this.depKey]: this.data[this.depKey] } as DynamoNTS_DBFilter<T>, set.update, this.issuer);
       } else {
         throw new Dynamo_Error({
           status: 417, 
@@ -552,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 
         });
@@ -570,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, 
         });
       }
@@ -614,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
           });
         }
@@ -627,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
           });
         }