Merge branch 'main' into max-timer

Author: jrouillard

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,7 @@
 ## Description:
 
+Describe the PR.
+
 ## Please complete the following:
 
 - [ ] I have added screenshots for all UI updates
@@ -10,4 +12,4 @@
 
 ## Please put your Discord username so you can be contacted if a bug or regression is found:
 
-<DISCORD USERNAME>
+DISCORD_USERNAME

.github/workflows/ci.yml

@@ -11,6 +11,7 @@ jobs:
   build:
     name: 🏗️ Build
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -29,6 +30,7 @@ jobs:
   test:
     name: 🔬 Test
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -44,6 +46,7 @@ jobs:
   eslint:
     name: 🔍 ESLint
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -56,6 +59,7 @@ jobs:
   prettier:
     name: 🎨 Prettier
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4

.github/workflows/deploy.yml

@@ -47,6 +47,7 @@ jobs:
     # Use different logic based on event type
     name: Deploy to ${{ inputs.target_domain || 'openfront.dev' }}
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     environment: ${{ inputs.target_domain == 'openfront.io' && 'prod' || '' }}
     env:
       DOMAIN: ${{ inputs.target_domain || 'openfront.dev' }}

.github/workflows/pr-description.yml

@@ -15,6 +15,7 @@ jobs:
   validate-description:
     name: Validate Description
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - uses: actions/github-script@v7
         with:
@@ -24,7 +25,7 @@ jobs:
             const errors = [];
 
             // Check for ## Description section
-            const descMatch = body.match(/^## Description:\s*\n((?:(?!^#).*\n?)*)/m);
+            const descMatch = body.match(/^## Description:\s*\n([\s\S]*?)(?:^## |\Z)/m);
             if (!descMatch || descMatch[1].trim().length < 20) {
               errors.push('❌ Missing or short `## Description:` section.');
             }
@@ -54,6 +55,7 @@ jobs:
   has-milestone:
     name: Has Milestone
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - uses: actions/github-script@v7
         with:

.github/workflows/release.yml

@@ -0,0 +1,27 @@
+name: 🏷️ Release
+
+on:
+  release:
+    types:
+      - created
+      - edited
+
+permissions: {}
+
+jobs:
+  print-release-info:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: 🖨 Print release info
+        env:
+          RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
+          RELEASE_NAME: ${{ github.event.release.name }}
+          RELEASE_BODY: ${{ github.event.release.body }}
+        run: |
+          cat <<EOF >> $GITHUB_STEP_SUMMARY
+          Name: ${RELEASE_NAME}
+          Tag: ${RELEASE_TAG_NAME}
+          Changelog:
+          ${RELEASE_BODY}
+          EOF

.gitignore

@@ -8,3 +8,4 @@ resources/images/.DS_Store
 resources/.DS_Store
 .env*
 .DS_Store
+.clinic/

Dockerfile

@@ -47,6 +47,9 @@ RUN npm run build-prod
 # https://openfront.io/commit.txt
 RUN echo "$GIT_COMMIT" > static/commit.txt
 
+# Update worker_connections in the existing nginx.conf
+RUN sed -i 's/worker_connections [0-9]*/worker_connections 8192/' /etc/nginx/nginx.conf
+
 # Copy Nginx configuration and ensure it's used instead of the default
 COPY nginx.conf /etc/nginx/conf.d/default.conf
 RUN rm -f /etc/nginx/sites-enabled/default

LICENSE

@@ -1,6 +1,17 @@
+# License Information for OpenFront.io Project
+
+## Overview
+
+As of commit 25d5cc370207fd39e0c3bcaa69873b8fc6c60e68, the src/client directory of the OpenFront.io project has been relicensed from the MIT License to the GNU General Public License (GPL) version 3.0. The rest of the project remains under the MIT License unless otherwise specified. Assets in the `/non-commercial/` directory are licensed under CC BY-NC 4.0 with a commercial exemption for OpenFront LLC. Below are the details of all licenses and their applicability.
+
+## MIT License
+
+**Applies to:** All parts of the OpenFront.io project except the src/client directory as of commit 25d5cc370207fd39e0c3bcaa69873b8fc6c60e68 (March 25 2025) and the `resources/non-commercial/` directory.
+
 MIT License
 
-Copyright (c) 2025 OpenFront.io Team
+Portions Copyright (c) 2024 WarFront.io Team
+Portions Copyright (c) 2024 OpenFront.io Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,3 +30,69 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+## GNU General Public License (GPL) version 3.0
+
+**Applies to:** The src/client directory as of commit 25d5cc370207fd39e0c3bcaa69873b8fc6c60e68.
+
+GNU GENERAL PUBLIC LICENSE
+Version 3, 29 June 2007
+
+Copyright (c) 2025 OpenFront.io Team
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+[Full text of the GPL v3.0 license can be found in src/client/LICENSE-GPL.txt, or at <https://www.gnu.org/licenses/gpl-3.0.txt>]
+
+## CC BY-NC 4.0 with Commercial Exemption
+
+**Applies to:** Assets in the `/non-commercial/` directory.
+
+CC BY-NC 4.0 with OpenFront LLC Commercial Exemption
+
+Copyright (c) 2025 OpenFront.io Team and Contributors
+
+This work is licensed under Creative Commons Attribution-NonCommercial 4.0
+International License with the following exception:
+
+**OpenFront LLC is granted unlimited commercial use rights for all purposes.**
+
+For all other parties, standard CC BY-NC 4.0 terms apply, which means:
+
+- **Attribution:** You must give appropriate credit
+- **NonCommercial:** You may not use the material for commercial purposes
+- **No additional restrictions:** You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits
+
+Full CC BY-NC 4.0 license text: https://creativecommons.org/licenses/by-nc/4.0/
+
+## Important Notes
+
+- **MIT License:** A permissive license that allows users to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the software with minimal restrictions, provided the copyright notice and permission notice are included.
+
+- **GPL v3.0:** A copyleft license that requires any derivative works or distributions of the src/client code to also be licensed under GPL v3.0 or later, ensuring that the source code remains open and freely available.
+
+- **CC BY-NC 4.0 with Exemption:** Protects assets from commercial exploitation while allowing OpenFront LLC full commercial rights. Community use for non-commercial purposes is encouraged.
+
+- **Mixed Licensing:** If you are combining code from src/client (GPL) with other parts of the project (MIT), the GPL's copyleft requirements may affect the licensing of the combined work. Consult a legal expert for specific guidance.
+
+- **Contributions:**
+  - For contributions to src/client, ensure that all contributors agree to the GPL v3.0 terms.
+  - For contributions to `/non-commercial/`, contributors grant CC BY-NC rights to the public and commercial rights to OpenFront LLC as specified in our contribution guidelines.
+  - For contributions to other directories, standard MIT terms apply.
+
+## Contributing
+
+Please see our CONTRIBUTING.md file for detailed information about licensing requirements for different parts of the project.
+
+For any questions, contact the OpenFront.io Team.

README.md

@@ -17,10 +17,13 @@ This is a fork/rewrite of WarFront.io. Credit to https://github.com/WarFrontIO.
 
 # OpenFront - Licensing
 
-This project uses a dual-licensing approach:
+This project uses a multi-licensing approach:
 
 - Code in the `server/` and `core/` directory is licensed under MIT
 - Client code (in the `client/` directory) is licensed under GPL v3
+- Assets in resources/non-commercial are under CC BY-NC 4.0 with OpenFront LLC Commercial Exemption. By contributing assets to /non-commercial/, contributors agree that OpenFront LLC may use their contributions for commercial purposes while the contributions remain CC BY-NC 4.0 for all other parties.
+
+See LICENSE file for more details.
 
 ## 🌟 Features
 

__mocks__/fileMock.js

@@ -0,0 +1 @@
+module.exports = "test-file-stub";