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

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

Browse Source
This commit is contained in:
_Bastler 2022-04-13 16:42:40 +02:00
commit bceb5ba74d
15 changed files with 144 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/end_to_end_tests.yml vendored
View File

@ -21,6 +21,7 @@ jobs:
working-directory: tests working-directory: tests
- name: Install Playwright - name: Install Playwright
run: npx playwright install --with-deps run: npx playwright install --with-deps
working-directory: tests
- name: 'Setup .env file' - name: 'Setup .env file'
run: cp .env.template .env run: cp .env.template .env
- name: Install messages dependencies - name: Install messages dependencies

1
front/package.json
View File

@ -45,6 +45,7 @@
"deep-copy-ts": "^0.5.0", "deep-copy-ts": "^0.5.0",
"dompurify" : "^2.3.6", "dompurify" : "^2.3.6",
"easystarjs": "^0.4.4", "easystarjs": "^0.4.4",
"fast-deep-equal": "^3.1.3",
"google-protobuf": "^3.13.0", "google-protobuf": "^3.13.0",
"phaser": "3.55.1", "phaser": "3.55.1",
"phaser-animated-tiles": "workadventure/phaser-animated-tiles#da68bbededd605925621dd4f03bd27e69284b254", "phaser-animated-tiles": "workadventure/phaser-animated-tiles#da68bbededd605925621dd4f03bd27e69284b254",

3
front/packages/iframe-api-typings/package.json
View File

@ -9,5 +9,8 @@
"license": "MIT", "license": "MIT",
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"
},
"dependencies": {
"rxjs": "^6.6.3"
} }
} }

7
front/src/Phaser/Game/GameScene.ts
View File

@ -178,6 +178,7 @@ export class GameScene extends DirtyScene {
private localVolumeStoreUnsubscriber: Unsubscriber | undefined; private localVolumeStoreUnsubscriber: Unsubscriber | undefined;
private followUsersColorStoreUnsubscribe!: Unsubscriber; private followUsersColorStoreUnsubscribe!: Unsubscriber;
private currentPlayerGroupIdStoreUnsubscribe!: Unsubscriber;
private privacyShutdownStoreUnsubscribe!: Unsubscriber; private privacyShutdownStoreUnsubscribe!: Unsubscriber;
private userIsJitsiDominantSpeakerStoreUnsubscriber!: Unsubscriber; private userIsJitsiDominantSpeakerStoreUnsubscriber!: Unsubscriber;
private jitsiParticipantsCountStoreUnsubscriber!: Unsubscriber; private jitsiParticipantsCountStoreUnsubscriber!: Unsubscriber;
@ -222,8 +223,8 @@ export class GameScene extends DirtyScene {
private loader: Loader; private loader: Loader;
private lastCameraEvent: WasCameraUpdatedEvent | undefined; private lastCameraEvent: WasCameraUpdatedEvent | undefined;
private firstCameraUpdateSent: boolean = false; private firstCameraUpdateSent: boolean = false;
private showVoiceIndicatorChangeMessageSent: boolean = false;
private currentPlayerGroupId?: number; private currentPlayerGroupId?: number;
private showVoiceIndicatorChangeMessageSent: boolean = false;
private jitsiDominantSpeaker: boolean = false; private jitsiDominantSpeaker: boolean = false;
private jitsiParticipantsCount: number = 0; private jitsiParticipantsCount: number = 0;
public readonly superLoad: SuperLoaderPlugin; public readonly superLoad: SuperLoaderPlugin;
@ -858,6 +859,10 @@ export class GameScene extends DirtyScene {
this.currentPlayerGroupId = message.groupId; this.currentPlayerGroupId = message.groupId;
}); });
this.connection.groupUsersUpdateMessageStream.subscribe((message) => {
this.currentPlayerGroupId = message.groupId;
});
/** /**
* Triggered when we receive the JWT token to connect to Jitsi * Triggered when we receive the JWT token to connect to Jitsi
*/ */

7
front/src/Stores/MediaStore.ts
View File

@ -11,6 +11,7 @@ import { peerStore } from "./PeerStore";
import { privacyShutdownStore } from "./PrivacyShutdownStore"; import { privacyShutdownStore } from "./PrivacyShutdownStore";
import { MediaStreamConstraintsError } from "./Errors/MediaStreamConstraintsError"; import { MediaStreamConstraintsError } from "./Errors/MediaStreamConstraintsError";
import { SoundMeter } from "../Phaser/Components/SoundMeter"; import { SoundMeter } from "../Phaser/Components/SoundMeter";
import deepEqual from "fast-deep-equal";
/** /**
* A store that contains the camera state requested by the user (on or off). * A store that contains the camera state requested by the user (on or off).
@ -314,10 +315,10 @@ export const mediaStreamConstraintsStore = derived(
currentAudioConstraint = false; currentAudioConstraint = false;
} }
// Let's make the changes only if the new value is different from the old one. // Let's make the changes only if the new value is different from the old one.tile
if ( if (
previousComputedVideoConstraint != currentVideoConstraint || !deepEqual(previousComputedVideoConstraint, currentVideoConstraint) ||
previousComputedAudioConstraint != currentAudioConstraint !deepEqual(previousComputedAudioConstraint, currentAudioConstraint)
) { ) {
previousComputedVideoConstraint = currentVideoConstraint; previousComputedVideoConstraint = currentVideoConstraint;
previousComputedAudioConstraint = currentAudioConstraint; previousComputedAudioConstraint = currentAudioConstraint;

40
pusher/src/Controller/AuthenticateController.ts
View File

@ -1,11 +1,12 @@
import { v4 } from "uuid"; import { v4 } from "uuid";
import { BaseHttpController } from "./BaseHttpController"; import { BaseHttpController } from "./BaseHttpController";
import { adminApi, FetchMemberDataByUuidResponse } from "../Services/AdminApi"; import { adminApi } from "../Services/AdminApi";
import { AuthTokenData, jwtTokenManager } from "../Services/JWTTokenManager"; import { AuthTokenData, jwtTokenManager } from "../Services/JWTTokenManager";
import { parse } from "query-string"; import { parse } from "query-string";
import { openIDClient } from "../Services/OpenIDClient"; import { openIDClient } from "../Services/OpenIDClient";
import { DISABLE_ANONYMOUS } from "../Enum/EnvironmentVariable"; import { DISABLE_ANONYMOUS } from "../Enum/EnvironmentVariable";
import { RegisterData } from "../Messages/JsonMessages/RegisterData"; import { RegisterData } from "../Messages/JsonMessages/RegisterData";
import { adminService } from "../Services/AdminService";
export interface TokenInterface { export interface TokenInterface {
userUuid: string; userUuid: string;
@ -166,10 +167,11 @@ export class AuthenticateController extends BaseHttpController {
//Get user data from Admin Back Office //Get user data from Admin Back Office
//This is very important to create User Local in LocalStorage in WorkAdventure //This is very important to create User Local in LocalStorage in WorkAdventure
const resUserData = await this.getUserByUserIdentifier( const resUserData = await adminService.fetchMemberDataByUuid(
authTokenData.identifier, authTokenData.identifier,
playUri as string, playUri as string,
IPAddress IPAddress,
[]
); );
if (authTokenData.accessToken == undefined) { if (authTokenData.accessToken == undefined) {
@ -221,7 +223,7 @@ export class AuthenticateController extends BaseHttpController {
//Get user data from Admin Back Office //Get user data from Admin Back Office
//This is very important to create User Local in LocalStorage in WorkAdventure //This is very important to create User Local in LocalStorage in WorkAdventure
const data = await this.getUserByUserIdentifier(sub, playUri as string, IPAddress); const data = await adminService.fetchMemberDataByUuid(sub, playUri as string, IPAddress, []);
return res.json({ ...data, authToken, username: userInfo?.username, locale: userInfo?.locale, userUuid : sub }); return res.json({ ...data, authToken, username: userInfo?.username, locale: userInfo?.locale, userUuid : sub });
} catch (e) { } catch (e) {
@ -430,34 +432,4 @@ export class AuthenticateController extends BaseHttpController {
} }
}); });
} }
/**
*
* @param email
* @param playUri
* @param IPAddress
* @return FetchMemberDataByUuidResponse|object
* @private
*/
private async getUserByUserIdentifier(
email: string,
playUri: string,
IPAddress: string
): Promise<FetchMemberDataByUuidResponse | object> {
let data: FetchMemberDataByUuidResponse = {
email: email,
userUuid: email,
tags: [],
messages: [],
visitCardUrl: null,
textures: [],
userRoomToken: undefined,
};
try {
data = await adminApi.fetchMemberDataByUuid(email, playUri, IPAddress, []);
} catch (err) {
console.error("openIDCallback => fetchMemberDataByUuid", err);
}
return data;
}
} }

6
pusher/src/Controller/MapController.ts
View File

@ -160,12 +160,12 @@ export class MapController extends BaseHttpController {
} }
} }
} }
const mapDetails = isMapDetailsData.safeParse( const mapDetails = isMapDetailsData.parse(
await adminApi.fetchMapDetails(query.playUri as string, userId) await adminApi.fetchMapDetails(query.playUri as string, userId)
); );
if (mapDetails.success && DISABLE_ANONYMOUS) { if (DISABLE_ANONYMOUS) {
mapDetails.data.authenticationMandatory = true; mapDetails.authenticationMandatory = true;
} }
res.json(mapDetails); res.json(mapDetails);

5
pusher/src/Services/AdminApi.ts
View File

@ -6,6 +6,7 @@ import { AdminApiData, isAdminApiData } from "../Messages/JsonMessages/AdminApiD
import { z } from "zod"; import { z } from "zod";
import { isWokaDetail } from "../Messages/JsonMessages/PlayerTextures"; import { isWokaDetail } from "../Messages/JsonMessages/PlayerTextures";
import qs from "qs"; import qs from "qs";
import { AdminInterface } from "./AdminInterface";
export interface AdminBannedData { export interface AdminBannedData {
is_banned: boolean; is_banned: boolean;
@ -25,7 +26,7 @@ export const isFetchMemberDataByUuidResponse = z.object({
export type FetchMemberDataByUuidResponse = z.infer<typeof isFetchMemberDataByUuidResponse>; export type FetchMemberDataByUuidResponse = z.infer<typeof isFetchMemberDataByUuidResponse>;
class AdminApi { class AdminApi implements AdminInterface {
/** /**
* @var playUri: is url of the room * @var playUri: is url of the room
* @var userId: can to be undefined or email or uuid * @var userId: can to be undefined or email or uuid
@ -65,7 +66,7 @@ class AdminApi {
} }
async fetchMemberDataByUuid( async fetchMemberDataByUuid(
userIdentifier: string | null, userIdentifier: string,
playUri: string, playUri: string,
ipAddress: string, ipAddress: string,
characterLayers: string[] characterLayers: string[]

10
pusher/src/Services/AdminInterface.ts Normal file
View File

@ -0,0 +1,10 @@
import { FetchMemberDataByUuidResponse } from "./AdminApi";
export interface AdminInterface {
fetchMemberDataByUuid(
userIdentifier: string,
playUri: string,
ipAddress: string,
characterLayers: string[]
): Promise<FetchMemberDataByUuidResponse>;
}

5
pusher/src/Services/AdminService.ts Normal file
View File

@ -0,0 +1,5 @@
import { ADMIN_API_URL } from "../Enum/EnvironmentVariable";
import { adminApi } from "./AdminApi";
import { localAdmin } from "./LocalAdmin";
export const adminService = ADMIN_API_URL ? adminApi : localAdmin;

29
pusher/src/Services/LocalAdmin.ts Normal file
View File

@ -0,0 +1,29 @@
import { FetchMemberDataByUuidResponse } from "./AdminApi";
import { AdminInterface } from "./AdminInterface";
/**
* A local class mocking a real admin if no admin is configured.
*/
class LocalAdmin implements AdminInterface {
fetchMemberDataByUuid(
userIdentifier: string,
// eslint-disable-next-line @typescript-eslint/no-unused-vars
playUri: string,
// eslint-disable-next-line @typescript-eslint/no-unused-vars
ipAddress: string,
// eslint-disable-next-line @typescript-eslint/no-unused-vars
characterLayers: string[]
): Promise<FetchMemberDataByUuidResponse> {
return Promise.resolve({
email: userIdentifier,
userUuid: userIdentifier,
tags: [],
messages: [],
visitCardUrl: null,
textures: [],
userRoomToken: undefined,
});
}
}
export const localAdmin = new LocalAdmin();

36
pusher/src/Services/SocketManager.ts
View File

@ -121,7 +121,13 @@ export class SocketManager implements ZoneEventListener {
} }
}) })
.on("end", () => { .on("end", () => {
console.warn("Admin connection lost to back server"); console.warn(
"Admin connection lost to back server '" +
apiClient.getChannel().getTarget() +
"' for room '" +
roomId +
"'"
);
// Let's close the front connection if the back connection is closed. This way, we can retry connecting from the start. // Let's close the front connection if the back connection is closed. This way, we can retry connecting from the start.
if (!client.disconnecting) { if (!client.disconnecting) {
this.closeWebsocketConnection(client, 1011, "Admin Connection lost to back server"); this.closeWebsocketConnection(client, 1011, "Admin Connection lost to back server");
@ -129,7 +135,14 @@ export class SocketManager implements ZoneEventListener {
console.log("A user left"); console.log("A user left");
}) })
.on("error", (err: Error) => { .on("error", (err: Error) => {
console.error("Error in connection to back server:", err); console.error(
"Error in connection to back server '" +
apiClient.getChannel().getTarget() +
"' for room '" +
roomId +
"':",
err
);
if (!client.disconnecting) { if (!client.disconnecting) {
this.closeWebsocketConnection(client, 1011, "Error while connecting to back server"); this.closeWebsocketConnection(client, 1011, "Error while connecting to back server");
} }
@ -186,7 +199,7 @@ export class SocketManager implements ZoneEventListener {
joinRoomMessage.addCharacterlayer(characterLayerMessage); joinRoomMessage.addCharacterlayer(characterLayerMessage);
} }
console.log("Calling joinRoom"); console.log("Calling joinRoom '" + client.roomId + "'");
const apiClient = await apiClientRepository.getClient(client.roomId); const apiClient = await apiClientRepository.getClient(client.roomId);
const streamToPusher = apiClient.joinRoom(); const streamToPusher = apiClient.joinRoom();
clientEventsEmitter.emitClientJoin(client.userUuid, client.roomId); clientEventsEmitter.emitClientJoin(client.userUuid, client.roomId);
@ -214,7 +227,13 @@ export class SocketManager implements ZoneEventListener {
} }
}) })
.on("end", () => { .on("end", () => {
console.warn("Connection lost to back server"); console.warn(
"Connection lost to back server '" +
apiClient.getChannel().getTarget() +
"' for room '" +
client.roomId +
"'"
);
// Let's close the front connection if the back connection is closed. This way, we can retry connecting from the start. // Let's close the front connection if the back connection is closed. This way, we can retry connecting from the start.
if (!client.disconnecting) { if (!client.disconnecting) {
this.closeWebsocketConnection(client, 1011, "Connection lost to back server"); this.closeWebsocketConnection(client, 1011, "Connection lost to back server");
@ -222,7 +241,14 @@ export class SocketManager implements ZoneEventListener {
console.log("A user left"); console.log("A user left");
}) })
.on("error", (err: Error) => { .on("error", (err: Error) => {
console.error("Error in connection to back server:", err); console.error(
"Error in connection to back server '" +
apiClient.getChannel().getTarget() +
"' for room '" +
client.roomId +
"':",
err
);
if (!client.disconnecting) { if (!client.disconnecting) {
this.closeWebsocketConnection(client, 1011, "Error while connecting to back server"); this.closeWebsocketConnection(client, 1011, "Error while connecting to back server");
} }

66
tests/package-lock.json generated
View File

@ -5,7 +5,7 @@
"packages": { "packages": {
"": { "": {
"devDependencies": { "devDependencies": {
"@playwright/test": "^1.20.0", "@playwright/test": "~1.21.0",
"@types/dockerode": "^3.3.0", "@types/dockerode": "^3.3.0",
"axios": "^0.24.0", "axios": "^0.24.0",
"dockerode": "^3.3.1", "dockerode": "^3.3.1",
@ -854,9 +854,9 @@
} }
}, },
"node_modules/@playwright/test": { "node_modules/@playwright/test": {
"version": "1.20.0", "version": "1.21.0",
"resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.20.0.tgz", "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.21.0.tgz",
"integrity": "sha512-UpI5HTcgNLckR0kqXqwNvbcIXtRaDxk+hnO0OBwPSjfbBjRfRgAJ2ClA/b30C5E3UW5dJa17zhsy2qrk66l5cg==", "integrity": "sha512-jvgN3ZeAG6rw85z4u9Rc4uyj6qIaYlq2xrOtS7J2+CDYhzKOttab9ix9ELcvBOCHuQ6wgTfxfJYdh6DRZmQ9hg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@babel/code-frame": "7.16.7", "@babel/code-frame": "7.16.7",
@ -882,13 +882,13 @@
"debug": "4.3.3", "debug": "4.3.3",
"expect": "27.2.5", "expect": "27.2.5",
"jest-matcher-utils": "27.2.5", "jest-matcher-utils": "27.2.5",
"json5": "2.2.0", "json5": "2.2.1",
"mime": "3.0.0", "mime": "3.0.0",
"minimatch": "3.0.4", "minimatch": "3.0.4",
"ms": "2.1.3", "ms": "2.1.3",
"open": "8.4.0", "open": "8.4.0",
"pirates": "4.0.4", "pirates": "4.0.4",
"playwright-core": "1.20.0", "playwright-core": "1.21.0",
"rimraf": "3.0.2", "rimraf": "3.0.2",
"source-map-support": "0.4.18", "source-map-support": "0.4.18",
"stack-utils": "2.0.5", "stack-utils": "2.0.5",
@ -1007,9 +1007,9 @@
"dev": true "dev": true
}, },
"node_modules/@types/yauzl": { "node_modules/@types/yauzl": {
"version": "2.9.2", "version": "2.10.0",
"resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz", "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
"integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==", "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
"dev": true, "dev": true,
"optional": true, "optional": true,
"dependencies": { "dependencies": {
@ -2071,13 +2071,10 @@
} }
}, },
"node_modules/json5": { "node_modules/json5": {
"version": "2.2.0", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
"dev": true, "dev": true,
"dependencies": {
"minimist": "^1.2.5"
},
"bin": { "bin": {
"json5": "lib/cli.js" "json5": "lib/cli.js"
}, },
@ -2279,9 +2276,9 @@
} }
}, },
"node_modules/playwright-core": { "node_modules/playwright-core": {
"version": "1.20.0", "version": "1.21.0",
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.20.0.tgz", "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.21.0.tgz",
"integrity": "sha512-d25IRcdooS278Cijlp8J8A5fLQZ+/aY3dKRJvgX5yjXA69N0huIUdnh3xXSgn+LsQ9DCNmB7Ngof3eY630jgdA==", "integrity": "sha512-yDGVs9qaaW6WiefgR7wH1CGt9D6D/X4U3jNpIzH0FjjrrWLCOYQo78Tu3SkW8X+/kWlBpj49iWf3QNSxhYc12Q==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"colors": "1.4.0", "colors": "1.4.0",
@ -3340,9 +3337,9 @@
} }
}, },
"@playwright/test": { "@playwright/test": {
"version": "1.20.0", "version": "1.21.0",
"resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.20.0.tgz", "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.21.0.tgz",
"integrity": "sha512-UpI5HTcgNLckR0kqXqwNvbcIXtRaDxk+hnO0OBwPSjfbBjRfRgAJ2ClA/b30C5E3UW5dJa17zhsy2qrk66l5cg==", "integrity": "sha512-jvgN3ZeAG6rw85z4u9Rc4uyj6qIaYlq2xrOtS7J2+CDYhzKOttab9ix9ELcvBOCHuQ6wgTfxfJYdh6DRZmQ9hg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/code-frame": "7.16.7", "@babel/code-frame": "7.16.7",
@ -3368,13 +3365,13 @@
"debug": "4.3.3", "debug": "4.3.3",
"expect": "27.2.5", "expect": "27.2.5",
"jest-matcher-utils": "27.2.5", "jest-matcher-utils": "27.2.5",
"json5": "2.2.0", "json5": "2.2.1",
"mime": "3.0.0", "mime": "3.0.0",
"minimatch": "3.0.4", "minimatch": "3.0.4",
"ms": "2.1.3", "ms": "2.1.3",
"open": "8.4.0", "open": "8.4.0",
"pirates": "4.0.4", "pirates": "4.0.4",
"playwright-core": "1.20.0", "playwright-core": "1.21.0",
"rimraf": "3.0.2", "rimraf": "3.0.2",
"source-map-support": "0.4.18", "source-map-support": "0.4.18",
"stack-utils": "2.0.5", "stack-utils": "2.0.5",
@ -3489,9 +3486,9 @@
"dev": true "dev": true
}, },
"@types/yauzl": { "@types/yauzl": {
"version": "2.9.2", "version": "2.10.0",
"resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz", "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
"integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==", "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
@ -4269,13 +4266,10 @@
"dev": true "dev": true
}, },
"json5": { "json5": {
"version": "2.2.0", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
"dev": true, "dev": true
"requires": {
"minimist": "^1.2.5"
}
}, },
"micromatch": { "micromatch": {
"version": "4.0.4", "version": "4.0.4",
@ -4425,9 +4419,9 @@
} }
}, },
"playwright-core": { "playwright-core": {
"version": "1.20.0", "version": "1.21.0",
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.20.0.tgz", "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.21.0.tgz",
"integrity": "sha512-d25IRcdooS278Cijlp8J8A5fLQZ+/aY3dKRJvgX5yjXA69N0huIUdnh3xXSgn+LsQ9DCNmB7Ngof3eY630jgdA==", "integrity": "sha512-yDGVs9qaaW6WiefgR7wH1CGt9D6D/X4U3jNpIzH0FjjrrWLCOYQo78Tu3SkW8X+/kWlBpj49iWf3QNSxhYc12Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"colors": "1.4.0", "colors": "1.4.0",

2
tests/package.json
View File

@ -1,6 +1,6 @@
{ {
"devDependencies": { "devDependencies": {
"@playwright/test": "^1.20.0", "@playwright/test": "~1.21.0",
"@types/dockerode": "^3.3.0", "@types/dockerode": "^3.3.0",
"axios": "^0.24.0", "axios": "^0.24.0",
"dockerode": "^3.3.1", "dockerode": "^3.3.1",

22
uploader/tsconfig.json
View File

@ -40,17 +40,17 @@
/* Module Resolution Options */ /* Module Resolution Options */
"moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
//"baseUrl": ".", /* Base directory to resolve non-absolute module names. */ //"baseUrl": ".", /* Base directory to resolve non-absolute module names. */
"paths": { // "paths": {
"_Controller/*": [ // "_Controller/*": [
"src/Controller/*" // "src/Controller/*"
], // ],
"_Model/*": [ // "_Model/*": [
"src/Model/*" // "src/Model/*"
], // ],
"_Enum/*": [ // "_Enum/*": [
"src/Enum/*" // "src/Enum/*"
] // ]
}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ // }, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */ // "typeRoots": [], /* List of folders to include type definitions from. */
// "types": [], /* Type declaration files to be included in compilation. */ // "types": [], /* Type declaration files to be included in compilation. */