@futdevpro/nts-dynamo 1.7.7 → 1.7.9

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

@@ -4,18 +4,18 @@ export class DynamoNTS_HttpSettings {
   httpPort?: number;
   httpsPort?: number;
 
-  httpEncodeSettings?: BodyParser.OptionsUrlencoded = {
+  httpUrlencoded?: BodyParser.OptionsUrlencoded = {
     limit: '50mb', 
     extended: true,
   };
-  httpJsonSettings?: BodyParser.OptionsJson = {
+  httpJson?: BodyParser.OptionsJson = {
     limit: '50mb',
   };
-  httpsEncodeSettings?: BodyParser.OptionsUrlencoded = {
-    limit: '50mb', 
+  httpsUrlencoded?: BodyParser.OptionsUrlencoded = {
+    limit: '50mb',
     extended: true,
   };
-  httpsJsonSettings?: BodyParser.OptionsJson = {
+  httpsJson?: BodyParser.OptionsJson = {
     limit: '50mb',
   };
 

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

@@ -14,7 +14,7 @@ export class DynamoNTS_SocketPresence {
   `We encountered an unhandled Socket Error, ` +
   `\nplease contact the responsible development team.`; 
   
-  sockets?: SocketIO.Socket[] = [];
+  sockets: SocketIO.Socket[] = [];
   
   constructor(
     set: {
@@ -23,7 +23,7 @@ export class DynamoNTS_SocketPresence {
       onDestroy?: (issuerId: string) => void,
 
       defaultErrorUserMsg?: string,
-      sockets?: SocketIO.Socket[],
+      sockets: SocketIO.Socket[],
 
       issuer: string,
     },

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

@@ -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);
     }
   }