Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing merge

Browse source
This commit is contained in:
David Négrier 2021-07-16 11:37:44 +02:00
parent 5c7ea7b258
commit 3d76f76d3e
3 changed files with 5 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

7
front/src/Api/iframe/player.ts
View file

@ -2,15 +2,8 @@ import { IframeApiContribution, sendToWorkadventure } from "./IframeApiContribut
import type { HasPlayerMovedEvent, HasPlayerMovedEventCallback } from "../Events/HasPlayerMovedEvent"; import type { HasPlayerMovedEvent, HasPlayerMovedEventCallback } from "../Events/HasPlayerMovedEvent";
import { Subject } from "rxjs"; import { Subject } from "rxjs";
import { apiCallback } from "./registeredCallbacks"; import { apiCallback } from "./registeredCallbacks";
import { getGameState } from "./room";
import { isHasPlayerMovedEvent } from "../Events/HasPlayerMovedEvent"; import { isHasPlayerMovedEvent } from "../Events/HasPlayerMovedEvent";
interface User {
id: string | undefined;
nickName: string | null;
tags: string[];
}
const moveStream = new Subject<HasPlayerMovedEvent>(); const moveStream = new Subject<HasPlayerMovedEvent>();
let playerName: string | undefined; let playerName: string | undefined;

17
pusher/src/Model/PusherRoom.ts
View file

@ -44,15 +44,6 @@ export class PusherRoom {
this.tags = []; this.tags = [];
this.policyType = GameRoomPolicyTypes.ANONYMOUS_POLICY; this.policyType = GameRoomPolicyTypes.ANONYMOUS_POLICY;
if (this.public) {
this.roomSlug = extractRoomSlugPublicRoomId(this.roomId);
} else {
const { organizationSlug, worldSlug, roomSlug } = extractDataFromPrivateRoomId(this.roomId);
this.roomSlug = roomSlug;
this.organizationSlug = organizationSlug;
this.worldSlug = worldSlug;
}
// A zone is 10 sprites wide. // A zone is 10 sprites wide.
this.positionNotifier = new PositionDispatcher(this.roomUrl, 320, 320, this.socketListener); this.positionNotifier = new PositionDispatcher(this.roomUrl, 320, 320, this.socketListener);
} }
@ -91,10 +82,10 @@ export class PusherRoom {
* Creates a connection to the back server to track global messages relative to this room (like variable changes). * Creates a connection to the back server to track global messages relative to this room (like variable changes).
*/ */
public async init(): Promise<void> { public async init(): Promise<void> {
debug("Opening connection to room %s on back server", this.roomId); debug("Opening connection to room %s on back server", this.roomUrl);
const apiClient = await apiClientRepository.getClient(this.roomId); const apiClient = await apiClientRepository.getClient(this.roomUrl);
const roomMessage = new RoomMessage(); const roomMessage = new RoomMessage();
roomMessage.setRoomid(this.roomId); roomMessage.setRoomid(this.roomUrl);
this.backConnection = apiClient.listenRoom(roomMessage); this.backConnection = apiClient.listenRoom(roomMessage);
this.backConnection.on("data", (batch: BatchToPusherRoomMessage) => { this.backConnection.on("data", (batch: BatchToPusherRoomMessage) => {
for (const message of batch.getPayloadList()) { for (const message of batch.getPayloadList()) {
@ -141,7 +132,7 @@ export class PusherRoom {
} }
public close(): void { public close(): void {
debug("Closing connection to room %s on back server", this.roomId); debug("Closing connection to room %s on back server", this.roomUrl);
this.isClosing = true; this.isClosing = true;
this.backConnection.cancel(); this.backConnection.cancel();
} }

2
pusher/src/Services/SocketManager.ts
View file

@ -380,7 +380,7 @@ export class SocketManager implements ZoneEventListener {
if (ADMIN_API_URL) { if (ADMIN_API_URL) {
await this.updateRoomWithAdminData(room); await this.updateRoomWithAdminData(room);
} }
await world.init(); await room.init();
this.rooms.set(roomUrl, room); this.rooms.set(roomUrl, room);
} }
return room; return room;