Merge branch 'develop' into changeRegisterAccess

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com> # Conflicts: # pusher/src/Services/AdminApi.ts
2022-03-17 09:54:24 +01:00
parent cfbf9dca23 3988559d2a
commit 5448596f01
1025 changed files with 16978 additions and 14921 deletions
@@ -1,14 +1,7 @@
 /node_modules/
-/dist/*.js
-/dist/*.js.map
-/dist/*.js.LICENSE.txt
-/dist/main.*.css
-/dist/main.*.css.map
-/dist/tests/
+dist/
 /yarn-error.log
 /package-lock.json
-/dist/webpack.config.js
-/dist/webpack.config.js.map
-/dist/src
 *.sh
 !templater.sh
+/public/iframe_api.js
@@ -1,35 +1,33 @@
+# The building of ProtoBuf "messages" must be done out of Docker because grpc-node does not ship with ARM64 binaries.
+# See: https://github.com/grpc/grpc-node/issues/1405
+# When the issue above is closed, we can move back messages building inside Dockerfile
+
+# protobuf build
+#FROM node:14.18.2-buster-slim@sha256:20bedf0c09de887379e59a41c04284974f5fb529cf0e13aab613473ce298da3d as proto-builder
+#WORKDIR /usr/src
+#COPY messages/yarn.lock messages/package.json ./
+#RUN yarn install
+#COPY messages .
+#RUN yarn ts-proto
+
+# typescript build
 FROM node:14.18.2-buster-slim@sha256:20bedf0c09de887379e59a41c04284974f5fb529cf0e13aab613473ce298da3d as builder
-
-WORKDIR /usr/src/messages
-COPY messages .
-RUN yarn install && yarn ts-proto
-
-WORKDIR /usr/src/front
+WORKDIR /usr/src
+COPY front/yarn.lock front/package.json ./
+RUN yarn install --network-timeout 1000000
 COPY front .
+#COPY --from=proto-builder /usr/src/ts-proto-generated/protos src/Messages/ts-proto-generated
+#RUN sed -i 's/import { Observable } from "rxjs";/import type { Observable } from "rxjs";/g' src/Messages/ts-proto-generated/messages.ts
+#COPY --from=proto-builder /usr/src/JsonMessages src/Messages/JsonMessages
+RUN yarn run typesafe-i18n && yarn run build-iframe-api && yarn build

-# move messages to front
-RUN cp -r ../messages/ts-proto-generated/protos/* src/Messages/ts-proto-generated
-RUN sed -i 's/import { Observable } from "rxjs";/import type { Observable } from "rxjs";/g' src/Messages/ts-proto-generated/messages.ts
-RUN cp -r ../messages/JsonMessages/* src/Messages/JsonMessages
+# final production image
+FROM nginx:1.21.6-alpine

-RUN yarn install && yarn run typesafe-i18n && yarn build
+COPY front/nginx.conf /etc/nginx/conf.d/default.conf
+COPY front/templater.sh /

-# Removing the iframe.html file from the final image as this adds a XSS attack.
-# iframe.html is only in dev mode to circumvent a limitation
-RUN rm dist/iframe.html
+COPY --from=builder /usr/src/dist /usr/share/nginx/html

-FROM thecodingmachine/nodejs:14-apache
-
-COPY --from=builder --chown=docker:docker /usr/src/front/dist dist
-COPY front/templater.sh .
-
-USER root
-RUN DEBIAN_FRONTEND=noninteractive apt-get update \
-    && apt-get install -y \
-    gettext-base \
-    && rm -rf /var/lib/apt/lists/*
-USER docker
-
-ENV STARTUP_COMMAND_0="./templater.sh"
-ENV STARTUP_COMMAND_1="envsubst < dist/env-config.template.js > dist/env-config.js"
-ENV APACHE_DOCUMENT_ROOT=dist/
+EXPOSE 80
+CMD ["/bin/sh", "-c", "/templater.sh && envsubst < /usr/share/nginx/html/env-config.template.js > /usr/share/nginx/html/env-config.js && exec nginx -g 'daemon off;'"]
@@ -1,6 +0,0 @@
-index.html
-/js/
-/fonts/
-style.*.css
-!env-config.template.js
-*.png
@@ -1,27 +0,0 @@
-window.env = {
-    SKIP_RENDER_OPTIMIZATIONS: '${SKIP_RENDER_OPTIMIZATIONS}',
-    DISABLE_NOTIFICATIONS: '${DISABLE_NOTIFICATIONS}',
-    PUSHER_URL: '${PUSHER_URL}',
-    UPLOADER_URL: '${UPLOADER_URL}',
-    ADMIN_URL: '${ADMIN_URL}',
-    CONTACT_URL: '${CONTACT_URL}',
-    PROFILE_URL: '${PROFILE_URL}',
-    ICON_URL: '${ICON_URL}',
-    DEBUG_MODE: '${DEBUG_MODE}',
-    STUN_SERVER: '${STUN_SERVER}',
-    TURN_SERVER: '${TURN_SERVER}',
-    TURN_USER: '${TURN_USER}',
-    TURN_PASSWORD: '${TURN_PASSWORD}',
-    JITSI_URL: '${JITSI_URL}',
-    JITSI_PRIVATE_MODE: '${JITSI_PRIVATE_MODE}',
-    START_ROOM_URL: '${START_ROOM_URL}',
-    MAX_USERNAME_LENGTH: '${MAX_USERNAME_LENGTH}',
-    MAX_PER_GROUP: '${MAX_PER_GROUP}',
-    DISPLAY_TERMS_OF_USE: '${DISPLAY_TERMS_OF_USE}',
-    POSTHOG_API_KEY: '${POSTHOG_API_KEY}',
-    POSTHOG_URL: '${POSTHOG_URL}',
-    NODE_ENV: '${NODE_ENV}',
-    DISABLE_ANONYMOUS: '${DISABLE_ANONYMOUS}',
-    OPID_LOGIN_SCREEN_PROVIDER: '${OPID_LOGIN_SCREEN_PROVIDER}',
-    FALLBACK_LOCALE: '${FALLBACK_LOCALE}',
-};
@@ -1,21 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-    <script src="/iframe_api.js" ></script>
-    <script>
-        // Note: this is a huge XSS flow as we allow anyone to load a Javascript file in our domain.
-        // This file must ABSOLUTELY be removed from the Docker images/deployments and is only here
-        // for development purpose (because dynamically generated iframes are not working with
-        // webpack hot reload due to an issue with rights)
-        const urlParams = new URLSearchParams(window.location.search);
-        const scriptUrl = urlParams.get('script');
-        const script = document.createElement('script');
-        script.src = scriptUrl;
-
-        if (urlParams.get('moduleMode') === 'true') {
-            script.type = "module";
-        }
-        document.head.append(script);
-    </script>
-    </head>
-</html>
@@ -1,5 +0,0 @@
-/*This file is a workaround to allow phaser to load directly this font */
-@font-face {
-    font-family: "Press Start 2P";
-    src: url("/fonts/press-start-2p-latin-400-normal.woff2") format('woff2');
-}
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="452.388px" height="452.388px" viewBox="0 0 452.388 452.388" style="enable-background:new 0 0 452.388 452.388;"
-	 xml:space="preserve">
-<g>
-	<g id="Layer_8_38_">
-		<path d="M441.677,43.643H10.687C4.785,43.643,0,48.427,0,54.329v297.425c0,5.898,4.785,10.676,10.687,10.676h162.069v25.631
-			c0,0.38,0.074,0.722,0.112,1.089h-23.257c-5.407,0-9.796,4.389-9.796,9.795c0,5.408,4.389,9.801,9.796,9.801h158.506
-			c5.406,0,9.795-4.389,9.795-9.801c0-5.406-4.389-9.795-9.795-9.795h-23.256c0.032-0.355,0.115-0.709,0.115-1.089V362.43H441.7
-			c5.898,0,10.688-4.782,10.688-10.676V54.329C452.37,48.427,447.589,43.643,441.677,43.643z M422.089,305.133
-			c0,5.903-4.784,10.687-10.683,10.687H40.96c-5.898,0-10.684-4.783-10.684-10.687V79.615c0-5.898,4.786-10.684,10.684-10.684
-			h370.446c5.898,0,10.683,4.785,10.683,10.684V305.133z M303.942,290.648H154.025c0-29.872,17.472-55.661,42.753-67.706
-			c-15.987-10.501-26.546-28.571-26.546-49.13c0-32.449,26.306-58.755,58.755-58.755c32.448,0,58.753,26.307,58.753,58.755
-			c0,20.553-10.562,38.629-26.545,49.13C286.475,234.987,303.942,260.781,303.942,290.648z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
@@ -0,0 +1,16 @@
+import { defineConfig } from "vite";
+import { resolve } from "path";
+
+export default defineConfig({
+    publicDir: false,
+    build: {
+        outDir: "public",
+        emptyOutDir: false,
+        lib: {
+            entry: resolve(__dirname, "src/iframe_api.ts"),
+            name: "iframe_api",
+            formats: ["cjs"],
+            fileName: () => "iframe_api.js",
+        },
+    },
+});
@@ -27,9 +27,8 @@
        <meta name="msapplication-TileImage" content="static/images/favicons/ms-icon-144x144.png">
        <meta name="theme-color" content="#000000">

-        <script src="/env-config.js"></script>
        <base href="/">
-        <link href="https://unpkg.com/nes.css@2.3.0/css/nes.min.css" rel="stylesheet" />
+        <style>/*hide cowebsite container before scss is loaded*/#cowebsite { visibility: collapse };</style>

        <title>WorkAdventure</title>
    </head>
@@ -64,5 +63,6 @@
            </div>
            <div id="cowebsite-buffer"></div>
        </div>
+        <script type="module" src="/src/index.ts"></script>
    </body>
 </html>
@@ -0,0 +1,51 @@
+server {
+    listen       80;
+    listen  [::]:80;
+    server_name  localhost;
+    access_log  off;
+
+    gzip on;
+    gzip_comp_level 6;
+    gzip_min_length 1000;
+    gzip_proxied any;
+    gzip_disable "msie6";
+    gzip_types
+        application/atom+xml
+        application/geo+json
+        application/javascript
+        application/x-javascript
+        application/json
+        application/ld+json
+        application/manifest+json
+        application/rdf+xml
+        application/rss+xml
+        application/xhtml+xml
+        application/xml
+        font/eot
+        font/otf
+        font/ttf
+        image/svg+xml
+        text/css
+        text/javascript
+        text/plain
+        text/xml;
+
+    # serve static assets (that have a cache busting hash) with an efficient cache policy
+    location /assets {
+        root   /usr/share/nginx/html;
+        expires 1y;
+        add_header Cache-Control "public";
+    }
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html;
+        rewrite ^/register/ /index.html break;
+        rewrite ^/login /index.html break; 
+        rewrite ^/jwt /index.html break; 
+    }
+
+    location ~ ^/[@_]/ {
+        try_files $uri $uri/ /index.html;
+    }
+}
@@ -4,54 +4,46 @@
  "main": "index.js",
  "license": "SEE LICENSE IN LICENSE.txt",
  "devDependencies": {
+    "@geprog/vite-plugin-env-config": "^4.0.0",
+    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.36",
    "@tsconfig/svelte": "^1.0.10",
    "@types/google-protobuf": "^3.7.3",
    "@types/jasmine": "^3.5.10",
-    "@types/mini-css-extract-plugin": "^1.4.3",
    "@types/node": "^15.3.0",
    "@types/quill": "^1.3.7",
    "@types/uuidv4": "^5.0.0",
-    "@types/webpack-dev-server": "^3.11.4",
    "@typescript-eslint/eslint-plugin": "^5.6.0",
    "@typescript-eslint/parser": "^5.6.0",
-    "css-loader": "^5.2.4",
-    "css-minimizer-webpack-plugin": "^3.3.1",
    "eslint": "^8.4.1",
    "eslint-plugin-svelte3": "^3.2.1",
-    "fork-ts-checker-webpack-plugin": "^6.5.0",
-    "html-webpack-plugin": "^5.3.1",
    "jasmine": "^3.5.0",
    "lint-staged": "^11.0.0",
-    "mini-css-extract-plugin": "^1.6.0",
-    "node-polyfill-webpack-plugin": "^1.1.2",
    "npm-run-all": "^4.1.5",
    "prettier": "^2.3.1",
    "prettier-plugin-svelte": "^2.5.0",
-    "sass": "^1.32.12",
-    "sass-loader": "^11.1.0",
-    "svelte": "^3.38.2",
+    "sass": "^1.49.7",
+    "svelte": "^3.46.3",
    "svelte-check": "^2.1.0",
-    "svelte-loader": "^3.1.1",
-    "svelte-preprocess": "^4.7.3",
-    "ts-loader": "^9.2.6",
+    "svelte-preprocess": "^4.10.2",
    "ts-node": "^10.4.0",
    "tsconfig-paths": "^3.9.0",
    "typescript": "^4.5.3",
-    "webpack": "^5.37.0",
-    "webpack-cli": "^4.7.0",
-    "webpack-dev-server": "^3.11.2"
+    "vite": "^2.7.13",
+    "vite-plugin-rewrite-all": "^0.1.2"
  },
  "dependencies": {
+    "@16bits/nes.css": "^2.3.2",
    "@fontsource/press-start-2p": "^4.3.0",
    "@joeattardi/emoji-button": "^4.6.2",
    "@types/simple-peer": "^9.11.1",
    "@types/socket.io-client": "^1.4.32",
    "axios": "^0.21.2",
+    "buffer": "^6.0.3",
    "cancelable-promise": "^4.2.1",
    "cross-env": "^7.0.3",
    "deep-copy-ts": "^0.5.0",
    "easystarjs": "^0.4.4",
-    "generic-type-guard": "^3.2.0",
+    "generic-type-guard": "^3.4.2",
    "google-protobuf": "^3.13.0",
    "phaser": "^3.54.0",
    "phaser-animated-tiles": "workadventure/phaser-animated-tiles#da68bbededd605925621dd4f03bd27e69284b254",
@@ -71,11 +63,13 @@
    "zod": "^3.11.6"
  },
  "scripts": {
-    "start": "run-p templater serve svelte-check-watch typesafe-i18n",
+    "start": "run-p templater serve watch-iframe-api svelte-check-watch typesafe-i18n-watch",
    "templater": "cross-env ./templater.sh",
-    "serve": "cross-env TS_NODE_PROJECT=\"tsconfig-for-webpack.json\" webpack serve --open",
-    "build": "cross-env TS_NODE_PROJECT=\"tsconfig-for-webpack.json\" NODE_ENV=production webpack",
-    "build-typings": "cross-env TS_NODE_PROJECT=\"tsconfig-for-webpack.json\" NODE_ENV=production BUILD_TYPINGS=1 webpack",
+    "serve": "cross-env vite --host",
+    "build": "cross-env vite build",
+    "build-iframe-api": "vite --config iframe-api.vite.config.ts build",
+    "watch-iframe-api": "yarn run build-iframe-api --watch",
+    "build-typings": "cross-env tsc --project tsconfig-for-iframe-api-typings.json",
    "test": "cross-env TS_NODE_PROJECT=\"tsconfig-for-jasmine.json\" ts-node node_modules/jasmine/bin/jasmine --config=jasmine.json",
    "lint": "node_modules/.bin/eslint src/ tests/ --ext .ts,.svelte",
    "fix": "node_modules/.bin/eslint --fix src/ tests/ --ext .ts,.svelte",
@@ -84,7 +78,9 @@
    "svelte-check": "svelte-check --fail-on-warnings --fail-on-hints --compiler-warnings \"a11y-no-onchange:ignore,a11y-autofocus:ignore,a11y-media-has-caption:ignore\"",
    "pretty": "yarn prettier --write 'src/**/*.{ts,svelte}'",
    "pretty-check": "yarn prettier --check 'src/**/*.{ts,svelte}'",
-    "typesafe-i18n": "typesafe-i18n  --no-watch"
+    "typecheck": "tsc --noEmit",
+    "typesafe-i18n": "typesafe-i18n  --no-watch",
+    "typesafe-i18n-watch": "typesafe-i18n"
  },
  "lint-staged": {
    "*.svelte": [
@@ -1 +1 @@
-iframe_api.d.ts
+*.d.ts
--- a/Show More
+++ b/Show More