Merge pull request coollabsio#3463 from coollabsio/next

andrasbacsai · web-flow · commit 6f578855a07a · 2024-09-17T12:38:50.000+02:00
v4.0.0-beta.388
diff --git a/app/Livewire/RunCommand.php b/app/Livewire/RunCommand.php
diff --git a/app/Livewire/Terminal/Index.php b/app/Livewire/Terminal/Index.php
@@ -3,15 +3,70 @@
 namespace App\Livewire\Terminal;
 
 use App\Models\Server;
+use Livewire\Attributes\On;
 use Livewire\Component;
 
 class Index extends Component
 {
+    public $selected_uuid = 'default';
+
     public $servers = [];
 
+    public $containers = [];
+
     public function mount()
     {
+        if (! auth()->user()->isAdmin()) {
+            abort(403);
+        }
         $this->servers = Server::isReachable()->get();
+        $this->containers = $this->getAllActiveContainers();
+    }
+
+    private function getAllActiveContainers()
+    {
+        return collect($this->servers)->flatMap(function ($server) {
+            if (! $server->isFunctional()) {
+                return [];
+            }
+
+            return $server->loadAllContainers()->map(function ($container) use ($server) {
+                $state = data_get_str($container, 'State')->lower();
+                if ($state->contains('running')) {
+                    return [
+                        'name' => data_get($container, 'Names'),
+                        'connection_name' => data_get($container, 'Names'),
+                        'uuid' => data_get($container, 'Names'),
+                        'status' => data_get_str($container, 'State')->lower(),
+                        'server' => $server,
+                        'server_uuid' => $server->uuid,
+                    ];
+                }
+
+                return null;
+            })->filter();
+        });
+    }
+
+    public function updatedSelectedUuid()
+    {
+        $this->connectToContainer();
+    }
+
+    #[On('connectToContainer')]
+    public function connectToContainer()
+    {
+        if ($this->selected_uuid === 'default') {
+            $this->dispatch('error', 'Please select a server or a container.');
+
+            return;
+        }
+        $container = collect($this->containers)->firstWhere('uuid', $this->selected_uuid);
+        $this->dispatch('send-terminal-command',
+            isset($container),
+            $container['connection_name'] ?? $this->selected_uuid,
+            $container['server_uuid'] ?? $this->selected_uuid
+        );
     }
 
     public function render()
diff --git a/app/Models/Server.php b/app/Models/Server.php
@@ -775,6 +775,18 @@ public function getContainersWithSentinel(): Collection
         }
     }
 
+    public function loadAllContainers(): Collection
+    {
+        if ($this->isFunctional()) {
+            $containers = instant_remote_process(["docker ps -a --format '{{json .}}'"], $this);
+            $containers = format_docker_command_output_to_json($containers);
+
+            return collect($containers);
+        }
+
+        return collect([]);
+    }
+
     public function loadUnmanagedContainers(): Collection
     {
         if ($this->isFunctional()) {
diff --git a/config/sentry.php b/config/sentry.php
@@ -7,7 +7,7 @@
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.337',
+    'release' => '4.0.0-beta.338',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.337';
+return '4.0.0-beta.338';
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -110,7 +110,7 @@ services:
       retries: 10
       timeout: 2s
   soketi:
-    image: 'ghcr.io/coollabsio/coolify-realtime:1.0.0'
+    image: 'ghcr.io/coollabsio/coolify-realtime:1.0.1'
     ports:
       - "${SOKETI_PORT:-6001}:6001"
       - "6002:6002"
@@ -123,7 +123,7 @@ services:
       SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY}"
       SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET}"
     healthcheck:
-      test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:6001/ready && wget -qO- http://127.0.0.1:6002/ready || exit 1"]
+      test: [ "CMD-SHELL", "wget -qO- http://127.0.0.1:6001/ready && wget -qO- http://127.0.0.1:6002/ready || exit 1" ]
       interval: 5s
       retries: 10
       timeout: 2s
diff --git a/docker/coolify-realtime/terminal-server.js b/docker/coolify-realtime/terminal-server.js
@@ -123,7 +123,6 @@ async function handleCommand(ws, command, userId) {
         cols: 80,
         rows: 30,
         cwd: process.env.HOME,
-        env: process.env
     };
 
     // NOTE: - Initiates a process within the Terminal container
diff --git a/other/nightly/docker-compose.prod.yml b/other/nightly/docker-compose.prod.yml
@@ -110,7 +110,7 @@ services:
       retries: 10
       timeout: 2s
   soketi:
-    image: 'ghcr.io/coollabsio/coolify-realtime:1.0.0'
+    image: 'ghcr.io/coollabsio/coolify-realtime:1.0.1'
     ports:
       - "${SOKETI_PORT:-6001}:6001"
       - "6002:6002"
@@ -123,7 +123,7 @@ services:
       SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY}"
       SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET}"
     healthcheck:
-      test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:6001/ready && wget -qO- http://127.0.0.1:6002/ready || exit 1"]
+      test: [ "CMD-SHELL", "wget -qO- http://127.0.0.1:6001/ready && wget -qO- http://127.0.0.1:6002/ready || exit 1" ]
       interval: 5s
       retries: 10
       timeout: 2s
diff --git a/other/nightly/versions.json b/other/nightly/versions.json
@@ -1,16 +1,16 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.337"
+            "version": "4.0.0-beta.338"
         },
         "nightly": {
-            "version": "4.0.0-beta.338"
+            "version": "4.0.0-beta.339"
         },
         "helper": {
             "version": "1.0.1"
         },
         "realtime": {
-            "version": "1.0.0"
+            "version": "1.0.1"
         }
     }
 }
diff --git a/resources/views/livewire/project/shared/terminal.blade.php b/resources/views/livewire/project/shared/terminal.blade.php
@@ -67,6 +67,12 @@ function initializeWebSocket() {
                     socket.onerror = (e) => {
                         console.error('WebSocket error:', e);
                     };
+                    socket.onclose = () => {
+                        console.log('WebSocket connection closed');
+                        setInterval(() => {
+                            $wire.dispatch('error', 'Connection to terminal lost, please refresh the page.');
+                        }, 2000);
+                    };
                 }
             }
 
@@ -209,8 +215,8 @@ function checkIfProcessIsRunningAndKillIt() {
                     term.resize(termWidth, termHeight);
                     socket.send(JSON.stringify({
                         resize: {
-                            cols: termWidth,
-                            rows: termHeight
+                            cols: 600,
+                            rows: 600
                         }
                     }));
                 }
diff --git a/resources/views/livewire/run-command.blade.php b/resources/views/livewire/run-command.blade.php
diff --git a/resources/views/livewire/terminal/index.blade.php b/resources/views/livewire/terminal/index.blade.php
@@ -8,11 +8,27 @@
         <x-helper
             helper="If you're having trouble connecting to your server, make sure that the port is open.<br><br><a class='underline' href='https://coolify.io/docs/knowledge-base/server/firewall/#terminal' target='_blank'>Documentation</a>"></x-helper>
     </div>
-    @if ($servers->count() > 0)
-        <livewire:run-command :servers="$servers" />
-    @else
-        <div>
-            <div>No servers found. Without a server, you won't be able to do much.</div>
-        </div>
-    @endif
+    <div>
+        <form class="flex flex-col gap-2 justify-center xl:items-end xl:flex-row"
+            wire:submit="$dispatchSelf('connectToContainer')">
+            <x-forms.select id="server" required wire:model.live="selected_uuid">
+                @foreach ($servers as $server)
+                    @if ($loop->first)
+                        <option disabled value="default">Select a server or container</option>
+                    @endif
+                    <option value="{{ $server->uuid }}">{{ $server->name }}</option>
+                    @foreach ($containers as $container)
+                        @if ($container['server_uuid'] == $server->uuid)
+                            <option value="{{ $container['uuid'] }}">
+                                {{ $server->name }} -> {{ $container['name'] }}
+                            </option>
+                        @endif
+                    @endforeach
+                @endforeach
+            </x-forms.select>
+            <x-forms.button type="submit">Connect</x-forms.button>
+        </form>
+        <livewire:project.shared.terminal />
+    </div>
+
 </div>
diff --git a/versions.json b/versions.json
@@ -1,16 +1,16 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.337"
+            "version": "4.0.0-beta.338"
         },
         "nightly": {
-            "version": "4.0.0-beta.338"
+            "version": "4.0.0-beta.339"
         },
         "helper": {
             "version": "1.0.1"
         },
         "realtime": {
-            "version": "1.0.0"
+            "version": "1.0.1"
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -775,6 +775,18 @@ public function getContainersWithSentinel(): Collection`
`775`	`775`	`}`
`776`	`776`	`}`
`777`	`777`
	`778`	`+ public function loadAllContainers(): Collection`
	`779`	`+ {`
	`780`	`+ if ($this->isFunctional()) {`
	`781`	`+ $containers = instant_remote_process(["docker ps -a --format '{{json .}}'"], $this);`
	`782`	`+ $containers = format_docker_command_output_to_json($containers);`
	`783`	`+`
	`784`	`+ return collect($containers);`
	`785`	`+ }`
	`786`	`+`
	`787`	`+ return collect([]);`
	`788`	`+ }`
	`789`	`+`
`778`	`790`	`public function loadUnmanagedContainers(): Collection`
`779`	`791`	`{`
`780`	`792`	`if ($this->isFunctional()) {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-return '4.0.0-beta.337';`
	`3`	`+return '4.0.0-beta.338';`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`	`1`	`{`
`2`	`2`	`"coolify": {`
`3`	`3`	`"v4": {`
`4`		`- "version": "4.0.0-beta.337"`
	`4`	`+ "version": "4.0.0-beta.338"`
`5`	`5`	`},`
`6`	`6`	`"nightly": {`
`7`		`- "version": "4.0.0-beta.338"`
	`7`	`+ "version": "4.0.0-beta.339"`
`8`	`8`	`},`
`9`	`9`	`"helper": {`
`10`	`10`	`"version": "1.0.1"`
`11`	`11`	`},`
`12`	`12`	`"realtime": {`
`13`		`- "version": "1.0.0"`
	`13`	`+ "version": "1.0.1"`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,12 @@ function initializeWebSocket() {`
`67`	`67`	`socket.onerror = (e) => {`
`68`	`68`	`console.error('WebSocket error:', e);`
`69`	`69`	`};`
	`70`	`+ socket.onclose = () => {`
	`71`	`+ console.log('WebSocket connection closed');`
	`72`	`+ setInterval(() => {`
	`73`	`+ $wire.dispatch('error', 'Connection to terminal lost, please refresh the page.');`
	`74`	`+ }, 2000);`
	`75`	`+ };`
`70`	`76`	`}`
`71`	`77`	`}`
`72`	`78`
`@@ -209,8 +215,8 @@ function checkIfProcessIsRunningAndKillIt() {`
`209`	`215`	`term.resize(termWidth, termHeight);`
`210`	`216`	`socket.send(JSON.stringify({`
`211`	`217`	`resize: {`
`212`		`- cols: termWidth,`
`213`		`- rows: termHeight`
	`218`	`+ cols: 600,`
	`219`	`+ rows: 600`
`214`	`220`	`}`
`215`	`221`	`}));`
`216`	`222`	`}`