Skip to content

Fix Crafty-Controller Self-Signed Certificate Issue #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
r03n wants to merge 1 commit into
base: main
Choose a base branch
from
+34 −52
Open

Fix Crafty-Controller Self-Signed Certificate Issue #241

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 34 additions & 52 deletions widgets/crafty-controller-minecraft-server/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,40 +18,32 @@ Displays server's custom icon, inferred IP, MOTD message and some statistics. Th
- type: custom-api
title: Crafty Controller - Minecraft Server
cache: 5s
allow-insecure: true
url: ${CRAFTY_URL}/api/v2/servers/${CRAFTY_SERVER_ID}/stats
headers:
Authorization: Bearer ${CRAFTY_API_TOKEN}
Accept: application/json
options:
base-url: ${CRAFTY_URL}
api-key: ${CRAFTY_API_TOKEN}
server-id: ${CRAFTY_SERVER_ID}
display-MOTD: true
allow-insecure: true
template: |
{{/* Required config options */}}
{{ $baseURL := .Options.StringOr "base-url" "" }}
{{ $apiKey := .Options.StringOr "api-key" "" }}
{{ $serverID := .Options.StringOr "server-id" "" }}

{{/* Optional config options */}}
{{ $displayMOTD := .Options.BoolOr "display-MOTD" true }}

{{ $serverStats := newRequest (print $baseURL "/api/v2/servers/" $serverID "/stats")
| withHeader "Authorization" (print "Bearer " $apiKey)
| withHeader "Accept" "application/json"
| getResponse }}

{{ $is_running := $serverStats.JSON.Bool "data.running" }}
{{ $online_players := $serverStats.JSON.Int "data.online" | formatNumber }}
{{ $max_players := $serverStats.JSON.Int "data.max" | formatNumber }}
{{ $name := $serverStats.JSON.String "data.world_name" }}
{{ $size := $serverStats.JSON.String "data.world_size" }}
{{ $version := $serverStats.JSON.String "data.version" }}
{{ $icon := $serverStats.JSON.String "data.icon" }}
{{ $server_ip := $serverStats.JSON.String "data.server_id.server_ip" }}
{{ $server_port := $serverStats.JSON.String "data.server_id.server_port" }}
{{ $motd := $serverStats.JSON.String "data.desc" }}
{{/* Use the built-in parsed JSON response */}}
{{ $is_running := .JSON.Bool "data.running" }}
{{ $online_players := .JSON.Int "data.online" | formatNumber }}
{{ $max_players := .JSON.Int "data.max" | formatNumber }}
{{ $name := .JSON.String "data.world_name" }}
{{ $size := .JSON.String "data.world_size" }}
{{ $version := .JSON.String "data.version" }}
{{ $icon := .JSON.String "data.icon" }}
{{ $server_ip := .JSON.String "data.server_id.server_ip" }}
{{ $server_port := .JSON.String "data.server_id.server_port" }}
{{ $motd := .JSON.String "data.desc" }}

{{ $server_addr := "" }}
{{ if and ($is_running) (eq $server_ip "127.0.0.1") }}
{{ $server_addr = printf "%s:%s" (replaceMatches "https?://" "" $baseURL) $server_port }}
{{ $server_addr = printf "%s:%s" (replaceMatches "https?://" "" "${CRAFTY_URL}") $server_port }}
{{ else if $is_running }}
{{ $server_addr = printf "%s:%s" $server_ip $server_port }}
{{ end }}
Expand All @@ -61,57 +53,45 @@ Displays server's custom icon, inferred IP, MOTD message and some statistics. Th
{{ $starting = true }}
{{ end }}

<!-- I couldn't find documentation describing the "waiting_start" state or the other booleans below. Implementation might not be correct. -->
{{ $updating := $serverStats.JSON.Bool "data.updating" }}
{{ $importing := $serverStats.JSON.Bool "data.importing" }}
{{ $crashed := $serverStats.JSON.Bool "data.crashed" }}
{{/* Corrected boolean states */}}
{{ $updating := .JSON.Bool "data.updating" }}
{{ $importing := .JSON.Bool "data.importing" }}
{{ $crashed := .JSON.Bool "data.crashed" }}

<div style="display:flex; align-items:center; gap:12px;">
<!-- Server Icon -->
<div style="width:40px; height:40px; flex-shrink:0; border-radius:4px; display:flex; justify-content:center; align-items:center; overflow:hidden;">
{{ if eq $icon "" }}
<img src="https://cdn.jsdelivr.net/gh/selfhst/icons/png/minecraft.png" style="width:100%; height:100%; object-fit:contain;" alt="Server icon">
<img src="https://cdn.jsdelivr.net/gh/selfhst/icons/png/minecraft.png" style="width:100%; height:100%; object-fit:contain;">
{{ else }}
<img src="data:image/png;base64, {{ $icon }}" style="width:100%; height:100%; object-fit:contain;" alt="Server icon">
<img src="data:image/png;base64, {{ $icon }}" style="width:100%; height:100%; object-fit:contain;">
{{ end }}
</div>

<!-- Right side: Info -->
<!-- Server Info -->
<div style="display:flex; flex-direction:column;">
<!-- First row: Server Name + IP -->
<div style="display:flex; align-items:center; gap:6px;">
<span class="size-h4 block text-truncate color-primary">
{{ $name }}
</span>

{{ if and ($is_running) (not $starting) (not (eq $server_addr "")) }}
<div style="font-size:0.9em; color:var(--color-secondary);">
<span class="size-h6 color-secondary">
- {{ $server_addr }}
</span>
</div>
<span class="size-h4 block text-truncate color-primary">{{ $name }}</span>
{{ if and ($is_running) (not $starting) (ne $server_addr "") }}
<span class="size-h6 color-secondary">- {{ $server_addr }}</span>
{{ end }}
</div>

<!-- Second row: MOTD & Stats if server is running, otherwise show status msg ... -->
{{ if and ($is_running) (not $starting) }}
{{ if and (not (eq $motd "")) ($displayMOTD) }}
{{ if and (ne $motd "") ($displayMOTD) }}
<div style="font-size:0.9em; color:var(--color-secondary);">
{{ replaceMatches "§." "" $motd }}
{{ replaceMatches "§." "" $motd }}
</div>
{{ end }}

<div style="font-size:0.9em; color:var(--color-secondary);">
{{ $version }} - {{ $online_players }}/{{ $max_players }} players - {{ $size }}
</div>

<!-- lots of assumptions about the boolean states meanings from crafty api.. -->
{{ else if $starting }}
<div style="font-size:0.9em; color:var(--color-secondary);">Server is starting up..</div>
<div style="font-size:0.9em; color:var(--color-secondary);">Server is starting up…</div>
{{ else if $importing }}
<div style="font-size:0.9em; color:var(--color-secondary);">Server is being imported..</div>
<div style="font-size:0.9em; color:var(--color-secondary);">Server is being imported…</div>
{{ else if $updating }}
<div style="font-size:0.9em; color:var(--color-secondary);">Server is being updated..</div>
<div style="font-size:0.9em; color:var(--color-secondary);">Server is being updated…</div>
{{ else if $crashed }}
<div style="font-size:0.9em; color:var(--color-secondary);">Server has crashed!</div>
{{ else }}
Expand All @@ -121,6 +101,7 @@ Displays server's custom icon, inferred IP, MOTD message and some statistics. Th
</div>
```


## Environment variables
- `CRAFTY_URL` - the URL or [IP]:[Port] to your Crafty Controller instance.
- `CRAFTY_SERVER_ID` - ID of the minecraft server you want to display info about. You can find it in the URL of the server details in Crafty Controller's dashboard. (Ex.; `https://[CRAFTY_URL]/panel/server_detail?id=[CRAFTY_SERVER_ID]`)
Expand All @@ -129,3 +110,4 @@ Displays server's custom icon, inferred IP, MOTD message and some statistics. Th
## 🍻 Cheers

* @not-first as the author of [minecraft-server](/widgets/minecraft-server/README.md) community widget from which I took a lot of inspiration.
* @erkston on [Glance Discord](https://discord.com/invite/7KQ7Xa9kJd) for the solution on Self-Signed Certificate issue.