agent pool

openziti · Jan 24, 2024 · 12b455c · 12b455c
1 parent 8211ddc
commit 12b455c
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 54 deletions.
diff --git a/src/context/context.js b/src/context/context.js
@@ -2090,8 +2090,6 @@ class ZitiContext extends EventEmitter {
 
     let ret;
 
-    try {
-
     let fetchPromise = new Promise( async (resolve, reject) => {
 
       /**
@@ -2113,59 +2111,66 @@ class ZitiContext extends EventEmitter {
 
       let req;
 
-      if (options.method === 'GET') {
-
-        req = http.get(options);
-        req.agent = await this.getZitiAgentPool().connect(req, options);
-
-      } else {
+      try {
 
-        req = http.request(options);
-        req.agent = await this.getZitiAgentPool().connect(req, options);
+        if (options.method === 'GET') {
+
+          req = http.get(options);
+          req.agent = await this.getZitiAgentPool().connect(req, options);
+
+        } else {
 
-        if (options.body) {
-          if (options.body instanceof Promise) {
-            let chunk = await options.body;
-            req.write( chunk );
-          }
-          else if (options.body instanceof ZitiFormData) {
-
-            let p = new Promise((resolve, reject) => {
-
-              let stream = options.body.getStream();
-
-              stream.on('error', err => {
-                reject(new Error(`${err.message}`));
-              });
-
-              stream.on('end', () => {
-                try {
-                  resolve();
-                } catch (err) {
+          req = http.request(options);
+          req.agent = await this.getZitiAgentPool().connect(req, options);
+
+          if (options.body) {
+            if (options.body instanceof Promise) {
+              let chunk = await options.body;
+              req.write( chunk );
+            }
+            else if (options.body instanceof ZitiFormData) {
+
+              let p = new Promise((resolve, reject) => {
+
+                let stream = options.body.getStream();
+
+                stream.on('error', err => {
                   reject(new Error(`${err.message}`));
-                }
+                });
+
+                stream.on('end', () => {
+                  try {
+                    resolve();
+                  } catch (err) {
+                    reject(new Error(`${err.message}`));
+                  }
+                });
+
+                stream.pipe(new BrowserStdout({req: req}))
               });
-
-              stream.pipe(new BrowserStdout({req: req}))
-            });
-
-            await p;
-
-          }
-          else {
-            let buffer;
-            if (options.body.arrayBuffer) {
-              let ab = await options.body.arrayBuffer();
-              buffer = new Buffer(ab)
-            } else {
-              buffer = options.body;
+
+              await p;
+
+            }
+            else {
+              let buffer;
+              if (options.body.arrayBuffer) {
+                let ab = await options.body.arrayBuffer();
+                buffer = new Buffer(ab)
+              } else {
+                buffer = options.body;
+              }
+              req.end( buffer );
             }
-            req.end( buffer );
+          } else {
+            req.end();
           }
-        } else {
-          req.end();
+
         }
-
+      }
+      catch (error) {
+        let errResponse = new Response(new Blob(), { status: 400, statusText: `ZBR Error: ${error}` });
+        resolve(errResponse);  
       }
 
       req.on('error', err => {
@@ -2175,7 +2180,7 @@ class ZitiContext extends EventEmitter {
 
       req.on('response', async res => {
 
-        self.logger.debug(`httpFetch on.reponse() elapsed[${et.getValue()}] url[${url}]`);
+        self.logger.debug(`httpFetch on.response() elapsed[${et.getValue()}] url[${url}]`);
 
         const response_options = {
           url: url,
@@ -2240,10 +2245,6 @@ class ZitiContext extends EventEmitter {
     });
 
     ret = await fetchPromise;
-
-    } finally {
-      // release();
-    }
 
     return ret;
   }

diff --git a/src/http/ziti-agent-pool.js b/src/http/ziti-agent-pool.js
@@ -262,7 +262,6 @@ class ZitiAgentPool extends EventEmitter {
       tid = setTimeout(() => {
         this.logger.trace('ending zitiAgent due to timeout')
         timeoutHit = true
-        // force kill the node driver, and let libpq do its teardown
         zitiAgent.connection ? zitiAgent.connection.stream.destroy() : zitiAgent.end()
       }, this.options.connectionTimeoutMillis)
     }