📦 Make server dist comes with the dependencies included

.github/workflows/main.yml

@@ -40,7 +40,7 @@ jobs:
           - { name: vscode, type: typescript }
           - { name: websites, type: typescript }
           - { name: jadx, type: pack }
-          - { name: server, type: pybunch }
+          - { name: server, type: python }
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -74,7 +74,7 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: "3.x"
-        if: matrix.target.type == 'pybunch'
+        if: matrix.target.type == 'pybunch' || matrix.target.type == 'python'
 
       - name: Install pybunch
         run: python -m pip install pybunch

Makefile

@@ -128,4 +128,8 @@ server:
 	@echo "Updating the version in pyproject.toml"
 	sed -i 's/version = "[^"]*"/version = "$(VERSION)"/' server/pyproject.toml
 	@echo "Building the graffiti Server"
-	python3 -m pybunch -d server -e graffiti -so -o out/graffiti_v$(VERSION)_server.py
+	mkdir tmp
+	python3 -m pip install websockets==10.3.0 --target tmp
+	cp -R server/graffiti tmp/
+	python3 -m zipapp tmp -m "graffiti.__main__:main_cli" -p "/usr/bin/env python3" -o out/graffiti_v$(VERSION)_server.pyz
+	rm -rf tmp

README.md

@@ -37,15 +37,9 @@ The server can run it two modes:
 - Single user mode - for local user.
 - Multi user mode - for domains or multiple users on the same server.
 
-To run the server, first install the single dependency - websockets library:
+Then, just run `python3 server.pyz`. If you want to use multi-user mode, add the `--multi-user-mode` flag.
 
-```python
-pip3 install websockets==10.3
-```
-
-Then, just run `python3 server.py`. If you want to use multi-user mode, add the `--multi-user-mode` flag.
-
-Note: if you want to run the unpacked version from source, run `python3 -m server.graffiti`.
+Note: if you want to run the unpacked version from source, run `python3 -m server.graffiti`. Make sure to install the requirements before.
 
 ### Backend
 

docs/platforms/Server.md

@@ -3,8 +3,7 @@ Graffiti requires a Python server to proxy between the various IDE you use and t
 ## Single user setup
 
 - Python 3.7+
-- `websockets==10.3`
-- Run the server: `python3 graffiti_v{version}_server.py`
+- Run the server: `python3 graffiti_v{version}_server.pyz`
 
 ## Multi user setup
 

frontends/web/scripts/main.js

@@ -68,7 +68,7 @@ const GRAFFITI_UTILS = [
   },
   {
     name: "Server",
-    filename: "graffiti_v{}_server.py",
+    filename: "graffiti_v{}_server.pyz",
     icon: "images/platforms/python.svg",
     color: "#C9B44C",
   },