diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/api-config.php b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/api-config.php
new file mode 100644
index 0000000000..b090d41aa5
--- /dev/null
+++ b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/api-config.php
@@ -0,0 +1,97 @@
+/dev/null";
+
+ $exitCode = 0;
+ self::executeCommand($command, $exitCode);
+
+ return $exitCode === 0;
+ }
+
+ /**
+ * Check if the unraid-api-plugin-connect is enabled
+ * @return bool True if connect plugin is enabled, false otherwise
+ */
+ public static function isConnectPluginEnabled()
+ {
+ return self::isApiPluginEnabled('unraid-api-plugin-connect');
+ }
+
+ /**
+ * Get API version from api_utils.sh
+ * @return string The API version or 'unknown' if not found
+ */
+ public static function getApiVersion()
+ {
+ $apiUtilsScript = self::getApiUtilsScript();
+
+ if (!is_executable($apiUtilsScript)) {
+ return 'unknown';
+ }
+
+ $escapedScript = escapeshellarg($apiUtilsScript);
+ $command = "$escapedScript get_api_version 2>/dev/null";
+
+ $exitCode = 0;
+ $output = self::executeCommand($command, $exitCode);
+
+ if ($exitCode !== 0) {
+ return 'unknown';
+ }
+
+ $version = trim($output);
+ return !empty($version) ? $version : 'unknown';
+ }
+}
diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php
index 5182e912df..530240328c 100644
--- a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php
+++ b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php
@@ -17,6 +17,7 @@
require_once "$docroot/plugins/dynamix.my.servers/include/reboot-details.php";
require_once "$docroot/plugins/dynamix.plugin.manager/include/UnraidCheck.php";
+require_once "$docroot/plugins/dynamix.my.servers/include/api-config.php";
/**
* ServerState class encapsulates server-related information and settings.
*
@@ -146,31 +147,12 @@ public function getWebguiGlobal(string $key, ?string $subkey = null)
private function setConnectValues()
{
- $apiConfigPath = '/boot/config/plugins/dynamix.my.servers/configs/api.json';
- if (!file_exists($apiConfigPath)) {
+ if (!ApiConfig::isConnectPluginEnabled()) {
return; // plugin is not installed; exit early
}
-
- $apiConfig = @json_decode(file_get_contents($apiConfigPath), true);
- $pluginName = 'unraid-api-plugin-connect'; // name of connect plugin's npm package
- if ($apiConfig && is_array($apiConfig['plugins'])) {
- foreach ($apiConfig['plugins'] as $plugin) {
- // recognize npm version identifiers inside $apiConfig['plugins']
- if ($plugin === $pluginName || strpos($plugin, $pluginName . '@') === 0) {
- $this->connectPluginInstalled = 'dynamix.unraid.net.plg';
- break;
- }
- }
- }
-
- // exit early if the plugin is not installed
- if (!$this->connectPluginInstalled) {
- return;
- }
-
- // Get version directly using api_utils.sh get_api_version function
- $this->connectPluginVersion = trim(@exec('/usr/local/share/dynamix.unraid.net/scripts/api_utils.sh get_api_version 2>/dev/null')) ?: 'unknown';
-
+
+ $this->connectPluginInstalled = 'dynamix.unraid.net.plg';
+ $this->connectPluginVersion = ApiConfig::getApiVersion();
$this->getMyServersCfgValues();
$this->getConnectKnownOrigins();
$this->getFlashBackupStatus();
diff --git a/plugin/source/dynamix.unraid.net/usr/local/share/dynamix.unraid.net/scripts/api_utils.sh b/plugin/source/dynamix.unraid.net/usr/local/share/dynamix.unraid.net/scripts/api_utils.sh
index ae7a6a0802..b4168542bd 100755
--- a/plugin/source/dynamix.unraid.net/usr/local/share/dynamix.unraid.net/scripts/api_utils.sh
+++ b/plugin/source/dynamix.unraid.net/usr/local/share/dynamix.unraid.net/scripts/api_utils.sh
@@ -9,7 +9,7 @@ CONFIG_FILE="/usr/local/share/dynamix.unraid.net/config/vendor_archive.json"
# Returns the API version string or empty if not found
get_api_version() {
local api_version=""
-
+
# Get version from config file
if [ -f "$CONFIG_FILE" ] && command -v jq >/dev/null 2>&1; then
api_version=$(jq -r '.api_version' "$CONFIG_FILE")
@@ -18,23 +18,23 @@ get_api_version() {
return 0
fi
fi
-
+
# No version found
return 1
}
-# Get vendor archive configuration information
+# Get vendor archive configuration information
# Returns an array of values: api_version, vendor_store_url, vendor_store_path
get_archive_information() {
# Define all local variables at the top
local api_version=""
local vendor_store_path=""
-
+
if [ ! -f "$CONFIG_FILE" ]; then
echo "Vendor archive config file not found at $CONFIG_FILE" >&2
return 1
fi
-
+
# Read values from JSON config using jq
if command -v jq >/dev/null 2>&1; then
api_version=$(jq -r '.api_version' "$CONFIG_FILE")
@@ -43,20 +43,83 @@ get_archive_information() {
echo "jq not found, can't parse config file" >&2
return 1
fi
-
+
# Validate that all required values exist and are not null
if [ -z "$api_version" ] || [ "$api_version" = "null" ]; then
echo "Invalid or missing api_version in config file" >&2
return 1
fi
-
+
if [ -z "$vendor_store_path" ] || [ "$vendor_store_path" = "null" ]; then
echo "Invalid or missing vendor_store_path in config file" >&2
return 1
fi
-
+
# Return the values
echo "$api_version"
echo "$vendor_store_path"
return 0
-}
\ No newline at end of file
+}
+
+# Check if an API plugin is enabled
+# Usage: is_api_plugin_enabled
+# Returns 0 if enabled, 1 if not enabled or error
+is_api_plugin_enabled() {
+ local plugin_name="$1"
+ local api_config_path="/boot/config/plugins/dynamix.my.servers/configs/api.json"
+
+ # Check if plugin name is provided
+ if [ -z "$plugin_name" ]; then
+ return 1
+ fi
+
+ # Check if API config file exists
+ if [ ! -f "$api_config_path" ]; then
+ return 1
+ fi
+
+ # Check if jq is available
+ if ! command -v jq >/dev/null 2>&1; then
+ return 1
+ fi
+
+ # Parse JSON and check for plugin
+ local plugins
+ plugins=$(jq -r '.plugins[]?' "$api_config_path" 2>/dev/null)
+ if [ $? -ne 0 ]; then
+ return 1
+ fi
+
+ # Check each plugin entry
+ while IFS= read -r plugin; do
+ if [ "$plugin" = "$plugin_name" ] || [[ "$plugin" == "$plugin_name@"* ]]; then
+ return 0
+ fi
+ done <<<"$plugins"
+
+ return 1
+}
+
+# Main execution when script is called directly
+# Handle command line arguments
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+ case "$1" in
+ "get_api_version")
+ get_api_version
+ ;;
+ "get_archive_information")
+ get_archive_information
+ ;;
+ "is_api_plugin_enabled")
+ if [ -z "$2" ]; then
+ echo "Error: Plugin name required" >&2
+ exit 1
+ fi
+ is_api_plugin_enabled "$2"
+ ;;
+ *)
+ echo "Usage: $0 {get_api_version|get_archive_information|is_api_plugin_enabled }" >&2
+ exit 1
+ ;;
+ esac
+fi