small cleanup

Author: acbegen

.gitignore

@@ -224,5 +224,7 @@ dist
 .ionide
 
 # End of https://www.toptal.com/developers/gitignore/api/macos,linux,visualstudiocode,git,node
+
+# Ignore certificate files
 cert.pem
 key.pem

Dockerfile.relay

@@ -1,12 +1,31 @@
-FROM rustlang/rust:nightly AS relay-builder
+FROM rust:alpine AS relay-builder
 
-WORKDIR /usr/src/app
+# Install system dependencies
+RUN apk --no-cache add git musl-dev
 
-RUN apt-get update && apt-get install -y git \
- && git clone https://github.com/streaming-university/moqtail.git
+# Clone the relay (draft 11)
+WORKDIR /moqtail
+RUN git init . && \
+    git remote add origin https://github.com/streaming-university/moqtail.git && \
+    git fetch --depth 1 origin fd691b4387c91b72acc4d264d4da092af49b7b0d && \
+    git checkout fd691b4387c91b72acc4d264d4da092af49b7b0d
 
-WORKDIR /usr/src/app/moqtail
+# Build the relay
+RUN cargo install --path apps/relay
 
+FROM alpine:latest
+
+# Install required dependencies
+RUN apk --no-cache add ca-certificates
+
+# Create directory for relay certificates
+RUN mkdir -p /etc/relay/cert
+
+# Copy the relay binary from the builder stage
+COPY --from=relay-builder /usr/local/cargo/bin/relay /usr/local/bin/relay
+
+# Expose the relay port
 EXPOSE 4433
 
-CMD ["cargo", "run", "--bin", "relay", "--", "--port", "4433", "--cert-file", "cert/cert.pem", "--key-file", "cert/key.pem"]
+# Start the relay
+CMD ["relay", "--cert-file", "/etc/relay/cert/cert.pem", "--key-file", "/etc/relay/cert/key.pem"]

README.md

@@ -16,40 +16,7 @@ mkcert -key-file cert/key.pem -cert-file cert/cert.pem localhost 127.0.0.1 ::1
 docker compose up --build
 ```
 
-**🚀 The app will be available at [http://localhost:5173](http://localhost:5173) by default.**
+**🚀 The app will be available at [http://localhost:4173](http://localhost:4173) by default.**
 
 > [!NOTE]
-> If not working, please check the notes in cert/README.md
-
-## Sample Project Structure
-
-```
-apps/client/
-
-├── public
-│   ├── ...
-├── src
-│   ├── App.tsx
-│   ├── composables
-│   │   └── useVideoPipeline.ts
-│   ├── contexts
-│   │   └── SessionContext.tsx
-│   ├── index.css
-│   ├── main.tsx
-│   ├── pages
-│   │   ├── JoinPage.tsx
-│   │   └── SessionPage.tsx
-│   ├── sockets
-│   │   └── SocketContext.tsx
-│   ├── startup.ts
-│   ├── types
-│   │   ├── AppSettings.ts
-│   │   └── types.ts
-│   ├── videoUtils.ts
-│   ├── vite-env.d.ts
-│   └── workers
-│       ├── decoderWorker.ts
-│       └── pcmPlayerProcessor.js
-├── ...
-
-```
+> If you experience issues with TLS certificates, please check the [README](cert/README.md) in the `cert` directory for troubleshooting steps.

apps/client/Dockerfile

@@ -1,13 +1,16 @@
-FROM node:22-alpine
+FROM node:alpine
 
 WORKDIR /usr/src/app
 
+# Copy package files and install dependencies
 COPY package*.json ./
+RUN npm install --prefer-offline --no-audit --progress=false
 
-RUN npm install
-
+# Copy source code and build
 COPY . .
+RUN npm run build
 
 EXPOSE 5173
 
-CMD ["npm", "run", "dev", "--", "--host", "0.0.0.0"]
+# Start the application in preview mode, accessible from any host
+CMD ["npm", "run", "preview", "--", "--host", "0.0.0.0"]

apps/room-server/Dockerfile

@@ -1,13 +1,17 @@
-FROM node:22-alpine
+FROM node:alpine
 
+# Set working directory
 WORKDIR /usr/src/app
 
+# Copy package files and install dependencies
 COPY package*.json ./
+RUN npm install --prefer-offline --no-audit --progress=false
 
-RUN npm install
-
+# Copy application source
 COPY . .
 
+# Expose application port
 EXPOSE 3001
 
+# Start the application
 CMD ["npm", "run", "start"]

apps/room-server/package.json

@@ -20,7 +20,7 @@
   "devDependencies": {
     "@tsconfig/node-lts": "^18.12.1",
     "nodemon": "^3.1.0",
-    "typescript": "^5.9.3"
+    "typescript": "^5.5.3"
   },
   "keywords": [],
   "author": "",

docker-compose.yml

@@ -3,34 +3,19 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.relay
-    container_name: relay
     ports:
       - '4433:4433/udp'
     volumes:
-      - ./cert:/usr/src/app/moqtail/cert
-    networks:
-      - timetravel-net
+      - ./cert:/etc/relay/cert:ro
 
   room-server:
     build:
       context: ./apps/room-server
-      dockerfile: Dockerfile
-    container_name: room-server
     ports:
       - '3001:3001'
-    networks:
-      - timetravel-net
 
   client:
     build:
       context: ./apps/client
-      dockerfile: Dockerfile
-    container_name: client
     ports:
-      - '5173:5173'
-    networks:
-      - timetravel-net
-
-networks:
-  timetravel-net:
-    driver: bridge
+      - '4173:4173'

package-lock.json

@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "husky": "^9.1.7",
-    "lint-staged": "^16.2.3",
+    "lint-staged": "^16.1.2",
     "prettier": "^3.5.3"
   },
   "packageManager": "npm@11.5.2+sha512.aac1241cfc3f41dc38780d64295c6c6b917a41e24288b33519a7b11adfc5a54a5f881c642d7557215b6c70e01e55655ed7ba666300fd0238bc75fb17478afaf3"