From 68516817aa3a1b9952429809de4ac091a9d79576 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 6 Jul 2024 00:08:43 -0700
Subject: [PATCH] cloud: fix tunnel registration failure hang

---
 plugins/cloud/package-lock.json | 4 ++--
 plugins/cloud/package.json      | 2 +-
 plugins/cloud/src/main.ts       | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/cloud/package-lock.json b/plugins/cloud/package-lock.json
index f0add86b96..21963a2684 100644
--- a/plugins/cloud/package-lock.json
+++ b/plugins/cloud/package-lock.json
@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/cloud",
-   "version": "0.2.20",
+   "version": "0.2.21",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/cloud",
-         "version": "0.2.20",
+         "version": "0.2.21",
          "dependencies": {
             "@eneris/push-receiver": "^3.1.5",
             "@scrypted/common": "file:../../common",
diff --git a/plugins/cloud/package.json b/plugins/cloud/package.json
index 0efc496092..497a15b3d9 100644
--- 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
index 15481f16e1..e1e9d088e4 100644
--- 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)