Author
@@ -1167,7 +1174,7 @@
System Environment
-
+
Note: Clicking Save will automatically apply the configuration and restart the plugin.
@@ -1186,8 +1193,10 @@
System Environment
blocklist: "mainboard\nmotherboard\nchipset"
},
paths: {
+ images: "/var/lib/coolercontrol/plugins/coolerdash",
+ image_coolerdash: "/var/lib/coolercontrol/plugins/coolerdash/coolerdash.png",
image_background: "",
- image_shutdown: "/etc/coolercontrol/plugins/coolerdash/shutdown.png"
+ image_shutdown: "/var/lib/coolercontrol/plugins/coolerdash/shutdown.png"
},
display: {
mode: "circle",
@@ -1374,6 +1383,13 @@
System Environment
};
}
+ if (typeof restartPlugin === 'undefined') {
+ window.restartPlugin = async function() {
+ console.info('restartPlugin: not in CoolerControl — skipping restart.');
+ return true;
+ };
+ }
+
// Fallback for getDevices() — used when cc-plugin-lib.js is not loaded (dev/browser mode)
// Note: cc-plugin-lib defines functions with `const` (not var/window), so typeof check always
// triggers even when cc-plugin-lib is loaded. We therefore implement postMessage for CC4 context.
@@ -1551,8 +1567,9 @@
System Environment
var name = String(device.name || '');
// Device type: Liquidctl = AIO cooler driver, others penalised
+ // ServicePlugin = software daemon (CC v4.3.0+), never LCD hardware
if (type === 'Liquidctl') score += 30;
- else if (type === 'Hwmon' || type === 'CustomSensors' || type === 'CPU' || type === 'GPU') score -= 40;
+ else if (type === 'Hwmon' || type === 'CustomSensors' || type === 'CPU' || type === 'GPU' || type === 'ServicePlugin') score -= 40;
else if (type) score += 8;
// Capability signals (independent of brand): has an 'lcd' channel key
@@ -1707,21 +1724,21 @@
System Environment
if (sensors.length === 0) {
setSensorDiscoveryStatus('warn',
'
No extra sensors found — CoolerControl API is reachable, but returned no temperature or channel data.
' +
- '
Only Standard sensors (CPU, GPU, Liquid) are shown. ' +
- 'Retry discovery '
+ '
Only Standard sensors (CPU, GPU, Liquid) are shown. ' +
+ 'Retry discovery '
);
} else {
setSensorDiscoveryStatus('ok',
'✔
' + sensors.length + ' sensor(s) discovered from CoolerControl API — see “CC4 Sensors” section below. ' +
- '
Refresh '
+ '
Refresh '
);
}
} catch (error) {
console.warn('Sensor discovery failed:', error);
setSensorDiscoveryStatus('error',
'
CC4 Sensor Discovery failed — ' + escapeHtml(error.message) + '.
' +
- '
Make sure CoolerControl is running and the API address in the Connection tab is correct. ' +
- 'Retry discovery '
+ '
Make sure CoolerControl is running and the API address in the Connection tab is correct. ' +
+ 'Retry discovery '
);
}
}
@@ -1733,7 +1750,10 @@
System Environment
var addrInput = document.querySelector('[name="daemon.address"]');
var tokenInput = document.querySelector('[name="daemon.access_token"]');
if (addrInput && addrInput.value) apiAddr = addrInput.value;
- if (tokenInput) apiToken = tokenInput.value;
+ if (tokenInput) {
+ var _tv = tokenInput.value;
+ apiToken = (_tv === '***' && tokenInput.dataset.realToken) ? tokenInput.dataset.realToken : _tv;
+ }
var statusEl = document.getElementById('sensor-discovery-status');
if (statusEl) {
statusEl.style.display = 'block';
@@ -1913,7 +1933,7 @@
System Environment
});
if (sensorIds.length === 0) {
- container.innerHTML = '
No sensors found. Make sure CoolerControl is running and reachable.
';
+ container.innerHTML = '
No sensors found. Make sure CoolerControl is running and reachable.
';
return;
}
@@ -2284,7 +2304,7 @@
System Environment
var latest = (data.tag_name || '').replace(/^v/i, '');
var dlUrl = 'https://github.com/damachine/coolerdash/releases/tag/' + (data.tag_name || 'latest');
if (latest && latest !== current) {
- el.innerHTML = '
v' + latest + ' available — '
+ el.innerHTML = '
v' + latest + ' available — '
+ '
Download ';
} else {
el.textContent = 'v' + (latest || current) + ' (up to date)';
@@ -2295,9 +2315,6 @@
System Environment
})();
try {
- lastApiAddress = apiAddress;
- lastApiToken = token;
-
// /health fetch isolated so a failure doesn't block the kernel lookup below.
// Also used as fallback in dev/browser mode where fetch() works.
var healthFetched = false;
@@ -2515,6 +2532,12 @@
System Environment
var extraInfoCb = document.getElementById('circle_show_extra_info');
config.display.circle_show_extra_info = extraInfoCb ? extraInfoCb.checked : false;
+ // Restore real token if user left the *** placeholder unchanged
+ var _tokenInput = document.querySelector('[name="daemon.access_token"]');
+ if (_tokenInput && _tokenInput.value.trim() === '***' && _tokenInput.dataset.realToken) {
+ config.daemon.access_token = _tokenInput.dataset.realToken;
+ }
+
var merged = mergeConfigWithDefaults(config, DEFAULT_CONFIG || FACTORY_DEFAULTS);
return merged;
@@ -2533,8 +2556,18 @@
System Environment
var value = fields[field];
var input = document.querySelector('[name="' + section + '.' + field + '"]');
if (input && typeof value !== 'object') {
- input.value = (typeof value === 'boolean') ? (value ? "1" : "0") : value;
- if (field === 'brightness') updateRangeValue('brightness', value);
+ if (section === 'daemon' && field === 'access_token') {
+ if (value && String(value).trim()) {
+ input.dataset.realToken = value;
+ input.value = '***';
+ } else {
+ input.value = '';
+ delete input.dataset.realToken;
+ }
+ } else {
+ input.value = (typeof value === 'boolean') ? (value ? "1" : "0") : value;
+ if (field === 'brightness') updateRangeValue('brightness', value);
+ }
}
}
}
@@ -2602,9 +2635,9 @@
System Environment
var config = buildConfig();
try {
- await saveAndRestartConfig(config);
- alert("Configuration saved! Plugin will restart.");
- setTimeout(function() { window.close(); }, 300);
+ await savePluginConfig(config);
+ await restartPlugin();
+ close();
} catch (error) {
console.error("Save failed:", error);
alert("Save failed: " + error.message);
@@ -2631,25 +2664,7 @@
System Environment
}
}
- async function triggerPluginRestart(delayMs) {
- delayMs = delayMs || 800;
- if (delayMs > 0) {
- await new Promise(function(resolve) { setTimeout(resolve, delayMs); });
- }
-
- if (typeof restart !== 'function') {
- throw new Error('CoolerControl native restart API is unavailable in this context.');
- }
-
- restart();
- return true;
- }
-
- async function saveAndRestartConfig(config, delayMs) {
- await savePluginConfig(config);
- return triggerPluginRestart(delayMs);
- }
async function resetConfig() {
try {
@@ -2663,10 +2678,10 @@
System Environment
} else if (factoryConfig.daemon) {
delete factoryConfig.daemon.access_token;
}
- await saveAndRestartConfig(factoryConfig);
+ await savePluginConfig(factoryConfig);
populateForm(factoryConfig);
- alert('Reset to factory defaults! Plugin will restart.');
- setTimeout(function() { window.close(); }, 300);
+ await restartPlugin();
+ close();
} catch (error) {
console.error("Reset failed:", error);
alert('Reset failed: ' + error.message);
@@ -2761,10 +2776,6 @@
System Environment
return merged;
}
- function migrateConfig(config) {
- return mergeConfigWithDefaults(config, DEFAULT_CONFIG || FACTORY_DEFAULTS);
- }
-
// ===== INITIALIZATION =====
runPluginScript(async function() {
try {
@@ -2778,9 +2789,9 @@
System Environment
var config = await getPluginConfig();
if (!config || Object.keys(config).length === 0) {
- config = JSON.parse(JSON.stringify(DEFAULT_CONFIG));
+ config = cloneConfig(DEFAULT_CONFIG);
} else {
- config = migrateConfig(config);
+ config = mergeConfigWithDefaults(config, DEFAULT_CONFIG || FACTORY_DEFAULTS);
}
populateForm(config);
diff --git a/packaging/coolerdash.spec b/packaging/coolerdash.spec
index de8687a..5346b71 100644
--- a/packaging/coolerdash.spec
+++ b/packaging/coolerdash.spec
@@ -44,15 +44,12 @@ make install DESTDIR=%{buildroot} SUDO="" REALOS=no
gzip -9 %{buildroot}/usr/share/man/man1/coolerdash.1
%pre
-# Stop legacy service
if command -v systemctl >/dev/null 2>&1; then
if systemctl list-unit-files coolerdash.service | grep -q coolerdash; then
systemctl stop coolerdash.service
systemctl disable coolerdash.service
fi
fi
-
-# Remove legacy files
rm -f /etc/systemd/system/coolerdash.service
rm -f /etc/systemd/system/coolerdash-helperd.service
rm -f /etc/systemd/system/multi-user.target.wants/coolerdash-helperd.service
@@ -68,20 +65,43 @@ rm -f /etc/coolercontrol/plugins/coolerdash/coolerdash
rm -f /usr/share/applications/coolerdash-settings.desktop
rm -f /bin/coolerdash
rm -f /usr/bin/coolerdash
-
-# Remove legacy user
if id -u coolerdash >/dev/null 2>&1; then
userdel -rf coolerdash
fi
+if [ -f /etc/coolercontrol/plugins/coolerdash/config.json ] && \
+ [ ! -f /var/lib/coolercontrol/plugins/coolerdash/config.json ]; then
+ mkdir -p /var/lib/coolercontrol/plugins/coolerdash
+ cp /etc/coolercontrol/plugins/coolerdash/config.json \
+ /var/lib/coolercontrol/plugins/coolerdash/config.json
+ chmod 600 /var/lib/coolercontrol/plugins/coolerdash/config.json
+fi
+if [ -f /etc/coolercontrol/plugins/coolerdash/credentials.json ] && \
+ [ ! -f /var/lib/coolercontrol/plugins/coolerdash/credentials.json ]; then
+ mkdir -p /var/lib/coolercontrol/plugins/coolerdash
+ cp /etc/coolercontrol/plugins/coolerdash/credentials.json \
+ /var/lib/coolercontrol/plugins/coolerdash/credentials.json
+ chmod 600 /var/lib/coolercontrol/plugins/coolerdash/credentials.json
+fi
+rm -f /etc/coolercontrol/plugins/coolerdash/manifest.toml
+rm -rf /etc/coolercontrol/plugins/coolerdash/ui
+rm -f /etc/coolercontrol/plugins/coolerdash/shutdown.png
+rm -f /etc/coolercontrol/plugins/coolerdash/README.md
+rm -f /etc/coolercontrol/plugins/coolerdash/CHANGELOG.md
+rm -f /etc/coolercontrol/plugins/coolerdash/VERSION
+# /etc/coolercontrol/plugins is a symlink to /var/lib/coolercontrol/plugins;
+# never rm -rf the directory — it would delete credentials.json via the symlink.
%post
-if [ -f /etc/coolercontrol/plugins/coolerdash/config.json ]; then
- chmod 600 /etc/coolercontrol/plugins/coolerdash/config.json
+if [ ! -f /var/lib/coolercontrol/plugins/coolerdash/credentials.json ]; then
+ mkdir -p /var/lib/coolercontrol/plugins/coolerdash
+ printf '{\n "access_token": ""\n}\n' > /var/lib/coolercontrol/plugins/coolerdash/credentials.json
fi
-if [ -f /etc/coolercontrol/plugins/coolerdash/credentials.json ]; then
- chmod 600 /etc/coolercontrol/plugins/coolerdash/credentials.json
+if [ -f /var/lib/coolercontrol/plugins/coolerdash/config.json ]; then
+ chmod 600 /var/lib/coolercontrol/plugins/coolerdash/config.json
+fi
+if [ -f /var/lib/coolercontrol/plugins/coolerdash/credentials.json ]; then
+ chmod 600 /var/lib/coolercontrol/plugins/coolerdash/credentials.json
fi
-# Remove legacy files
rm -f /etc/systemd/system/multi-user.target.wants/coolerdash-helperd.service
rm -f /etc/systemd/system/coolerdash-helperd.service
rm -f /usr/lib/systemd/system/coolerdash-helperd.service
@@ -89,6 +109,10 @@ rm -rf /etc/systemd/system/cc-plugin-coolerdash.service.d
rm -f /usr/lib/udev/rules.d/99-coolerdash.rules
if command -v systemctl >/dev/null 2>&1; then
systemctl daemon-reload
+ systemctl reset-failed cc-plugin-coolerdash.service >/dev/null 2>&1 || true
+ if systemctl list-unit-files cc-plugin-coolerdash.service | grep -q cc-plugin-coolerdash; then
+ systemctl restart cc-plugin-coolerdash.service || echo "Note: Plugin restart failed."
+ fi
if systemctl is-active --quiet coolercontrold.service; then
systemctl restart coolercontrold.service || echo "Note: CoolerControl restart failed."
fi
@@ -105,7 +129,6 @@ if command -v systemctl >/dev/null 2>&1; then
fi
fi
-# Remove legacy files
if [ "$1" = "0" ]; then
rm -f /etc/systemd/system/coolerdash-helperd.service
rm -f /etc/systemd/system/coolerdash.service
@@ -120,7 +143,6 @@ if [ "$1" = "0" ]; then
rm -f /usr/bin/coolerdash
rm -rf /opt/coolerdash
rm -rf /etc/coolerdash
- # Remove legacy user
if id -u coolerdash >/dev/null 2>&1; then
userdel -rf coolerdash
fi
@@ -140,15 +162,15 @@ fi
%license /usr/share/licenses/%{name}/LICENSE
%dir /usr/libexec/coolerdash
/usr/libexec/coolerdash/coolerdash
-%dir /etc/coolercontrol/plugins/coolerdash
-%config(noreplace) /etc/coolercontrol/plugins/coolerdash/config.json
-/etc/coolercontrol/plugins/coolerdash/manifest.toml
-%dir /etc/coolercontrol/plugins/coolerdash/ui
-/etc/coolercontrol/plugins/coolerdash/ui/index.html
-/etc/coolercontrol/plugins/coolerdash/shutdown.png
-/etc/coolercontrol/plugins/coolerdash/README.md
-/etc/coolercontrol/plugins/coolerdash/CHANGELOG.md
-/etc/coolercontrol/plugins/coolerdash/VERSION
+%dir /var/lib/coolercontrol/plugins/coolerdash
+%config(noreplace) /var/lib/coolercontrol/plugins/coolerdash/config.json
+/var/lib/coolercontrol/plugins/coolerdash/manifest.toml
+%dir /var/lib/coolercontrol/plugins/coolerdash/ui
+/var/lib/coolercontrol/plugins/coolerdash/ui/index.html
+/var/lib/coolercontrol/plugins/coolerdash/shutdown.png
+/var/lib/coolercontrol/plugins/coolerdash/README.md
+/var/lib/coolercontrol/plugins/coolerdash/CHANGELOG.md
+/var/lib/coolercontrol/plugins/coolerdash/VERSION
/usr/share/man/man1/coolerdash.1.gz
/usr/share/applications/coolerdash.desktop
/usr/share/icons/hicolor/scalable/apps/coolerdash.svg
diff --git a/packaging/debian/conffiles b/packaging/debian/conffiles
index de41f0e..e69de29 100644
--- a/packaging/debian/conffiles
+++ b/packaging/debian/conffiles
@@ -1 +0,0 @@
-/etc/coolercontrol/plugins/coolerdash/config.json
diff --git a/packaging/debian/install b/packaging/debian/install
index 09fc557..9d49a02 100644
--- a/packaging/debian/install
+++ b/packaging/debian/install
@@ -1,12 +1,12 @@
usr/libexec/coolerdash/coolerdash
usr/share/licenses/coolerdash/LICENSE
-etc/coolercontrol/plugins/coolerdash/config.json
-etc/coolercontrol/plugins/coolerdash/manifest.toml
-etc/coolercontrol/plugins/coolerdash/shutdown.png
-etc/coolercontrol/plugins/coolerdash/README.md
-etc/coolercontrol/plugins/coolerdash/VERSION
-etc/coolercontrol/plugins/coolerdash/CHANGELOG.md
-etc/coolercontrol/plugins/coolerdash/ui/index.html
+var/lib/coolercontrol/plugins/coolerdash/config.json
+var/lib/coolercontrol/plugins/coolerdash/manifest.toml
+var/lib/coolercontrol/plugins/coolerdash/shutdown.png
+var/lib/coolercontrol/plugins/coolerdash/README.md
+var/lib/coolercontrol/plugins/coolerdash/VERSION
+var/lib/coolercontrol/plugins/coolerdash/CHANGELOG.md
+var/lib/coolercontrol/plugins/coolerdash/ui/index.html
usr/share/man/man1/coolerdash.1
usr/share/applications/coolerdash.desktop
usr/share/icons/hicolor/scalable/apps/coolerdash.svg
diff --git a/packaging/debian/postinst b/packaging/debian/postinst
index c139131..5df31c7 100755
--- a/packaging/debian/postinst
+++ b/packaging/debian/postinst
@@ -3,9 +3,17 @@ set -e
case "$1" in
configure)
+ if [ ! -f /var/lib/coolercontrol/plugins/coolerdash/credentials.json ]; then
+ mkdir -p /var/lib/coolercontrol/plugins/coolerdash
+ printf '{\n "access_token": ""\n}\n' > /var/lib/coolercontrol/plugins/coolerdash/credentials.json
+ fi
+
# Set permissions on config.json
- if [ -f /etc/coolercontrol/plugins/coolerdash/config.json ]; then
- chmod 600 /etc/coolercontrol/plugins/coolerdash/config.json
+ if [ -f /var/lib/coolercontrol/plugins/coolerdash/config.json ]; then
+ chmod 600 /var/lib/coolercontrol/plugins/coolerdash/config.json
+ fi
+ if [ -f /var/lib/coolercontrol/plugins/coolerdash/credentials.json ]; then
+ chmod 600 /var/lib/coolercontrol/plugins/coolerdash/credentials.json
fi
# Remove legacy files
@@ -17,6 +25,10 @@ case "$1" in
if command -v systemctl >/dev/null 2>&1; then
systemctl daemon-reload
+ systemctl reset-failed cc-plugin-coolerdash.service >/dev/null 2>&1 || true
+ if systemctl list-unit-files cc-plugin-coolerdash.service | grep -q cc-plugin-coolerdash; then
+ systemctl restart cc-plugin-coolerdash.service || echo "Note: Plugin restart failed."
+ fi
if systemctl is-active --quiet coolercontrold.service; then
systemctl restart coolercontrold.service || echo "Note: CoolerControl restart failed."
fi
diff --git a/packaging/debian/preinst b/packaging/debian/preinst
index face5ee..277650e 100755
--- a/packaging/debian/preinst
+++ b/packaging/debian/preinst
@@ -3,15 +3,12 @@ set -e
case "$1" in
install|upgrade)
- # Stop legacy service
if command -v systemctl >/dev/null 2>&1; then
if systemctl list-unit-files coolerdash.service | grep -q coolerdash; then
systemctl stop coolerdash.service
systemctl disable coolerdash.service
fi
fi
-
- # Remove legacy files
rm -f /etc/systemd/system/coolerdash.service
rm -f /etc/systemd/system/coolerdash-helperd.service
rm -f /etc/systemd/system/multi-user.target.wants/coolerdash-helperd.service
@@ -27,11 +24,31 @@ case "$1" in
rm -f /usr/share/applications/coolerdash-settings.desktop
rm -f /bin/coolerdash
rm -f /usr/bin/coolerdash
-
- # Remove legacy user
if id -u coolerdash >/dev/null 2>&1; then
userdel -rf coolerdash
fi
+ if [ -f /etc/coolercontrol/plugins/coolerdash/config.json ] && \
+ [ ! -f /var/lib/coolercontrol/plugins/coolerdash/config.json ]; then
+ mkdir -p /var/lib/coolercontrol/plugins/coolerdash
+ cp /etc/coolercontrol/plugins/coolerdash/config.json \
+ /var/lib/coolercontrol/plugins/coolerdash/config.json
+ chmod 600 /var/lib/coolercontrol/plugins/coolerdash/config.json
+ fi
+ if [ -f /etc/coolercontrol/plugins/coolerdash/credentials.json ] && \
+ [ ! -f /var/lib/coolercontrol/plugins/coolerdash/credentials.json ]; then
+ mkdir -p /var/lib/coolercontrol/plugins/coolerdash
+ cp /etc/coolercontrol/plugins/coolerdash/credentials.json \
+ /var/lib/coolercontrol/plugins/coolerdash/credentials.json
+ chmod 600 /var/lib/coolercontrol/plugins/coolerdash/credentials.json
+ fi
+ rm -f /etc/coolercontrol/plugins/coolerdash/manifest.toml
+ rm -rf /etc/coolercontrol/plugins/coolerdash/ui
+ rm -f /etc/coolercontrol/plugins/coolerdash/shutdown.png
+ rm -f /etc/coolercontrol/plugins/coolerdash/README.md
+ rm -f /etc/coolercontrol/plugins/coolerdash/CHANGELOG.md
+ rm -f /etc/coolercontrol/plugins/coolerdash/VERSION
+ # /etc/coolercontrol/plugins is a symlink to /var/lib/coolercontrol/plugins;
+ # never rm -rf the directory — it would delete credentials.json via the symlink.
;;
esac
diff --git a/src/device/config.c b/src/device/config.c
index 763b18b..2430624 100644
--- a/src/device/config.c
+++ b/src/device/config.c
@@ -79,11 +79,11 @@ static void set_paths_defaults(Config *config)
{
if (config->paths_images[0] == '\0')
{
- SAFE_STRCPY(config->paths_images, "/etc/coolercontrol/plugins/coolerdash");
+ SAFE_STRCPY(config->paths_images, "/var/lib/coolercontrol/plugins/coolerdash");
}
if (config->paths_image_coolerdash[0] == '\0')
{
- SAFE_STRCPY(config->paths_image_coolerdash, "/etc/coolercontrol/plugins/coolerdash/coolerdash.png");
+ SAFE_STRCPY(config->paths_image_coolerdash, "/var/lib/coolercontrol/plugins/coolerdash/coolerdash.png");
}
if (config->paths_image_background[0] == '\0')
{
@@ -92,7 +92,7 @@ static void set_paths_defaults(Config *config)
if (config->paths_image_shutdown[0] == '\0')
{
SAFE_STRCPY(config->paths_image_shutdown,
- "/etc/coolercontrol/plugins/coolerdash/shutdown.png");
+ "/var/lib/coolercontrol/plugins/coolerdash/shutdown.png");
}
}
@@ -650,7 +650,8 @@ static const char *find_config_json(const char *custom_path)
}
static const char *possible_paths[] = {
- "/etc/coolercontrol/plugins/coolerdash/config.json",
+ "/var/lib/coolercontrol/plugins/coolerdash/config.json",
+ "/etc/coolercontrol/plugins/coolerdash/config.json", /* symlink fallback */
NULL};
for (int i = 0; possible_paths[i] != NULL; i++)
@@ -738,6 +739,14 @@ static void load_credentials_file(const char *config_json_path, Config *config)
if (!config_json_path || !config)
return;
+ int had_sentinel = (strcmp(config->access_token, "***") == 0);
+
+ /* credentials.json is the single authoritative source for the access token.
+ * It always overrides whatever config.json contained — config.json is only
+ * the temporary delivery channel when the user saves a new token via the UI.
+ * The save_credentials_file() call before this one already persisted any new
+ * token from config.json into credentials.json, so reading here is safe. */
+
char cred_path[CONFIG_MAX_PATH_LEN];
if (!get_credentials_path(config_json_path, cred_path, sizeof(cred_path)))
return;
@@ -746,21 +755,38 @@ static void load_credentials_file(const char *config_json_path, Config *config)
json_t *root = json_load_file(cred_path, 0, &error);
if (!root)
{
+ if (had_sentinel)
+ {
+ config->access_token[0] = '\0';
+ log_message(LOG_WARNING,
+ "credentials.json missing; cleared stale token sentinel from runtime config");
+ }
log_message(LOG_INFO, "No credentials.json at %s", cred_path);
return;
}
json_t *token = json_object_get(root, "access_token");
+ int loaded_token = 0;
if (token && json_is_string(token) && json_string_length(token) > 0)
{
const char *value = json_string_value(token);
- if (value)
+ /* Skip sentinel — credentials.json should never contain "***" but
+ * guard against accidental writes of the UI placeholder. */
+ if (value && strcmp(value, "***") != 0)
{
SAFE_STRCPY(config->access_token, value);
log_message(LOG_INFO, "Loaded access_token from credentials.json");
+ loaded_token = 1;
}
}
+ if (!loaded_token && had_sentinel)
+ {
+ config->access_token[0] = '\0';
+ log_message(LOG_WARNING,
+ "credentials.json has no usable token; cleared stale token sentinel from runtime config");
+ }
+
json_decref(root);
}
@@ -778,15 +804,25 @@ static void save_credentials_file(const char *config_json_path, const Config *co
if (!config_json_path || !config)
return;
+ /* Never overwrite credentials.json with an empty token or the sentinel.
+ * credentials.json is authoritative — only update it when we actually
+ * have a new token (delivered via config.json after a UI save). */
+ if (config->access_token[0] == '\0')
+ return;
+
+ /* "***" is the UI sentinel meaning "token already set, no change" — never
+ * persist the sentinel itself into credentials.json. */
+ if (strcmp(config->access_token, "***") == 0)
+ return;
+
+ const char *token = config->access_token;
+
char cred_path[CONFIG_MAX_PATH_LEN];
if (!get_credentials_path(config_json_path, cred_path, sizeof(cred_path)))
return;
- const char *token = config->access_token[0] != '\0'
- ? config->access_token
- : "";
-
/* Check if credentials.json already has the same token */
+ /* (skip unnecessary writes for unchanged tokens) */
json_t *existing = json_load_file(cred_path, 0, NULL);
if (existing)
{
@@ -824,10 +860,7 @@ static void save_credentials_file(const char *config_json_path, const Config *co
json_decref(root);
- if (token[0] != '\0')
- log_message(LOG_STATUS, "Access token persisted to credentials.json");
- else
- log_message(LOG_STATUS, "Created credentials.json");
+ log_message(LOG_STATUS, "Access token persisted to credentials.json");
}
/**
@@ -863,11 +896,22 @@ static void normalize_config_json(const char *json_path, json_t *root)
if (head[0] == '{' && head[1] == '\n' && head[2] == ' ' && head[3] == ' ')
return;
- /* Remove access_token before writing (belongs in credentials.json) */
+ /* Replace real access_token with sentinel "***" before writing.
+ * The actual token stays safe in credentials.json; the sentinel tells
+ * the UI that a token is already configured without exposing the value. */
json_t *daemon = json_object_get(root, "daemon");
if (daemon && json_is_object(daemon))
{
- json_object_del(daemon, "access_token");
+ json_t *tok = json_object_get(daemon, "access_token");
+ if (tok && json_is_string(tok))
+ {
+ const char *tv = json_string_value(tok);
+ if (tv && tv[0] != '\0' && strcmp(tv, "***") != 0)
+ json_object_set_new(daemon, "access_token", json_string("***"));
+ else if (!tv || tv[0] == '\0')
+ json_object_del(daemon, "access_token");
+ /* "***" already present — leave as-is */
+ }
}
if (json_dump_file(root, json_path,
@@ -1430,6 +1474,61 @@ static void load_positioning_from_json(json_t *root, Config *config)
// Public API Implementation
// ============================================================================
+/**
+ * @brief Write "***" sentinel for access_token into config.json.
+ * @details Called after loading credentials.json so the UI can display that
+ * a token is configured without exposing the real value. Safe to call
+ * repeatedly — skips the write if the sentinel is already present.
+ * @param json_path Path to config.json
+ * @param config Config struct (used to check whether a token is actually set)
+ */
+static void write_token_sentinel_to_config(const char *json_path, const Config *config)
+{
+ if (!json_path || !config || config->access_token[0] == '\0')
+ return;
+
+ json_error_t error;
+ json_t *root = json_load_file(json_path, 0, &error);
+ if (!root)
+ return;
+
+ json_t *daemon_obj = json_object_get(root, "daemon");
+ if (!daemon_obj || !json_is_object(daemon_obj))
+ {
+ json_decref(root);
+ return;
+ }
+
+ json_t *tok = json_object_get(daemon_obj, "access_token");
+ const char *tv = (tok && json_is_string(tok)) ? json_string_value(tok) : "";
+ if (tv && strcmp(tv, "***") == 0)
+ {
+ /* Already correct — nothing to write */
+ json_decref(root);
+ return;
+ }
+
+ json_object_set_new(daemon_obj, "access_token", json_string("***"));
+
+ if (json_dump_file(root, json_path, JSON_INDENT(2) | JSON_PRESERVE_ORDER) == 0)
+ {
+ /* Append trailing newline (json_dump_file omits it) */
+ FILE *fp = fopen(json_path, "a");
+ if (fp)
+ {
+ fputc('\n', fp);
+ fclose(fp);
+ }
+ log_message(LOG_INFO, "Token sentinel written to config.json");
+ }
+ else
+ {
+ log_message(LOG_WARNING, "Failed to write token sentinel to config.json");
+ }
+
+ json_decref(root);
+}
+
/**
* @brief Load complete configuration from config.json with hardcoded defaults.
*/
@@ -1494,8 +1593,19 @@ int load_plugin_config(Config *config, const char *config_path)
log_message(LOG_STATUS, "Using hardcoded defaults");
}
- /* Load credentials.json (overrides access_token from config.json) */
+ /* If config.json delivered a new token (user saved via UI), persist it
+ * to credentials.json NOW — before reading credentials.json as authority. */
+ save_credentials_file(json_path, config);
+
+ /* Load credentials.json as the single authoritative source for access_token.
+ * This always wins — it is the persisted, update-safe store. */
load_credentials_file(json_path, config);
+
+ /* If a token is now active, write the "***" sentinel back to config.json
+ * so the UI (getPluginConfig) can show that a token is configured
+ * without exposing the real value. */
+ if (config->access_token[0] != '\0')
+ write_token_sentinel_to_config(json_path, config);
}
else
{
@@ -1505,11 +1615,5 @@ int load_plugin_config(Config *config, const char *config_path)
// Apply defaults for any missing fields
apply_system_defaults(config);
- /* Auto-persist token to credentials.json (survives config.json updates) */
- if (json_path)
- {
- save_credentials_file(json_path, config);
- }
-
return loaded_from_json;
}
diff --git a/src/srv/cc_conf.c b/src/srv/cc_conf.c
index bdc6af7..147cb1e 100644
--- a/src/srv/cc_conf.c
+++ b/src/srv/cc_conf.c
@@ -110,11 +110,12 @@ const char *extract_device_type_from_json(const json_t *dev)
if (!dev)
return NULL;
- const json_t *type_val = json_object_get(dev, "type");
+ /* Both DeviceDto (/devices) and DeviceStatusDto (/status) use the "d_type" field. */
+ const json_t *type_val = json_object_get(dev, "d_type");
if (!type_val || !json_is_string(type_val))
{
- /* Fallback: /status endpoint uses "d_type" instead of "type" */
- type_val = json_object_get(dev, "d_type");
+ /* Legacy fallback for older CC versions that may have used "type" */
+ type_val = json_object_get(dev, "type");
if (!type_val || !json_is_string(type_val))
return NULL;
}
@@ -446,7 +447,8 @@ static int score_lcd_candidate(const Config *config, const char *device_uid,
else if (type_str &&
(strcmp(type_str, "Hwmon") == 0 ||
strcmp(type_str, "CustomSensors") == 0 ||
- strcmp(type_str, "CPU") == 0 || strcmp(type_str, "GPU") == 0))
+ strcmp(type_str, "CPU") == 0 || strcmp(type_str, "GPU") == 0 ||
+ strcmp(type_str, "ServicePlugin") == 0)) /* CC v4.3.0: plugins are never LCD hw */
score -= 40;
else if (type_str && type_str[0] != '\0')
score += 8;
diff --git a/src/srv/cc_main.c b/src/srv/cc_main.c
index 05ecaa9..5e0c3ee 100644
--- a/src/srv/cc_main.c
+++ b/src/srv/cc_main.c
@@ -332,7 +332,7 @@ int send_image_to_lcd(const Config *config, const char *image_path,
char upload_url[CC_URL_SIZE];
int written = snprintf(upload_url, sizeof(upload_url),
- "%s/devices/%s/settings/lcd/lcd",
+ "%s/devices/%s/settings/lcd/lcd?log=false",
config->daemon_address, device_uid);
if (!validate_snprintf(written, sizeof(upload_url), upload_url))
{