implementation of DataLayerEvent

update GetGameState to add nickname to the returned data
update GameMap to separate phaserLayer and mapLayer

front/src/Api/Events/DataLayerEvent.ts

@@ -2,7 +2,7 @@ import * as tg from "generic-type-guard";
 
 
 
-export const isHasDataLayerChangedEvent =
+export const isDataLayerEvent =
     new tg.IsInterface().withProperties({
         data: tg.isObject
     }).get();
@@ -10,7 +10,4 @@ export const isHasDataLayerChangedEvent =
 /**
  * A message sent from the game to the iFrame when the data of the layers change after the iFrame send a message to the game that it want to listen to the data of the layers
  */
-export type DataLayerEvent = tg.GuardedType<typeof isHasDataLayerChangedEvent>;
-
-
-export type HasDataLayerChangedEventCallback = (event: DataLayerEvent) => void
+export type DataLayerEvent = tg.GuardedType<typeof isDataLayerEvent>;

front/src/Api/Events/GameStateEvent.ts

@@ -18,6 +18,7 @@ export const isGameStateEvent =
     new tg.IsInterface().withProperties({
         roomId: tg.isString,
         mapUrl: tg.isString,
+        nickname: tg.isUnion(tg.isString, tg.isNull),
         uuid: tg.isUnion(tg.isString, tg.isUndefined),
         startLayerName: tg.isUnion(tg.isString, tg.isNull)
     }).get();

front/src/Api/Events/IframeEvent.ts

@@ -10,7 +10,7 @@ import type { OpenCoWebSiteEvent } from './OpenCoWebSiteEvent';
 import type { OpenPopupEvent } from './OpenPopupEvent';
 import type { OpenTabEvent } from './OpenTabEvent';
 import type { UserInputChatEvent } from './UserInputChatEvent';
-import type { HasDataLayerChangedEvent } from "./HasDataLayerChangedEvent";
+import type { DataLayerEvent } from "./DataLayerEvent";
 import type { LayerEvent } from './LayerEvent';
 import type { SetPropertyEvent } from "./setPropertyEvent";
 
@@ -37,6 +37,7 @@ export type IframeEventMap = {
     showLayer: LayerEvent
     hideLayer: LayerEvent
     setProperty: SetPropertyEvent
+    getDataLayer: undefined
 }
 export interface IframeEvent<T extends keyof IframeEventMap> {
     type: T;
@@ -54,7 +55,7 @@ export interface IframeResponseEventMap {
     buttonClickedEvent: ButtonClickedEvent
     gameState: GameStateEvent
     hasPlayerMoved: HasPlayerMovedEvent
-    hasDataLayerChanged: HasDataLayerChangedEvent
+    dataLayer: DataLayerEvent
 }
 export interface IframeResponseEvent<T extends keyof IframeResponseEventMap> {
     type: T;

front/src/Api/IframeListener.ts

@@ -13,11 +13,10 @@ import { IframeEventMap, IframeEvent, IframeResponseEvent, IframeResponseEventMa
 import type { UserInputChatEvent } from "./Events/UserInputChatEvent";
 import { isLayerEvent, LayerEvent } from "./Events/LayerEvent";
 import { isSetPropertyEvent, SetPropertyEvent} from "./Events/setPropertyEvent";
-import { GameStateEvent } from './Events/GameStateEvent';
-import { deepFreezeClone as deepFreezeClone } from '../utility';
-import { HasPlayerMovedEvent } from './Events/HasPlayerMovedEvent';
+import type { GameStateEvent } from './Events/GameStateEvent';
+import type { HasPlayerMovedEvent } from './Events/HasPlayerMovedEvent';
 import { Math } from 'phaser';
-import { HasDataLayerChangedEvent } from "./Events/HasDataLayerChangedEvent";
+import type { DataLayerEvent } from "./Events/DataLayerEvent";
 
 
 
@@ -72,11 +71,12 @@ class IframeListener {
     private readonly _gameStateStream: Subject<void> = new Subject();
     public readonly gameStateStream = this._gameStateStream.asObservable();
 
+    private readonly _dataLayerChangeStream: Subject<void> = new Subject();
+    public readonly dataLayerChangeStream = this._dataLayerChangeStream.asObservable();
 
     private readonly iframes = new Set<HTMLIFrameElement>();
     private readonly scripts = new Map<string, HTMLIFrameElement>();
     private sendPlayerMove: boolean = false;
-    private sendDataLayerChange: boolean = false;
 
     init() {
         window.addEventListener("message", (message: TypedMessageEvent<IframeEvent<keyof IframeEventMap>>) => {
@@ -138,21 +138,26 @@ class IframeListener {
                     this._gameStateStream.next();
                 } else if (payload.type == "onPlayerMove") {
                     this.sendPlayerMove = true
-                } else if (payload.type == "onDataLayerChange") {
-                    this.sendDataLayerChange = true
+                } else if (payload.type == "getDataLayer") {
+                    this._dataLayerChangeStream.next();
                 }
             }
-
-
         }, false);
 
     }
 
+    sendDataLayerEvent(dataLayerEvent: DataLayerEvent) {
+        this.postMessage({
+            'type' : 'dataLayer',
+            'data' : dataLayerEvent
+        })
+    }
+
 
     sendFrozenGameStateEvent(gameStateEvent: GameStateEvent) {
         this.postMessage({
             'type': 'gameState',
-            'data': gameStateEvent //deepFreezeClone(gameStateEvent)
+            'data': gameStateEvent
         });
     }
 
@@ -268,15 +273,6 @@ class IframeListener {
         }
     }
 
-    hasDataLayerChanged(event: HasDataLayerChangedEvent) {
-        if (this.sendDataLayerChange) {
-            this.postMessage({
-                'type' : 'hasDataLayerChanged',
-                'data' : event
-            });
-        }
-    }
-
     sendButtonClickedEvent(popupId: number, buttonId: number): void {
         this.postMessage({
             'type': 'buttonClickedEvent',