_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

availabilityStatus info from websocket

Browse Source
This commit is contained in:
Piotr 'pwh' Hanusiak
2022-05-10 15:10:01 +02:00
committed by David Négrier
parent 2b15faf4e8
commit a566f8d661
17 changed files with 86 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
front/src/Connexion/ConnectionManager.ts
+14 -5
View File
@@ -19,6 +19,7 @@ import { gameManager } from "../Phaser/Game/GameManager";
import { locales } from "../i18n/i18n-util";
import type { Locales } from "../i18n/i18n-types";
import { setCurrentLocale } from "../i18n/locales";
import { AvailabilityStatus } from "../Messages/ts-proto-generated/protos/messages";
class ConnectionManager {
private localUser!: LocalUser;
@@ -276,7 +277,8 @@ class ConnectionManager {
characterLayers: string[],
position: PositionInterface,
viewport: ViewportInterface,
companion: string | null
companion: string | null,
availabilityStatus: AvailabilityStatus
): Promise<OnConnectInterface> {
return new Promise<OnConnectInterface>((resolve, reject) => {
const connection = new RoomConnection(
@@ -286,7 +288,8 @@ class ConnectionManager {
characterLayers,
position,
viewport,
companion
companion,
availabilityStatus
);
connection.onConnectError((error: object) => {
@@ -340,9 +343,15 @@ class ConnectionManager {
this.reconnectingTimeout = setTimeout(() => {
//todo: allow a way to break recursion?
//todo: find a way to avoid recursive function. Otherwise, the call stack will grow indefinitely.
void this.connectToRoomSocket(roomUrl, name, characterLayers, position, viewport, companion).then(
(connection) => resolve(connection)
);
void this.connectToRoomSocket(
roomUrl,
name,
characterLayers,
position,
viewport,
companion,
availabilityStatus
).then((connection) => resolve(connection));
}, 4000 + Math.floor(Math.random() * 2000));
});
});
front/src/Connexion/ConnexionModels.ts
+2 -2
View File
@@ -15,7 +15,7 @@ export interface MessageUserPositionInterface {
name: string;
characterLayers: BodyResourceDescriptionInterface[];
position: PointInterface;
status: AvailabilityStatus;
availabilityStatus: AvailabilityStatus;
visitCardUrl: string | null;
companion: string | null;
userUuid: string;
@@ -31,7 +31,7 @@ export interface MessageUserJoined {
name: string;
characterLayers: BodyResourceDescriptionInterface[];
position: PointInterface;
status: AvailabilityStatus;
availabilityStatus: AvailabilityStatus;
visitCardUrl: string | null;
companion: string | null;
userUuid: string;
front/src/Connexion/RoomConnection.ts
+9 -4
View File
@@ -154,6 +154,7 @@ export class RoomConnection implements RoomConnection {
* @param position
* @param viewport
* @param companion
* @param availabilityStatus
*/
public constructor(
token: string | null,
@@ -162,7 +163,8 @@ export class RoomConnection implements RoomConnection {
characterLayers: string[],
position: PositionInterface,
viewport: ViewportInterface,
companion: string | null
companion: string | null,
availabilityStatus: AvailabilityStatus
) {
let url = new URL(PUSHER_URL, window.location.toString()).toString();
url = url.replace("http://", "ws://").replace("https://", "wss://");
@@ -185,6 +187,9 @@ export class RoomConnection implements RoomConnection {
if (typeof companion === "string") {
url += "&companion=" + encodeURIComponent(companion);
}
if (typeof availabilityStatus === "number") {
url += "&availabilityStatus=" + availabilityStatus;
}
if (RoomConnection.websocketFactory) {
this.socket = RoomConnection.websocketFactory(url);
@@ -537,9 +542,9 @@ export class RoomConnection implements RoomConnection {
this.socket.send(bytes);
}
public emitPlayerStatusChange(status: AvailabilityStatus): void {
public emitPlayerStatusChange(availabilityStatus: AvailabilityStatus): void {
const message = SetPlayerDetailsMessageTsProto.fromPartial({
status,
availabilityStatus,
});
const bytes = ClientToServerMessageTsProto.encode({
message: {
@@ -673,7 +678,7 @@ export class RoomConnection implements RoomConnection {
characterLayers,
visitCardUrl: message.visitCardUrl,
position: ProtobufClientUtils.toPointInterface(position),
status: message.status,
availabilityStatus: message.availabilityStatus,
companion: companion ? companion.name : null,
userUuid: message.userUuid,
outlineColor: message.hasOutline ? message.outlineColor : undefined,
front/src/Phaser/Components/PlayerStatusDot.ts
+6 -6
View File
@@ -5,7 +5,7 @@ export class PlayerStatusDot extends Phaser.GameObjects.Container {
private statusImage: Phaser.GameObjects.Image;
private statusImageOutline: Phaser.GameObjects.Image;
private status: AvailabilityStatus;
private availabilityStatus: AvailabilityStatus;
private readonly COLORS: Record<AvailabilityStatus, { filling: number; outline: number }> = {
[AvailabilityStatus.AWAY]: { filling: 0xf5931e, outline: 0x875d13 },
@@ -19,7 +19,7 @@ export class PlayerStatusDot extends Phaser.GameObjects.Container {
constructor(scene: Phaser.Scene, x: number, y: number) {
super(scene, x, y);
this.status = AvailabilityStatus.ONLINE;
this.availabilityStatus = AvailabilityStatus.ONLINE;
this.statusImage = this.scene.add.image(0, 0, "iconStatusIndicatorInside");
this.statusImageOutline = this.scene.add.image(0, 0, "iconStatusIndicatorOutline");
@@ -31,11 +31,11 @@ export class PlayerStatusDot extends Phaser.GameObjects.Container {
this.scene.add.existing(this);
}
public setStatus(status: AvailabilityStatus, instant: boolean = false): void {
if (this.status === status || status === AvailabilityStatus.UNCHANGED) {
public setAvailabilityStatus(availabilityStatus: AvailabilityStatus, instant: boolean = false): void {
if (this.availabilityStatus === availabilityStatus || availabilityStatus === AvailabilityStatus.UNCHANGED) {
return;
}
this.status = status;
this.availabilityStatus = availabilityStatus;
if (instant) {
this.redraw();
} else {
@@ -61,7 +61,7 @@ export class PlayerStatusDot extends Phaser.GameObjects.Container {
}
private redraw(): void {
const colors = this.COLORS[this.status];
const colors = this.COLORS[this.availabilityStatus];
this.statusImage.setTintFill(colors.filling);
this.statusImageOutline.setTintFill(colors.outline);
}
front/src/Phaser/Entity/Character.ts
+2 -2
View File
@@ -236,8 +236,8 @@ export abstract class Character extends Container implements OutlineableInterfac
this.talkIcon.show(show, forceClose);
}
public setStatus(status: AvailabilityStatus, instant: boolean = false): void {
this.statusDot.setStatus(status, instant);
public setAvailabilityStatus(availabilityStatus: AvailabilityStatus, instant: boolean = false): void {
this.statusDot.setAvailabilityStatus(availabilityStatus, instant);
}
public addCompanion(name: string, texturePromise?: CancelablePromise<string>): void {
front/src/Phaser/Game/GameScene.ts
+11 -9
View File
@@ -687,7 +687,8 @@ export class GameScene extends DirtyScene {
right: camera.scrollX + camera.width,
bottom: camera.scrollY + camera.height,
},
this.companion
this.companion,
get(availabilityStatusStore)
)
.then((onConnect: OnConnectInterface) => {
this.connection = onConnect.connection;
@@ -711,7 +712,7 @@ export class GameScene extends DirtyScene {
characterLayers: message.characterLayers,
name: message.name,
position: message.position,
status: message.status,
availabilityStatus: message.availabilityStatus,
visitCardUrl: message.visitCardUrl,
companion: message.companion,
userUuid: message.userUuid,
@@ -889,9 +890,10 @@ export class GameScene extends DirtyScene {
this.tryChangeShowVoiceIndicatorState(this.jitsiDominantSpeaker && this.jitsiParticipantsCount > 1);
});
this.availabilityStatusStoreUnsubscriber = availabilityStatusStore.subscribe((status) => {
this.connection?.emitPlayerStatusChange(status);
this.CurrentPlayer.setStatus(status);
this.availabilityStatusStoreUnsubscriber = availabilityStatusStore.subscribe((availabilityStatus) => {
console.log(availabilityStatus);
this.connection?.emitPlayerStatusChange(availabilityStatus);
this.CurrentPlayer.setAvailabilityStatus(availabilityStatus);
});
this.emoteUnsubscriber = emoteStore.subscribe((emote) => {
@@ -1993,8 +1995,8 @@ ${escapedMessage}
if (addPlayerData.outlineColor !== undefined) {
player.setApiOutlineColor(addPlayerData.outlineColor);
}
if (addPlayerData.status !== undefined) {
player.setStatus(addPlayerData.status, true);
if (addPlayerData.availabilityStatus !== undefined) {
player.setAvailabilityStatus(addPlayerData.availabilityStatus, true);
}
this.MapPlayers.add(player);
this.MapPlayersByKey.set(player.userId, player);
@@ -2145,8 +2147,8 @@ ${escapedMessage}
if (message.details?.showVoiceIndicator !== undefined) {
character.showTalkIcon(message.details?.showVoiceIndicator);
}
if (message.details?.status !== undefined) {
character.setStatus(message.details?.status);
if (message.details?.availabilityStatus !== undefined) {
character.setAvailabilityStatus(message.details?.availabilityStatus);
}
}
front/src/Phaser/Game/PlayerInterface.ts
+1 -1
View File
@@ -8,7 +8,7 @@ export interface PlayerInterface {
visitCardUrl: string | null;
companion: string | null;
userUuid: string;
status: AvailabilityStatus;
availabilityStatus: AvailabilityStatus;
color?: string;
outlineColor?: number;
}
front/src/Stores/PlayersStore.ts
+2 -2
View File
@@ -29,7 +29,7 @@ function createPlayersStore() {
visitCardUrl: message.visitCardUrl,
companion: message.companion,
userUuid: message.userUuid,
status: message.status,
availabilityStatus: message.status,
color: getRandomColor(),
});
return users;
@@ -59,7 +59,7 @@ function createPlayersStore() {
characterLayers: [],
visitCardUrl: null,
companion: null,
status: AvailabilityStatus.ONLINE,
availabilityStatus: AvailabilityStatus.ONLINE,
userUuid: "dummy",
color: getRandomColor(),
});