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

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

@ -19,8 +19,7 @@ export const initVariables = (_variables: Map<string, unknown>): void => {
variables.set(name, value); variables.set(name, value);
} }
} }
};
}
setVariableResolvers.subscribe((event) => { setVariableResolvers.subscribe((event) => {
const oldValue = variables.get(event.key); const oldValue = variables.get(event.key);
@ -44,19 +43,19 @@ export class WorkadventureStateCommands extends IframeApiContribution<Workadvent
typeChecker: isSetVariableEvent, typeChecker: isSetVariableEvent,
callback: (payloadData) => { callback: (payloadData) => {
setVariableResolvers.next(payloadData); setVariableResolvers.next(payloadData);
} },
}), }),
]; ];
saveVariable(key: string, value: unknown): Promise<void> { saveVariable(key: string, value: unknown): Promise<void> {
variables.set(key, value); variables.set(key, value);
return queryWorkadventure({ return queryWorkadventure({
type: 'setVariable', type: "setVariable",
data: { data: {
key, key,
value value,
} },
}) });
} }
loadVariable(key: string): unknown { loadVariable(key: string): unknown {
@ -71,7 +70,6 @@ export class WorkadventureStateCommands extends IframeApiContribution<Workadvent
} }
return subject.asObservable(); return subject.asObservable();
} }
} }
const proxyCommand = new Proxy(new WorkadventureStateCommands(), { 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. // User must use WA.state.saveVariable to have error message.
target.saveVariable(p.toString(), value); target.saveVariable(p.toString(), value);
return true; return true;
} },
}); }) as WorkadventureStateCommands & { [key: string]: unknown };
export default proxyCommand; export default proxyCommand;