Nginx setup

.env.local.default

@@ -15,7 +15,7 @@ KEY=certs/key.pem
 
 
 # Client variables ---------------
-APP_TITLE=Ethereal Engine
+APP_TITLE="Ethereal Engine"
 APP_LOGO=https://etherealengine-static.s3-us-east-1.amazonaws.com/logo.png
 APP_URL=https://localhost:3000
 APP_HOST=localhost:3000
@@ -118,6 +118,8 @@ RTC_PORT_BLOCK_SIZE=50
 INSTANCESERVER_PORT=3031
 INSTANCESERVER_MODE=local
 INSTANCESERVER_SHUTDOWN_DELAY_MS=30000
+MEDIAINSTANCE_DOMAIN=local.etherealengine.com
+MEDIAINSTANCE_PORT=3032
 # --------------------------------
 
 # Email variables ----------------
@@ -127,7 +129,7 @@ SMTP_SECURE=true
 SMTP_USER=AKIARQM6EGKHDSORVC6Z
 SMTP_PASS=
 SMTP_FROM_NAME=noreply
-SMTP_FROM_EMAIL=<ENTER_SENDER_EMAIL>
+SMTP_FROM_EMAIL=ENTER_SENDER_EMAIL
 # --------------------------------
 
 # Authentication -----------------
@@ -216,3 +218,17 @@ NODE_ENV=production
 OPENSEARCH_USER=admin
 OPENSEARCH_PASSWORD=admin
 OPENSEARCH_HOST=http://localhost:9200
+
+
+# Ideally you should modify you /etc/hosts config to route local.etherealengine.com to localhost
+# Make sure to run npm run dev-genereatecerts before hand
+#NGINX OVERRIDES
+#APP_URL=https://localhost
+#APP_HOST=localhost
+#CERT=certs/mkcert-cert.pem
+#KEY=certs/mkcert-key.pem
+#VITE_LOCAL_NGINX=true
+#VITE_FILE_SERVER=https://localhost/fileserver/ or https://local.etherealengine.com/minio/
+#VITE_TEST_FILE_SERVER=https://local.etherealengine.com/minio/etherealengine-static-resources-test
+#LOCAL_STORAGE_PROVIDER=localhost
+#REDIS_ENABLED=false

.gitignore

@@ -165,4 +165,7 @@ project-package-jsons/*
 
 feathers/*
 /packages/ui/tests/jest-test-results.json
-packages/ui/tests/jest-test-results.json
+packages/ui/tests/jest-test-results.json
+
+/certs/mkcert-cert.pem
+/certs/mkcert-key.pem

package.json

@@ -56,9 +56,11 @@
     "dev-docker-windows": "cd scripts && docker-compose up -d && docker-compose up -d -f docker-compose-minio.yml",
     "dev-tabs": "cd scripts && ./dev-tabs.sh",
     "fetch-projects": "lerna exec 'git fetch -p && git rebase' --parallel --ignore @etherealengine/*",
-    "dev-reinit": "npm run dev-docker && cd packages/server && npm run dev-reinit-db && cd ../../scripts && ./generate-certs.sh",
+    "dev-reinit": "npm run dev-docker && cd packages/server && npm run dev-reinit-db && cd ../../scripts",
     "dev-server": "cd packages/server && npm run dev",
     "dev-windows": "npm run dev-docker-windows && concurrently -n agones,server,client npm:dev-agones-silent npm:dev-server npm:dev-client",
+    "dev-debiancerts": "./generate-certs.sh",
+    "dev-gencerts": "cd ./scripts && ./generate-mkcerts.sh",
     "diff": "lerna diff",
     "format": "prettier --write \"packages/**/*.{ts,tsx}\" \"scripts/*.ts\"",
     "format-scss": "stylelint \"packages/**/*.scss\" --fix",

packages/client-core/src/transports/SocketWebRTCClientFunctions.ts

@@ -250,7 +250,8 @@ export const connectToNetwork = async (
     locationId,
     channelId,
     roomCode,
-    token
+    token,
+    server: 'instanceserver'
   } as {
     instanceID: InstanceID
     locationId?: LocationID
@@ -259,10 +260,14 @@ export const connectToNetwork = async (
     address?: string
     port?: string
     token: string
+    server: string
   }
 
   if (locationId) delete query.channelId
-  if (channelId) delete query.locationId
+  if (channelId) {
+    delete query.locationId
+    query.server = 'mediaserver'
+  }
   if (!roomCode) delete query.roomCode
 
   let primus: Primus

packages/client/server.js

@@ -55,8 +55,8 @@ app.use(async (ctx) => {
 app.listen = function () {
   let server;
   if (HTTPS) {
-    const key = readFileSync(join(packageRoot, 'certs/key.pem'))
-    const cert = readFileSync(join(packageRoot, 'certs/cert.pem'))
+    const key = readFileSync(join(packageRoot, process.env.key))
+    const cert = readFileSync(join(packageRoot, process.env.cert))
     server = createServer({key: key, cert: cert }, this.callback());
   } else {
     server = _createServer(this.callback());

packages/client/vite.config.ts

@@ -266,8 +266,8 @@ export default defineConfig(async () => {
       ...(isDevOrLocal
         ? {
             https: {
-              key: fs.readFileSync(path.join(packageRoot.path, 'certs/key.pem')),
-              cert: fs.readFileSync(path.join(packageRoot.path, 'certs/cert.pem'))
+              key: fs.readFileSync(path.join(packageRoot.path, process.env.KEY ?? 'certs/key.pem')),
+              cert: fs.readFileSync(path.join(packageRoot.path, process.env.CERT ?? 'certs/cert.pem'))
             }
           }
         : {})

packages/server-core/src/appconfig.ts

@@ -198,6 +198,8 @@ const instanceserver = {
   domain: process.env.INSTANCESERVER_DOMAIN || 'instanceserver.etherealengine.com',
   releaseName: process.env.RELEASE_NAME || 'local',
   port: process.env.INSTANCESERVER_PORT!,
+  mediaDomain: process.env.MEDIAINSTANCE_DOMAIN!,
+  mediaPort: process.env.MEDIAINSTANCE_PORT!,
   locationName: process.env.PRELOAD_LOCATION_NAME!,
   shutdownDelayMs: parseInt(process.env.INSTANCESERVER_SHUTDOWN_DELAY_MS!) || 0
 }

packages/server-core/src/createFileServer.ts

@@ -36,8 +36,8 @@ const serve = process.env.TEST === 'true' ? serveStatic('../server/upload_test/'
 
 let server: https.Server = null!
 const options = {
-  key: fs.readFileSync(join(packageRoot.path, 'certs/key.pem')),
-  cert: fs.readFileSync(join(packageRoot.path, 'certs/cert.pem'))
+  key: fs.readFileSync(join(packageRoot.path, process.env.KEY ?? 'certs/key.pem')),
+  cert: fs.readFileSync(join(packageRoot.path, process.env.CERT ?? 'certs/cert.pem'))
 }
 
 const createTestFileServer = (port: number, isServerRunning: boolean) => {

packages/server-core/src/media/storageprovider/local.storage.ts

@@ -34,6 +34,7 @@ import { MULTIPART_CUTOFF_SIZE } from '@etherealengine/common/src/constants/File
 
 import { FileBrowserContentType } from '@etherealengine/engine/src/schemas/media/file-browser.schema'
 import { getState } from '@etherealengine/hyperflux'
+import { ChildProcess } from 'child_process'
 import logger from '../../ServerLogger'
 import { ServerMode, ServerState } from '../../ServerState'
 import config from '../../appconfig'
@@ -81,9 +82,30 @@ export class LocalStorage implements StorageProviderInterface {
     this._store = fsStore(this.PATH_PREFIX)
 
     if (getState(ServerState).serverMode === ServerMode.API && !config.testEnabled) {
-      require('child_process').spawn('npm', ['run', 'serve-local-files'], {
-        cwd: process.cwd(),
-        stdio: 'inherit'
+      const child: ChildProcess = require('child_process').spawn(
+        'npx',
+        [
+          'http-server',
+          `${this.PATH_PREFIX}`,
+          '--ssl',
+          '--cert',
+          `${config.server.certPath}`,
+          '--key',
+          `${config.server.keyPath}`,
+          '--port',
+          '8642',
+          '--cors=*',
+          '--brotli',
+          '--gzip'
+        ],
+        {
+          cwd: process.cwd(),
+          stdio: 'inherit',
+          detached: true
+        }
+      )
+      process.on('exit', async () => {
+        process.kill(-child.pid!, 'SIGINT')
       })
     }
     this.getOriginURLs().then((result) => (this.originURLs = result))

packages/server-core/src/util/get-local-server-ip.ts

@@ -35,7 +35,11 @@ export interface ServerAddress {
 export default async (isMediaInstance: boolean): Promise<ServerAddress> => {
   const ip = configFile.instanceserver.domain === 'localhost' ? await internalIp.v4() : configFile.instanceserver.domain
   return {
-    ipAddress: ip!,
-    port: isMediaInstance ? '3032' : '3031'
+    ipAddress: isMediaInstance ? configFile.instanceserver.mediaDomain : ip!,
+    port: process.env.VITE_LOCAL_NGINX
+      ? '443'
+      : isMediaInstance
+      ? configFile.instanceserver.mediaPort
+      : configFile.instanceserver.port
   }
 }

packages/server/src/start.ts

@@ -154,8 +154,8 @@ export const start = async (): Promise<void> => {
       let server
       const HTTPS = process.env.VITE_LOCAL_BUILD ?? false
       if (HTTPS) {
-        const key = fs.readFileSync(join(packageRoot.path, 'certs/key.pem'))
-        const cert = fs.readFileSync(join(packageRoot.path, 'certs/cert.pem'))
+        const key = fs.readFileSync(join(packageRoot.path, process.env.KEY ?? 'certs/key.pem'))
+        const cert = fs.readFileSync(join(packageRoot.path, process.env.CERT ?? 'certs/cert.pem'))
         server = https.createServer({ key: key, cert: cert }, this.callback())
       } else {
         const http = require('http')

scripts/docker-compose.yml

@@ -1,4 +1,3 @@
-
 version: '2.3'
 services:
   db:
@@ -37,7 +36,22 @@ services:
     command: redis-server
     ports:
       - '6379:6379'
-
+  # web:
+  #   image: nginx
+  #   container_name: etherealengine_nginx
+  #   volumes:
+  #     - ./nginx/templates:/etc/nginx/templates
+  #     - ./nginx/default.conf:/etc/nginx/conf.d/default.conf:ro
+  #     - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+  #     - ../certs:/etc/nginx/certs
+  #   ports:
+  #     - '80:80'
+  #     - '443:443'
+  #   environment:
+  #     - NGINX_HOST
+  #     - NGINX_PORT
+  #   extra_hosts:
+  #     - 'host.docker.internal:host-gateway'
 #   elasticsearch:
 #     image: docker.elastic.co/elasticsearch/elasticsearch:7.4.0
 #     container_name: elasticsearch

scripts/generate-certs.sh

@@ -21,4 +21,4 @@ case "$(uname -s)" in
     echo 'Not supported.'
     echo 'Other OS' 
      ;;
-esac
+esac

scripts/generate-mkcerts.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+if ! command -v -- "mkcert" > /dev/null 2>&1; then
+  echo "ERROR: mkcert not installed."
+  exit 1
+fi
+DIR=`pwd`/../certs
+set -a; source ../.env.local; set +a
+case "$(uname -s)" in
+   Darwin)
+    rm -f $DIR/mkcert-cert.pem
+    rm -f $DIR/mkcert-key.pem
+    mkcert -install
+    mkcert -cert-file $DIR/mkcert-cert.pem -key-file $DIR/mkcert-key.pem $VITE_APP_HOST
+     ;;
+   Linux)
+    rm -f $DIR/mkcert-cert.pem
+    rm -f $DIR/mkcert-key.pem
+    mkcert -install
+    mkcert -cert-file $DIR/mkcert-cert.pem -key-file $DIR/mkcert-key.pem $VITE_APP_HOST
+     ;;
+   CYGWIN*|MINGW32*|MSYS*|MINGW*)
+     echo 'MS Windows'
+     echo "Automatic cert generation for SSL isn't supported on Windows, please add this code"
+     ;;
+   *)
+    echo 'Not supported.'
+    echo 'Other OS' 
+     ;;
+esac