@futdevpro/nts-dynamo 1.11.29 → 1.11.31

package/src/_modules/server/errors/errors.data-service.ts

@@ -6,7 +6,7 @@ import {
   DyFM_AnyError,
   DyFM_DBFilter,
   DyFM_DataModel_Params, DyFM_Error, DyFM_ErrorLevel, DyFM_Error_Settings,
-  DyFM_Log, DyFM_Shared, DyFM_clone, DyFM_errorFlag, DyFM_Errors,
+  DyFM_Log, DyFM_Object, DyFM_errorFlag, DyFM_Errors,
   DyFM_RelativeDate,
   DyFM_Array,
   DyFM_Paged,
@@ -140,7 +140,7 @@ export class DyNTS_Errors_DataService<
           await this.updateData({
             filterBy: { _id: duplicateError._id } as DyFM_DBFilter<Error_T>,
             update: { 
-              $push: { duplications: DyFM_clone(data) },
+              $push: { duplications: DyFM_Object.clone(data) },
             } as DyNTS_DBUpdate<Error_T>,
           }).catch((pushError) => {
             DyFM_Log.error('pushError:', pushError);
@@ -165,7 +165,7 @@ export class DyNTS_Errors_DataService<
         if (this.debugLog) DyFM_Log.error('Error:', errorsRecord);
 
         errorsRecord.priority = this.getPriorityMultiplierByLevel(errorsRecord?.level);
-        errorsRecord.duplications.push(DyFM_clone(errorsRecord));
+        errorsRecord.duplications.push(DyFM_Object.clone(errorsRecord));
 
         this.duplicationCounter = 1;
 
@@ -315,7 +315,7 @@ export class DyNTS_Errors_DataService<
         DyFM_Log.error('checkErrorIsStringifyableOrResolvable error:', err);
       }
 
-      error = DyFM_Shared.resolveCirculation(error);
+      error = DyFM_Object.resolveCirculation(error);
 
       try {
         JSON.stringify(error);

package/src/_modules/socket/_services/socket-client.service.ts

@@ -4,7 +4,7 @@
 import * as SocketIOClient from 'socket.io-client';
 
 import { 
-  DyFM_Error, DyFM_Log, DyFM_delay, DyFM_Array, DyFM_errorFlag 
+  DyFM_Error, DyFM_Log, DyFM_Async, DyFM_Array, DyFM_errorFlag 
 } from '@futdevpro/fsm-dynamo';
 import { DyFM_SocketEvent, DyFM_SocketEvent_Key } from '@futdevpro/fsm-dynamo/socket';
 
@@ -49,7 +49,7 @@ export abstract class DyNTS_SocketClient_ServiceBase extends DyNTS_SingletonServ
           DyFM_Log.warn(`<x  >  socket-client (${this.params.name}) disconnected!`);
 
           if (this._params.reconnect) {
-            await DyFM_delay(this._params.reconnectDelay);
+            await DyFM_Async.delay(this._params.reconnectDelay);
             this.connectSocket();
           }
         },
@@ -212,7 +212,7 @@ export abstract class DyNTS_SocketClient_ServiceBase extends DyNTS_SingletonServ
     try {
       if (this.logFn) console.log(`\nFn:. tryReconnectIfNeeded`);
       this.tryingToReconnect = true;
-      await DyFM_delay(this._params.reconnectDelay);
+      await DyFM_Async.delay(this._params.reconnectDelay);
       
       this.tryingToReconnect = false;
       if (!this._connected) {

package/src/_modules/socket/app-extended.server.spec.ts

@@ -1,4 +1,4 @@
-import { DyFM_delay, DyFM_Error, DyFM_Log, DyFM_waitUntil, second } from '@futdevpro/fsm-dynamo';
+import { DyFM_Async, DyFM_Error, DyFM_Log, second } from '@futdevpro/fsm-dynamo';
 import {
   DyNTS_AppExtendedBase_Mock, DyNTS_AppExtendedFull_Mock, DyNTS_AppWbMock_Mock
 } from '../mock/app-extended-server.mock';
@@ -25,7 +25,7 @@ describe('| DyNTS_AppExtended;', (): void => {
   const waitForAppReady = async (appInstance: DyNTS_AppExtended, timeoutMs: number = 10000): Promise<void> => {
     const startTime = Date.now();
     while (!appInstance.started && (Date.now() - startTime) < timeoutMs) {
-      await DyFM_delay(100);
+      await DyFM_Async.delay(100);
     }
     
     if (!appInstance.started) {
@@ -36,16 +36,16 @@ describe('| DyNTS_AppExtended;', (): void => {
   describe('| a extended-base instance;', (): void => {
     beforeEach(async (): Promise<void> => {
       try {
-        await DyFM_waitUntil((): boolean => !app, second);
-        await DyFM_delay(100); // Ensure previous instance is fully cleaned up
+        await DyFM_Async.waitUntil((): boolean => !app, second);
+        await DyFM_Async.delay(100); // Ensure previous instance is fully cleaned up
 
         app = new DyNTS_AppExtendedBase_Mock();
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
         
         await app.ready();
         await waitForAppReady(app);
         
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
       } catch (error) {
         DyFM_Log.testError(
           '| DyNTS_AppExtended; | a extended-base instance; test beforeEach error:\n', 
@@ -66,9 +66,9 @@ describe('| DyNTS_AppExtended;', (): void => {
 
     afterEach(async (): Promise<void> => {
       try {
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
         await safeStopApp();
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
       } catch (error) {
         DyFM_Log.testError(
           '| DyNTS_AppExtended; | a extended-base instance; test afterEach error:\n', 
@@ -100,16 +100,16 @@ describe('| DyNTS_AppExtended;', (): void => {
   describe('| a extended-full instance;', (): void => {
     beforeEach(async (): Promise<void> => {
       try {
-        await DyFM_waitUntil((): boolean => !app, second);
-        await DyFM_delay(100); // Ensure previous instance is fully cleaned up
+        await DyFM_Async.waitUntil((): boolean => !app, second);
+        await DyFM_Async.delay(100); // Ensure previous instance is fully cleaned up
 
         app = new DyNTS_AppExtendedFull_Mock();
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
         
         await app.ready();
         await waitForAppReady(app);
         
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
       } catch (error) {
         DyFM_Log.testError(
           '| DyNTS_AppExtended; | a extended-full instance; test beforeEach error:\n', 
@@ -130,9 +130,9 @@ describe('| DyNTS_AppExtended;', (): void => {
 
     afterEach(async (): Promise<void> => {
       try {
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
         await safeStopApp();
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
       } catch (error) {
         DyFM_Log.testError(
           '| DyNTS_AppExtended; | a extended-full instance; test afterEach error:\n', 
@@ -164,16 +164,16 @@ describe('| DyNTS_AppExtended;', (): void => {
   describe('| a wb-mock instance;', (): void => {
     beforeEach(async (): Promise<void> => {
       try {
-        await DyFM_waitUntil((): boolean => !app, second);
-        await DyFM_delay(100); // Ensure previous instance is fully cleaned up
+        await DyFM_Async.waitUntil((): boolean => !app, second);
+        await DyFM_Async.delay(100); // Ensure previous instance is fully cleaned up
 
         app = new DyNTS_AppWbMock_Mock();
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
         
         await app.ready();
         await waitForAppReady(app);
         
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
       } catch (error) {
         DyFM_Log.testError(
           '| DyNTS_AppExtended; | a wb-mock instance; test beforeEach error:\n', 
@@ -194,9 +194,9 @@ describe('| DyNTS_AppExtended;', (): void => {
 
     afterEach(async (): Promise<void> => {
       try {
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
         await safeStopApp();
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
       } catch (error) {
         DyFM_Log.testError(
           '| DyNTS_AppExtended; | a wb-mock instance; test afterEach error:\n', 

package/src/_modules/socket/app-extended.server.ts

@@ -5,12 +5,11 @@ import * as SocketIO from 'socket.io';
 import {
   DyFM_AnyError,
   DyFM_Array,
-  DyFM_delay,
+  DyFM_Async,
   DyFM_Error,
   DyFM_Error_Settings,
   DyFM_ErrorLevel,
   DyFM_Log,
-  DyFM_wait
 } from '@futdevpro/fsm-dynamo';
 
 import { DyNTS_global_settings } from '../../_collections/global-settings.const';
@@ -283,7 +282,7 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
         }
 
         if (!ready) {
-          await DyFM_wait(100);
+          await DyFM_Async.wait(100);
         }
       }
 
@@ -400,7 +399,7 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
         this.systemControlsExt.httpSocketServer.init = false;
         this.systemControlsExt.httpsSocketServer.init = false;
         
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
 
         DyFM_Log.H_info(`"${this.params.name}" stopped successfully.`);
       }

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

@@ -4,7 +4,9 @@ import { Router } from 'express';
 import {
   DyFM_AnyError, DyFM_Error, DyFM_ErrorLevel, DyFM_Error_Settings,
   DyFM_HttpCallType,
-  DyFM_Log
+  DyFM_Log,
+  DyFM_getConstructionStackLocation,
+  DyFM_getLocalStackLocation
 } from '@futdevpro/fsm-dynamo';
 
 import { DyNTS_global_settings } from '../../_collections/global-settings.const';
@@ -66,13 +68,15 @@ export class DyNTS_RoutingModule {
   /* serviceName: string; */
   
   security: DyNTS_RouteSecurity;
-  route: string;
+  readonly route: string;
 
   private readonly controllers: DyNTS_Controller[];
   endpoints: DyNTS_Endpoint_Params[] = [];
 
-  openRouter: Router = Router();
-  secureRouter: Router = Router();
+  readonly openRouter: Router = Router();
+  readonly secureRouter: Router = Router();
+
+  readonly stackLocation: string;
 
   get logSetup(): boolean {
     return DyNTS_global_settings.log_settings.setup;
@@ -91,6 +95,7 @@ export class DyNTS_RoutingModule {
       this.controllers = set.controllers ?? [];
       this.setupRoutes();
       this.mountRoutes(set.securityOverride);
+      this.stackLocation = DyFM_getConstructionStackLocation();
 
       if (this.logSetup) console.log(
         `routing module setup done: ${this.route} security: ${this.security}\n`

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

@@ -1,5 +1,4 @@
-
-import { DyFM_Error, DyFM_Log, DyFM_delay, DyFM_waitUntil, second } from '@futdevpro/fsm-dynamo';
+import { DyFM_Error, DyFM_Log, DyFM_Async, second } from '@futdevpro/fsm-dynamo';
 import { DyNTS_AppBase_Mock, DyNTS_AppFull_Mock } from '../../_modules/mock/app-server.mock';
 import { DyNTS_App } from './app.server';
 
@@ -11,15 +10,15 @@ describe('| DyNTS_App AND DyNTS_AppExtended?;', (): void => {
   describe('| a base instance;', (): void => {
     beforeEach(async (): Promise<void> => {
       try {
-        await DyFM_waitUntil((): boolean => !app, second);
+        await DyFM_Async.waitUntil((): boolean => !app, second);
 
         app = new DyNTS_AppBase_Mock();
 
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
         
         await app.ready();
 
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
       } catch (error) {
         DyFM_Log.testError(
           '| DyNTS_App; | a base instance; test beforeEach error:\n', 
@@ -39,13 +38,13 @@ describe('| DyNTS_App AND DyNTS_AppExtended?;', (): void => {
 
     afterEach(async (): Promise<void> => {
       try {
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
         
         await app.stop();
 
         app = null;
 
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
       } catch (error) {
         DyFM_Log.testError(
           '| DyNTS_App; | a base instance; test afterEach error:\n', 
@@ -75,15 +74,15 @@ describe('| DyNTS_App AND DyNTS_AppExtended?;', (): void => {
   describe('| a full instance;', (): void => {
     beforeEach(async (): Promise<void> => {
       try {
-        await DyFM_waitUntil((): boolean => !app, second);
+        await DyFM_Async.waitUntil((): boolean => !app, second);
 
         app = new DyNTS_AppFull_Mock();
 
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
         
         await app.ready();
 
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
       } catch (error) {
         DyFM_Log.testError(
           '| DyNTS_App; | a full instance; test beforeEach error:\n', 
@@ -103,13 +102,13 @@ describe('| DyNTS_App AND DyNTS_AppExtended?;', (): void => {
 
     afterEach(async (): Promise<void> => {
       try {
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
         
         await app.stop();
 
         app = null;
 
-        await DyFM_delay(100);
+        await DyFM_Async.delay(100);
       } catch (error) {
         DyFM_Log.testError(
           '| DyNTS_App; | a full instance; test afterEach error:\n', 

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

@@ -15,11 +15,12 @@ import dotenv from 'dotenv'
 import {
   DyFM_AnyError,
   DyFM_Array,
-  DyFM_delay,
-  DyFM_Error, DyFM_error_defaults,
+  DyFM_Async,
+  DyFM_Error, 
+  DyFM_error_defaults,
   DyFM_Error_Settings,
-  DyFM_ErrorLevel, DyFM_Log,
-  DyFM_wait,
+  DyFM_ErrorLevel, 
+  DyFM_Log,
   second
 } from '@futdevpro/fsm-dynamo';
 
@@ -530,7 +531,7 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
     try {
       if (this.fnLogs) DyFM_Log.log('\nfn:. ready');
       
-      await DyFM_delay(100);
+      await DyFM_Async.delay(100);
 
       let ready: boolean = false;
       const start: number = +new Date();
@@ -576,7 +577,7 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
         }
 
         if (!ready) {
-          await DyFM_wait(100);
+          await DyFM_Async.wait(100);
         }
       }
 
@@ -720,7 +721,7 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
             tryCount++ < 10
           ) {
             DyFM_Log.warn(`Mongoose not even started yet....`);
-            await DyFM_wait(second);
+            await DyFM_Async.wait(second);
           }
           this.systemControls.mongoose.started = false;
 
@@ -749,7 +750,7 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
               !this.constructErrors.length
             ) {
               DyFM_Log.warn(`\nMongoose still not disconnected....`);
-              await DyFM_wait(second);
+              await DyFM_Async.wait(second);
             }
           } else {
             DyFM_Log.error(`\nMongoose not found.`);
@@ -783,7 +784,7 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
           this.systemControls.httpsServer.init = false;
         }
 
-        await DyFM_wait(second);
+        await DyFM_Async.wait(second);
 
         if (!dontLog) {
           DyFM_Log.H_log(`"${this._params.name}" stopped successfully.`);
@@ -968,10 +969,12 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
           this._routingModules.forEach((module: DyNTS_RoutingModule): void => {
             if (module.security && module.security !== DyNTS_RouteSecurity.open) {
               errorMsg += `\n  ${module.route} (security: ${module.security})`;
-              errorMsg += `\n  subroutes using secure sever:`;
+              errorMsg += `\n    location: ${module.stackLocation}`;
+              errorMsg += `\n    subroutes using secure sever:`;
               module.endpoints.forEach((endpoint: DyNTS_Endpoint_Params): void => {
                 if (endpoint.security && endpoint.security !== DyNTS_RouteSecurity.open) {
-                  errorMsg += `\n    ${endpoint.endpoint} (security: ${endpoint.security})`;
+                  errorMsg += `\n      ${endpoint.endpoint} (security: ${endpoint.security})`;
+                  errorMsg += `\n        location: ${endpoint.stackLocation}`;
                 }
               });
             }

package/src/_services/shared.static-service.ts

@@ -3,13 +3,13 @@ import * as ReadLine from 'readline';
 import * as GeoIp from 'geoip-lite';
 import { Request } from 'express';
 
-import { DyFM_Shared } from '@futdevpro/fsm-dynamo';
+import { DyFM_Object } from '@futdevpro/fsm-dynamo';
 import { DyFM_GeoIpLocation } from '@futdevpro/fsm-dynamo/location';
 
 /**
  * Collection of static helper utilities shared across modules.
  */
-export class DyNTS_Shared extends DyFM_Shared {
+export class DyNTS_Shared extends DyFM_Object {
 
   /**
    * Extract the IP address from an Express request.