From 9e86e95135a8adaf0870022d8566718d841796bf Mon Sep 17 00:00:00 2001 From: _Bastler <_Bastler@bstly.de> Date: Sun, 27 Feb 2022 14:19:39 +0100 Subject: [PATCH] merge latest dev --- back/src/Services/MapFetcher.ts | 2 +- .../docker-compose.single-domain.prod.yaml | 89 ------------------- front/package.json | 1 - .../AudioManager/AudioManager.svelte | 2 +- front/src/Phaser/Game/GameScene.ts | 9 -- front/tsconfig.json | 75 ++++++++-------- front/yarn.lock | 88 +----------------- 7 files changed, 40 insertions(+), 226 deletions(-) delete mode 100644 contrib/docker/docker-compose.single-domain.prod.yaml diff --git a/back/src/Services/MapFetcher.ts b/back/src/Services/MapFetcher.ts index 91ec8de4..813685b2 100644 --- a/back/src/Services/MapFetcher.ts +++ b/back/src/Services/MapFetcher.ts @@ -53,7 +53,7 @@ class MapFetcher { const resolver = new Resolver(); addresses = await promisify(resolver.resolve).bind(resolver)(urlObj.hostname); } else { - addresses = [ urlObj.hostname ]; + addresses = [urlObj.hostname]; } for (const address of addresses) { diff --git a/contrib/docker/docker-compose.single-domain.prod.yaml b/contrib/docker/docker-compose.single-domain.prod.yaml deleted file mode 100644 index c820d92e..00000000 --- a/contrib/docker/docker-compose.single-domain.prod.yaml +++ /dev/null @@ -1,89 +0,0 @@ -version: "3.3" -services: - reverse-proxy: - image: traefik:v2.5 - command: - - --log.level=WARN - - --providers.docker - - --entryPoints.web.address=:80 - ports: - - "9999:80" # port is used to proxy through apache with ssl - depends_on: - - pusher - - front - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - front: - build: - context: ./ - dockerfile: front/Dockerfile - args: - DEBUG_MODE: "$DEBUG_MODE" - JITSI_URL: $JITSI_URL - JITSI_PRIVATE_MODE: "$JITSI_PRIVATE_MODE" - PUSHER_URL: /pusher - ADMIN_URL: /admin # this is only set to avoid compiling errors, currently not used otherways - TURN_SERVER: "${TURN_SERVER}" - TURN_USER: "${TURN_USER}" - TURN_PASSWORD: "${TURN_PASSWORD}" - MAX_PER_GROUP: "${MAX_PER_GROUP}" - MAX_USERNAME_LENGTH: "${MAX_USERNAME_LENGTH}" - START_ROOM_URL: "${START_ROOM_URL}" - DISABLE_NOTIFICATIONS: "${DISABLE_NOTIFICATIONS}" - SKIP_RENDER_OPTIMIZATIONS: "${SKIP_RENDER_OPTIMIZATIONS}" - labels: - - "traefik.http.routers.front.rule=PathPrefix(`/`)" - - "traefik.http.routers.front.entryPoints=web" - - "traefik.http.services.front.loadbalancer.server.port=80" - - "traefik.http.routers.front.service=front" - - pusher: - build: - context: ./ - dockerfile: pusher/Dockerfile - environment: - SECRET_JITSI_KEY: "${SECRET_JITSI_KEY}" - SECRET_KEY: ${SECRET_KEY} - API_URL: back:50051 - ADMIN_API_URL: "${ADMIN_API_URL}" - ADMIN_API_TOKEN: "${ADMIN_API_TOKEN}" - JITSI_URL: ${JITSI_URL} - JITSI_ISS: ${JITSI_ISS} - FRONT_URL : ${FRONT_URL} - OPID_CLIENT_ID: ${OPID_CLIENT_ID} - OPID_CLIENT_SECRET: ${OPID_CLIENT_SECRET} - OPID_CLIENT_ISSUER: ${OPID_CLIENT_ISSUER} - labels: - - "traefik.http.middlewares.strip-pusher-prefix.stripprefix.prefixes=/pusher" - - "traefik.http.routers.pusher.rule=PathPrefix(`/pusher`)" - - "traefik.http.routers.pusher.middlewares=strip-pusher-prefix@docker" - - "traefik.http.routers.pusher.entryPoints=web" - - "traefik.http.services.pusher.loadbalancer.server.port=8080" - - "traefik.http.routers.pusher.service=pusher" - - back: - build: - context: ./ - dockerfile: back/Dockerfile - environment: - SECRET_KEY: ${SECRET_KEY} - STARTUP_COMMAND_1: yarn install - SECRET_JITSI_KEY: "${SECRET_JITSI_KEY}" - ADMIN_API_TOKEN: "${ADMIN_API_TOKEN}" - ADMIN_API_URL: "${ADMIN_API_URL}" - JITSI_URL: ${JITSI_URL} - JITSI_ISS: ${JITSI_ISS} - MAX_PER_GROUP: ${MAX_PER_GROUP} - TURN_STATIC_AUTH_SECRET: "${TURN_STATIC_AUTH_SECRET}" - REDIS_HOST: redis - labels: - - "traefik.http.middlewares.strip-api-prefix.stripprefix.prefixes=/api" - - "traefik.http.routers.back.rule=PathPrefix(`/api`)" - - "traefik.http.routers.back.middlewares=strip-api-prefix@docker" - - "traefik.http.routers.back.entryPoints=web" - - "traefik.http.services.back.loadbalancer.server.port=8080" - - "traefik.http.routers.back.service=back" - - redis: - image: redis:6 \ No newline at end of file diff --git a/front/package.json b/front/package.json index 52eac1d0..4a0ea649 100644 --- a/front/package.json +++ b/front/package.json @@ -54,7 +54,6 @@ "quill-delta-to-html": "^0.12.0", "retry-axios": "^2.6.0", "rxjs": "^6.6.3", - "sanitize-html": "^2.5.0", "simple-peer": "^9.11.0", "socket.io-client": "^2.3.0", "standardized-audio-context": "^25.2.4", diff --git a/front/src/Components/AudioManager/AudioManager.svelte b/front/src/Components/AudioManager/AudioManager.svelte index 1c26bbb8..eec51572 100644 --- a/front/src/Components/AudioManager/AudioManager.svelte +++ b/front/src/Components/AudioManager/AudioManager.svelte @@ -150,7 +150,7 @@
- +
diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts index d3beb1fd..de2a5ff6 100644 --- a/front/src/Phaser/Game/GameScene.ts +++ b/front/src/Phaser/Game/GameScene.ts @@ -1323,15 +1323,6 @@ export class GameScene extends DirtyScene { this.markDirty(); }) ); - - this.iframeSubscriptionList.push( - iframeListener.setTilesStream.subscribe((eventTiles) => { - for (const eventTile of eventTiles) { - this.gameMap.putTile(eventTile.tile, eventTile.x, eventTile.y, eventTile.layer); - } - }) - ); - iframeListener.registerAnswerer("loadTileset", (eventTileset) => { return this.connectionAnswerPromise.then(() => { const jsonTilesetDir = eventTileset.url.substr(0, eventTileset.url.lastIndexOf("/")); diff --git a/front/tsconfig.json b/front/tsconfig.json index 11d0e79b..b9057d28 100644 --- a/front/tsconfig.json +++ b/front/tsconfig.json @@ -1,39 +1,38 @@ { - // "include": ["src/**/*"], - - "extends": "@tsconfig/svelte/tsconfig.json", - "compilerOptions": { - "outDir": "./dist/", - "sourceMap": true, - "moduleResolution": "node", - //"module": "CommonJS", - "module": "ESNext", - "target": "ES2017", - "declaration": false, - "downlevelIteration": true, - "jsx": "react", - "allowJs": true, - "esModuleInterop": true, - - "importsNotUsedAsValues": "remove", - - "strict": true, /* Enable all strict type-checking options. */ - "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ - "strictNullChecks": true, /* Enable strict null checks. */ - "strictFunctionTypes": true, /* Enable strict checking of function types. */ - "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ - "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */ - "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ - "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ - - "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ - "noFallthroughCasesInSwitch": true /* Report errors for fallthrough cases in switch statement. */ - }, - "exclude": [ - "node_modules", - "dist", - "public/iframe_api.js", - "packages/iframe-api-typings" - ] - } - \ No newline at end of file +// "include": ["src/**/*"], + + "extends": "@tsconfig/svelte/tsconfig.json", + "compilerOptions": { + "outDir": "./dist/", + "sourceMap": true, + "moduleResolution": "node", + //"module": "CommonJS", + "module": "ESNext", + "target": "ES2017", + "declaration": false, + "downlevelIteration": true, + "jsx": "react", + "allowJs": true, + "esModuleInterop": true, + + "importsNotUsedAsValues": "remove", + + "strict": true, /* Enable all strict type-checking options. */ + "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ + "strictNullChecks": true, /* Enable strict null checks. */ + "strictFunctionTypes": true, /* Enable strict checking of function types. */ + "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ + "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */ + "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ + "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ + + "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ + "noFallthroughCasesInSwitch": true /* Report errors for fallthrough cases in switch statement. */ + }, + "exclude": [ + "node_modules", + "dist", + "public/iframe_api.js", + "packages/iframe-api-typings" + ] +} diff --git a/front/yarn.lock b/front/yarn.lock index 19914dc3..c7263531 100644 --- a/front/yarn.lock +++ b/front/yarn.lock @@ -845,11 +845,6 @@ deep-is@^0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= -deepmerge@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" - integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== - define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" @@ -881,36 +876,6 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" -dom-serializer@^1.0.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" - integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== - dependencies: - domelementtype "^2.0.1" - domhandler "^4.2.0" - entities "^2.0.0" - -domelementtype@^2.0.1, domelementtype@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" - integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== - -domhandler@^4.0.0, domhandler@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz#16c658c626cf966967e306f966b431f77d4a5626" - integrity sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g== - dependencies: - domelementtype "^2.2.0" - -domutils@^2.5.2: - version "2.8.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" - integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== - dependencies: - dom-serializer "^1.0.1" - domelementtype "^2.2.0" - domhandler "^4.2.0" - easystarjs@^0.4.4: version "0.4.4" resolved "https://registry.yarnpkg.com/easystarjs/-/easystarjs-0.4.4.tgz#8cec6d20d0d8660715da0301d1da440370a8f40a" @@ -958,11 +923,6 @@ enquirer@^2.3.5, enquirer@^2.3.6: dependencies: ansi-colors "^4.1.1" -entities@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" - integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== - err-code@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/err-code/-/err-code-3.0.1.tgz#a444c7b992705f2b120ee320b09972eef331c920" @@ -1557,16 +1517,6 @@ hosted-git-info@^2.1.4: resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== -htmlparser2@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" - integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A== - dependencies: - domelementtype "^2.0.1" - domhandler "^4.0.0" - domutils "^2.5.2" - entities "^2.0.0" - human-signals@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" @@ -1737,11 +1687,6 @@ is-obj@^1.0.1: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= -is-plain-object@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" - integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== - is-regex@^1.0.4, is-regex@^1.1.2: version "1.1.3" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f" @@ -2056,11 +2001,6 @@ nanoid@^3.1.30: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== -nanoid@^3.2.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35" - integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw== - natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -2209,11 +2149,6 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse-srcset@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1" - integrity sha1-8r0iH2zJcKk42IVWq8WJyqqiveE= - parseqs@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5" @@ -2318,15 +2253,6 @@ please-upgrade-node@^3.2.0: dependencies: semver-compare "^1.0.0" -postcss@^8.3.11: - version "8.4.6" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.6.tgz#c5ff3c3c457a23864f32cb45ac9b741498a09ae1" - integrity sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA== - dependencies: - nanoid "^3.2.0" - picocolors "^1.0.0" - source-map-js "^1.0.2" - postcss@^8.4.5: version "8.4.5" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.5.tgz#bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95" @@ -2598,18 +2524,6 @@ sander@^0.5.0: mkdirp "^0.5.1" rimraf "^2.5.2" -sanitize-html@^2.5.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.7.0.tgz#e106205b468aca932e2f9baf241f24660d34e279" - integrity sha512-jfQelabOn5voO7FAfnQF7v+jsA6z9zC/O4ec0z3E35XPEtHYJT/OdUziVWlKW4irCr2kXaQAyXTXDHWAibg1tA== - dependencies: - deepmerge "^4.2.2" - escape-string-regexp "^4.0.0" - htmlparser2 "^6.0.0" - is-plain-object "^5.0.0" - parse-srcset "^1.0.2" - postcss "^8.3.11" - sass@^1.49.7: version "1.49.7" resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.7.tgz#22a86a50552b9b11f71404dfad1b9ff44c6b0c49" @@ -2742,7 +2656,7 @@ sorcery@^0.10.0: sander "^0.5.0" sourcemap-codec "^1.3.0" -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: +"source-map-js@>=0.6.2 <2.0.0": version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==