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

latest dev

Browse Source
This commit is contained in:
_Bastler 2021-11-24 16:29:14 +01:00
commit e796503810
12 changed files with 140 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/continuous_integration.yml vendored
View File

@ -62,18 +62,13 @@ jobs:
working-directory: "front" working-directory: "front"
- name: "Pretty" - name: "Pretty"
run: yarn run pretty run: yarn run pretty-check
working-directory: "front" working-directory: "front"
- name: "Jasmine" - name: "Jasmine"
run: yarn test run: yarn test
working-directory: "front" working-directory: "front"
# We will enable prettier checks on front in a few month, when most PRs without prettier have been merged
# - name: "Prettier"
# run: yarn run pretty-check
# working-directory: "front"
continuous-integration-pusher: continuous-integration-pusher:
name: "Continuous Integration Pusher" name: "Continuous Integration Pusher"

2
front/src/Api/Events/CloseCoWebsiteEvent.ts
View File

@ -2,7 +2,7 @@ import * as tg from "generic-type-guard";
export const isCloseCoWebsite = new tg.IsInterface() export const isCloseCoWebsite = new tg.IsInterface()
.withProperties({ .withProperties({
id: tg.isOptional(tg.isString) id: tg.isOptional(tg.isString),
}) })
.get(); .get();

12
front/src/Api/Events/IframeEvent.ts
View File

@ -24,9 +24,7 @@ import type { EmbeddedWebsite } from "../iframe/Room/EmbeddedWebsite";
import { isCreateEmbeddedWebsiteEvent } from "./EmbeddedWebsiteEvent"; import { isCreateEmbeddedWebsiteEvent } from "./EmbeddedWebsiteEvent";
import type { LoadTilesetEvent } from "./LoadTilesetEvent"; import type { LoadTilesetEvent } from "./LoadTilesetEvent";
import { isLoadTilesetEvent } from "./LoadTilesetEvent"; import { isLoadTilesetEvent } from "./LoadTilesetEvent";
import type { import type { MessageReferenceEvent } from "./ui/TriggerActionMessageEvent";
MessageReferenceEvent,
} from "./ui/TriggerActionMessageEvent";
import { isMessageReferenceEvent, isTriggerActionMessageEvent } from "./ui/TriggerActionMessageEvent"; import { isMessageReferenceEvent, isTriggerActionMessageEvent } from "./ui/TriggerActionMessageEvent";
import type { MenuRegisterEvent, UnregisterMenuEvent } from "./ui/MenuRegisterEvent"; import type { MenuRegisterEvent, UnregisterMenuEvent } from "./ui/MenuRegisterEvent";
import type { ChangeLayerEvent } from "./ChangeLayerEvent"; import type { ChangeLayerEvent } from "./ChangeLayerEvent";
@ -122,19 +120,19 @@ export const iframeQueryMapTypeGuards = {
}, },
openCoWebsite: { openCoWebsite: {
query: isOpenCoWebsiteEvent, query: isOpenCoWebsiteEvent,
answer: isCoWebsite answer: isCoWebsite,
}, },
getCoWebsites: { getCoWebsites: {
query: tg.isUndefined, query: tg.isUndefined,
answer: tg.isArray(isCoWebsite) answer: tg.isArray(isCoWebsite),
}, },
closeCoWebsite: { closeCoWebsite: {
query: tg.isString, query: tg.isString,
answer: tg.isUndefined answer: tg.isUndefined,
}, },
closeCoWebsites: { closeCoWebsites: {
query: tg.isUndefined, query: tg.isUndefined,
answer: tg.isUndefined answer: tg.isUndefined,
}, },
triggerActionMessage: { triggerActionMessage: {
query: isTriggerActionMessageEvent, query: isTriggerActionMessageEvent,

2
front/src/Api/Events/OpenCoWebsiteEvent.ts
View File

@ -5,7 +5,7 @@ export const isOpenCoWebsiteEvent = new tg.IsInterface()
url: tg.isString, url: tg.isString,
allowApi: tg.isOptional(tg.isBoolean), allowApi: tg.isOptional(tg.isBoolean),
allowPolicy: tg.isOptional(tg.isString), allowPolicy: tg.isOptional(tg.isString),
position: tg.isOptional(tg.isNumber) position: tg.isOptional(tg.isNumber),
}) })
.get(); .get();

2
front/src/Api/iframe/nav.ts
View File

@ -57,7 +57,7 @@ export class WorkadventureNavigationCommands extends IframeApiContribution<Worka
async getCoWebSites(): Promise<CoWebsite[]> { async getCoWebSites(): Promise<CoWebsite[]> {
const result = await queryWorkadventure({ const result = await queryWorkadventure({
type: "getCoWebsites", type: "getCoWebsites",
data: undefined data: undefined,
}); });
return result.map((cowebsiteEvent) => new CoWebsite(cowebsiteEvent.id, cowebsiteEvent.position)); return result.map((cowebsiteEvent) => new CoWebsite(cowebsiteEvent.id, cowebsiteEvent.position));
} }

4
front/src/Phaser/Entity/Character.ts
View File

@ -128,6 +128,10 @@ export abstract class Character extends Container {
} }
public addTextures(textures: string[], frame?: string | number): void { public addTextures(textures: string[], frame?: string | number): void {
if (textures.length < 1) {
throw new TextureError("no texture given");
}
for (const texture of textures) { for (const texture of textures) {
if (this.scene && !this.scene.textures.exists(texture)) { if (this.scene && !this.scene.textures.exists(texture)) {
throw new TextureError("texture not found"); throw new TextureError("texture not found");

6
front/src/Phaser/Entity/PlayerTexturesLoadingManager.ts
View File

@ -69,13 +69,11 @@ export const lazyLoadPlayerCharacterTextures = (
} }
//If the loading fail, we render the default model instead. //If the loading fail, we render the default model instead.
return returnPromise return returnPromise.then((keys) =>
.then((keys) =>
keys.map((key) => { keys.map((key) => {
return typeof key !== "string" ? key.name : key; return typeof key !== "string" ? key.name : key;
}) })
) );
.catch(() => lazyLoadPlayerCharacterTextures(loadPlugin, ["color_22", "eyes_23"]));
}; };
export const getRessourceDescriptor = ( export const getRessourceDescriptor = (

8
front/src/Phaser/Game/GameMap.ts
View File

@ -12,8 +12,7 @@ export type PropertyChangeCallback = (
export type layerChangeCallback = ( export type layerChangeCallback = (
layersChangedByAction: Array<ITiledMapLayer>, layersChangedByAction: Array<ITiledMapLayer>,
allLayersOnNewPosition: Array<ITiledMapLayer>, allLayersOnNewPosition: Array<ITiledMapLayer>
) => void; ) => void;
/** /**
@ -81,7 +80,7 @@ export class GameMap {
} }
private getLayersByKey(key: number): Array<ITiledMapLayer> { private getLayersByKey(key: number): Array<ITiledMapLayer> {
return this.flatLayers.filter(flatLayer => flatLayer.type === 'tilelayer' && flatLayer.data[key] !== 0); return this.flatLayers.filter((flatLayer) => flatLayer.type === "tilelayer" && flatLayer.data[key] !== 0);
} }
/** /**
@ -134,14 +133,13 @@ export class GameMap {
const enterLayers = new Set(layersByNewKey); const enterLayers = new Set(layersByNewKey);
const leaveLayers = new Set(layersByOldKey); const leaveLayers = new Set(layersByOldKey);
enterLayers.forEach(layer => { enterLayers.forEach((layer) => {
if (leaveLayers.has(layer)) { if (leaveLayers.has(layer)) {
leaveLayers.delete(layer); leaveLayers.delete(layer);
enterLayers.delete(layer); enterLayers.delete(layer);
} }
}); });
if (enterLayers.size > 0) { if (enterLayers.size > 0) {
const layerArray = Array.from(enterLayers); const layerArray = Array.from(enterLayers);
for (const callback of this.enterLayerCallbacks) { for (const callback of this.enterLayerCallbacks) {

70
front/src/Phaser/Game/GameMapProperties.ts
View File

@ -1,37 +1,37 @@
export enum GameMapProperties { export enum GameMapProperties {
ALLOW_API = 'allowApi', ALLOW_API = "allowApi",
AUDIO_LOOP = 'audioLoop', AUDIO_LOOP = "audioLoop",
AUDIO_VOLUME = 'audioVolume', AUDIO_VOLUME = "audioVolume",
COLLIDES = 'collides', COLLIDES = "collides",
DEFAULT = 'default', DEFAULT = "default",
EXIT_URL = 'exitUrl', EXIT_URL = "exitUrl",
EXIT_SCENE_URL = 'exitSceneUrl', EXIT_SCENE_URL = "exitSceneUrl",
FONT_FAMILY = 'font-family', FONT_FAMILY = "font-family",
JITSI_ADMIN_ROOM_TAG = 'jitsiRoomAdminTag', JITSI_ADMIN_ROOM_TAG = "jitsiRoomAdminTag",
JITSI_CONFIG = 'jitsiConfig', JITSI_CONFIG = "jitsiConfig",
JITSI_INTERFACE_CONFIG = 'jitsiInterfaceConfig', JITSI_INTERFACE_CONFIG = "jitsiInterfaceConfig",
JITSI_ROOM = 'jitsiRoom', JITSI_ROOM = "jitsiRoom",
JITSI_TRIGGER = 'jitsiTrigger', JITSI_TRIGGER = "jitsiTrigger",
JITSI_TRIGGER_MESSAGE = 'jitsiTriggerMessage', JITSI_TRIGGER_MESSAGE = "jitsiTriggerMessage",
JITSI_URL = 'jitsiUrl', JITSI_URL = "jitsiUrl",
JITSI_WIDTH = 'jitsiWidth', JITSI_WIDTH = "jitsiWidth",
NAME = 'name', NAME = "name",
OPEN_TAB = 'openTab', OPEN_TAB = "openTab",
OPEN_WEBSITE = 'openWebsite', OPEN_WEBSITE = "openWebsite",
OPEN_WEBSITE_ALLOW_API = 'openWebsiteAllowApi', OPEN_WEBSITE_ALLOW_API = "openWebsiteAllowApi",
OPEN_WEBSITE_POLICY = 'openWebsitePolicy', OPEN_WEBSITE_POLICY = "openWebsitePolicy",
OPEN_WEBSITE_WIDTH = 'openWebsiteWidth', OPEN_WEBSITE_WIDTH = "openWebsiteWidth",
OPEN_WEBSITE_POSITION = 'openWebsitePosition', OPEN_WEBSITE_POSITION = "openWebsitePosition",
OPEN_WEBSITE_TRIGGER = 'openWebsiteTrigger', OPEN_WEBSITE_TRIGGER = "openWebsiteTrigger",
OPEN_WEBSITE_TRIGGER_MESSAGE = 'openWebsiteTriggerMessage', OPEN_WEBSITE_TRIGGER_MESSAGE = "openWebsiteTriggerMessage",
PLAY_AUDIO = 'playAudio', PLAY_AUDIO = "playAudio",
PLAY_AUDIO_LOOP = 'playAudioLoop', PLAY_AUDIO_LOOP = "playAudioLoop",
READABLE_BY = 'readableBy', READABLE_BY = "readableBy",
SCRIPT = 'script', SCRIPT = "script",
SILENT = 'silent', SILENT = "silent",
START = 'start', START = "start",
START_LAYER = 'startLayer', START_LAYER = "startLayer",
URL = 'url', URL = "url",
WRITABLE_BY = 'writableBy', WRITABLE_BY = "writableBy",
ZONE = 'zone', ZONE = "zone",
} }

37
front/src/Phaser/Game/GameMapPropertiesListener.ts
View File

@ -4,10 +4,8 @@ import { scriptUtils } from "../../Api/ScriptUtils";
import type { CoWebsite } from "../../WebRtc/CoWebsiteManager"; import type { CoWebsite } from "../../WebRtc/CoWebsiteManager";
import { coWebsiteManager, CoWebsiteState } from "../../WebRtc/CoWebsiteManager"; import { coWebsiteManager, CoWebsiteState } from "../../WebRtc/CoWebsiteManager";
import { layoutManagerActionStore } from "../../Stores/LayoutManagerStore"; import { layoutManagerActionStore } from "../../Stores/LayoutManagerStore";
import { get } from 'svelte/store'; import { get } from "svelte/store";
import { import { ON_ACTION_TRIGGER_BUTTON, ON_ACTION_TRIGGER_DISABLE } from "../../WebRtc/LayoutManager";
ON_ACTION_TRIGGER_BUTTON, ON_ACTION_TRIGGER_DISABLE,
} from "../../WebRtc/LayoutManager";
import type { ITiledMapLayer } from "../Map/ITiledMap"; import type { ITiledMapLayer } from "../Map/ITiledMap";
import { GameMapProperties } from "./GameMapProperties"; import { GameMapProperties } from "./GameMapProperties";
import { iframeListener } from "../../Api/IframeListener"; import { iframeListener } from "../../Api/IframeListener";
@ -21,8 +19,8 @@ enum OpenCoWebsiteState {
} }
interface OpenCoWebsite { interface OpenCoWebsite {
coWebsite: CoWebsite | undefined, coWebsite: CoWebsite | undefined;
state: OpenCoWebsiteState state: OpenCoWebsiteState;
} }
export class GameMapPropertiesListener { export class GameMapPropertiesListener {
@ -33,7 +31,7 @@ export class GameMapPropertiesListener {
constructor(private scene: GameScene, private gameMap: GameMap) {} constructor(private scene: GameScene, private gameMap: GameMap) {}
register() { register() {
this.gameMap.onPropertyChange(GameMapProperties.OPEN_TAB, (newValue, oldvalue, allProps) => { this.gameMap.onPropertyChange(GameMapProperties.OPEN_TAB, (newValue, oldValue, allProps) => {
if (newValue === undefined) { if (newValue === undefined) {
layoutManagerActionStore.removeAction("openTab"); layoutManagerActionStore.removeAction("openTab");
} }
@ -60,7 +58,7 @@ export class GameMapPropertiesListener {
// Open a new co-website by the property. // Open a new co-website by the property.
this.gameMap.onEnterLayer((newLayers) => { this.gameMap.onEnterLayer((newLayers) => {
const handler = () => { const handler = () => {
newLayers.forEach(layer => { newLayers.forEach((layer) => {
if (!layer.properties) { if (!layer.properties) {
return; return;
} }
@ -73,7 +71,7 @@ export class GameMapPropertiesListener {
let websiteTriggerProperty: string | undefined; let websiteTriggerProperty: string | undefined;
let websiteTriggerMessageProperty: string | undefined; let websiteTriggerMessageProperty: string | undefined;
layer.properties.forEach(property => { layer.properties.forEach((property) => {
switch (property.name) { switch (property.name) {
case GameMapProperties.OPEN_WEBSITE: case GameMapProperties.OPEN_WEBSITE:
openWebsiteProperty = property.value as string | undefined; openWebsiteProperty = property.value as string | undefined;
@ -115,14 +113,16 @@ export class GameMapPropertiesListener {
}); });
const openWebsiteFunction = () => { const openWebsiteFunction = () => {
coWebsiteManager.loadCoWebsite( coWebsiteManager
.loadCoWebsite(
openWebsiteProperty as string, openWebsiteProperty as string,
this.scene.MapUrlFile, this.scene.MapUrlFile,
allowApiProperty, allowApiProperty,
websitePolicyProperty, websitePolicyProperty,
websiteWidthProperty, websiteWidthProperty,
websitePositionProperty, websitePositionProperty
).then(coWebsite => { )
.then((coWebsite) => {
const coWebsiteOpen = this.coWebsitesOpenByLayer.get(layer); const coWebsiteOpen = this.coWebsitesOpenByLayer.get(layer);
if (coWebsiteOpen && coWebsiteOpen.state === OpenCoWebsiteState.MUST_BE_CLOSE) { if (coWebsiteOpen && coWebsiteOpen.state === OpenCoWebsiteState.MUST_BE_CLOSE) {
coWebsiteManager.closeCoWebsite(coWebsite); coWebsiteManager.closeCoWebsite(coWebsite);
@ -131,7 +131,7 @@ export class GameMapPropertiesListener {
} else { } else {
this.coWebsitesOpenByLayer.set(layer, { this.coWebsitesOpenByLayer.set(layer, {
coWebsite, coWebsite,
state: OpenCoWebsiteState.OPENED state: OpenCoWebsiteState.OPENED,
}); });
} }
}); });
@ -186,7 +186,7 @@ export class GameMapPropertiesListener {
// Close opened co-websites on leave the layer who contain the property. // Close opened co-websites on leave the layer who contain the property.
this.gameMap.onLeaveLayer((oldLayers) => { this.gameMap.onLeaveLayer((oldLayers) => {
const handler = () => { const handler = () => {
oldLayers.forEach(layer => { oldLayers.forEach((layer) => {
if (!layer.properties) { if (!layer.properties) {
return; return;
} }
@ -194,7 +194,7 @@ export class GameMapPropertiesListener {
let openWebsiteProperty: string | undefined; let openWebsiteProperty: string | undefined;
let websiteTriggerProperty: string | undefined; let websiteTriggerProperty: string | undefined;
layer.properties.forEach(property => { layer.properties.forEach((property) => {
switch (property.name) { switch (property.name) {
case GameMapProperties.OPEN_WEBSITE: case GameMapProperties.OPEN_WEBSITE:
openWebsiteProperty = property.value as string | undefined; openWebsiteProperty = property.value as string | undefined;
@ -245,9 +245,10 @@ export class GameMapPropertiesListener {
return; return;
} }
const action = actionStore && actionStore.length > 0 ? const action =
actionStore.find(action => action.uuid === actionTriggerUuid) : undefined; actionStore && actionStore.length > 0
? actionStore.find((action) => action.uuid === actionTriggerUuid)
: undefined;
if (action) { if (action) {
layoutManagerActionStore.removeAction(actionTriggerUuid); layoutManagerActionStore.removeAction(actionTriggerUuid);

2
front/src/Stores/LayoutManagerStore.ts
View File

@ -9,9 +9,7 @@ export interface LayoutManagerAction {
userInputManager: UserInputManager | undefined; userInputManager: UserInputManager | undefined;
} }
function createLayoutManagerAction() { function createLayoutManagerAction() {
const { subscribe, set, update } = writable<LayoutManagerAction[]>([]); const { subscribe, set, update } = writable<LayoutManagerAction[]>([]);
return { return {

10
front/src/WebRtc/JitsiFactory.ts
View File

@ -144,7 +144,8 @@ class JitsiFactory {
jitsiUrl?: string, jitsiUrl?: string,
jitsiWidth?: number jitsiWidth?: number
): void { ): void {
coWebsiteManager.addCoWebsite(async (cowebsiteDiv) => { coWebsiteManager.addCoWebsite(
async (cowebsiteDiv) => {
// Jitsi meet external API maintains some data in local storage // Jitsi meet external API maintains some data in local storage
// which is sent via the appData URL parameter when joining a // which is sent via the appData URL parameter when joining a
// conference. Problem is that this data grows indefinitely. Thus // conference. Problem is that this data grows indefinitely. Thus
@ -179,7 +180,7 @@ class JitsiFactory {
throw new Error("Could not find Jitsi Iframe"); throw new Error("Could not find Jitsi Iframe");
} }
resolve(iframe); resolve(iframe);
} };
options.onload = () => doResolve(); //we want for the iframe to be loaded before triggering animations. options.onload = () => doResolve(); //we want for the iframe to be loaded before triggering animations.
setTimeout(() => doResolve(), 2000); //failsafe in case the iframe is deleted before loading or too long to load setTimeout(() => doResolve(), 2000); //failsafe in case the iframe is deleted before loading or too long to load
this.jitsiApi = new window.JitsiMeetExternalAPI(domain, options); this.jitsiApi = new window.JitsiMeetExternalAPI(domain, options);
@ -188,7 +189,10 @@ class JitsiFactory {
this.jitsiApi.addListener("audioMuteStatusChanged", this.audioCallback); this.jitsiApi.addListener("audioMuteStatusChanged", this.audioCallback);
this.jitsiApi.addListener("videoMuteStatusChanged", this.videoCallback); this.jitsiApi.addListener("videoMuteStatusChanged", this.videoCallback);
}); });
}, jitsiWidth, 0); },
jitsiWidth,
0
);
} }
public stop() { public stop() {