diff --git a/tests/Feature/ServerConnectionTimeoutTest.php b/tests/Feature/ServerConnectionTimeoutTest.php
new file mode 100644
index 000000000..b457f3f01
--- /dev/null
+++ b/tests/Feature/ServerConnectionTimeoutTest.php
@@ -0,0 +1,43 @@
+create();
+ $this->team = $user->teams()->first();
+ $this->server = Server::factory()->create([
+ 'team_id' => $this->team->id,
+ ]);
+});
+
+it('defaults connection_timeout to 10 seconds for new servers', function () {
+ expect($this->server->settings->connection_timeout)->toBe(10);
+});
+
+it('persists a custom connection_timeout value', function () {
+ $this->server->settings->connection_timeout = 30;
+ $this->server->settings->save();
+
+ expect($this->server->settings->fresh()->connection_timeout)->toBe(30);
+});
+
+it('returns the per-server connection_timeout from getConnectionTimeout', function () {
+ $this->server->settings->connection_timeout = 45;
+ $this->server->settings->save();
+
+ expect(SshMultiplexingHelper::getConnectionTimeout($this->server->fresh()))->toBe(45);
+});
+
+it('falls back to config default when connection_timeout is invalid', function () {
+ $this->server->settings->connection_timeout = 0;
+ $this->server->settings->saveQuietly();
+
+ $expected = (int) config('constants.ssh.connection_timeout');
+
+ expect(SshMultiplexingHelper::getConnectionTimeout($this->server->fresh()))->toBe($expected);
+});
From 9bb819c33ea6d327377038717d402851e9697726 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Tue, 28 Apr 2026 15:43:58 +0200
Subject: [PATCH 2/4] feat(api): expose connection_timeout in servers API
Add connection_timeout to create_server docs, update_server allowed
fields, validation (integer 1-300), and advanced settings update path.
---
app/Http/Controllers/Api/ServersController.php | 6 ++++--
openapi.json | 4 ++++
openapi.yaml | 3 +++
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/app/Http/Controllers/Api/ServersController.php b/app/Http/Controllers/Api/ServersController.php
index b33e85c78..6c3b2da00 100644
--- a/app/Http/Controllers/Api/ServersController.php
+++ b/app/Http/Controllers/Api/ServersController.php
@@ -612,6 +612,7 @@ public function create_server(Request $request)
'deployment_queue_limit' => ['type' => 'integer', 'description' => 'Maximum number of queued deployments.'],
'server_disk_usage_notification_threshold' => ['type' => 'integer', 'description' => 'Server disk usage notification threshold (%).'],
'server_disk_usage_check_frequency' => ['type' => 'string', 'description' => 'Cron expression for disk usage check frequency.'],
+ 'connection_timeout' => ['type' => 'integer', 'description' => 'SSH connection timeout in seconds (1-300). Default: 10.'],
],
),
),
@@ -648,7 +649,7 @@ public function create_server(Request $request)
)]
public function update_server(Request $request)
{
- $allowedFields = ['name', 'description', 'ip', 'port', 'user', 'private_key_uuid', 'is_build_server', 'instant_validate', 'proxy_type', 'concurrent_builds', 'dynamic_timeout', 'deployment_queue_limit', 'server_disk_usage_notification_threshold', 'server_disk_usage_check_frequency'];
+ $allowedFields = ['name', 'description', 'ip', 'port', 'user', 'private_key_uuid', 'is_build_server', 'instant_validate', 'proxy_type', 'concurrent_builds', 'dynamic_timeout', 'deployment_queue_limit', 'server_disk_usage_notification_threshold', 'server_disk_usage_check_frequency', 'connection_timeout'];
$teamId = getTeamIdFromToken();
if (is_null($teamId)) {
@@ -674,6 +675,7 @@ public function update_server(Request $request)
'deployment_queue_limit' => 'integer|min:1',
'server_disk_usage_notification_threshold' => 'integer|min:1|max:100',
'server_disk_usage_check_frequency' => 'string',
+ 'connection_timeout' => 'integer|min:1|max:300',
]);
$extraFields = array_diff(array_keys($request->all()), $allowedFields);
@@ -718,7 +720,7 @@ public function update_server(Request $request)
], 422);
}
- $advancedSettings = $request->only(['concurrent_builds', 'dynamic_timeout', 'deployment_queue_limit', 'server_disk_usage_notification_threshold', 'server_disk_usage_check_frequency']);
+ $advancedSettings = $request->only(['concurrent_builds', 'dynamic_timeout', 'deployment_queue_limit', 'server_disk_usage_notification_threshold', 'server_disk_usage_check_frequency', 'connection_timeout']);
if (! empty($advancedSettings)) {
$server->settings()->update(array_filter($advancedSettings, fn ($value) => ! is_null($value)));
}
diff --git a/openapi.json b/openapi.json
index 8b3d5b91f..059b3d911 100644
--- a/openapi.json
+++ b/openapi.json
@@ -10545,6 +10545,10 @@
"server_disk_usage_check_frequency": {
"type": "string",
"description": "Cron expression for disk usage check frequency."
+ },
+ "connection_timeout": {
+ "type": "integer",
+ "description": "SSH connection timeout in seconds (1-300). Default: 10."
}
},
"type": "object"
diff --git a/openapi.yaml b/openapi.yaml
index 07d9b6095..83aa30744 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -6734,6 +6734,9 @@ paths:
server_disk_usage_check_frequency:
type: string
description: 'Cron expression for disk usage check frequency.'
+ connection_timeout:
+ type: integer
+ description: 'SSH connection timeout in seconds (1-300). Default: 10.'
type: object
responses:
'201':
From e8dc48e058e6c21df89b0262e3fdbd47d60db059 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Tue, 28 Apr 2026 22:06:20 +0200
Subject: [PATCH 3/4] fix(vite): make dev server host/port configurable via env
vars
Replace hardcoded HMR host with VITE_HOST/VITE_PORT env vars.
Set allowedHosts to true and derive origin/HMR config from env,
falling back to defaults when vars are absent.
---
vite.config.js | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/vite.config.js b/vite.config.js
index fc739c95d..4b967c40e 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -4,6 +4,8 @@ import vue from "@vitejs/plugin-vue";
export default defineConfig(({ mode }) => {
const env = loadEnv(mode, process.cwd(), '')
+ const viteHost = env.VITE_HOST || null;
+ const vitePort = Number(env.VITE_PORT || 5173);
return {
server: {
@@ -14,9 +16,11 @@ export default defineConfig(({ mode }) => {
],
},
host: "0.0.0.0",
- hmr: {
- host: env.VITE_HOST || '0.0.0.0'
- },
+ allowedHosts: true,
+ origin: viteHost ? `http://${viteHost}:${vitePort}` : undefined,
+ hmr: viteHost
+ ? { host: viteHost, clientPort: vitePort }
+ : true,
},
plugins: [
laravel({
From 19994a0a135ab06cd52e4869cfa5aeffd9455a8e Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Tue, 28 Apr 2026 22:20:15 +0200
Subject: [PATCH 4/4] test(api): add feature tests for server
connection_timeout API
Tests cover PATCH update success, out-of-range, above-max, and
non-integer validation for the connection_timeout field.
---
.../ServerConnectionTimeoutApiTest.php | 74 +++++++++++++++++++
1 file changed, 74 insertions(+)
create mode 100644 tests/Feature/ServerConnectionTimeoutApiTest.php
diff --git a/tests/Feature/ServerConnectionTimeoutApiTest.php b/tests/Feature/ServerConnectionTimeoutApiTest.php
new file mode 100644
index 000000000..287122523
--- /dev/null
+++ b/tests/Feature/ServerConnectionTimeoutApiTest.php
@@ -0,0 +1,74 @@
+ 0, 'is_api_enabled' => true]);
+
+ $this->team = Team::factory()->create();
+ $this->user = User::factory()->create();
+ $this->team->members()->attach($this->user->id, ['role' => 'owner']);
+ session(['currentTeam' => $this->team]);
+
+ $this->server = Server::factory()->create([
+ 'team_id' => $this->team->id,
+ ]);
+
+ $newToken = $this->user->createToken('write-token', ['write']);
+ $newToken->accessToken->forceFill(['team_id' => $this->team->id])->save();
+ $this->token = $newToken->plainTextToken;
+});
+
+it('PATCH updates connection_timeout via API', function () {
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer '.$this->token,
+ 'Content-Type' => 'application/json',
+ ])->patchJson('/api/v1/servers/'.$this->server->uuid, [
+ 'connection_timeout' => 45,
+ ]);
+
+ $response->assertStatus(201);
+ expect($this->server->settings->fresh()->connection_timeout)->toBe(45);
+});
+
+it('PATCH rejects connection_timeout out of range', function () {
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer '.$this->token,
+ 'Content-Type' => 'application/json',
+ ])->patchJson('/api/v1/servers/'.$this->server->uuid, [
+ 'connection_timeout' => 0,
+ ]);
+
+ $response->assertStatus(422);
+ $response->assertJsonStructure(['errors' => ['connection_timeout']]);
+});
+
+it('PATCH rejects connection_timeout above max', function () {
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer '.$this->token,
+ 'Content-Type' => 'application/json',
+ ])->patchJson('/api/v1/servers/'.$this->server->uuid, [
+ 'connection_timeout' => 999,
+ ]);
+
+ $response->assertStatus(422);
+ $response->assertJsonStructure(['errors' => ['connection_timeout']]);
+});
+
+it('PATCH rejects non-integer connection_timeout', function () {
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer '.$this->token,
+ 'Content-Type' => 'application/json',
+ ])->patchJson('/api/v1/servers/'.$this->server->uuid, [
+ 'connection_timeout' => 'fast',
+ ]);
+
+ $response->assertStatus(422);
+ $response->assertJsonStructure(['errors' => ['connection_timeout']]);
+});