@3dsource/angular-unreal-module 0.0.101-dev.0 → 0.0.101-dev.1

package/README.md

@@ -236,10 +236,10 @@ Inject `UnrealCallbackService` to listen for callback events from Unreal Engine
 
 There are two methods:
 
-| Method                   | Description                                                                                                         |
-| ------------------------ | ------------------------------------------------------------------------------------------------------------------- |
-| `fromUnrealCallback`     | Listens for callbacks matching a command or event key. Supports MetaBox commands and custom Unreal callback events. |
-| `observeCommandResponse` | Sends a command and waits for its matching response by `correlationId`. Includes timeout and error handling.        |
+| Method                   | Description                                                                                                                                                            |
+| ------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `fromUnrealCallback`     | Listens for callbacks matching a command or event key. Supports MetaBox commands and custom Unreal callback events. Returns `Observable<UnrealCallbackDescriptor[K]>`. |
+| `observeCommandResponse` | Sends a command and waits for its matching response by `correlationId`. Returns `Observable<MetaBoxCommandList[K]>`. Includes timeout and error handling.              |
 
 **Custom Unreal callback events** (defined in `UnrealCallbackEventMap`):
 

package/fesm2022/3dsource-angular-unreal-module.mjs

@@ -4700,17 +4700,12 @@ class UnrealCallbackService {
      */
     observeCommandResponse(data, sender, timeOut = 60000, dispatchOnTimeout = true) {
         const correlationId = generateUuid();
-        const observable = this.actions$.pipe(ofType(unrealCommandCallback), map$1(({ json }) => {
-            // !!!IMPORTANT!!! ALL COMMANDS NEED TO CONTAIN COMMAND CALLBACKS
-            // Some callbacks do not have commandCallback wrapper,
-            // so first we check if it exists,
-            // then fall back to JSON itself
-            return 'commandCallback' in json
-                ? { json }
-                : { json: { commandCallback: json } };
-        }), filter(({ json }) => json.commandCallback.correlationId === correlationId), timeout(timeOut), catchError(() => dispatchOnTimeout
-            ? of({ json: { commandCallback: { correlationId: 'timeout' } } })
-            : of(null)), take(1), tapLog('Command Response Observer'), filter(Truthy));
+        const observable = this.actions$.pipe(ofType(unrealCommandCallback), map$1(({ json }) => 'commandCallback' in json ? json.commandCallback : json), filter((json) => json.correlationId === correlationId), timeout(timeOut), catchError(() => dispatchOnTimeout
+            ? of({ command: 'timeout', correlationId: 'timeout' })
+            : of(null)), take(1), tapLog('Command Response Observer'), filter(Truthy), map$1((data) => ({
+            command: data.command,
+            payload: 'payload' in data ? data.payload : null,
+        })));
         setTimeout(() => sender({ ...data, correlationId }), 0);
         return observable;
     }