handle case where websocket does not have on method; add tests

Author: avistramer

dist/sockjs-esm.js

@@ -2,8 +2,7 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
 }) : x)(function(x) {
-  if (typeof require !== "undefined")
-    return require.apply(this, arguments);
+  if (typeof require !== "undefined") return require.apply(this, arguments);
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 var __commonJS = (cb, mod) => function __require2() {
@@ -33,16 +32,14 @@ var require_sockjs = __commonJS({
       }
     })(function() {
       var define2, module2, exports2;
-      return function() {
+      return (/* @__PURE__ */ function() {
         function r(e, n, t) {
           function o(i2, f) {
             if (!n[i2]) {
               if (!e[i2]) {
                 var c = "function" == typeof __require && __require;
-                if (!f && c)
-                  return c(i2, true);
-                if (u)
-                  return u(i2, true);
+                if (!f && c) return c(i2, true);
+                if (u) return u(i2, true);
                 var a = new Error("Cannot find module '" + i2 + "'");
                 throw a.code = "MODULE_NOT_FOUND", a;
               }
@@ -54,12 +51,11 @@ var require_sockjs = __commonJS({
             }
             return n[i2].exports;
           }
-          for (var u = "function" == typeof __require && __require, i = 0; i < t.length; i++)
-            o(t[i]);
+          for (var u = "function" == typeof __require && __require, i = 0; i < t.length; i++) o(t[i]);
           return o;
         }
         return r;
-      }()({ 1: [function(require2, module3, exports3) {
+      }())({ 1: [function(require2, module3, exports3) {
         (function(global2) {
           (function() {
             "use strict";
@@ -2874,7 +2870,7 @@ var require_sockjs = __commonJS({
             exports3.load = load;
             exports3.useColors = useColors;
             exports3.storage = localstorage();
-            exports3.destroy = (() => {
+            exports3.destroy = /* @__PURE__ */ (() => {
               let warned = false;
               return () => {
                 if (!warned) {
@@ -3240,17 +3236,15 @@ var require_sockjs = __commonJS({
           var parser = /([^=?&]+)=?([^&]*)/g, result = {}, part;
           while (part = parser.exec(query)) {
             var key = decode(part[1]), value = decode(part[2]);
-            if (key === null || value === null || key in result)
-              continue;
+            if (key === null || value === null || key in result) continue;
             result[key] = value;
           }
           return result;
         }
         function querystringify(obj, prefix) {
           prefix = prefix || "";
           var pairs = [], value, key;
-          if ("string" !== typeof prefix)
-            prefix = "?";
+          if ("string" !== typeof prefix) prefix = "?";
           for (key in obj) {
             if (has.call(obj, key)) {
               value = obj[key];
@@ -3259,8 +3253,7 @@ var require_sockjs = __commonJS({
               }
               key = encodeURIComponent(key);
               value = encodeURIComponent(value);
-              if (key === null || value === null)
-                continue;
+              if (key === null || value === null) continue;
               pairs.push(key + "=" + value);
             }
           }
@@ -3273,8 +3266,7 @@ var require_sockjs = __commonJS({
         module3.exports = function required(port, protocol) {
           protocol = protocol.split(":")[0];
           port = +port;
-          if (!port)
-            return false;
+          if (!port) return false;
           switch (protocol) {
             case "http":
             case "ws":
@@ -3321,27 +3313,21 @@ var require_sockjs = __commonJS({
             var ignore = { hash: 1, query: 1 };
             function lolcation(loc) {
               var globalVar;
-              if (typeof window !== "undefined")
-                globalVar = window;
-              else if (typeof global2 !== "undefined")
-                globalVar = global2;
-              else if (typeof self !== "undefined")
-                globalVar = self;
-              else
-                globalVar = {};
+              if (typeof window !== "undefined") globalVar = window;
+              else if (typeof global2 !== "undefined") globalVar = global2;
+              else if (typeof self !== "undefined") globalVar = self;
+              else globalVar = {};
               var location = globalVar.location || {};
               loc = loc || location;
               var finaldestination = {}, type = typeof loc, key;
               if ("blob:" === loc.protocol) {
                 finaldestination = new Url(unescape(loc.pathname), {});
               } else if ("string" === type) {
                 finaldestination = new Url(loc, {});
-                for (key in ignore)
-                  delete finaldestination[key];
+                for (key in ignore) delete finaldestination[key];
               } else if ("object" === type) {
                 for (key in loc) {
-                  if (key in ignore)
-                    continue;
+                  if (key in ignore) continue;
                   finaldestination[key] = loc[key];
                 }
                 if (finaldestination.slashes === void 0) {
@@ -3400,8 +3386,7 @@ var require_sockjs = __commonJS({
               };
             }
             function resolve(relative, base) {
-              if (relative === "")
-                return base;
+              if (relative === "") return base;
               var path = (base || "/").split("/").slice(0, -1).concat(relative.split("/")), i = path.length, last = path[i - 1], unshift = false, up = 0;
               while (i--) {
                 if (path[i] === ".") {
@@ -3410,16 +3395,13 @@ var require_sockjs = __commonJS({
                   path.splice(i, 1);
                   up++;
                 } else if (up) {
-                  if (i === 0)
-                    unshift = true;
+                  if (i === 0) unshift = true;
                   path.splice(i, 1);
                   up--;
                 }
               }
-              if (unshift)
-                path.unshift("");
-              if (last === "." || last === "..")
-                path.push("");
+              if (unshift) path.unshift("");
+              if (last === "." || last === "..") path.push("");
               return path.join("/");
             }
             function Url(address, location, parser) {
@@ -3433,8 +3415,7 @@ var require_sockjs = __commonJS({
                 parser = location;
                 location = null;
               }
-              if (parser && "function" !== typeof parser)
-                parser = qs.parse;
+              if (parser && "function" !== typeof parser) parser = qs.parse;
               location = lolcation(location);
               extracted = extractProtocol(address || "", location);
               relative = !extracted.protocol && !extracted.slashes;
@@ -3470,11 +3451,9 @@ var require_sockjs = __commonJS({
                   address = address.slice(0, index.index);
                 }
                 url[key] = url[key] || (relative && instruction[3] ? location[key] || "" : "");
-                if (instruction[4])
-                  url[key] = url[key].toLowerCase();
+                if (instruction[4]) url[key] = url[key].toLowerCase();
               }
-              if (parser)
-                url.query = parser(url.query);
+              if (parser) url.query = parser(url.query);
               if (relative && location.slashes && url.pathname.charAt(0) !== "/" && (url.pathname !== "" || location.pathname !== "")) {
                 url.pathname = resolve(url.pathname, location.pathname);
               }
@@ -3521,8 +3500,7 @@ var require_sockjs = __commonJS({
                   break;
                 case "hostname":
                   url[part] = value;
-                  if (url.port)
-                    value += ":" + url.port;
+                  if (url.port) value += ":" + url.port;
                   url.host = value;
                   break;
                 case "host":
@@ -3566,25 +3544,21 @@ var require_sockjs = __commonJS({
               }
               for (var i = 0; i < rules.length; i++) {
                 var ins = rules[i];
-                if (ins[4])
-                  url[ins[1]] = url[ins[1]].toLowerCase();
+                if (ins[4]) url[ins[1]] = url[ins[1]].toLowerCase();
               }
               url.auth = url.password ? url.username + ":" + url.password : url.username;
               url.origin = url.protocol !== "file:" && isSpecial(url.protocol) && url.host ? url.protocol + "//" + url.host : "null";
               url.href = url.toString();
               return url;
             }
             function toString(stringify) {
-              if (!stringify || "function" !== typeof stringify)
-                stringify = qs.stringify;
+              if (!stringify || "function" !== typeof stringify) stringify = qs.stringify;
               var query, url = this, host = url.host, protocol = url.protocol;
-              if (protocol && protocol.charAt(protocol.length - 1) !== ":")
-                protocol += ":";
+              if (protocol && protocol.charAt(protocol.length - 1) !== ":") protocol += ":";
               var result = protocol + (url.protocol && url.slashes || isSpecial(url.protocol) ? "//" : "");
               if (url.username) {
                 result += url.username;
-                if (url.password)
-                  result += ":" + url.password;
+                if (url.password) result += ":" + url.password;
                 result += "@";
               } else if (url.password) {
                 result += ":" + url.password;
@@ -3597,10 +3571,8 @@ var require_sockjs = __commonJS({
               }
               result += host + url.pathname;
               query = "object" === typeof url.query ? stringify(url.query) : url.query;
-              if (query)
-                result += "?" !== query.charAt(0) ? "?" + query : query;
-              if (url.hash)
-                result += url.hash;
+              if (query) result += "?" !== query.charAt(0) ? "?" + query : query;
+              if (url.hash) result += url.hash;
               return result;
             }
             Url.prototype = { set, toString };

lib/transport/websocket.js

@@ -54,9 +54,10 @@ function WebSocketTransport(transUrl, ignore, options) {
     self.emit('close', 1006, 'WebSocket connection broken');
     self._cleanup();
   };
-  this.ws.on('drain', function() {
-    self.emit('drain');
-  })
+  if (this.ws.on)
+    this.ws.on('drain', function() {
+      self.emit('drain');
+    });
 }
 
 inherits(WebSocketTransport, EventEmitter);

tests/lib/senders.js

@@ -63,6 +63,22 @@ function ajaxStreaming (Obj) {
   });
 }
 
+function ajaxCustomHeaders (Obj) {
+  it('simple', function (done) {
+    var x = new Obj('GET', testUtils.getSameOriginUrl() + '/echo-custom-data-header.txt', null, 
+      { headers: { 'X-Custom-Data': 'abc' }});
+    x.on('finish', function (status, text) {
+      try {
+        expect(text).to.equal('abc');
+      } catch (e) {
+        done(e);
+        return;
+      }
+      done();
+    });
+  });
+}
+
 function wrongUrl(Obj, url, statuses) {
   it('wrong url ' + url, function (done) {
     var test = this.runnable();
@@ -110,6 +126,7 @@ describe('Senders', function () {
   describe('xhr-local', function () {
     ajaxSimple(XhrLocal);
     ajaxStreaming(XhrLocal);
+    ajaxCustomHeaders(XhrLocal);
     // TODO senders don't have a timeouts so these tests can fail
     // BUT info-receiver has a timeout so they will never not-return
     // wrongPort(XhrLocal);
@@ -123,6 +140,7 @@ describe('Senders', function () {
     }
     ajaxSimple(Xdr);
     ajaxStreaming(Xdr);
+    ajaxCustomHeaders(Xdr);
     wrongPort(Xdr);
     wrongUrl(Xdr, testUtils.getSameOriginUrl() + '/wrong_url_indeed.txt', [0, 400]);
   });

tests/support/sockjs_server.js

@@ -42,6 +42,11 @@ function startServer(port, config, prefix) {
       res.setHeader('Access-Control-Allow-Origin', '*');
       res.writeHead(200);
       res.end(new Array(2049).join('a') + '\nb\n');
+    } else if ( /\/echo-custom-data-header.txt/.test(req.url) ) {
+      res.setHeader('content-type', 'text/plain');
+      res.setHeader('Access-Control-Allow-Origin', '*');
+      res.writeHead(200);
+      res.end(req.headers['x-custom-data'] || '');
     } else if (req.url === '/config.js') {
       if (req.headers.referer) {
         var parsedOrigin = new URL(req.headers.referer);