cloud: fix tunnel registration failure hang

koush · Jul 6, 2024 · 6851681 · 6851681
1 parent 9dc5f2a
commit 6851681
Show file tree

Hide file tree

Showing 3 changed files with 7 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
@@ -53,5 +53,5 @@
       "@types/nat-upnp": "^1.1.5",
       "@types/node": "^20.14.6"
    },
-   "version": "0.2.20"
+   "version": "0.2.21"
 }
diff --git a/plugins/cloud/src/main.ts b/plugins/cloud/src/main.ts
@@ -1019,6 +1019,10 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
 
                         const lines = string.split('\n');
                         for (const line of lines) {
+                            if (line.includes('Register tunnel error') && deferred.finished ) {
+                                this.console.warn('Cloudflare registration failed after tunnel started. The old tunnel may be invalid. Terminating.');
+                                cloudflareTunnel.child.kill();
+                            }
                             if (line.includes('hostname'))
                                 this.console.log(line);
                             const match = /config=(".*?}")/gm.exec(line)