Added some features

Author: root

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,42 +60,76 @@ 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)
     {
         $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
+    }
 }

CraftyController/config.blade.php

@@ -12,6 +12,23 @@
         <label>{{ __('app.apps.password') }}</label>
         {!! Form::input('password', 'config[password]', '', ['placeholder' => __('app.apps.password'), 'data-config' => 'password', 'class' => 'form-control config-item']) !!}
     </div>
+    <div class="input">
+        <label>Skip TLS verification</label>
+        <div class="toggleinput" style="margin-top: 26px; padding-left: 15px;">
+            {!! Form::hidden('config[ignore_tls]', 0, ['class' => 'config-item', 'data-config' => 'ignore_tls']) !!}
+            <label class="switch">
+                <?php
+                $checked = false;
+                if (isset($item) && !empty($item) && isset($item->getconfig()->ignore_tls)) {
+                    $checked = $item->getconfig()->ignore_tls;
+                }
+                $set_checked = $checked ? ' checked="checked"' : '';
+                ?>
+                <input type="checkbox" class="config-item" data-config="ignore_tls" name="config[ignore_tls]" value="1" <?php echo $set_checked; ?> />
+                <span class="slider round"></span>
+            </label>
+        </div>
+    </div>
     <div class="input">
         <button style="margin-top: 32px;" class="btn test" id="test_config">Test</button>
     </div>

CraftyController/livestats.blade.php

@@ -1,10 +1,10 @@
 <ul class="livestats">
     <li>
-        <span class="title">servers</span>
-        <strong>{!! $servers_total !!}</strong>
+        <span class="title">servers: {!! $servers_total !!}</span>
+        <span class="title">players: {!! $players_online !!}</span>
     </li>
     <li>
-        <span class="title">online</span>
-        <strong>{!! $servers_online !!}</strong>
+        <span class="title">online: {!! $servers_online !!}</span>
+        <span class="title">{!! $mem !!} GB</span>
     </li>
 </ul>