Merge pull request #157 from blenderskool/next

Version 3.0.0 ⚡️🚀
blenderskool · Jan 3, 2023 · 2494dea · 2494dea
2 parents 6fed0b5 + 1450c33
commit 2494dea
Show file tree

Hide file tree

Showing 82 changed files with 18,406 additions and 12,727 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14.16.1-alpine as base
+FROM node:16.19.0-alpine as base
 
 WORKDIR /app
 
@@ -21,7 +21,7 @@ COPY ./client .
 COPY ./common ../common
 RUN npm run build
 
-FROM node:14.16.1-alpine
+FROM node:16.19.0-alpine
 
 # Installing nginx and gettext alpine packages
 # gettext is for envsubst command
@@ -38,6 +38,8 @@ COPY ./server/package*.json ./server/
 WORKDIR /app/server
 
 ENV NODE_ENV "production"
+ENV TRUST_PROXY true
+ENV DISABLE_SSE_EVENTS=
 RUN npm install
 
 COPY ./server .

diff --git a/README.md b/README.md
@@ -76,18 +76,20 @@ Blaze is sponsored by:
 Following environment variables can be set in the build process:
 
 
-| variable             | description                                                           | default                         |
-|----------------------|-----------------------------------------------------------------------|---------------------------------|
-| **client**           | Variables for **client** should be set as build args if using Docker. |                                 |
-| `WS_HOST`            | URL to the server that is running the Blaze WebSockets server.        | 'ws://\<your-local-ip\>:3030'   |
-| `SERVER_HOST`        | URL to the server that running the Blaze HTTP server.                 | 'http://\<your-local-ip\>:3030' |
-| `WS_SIZE_LIMIT`      | Max file size limit when transferring files over WebSockets in bytes. | 100000000 (100 MBs)             |
-| `TORRENT_SIZE_LIMIT` | Max file size limit when transferring files over WebTorrent in bytes. | 700000000 (700 MBs)             |
-| **server**           |                                                                       |                                 |
-| `ORIGIN`             | Array of string URLs to allow CORS.                                   | *                               |
-| `PORT`               | Port for the server to run.                                           | 3030                            |
-| `WS_SIZE_LIMIT`      | Max file size limit when transferring files over WebSockets in bytes. | 100000000 (100 MBs)             |
-----------------------------------------------------------------------------------------------------------------------------------
+| variable             | description                                                           | default                                           |
+|----------------------|-----------------------------------------------------------------------|---------------------------------------------------|
+| **client**           | Variables for **client** should be set as build args if using Docker. |                                                   |
+| `WS_HOST`            | URL to the server that is running the Blaze WebSockets server.        | 'ws://\<your-local-ip\>:3030'                     |
+| `SERVER_HOST`        | URL to the server that running the Blaze HTTP server.                 | 'http://\<your-local-ip\>:3030'                   |
+| `WS_SIZE_LIMIT`      | Max file size limit when transferring files over WebSockets in bytes. | 100000000 (100 MBs)                               |
+| `TORRENT_SIZE_LIMIT` | Max file size limit when transferring files over WebTorrent in bytes. | 700000000 (700 MBs)                               |
+| **server**           |                                                                       |                                                   |
+| `ORIGIN`             | Array of string URLs to allow CORS.                                   | *                                                 |
+| `PORT`               | Port for the server to run.                                           | 3030                                              |
+| `WS_SIZE_LIMIT`      | Max file size limit when transferring files over WebSockets in bytes. | 100000000 (100 MBs)                               |
+| `DISABLE_SSE_EVENTS` | Disable server side events to reduce long-lived connections.          | false                                             |
+| `TRUST_PROXY`        | Whether server is behind a trusted proxy and can read forwarded IPs.  | _false_ when standalone, _true_ in docker-compose |
+----------------------------------------------------------------------------------------------------------------------------------------------------
 
 **NOTE:** Any URL in the environment variables should not end with `/`.
 

diff --git a/api/package-lock.json b/api/package-lock.json
diff --git a/api/package.json b/api/package.json
@@ -10,7 +10,7 @@
   "author": "Akash Hamirwasia",
   "license": "ISC",
   "dependencies": {
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^2.6.7",
     "preact": "^10.5.8",
     "preact-render-to-string": "^5.1.12"
   },

diff --git a/client/.babelrc b/client/.babelrc
diff --git a/client/Dockerfile b/client/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14.16.1 AS base
+FROM node:16.19.0 AS base
 
 WORKDIR /app