From b5c9b3dcba32e09034305c57cdecb07a44e75117 Mon Sep 17 00:00:00 2001
From: Curt Tudor <curt@rentallect.com>
Date: Sun, 3 Dec 2023 08:32:29 -0700
Subject: [PATCH] feat: TLS handshake timeout event (#169)

---
 package.json             |  2 +-
 src/ZitiFirstStrategy.ts | 13 ++++++++++++-
 yarn.lock                |  8 ++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 2c237f5..8c5aae4 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     ]
   },
   "dependencies": {
-    "@openziti/ziti-browzer-core": "^0.32.1",
+    "@openziti/ziti-browzer-core": "^0.33.0",
     "async-mutex": "^0.3.2",
     "cheerio": "^1.0.0-rc.12",
     "jwt-decode": "^3.1.2",
diff --git a/src/ZitiFirstStrategy.ts b/src/ZitiFirstStrategy.ts
index e0007c7..382886c 100644
--- a/src/ZitiFirstStrategy.ts
+++ b/src/ZitiFirstStrategy.ts
@@ -346,6 +346,12 @@ class ZitiFirstStrategy extends CacheFirst /* NetworkFirst */ {
     this._zitiBrowzerServiceWorkerGlobalScope._xgressEvent(xgressEvent);
 
   }
+
+  async nestedTLSHandshakeTimeoutEventHandler(nestedTLSHandshakeTimeoutEvent: any) {
+
+    this._zitiBrowzerServiceWorkerGlobalScope._nestedTLSHandshakeTimeout(nestedTLSHandshakeTimeoutEvent);
+
+  }
   
   /**
    * Do all work necessary to initialize the ZitiFirstStrategy instance.
@@ -399,6 +405,8 @@ class ZitiFirstStrategy extends CacheFirst /* NetworkFirst */ {
             this._zitiContext.on(ZITI_CONSTANTS.ZITI_EVENT_CHANNEL_CONNECT_FAIL,   this.channelConnectFailEventHandler);
             this._zitiContext.on(ZITI_CONSTANTS.ZITI_EVENT_NO_WSS_ROUTERS,         this.noWSSRoutersEventHandler);
             this._zitiContext.on(ZITI_CONSTANTS.ZITI_EVENT_XGRESS,                 this.xgressEventHandler);
+            this._zitiContext.on(ZITI_CONSTANTS.ZITI_EVENT_NESTED_TLS_HANDSHAKE_TIMEOUT,  this.nestedTLSHandshakeTimeoutEventHandler);
+
       
             this.logger.trace(`_initialize: ZitiContext '${this._uuid}' initialized`);
 
@@ -498,7 +506,10 @@ class ZitiFirstStrategy extends CacheFirst /* NetworkFirst */ {
   
     var regex = new RegExp( this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.browzer.bootstrapper.self.host, 'g' );
     let targetserviceHost = await this._zitiContext.getConfigHostByServiceName (this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.browzer.bootstrapper.target.service);
-    let connectAppData = await this._zitiContext.getConnectAppDataByServiceName (this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.browzer.bootstrapper.target.service);
+    let connectAppData = await this._zitiContext.getConnectAppDataByServiceName (
+      this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.browzer.bootstrapper.target.service,
+      this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.browzer.bootstrapper.target.scheme
+      );
     var targetServiceRegex = new RegExp( targetserviceHost , 'g' );
     var browzerLoadBalancerRegex = new RegExp( this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.browzer.loadbalancer.host , 'g' );
   
diff --git a/yarn.lock b/yarn.lock
index ce4f269..fbb5bf9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -969,10 +969,10 @@
     "@types/emscripten" "^1.39.6"
     "@wasmer/wasi" "^1.0.2"
 
-"@openziti/ziti-browzer-core@^0.32.1":
-  version "0.32.1"
-  resolved "https://registry.yarnpkg.com/@openziti/ziti-browzer-core/-/ziti-browzer-core-0.32.1.tgz#fc484a4ff90c23c2501788daaf757b063d21b450"
-  integrity sha512-1KftsTX1k6N3nJRu9x9O3uYtgUvW5esGWlV84XkRIl5+AF/R82jvpLJIi7DVC/Dm+edThM0ltkrvmy967k2XNw==
+"@openziti/ziti-browzer-core@^0.33.0":
+  version "0.33.0"
+  resolved "https://registry.yarnpkg.com/@openziti/ziti-browzer-core/-/ziti-browzer-core-0.33.0.tgz#b0fe9dc7691dbce68dc1f6f18db9ee4f90946fc4"
+  integrity sha512-lAducijRv+svCMF6yL8b5L84I4AQAFuR9krj0iTj86y047EzXSSZvTCg+ZABOnoE12/JNQ2CYPzBnAXLqgiWxA==
   dependencies:
     "@openziti/libcrypto-js" "^0.18.2"
     "@openziti/ziti-browzer-edge-client" "^0.6.2"