Skip to content

Commit 0c8530d

Browse files
committed
Refactoring and proper naming
1 parent 501fbb5 commit 0c8530d

35 files changed

+344
-326
lines changed

β€Ž.gitignoreβ€Ž

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ service-account-key.json
5656
# Chromium persistent data (deprecated, now in @mount/)
5757
chromium-data/
5858

59-
# All mounted volumes (recordings, chromium-data, eval-server, etc.)
59+
# All mounted volumes (recordings, chromium-data, browser-agent-server, etc.)
6060
@mount/
6161

6262
# Browser Operator DevTools build artifacts
@@ -66,10 +66,10 @@ browser-operator-core/.devtools-built
6666
browser-operator-core/.devtools-base-built
6767

6868
# Eval server runtime files
69-
eval-server/nodejs/clients/
70-
eval-server/nodejs/logs/
71-
eval-server/nodejs/node_modules/
72-
eval-server/nodejs/.env
69+
browser-agent-server/nodejs/clients/
70+
browser-agent-server/nodejs/logs/
71+
browser-agent-server/nodejs/node_modules/
72+
browser-agent-server/nodejs/.env
7373

7474
# Evaluation screenshots
7575
evals/screenshots/

β€ŽDockerfile.cloudrunβ€Ž

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ RUN sed -i 's/AUTOMATED_MODE: false/AUTOMATED_MODE: true/' front_end/panels/ai_c
5656
RUN npm run build
5757

5858
# Eval-Server build stage
59-
FROM node:22-bullseye-slim AS eval-server-builder
60-
WORKDIR /eval-server
61-
COPY eval-server/nodejs/package*.json ./
59+
FROM node:22-bullseye-slim AS browser-agent-server-builder
60+
WORKDIR /browser-agent-server
61+
COPY browser-agent-server/nodejs/package*.json ./
6262
RUN npm install --production
63-
COPY eval-server/nodejs/ ./
63+
COPY browser-agent-server/nodejs/ ./
6464

6565
# Multi-stage build using kernel-images as base
6666
FROM docker.io/golang:1.25.0 AS server-builder
@@ -154,10 +154,10 @@ RUN apt-get update && \
154154
nginx \
155155
# PPA req
156156
software-properties-common \
157-
# Node.js for eval-server
157+
# Node.js for browser-agent-server
158158
ca-certificates \
159159
gnupg && \
160-
# Install Node.js 22.x for eval-server
160+
# Install Node.js 22.x for browser-agent-server
161161
mkdir -p /etc/apt/keyrings && \
162162
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
163163
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
@@ -279,15 +279,15 @@ RUN chown -R kernel:kernel /usr/share/nginx/devtools
279279
# Eval-Server Integration
280280
# ============================================================================
281281

282-
# Copy eval-server from builder
283-
COPY --from=eval-server-builder /eval-server /opt/eval-server
282+
# Copy browser-agent-server from builder
283+
COPY --from=browser-agent-server-builder /browser-agent-server /opt/browser-agent-server
284284

285-
# Copy custom eval-server startup script INTO eval-server directory
286-
COPY eval-server-start.js /opt/eval-server/start-cloudrun.js
287-
RUN chmod +x /opt/eval-server/start-cloudrun.js
285+
# Copy custom browser-agent-server startup script INTO browser-agent-server directory
286+
COPY browser-agent-server/start.js /opt/browser-agent-server/start-cloudrun.js
287+
RUN chmod +x /opt/browser-agent-server/start-cloudrun.js
288288

289-
# Set permissions for eval-server
290-
RUN chown -R kernel:kernel /opt/eval-server
289+
# Set permissions for browser-agent-server
290+
RUN chown -R kernel:kernel /opt/browser-agent-server
291291

292292
# Cloud Run specific: wrapper scripts (nginx config is inline)
293293
# DO NOT copy nginx.conf to avoid auto-start conflicts
@@ -301,7 +301,7 @@ COPY supervisor/services-cloudrun/xorg.conf /etc/supervisor/conf.d/services-clou
301301
COPY supervisor/services-cloudrun/neko.conf /etc/supervisor/conf.d/services-cloudrun/neko.conf
302302
COPY supervisor/services-cloudrun/chromium.conf /etc/supervisor/conf.d/services-cloudrun/chromium.conf
303303
COPY supervisor/services-cloudrun/devtools-frontend.conf /etc/supervisor/conf.d/services-cloudrun/devtools-frontend.conf
304-
COPY supervisor/services-cloudrun/eval-server.conf /etc/supervisor/conf.d/services-cloudrun/eval-server.conf
304+
COPY supervisor/services-cloudrun/browser-agent-server.conf /etc/supervisor/conf.d/services-cloudrun/browser-agent-server.conf
305305

306306
# Create nginx temp directories for non-root execution
307307
RUN mkdir -p /tmp/nginx_client_temp /tmp/nginx_proxy_temp /tmp/nginx_fastcgi_temp \
@@ -313,7 +313,7 @@ RUN mkdir -p /tmp/nginx_client_temp /tmp/nginx_proxy_temp /tmp/nginx_fastcgi_tem
313313
# Create supervisor log directories
314314
RUN mkdir -p /var/log/supervisord/chromium /var/log/supervisord/neko /var/log/supervisord/xorg \
315315
/var/log/supervisord/dbus /var/log/supervisord/kernel-images-api /var/log/supervisord/mutter \
316-
/var/log/supervisord/nginx /var/log/supervisord/devtools-frontend /var/log/supervisord/eval-server && \
316+
/var/log/supervisord/nginx /var/log/supervisord/devtools-frontend /var/log/supervisord/browser-agent-server && \
317317
chown -R kernel:kernel /var/log/supervisord
318318

319319
# Create health check endpoint

β€ŽDockerfile.devtoolsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ FROM devtools-base AS devtools-local
6969
# Copy local changes from browser-operator-core submodule FIRST
7070
# This happens before checking out upstream, so we copy over the upstream code
7171
COPY browser-operator-core/front_end /workspace/devtools/devtools-frontend/front_end
72-
COPY eval-server /workspace/devtools/devtools-frontend/eval-server
72+
COPY browser-agent-server /workspace/devtools/devtools-frontend/browser-agent-server
7373

7474
WORKDIR /workspace/devtools/devtools-frontend
7575

β€ŽDockerfile.localβ€Ž

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ FROM browser-operator-devtools:latest AS devtools-source
1212
# ============================================================================
1313
# Eval Server build stage
1414
# ============================================================================
15-
FROM --platform=linux/arm64 node:18-alpine AS eval-server-builder
15+
FROM --platform=linux/arm64 node:18-alpine AS browser-agent-server-builder
1616

1717
WORKDIR /workspace
1818

1919
# Copy eval server from browser-operator-core submodule
20-
COPY eval-server/nodejs /workspace/eval-server
20+
COPY browser-agent-server/nodejs /workspace/browser-agent-server
2121

22-
WORKDIR /workspace/eval-server
22+
WORKDIR /workspace/browser-agent-server
2323

2424
# Install dependencies
2525
RUN npm install
@@ -229,7 +229,7 @@ RUN ln -s /etc/nginx/sites-available/devtools /etc/nginx/sites-enabled/devtools
229229
COPY supervisor/services/nginx-devtools.conf /etc/supervisor/conf.d/services/nginx-devtools.conf
230230

231231
# Add eval server service to supervisor
232-
COPY supervisor/services/eval-server.conf /etc/supervisor/conf.d/services/eval-server.conf
232+
COPY supervisor/services/browser-agent-server.conf /etc/supervisor/conf.d/services/browser-agent-server.conf
233233

234234
# Add neko service to supervisor (configured for port 8000)
235235
COPY supervisor/services/neko.conf /etc/supervisor/conf.d/services/neko.conf
@@ -250,16 +250,16 @@ RUN useradd -m -s /bin/bash kernel
250250
# ============================================================================
251251

252252
# Copy eval server from builder
253-
COPY --from=eval-server-builder /workspace/eval-server /opt/eval-server
253+
COPY --from=browser-agent-server-builder /workspace/browser-agent-server /opt/browser-agent-server
254254

255255
# Install Node.js in final image for eval server
256256
RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
257257
apt-get install -y nodejs && \
258258
rm -rf /var/lib/apt/lists/*
259259

260260
# Create eval server startup script
261-
RUN echo '#!/bin/bash\ncd /opt/eval-server && node start.js' > /usr/local/bin/start-eval-server.sh && \
262-
chmod +x /usr/local/bin/start-eval-server.sh
261+
RUN echo '#!/bin/bash\ncd /opt/browser-agent-server && node start.js' > /usr/local/bin/start-browser-agent-server.sh && \
262+
chmod +x /usr/local/bin/start-browser-agent-server.sh
263263

264264
# ============================================================================
265265
# Chromium Data Directory Configuration

β€ŽMakefileβ€Ž

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,15 @@ shell: ## Get shell access to running container
120120
info: ## Show connection information
121121
@echo ""
122122
@echo "🌐 Service Access Points:"
123-
@echo " WebRTC Client: http://localhost:8000"
124-
@echo " Eval Server API: http://localhost:8081"
125-
@echo " Chrome DevTools: http://localhost:9222/json"
126-
@echo " Recording API: http://localhost:444/api"
127-
@echo " Enhanced DevTools UI: http://localhost:8001"
128-
@echo " DevTools Health: http://localhost:8001/health"
129-
130-
test: ## Test eval API with simple math eval
131-
@echo "πŸ§ͺ Testing Eval Server API..."
123+
@echo " WebRTC Client: http://localhost:8000"
124+
@echo " Browser Agent Server API: http://localhost:8081"
125+
@echo " Chrome DevTools: http://localhost:9222/json"
126+
@echo " Recording API: http://localhost:444/api"
127+
@echo " Enhanced DevTools UI: http://localhost:8001"
128+
@echo " DevTools Health: http://localhost:8001/health"
129+
130+
test: ## Test Browser Agent Server API with simple eval
131+
@echo "πŸ§ͺ Testing Browser Agent Server API..."
132132
@echo ""
133133
@echo "1️⃣ Checking API endpoint..."
134134
@curl -s -o /dev/null -w " Status: %{http_code}\n" http://localhost:8080/status || (echo " ❌ API not responding"; exit 1)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
Β (0)