@futdevpro/nts-dynamo 1.11.26 → 1.11.28

package/src/_modules/oauth2/index.ts

@@ -1,5 +1,5 @@
 try {
-  require('crypto');
+  require('crypto-js');
 } catch (error) {
   console.log(
     '❌ CryptoJS package not found, please install it with: pnpm add crypto-js'

package/src/_modules/open-ai/_services/oai-chunk.service-base.ts

@@ -90,6 +90,10 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
 
   async comparePage(page: T_Page, issuer: string): Promise<DyNTS_OAI_PageCompareResult<T_Chunk, T_Page>> {
     try {
+      if (this.debugLog) {
+        DyFM_Log.info(`🔍 Comparing page: ${page.name}`);
+      }
+
       if (!page?.allFlaggedParentsMerged) {
         DyFM_Log.T_error(
           `❌ allFlaggedParentsMerged is not set (${page.name})`, JSON.stringify(page, null, 2)
@@ -125,6 +129,10 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
       if (
         compareResults.every(result => result.result === DyNTS_OAI_CompareResult_Type.equal)
       ) {
+        if (this.debugLog) {
+          DyFM_Log.info(`✅ Page is equal: ${page.name}`);
+        }
+
         return {
           result: DyNTS_OAI_CompareResult_Type.equal,
           subjectPage: page,
@@ -138,6 +146,10 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
       if (
         compareResults.every(result => result.result === DyNTS_OAI_CompareResult_Type.new)
       ) {
+        if (this.debugLog) {
+          DyFM_Log.info(`✅ Page is new: ${page.name}`);
+        }
+
         return {
           result: DyNTS_OAI_CompareResult_Type.new,
           subjectPage: page,
@@ -148,6 +160,10 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
         };
       }
 
+      if (this.debugLog) {
+        DyFM_Log.info(`✅ Page is modified: ${page.name}`);
+      }
+
       return {
         result: DyNTS_OAI_CompareResult_Type.modified,
         subjectPage: page,
@@ -172,6 +188,10 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
     oldChunks?: T_Chunk[]
   ): Promise<DyNTS_OAI_ChunkCompareResult<T_Chunk>[]> {
     try {
+      if (this.debugLog) {
+        DyFM_Log.info(`🔍 Comparing chunks: ${chunks.length}`);
+      }
+
       if (chunks.length === 0) {
         return [];
       }
@@ -209,6 +229,10 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
     oldChunk?: T_Chunk
   ): Promise<DyNTS_OAI_ChunkCompareResult<T_Chunk>> {
     try {
+      if (this.debugLog) {
+        DyFM_Log.info(`🔍 Comparing chunk: ${newChunk.chunkIndex}`);
+      }
+
       oldChunk ??= await this.findData({
         path: newChunk.path,
         chunkIndex: newChunk.chunkIndex,
@@ -223,6 +247,9 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
       }); */
 
       if (!oldChunk) {
+        // itt kéne vektor search-el utána keresni, 
+        // hogy a page link-je megtalálható-e (avagy csak átnevezésre került-e)
+        // hogy az adott tartalom, nem-e csak átnevezésre, szétbontásra vagy összevonásra került-e
         return {
           result: DyNTS_OAI_CompareResult_Type.new,
           oldChunk: null,

package/src/_modules/open-ai/_services/oai-llm-chat.service-base.ts

@@ -1,7 +1,7 @@
 import { OpenAI } from 'openai';
 
 import { DyFM_OpenAI_Settings, DyFM_OpenAIModel, DyFM_GPTCall_Settings } from '@futdevpro/fsm-dynamo/open-ai';
-import { DyFM_AnyError, DyFM_clone, DyFM_Error, DyFM_Error_Settings, DyFM_Log, DyFM_notNull } from '@futdevpro/fsm-dynamo';
+import { DyFM_AnyError, DyFM_clone, DyFM_Error, DyFM_Error_Settings, DyFM_getLocalStackLocation, DyFM_Log, DyFM_notNull, DyFM_Shared } from '@futdevpro/fsm-dynamo';
 
 import { DyNTS_global_settings } from '../../../_collections/global-settings.const';
 import { DyNTS_OAI_GPT_Message } from '../_models/interfaces/oai-gpt-message.interface';
@@ -9,7 +9,7 @@ import { ChatCompletion } from 'openai/resources';
 import { ChatCompletionCreateParamsBase, ChatCompletionMessageParam } from 'openai/resources/chat/completions';
 import { DyNTS_OAI_GPT_Message_Role } from '../_enums/oai-gpt-message-role.enum';
 import { DyNTS_OAI_LLM_Predefined_Requests } from '../_models/interfaces/oai-llm-predefined-requests.interface';
-import { DyFM_safeParseJSON, DyFM_safeParseList, DyNTS_OAI_LLM_ServiceBase } from './oai-llm.service-base';
+import { DyNTS_OAI_LLM_ServiceBase } from './oai-llm.service-base';
 import { DyNTS_OAI_global_settings } from '../_collections/oai-global-settings.const';
 
 
@@ -50,7 +50,7 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     return answer.toUpperCase().includes(this.predefinedRequests.yesNo.upperCaseYes);
   }
-  askYesNoQuestionInConversation = this.yesNoQuestionInConversation;
+  askYesNoQuestionInConversation: typeof this.yesNoQuestionInConversation = this.yesNoQuestionInConversation;
 
   /**
    * Asks the AI to answer a simple question
@@ -72,7 +72,7 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     return await this.getQuestionAnswerInConversation(set);
   }
-  askSimpleQuestionInConversation = this.simpleQuestionInConversation;
+  askSimpleQuestionInConversation: typeof this.simpleQuestionInConversation = this.simpleQuestionInConversation;
 
   /**
    * Asks the AI to answer a percentage question
@@ -107,7 +107,7 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     return +answer;
   }
-  askPercentageQuestionInConversation = this.percentageQuestionInConversation;
+  askPercentageQuestionInConversation: typeof this.percentageQuestionInConversation = this.percentageQuestionInConversation;
   
 
   /**
@@ -146,7 +146,7 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     return null;
   }
-  askSelectQuestionInConversation = this.selectQuestionInConversation;
+  askSelectQuestionInConversation: typeof this.selectQuestionInConversation = this.selectQuestionInConversation;
 
   /**
    * Asks the AI to select one of the options from the list
@@ -177,9 +177,9 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.getQuestionAnswerInConversation(set);
 
-    return DyFM_safeParseJSON<T>(answer);
+    return DyFM_Shared.safeParseJSON<T>(answer);
   }
-  askRequestSelectInConversation = this.requestSelectInConversation;
+  askRequestSelectInConversation: typeof this.requestSelectInConversation = this.requestSelectInConversation;
 
   /**
    * Asks the AI to select one or more of the options from the list
@@ -218,7 +218,7 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     return result;
   }
-  askMultipleSelectQuestionWithOptionsInConversation = this.multipleSelectQuestionWithOptionsInConversation;
+  askMultipleSelectQuestionWithOptionsInConversation: typeof this.multipleSelectQuestionWithOptionsInConversation = this.multipleSelectQuestionWithOptionsInConversation;
 
   /**
    * Asks the AI to select one or more of the options from the list
@@ -249,9 +249,9 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.getQuestionAnswerInConversation(set);
 
-    return DyFM_safeParseList<T[]>(answer);
+    return DyFM_Shared.safeParseList<T[]>(answer);
   }
-  askRequestMultipleSelectInConversation = this.requestMultipleSelectInConversation;
+  askRequestMultipleSelectInConversation: typeof this.requestMultipleSelectInConversation = this.requestMultipleSelectInConversation;
 
   /**
    * Asks the AI to answer a question that must result a JSON object
@@ -279,9 +279,9 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.getQuestionAnswerInConversation(set);
     
-    return DyFM_safeParseJSON<T>(answer);
+    return DyFM_Shared.safeParseJSON<T>(answer);
   }
-  askJsonQuestionInConversation = this.jsonQuestionInConversation;
+  askJsonQuestionInConversation: typeof this.jsonQuestionInConversation = this.jsonQuestionInConversation;
 
   /**
    * Asks the AI to answer a question that must result a JSON object with specific key descriptions
@@ -314,9 +314,9 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.getQuestionAnswerInConversation(set);
 
-    return DyFM_safeParseJSON<T>(answer);
+    return DyFM_Shared.safeParseJSON<T>(answer);
   }
-  askJsonQuestionWithKeysDescriptionInConversation = this.jsonQuestionWithKeysDescriptionInConversation;
+  askJsonQuestionWithKeysDescriptionInConversation: typeof this.jsonQuestionWithKeysDescriptionInConversation = this.jsonQuestionWithKeysDescriptionInConversation;
 
   /**
    * Asks the AI to answer a question that must result a JSON object with specific keys
@@ -349,9 +349,9 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.getQuestionAnswerInConversation(set);
 
-    return DyFM_safeParseJSON<T>(answer);
+    return DyFM_Shared.safeParseJSON<T>(answer);
   }
-  askJsonQuestionWithExactKeysInConversation = this.jsonQuestionWithExactKeysInConversation;
+  askJsonQuestionWithExactKeysInConversation: typeof this.jsonQuestionWithExactKeysInConversation = this.jsonQuestionWithExactKeysInConversation;
 
   /**
    * Asks the AI to answer a question that must result a list of strings
@@ -379,9 +379,9 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.getQuestionAnswerInConversation(set);
 
-    return DyFM_safeParseList(answer);
+    return DyFM_Shared.safeParseList(answer);
   }
-  askListQuestionInConversation = this.listQuestionInConversation;
+  askListQuestionInConversation: typeof this.listQuestionInConversation = this.listQuestionInConversation;
 
   /**
    * Asks the AI to answer a question
@@ -412,7 +412,7 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
   async getQuestionAnswerInConversation(
     set: {
       conversation: DyNTS_OAI_GPT_Message[],
-      question: string, 
+      question?: string, 
       issuer: string,
       settings?: DyFM_GPTCall_Settings,
       debugLog?: boolean,
@@ -426,8 +426,9 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
     });
   }
   /* getQuestionAnswerInConversation = this.getAnswerInConversation; */
-  getQuestionInConversation = this.getQuestionAnswerInConversation;
-  askQuestionInConversation = this.getQuestionAnswerInConversation;
+  getQuestionInConversation: typeof this.getQuestionAnswerInConversation = this.getQuestionAnswerInConversation;
+  askQuestionInConversation: typeof this.getQuestionAnswerInConversation = this.getQuestionAnswerInConversation;
+  getConversationAnswer: typeof this.getAnswerInConversation = this.getAnswerInConversation;
   
   /**
    * Asks the AI to answer a question using the whole conversation
@@ -500,6 +501,8 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
       // conversation shortening
       const shortenedConversation = this.shortenConversation(set);
+
+      this.validateConversation(shortenedConversation);
       
       this.logConversation({
         ...set,
@@ -526,7 +529,7 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
       });
     }
   }
-  resolveSimpleUserMessageInConversation = this.resolveConversation;
+  resolveSimpleUserMessageInConversation: typeof this.resolveConversation = this.resolveConversation;
 
   protected shortenConversation(
     set: {
@@ -599,6 +602,8 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
     }
   ) {
     if (set.debugLog || this.debugLog) {
+      DyFM_Log.info('Conversation', DyFM_getLocalStackLocation());
+
       set.conversation.forEach(message => {
         console.log(
           ` - ${message.role}: ${message.content.replace(set.replaceThisInLog, this.defaultLogReplacer)}`

package/src/_modules/open-ai/_services/oai-llm.service-base.ts

@@ -1,7 +1,7 @@
 import { OpenAI } from 'openai';
 
 import { DyFM_OpenAI_Settings, DyFM_OpenAIModel, DyFM_GPTCall_Settings } from '@futdevpro/fsm-dynamo/open-ai';
-import { DyFM_AnyError, DyFM_Error, DyFM_Error_Settings, DyFM_Log, DyFM_notNull } from '@futdevpro/fsm-dynamo';
+import { DyFM_AnyError, DyFM_Error, DyFM_Error_Settings, DyFM_Log, DyFM_notNull, DyFM_Shared } from '@futdevpro/fsm-dynamo';
 
 import { DyNTS_global_settings } from '../../../_collections/global-settings.const';
 import { DyNTS_OAI_GPT_Message } from '../_models/interfaces/oai-gpt-message.interface';
@@ -193,7 +193,7 @@ export class DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.askQuestion(set);
 
-    return DyFM_safeParseJSON<T>(answer);
+    return DyFM_Shared.safeParseJSON<T>(answer);
   }
   /** the exact same as {@link requestSelect} */
   selectRequest = this.requestSelect;
@@ -263,7 +263,7 @@ export class DyNTS_OAI_LLM_ServiceBase {
     
     const answer = await this.askQuestion(set);
 
-    return DyFM_safeParseList<T[]>(answer);
+    return DyFM_Shared.safeParseList<T[]>(answer);
   }
   /** the exact same as {@link requestMultipleSelect} */
   multipleSelectRequest = this.requestMultipleSelect;
@@ -291,7 +291,7 @@ export class DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.askQuestion(set);
     
-    return DyFM_safeParseJSON<T>(answer);
+    return DyFM_Shared.safeParseJSON<T>(answer);
   }
   /** the exact same as {@link askJSONQuestion} */
   jsonQuestion = this.askJSONQuestion;
@@ -324,7 +324,7 @@ export class DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.askQuestion(set);
 
-    return DyFM_safeParseJSON<T>(answer);
+    return DyFM_Shared.safeParseJSON<T>(answer);
   }
   /** the exact same as {@link askJSONQuestionWithKeysDescription} */
   jsonQuestionWithKeysDescription = this.askJSONQuestionWithKeysDescription;
@@ -357,7 +357,7 @@ export class DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.askQuestion(set);
 
-    return DyFM_safeParseJSON<T>(answer);
+    return DyFM_Shared.safeParseJSON<T>(answer);
   }
   /** the exact same as {@link askJSONQuestionWithExactKeys} */
   jsonQuestionWithExactKeys = this.askJSONQuestionWithExactKeys;
@@ -385,7 +385,7 @@ export class DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.askQuestion(set);
 
-    return DyFM_safeParseList(answer);
+    return DyFM_Shared.safeParseList<string[]>(answer);
   }
   /** the exact same as {@link askListQuestion} */
   listQuestion = this.askListQuestion;
@@ -597,6 +597,30 @@ export class DyNTS_OAI_LLM_ServiceBase {
       content: settings?.systemPrompt || this.defaultSystemPrompt,
     };
   }
+
+  protected validateConversation(conversation: DyNTS_OAI_GPT_Message[]): void {
+    conversation.forEach((message: DyNTS_OAI_GPT_Message, index: number) => {
+      if (!message.role) {
+        throw new DyFM_Error({
+          message: `Message has no role at index ${index}`,
+          additionalContent: {
+            invalidMessage: message,
+            conversation: conversation,
+          }
+        });
+      }
+
+      if (!message.content) {
+        throw new DyFM_Error({
+          message: `Message has no content at index ${index}`,
+          additionalContent: {
+            invalidMessage: message,
+            conversation: conversation,
+          }
+        });
+      }
+    });
+  }
   
   protected getDefaultErrorSettings(
     fnName: string, 
@@ -618,92 +642,3 @@ export class DyNTS_OAI_LLM_ServiceBase {
 
   //#endregion
 }
-
-/**
- * parses the JSON list, if it fails, it returns the answer as a single item in an array
- * 
- * (uses {@link DyFM_safeParseJSON})
- * @deprecated use {@link DyFM_Shared.safeParseList} instead
- */
-export function DyFM_safeParseList<T extends Array<any>>(
-  textedJSON: string, 
-  disableErrorLog?: boolean
-): T {
-  const parsed = DyFM_safeParseJSON<T>(textedJSON, true);
-
-  if (Array.isArray(parsed)) {
-    return parsed;
-  } else if (typeof parsed === 'object') {
-    if (!disableErrorLog) {
-      DyFM_Log.warn(
-        'DyFM_safeParseList result is an object, returning its values', 
-        {
-          parsed: parsed,
-        }
-      );
-    }
-
-    return Object.values(parsed) as T;
-  } else {
-
-    if (!disableErrorLog) {
-      DyFM_Log.warn(
-        'DyFM_safeParseList result is not an array or object, returning it as a single item', 
-        {
-          parsed: parsed,
-        }
-      );
-    }
-
-    return [ parsed ] as string[] as T;
-  }
-}
-
-/**
- * parses the JSON, if it fails, it returns { unparsableResult: textedJSON }
- * 
- * (uses {@link DyFM_failableSafeParseJSON})
- * @deprecated use {@link DyFM_Shared.safeParseJSON} instead
- */
-export function DyFM_safeParseJSON<T = any>(
-  textedJSON: string,
-  disableErrorLog?: boolean
-): T | { unparsableResult: string } {
-  try {
-    return DyFM_failableSafeParseJSON(textedJSON);
-  } catch (error) {
-    if (!disableErrorLog) {
-      DyFM_Log.error(
-        'Unable to parse JSON answer:', 
-        {
-          unparsedJSON: textedJSON,
-          error: error,
-        }
-      );
-    }
-
-    return { unparsableResult: textedJSON };
-  }
-}
-
-/**
- * parses the JSON, if it fails, it throws an error
- * (also will extract the JSON from "```json ... ```" wrapper)
- * @deprecated use {@link DyFM_Shared.failableSafeParseJSON} instead
- */
-export function DyFM_failableSafeParseJSON<T = any>(textedJSON: string): T {
-  if (!textedJSON) {
-    throw new Error(`No content provided to JSON parse ("${textedJSON}")`);
-  }
-
-  const match = textedJSON.match(/```json(.*)```/s);
-  textedJSON = textedJSON.replaceAll('\n', '');
-
-  if (match) {
-    return JSON.parse(match[1].replaceAll('\n', ''));
-  } else {
-    return JSON.parse(
-      textedJSON.replaceAll('```json', '').replaceAll('```', '')
-    );
-  }
-}

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

@@ -498,12 +498,21 @@ export abstract class DyNTS_SocketServerService<
         }
       });
         
-      newSocketServer.listen(this.params.port);
-      
-      DyFM_Log.success(
-        `\nsocket server setup finished: "${this.params.name}"` + 
-        `\nsocket server listening on port: "${this.params.port}"`
-      );
+      try {
+        newSocketServer.listen(this.params.port);
+        
+        DyFM_Log.success(
+          `\nsocket server setup finished: "${this.params.name}"` + 
+          `\nsocket server listening on port: "${this.params.port}"`
+        );
+      } catch (listenError) {
+        const errorMessage = `Failed to bind socket server "${this.params.name}" to port ${this.params.port}. ` +
+          `This could be due to port already in use or insufficient permissions. ` +
+          `Please ensure the port is available and try again.`;
+        
+        DyFM_Log.error(errorMessage, listenError);
+        throw new Error(errorMessage);
+      }
 
       successCallback();
       

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

@@ -9,17 +9,42 @@ describe('| DyNTS_AppExtended;', (): void => {
   process.setMaxListeners(20);
   let app: DyNTS_AppExtended;
 
+  // Helper function to safely stop and cleanup app
+  const safeStopApp = async (): Promise<void> => {
+    if (app) {
+      try {
+        await app.stop();
+      } catch (error) {
+        DyFM_Log.testWarn('Error stopping app:', error);
+      }
+      app = null;
+    }
+  };
+
+  // Helper function to wait for app to be ready with timeout
+  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);
+    }
+    
+    if (!appInstance.started) {
+      throw new Error(`App failed to start within ${timeoutMs}ms`);
+    }
+  };
+
   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
 
         app = new DyNTS_AppExtendedBase_Mock();
-
         await DyFM_delay(100);
         
         await app.ready();
-
+        await waitForAppReady(app);
+        
         await DyFM_delay(100);
       } catch (error) {
         DyFM_Log.testError(
@@ -35,16 +60,15 @@ describe('| DyNTS_AppExtended;', (): void => {
           (new Error()).stack,
           (error as DyFM_Error)?.additionalContent?.errors?.reverse()?.unshift()?.stack
         );
+        throw error; // Re-throw to fail the test
       }
     });
 
     afterEach(async (): Promise<void> => {
       try {
         await DyFM_delay(100);
-        
-        await app.stop();
-
-        app = null;
+        await safeStopApp();
+        await DyFM_delay(100);
       } catch (error) {
         DyFM_Log.testError(
           '| DyNTS_AppExtended; | a extended-base instance; test afterEach error:\n', 
@@ -64,10 +88,12 @@ describe('| DyNTS_AppExtended;', (): void => {
 
     it('| should be created', (): void => {
       expect(app).toBeDefined();
+      expect(app).toBeInstanceOf(DyNTS_AppExtendedBase_Mock);
     });
 
-    it('| should be started', (): void => {
+    it('| should be started', async (): Promise<void> => {
       expect(app.started).toBeTrue();
+      expect(app).toBeDefined();
     });
   });
 
@@ -75,13 +101,14 @@ describe('| DyNTS_AppExtended;', (): void => {
     beforeEach(async (): Promise<void> => {
       try {
         await DyFM_waitUntil((): boolean => !app, second);
+        await DyFM_delay(100); // Ensure previous instance is fully cleaned up
 
         app = new DyNTS_AppExtendedFull_Mock();
-
         await DyFM_delay(100);
         
         await app.ready();
-
+        await waitForAppReady(app);
+        
         await DyFM_delay(100);
       } catch (error) {
         DyFM_Log.testError(
@@ -97,16 +124,15 @@ describe('| DyNTS_AppExtended;', (): void => {
           (new Error()).stack,
           (error as DyFM_Error)?.additionalContent?.errors?.reverse()?.unshift()?.stack
         );
+        throw error; // Re-throw to fail the test
       }
     });
 
     afterEach(async (): Promise<void> => {
       try {
         await DyFM_delay(100);
-        
-        await app.stop();
-
-        app = null;
+        await safeStopApp();
+        await DyFM_delay(100);
       } catch (error) {
         DyFM_Log.testError(
           '| DyNTS_AppExtended; | a extended-full instance; test afterEach error:\n', 
@@ -126,10 +152,12 @@ describe('| DyNTS_AppExtended;', (): void => {
 
     it('| should be created', async (): Promise<void> => {
       expect(app).toBeDefined();
+      expect(app).toBeInstanceOf(DyNTS_AppExtendedFull_Mock);
     });
       
     it('| should be started', async (): Promise<void> => {
       expect(app.started).toBeTrue();
+      expect(app).toBeDefined();
     });
   });
 
@@ -137,12 +165,14 @@ describe('| DyNTS_AppExtended;', (): void => {
     beforeEach(async (): Promise<void> => {
       try {
         await DyFM_waitUntil((): boolean => !app, second);
+        await DyFM_delay(100); // Ensure previous instance is fully cleaned up
 
         app = new DyNTS_AppWbMock_Mock();
         await DyFM_delay(100);
         
         await app.ready();
-
+        await waitForAppReady(app);
+        
         await DyFM_delay(100);
       } catch (error) {
         DyFM_Log.testError(
@@ -158,15 +188,15 @@ describe('| DyNTS_AppExtended;', (): void => {
           (new Error()).stack,
           (error as DyFM_Error)?.additionalContent?.errors?.reverse()?.unshift()?.stack
         );
+        throw error; // Re-throw to fail the test
       }
     });
+
     afterEach(async (): Promise<void> => {
       try {
         await DyFM_delay(100);
-        
-        await app.stop();
-
-        app = null;
+        await safeStopApp();
+        await DyFM_delay(100);
       } catch (error) {
         DyFM_Log.testError(
           '| DyNTS_AppExtended; | a wb-mock instance; test afterEach error:\n', 
@@ -186,10 +216,12 @@ describe('| DyNTS_AppExtended;', (): void => {
 
     it('| should be created', async (): Promise<void> => {
       expect(app).toBeDefined();
+      expect(app).toBeInstanceOf(DyNTS_AppWbMock_Mock);
     });
       
     it('| should be started', async (): Promise<void> => {
       expect(app.started).toBeTrue();
+      expect(app).toBeDefined();
     });
   });
 });