@futdevpro/nts-dynamo 1.15.8 → 1.15.10

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

@@ -1495,11 +1495,17 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
     }
 
     if (!properties._deletedBy) {
-      properties._deletedBy = { 
+      properties._deletedBy = {
         key: '_deletedBy', type: DyFM_BasicProperty_Type.string,
       };
     }
 
+    if (!properties._archived) {
+      properties._archived = {
+        key: '_archived', type: DyFM_BasicProperty_Type.date,
+      };
+    }
+
     return properties;
   }
 
@@ -1521,10 +1527,12 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
     }
 
     if (!properties._archived) {
-      properties._archived = { 
+      properties._archived = {
         key: '_archived', type: DyFM_BasicProperty_Type.date,
-        required: true, 
+        required: true,
       };
+    } else if (properties._archived.required === undefined) {
+      properties._archived.required = true;
     }
 
     return properties;

package/src/_services/route/routing-module.service.spec.ts

@@ -1,6 +1,7 @@
 
 import { DyFM_Error, DyFM_HttpCallType } from '@futdevpro/fsm-dynamo';
 
+import { DyNTS_global_settings } from '../../_collections/global-settings.const';
 import { DyNTS_RouteSecurity } from '../../_enums/route-security.enum';
 import { DyNTS_Endpoint_Params } from '../../_models/control-models/endpoint-params.control-model';
 import {
@@ -80,4 +81,18 @@ describe('| DyNTS_RoutingModule', () => {
     routingModule.endpoints = [ mockEndpoint, mockEndpoint ];
     expect(() => routingModule['mountRoutes']()).toThrowError(/ENDPOINT DUPLICATION/);
   });
+
+  it('| should use DyNTS_global_settings.baseUrl as route prefix', () => {
+    const originalBaseUrl: string = DyNTS_global_settings.baseUrl;
+    try {
+      DyNTS_global_settings.baseUrl = '/custom-api';
+      const moduleWithCustomBase: DyNTS_RoutingModule = new DyNTS_RoutingModule({
+        route: '/foo',
+        controllers: [ mockController ],
+      });
+      expect(moduleWithCustomBase.route).toBe('/custom-api/foo');
+    } finally {
+      DyNTS_global_settings.baseUrl = originalBaseUrl;
+    }
+  });
 });

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

@@ -8,6 +8,7 @@ import * as BodyParser from 'body-parser';
 import * as FileSystem from 'fs';
 import * as Http from 'http';
 import * as Https from 'https';
+import * as Path from 'path';
 import * as dotenv from 'dotenv'
 
 /* import { version } from '../../../package.json'; */
@@ -25,6 +26,8 @@ import {
   second
 } from '@futdevpro/fsm-dynamo';
 
+import { DyNTS_defaultFallbackCacheMaxAge } from '../../_collections/default-fallback-cache-max-age.const';
+import { DyNTS_defaultNotFoundPageHtml } from '../../_collections/default-not-found-page.const';
 import { DyNTS_global_settings } from '../../_collections/global-settings.const';
 import { DyNTS_RouteSecurity } from '../../_enums/route-security.enum';
 import { DyNTS_App_Params } from '../../_models/control-models/app-params.control-model';
@@ -41,6 +44,9 @@ import {
 import {
   DyNTS_GlobalService_Settings
 } from '../../_models/interfaces/global-service-settings.interface';
+import {
+  DyNTS_StaticClient_Settings
+} from '../../_models/interfaces/static-client-settings.interface';
 import { DyNTS_SingletonService } from '../base/singleton.service';
 import { DyNTS_GlobalService } from '../core/global.service';
 import { DyNTS_RoutingModule } from '../route/routing-module.service';
@@ -457,6 +463,10 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
         this._cert = this.getCertificationSettings();
       }
 
+      if (this.getApiBasePath) {
+        DyNTS_global_settings.baseUrl = this.getApiBasePath();
+      }
+
       if (this.getRoutingModules) {
         this._routingModules = this.getRoutingModules();
 
@@ -499,6 +509,8 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
           await this.mountSecureRoutes();
         }
 
+        await this.mountStaticClient();
+
         if (this.logSetup) {
           DyFM_Log.log(`\nRoutes mounted.... server using security: ${this._security}`);
         }
@@ -951,7 +963,7 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
 
     try {
       if (this._security && this._security !== DyNTS_RouteSecurity.secure) {
-        if (!this._portSettings.httpPort) {
+        if (this._portSettings.httpPort === undefined || this._portSettings.httpPort === null) {
           let errorMsg: string =
             `\nYou have open routes, but httpPort is not set!` +
             `\nThere are ${this._routingModules.filter(
@@ -1151,9 +1163,19 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
               this.params.expressBacklog, 
               (): void => {
                 this.systemControls.httpServer.started = true;
+
+                const resolvedPort: number = this.httpServer?.address?.()?.['port'] ?? this._portSettings.httpPort;
+
+                if (this._portSettings.httpPort === 0) {
+                  DyFM_Log.H_warn(
+                    `\nHTTP (open) server is using a randomly selected port by the OS: ${resolvedPort}` +
+                    `\n  (httpPort was set to 0 — this is intended for testing only)`
+                  );
+                }
+
                 DyFM_Log.success(
                   `\nHTTP (open) server is listening on port: ` +
-                    `${this.params.openHost}:${this._portSettings.httpPort}`
+                    `${this.params.openHost}:${resolvedPort}`
                 );
 
                 resolve();
@@ -1374,6 +1396,77 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
     }
   }
 
+  /**
+   * Ha getStaticClientSettings() visszaad beállításokat, a client static fájlok a '/' alatt
+   * lesznek kiszolgálva (API route-ok után). SPA fallback opcionális (fallbackPath).
+   * Asset cache (assetCacheMaxAge, assetCacheImmutable) és fallback cache (fallbackCacheMaxAge)
+   * opcionálisak; ha nincs megadva fallbackCacheMaxAge, DyNTS_defaultFallbackCacheMaxAge (0) marad.
+   */
+  private async mountStaticClient(): Promise<void> {
+    const settings: DyNTS_StaticClient_Settings | undefined = this.getStaticClientSettings?.();
+    if (!settings) {
+      return;
+    }
+
+    const absoluteRoot: string = Path.isAbsolute(settings.root)
+      ? settings.root
+      : Path.resolve(process.cwd(), settings.root);
+
+    const hasAssetCache: boolean =
+      settings.assetCacheMaxAge !== undefined || settings.assetCacheImmutable === true;
+    const staticOptions: { setHeaders: (res: Express.Response) => void } | undefined =
+      hasAssetCache && settings.assetCacheMaxAge !== undefined
+        ? {
+            setHeaders: (res: Express.Response): void => {
+              const maxAge: number = settings.assetCacheMaxAge!;
+              const immutable: string =
+                settings.assetCacheImmutable === true ? ', immutable' : '';
+              res.setHeader('Cache-Control', `max-age=${maxAge}${immutable}`);
+            },
+          }
+        : undefined;
+
+    const staticMiddleware: Express.Handler =
+      staticOptions
+        ? Express.static(absoluteRoot, staticOptions)
+        : Express.static(absoluteRoot);
+
+    const fallbackMaxAge: number =
+      settings.fallbackCacheMaxAge ?? DyNTS_defaultFallbackCacheMaxAge;
+
+    if (this.openExpress) {
+      this.openExpress.use('/', staticMiddleware);
+      if (settings.fallbackPath) {
+        this.openExpress.get('*', (req: Express.Request, res: Express.Response): void => {
+          res.setHeader('Cache-Control', `max-age=${fallbackMaxAge}`);
+          res.sendFile(settings.fallbackPath!, { root: absoluteRoot });
+        });
+      } else {
+        this.openExpress.get('*', (req: Express.Request, res: Express.Response): void => {
+          res.status(404).type('html').send(DyNTS_defaultNotFoundPageHtml);
+        });
+      }
+    }
+
+    if (this.secureExpress) {
+      this.secureExpress.use('/', staticMiddleware);
+      if (settings.fallbackPath) {
+        this.secureExpress.get('*', (req: Express.Request, res: Express.Response): void => {
+          res.setHeader('Cache-Control', `max-age=${fallbackMaxAge}`);
+          res.sendFile(settings.fallbackPath!, { root: absoluteRoot });
+        });
+      } else {
+        this.secureExpress.get('*', (req: Express.Request, res: Express.Response): void => {
+          res.status(404).type('html').send(DyNTS_defaultNotFoundPageHtml);
+        });
+      }
+    }
+
+    if (this.logSetup) {
+      DyFM_Log.log(`\nStatic client mounted at / (root: ${absoluteRoot})`);
+    }
+  }
+
   /**
    * 
    */
@@ -1444,6 +1537,12 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
    */
   overrideDynamoNTSGlobalSettings?(): void;
 
+  /**
+   * Ha megadva, a visszaadott értéket használjuk a route prefix-ként
+   * (DyNTS_global_settings.baseUrl felülírása erre az app-ra).
+   */
+  getApiBasePath?(): string;
+
   /**
    * MISSING Description (TODO)
    */
@@ -1459,6 +1558,12 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
    */
   getCertificationSettings?(): DyNTS_Certification_Settings;
 
+  /**
+   * Ha megadva, a client static fájlok a '/' alatt lesznek kiszolgálva (API route-ok után).
+   * Opcionális fallbackPath pl. SPA index.html-hez.
+   */
+  getStaticClientSettings?(): DyNTS_StaticClient_Settings | undefined;
+
   /**
    * MISSING Description (TODO)
    */

package/src/index.ts

@@ -27,6 +27,9 @@ try {
 // COLLECTIONS
 export * from './_collections/archive.util';
 export * from './_collections/atlas-default-db-options.const';
+export * from './_collections/default-fallback-cache-max-age.const';
+export * from './_collections/default-not-found-page.const';
+export * from './_collections/default-socket-path.const';
 export * from './_collections/get-environment-settings.util';
 export * from './_collections/global-settings.const';
 
@@ -46,6 +49,7 @@ export * from './_models/interfaces/environment-settings.interface';
 export * from './_models/interfaces/global-service-settings.interface';
 export * from './_models/interfaces/global-settings.interface';
 export * from './_models/interfaces/routing-module-settings.interface';
+export * from './_models/interfaces/static-client-settings.interface';
 
 // models/CONTROL MODELS
 export * from './_models/control-models/api-call-params.control-model';