From 42bb298f05c88a03458ae6b733d0f5b290605dc7 Mon Sep 17 00:00:00 2001 From: Sander Date: Wed, 12 Mar 2025 23:59:54 +0100 Subject: [PATCH 1/9] Create CraftyController.php --- CraftyController/CraftyController.php | 84 +++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 CraftyController/CraftyController.php diff --git a/CraftyController/CraftyController.php b/CraftyController/CraftyController.php new file mode 100644 index 0000000000..d699c03636 --- /dev/null +++ b/CraftyController/CraftyController.php @@ -0,0 +1,84 @@ +jar = new \GuzzleHttp\Cookie\CookieJar; // Uncomment if cookies need to be set + } + + public function test() + { + $test = parent::appTest($this->url('api/v2/auth/login'), $this->auth_attrs()); + echo $test->status; + } + + public function livestats() + { + $status = "inactive"; + $res = parent::execute($this->url('api/v2/auth/login'), $this->auth_attrs()); + $data = json_decode($res->getBody()); + + if ($data->status == 'ok') { + $this->token = $data->data->token; + } + + $res = parent::execute($this->url('api/v2/servers'), attrs: $this->attrs(), overridemethod: 'GET'); + $details = json_decode($res->getBody()); + + $vars['servers_total'] = count($details->data); + + $online = 0; + + foreach ($details->data as $server) { + $server_res = parent::execute($this->url('api/v2/servers/' . $server->server_id . '/stats'), attrs: $this->attrs(), overridemethod: 'GET'); + $server_details = json_decode($server_res->getBody()); + if ($server_details->data->running == True) + $online++; + } + + $vars['servers_online'] = $online; + + return parent::getLiveStats($status, $vars); + + } + + private function auth_attrs() + { + return [ + "body" => json_encode([ + "username" => $this->config->username, + "password" => $this->config->password + ]), + "verify" => false + ]; + } + + + public function attrs() + { + $attrs["headers"] = [ + "content-type" => "application/json", + "Authorization" => "Bearer " . $this->token, + ]; + $attrs["verify"] = false; + + return $attrs; + } + + public function url($endpoint) + { + $api_url = parent::normaliseurl($this->config->url).$endpoint; + return $api_url; + } +} From 335ee90a3f6edbaa449cf48c68b8201c30f1f8f6 Mon Sep 17 00:00:00 2001 From: Sander Date: Thu, 13 Mar 2025 00:01:56 +0100 Subject: [PATCH 2/9] Add files via upload --- CraftyController/app.json | 10 ++++++++++ CraftyController/config.blade.php | 19 +++++++++++++++++++ CraftyController/craftycontroller.png | Bin 0 -> 6426 bytes CraftyController/livestats.blade.php | 10 ++++++++++ 4 files changed, 39 insertions(+) create mode 100644 CraftyController/app.json create mode 100644 CraftyController/config.blade.php create mode 100644 CraftyController/craftycontroller.png create mode 100644 CraftyController/livestats.blade.php diff --git a/CraftyController/app.json b/CraftyController/app.json new file mode 100644 index 0000000000..23e3109826 --- /dev/null +++ b/CraftyController/app.json @@ -0,0 +1,10 @@ +{ + "appid": "200fe80f6b54e75f36a0ae671663f47b417de384", + "name": "Crafty Controller", + "website": "https://craftycontrol.com", + "license": "GNU General Public License v3.0 or later", + "description": "Crafty Controller is a free and open-source Minecraft launcher and manager that allows users to start and administer Minecraft servers from a user-friendly interface. The interface is run as a self-hosted web server that is accessible to devices on the local network by default and can be port forwarded to provide external access outside of your local network. Crafty is designed to be easy to install and use, requiring only a bit of technical knowledge and a desire to learn to get started. Crafty Controller is still actively being developed by Arcadia Technology and we are continually making major improvements to the software.\r\n\r\nCrafty Controller is a feature rich panel that allows you to create and run servers, manage players, run commands, change server settings, view and edit server files, and make backups. With the help of Crafty Controller managing a large number of Minecraft servers on separate versions is easy and intuitive to do.", + "enhanced": true, + "tile_background": "dark", + "icon": "craftycontroller.png" +} \ No newline at end of file diff --git a/CraftyController/config.blade.php b/CraftyController/config.blade.php new file mode 100644 index 0000000000..e892e6c0d9 --- /dev/null +++ b/CraftyController/config.blade.php @@ -0,0 +1,19 @@ +

{{ __('app.apps.config') }} ({{ __('app.optional') }}) @include('items.enable')

+
+
+ + {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!} +
+
+ + {!! Form::text('config[username]', null, array('placeholder' => __('app.apps.username'), 'data-config' => 'username', 'class' => 'form-control config-item')) !!} +
+
+ + {!! Form::input('password', 'config[password]', '', ['placeholder' => __('app.apps.password'), 'data-config' => 'password', 'class' => 'form-control config-item']) !!} +
+
+ +
+
+ diff --git a/CraftyController/craftycontroller.png b/CraftyController/craftycontroller.png new file mode 100644 index 0000000000000000000000000000000000000000..ec39e3fd2903b4852a4f6d3cf579be487e61e342 GIT binary patch literal 6426 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 VZ>!8|fPXCjqZ_9BmDimg{~yPy2|xe< literal 0 HcmV?d00001 diff --git a/CraftyController/livestats.blade.php b/CraftyController/livestats.blade.php new file mode 100644 index 0000000000..73a7470ee4 --- /dev/null +++ b/CraftyController/livestats.blade.php @@ -0,0 +1,10 @@ +
    +
  • + servers + {!! $servers_total !!} +
    • +
  • + online + {!! $servers_online !!} +
    • +
\ No newline at end of file From 6db4e6c164c4c5c76ad87cc0d6f5ba6952581789 Mon Sep 17 00:00:00 2001 From: Sander Date: Thu, 13 Mar 2025 09:23:59 +0100 Subject: [PATCH 3/9] Update CraftyController.php --- CraftyController/CraftyController.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/CraftyController/CraftyController.php b/CraftyController/CraftyController.php index d699c03636..9da10ce624 100644 --- a/CraftyController/CraftyController.php +++ b/CraftyController/CraftyController.php @@ -4,7 +4,6 @@ class CraftyController extends \App\SupportedApps implements \App\EnhancedApps { - public $config; private $token = null; @@ -18,17 +17,16 @@ public function __construct() } public function test() - { - $test = parent::appTest($this->url('api/v2/auth/login'), $this->auth_attrs()); + { + $test = parent::appTest($this->url('api/v2/auth/login'), $this->authAttrs()); echo $test->status; } public function livestats() { $status = "inactive"; - $res = parent::execute($this->url('api/v2/auth/login'), $this->auth_attrs()); + $res = parent::execute($this->url('api/v2/auth/login'), $this->authAttrs()); $data = json_decode($res->getBody()); - if ($data->status == 'ok') { $this->token = $data->data->token; } @@ -41,19 +39,21 @@ public function livestats() $online = 0; foreach ($details->data as $server) { - $server_res = parent::execute($this->url('api/v2/servers/' . $server->server_id . '/stats'), attrs: $this->attrs(), overridemethod: 'GET'); + $server_res = parent::execute($this->url('api/v2/servers/' . $server->server_id . '/stats'), + attrs: $this->attrs(), + overridemethod: 'GET'); $server_details = json_decode($server_res->getBody()); - if ($server_details->data->running == True) + if ($server_details->data->running == true) { $online++; + } } $vars['servers_online'] = $online; return parent::getLiveStats($status, $vars); - } - private function auth_attrs() + private function authAttrs() { return [ "body" => json_encode([ @@ -64,7 +64,7 @@ private function auth_attrs() ]; } - + public function attrs() { $attrs["headers"] = [ @@ -78,7 +78,7 @@ public function attrs() public function url($endpoint) { - $api_url = parent::normaliseurl($this->config->url).$endpoint; + $api_url = parent::normaliseurl($this->config->url) . $endpoint; return $api_url; } } From e434790eee8c1c9b4c69f5a8f91e554c2d918aa6 Mon Sep 17 00:00:00 2001 From: Sander Date: Thu, 13 Mar 2025 09:25:58 +0100 Subject: [PATCH 4/9] Update CraftyController.php --- CraftyController/CraftyController.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CraftyController/CraftyController.php b/CraftyController/CraftyController.php index 9da10ce624..463543f32f 100644 --- a/CraftyController/CraftyController.php +++ b/CraftyController/CraftyController.php @@ -39,9 +39,11 @@ public function livestats() $online = 0; foreach ($details->data as $server) { - $server_res = parent::execute($this->url('api/v2/servers/' . $server->server_id . '/stats'), - attrs: $this->attrs(), - overridemethod: 'GET'); + $server_res = parent::execute( + $this->url('api/v2/servers/' . $server->server_id . '/stats'), + attrs: $this->attrs(), + overridemethod: 'GET' + ); $server_details = json_decode($server_res->getBody()); if ($server_details->data->running == true) { $online++; From be6b4316a71395c0ebad27ac7ef5aca10773638e Mon Sep 17 00:00:00 2001 From: root Date: Thu, 13 Mar 2025 11:16:44 +0100 Subject: [PATCH 5/9] Added some features --- CraftyController/CraftyController.php | 89 +++++++++++++++++++++------ CraftyController/config.blade.php | 17 +++++ CraftyController/livestats.blade.php | 8 +-- 3 files changed, 90 insertions(+), 24 deletions(-) diff --git a/CraftyController/CraftyController.php b/CraftyController/CraftyController.php index 463543f32f..9a45427b4e 100644 --- a/CraftyController/CraftyController.php +++ b/CraftyController/CraftyController.php @@ -16,27 +16,42 @@ public function __construct() //$this->jar = new \GuzzleHttp\Cookie\CookieJar; // Uncomment if cookies need to be set } + private function getToken() + { + $res = parent::execute($this->url('api/v2/auth/login'), $this->authAttrs()); + $data = json_decode($res->getBody()); + if ($data->status == 'ok') { + $this->token = $data->data->token; + } + } + public function test() { - $test = parent::appTest($this->url('api/v2/auth/login'), $this->authAttrs()); - echo $test->status; + try { + $this->getToken(); + echo "Successfully communicated with the API"; + } catch (Exception $err) { + echo $err->getMessage(); + } } public function livestats() { $status = "inactive"; - $res = parent::execute($this->url('api/v2/auth/login'), $this->authAttrs()); - $data = json_decode($res->getBody()); - if ($data->status == 'ok') { - $this->token = $data->data->token; - } + $this->getToken(); - $res = parent::execute($this->url('api/v2/servers'), attrs: $this->attrs(), overridemethod: 'GET'); + $res = parent::execute( + $this->url('api/v2/servers'), + attrs: $this->attrs(), + overridemethod: 'GET' + ); $details = json_decode($res->getBody()); $vars['servers_total'] = count($details->data); - $online = 0; + $servers_online = 0; + $players_online = 0; + $mem = 0; foreach ($details->data as $server) { $server_res = parent::execute( @@ -45,37 +60,43 @@ public function livestats() overridemethod: 'GET' ); $server_details = json_decode($server_res->getBody()); + $players_online += $server_details->data->online; + $mem += $this->decodeSizeToGB($server_details->data->mem); if ($server_details->data->running == true) { - $online++; + $servers_online++; } } - $vars['servers_online'] = $online; + $vars['servers_online'] = $servers_online; + $vars['players_online'] = $players_online; + $vars['mem'] = $mem; return parent::getLiveStats($status, $vars); } private function authAttrs() { + $ignoreTls = $this->getConfigValue("ignore_tls", false); return [ "body" => json_encode([ - "username" => $this->config->username, - "password" => $this->config->password + "username" => $this->getConfigValue("username", null), + "password" => $this->getConfigValue("password", null) ]), - "verify" => false + "verify" => ($ignoreTls ? false : true) ]; } public function attrs() { - $attrs["headers"] = [ - "content-type" => "application/json", - "Authorization" => "Bearer " . $this->token, + $ignoreTls = $this->getConfigValue("ignore_tls", false); + return [ + "headers" => [ + "content-type" => "application/json", + "Authorization" => "Bearer " . $this->token, + ], + "verify" => ($ignoreTls ? false : true) ]; - $attrs["verify"] = false; - - return $attrs; } public function url($endpoint) @@ -83,4 +104,32 @@ public function url($endpoint) $api_url = parent::normaliseurl($this->config->url) . $endpoint; return $api_url; } + + private function getConfigValue($key, $default = null) + { + return isset($this->config) && isset($this->config->$key) + ? $this->config->$key + : $default; + } + + private function decodeSizeToGB($size) + { + $units = [ + 'B' => 1 / (1024 * 1024 * 1024), // Convert bytes to GB + 'KB' => 1 / (1024 * 1024), // Convert KB to GB + 'MB' => 1 / 1024, // Convert MB to GB + 'GB' => 1, // GB is the base unit + 'TB' => 1024, // Convert TB to GB + 'PB' => 1024 * 1024, // Convert PB to GB + ]; + + if (preg_match('/^([\d\.]+)\s*([KMGTP]?B)$/i', strtoupper($size), $matches)) { + $value = (float)$matches[1]; + $unit = $matches[2]; + + return $value * ($units[$unit] ?? 1); + } + + return false; // Invalid format + } } diff --git a/CraftyController/config.blade.php b/CraftyController/config.blade.php index e892e6c0d9..e4030b30f4 100644 --- a/CraftyController/config.blade.php +++ b/CraftyController/config.blade.php @@ -12,6 +12,23 @@ {!! Form::input('password', 'config[password]', '', ['placeholder' => __('app.apps.password'), 'data-config' => 'password', 'class' => 'form-control config-item']) !!} +
+ +
+ {!! Form::hidden('config[ignore_tls]', 0, ['class' => 'config-item', 'data-config' => 'ignore_tls']) !!} + +
+
diff --git a/CraftyController/livestats.blade.php b/CraftyController/livestats.blade.php index 73a7470ee4..af51228714 100644 --- a/CraftyController/livestats.blade.php +++ b/CraftyController/livestats.blade.php @@ -1,10 +1,10 @@
  • - servers - {!! $servers_total !!} + servers: {!! $servers_total !!} + players: {!! $players_online !!}
  • - online - {!! $servers_online !!} + online: {!! $servers_online !!} + {!! $mem !!} GB
\ No newline at end of file From 2953ebe4f5b645e1928dd02ccf4e2cc8e10b810d Mon Sep 17 00:00:00 2001 From: root Date: Thu, 13 Mar 2025 11:24:12 +0100 Subject: [PATCH 6/9] Improve linting --- CraftyController/CraftyController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CraftyController/CraftyController.php b/CraftyController/CraftyController.php index 9a45427b4e..5cf82e4ce0 100644 --- a/CraftyController/CraftyController.php +++ b/CraftyController/CraftyController.php @@ -122,14 +122,14 @@ private function decodeSizeToGB($size) 'TB' => 1024, // Convert TB to GB 'PB' => 1024 * 1024, // Convert PB to GB ]; - + if (preg_match('/^([\d\.]+)\s*([KMGTP]?B)$/i', strtoupper($size), $matches)) { $value = (float)$matches[1]; $unit = $matches[2]; - + return $value * ($units[$unit] ?? 1); } - + return false; // Invalid format } } From 05a351c3a972f4265bc5cb9c3a145525af0a1627 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 13 Mar 2025 11:36:06 +0100 Subject: [PATCH 7/9] Memory value rounding --- CraftyController/CraftyController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CraftyController/CraftyController.php b/CraftyController/CraftyController.php index 5cf82e4ce0..b44a6fd0fd 100644 --- a/CraftyController/CraftyController.php +++ b/CraftyController/CraftyController.php @@ -127,7 +127,7 @@ private function decodeSizeToGB($size) $value = (float)$matches[1]; $unit = $matches[2]; - return $value * ($units[$unit] ?? 1); + return round($value * ($units[$unit] ?? 1), 1); } return false; // Invalid format From c827d3688a6059818d3b91e2b248f763c49b59af Mon Sep 17 00:00:00 2001 From: root Date: Fri, 14 Mar 2025 11:35:38 +0100 Subject: [PATCH 8/9] Updated config and livestats --- CraftyController/config.blade.php | 4 ++-- CraftyController/livestats.blade.php | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CraftyController/config.blade.php b/CraftyController/config.blade.php index e4030b30f4..93635e82e0 100644 --- a/CraftyController/config.blade.php +++ b/CraftyController/config.blade.php @@ -2,11 +2,11 @@
- {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!} + {!! Form::text('config[override_url]', isset($item) ? $item->getconfig()->override_url : null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
- {!! Form::text('config[username]', null, array('placeholder' => __('app.apps.username'), 'data-config' => 'username', 'class' => 'form-control config-item')) !!} + {!! Form::text('config[username]', isset($item) ? $item->getconfig()->username : null, array('placeholder' => __('app.apps.username'), 'data-config' => 'username', 'class' => 'form-control config-item')) !!}
diff --git a/CraftyController/livestats.blade.php b/CraftyController/livestats.blade.php index af51228714..a369ff6643 100644 --- a/CraftyController/livestats.blade.php +++ b/CraftyController/livestats.blade.php @@ -1,10 +1,10 @@
  • - servers: {!! $servers_total !!} - players: {!! $players_online !!} + servers:{!! $servers_total !!} + players:{!! $players_online !!}
  • - online: {!! $servers_online !!} - {!! $mem !!} GB + online:{!! $servers_online !!} + memory:{!! $mem !!} GB
\ No newline at end of file From 6e916628b21ccf97c2e5fa284903dd15b7a5939b Mon Sep 17 00:00:00 2001 From: Sander Date: Mon, 24 Mar 2025 07:09:34 +0100 Subject: [PATCH 9/9] Update app.json --- CraftyController/app.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CraftyController/app.json b/CraftyController/app.json index 23e3109826..edd052843e 100644 --- a/CraftyController/app.json +++ b/CraftyController/app.json @@ -3,8 +3,8 @@ "name": "Crafty Controller", "website": "https://craftycontrol.com", "license": "GNU General Public License v3.0 or later", - "description": "Crafty Controller is a free and open-source Minecraft launcher and manager that allows users to start and administer Minecraft servers from a user-friendly interface. The interface is run as a self-hosted web server that is accessible to devices on the local network by default and can be port forwarded to provide external access outside of your local network. Crafty is designed to be easy to install and use, requiring only a bit of technical knowledge and a desire to learn to get started. Crafty Controller is still actively being developed by Arcadia Technology and we are continually making major improvements to the software.\r\n\r\nCrafty Controller is a feature rich panel that allows you to create and run servers, manage players, run commands, change server settings, view and edit server files, and make backups. With the help of Crafty Controller managing a large number of Minecraft servers on separate versions is easy and intuitive to do.", + "description": "Crafty Controller is a free and open-source Minecraft launcher and manager that allows users to start and administer Minecraft servers from a user-friendly interface.", "enhanced": true, "tile_background": "dark", "icon": "craftycontroller.png" -} \ No newline at end of file +}