cloud: support disabling cloudflare

koush · Oct 4, 2023 · 71cbe83 · 71cbe83
1 parent 1438af8
commit 71cbe83
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/plugins/cloud/package-lock.json b/plugins/cloud/package-lock.json
diff --git a/plugins/cloud/package.json b/plugins/cloud/package.json
@@ -54,5 +54,5 @@
       "@types/nat-upnp": "^1.1.2",
       "@types/node": "^20.4.5"
    },
-   "version": "0.2.2"
+   "version": "0.2.3"
 }
diff --git a/plugins/cloud/src/main.ts b/plugins/cloud/src/main.ts
@@ -151,6 +151,14 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
             hide: true,
             json: true,
         },
+        cloudflareEnabled: {
+            group: 'Advanced',
+            title: 'Cloudflare',
+            type: 'boolean',
+            description: 'Optional: Create a Cloudflare Tunnel to this server at a random domain name. Providing a Cloudflare token will allow usage of a custom domain name.',
+            defaultValue: true,
+            onPut: () => deviceManager.requestRestart(),
+        },
         cloudflaredTunnelToken: {
             group: 'Advanced',
             title: 'Cloudflare Tunnel Token',
@@ -260,6 +268,13 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
         //     }
         // };
 
+        this.storageSettings.settings.cloudflaredTunnelToken.onGet =
+            this.storageSettings.settings.cloudflaredTunnelUrl.onGet = async () => {
+                return {
+                    hide: !this.storageSettings.values.cloudflareEnabled,
+                }
+            };
+
         this.log.clearAlerts();
 
         this.storageSettings.settings.securePort.onPut = (ov, nv) => {
@@ -839,6 +854,11 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
     }
 
     async startCloudflared() {
+        if (!this.storageSettings.values.cloudflareEnabled) {
+            this.console.log('cloudflared is disabled.');
+            return;
+        }
+
         while (true) {
             try {
                 this.console.log('starting cloudflared');