@futdevpro/nts-dynamo 1.7.5 → 1.7.8

package/src/_constants/mocks/app-extended-server.mock.ts

@@ -5,7 +5,7 @@ import { customDataModelParams } from '@futdevpro/fsm-dynamo/custom-data-module'
 
 import { DynamoNTS_AppParams } from '../../_models/control-models/app-params.control-model';
 import { DynamoNTS_GlobalServiceSettings } from '../../_models/interfaces/global-service-settings.interface';
-import { DynamoNTS_PortSettings } from '../../_models/control-models/port-settings.control-model';
+import { DynamoNTS_HttpSettings } from '../../_models/control-models/http-settings.control-model';
 import { getTestRoutingModule } from '../../_modules/test';
 import { getUsageRoutingModule } from '../../_modules/usage';
 import { DynamoNTS_SingletonService } from '../../_services';
@@ -40,7 +40,7 @@ export class DynamoNTS_AppExtendedBase_Mock extends DynamoNTS_AppExtended {
     };
   }
 
-  getPortSettings(): DynamoNTS_PortSettings {
+  getPortSettings(): DynamoNTS_HttpSettings {
     return {};
   }
 
@@ -89,7 +89,7 @@ export class DynamoNTS_AppExtendedFull_Mock extends DynamoNTS_AppExtended {
     };
   }
 
-  getPortSettings(): DynamoNTS_PortSettings {
+  getPortSettings(): DynamoNTS_HttpSettings {
     return {
       httpPort: 53535,
     };
@@ -159,7 +159,7 @@ export class DynamoNTS_AppWbMock_Mock extends DynamoNTS_AppExtended {
     };
   }
 
-  getPortSettings(): DynamoNTS_PortSettings {
+  getPortSettings(): DynamoNTS_HttpSettings {
     return {
       httpPort: 53535,
     };

package/src/_constants/mocks/app-server.mock.ts

@@ -5,7 +5,7 @@ import { customDataModelParams } from '@futdevpro/fsm-dynamo/custom-data-module'
 
 import { DynamoNTS_AppParams } from '../../_models/control-models/app-params.control-model';
 import { DynamoNTS_GlobalServiceSettings } from '../../_models/interfaces/global-service-settings.interface';
-import { DynamoNTS_PortSettings } from '../../_models/control-models/port-settings.control-model';
+import { DynamoNTS_HttpSettings } from '../../_models/control-models/http-settings.control-model';
 import { getTestRoutingModule } from '../../_modules/test';
 import { getUsageRoutingModule } from '../../_modules/usage';
 import { DynamoNTS_SingletonService } from '../../_services';
@@ -34,7 +34,7 @@ export class DynamoNTS_AppBase_Mock extends DynamoNTS_App {
     };
   }
 
-  getPortSettings(): DynamoNTS_PortSettings {
+  getPortSettings(): DynamoNTS_HttpSettings {
     return {};
   }
 
@@ -79,7 +79,7 @@ export class DynamoNTS_AppFull_Mock extends DynamoNTS_App {
     };
   }
 
-  getPortSettings(): DynamoNTS_PortSettings {
+  getPortSettings(): DynamoNTS_HttpSettings {
     return {
       httpPort: 10101,
     };
@@ -114,7 +114,7 @@ export class DynamoNTS_AppTEST_Mock extends DynamoNTS_App {
     overrides: {
       getAppParams?(): DynamoNTS_AppParams;
       getGlobalServiceCollection?(): DynamoNTS_GlobalServiceSettings;
-      getPortSettings?(): DynamoNTS_PortSettings;
+      getPortSettings?(): DynamoNTS_HttpSettings;
       getRoutingModules?(): DynamoNTS_RoutingModule[];
       getRootServices?(): Promise<DynamoNTS_SingletonService[]>;
     }
@@ -161,7 +161,7 @@ export class DynamoNTS_AppTEST_Mock extends DynamoNTS_App {
     };
   }
 
-  getPortSettings(): DynamoNTS_PortSettings {
+  getPortSettings(): DynamoNTS_HttpSettings {
     return {
       httpPort: 10203,
     };

package/src/_constants/mocks/socket-server.mock.ts

@@ -26,8 +26,9 @@ export class DynamoNTS_SocketServer_Mock extends DynamoNTS_SocketServerService<D
   protected async getPresenceFromSubscrioptionEventContent(socketSubscription: any, socket: Socket): Promise<DynamoNTS_SocketPresence> {
     return new DynamoNTS_SocketPresence({ 
       issuerId: socketSubscription.issuerId, 
-      sockets: [ socket ] 
-    }, 'ISSUER socketServer_Mock');
+      sockets: [ socket ],
+      issuer: 'ISSUER socketServer_Mock',
+    });
   }
 }
 

package/src/_models/control-models/http-settings.control-model.ts

@@ -0,0 +1,27 @@
+
+import * as BodyParser from 'body-parser';
+export class DynamoNTS_HttpSettings {
+  httpPort?: number;
+  httpsPort?: number;
+
+  httpUrlencoded?: BodyParser.OptionsUrlencoded = {
+    limit: '50mb', 
+    extended: true,
+  };
+  httpJson?: BodyParser.OptionsJson = {
+    limit: '50mb',
+  };
+  httpsUrlencoded?: BodyParser.OptionsUrlencoded = {
+    limit: '50mb',
+    extended: true,
+  };
+  httpsJson?: BodyParser.OptionsJson = {
+    limit: '50mb',
+  };
+
+  constructor(
+    set: DynamoNTS_HttpSettings
+  ) {
+    Object.assign(this, set);
+  }
+}

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

@@ -14,11 +14,19 @@ export class DynamoNTS_SocketPresence {
   `We encountered an unhandled Socket Error, ` +
   `\nplease contact the responsible development team.`; 
   
-  sockets?: SocketIO.Socket[] = [];
+  sockets: SocketIO.Socket[] = [];
   
   constructor(
-    set: DynamoNTS_SocketPresence,
-    issuer: string
+    set: {
+      issuerId: string,
+      serviceName?: string,
+      onDestroy?: (issuerId: string) => void,
+
+      defaultErrorUserMsg?: string,
+      sockets: SocketIO.Socket[],
+
+      issuer: string,
+    },
   ) {
     if (!set?.issuerId) {
       throw new Dynamo_Error({ 
@@ -28,7 +36,7 @@ export class DynamoNTS_SocketPresence {
             `trying to create DynamoNTS_SocketPresence without a valid issuerId!` +
             `\nset: ${JSON.stringify(set)}`
           ),
-          issuer
+          set?.issuer
         ),
 
         errorCode: 'NTS-SD0-C00',
@@ -55,7 +63,7 @@ export class DynamoNTS_SocketPresence {
             `trying to create DynamoNTS_SocketPresence without a single active socket!` +
             `\nissuerId: ${this.issuerId}`
           ),
-          issuer
+          set?.issuer
         ),
 
         errorCode: 'NTS-SD0-C01',
@@ -149,7 +157,7 @@ export class DynamoNTS_SocketPresence {
     }
   }
   
-  private _getDefaultErrorSettings?(fnName: string, error: Error | Dynamo_Error, issuer: string): any {
+  private _getDefaultErrorSettings(fnName: string, error: Error | Dynamo_Error, issuer: string) {
     return {
       status: (error as Dynamo_Error)?.___status ?? 406,
       message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS; ${this.serviceName})`,

package/src/_models/interfaces/index.ts

@@ -1,7 +1,7 @@
 
 // INTERFACES
 export * from './global-service-settings.interface';
-export * from '../control-models/port-settings.control-model';
+export * from '../control-models/http-settings.control-model';
 export * from './certification-settings.interface';
 export * from './global-settings.interface';
 export * from './routing-module-settings.interface';

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

@@ -9,7 +9,7 @@ export * from '../_services/socket/socket-server.service';
 
 // INTERFACES
 export * from '../_models/interfaces/global-service-settings.interface';
-export * from '../_models/control-models/port-settings.control-model';
+export * from '../_models/control-models/http-settings.control-model';
 export * from '../_models/interfaces/certification-settings.interface';
 export * from '../_models/interfaces/global-settings.interface';
 export * from '../_models/interfaces/routing-module-settings.interface';

package/src/_modules/app.index.ts

@@ -7,7 +7,7 @@ export * from '../_services/shared.static-service';
 
 // INTERFACES
 export * from '../_models/interfaces/global-service-settings.interface';
-export * from '../_models/control-models/port-settings.control-model';
+export * from '../_models/control-models/http-settings.control-model';
 export * from '../_models/interfaces/certification-settings.interface';
 export * from '../_models/interfaces/global-settings.interface';
 export * from '../_models/interfaces/routing-module-settings.interface';

package/src/_services/base/db.service.ts

@@ -17,7 +17,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
 
   serviceName: string;
 
-  dataModel; // = mongoose.model(this.dataParams.dbName, this.getSchema());
+  dataModel/* : mongoose.Model<T> */; // = mongoose.model(this.dataParams.dbName, this.getSchema());
 
   private depDataName: string;
 
@@ -100,7 +100,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       }
     });
 
-    data = this.stringifyDataId(newData, 'createData');
+    newData = this.stringifyDataId(newData, 'createData');
 
     return data;
   }
@@ -114,10 +114,10 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
     data.__lastModified = new Date();
     data.__lastModifiedBy = issuer;
 
-    const dataModel = new this.dataModel(data);
-    let newData: T = await this.dataModel.findByIdAndUpdate(data._id, dataModel).then(res => {
+    /** EZ A SZAR TELJESEN SZAR, nem friss, a db-be mentett adatokat ad vissza, átír random value-kat */
+    /* let newData: T = */ await this.dataModel.findByIdAndUpdate(data._id, data).then(res => {
       if (res) {
-        return res?.toObject() as T;
+        /* return res?.toObject() as T; */
       } else {
         throw new Dynamo_Error({ 
           ...this._getDefaultErrorSettings(
@@ -141,7 +141,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       });
     });
 
-    data = this.stringifyDataId(newData, 'modifyData');
+    /* newData = this.stringifyDataId(newData, 'modifyData'); */
 
     return data;
   }

package/src/_services/server/app-extended.server.spec.ts

@@ -1,3 +1,4 @@
+import { delay } from '@futdevpro/fsm-dynamo';
 import { DynamoNTS_AppExtendedBase_Mock, DynamoNTS_AppExtendedFull_Mock, DynamoNTS_AppWbMock_Mock } from '../../_constants/mocks/app-extended-server.mock';
 
 describe('DynamoNTS_AppExtended;', () => {
@@ -11,6 +12,8 @@ describe('DynamoNTS_AppExtended;', () => {
 
     afterEach(async () => {
       await app.stop();
+
+      await delay(100);
     });
 
     it('should be created', () => {
@@ -53,6 +56,8 @@ describe('DynamoNTS_AppExtended;', () => {
 
     afterEach(async () => {
       await app.stop();
+
+      await delay(100);
     });
 
     it('should be created', () => {

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

@@ -1,5 +1,5 @@
 
-import { Dynamo_Log } from '@futdevpro/fsm-dynamo';
+import { Dynamo_Log, delay } from '@futdevpro/fsm-dynamo';
 import { DynamoNTS_AppBase_Mock, DynamoNTS_AppFull_Mock } from '../../_constants/mocks/app-server.mock';
 
 describe('DynamoNTS_App AND DynamoNTS_AppExtended?;', () => {
@@ -19,6 +19,8 @@ describe('DynamoNTS_App AND DynamoNTS_AppExtended?;', () => {
 
     afterEach(async () => {
       await app.stop();
+
+      await delay(100);
     });
 
     it('should be created', () => {
@@ -44,6 +46,8 @@ describe('DynamoNTS_App AND DynamoNTS_AppExtended?;', () => {
 
     afterEach(async () => {
       await app.stop();
+
+      await delay(100);
     });
 
     it('should be created', () => {

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

@@ -13,7 +13,7 @@ import { DynamoNTS_SingletonService } from '../base/singleton.service';
 import { DynamoNTS_RouteSecurity } from '../../_enums/route-security.enum';
 import { DynamoNTS_RoutingModule } from '../route/routing-module.service';
 import { DynamoNTS_GlobalService } from '../core/global.service';
-import { DynamoNTS_PortSettings } from '../../_models/control-models/port-settings.control-model';
+import { DynamoNTS_HttpSettings } from '../../_models/control-models/http-settings.control-model';
 import { DynamoNTS_CertificationSettings } from '../../_models/interfaces/certification-settings.interface';
 import { DynamoNTS_GlobalServiceSettings } from '../../_models/interfaces/global-service-settings.interface';
 import { dynamoNTS_globalSettings } from '../../_constants/global-settings.const';
@@ -195,8 +195,8 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
   private _security: DynamoNTS_RouteSecurity;
   protected get security(): DynamoNTS_RouteSecurity { return this._security; }
 
-  protected _portSettings: DynamoNTS_PortSettings;
-  protected get portSettings(): DynamoNTS_PortSettings { return this._portSettings; }
+  protected _portSettings: DynamoNTS_HttpSettings;
+  protected get portSettings(): DynamoNTS_HttpSettings { return this._portSettings; }
 
   private _cert?: DynamoNTS_CertificationSettings;
   protected get cert(): DynamoNTS_CertificationSettings { return this._cert; }
@@ -627,18 +627,18 @@ 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(this._portSettings.httpEncodeSettings));
-    this.openExpress.use(BodyParser.json(this._portSettings.httpJsonSettings));
+    this.openExpress.use(BodyParser.urlencoded(this._portSettings.httpUrlencoded));
+    this.openExpress.use(BodyParser.json(this._portSettings.httpJson));
   }
 
   /**
    * 
    */
-   protected async initSecureExpress(): Promise<void> {
+  protected async initSecureExpress(): Promise<void> {
     if (this.logFn) console.log('\nfn:. initSecureExpress');
     this.secureExpress = Express();    
-    this.secureExpress.use(BodyParser.urlencoded(this._portSettings.httpsEncodeSettings));
-    this.secureExpress.use(BodyParser.json(this._portSettings.httpsJsonSettings));
+    this.secureExpress.use(BodyParser.urlencoded(this._portSettings.httpsUrlencoded));
+    this.secureExpress.use(BodyParser.json(this._portSettings.httpsJson));
 
     const options = {
       key: FileSystem.readFileSync(this._cert.keyPath),
@@ -743,6 +743,9 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
     }
   }
 
+  /**
+   * 
+   */
   private async expressErrorHandling(err, req, res, next): Promise<void> {
     try {
       if (err) {
@@ -760,22 +763,11 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
           '\nres:', res
         );
       }
-
-      res.status(err?.status || 500);
-      res.render('error', {
-        message: err?.message,
-      });
-      res.send(err);
     } catch (error) {
       Dynamo_Log.H_error(
-        'MULTILEVEL ERROR (expressErrorHandling)....', error
+        'MULTILEVEL ERROR (expressErrorHandling)....' +
+        '\n', error
       );
-      
-      res.status(err?.status || 500);
-      res.render('error', {
-        message: err?.message,
-      });
-      res.send(err);
     }
   }
 
@@ -915,7 +907,7 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
   /**
    * MISSING Description (TODO)
    */
-  abstract getPortSettings(): DynamoNTS_PortSettings;
+  abstract getPortSettings(): DynamoNTS_HttpSettings;
 
   /**
    * MISSING Description (TODO)

package/lib/_models/control-models/port-settings.control-model.d.ts

@@ -1,11 +0,0 @@
-import * as BodyParser from 'body-parser';
-export declare class DynamoNTS_PortSettings {
-    httpPort?: number;
-    httpsPort?: number;
-    httpEncodeSettings?: BodyParser.OptionsUrlencoded;
-    httpJsonSettings?: BodyParser.OptionsJson;
-    httpsEncodeSettings?: BodyParser.OptionsUrlencoded;
-    httpsJsonSettings?: BodyParser.OptionsJson;
-    constructor(set: DynamoNTS_PortSettings);
-}
-//# sourceMappingURL=port-settings.control-model.d.ts.map

package/lib/_models/control-models/port-settings.control-model.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"port-settings.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/port-settings.control-model.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAC1C,qBAAa,sBAAsB;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,kBAAkB,CAAC,EAAE,UAAU,CAAC,iBAAiB,CAG/C;IACF,gBAAgB,CAAC,EAAE,UAAU,CAAC,WAAW,CAEvC;IACF,mBAAmB,CAAC,EAAE,UAAU,CAAC,iBAAiB,CAGhD;IACF,iBAAiB,CAAC,EAAE,UAAU,CAAC,WAAW,CAExC;gBAGA,GAAG,EAAE,sBAAsB;CAI9B"}

package/lib/_models/control-models/port-settings.control-model.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"port-settings.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/port-settings.control-model.ts"],"names":[],"mappings":";;;AAEA,MAAa,sBAAsB;IACjC,QAAQ,CAAU;IAClB,SAAS,CAAU;IAEnB,kBAAkB,GAAkC;QAClD,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,gBAAgB,GAA4B;QAC1C,KAAK,EAAE,MAAM;KACd,CAAC;IACF,mBAAmB,GAAkC;QACnD,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,iBAAiB,GAA4B;QAC3C,KAAK,EAAE,MAAM;KACd,CAAC;IAEF,YACE,GAA2B;QAE3B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC3B,CAAC;CACF;AAxBD,wDAwBC"}

package/src/_models/control-models/port-settings.control-model.ts

@@ -1,27 +0,0 @@
-
-import * as BodyParser from 'body-parser';
-export class DynamoNTS_PortSettings {
-  httpPort?: number;
-  httpsPort?: number;
-
-  httpEncodeSettings?: BodyParser.OptionsUrlencoded = {
-    limit: '50mb', 
-    extended: true,
-  };
-  httpJsonSettings?: BodyParser.OptionsJson = {
-    limit: '50mb',
-  };
-  httpsEncodeSettings?: BodyParser.OptionsUrlencoded = {
-    limit: '50mb', 
-    extended: true,
-  };
-  httpsJsonSettings?: BodyParser.OptionsJson = {
-    limit: '50mb',
-  };
-
-  constructor(
-    set: DynamoNTS_PortSettings
-  ) {
-    Object.assign(this, set);
-  }
-}