Merge branch 'feature/https' into develop

@@ -8,6 +8,8 @@ services:
     restart: unless-stopped
     restart: unless-stopped
     ports:
     ports:
       - "3000:3000"
       - "3000:3000"
+    volumes:
+      - /etc/letsencrypt:/etc/letsencrypt
 
 
   web:
   web:
     build:
     build:
@@ -15,4 +17,7 @@ services:
       dockerfile: ./web/Dockerfile
       dockerfile: ./web/Dockerfile
     restart: unless-stopped
     restart: unless-stopped
     ports:
     ports:
+      - "443:443"
       - "80:80"
       - "80:80"
+    volumes:
+      - /etc/letsencrypt:/etc/letsencrypt

@@ -11,6 +11,8 @@ RUN yarn install
 
 
 WORKDIR /usr/server
 WORKDIR /usr/server
 
 
+RUN apk add --no-cache build-base gcc python3
+
 RUN yarn install
 RUN yarn install
 RUN yarn build
 RUN yarn build
 
 

 import express from "express";
 import express from "express";
 import socketIo, { Server as IoServer } from "socket.io";
 import socketIo, { Server as IoServer } from "socket.io";
-import { createServer } from "http";
+import { createServer } from "https";
 import { RoomManager } from "./room/RoomManager";
 import { RoomManager } from "./room/RoomManager";
 import { Connection } from "./connection/Connection";
 import { Connection } from "./connection/Connection";
 import { SocketIoWrapper } from "./connection/SocketWrapper";
 import { SocketIoWrapper } from "./connection/SocketWrapper";
+import { readFileSync } from "fs";
 
 
 export class Server {
 export class Server {
   public readonly port: number;
   public readonly port: number;
@@ -13,7 +14,20 @@ export class Server {
     this.port = port;
     this.port = port;
 
 
     const app = express();
     const app = express();
-    const server = createServer(app);
+    const server = createServer(
+      {
+        cert: readFileSync(
+          "/etc/letsencrypt/live/2020105578.oss2021.tk/cert.pem"
+        ),
+        key: readFileSync(
+          "/etc/letsencrypt/live/2020105578.oss2021.tk/privkey.pem"
+        ),
+        ca: readFileSync(
+          "/etc/letsencrypt/live/2020105578.oss2021.tk/fullchain.pem"
+        ),
+      },
+      app
+    );
     this.io = new socketIo.Server(server, {
     this.io = new socketIo.Server(server, {
       cors: {
       cors: {
         origin: "*",
         origin: "*",

@@ -19,6 +19,7 @@ FROM nginx:latest
 COPY web/default.conf /etc/nginx/conf.d/default.conf
 COPY web/default.conf /etc/nginx/conf.d/default.conf
 COPY --from=build /usr/web/build /usr/web/build
 COPY --from=build /usr/web/build /usr/web/build
 
 
+EXPOSE 443
 EXPOSE 80
 EXPOSE 80
 
 
-CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
+CMD ["nginx", "-g", "daemon off;"]

 server {
 server {
     listen 80;
     listen 80;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl default_server;
+    server_name 2020105578.oss2021.tk;
+
+    ssl_certificate /etc/letsencrypt/live/2020105578.oss2021.tk/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/2020105578.oss2021.tk/privkey.pem;
+
     location / {
     location / {
         root    /usr/web/build;
         root    /usr/web/build;
         index   index.html;
         index   index.html;
         try_files $uri $uri/ /index.html;
         try_files $uri $uri/ /index.html;
     }
     }
-}
\ No newline at end of file
+}

 import React from "react";
 import React from "react";
 import { io } from "socket.io-client";
 import { io } from "socket.io-client";
 
 
-export const socket = io(`http://${window.location.hostname}:3000/`);
+export const socket = io(`https://${window.location.hostname}:3000/`);
 const SocketContext = React.createContext(socket);
 const SocketContext = React.createContext(socket);
 
 
 export const SocketProvider = SocketContext.Provider;
 export const SocketProvider = SocketContext.Provider;