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

Merge branch 'develop' of github.com:thecodingmachine/workadventure into main

Browse Source
This commit is contained in:
_Bastler 2021-07-22 18:41:01 +02:00
commit b6693b9ea7
2 changed files with 92 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
back/src/RoomManager.ts
View File

@ -45,7 +45,8 @@ const roomManager: IRoomManagerServer = {
let room: GameRoom | null = null;
let user: User | null = null;
call.on("data", async (message: PusherToBackMessage) => {
call.on("data", (message: PusherToBackMessage) => {
(async () => {
try {
if (room === null || user === null) {
if (message.hasJoinroommessage()) {
@ -127,6 +128,7 @@ const roomManager: IRoomManagerServer = {
emitError(call, e);
call.end();
}
})().catch(e => console.error(e));
});
call.on("end", () => {

26
front/src/Api/iframe/state.ts
View File

@ -1,10 +1,10 @@
import {Observable, Subject} from "rxjs";
import { Observable, Subject } from "rxjs";
import { EnterLeaveEvent, isEnterLeaveEvent } from "../Events/EnterLeaveEvent";
import {IframeApiContribution, queryWorkadventure, sendToWorkadventure} from "./IframeApiContribution";
import { IframeApiContribution, queryWorkadventure, sendToWorkadventure } from "./IframeApiContribution";
import { apiCallback } from "./registeredCallbacks";
import {isSetVariableEvent, SetVariableEvent} from "../Events/SetVariableEvent";
import { isSetVariableEvent, SetVariableEvent } from "../Events/SetVariableEvent";
import type { ITiledMap } from "../../Phaser/Map/ITiledMap";
@ -19,8 +19,7 @@ export const initVariables = (_variables: Map<string, unknown>): void => {
variables.set(name, value);
}
}
}
};
setVariableResolvers.subscribe((event) => {
const oldValue = variables.get(event.key);
@ -44,19 +43,19 @@ export class WorkadventureStateCommands extends IframeApiContribution<Workadvent
typeChecker: isSetVariableEvent,
callback: (payloadData) => {
setVariableResolvers.next(payloadData);
}
},
}),
];
saveVariable(key : string, value : unknown): Promise<void> {
saveVariable(key: string, value: unknown): Promise<void> {
variables.set(key, value);
return queryWorkadventure({
type: 'setVariable',
type: "setVariable",
data: {
key,
value
}
})
value,
},
});
}
loadVariable(key: string): unknown {
@ -71,7 +70,6 @@ export class WorkadventureStateCommands extends IframeApiContribution<Workadvent
}
return subject.asObservable();
}
}
const proxyCommand = new Proxy(new WorkadventureStateCommands(), {
@ -86,7 +84,7 @@ const proxyCommand = new Proxy(new WorkadventureStateCommands(), {
// User must use WA.state.saveVariable to have error message.
target.saveVariable(p.toString(), value);
return true;
}
});
},
}) as WorkadventureStateCommands & { [key: string]: unknown };
export default proxyCommand;