michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-02-03 14:13:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cloud: code cleanup and alert clearing

Browse Source
This commit is contained in:
Koushik Dutta
2025-11-13 15:23:26 -08:00
parent ef55c3f366
commit ec6ccb5826
3 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/cloud/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/cloud",
"version": "0.2.50",
"version": "0.2.51",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@scrypted/cloud",
"version": "0.2.50",
"version": "0.2.51",
"dependencies": {
"@eneris/push-receiver": "^4.3.0",
"@scrypted/common": "file:../../common",

2
plugins/cloud/package.json
View File

@@ -52,5 +52,5 @@
"@types/node": "^22.10.1",
"ts-node": "^10.9.2"
},
"version": "0.2.50"
"version": "0.2.51"
}

20
plugins/cloud/src/main.ts
View File

@@ -1160,6 +1160,7 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
// Local failure counter - only accessible within this method
let failureCount = 0;
const maxFailuresBeforeRestart = 3;
const alertTitle = 'Cloudflared health check failed 3 times consecutively. Restarting cloudflared process.';
const check = async () => {
// Only perform health check if cloudflare is enabled and we have a tunnel URL
@@ -1177,39 +1178,30 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
timeout: 30000, // 30 second timeout
});
this.log.clearAlert(alertTitle);
if (response.body !== this.healthCheckToken) {
throw new Error(`Health check failed: Expected token ${this.healthCheckToken}, got ${response.body}`);
}
// Reset failure count on success
failureCount = 0;
this.console.log('Cloudflared health check passed');
} catch (error) {
// Increment failure count on error
failureCount++;
this.console.error(`Cloudflared health check failed (${failureCount}/${maxFailuresBeforeRestart}):`, error);
// Only restart after 3 consecutive failures
if (failureCount >= maxFailuresBeforeRestart) {
this.console.log('3 consecutive health check failures detected. Restarting cloudflared process.');
this.log.a('Cloudflared health check failed 3 times consecutively. Restarting cloudflared process.');
this.console.warn('3 consecutive health check failures detected. Restarting cloudflared process.');
this.log.a(alertTitle);
this.cloudflared?.child?.kill();
// Kill the current cloudflared process to trigger restart
if (this.cloudflared?.child) {
this.cloudflared.child.kill();
}
// Reset the counter after triggering restart
failureCount = 0;
} else {
this.console.log(`Waiting for ${maxFailuresBeforeRestart - failureCount} more consecutive failures before restarting.`);
}
}
};
// Start a new health check interval (every 2 minutes)
this.healthCheckInterval = setInterval(check, 2 * 60 * 1000); // Run every 2 minutes
check();
}
get serverIdentifier() {