fix: correct a ws intercept issue (#98)

Author: rentallect

README.md

@@ -8,7 +8,7 @@ A JavaScript-based SDK for delivering secure browser-based web applications over
 Learn about Ziti at [ziti.dev](https://ziti.dev)
 
 
-[![Build](https://github.com/openziti/ziti-sdk-js/workflows/Build/badge.svg?branch=master)]()
+[![Build](https://github.com/openziti/ziti-sdk-js/workflows/Build/badge.svg?branch=main)]()
 [![Issues](https://img.shields.io/github/issues-raw/openziti/ziti-sdk-js)]()
 [![Known Vulnerabilities](https://snyk.io/test/npm/@openziti/ziti-sdk-js/badge.svg)](https://snyk.io/test/npm/@openziti/ziti-sdk-js)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
@@ -17,6 +17,7 @@ Learn about Ziti at [ziti.dev](https://ziti.dev)
 [![LOC](https://img.shields.io/tokei/lines/github/openziti/ziti-sdk-js)]()
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=rounded)](CONTRIBUTING.md)
 [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md)
+[![CodeSee](https://codesee-docs.s3.amazonaws.com/badge.svg)](https://app.codesee.io/maps/public/12213800-239c-11ec-8afb-0d2533b87e31)
 
 
 

package.json

@@ -135,4 +135,4 @@
     "utf-8-validate": "^5.0.4",
     "uuid": "^8.3.2"
   }
-}
+}

src/client.js

@@ -980,10 +980,12 @@ zitiDocumentAppendChild = ( elem, args ) => {
           // Transform all occurances of the DOM Proxy hostname into a URL our sw can intercept
           let replace = zitiConfig.httpAgent.self.host + '/ziti-dom-proxy/' + domHost;
           try {
-	          let newSRC = elem[0].src.replace(re, replace);
-	          elem[0].src = newSRC;
-            console.log('zitiDocumentAppendChild() TRANSFORMED: ', elem[0].outerHTML);
-            transformed = true;
+            if (!isUndefined(elem[0].src)) {
+              let newSRC = elem[0].src.replace(re, replace);
+              elem[0].src = newSRC;
+              console.log('zitiDocumentAppendChild() TRANSFORMED: ', elem[0].outerHTML);
+              transformed = true;
+            }
           }
           catch (e) {
             console.error(e);

src/http/request.js

@@ -269,11 +269,17 @@ HttpRequest.prototype.getRequestOptions = async function() {
 	// set the Cookie header
 	let cookieHeaderValue = '';
 	for (const cookie in cookieObject) {
-		if (cookieObject.hasOwnProperty(cookie)) {
-			cookieHeaderValue += cookie + '=' + cookieObject[cookie] + '; ';
+		if (cookie !== '') {
+			if (cookieObject.hasOwnProperty(cookie)) {
+				cookieHeaderValue += cookie + '=' + cookieObject[cookie] + '; ';
+			}
 		}
 	}
-	headers.set('Cookie', cookieHeaderValue);	
+	if (cookieHeaderValue !== '') {
+		headers.set('Cookie', cookieHeaderValue);
+	} else {
+		headers.delete('Cookie');
+	}
 
 	// HTTP-network-or-cache fetch steps 2.4-2.7
 	let contentLengthValue = null;

src/http/ziti-websocket-wrapper.js

@@ -590,7 +590,7 @@ async function initAsClient(websocket, address, protocols, options) {
             opts.createConnection = zitiConnect;    // We're going over Ziti
 
             newUrl.protocol = "http:";
-            opts.href = newUrl.toString().toLowerCase();
+            opts.href = newUrl.protocol + '//' + newUrl.host.toLowerCase() + newUrl.pathname + newUrl.search;
             opts.origin = "http://" + (zitiConfig.httpAgent.target.host).toLowerCase();
             if (zitiConfig.httpAgent.target.port !== '80') {
               if (zitiConfig.httpAgent.target.port === '443') {
@@ -973,7 +973,14 @@ function sendAfterClose(websocket, data, cb) {
    * @private
    */
   function receiverOnMessage(data) {
-    this[kWebSocket].emit('message', data);
+    if (typeof data === 'string') {
+      ziti._ctx.logger.info('ZitiWebSocketWrapper.receiverOnMessage() entered, emitting STRING: %o', data);
+      this[kWebSocket].emit('message', data);
+    } else {
+      let blob = new Blob(data);
+      ziti._ctx.logger.info('ZitiWebSocketWrapper.receiverOnMessage() entered, emitting BLOB: %o', blob);
+      this[kWebSocket].emit('message', blob);
+    }
   }
 
   /**