@futdevpro/nts-dynamo 1.6.20 → 1.6.21

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

@@ -15,11 +15,16 @@ import { DynamoNTS_Controller_Mock } from './controller.mock';
 import { AuthService_Mock } from './auth-service.mock';
 import { DynamoNTS_AppExtended, dynamoNTS_globalSettings, DynamoNTS_SocketServerService } from '../../_modules/app-extended.index';
 import { DynamoNTS_SocketServer_Mock } from './socket-server.mock';
+import { SocketClient_Mock } from './socket-client.mock';
+import { dependency_mock_DataParams, dependent_mock_DataParams } from './data-model.mock';
+import { dynamo_error_default } from '@futdevpro/fsm-dynamo';
+import { EmailServiceCollection_Mock } from './email-service-collection.mock';
 
 /**
  * 
  */
 export class DynamoNTS_AppExtendedBase_Mock extends DynamoNTS_AppExtended {
+
   getAppParams(): DynamoNTS_AppParams {
     return new DynamoNTS_AppParams({
       name: 'test-extended-base',
@@ -55,6 +60,7 @@ export class DynamoNTS_AppExtendedBase_Mock extends DynamoNTS_AppExtended {
  * 
  */
 export class DynamoNTS_AppExtendedFull_Mock extends DynamoNTS_AppExtended {
+
   getAppParams(): DynamoNTS_AppParams {
     return new DynamoNTS_AppParams({
       name: 'test-extended-full',
@@ -62,8 +68,7 @@ export class DynamoNTS_AppExtendedFull_Mock extends DynamoNTS_AppExtended {
       dbName: 'test-full',
     });
   }
-  
-  
+    
   overrideDynamoNTSGlobalSettings(): void {
     /* dynamoNTS_globalSettings.logSetup = true; */
     /* dynamoNTS_globalSettings.defaultRouteSecurity = DynamoNTS_RouteSecurity.open;  */
@@ -74,6 +79,8 @@ export class DynamoNTS_AppExtendedFull_Mock extends DynamoNTS_AppExtended {
       authService: AuthService_Mock.getInstance(),
       /* emailServiceCollection: EmailServiceCollectionService.getInstance(), */
       dbModels: [
+        dependency_mock_DataParams,
+        dependent_mock_DataParams,
 
         usageSessionModelParams,
         customDataModelParams,
@@ -108,6 +115,77 @@ export class DynamoNTS_AppExtendedFull_Mock extends DynamoNTS_AppExtended {
   }
 
   async getRootServices(): Promise<DynamoNTS_SingletonService[]> {
-    return [];
+    return [
+      SocketClient_Mock.getInstance(),
+    ];
+  }
+}
+
+////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////
+
+/**
+ * 
+ */
+export class DynamoNTS_AppWbMock_Mock extends DynamoNTS_AppExtended {
+
+  getAppParams(): DynamoNTS_AppParams {
+    return new DynamoNTS_AppParams({
+      name: 'test-wb-mock',
+      version: 'x.0.101',
+      dbName: 'test-full',
+    });
+  }
+    
+  overrideDynamoNTSGlobalSettings(): void {
+    dynamoNTS_globalSettings.logRequestsContent = true;
+    dynamo_error_default.issuerSystem = '-test-wb-mock-';
+  }
+
+  getGlobalServiceCollection(): DynamoNTS_GlobalServiceSettings {
+    return {
+      authService: AuthService_Mock.getInstance(),
+      emailServiceCollection: EmailServiceCollection_Mock.getInstance(),
+      dbModels: [
+        dependency_mock_DataParams,
+        dependent_mock_DataParams,
+
+        usageSessionModelParams,
+        customDataModelParams,
+      ],      
+    };
+  }
+
+  getPortSettings(): DynamoNTS_PortSettings {
+    return {
+      httpPort: 53535,
+    };
+  }
+
+  getRoutingModules(): DynamoNTS_RoutingModule[] {
+    return [
+      new DynamoNTS_RoutingModule({
+        route: '/test-0',
+        controllers: [
+          DynamoNTS_Controller_Mock.getInstance(),
+        ],
+      }),
+
+      getTestRoutingModule(),
+      getUsageRoutingModule()
+    ];
+  }
+
+  getSocketServices(): DynamoNTS_SocketServerService[] {
+    return [
+      DynamoNTS_SocketServer_Mock.getInstance(),
+    ];
+  }
+
+  async getRootServices(): Promise<DynamoNTS_SingletonService[]> {
+    return [
+      SocketClient_Mock.getInstance(),
+    ];
   }
 }

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

@@ -14,6 +14,7 @@ import { DynamoNTS_App } from '../../_services/server/app.server';
 import { DynamoNTS_Controller_Mock } from './controller.mock';
 import { AuthService_Mock } from './auth-service.mock';
 import { dynamoNTS_globalSettings } from '../global-settings.const';
+import { dependency_mock_DataParams, dependent_mock_DataParams } from './data-model.mock';
 
 /**
  * 
@@ -69,6 +70,8 @@ export class DynamoNTS_AppFull_Mock extends DynamoNTS_App {
       authService: AuthService_Mock.getInstance(),
       /* emailServiceCollection: EmailServiceCollectionService.getInstance(), */
       dbModels: [
+        dependency_mock_DataParams,
+        dependent_mock_DataParams,
 
         usageSessionModelParams,
         customDataModelParams,

package/src/_constants/mocks/data-model.mock.ts

@@ -0,0 +1,83 @@
+import { Dynamo_DataParams, Dynamo_Metadata } from '@futdevpro/fsm-dynamo';
+
+
+export class Depemndency_Mock extends Dynamo_Metadata {
+  string?: string;
+  number?: number;
+  date?: Date;
+  boolean?: boolean;
+  array?: string[];
+  object?: any;
+  objectArray?: any[];
+  objectArrayArray?: any[][];
+
+  constructor(
+    set?: Depemndent_Mock
+  ) {
+    super(set);
+
+    if (set) {
+      Object.assign(this, set);
+    }
+  }
+}
+
+export const dependency_mock_DataParams = new Dynamo_DataParams({
+  dataName: 'dependencyMock',
+  modelParams: [
+    { key: 'string', type: 'string', },
+    { key: 'number', type: 'number', },
+    { key: 'date', type: 'Date', },
+    { key: 'boolean', type: 'boolean', },
+    { key: 'array', type: 'string[]', },
+    { key: 'object', type: 'any', },
+    { key: 'objectArray', type: 'any[]', },
+    { key: 'objectArrayArray', type: 'any[][]', },
+  ]
+})
+
+////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////
+
+export class Depemndent_Mock extends Dynamo_Metadata {
+  dependencyId?: string;
+
+  string?: string;
+  number?: number;
+  date?: Date;
+  boolean?: boolean;
+  array?: string[];
+  object?: any;
+  objectArray?: any[];
+  objectArrayArray?: any[][];
+
+  constructor(
+    set?: Depemndent_Mock
+  ) {
+    super(set);
+
+    if (set) {
+      Object.assign(this, set);
+    }
+  }
+}
+
+export const dependent_mock_DataParams = new Dynamo_DataParams({
+  dataName: 'dependentMock',
+  modelParams: [
+    { key: 'dependencyId', type: 'string',
+      unique: true, required: true,
+      isDependencyHook: true,
+      dependencyDataName:  dependency_mock_DataParams.dataName,
+    },
+    { key: 'string', type: 'string', },
+    { key: 'number', type: 'number', },
+    { key: 'date', type: 'Date', },
+    { key: 'boolean', type: 'boolean', },
+    { key: 'array', type: 'string[]', },
+    { key: 'object', type: 'any', },
+    { key: 'objectArray', type: 'any[]', },
+    { key: 'objectArrayArray', type: 'any[][]', },
+  ]
+})

package/src/_constants/mocks/email-service-collection.mock.ts

@@ -0,0 +1,12 @@
+import { DynamoNTS_EmailService, DynamoNTS_ServiceCollection } from '../../_services';
+import { EmailService_Mock } from './email-service.mock';
+
+export class EmailServiceCollection_Mock extends DynamoNTS_ServiceCollection<DynamoNTS_EmailService> {
+
+  static getInstance(): EmailServiceCollection_Mock {
+    return EmailServiceCollection_Mock.getSingletonInstance();
+  }
+  
+  test: EmailService_Mock = new EmailService_Mock();
+
+}

package/src/_constants/mocks/email-service.mock.ts

@@ -0,0 +1,19 @@
+import { DynamoNTS_EmailService } from '../../_services';
+
+export class EmailService_Mock extends DynamoNTS_EmailService {
+
+  constructor() {
+    super({
+      host: 'smtp.forpsi.com',
+      port: 465,
+      senderName: 'FutDevPro - Auto',
+      email: 'auto@futdevpro.hu',
+      pass: 'a9wY992H4CpxYAG#',
+      rootPath: __dirname,
+      templatePaths: {
+        // test: './email-template.mock.html',
+      },
+    });
+  }
+}
+

package/src/_constants/mocks/email-template.mock.html

@@ -0,0 +1,15 @@
+
+<!DOCTYPE html>
+<html>
+  <body>
+    <h1>Hello!</h1>
+
+    This is a TEST!
+    {{ content }}
+
+    {{content}}}
+
+    <h4>Regards,</h4>
+
+  </body>
+</html> 

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

@@ -0,0 +1,42 @@
+import { DynamoNTS_SocketEventType } from '../../_enums';
+import { DynamoNTS_SocketClientServiceParams, DynamoNTS_SocketEvent } from '../../_models';
+import { DynamoNTS_SocketClientService } from '../../_modules/app-extended.index';
+
+
+
+export class SocketClient_Mock extends DynamoNTS_SocketClientService {
+
+  private constructor() {
+    super();
+  } 
+  
+  static getInstance(): SocketClient_Mock {
+    return SocketClient_Mock.getSingletonInstance();
+  }
+
+  getIncomingEvents(): DynamoNTS_SocketEvent<any>[] {
+    return [
+      new DynamoNTS_SocketEvent({
+        eventType: DynamoNTS_SocketEventType.connect,
+        tasks: [
+          async (content: any, issuer: string) => {
+            console.log('SocketClient_Mock: connect event received');
+          }
+        ]
+      }),
+    ];
+  }
+
+  getParams(): DynamoNTS_SocketClientServiceParams {
+    return new DynamoNTS_SocketClientServiceParams({
+      service: '-test-socket-target-',
+      name: 'socket-client-mock',
+      port: 30303,
+      socketOptions: {
+        reconnection: true,
+      },
+    });
+  }
+
+}
+

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

@@ -150,7 +150,6 @@ export class DynamoNTS_EmailService {
 
       await new Promise<void>((resolve, reject) => { 
         this.nmTransporter.sendMail(mailOptions, (error, info) => { 
-          /* err = error; */
           if (error) {
             reject(error);
           } else {

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

@@ -1,4 +1,4 @@
-import { DynamoNTS_AppExtendedBase_Mock, DynamoNTS_AppExtendedFull_Mock } from '../../_constants/mocks/app-extended-server.mock';
+import { DynamoNTS_AppExtendedBase_Mock, DynamoNTS_AppExtendedFull_Mock, DynamoNTS_AppWbMock_Mock } from '../../_constants/mocks/app-extended-server.mock';
 
 describe('DynamoNTS_AppExtended;', () => {
   describe('a extended-base instance;', () => {
@@ -42,4 +42,25 @@ describe('DynamoNTS_AppExtended;', () => {
       expect(app.started).toBeTrue();
     });
   });
+
+  describe('a wb-mock instance;', () => {
+    let app: DynamoNTS_AppWbMock_Mock;
+
+    beforeEach(async () => {
+      app = new DynamoNTS_AppWbMock_Mock();
+      await app.ready();
+    });
+
+    afterEach(async () => {
+      await app.stop();
+    });
+
+    it('should be created', () => {
+      expect(app).toBeDefined();
+    });
+      
+    it('should be started', () => {
+      expect(app.started).toBeTrue();
+    });
+  });
 });

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

@@ -168,14 +168,13 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
 
   override async ready(timeout: number = 4 * second): Promise<void> {
     if (this.logFn) console.log('\nfn:. ready-extended');
-    /* return new Promise(async (resolve, reject) => { */
-    /* try { */
     await super.ready(timeout);
 
     let ready: boolean = false;
     const start: number = +new Date();
 
     if (this.constructErrors.length) {
+      Dynamo_Log.error(`Extended Application: ${this.params?.name} start failed. ERRORS`, this.constructErrors, '\n');
       throw new Dynamo_Error({ 
         message: `${this.params?.name} start failed. ERRORS`,
         additionalContent: this.constructErrors,
@@ -183,7 +182,6 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
       });
     }
 
-    if (this.logFn && this.deepLog) console.log('\nfn:. ready-extended: bef while', this.systemControls, this.systemControlsExt);
     while (!ready && +new Date() - start < timeout) {
       if (this.systemControlsExt.appExtended.init) {
         ready = (
@@ -197,6 +195,7 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
     }
 
     if (this.constructErrors.length) {
+      Dynamo_Log.error(`Extended Application: ${this.params?.name} start failed. TIMEOUT`, this.constructErrors, '\n');
       throw new Dynamo_Error({ 
         message: `${this.params?.name} start failed. TIMEOUT`,
         additionalContent: this.constructErrors,
@@ -204,12 +203,6 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
       });
     }
 
-    /* ready = (
-      this.superStarted &&
-      this.systemControlsExt.httpSocketServer.getReady() &&
-      this.systemControlsExt.httpsSocketServer.getReady()
-    ); */
-      /* console.log('T1000', ready, this.started, this.systemControlsExt.httpSocketServer.getReady(), this.systemControlsExt.httpsSocketServer.getReady(),  this.systemControls, this.systemControlsExt); */
     if (ready) {
       this.systemControlsExt.appExtended.started = true;
       
@@ -226,6 +219,7 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
         msg += '\nhttpsSocketServer start failed.';
       }      
 
+      Dynamo_Log.error(msg, this.constructErrors, '\n');
       throw new Dynamo_Error({ 
         errorCode: 'NTS-AES-110',
         message: msg,
@@ -246,10 +240,6 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
         error: this.constructErrors?.[0] ?? new Error()
       });
     }
-    /* } catch (error) {
-      reject(error);
-    } */
-    /* }); */
   }
 
   override async stop(): Promise<void> {
@@ -264,7 +254,14 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
           socketServer.disconnectSockets(true);
           socketServer.close((err) => {
             if (err) {
-              reject(err);
+              Dynamo_Log.error(`\nHTTP socket server close error`, err);
+              reject(
+                new Dynamo_Error({
+                  errorCode: 'NTS-AES-120',
+                  message: `SocketServer close failed.`,
+                  error: err
+                })
+              );
             } else {
               resolve();
             }